diff options
| author | Paul Buetow <paul@buetow.org> | 2026-06-11 08:34:41 +0300 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2026-06-11 08:34:41 +0300 |
| commit | e95f3fdf0a66ba05ba2c8fb7e755e107f9cf7991 (patch) | |
| tree | 412c7e21ec9c317beb99ed7fe0d4d93a7dacbe50 /internal/mcp/server.go | |
| parent | 73dadb573f92dca310036e8793932e94277abd62 (diff) | |
Thread context.Context through blocking I/O entry points
Accept ctx as the first parameter on the blocking I/O entry points and
propagate it to downstream blocking calls so the work is cancellable from
the process entry point:
- appconfig.Load / LoadWithOptions: honor ctx before the blocking file
reads, returning defaults on a cancelled context.
- LSP: lsp.Server.Run(ctx) ties the serve loop to the caller context via a
new watchParentContext bridge (cancels the server context, aborting
in-flight LLM work). Threaded through hexailsp.Run/RunWithConfig/
RunWithFactory and runtimeconfig.Store.Reload.
- MCP: mcp.Server.Run(ctx) stops accepting requests once ctx is cancelled;
threaded through hexaimcp.Run/RunWithFactory/RunBackfill.
- editor: RunEditor/OpenTempAndEdit/OpenFile take ctx and use
exec.CommandContext so a cancelled context kills the editor subprocess;
threaded through hexaicli, hexaiaction and askcli call sites.
Top-level callers (cmd/hexai-lsp-server, cmd/hexai-mcp-server) now build a
signal-cancelled context (SIGINT/SIGTERM) so shutdown tears the run down
cleanly. Updated comments to explain the cancellation flow and added
cancellation tests for the LSP/MCP loops, editor, and config load.
All tests pass with -race; cross-package coverage 86.2%.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Diffstat (limited to 'internal/mcp/server.go')
| -rw-r--r-- | internal/mcp/server.go | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/internal/mcp/server.go b/internal/mcp/server.go index f8042ac..e3c8723 100644 --- a/internal/mcp/server.go +++ b/internal/mcp/server.go @@ -3,6 +3,7 @@ package mcp import ( "bufio" + "context" "encoding/json" "errors" "fmt" @@ -67,9 +68,20 @@ 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, after waiting for all in-flight handlers. -func (s *Server) Run() error { +// Returns on EOF, on a cancelled ctx, or on a fatal error, after waiting for +// all in-flight handlers. +// +// ctx ties the serve loop to the process lifecycle: once it is cancelled (e.g. +// SIGINT/SIGTERM at main) the loop stops accepting further requests after the +// current blocking read returns and drains outstanding handlers before exiting. +func (s *Server) Run(ctx context.Context) error { for { + // Stop promptly when the caller cancels (shutdown signal); the loop + // otherwise blocks in readMessage until the next request or EOF. + if ctx != nil && ctx.Err() != nil { + s.inflight.Wait() + return nil + } body, err := s.readMessage() if errors.Is(err, io.EOF) { s.inflight.Wait() // drain handlers before signalling callers |
