From e95f3fdf0a66ba05ba2c8fb7e755e107f9cf7991 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Thu, 11 Jun 2026 08:34:41 +0300 Subject: 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 --- internal/appconfig/config_load.go | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'internal/appconfig/config_load.go') diff --git a/internal/appconfig/config_load.go b/internal/appconfig/config_load.go index 3ed1654..1e4c6b7 100644 --- a/internal/appconfig/config_load.go +++ b/internal/appconfig/config_load.go @@ -1,6 +1,7 @@ package appconfig import ( + "context" "fmt" "log" "os" @@ -15,15 +16,26 @@ import ( const ProjectConfigFilename = ".hexaiconfig.toml" // Load reads configuration from a file and merges with defaults. -// It respects the XDG Base Directory Specification. -func Load(logger *log.Logger) App { return LoadWithOptions(logger, LoadOptions{}) } +// It respects the XDG Base Directory Specification. The context lets callers +// abort the (blocking) file reads on shutdown/cancellation. +func Load(ctx context.Context, logger *log.Logger) App { + return LoadWithOptions(ctx, logger, LoadOptions{}) +} // LoadWithOptions reads configuration and applies the requested loading options. -func LoadWithOptions(logger *log.Logger, opts LoadOptions) App { +// ctx is honored before performing the blocking file I/O so a cancelled caller +// gets a clean default config back instead of stalling on disk access. +func LoadWithOptions(ctx context.Context, logger *log.Logger, opts LoadOptions) App { cfg := newDefaultConfig() if logger == nil { return cfg // Return defaults if no logger is provided (e.g. in tests) } + // Respect cancellation up front: config loading touches several files and + // there is no value in starting that work once the caller has given up. + if ctx != nil && ctx.Err() != nil { + logger.Printf("config load cancelled: %v", ctx.Err()) + return cfg + } // Step 1: Load global config file configPath := strings.TrimSpace(opts.ConfigPath) -- cgit v1.2.3