015632a · crush · git.iko.soy

git.iko.soy/crush

fix(mcp): make sure to cancel context on error (#1246)

Signed-off-by: Carlos Alexandro Becker <caarlos0@users.noreply.github.com>

commit015632a146db8ce0d04c989b4394f67490ad0c21 authorCarlos Alexandro Becker <caarlos0@users.noreply.github.com> dateThu 16 Oct 2025, 19:36 (1 year ago) parent14c4f11

2 files changed+4−1

compare with main

unifiedsplit

Taskfile.yaml+1−1 internal/llm/agent/mcp-tools.go+3

Taskfile.yaml+1−1

@@ -99,7 +99,7 @@ tasks:

9999 cmds:

100100 - task: fetch-tags

101101 - git commit --allow-empty -m "{{.NEXT}}"

102− - git tag --annotate -m "{{.NEXT}}" {{.NEXT}} {{.CLI_ARGS}}

102+ - git tag --annotate --sign -m "{{.NEXT}}" {{.NEXT}} {{.CLI_ARGS}}

103103 - echo "Pushing {{.NEXT}}..."

104104 - git push origin main --follow-tags

105105

internal/llm/agent/mcp-tools.go+3

@@ -365,6 +365,8 @@ func createMCPSession(ctx context.Context, name string, m config.MCPConfig, reso

365365 if err != nil {

366366 updateMCPState(name, MCPStateError, err, nil, 0)

367367 slog.Error("error creating mcp client", "error", err, "name", name)

368+ cancel()

369+ cancelTimer.Stop()

368370 return nil, err

369371 }

370372

@@ -391,6 +393,7 @@ func createMCPSession(ctx context.Context, name string, m config.MCPConfig, reso

391393 updateMCPState(name, MCPStateError, maybeTimeoutErr(err, timeout), nil, 0)

392394 slog.Error("error starting mcp client", "error", err, "name", name)

393395 cancel()

396+ cancelTimer.Stop()

394397 return nil, err

395398 }

396399