scriptoriumadmin/Roo-Code
1
0
Fork 0
mirror of https://github.com/RooVetGit/Roo-Code.git synced 2026-08-28 05:27:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Does that work?

Browse source
This commit is contained in:
Roo Code 2025-02-18 21:16:16 -07:00
parent 7bb8edf720
commit bfa73fb69d
2 changed files with 56 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
src/core/webview/ClineProvider.ts
View file

@ -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
}

53
src/services/mcp/McpHub.ts
View file

@ -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) {