Release MCP inspector sub-contexts promptly after each operation (#18343)

Copilot · web-flow · commit b70143d20a82 · 2026-02-25T04:46:15.000-08:00
diff --git a/.github/smoke-test-22395402042.json b/.github/smoke-test-22395402042.json
@@ -1 +1 @@
-{"smoke_test": "run-22395402042", "note": "Test file for PR push validation"}
+{ "smoke_test": "run-22395402042", "note": "Test file for PR push validation" }
diff --git a/pkg/cli/mcp_inspect_mcp.go b/pkg/cli/mcp_inspect_mcp.go
@@ -192,9 +192,8 @@ func connectStdioMCPServer(ctx context.Context, config parser.MCPServerConfig, v
 
 	// List tools
 	listToolsCtx, cancel := context.WithTimeout(ctx, MCPOperationTimeout)
-	defer cancel()
-
 	toolsResult, err := session.ListTools(listToolsCtx, &mcp.ListToolsParams{})
+	cancel()
 	if err != nil {
 		if verbose {
 			fmt.Fprintln(os.Stderr, console.FormatWarningMessage(fmt.Sprintf("Failed to list tools: %v", err)))
@@ -205,9 +204,8 @@ func connectStdioMCPServer(ctx context.Context, config parser.MCPServerConfig, v
 
 	// List resources
 	listResourcesCtx, cancel := context.WithTimeout(ctx, MCPOperationTimeout)
-	defer cancel()
-
 	resourcesResult, err := session.ListResources(listResourcesCtx, &mcp.ListResourcesParams{})
+	cancel()
 	if err != nil {
 		if verbose {
 			fmt.Fprintln(os.Stderr, console.FormatWarningMessage(fmt.Sprintf("Failed to list resources: %v", err)))
@@ -283,9 +281,8 @@ func connectHTTPMCPServer(ctx context.Context, config parser.MCPServerConfig, ve
 
 	// List tools
 	listToolsCtx, cancel := context.WithTimeout(ctx, MCPOperationTimeout)
-	defer cancel()
-
 	toolsResult, err := session.ListTools(listToolsCtx, &mcp.ListToolsParams{})
+	cancel()
 	if err != nil {
 		if verbose {
 			fmt.Fprintln(os.Stderr, console.FormatWarningMessage(fmt.Sprintf("Failed to list tools: %v", err)))
@@ -296,9 +293,8 @@ func connectHTTPMCPServer(ctx context.Context, config parser.MCPServerConfig, ve
 
 	// List resources
 	listResourcesCtx, cancel := context.WithTimeout(ctx, MCPOperationTimeout)
-	defer cancel()
-
 	resourcesResult, err := session.ListResources(listResourcesCtx, &mcp.ListResourcesParams{})
+	cancel()
 	if err != nil {
 		if verbose {
 			fmt.Fprintln(os.Stderr, console.FormatWarningMessage(fmt.Sprintf("Failed to list resources: %v", err)))

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{"smoke_test": "run-22395402042", "note": "Test file for PR push validation"}`
	`1`	`+{ "smoke_test": "run-22395402042", "note": "Test file for PR push validation" }`