Protobus: updateMcpTimeout message (RooCodeInc#3085)

* updateMcpTimeout protobus conversion

* changeset

Author: celestial-vault

.changeset/clean-chicken-smash.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": minor
+---
+
+Move updateMcpTimeout message to protobus

proto/mcp.proto

@@ -6,6 +6,19 @@ import "common.proto";
 
 service McpService {
   rpc toggleMcpServer(ToggleMcpServerRequest) returns (McpServers);
+  rpc updateMcpTimeout(UpdateMcpTimeoutRequest) returns (McpServers);
+}
+
+message ToggleMcpServerRequest {
+  Metadata metadata = 1;
+  string server_name = 2;
+  bool disabled = 3;
+}
+
+message UpdateMcpTimeoutRequest {
+  Metadata metadata = 1;
+  string server_name = 2;
+  int32 timeout = 3;
 }
 
 message McpTool {
@@ -49,12 +62,6 @@ message McpServer {
   optional int32 timeout = 9;
 }
 
-message ToggleMcpServerRequest {
-  Metadata metadata = 1;
-  string server_name = 2;
-  bool disabled = 3;
-}
-
 message McpServers {
   repeated McpServer mcp_servers = 1;
 }

src/core/controller/index.ts

@@ -646,16 +646,6 @@ export class Controller {
 				}
 				break
 			}
-			case "updateMcpTimeout": {
-				try {
-					if (message.serverName && message.timeout) {
-						await this.mcpHub?.updateServerTimeout(message.serverName, message.timeout)
-					}
-				} catch (error) {
-					console.error(`Failed to update timeout for server ${message.serverName}:`, error)
-				}
-				break
-			}
 			case "openExtensionSettings": {
 				const settingsFilter = message.text || ""
 				await vscode.commands.executeCommand(

src/core/controller/mcp/methods.ts

@@ -4,9 +4,11 @@
 // Import all method implementations
 import { registerMethod } from "./index"
 import { toggleMcpServer } from "./toggleMcpServer"
+import { updateMcpTimeout } from "./updateMcpTimeout"
 
 // Register all mcp service methods
 export function registerAllMethods(): void {
 	// Register each method with the registry
 	registerMethod("toggleMcpServer", toggleMcpServer)
+	registerMethod("updateMcpTimeout", updateMcpTimeout)
 }

src/core/controller/mcp/updateMcpTimeout.ts

@@ -0,0 +1,27 @@
+import { convertMcpServersToProtoMcpServers } from "@/shared/proto-conversions/mcp/mcp-server-conversion"
+import { Controller } from ".."
+import { UpdateMcpTimeoutRequest, McpServers } from "../../../shared/proto/mcp"
+
+/**
+ * Updates the timeout configuration for an MCP server.
+ * @param controller - The Controller instance
+ * @param request - Contains server name and timeout value
+ * @returns Array of updated McpServer objects
+ */
+export async function updateMcpTimeout(controller: Controller, request: UpdateMcpTimeoutRequest): Promise<McpServers> {
+	try {
+		if (request.serverName && typeof request.serverName === "string" && typeof request.timeout === "number") {
+			const mcpServers = await controller.mcpHub?.updateServerTimeoutRPC(request.serverName, request.timeout)
+			console.log("mcpServers", mcpServers)
+			const convertedMcpServers = convertMcpServersToProtoMcpServers(mcpServers)
+			console.log("convertedMcpServers", convertedMcpServers)
+			return { mcpServers: convertedMcpServers }
+		} else {
+			console.error("Server name and timeout are required")
+			throw new Error("Server name and timeout are required")
+		}
+	} catch (error) {
+		console.error(`Failed to update timeout for server ${request.serverName}:`, error)
+		throw error
+	}
+}

src/services/mcp/McpHub.ts

@@ -329,10 +329,9 @@ export class McpHub {
 				autoApprove: autoApproveConfig.includes(tool.name),
 			}))
 
-			// console.log(`[MCP] Fetched tools for ${serverName}:`, tools)
 			return tools
 		} catch (error) {
-			// console.error(`Failed to fetch tools for ${serverName}:`, error)
+			console.error(`Failed to fetch tools for ${serverName}:`, error)
 			return []
 		}
 	}
