diff options
| author | Paul Buetow <paul@buetow.org> | 2026-03-23 09:04:17 +0200 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2026-03-23 09:04:17 +0200 |
| commit | 462184dff3eef32f01f06634305da1355ac1bec2 (patch) | |
| tree | 026ffaaeacfe152957298c985e1df77ff661b723 /internal/mcp | |
| parent | 667f2d3384643aa877de2eefcbad3923965bad09 (diff) | |
chore: bump version to v0.25.9v0.25.9
Code quality fixes from audit:
- Log silently discarded errors in status sinks and stats.Update call sites
- Fix json.Marshal errors silently ignored in LSP handlers
- Replace time.Sleep in tests with channel signaling (mcp) and fake clock (stats)
- Make context cancellation work in production time.Sleep sites (handlers_document, cmdentry)
- Remove init()-based provider registration from llm package; use explicit RegisterAllProviders()
- Add WaitGroup goroutine tracking to MCP server Run()
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Diffstat (limited to 'internal/mcp')
| -rw-r--r-- | internal/mcp/server.go | 13 | ||||
| -rw-r--r-- | internal/mcp/server_test.go | 9 |
2 files changed, 16 insertions, 6 deletions
diff --git a/internal/mcp/server.go b/internal/mcp/server.go index 645c0cf..f8042ac 100644 --- a/internal/mcp/server.go +++ b/internal/mcp/server.go @@ -32,6 +32,7 @@ type Server struct { syncer SlashCommandSyncer initialized bool mu sync.RWMutex + inflight sync.WaitGroup // tracks handler goroutines; Run waits before returning // Dispatch table for JSON-RPC methods handlers map[string]func(Request) @@ -66,14 +67,16 @@ func NewServer(r io.Reader, w io.Writer, logger *log.Logger, store promptstore.P } // Run starts the server main loop, reading and dispatching requests. -// Returns on EOF or fatal error. +// Returns on EOF or fatal error, after waiting for all in-flight handlers. func (s *Server) Run() error { for { body, err := s.readMessage() if errors.Is(err, io.EOF) { + s.inflight.Wait() // drain handlers before signalling callers return nil } if err != nil { + s.inflight.Wait() return fmt.Errorf("read message: %w", err) } @@ -89,8 +92,12 @@ func (s *Server) Run() error { continue } - // Dispatch request - go s.handle(req) + // Dispatch request in a goroutine, tracked so Run can wait on completion. + s.inflight.Add(1) + go func(r Request) { + defer s.inflight.Done() + s.handle(r) + }(req) } } diff --git a/internal/mcp/server_test.go b/internal/mcp/server_test.go index 256b324..00a7823 100644 --- a/internal/mcp/server_test.go +++ b/internal/mcp/server_test.go @@ -430,14 +430,17 @@ func TestServer_Run(t *testing.T) { t.Fatalf("sendRequest() error = %v", err) } - // Run in background + // Run in background; bytes.Buffer returns EOF after the single request, + // so Run() will complete naturally once it has written the response. done := make(chan error, 1) go func() { done <- server.Run() }() - // Give time for processing (server will block waiting for more input) - time.Sleep(50 * time.Millisecond) + // Wait for Run() to return (signalled by EOF on the input buffer). + if err := <-done; err != nil { + t.Fatalf("Run() error = %v", err) + } // Read response resp, err := readResponse(outBuf) |
