Skip to content

Fix context cancel lifecycle violations in workflow + MCP inspect paths #35811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pelikhan merged 4 commits into from
May 29, 2026
Merged

Fix context cancel lifecycle violations in workflow + MCP inspect paths #35811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6dd419e
Initial plan
Copilot May 29, 2026
a25ce33
Plan: fix context cancel defer lints
Copilot May 29, 2026
e243514
Fix context cancel defer violations in workflow and MCP inspect code
Copilot May 29, 2026
6c07037
Restore explicit cancel calls with deferred cancellation
Copilot May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/avenger.lock.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/step-name-alignment.lock.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions pkg/cli/mcp_inspect_mcp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ func connectStdioMCPServer(ctx context.Context, config parser.RegistryMCPServerC

// List tools
listToolsCtx, cancel := context.WithTimeout(ctx, MCPOperationTimeout)
defer cancel()
toolsResult, err := session.ListTools(listToolsCtx, &mcp.ListToolsParams{})
cancel()
if err != nil {
Expand All @@ -206,6 +207,7 @@ func connectStdioMCPServer(ctx context.Context, config parser.RegistryMCPServerC

// List resources
listResourcesCtx, cancel := context.WithTimeout(ctx, MCPOperationTimeout)
defer cancel()
resourcesResult, err := session.ListResources(listResourcesCtx, &mcp.ListResourcesParams{})
cancel()
if err != nil {
Expand Down Expand Up @@ -283,6 +285,7 @@ func connectHTTPMCPServer(ctx context.Context, config parser.RegistryMCPServerCo

// List tools
listToolsCtx, cancel := context.WithTimeout(ctx, MCPOperationTimeout)
defer cancel()
toolsResult, err := session.ListTools(listToolsCtx, &mcp.ListToolsParams{})
cancel()
if err != nil {
Expand All @@ -295,6 +298,7 @@ func connectHTTPMCPServer(ctx context.Context, config parser.RegistryMCPServerCo

// List resources
listResourcesCtx, cancel := context.WithTimeout(ctx, MCPOperationTimeout)
defer cancel()
resourcesResult, err := session.ListResources(listResourcesCtx, &mcp.ListResourcesParams{})
cancel()
if err != nil {
Expand Down
1 change: 1 addition & 0 deletions pkg/workflow/action_resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ func (r *ActionResolver) resolveFromGitHub(ctx context.Context, repo, version st
// caller context (ctx), not from callCtx, so we don't accidentally shrink
// the budget for subsequent peels.
peelCtx, peelCancel := context.WithTimeout(ctx, 30*time.Second)
defer peelCancel()
cmd2 := ExecGHContext(peelCtx, "api", tagPath, "--jq", "[.object.sha, .object.type] | @tsv")
output2, peelErr := cmd2.Output()
peelCancel()
Expand Down
1 change: 1 addition & 0 deletions pkg/workflow/safe_outputs_actions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ func fetchRemoteActionYAML(repo, subdir, ref string) (*actionYAMLFile, error) {
safeOutputActionsLog.Printf("Fetching action YAML from: %s", apiPath)

ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second)
defer cancel()
cmd := ExecGHContext(ctx, "api", apiPath, "--jq", ".content")
output, err := cmd.Output()
cancel()
Expand Down
Loading