@@ -377,6 +376,53 @@ export class McpHub {
 		}
 	}
 
+	async updateServerConnectionsRPC(newServers: Record<string, McpServerConfig>): Promise<void> {
+		this.isConnecting = true
+		this.removeAllFileWatchers()
+		const currentNames = new Set(this.connections.map((conn) => conn.server.name))
+		const newNames = new Set(Object.keys(newServers))
+
+		// Delete removed servers
+		for (const name of currentNames) {
+			if (!newNames.has(name)) {
+				await this.deleteConnection(name)
+				console.log(`Deleted MCP server: ${name}`)
+			}
+		}
+
+		// Update or add servers
+		for (const [name, config] of Object.entries(newServers)) {
+			const currentConnection = this.connections.find((conn) => conn.server.name === name)
+
+			if (!currentConnection) {
+				// New server
+				try {
+					if (config.transportType === "stdio") {
+						this.setupFileWatcher(name, config)
+					}
+					await this.connectToServer(name, config)
+				} catch (error) {
+					console.error(`Failed to connect to new MCP server ${name}:`, error)
+				}
+			} else if (!deepEqual(JSON.parse(currentConnection.server.config), config)) {
+				// Existing server with changed config
+				try {
+					if (config.transportType === "stdio") {
+						this.setupFileWatcher(name, config)
+					}
+					await this.deleteConnection(name)
+					await this.connectToServer(name, config)
+					console.log(`Reconnected MCP server with updated config: ${name}`)
+				} catch (error) {
+					console.error(`Failed to reconnect MCP server ${name}:`, error)
+				}
+			}
+			// If server exists with same config, do nothing
+		}
+
+		this.isConnecting = false
+	}
+
 	async updateServerConnections(newServers: Record<string, McpServerConfig>): Promise<void> {
 		this.isConnecting = true
 		this.removeAllFileWatchers()
@@ -719,7 +765,7 @@ export class McpHub {
 		}
 	}
 
-	public async updateServerTimeout(serverName: string, timeout: number): Promise<void> {
+	public async updateServerTimeoutRPC(serverName: string, timeout: number): Promise<McpServer[]> {
 		try {
 			// Validate timeout against schema
 			const setConfigResult = BaseConfigSchema.shape.timeout.safeParse(timeout)
@@ -742,7 +788,18 @@ export class McpHub {
 
 			await fs.writeFile(settingsPath, JSON.stringify(config, null, 2))
 
-			await this.updateServerConnections(config.mcpServers)
+			await this.updateServerConnectionsRPC(config.mcpServers)
+
+			const serverOrder = Object.keys(config.mcpServers || {})
+			const updatedMcpServers = [...this.connections]
+				.sort((a, b) => {
+					const indexA = serverOrder.indexOf(a.server.name)
+					const indexB = serverOrder.indexOf(b.server.name)
+					return indexA - indexB
+				})
+				.map((connection) => connection.server)
+
+			return updatedMcpServers
 		} catch (error) {
 			console.error("Failed to update server timeout:", error)
 			if (error instanceof Error) {

src/shared/WebviewMessage.ts

@@ -42,7 +42,6 @@ export interface WebviewMessage {
 		| "openExtensionSettings"
 		| "requestVsCodeLmModels"
 		| "toggleToolAutoApprove"
-		| "toggleMcpServer"
 		| "getLatestState"
 		| "accountLoginClicked"
 		| "accountLogoutClicked"
@@ -57,7 +56,6 @@ export interface WebviewMessage {
 		| "fetchLatestMcpServersFromHub"
 		| "telemetrySetting"
 		| "openSettings"
-		| "updateMcpTimeout"
 		| "fetchOpenGraphData"
 		| "checkIsImageUrl"
 		| "invoke"