mcp: fix reregistering mcp tool leading to an error (microsoft#258827)

connor4312 · web-flow · commit e73414641b1d · 2025-07-30T16:25:04.000Z
Closes microsoft#256521
diff --git a/src/vs/workbench/contrib/mcp/common/mcpLanguageModelToolContribution.ts b/src/vs/workbench/contrib/mcp/common/mcpLanguageModelToolContribution.ts
@@ -127,7 +127,7 @@ export class McpLanguageModelToolContribution extends Disposable implements IWor
 						existing.store.clear();
 						// We need to re-register both the data and implementation, as the
 						// implementation is discarded when the data is removed (#245921)
-						registerTool(tool, toolData, store);
+						registerTool(tool, toolData, existing.store);
 					}
 					toDelete.delete(tool.id);
 				} else {

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ export class McpLanguageModelToolContribution extends Disposable implements IWor`
`127`	`127`	`existing.store.clear();`
`128`	`128`	`// We need to re-register both the data and implementation, as the`
`129`	`129`	`// implementation is discarded when the data is removed (#245921)`
`130`		`- registerTool(tool, toolData, store);`
	`130`	`+ registerTool(tool, toolData, existing.store);`
`131`	`131`	`}`
`132`	`132`	`toDelete.delete(tool.id);`
`133`	`133`	`} else {`