merge conflicts

.changeset/wild-gifts-switch.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": minor
+---
+
+Migrate the deleteMcpServer message to protobus

proto/mcp.proto

@@ -12,6 +12,7 @@ service McpService {
   rpc addRemoteMcpServer(AddRemoteMcpServerRequest) returns (McpServers);
   rpc downloadMcp(StringRequest) returns (Empty);
   rpc restartMcpServer(StringRequest) returns (McpServers);
+  rpc deleteMcpServer(StringRequest) returns (McpServers);
 }
 
 message ToggleMcpServerRequest {

src/core/controller/index.ts

@@ -482,12 +482,7 @@ export class Controller {
 				this.refreshTotalTasksSize()
 				break
 			}
-			case "deleteMcpServer": {
+
-				if (message.serverName) {
-					this.mcpHub?.deleteServer(message.serverName)
-				}
-				break
-			}
 			case "fetchLatestMcpServersFromHub": {
 				this.mcpHub?.sendLatestMcpServers()
 				break

src/core/controller/mcp/deleteMcpServer.ts

@@ -0,0 +1,25 @@
+import type { Controller } from "../index"
+import type { McpServers } from "../../../shared/proto/mcp"
+import { convertMcpServersToProtoMcpServers } from "../../../shared/proto-conversions/mcp/mcp-server-conversion"
+import { StringRequest } from "@/shared/proto/common"
+
+/**
+ * Deletes an MCP server
+ * @param controller The controller instance
+ * @param request The delete server request
+ * @returns The list of remaining MCP servers after deletion
+ */
+export async function deleteMcpServer(controller: Controller, request: StringRequest): Promise<McpServers> {
+	try {
+		// Call the RPC variant to delete the server and get updated server list
+		const mcpServers = (await controller.mcpHub?.deleteServerRPC(request.value)) || []
+
+		// Convert application types to protobuf types
+		const protoServers = convertMcpServersToProtoMcpServers(mcpServers)
+
+		return { mcpServers: protoServers }
+	} catch (error) {
+		console.error(`Failed to delete MCP server: ${error}`)
+		throw error
+	}
+}

src/core/controller/mcp/methods.ts

@@ -4,6 +4,7 @@
 // Import all method implementations
 import { registerMethod } from "./index"
 import { addRemoteMcpServer } from "./addRemoteMcpServer"
+import { deleteMcpServer } from "./deleteMcpServer"
 import { downloadMcp } from "./downloadMcp"
 import { restartMcpServer } from "./restartMcpServer"
 import { toggleMcpServer } from "./toggleMcpServer"
@@ -13,6 +14,7 @@ import { updateMcpTimeout } from "./updateMcpTimeout"
 export function registerAllMethods(): void {
 	// Register each method with the registry
 	registerMethod("addRemoteMcpServer", addRemoteMcpServer)
+	registerMethod("deleteMcpServer", deleteMcpServer)
 	registerMethod("downloadMcp", downloadMcp)
 	registerMethod("restartMcpServer", restartMcpServer)
 	registerMethod("toggleMcpServer", toggleMcpServer)

src/services/mcp/McpHub.ts

@@ -883,7 +883,12 @@ export class McpHub {
 		}
 	}
 
-	public async deleteServer(serverName: string) {
+	/**
+	 * RPC variant of deleteServer that returns the updated server list directly
+	 * @param serverName The name of the server to delete
+	 * @returns Array of remaining MCP servers
+	 */
+	public async deleteServerRPC(serverName: string): Promise<McpServer[]> {
 		try {
 			const settingsPath = await this.getMcpSettingsFilePath()
 			const content = await fs.readFile(settingsPath, "utf-8")
@@ -891,21 +896,23 @@ export class McpHub {
 			if (!config.mcpServers || typeof config.mcpServers !== "object") {
 				config.mcpServers = {}
 			}
+
 			if (config.mcpServers[serverName]) {
 				delete config.mcpServers[serverName]
 				const updatedConfig = {
 					mcpServers: config.mcpServers,
 				}
 				await fs.writeFile(settingsPath, JSON.stringify(updatedConfig, null, 2))
-				await this.updateServerConnections(config.mcpServers)
+				await this.updateServerConnectionsRPC(config.mcpServers)
-				vscode.window.showInformationMessage(`Deleted ${serverName} MCP server`)
+
+				// Get the servers in their correct order from settings
+				const serverOrder = Object.keys(config.mcpServers || {})
+				return this.getSortedMcpServers(serverOrder)
 			} else {
-				vscode.window.showWarningMessage(`${serverName} not found in MCP configuration`)
+				throw new Error(`${serverName} not found in MCP configuration`)
 			}
 		} catch (error) {
-			vscode.window.showErrorMessage(
+			console.error(`Failed to delete MCP server: ${error instanceof Error ? error.message : String(error)}`)
-				`Failed to delete MCP server: ${error instanceof Error ? error.message : String(error)}`,
-			)
 			throw error
 		}
 	}

src/shared/WebviewMessage.ts

@@ -20,7 +20,6 @@ export interface WebviewMessage {
 		| "showChatView"
 		| "refreshClineRules"
 		| "openMcpSettings"
-		| "deleteMcpServer"
 		| "autoApprovalSettings"
 		| "browserRelaunchResult"
 		| "togglePlanActMode"

src/shared/proto/mcp.ts

@@ -1020,6 +1020,14 @@ export const McpServiceDefinition = {
 			responseStream: false,
 			options: {},
 		},
+		deleteMcpServer: {
+			name: "deleteMcpServer",
+			requestType: StringRequest,
+			requestStream: false,
+			responseType: McpServers,
+			responseStream: false,
+			options: {},
+		},
 	},
 } as const
 

src/standalone/server-setup.ts

@@ -34,6 +34,7 @@ import { updateMcpTimeout } from "../core/controller/mcp/updateMcpTimeout"
 import { addRemoteMcpServer } from "../core/controller/mcp/addRemoteMcpServer"
 import { downloadMcp } from "../core/controller/mcp/downloadMcp"
 import { restartMcpServer } from "../core/controller/mcp/restartMcpServer"
+import { deleteMcpServer } from "../core/controller/mcp/deleteMcpServer"
 
 // Models Service
 import { getOllamaModels } from "../core/controller/models/getOllamaModels"
@@ -117,6 +118,7 @@ export function addServices(
 		addRemoteMcpServer: wrapper(addRemoteMcpServer, controller),
 		downloadMcp: wrapper(downloadMcp, controller),
 		restartMcpServer: wrapper(restartMcpServer, controller),
+		deleteMcpServer: wrapper(deleteMcpServer, controller),
 	})
 
 	// Models Service

webview-ui/src/components/mcp/configuration/tabs/installed/server-row/ServerRow.tsx

@@ -117,10 +117,18 @@ const ServerRow = ({
 
 	const handleDelete = () => {
 		setIsDeleting(true)
-		vscode.postMessage({
+		McpServiceClient.deleteMcpServer({
-			type: "deleteMcpServer",
+			value: server.name,
-			serverName: server.name,
+		} as StringRequest)
-		})
+			.then((response: McpServers) => {
+				const mcpServers = convertProtoMcpServersToMcpServers(response.mcpServers)
+				setMcpServers(mcpServers)
+				setIsDeleting(false)
+			})
+			.catch((error) => {
+				console.error("Error deleting MCP server", error)
+				setIsDeleting(false)
+			})
 	}
 
 	const handleAutoApproveChange = () => {