From bfa73fb69d169ae14775da7254475a92eea540e8 Mon Sep 17 00:00:00 2001
From: Roo Code <support@roo.vet>
Date: Tue, 18 Feb 2025 21:16:16 -0700
Subject: [PATCH] Does that work?

---
 src/core/webview/ClineProvider.ts | 63 ++-----------------------------
 src/services/mcp/McpHub.ts        | 53 ++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 60 deletions(-)

diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts
index 32aef5969b..43ba3a9084 100644
--- a/src/core/webview/ClineProvider.ts
+++ b/src/core/webview/ClineProvider.ts
@@ -948,69 +948,12 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 
 						try {
 							this.outputChannel.appendLine(`Attempting to delete MCP server: ${message.serverName}`)
-
-							const settingsPath = await this.mcpHub?.getMcpSettingsFilePath()
-							if (!settingsPath) {
-								throw new Error("Could not get MCP settings file path")
-							}
-
-							// Ensure the settings file exists and is accessible
-							try {
-								await fs.access(settingsPath)
-							} catch (error) {
-								this.outputChannel.appendLine("Settings file not accessible")
-								throw new Error("Settings file not accessible")
-							}
-
-							this.outputChannel.appendLine(`Reading MCP settings from: ${settingsPath}`)
-							const content = await fs.readFile(settingsPath, "utf-8")
-							const config = JSON.parse(content)
-
-							// Validate the config structure
-							if (!config || typeof config !== "object") {
-								throw new Error("Invalid config structure")
-							}
-
-							if (!config.mcpServers || typeof config.mcpServers !== "object") {
-								config.mcpServers = {}
-							}
-
-							// Remove the server from the settings
-							if (config.mcpServers[message.serverName]) {
-								this.outputChannel.appendLine(
-									`Removing server ${message.serverName} from configuration`,
-								)
-								delete config.mcpServers[message.serverName]
-
-								// Write the entire config back
-								const updatedConfig = {
-									mcpServers: config.mcpServers,
-								}
-
-								await fs.writeFile(settingsPath, JSON.stringify(updatedConfig, null, 2))
-
-								// Update server connections through McpHub
-								this.outputChannel.appendLine("Updating server connections")
-								await this.mcpHub?.updateServerConnections(config.mcpServers)
-
-								this.outputChannel.appendLine(`Successfully deleted MCP server: ${message.serverName}`)
-								vscode.window.showInformationMessage(`Deleted MCP server: ${message.serverName}`)
-							} else {
-								this.outputChannel.appendLine(`Server ${message.serverName} not found in configuration`)
-								vscode.window.showWarningMessage(
-									`Server "${message.serverName}" not found in configuration`,
-								)
-							}
+							await this.mcpHub?.deleteServer(message.serverName)
+							this.outputChannel.appendLine(`Successfully deleted MCP server: ${message.serverName}`)
 						} catch (error) {
-							console.error("Failed to delete MCP server:", error)
-							if (error instanceof Error) {
-								console.error("Error details:", error.message, error.stack)
-							}
 							const errorMessage = error instanceof Error ? error.message : String(error)
 							this.outputChannel.appendLine(`Failed to delete MCP server: ${errorMessage}`)
-							vscode.window.showErrorMessage(
-								`Failed to delete MCP server: ${error instanceof Error ? error.message : String(error)}`,
-							)
+							// Error messages are already handled by McpHub.deleteServer
 						}
 						break
 					}
diff --git a/src/services/mcp/McpHub.ts b/src/services/mcp/McpHub.ts
index 209df3dbe6..6e3f39fa7d 100644
--- a/src/services/mcp/McpHub.ts
+++ b/src/services/mcp/McpHub.ts
@@ -576,6 +576,59 @@ export class McpHub {
 		}
 	}
 
+	public async deleteServer(serverName: string): Promise<void> {
+		try {
+			const settingsPath = await this.getMcpSettingsFilePath()
+
+			// Ensure the settings file exists and is accessible
+			try {
+				await fs.access(settingsPath)
+			} catch (error) {
+				throw new Error("Settings file not accessible")
+			}
+
+			const content = await fs.readFile(settingsPath, "utf-8")
+			const config = JSON.parse(content)
+
+			// Validate the config structure
+			if (!config || typeof config !== "object") {
+				throw new Error("Invalid config structure")
+			}
+
+			if (!config.mcpServers || typeof config.mcpServers !== "object") {
+				config.mcpServers = {}
+			}
+
+			// Remove the server from the settings
+			if (config.mcpServers[serverName]) {
+				delete config.mcpServers[serverName]
+
+				// Write the entire config back
+				const updatedConfig = {
+					mcpServers: config.mcpServers,
+				}
+
+				await fs.writeFile(settingsPath, JSON.stringify(updatedConfig, null, 2))
+
+				// Update server connections
+				await this.updateServerConnections(config.mcpServers)
+
+				vscode.window.showInformationMessage(`Deleted MCP server: ${serverName}`)
+			} else {
+				vscode.window.showWarningMessage(`Server "${serverName}" not found in configuration`)
+			}
+		} catch (error) {
+			console.error("Failed to delete MCP server:", error)
+			if (error instanceof Error) {
+				console.error("Error details:", error.message, error.stack)
+			}
+			vscode.window.showErrorMessage(
+				`Failed to delete MCP server: ${error instanceof Error ? error.message : String(error)}`,
+			)
+			throw error
+		}
+	}
+
 	async readResource(serverName: string, uri: string): Promise<McpResourceResponse> {
 		const connection = this.connections.find((conn) => conn.server.name === serverName)
 		if (!connection) {