From 14e2e09d106981742ad3993fb9250cf09cf50a2d Mon Sep 17 00:00:00 2001
From: christine betts <chrstn@uw.edu>
Date: Tue, 3 Feb 2026 14:29:15 -0500
Subject: [PATCH] Match on extension ID when stopping extensions (#18218)

---
 packages/core/src/tools/mcp-client-manager.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/src/tools/mcp-client-manager.ts b/packages/core/src/tools/mcp-client-manager.ts
index a56876323d..b38b00616b 100644
--- a/packages/core/src/tools/mcp-client-manager.ts
+++ b/packages/core/src/tools/mcp-client-manager.ts
@@ -74,7 +74,7 @@ export class McpClientManager {
     await Promise.all(
       Object.keys(extension.mcpServers ?? {}).map((name) => {
         const config = this.allServerConfigs.get(name);
-        if (config?.extension === extension) {
+        if (config?.extension?.id === extension.id) {
           this.allServerConfigs.delete(name);
           // Also remove from blocked servers if present
           const index = this.blockedMcpServers.findIndex(