fix: complete disabled server handling - UI shows grey status and no retry button

Author: hannesrudolph

src/services/mcp/McpHub.ts

@@ -1207,6 +1207,15 @@ export class McpHub {
 				}
 			}
 
+			// Store disabled state before clearing connections
+			const disabledServers = new Map<string, boolean>()
+			for (const conn of this.connections) {
+				if (conn.server.disabled) {
+					const key = `${conn.server.name}-${conn.server.source || "global"}`
+					disabledServers.set(key, true)
+				}
+			}
+
 			// Clear all existing connections first
 			const existingConnections = [...this.connections]
 			for (const conn of existingConnections) {
@@ -1218,6 +1227,15 @@ export class McpHub {
 			await this.initializeMcpServers("global")
 			await this.initializeMcpServers("project")
 
+			// Re-apply disabled state to servers that were disabled before refresh
+			for (const conn of this.connections) {
+				const key = `${conn.server.name}-${conn.server.source || "global"}`
+				if (disabledServers.has(key) && !conn.server.disabled) {
+					// Server was disabled before refresh but got re-enabled, disable it again
+					await this.toggleServerDisabled(conn.server.name, true, conn.server.source)
+				}
+			}
+
 			await delay(100)
 
 			await this.notifyWebviewOfServerChanges()
@@ -1339,8 +1357,35 @@ export class McpHub {
 
 			// If disabling the server, update the connection state and disconnect
 			if (disabled) {
+				// First update the config file
 				connection.server.disabled = true
+
+				// Store the config before deleting the connection
+				const storedConfig = connection.server.config
+
+				// Delete the connection (this closes transport and client)
 				await this.deleteConnection(serverName, serverSource)
+
+				// Create a placeholder connection for disabled servers
+				// This is needed so the server still appears in the UI
+				const parsedConfig = JSON.parse(storedConfig)
+				parsedConfig.disabled = true
+
+				const placeholderConnection: McpConnection = {
+					server: {
+						name: serverName,
+						config: JSON.stringify(parsedConfig),
+						status: "disconnected",
+						disabled: true,
+						source: serverSource,
+						projectPath:
+							serverSource === "project" ? vscode.workspace.workspaceFolders?.[0]?.uri.fsPath : undefined,
+						errorHistory: [],
+					},
+					client: null as any,
+					transport: null as any,
+				}
+				this.connections.push(placeholderConnection)
 			} else {
 				// If enabling the server, we need to re-read the config and reconnect
 				// Get the updated config from the file

src/services/mcp/__tests__/McpHub.spec.ts

@@ -484,9 +484,13 @@ describe("McpHub", () => {
 			const mockConnection: McpConnection = {
 				server: {
 					name: "test-server",
-					type: "stdio",
-					command: "node",
-					args: ["test.js"],
+					config: JSON.stringify({
+						type: "stdio",
+						command: "node",
+						args: ["test.js"],
+						disabled: false,
+					}),
+					status: "connected",
 					disabled: false,
 					source: "global",
 				} as any,
@@ -734,7 +738,12 @@ describe("McpHub", () => {
 			// Verify the server was disconnected
 			expect(mockTransport.close).toHaveBeenCalled()
 			expect(mockClient.close).toHaveBeenCalled()
-			expect(mcpHub.connections.length).toBe(0)
+			// Should have 1 placeholder connection for the disabled server
+			expect(mcpHub.connections.length).toBe(1)
+			expect(mcpHub.connections[0].server.disabled).toBe(true)
+			expect(mcpHub.connections[0].server.status).toBe("disconnected")
+			expect(mcpHub.connections[0].client).toBeNull()
+			expect(mcpHub.connections[0].transport).toBeNull()
 		})
 
 		it("should reconnect server when toggling to enabled", async () => {