From 857eda72fd8ec19d132a35dbde545b538e93d660 Mon Sep 17 00:00:00 2001 From: Andrew Pareles Date: Fri, 30 May 2025 20:54:52 -0700 Subject: [PATCH 1/2] remove toolname prefix in sidebar and remove unused logic --- .../react/src/sidebar-tsx/SidebarChat.tsx | 3 +- .../contrib/void/common/mcpServiceTypes.ts | 6 +++ .../contrib/void/electron-main/mcpChannel.ts | 38 ++----------------- 3 files changed, 12 insertions(+), 35 deletions(-) diff --git a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx index 26b12cc8..9533958f 100644 --- a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx +++ b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx @@ -34,6 +34,7 @@ import ErrorBoundary from './ErrorBoundary.js'; import { ToolApprovalTypeSwitch } from '../void-settings-tsx/Settings.js'; import { persistentTerminalNameOfId } from '../../../terminalToolService.js'; +import { removeMCPToolNamePrefix } from '../../../../common/mcpServiceTypes.js'; @@ -1857,7 +1858,7 @@ const MCPToolWrapper = ({ toolMessage }: WrapperProps) => { const mcpService = accessor.get('IMCPService') const title = getTitle(toolMessage) - const desc1 = toolMessage.name + const desc1 = removeMCPToolNamePrefix(toolMessage.name) const icon = null diff --git a/src/vs/workbench/contrib/void/common/mcpServiceTypes.ts b/src/vs/workbench/contrib/void/common/mcpServiceTypes.ts index 170cb843..81fc716f 100644 --- a/src/vs/workbench/contrib/void/common/mcpServiceTypes.ts +++ b/src/vs/workbench/contrib/void/common/mcpServiceTypes.ts @@ -234,3 +234,9 @@ export interface MCPToolCallParams { toolName: string; params: Record; } + + + +export const removeMCPToolNamePrefix = (name: string) => { + return name.split('_').slice(1).join('_') +} diff --git a/src/vs/workbench/contrib/void/electron-main/mcpChannel.ts b/src/vs/workbench/contrib/void/electron-main/mcpChannel.ts index 7e1be86b..3877117f 100644 --- a/src/vs/workbench/contrib/void/electron-main/mcpChannel.ts +++ b/src/vs/workbench/contrib/void/electron-main/mcpChannel.ts @@ -13,7 +13,7 @@ import { Client } from '@modelcontextprotocol/sdk/client/index.js'; import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js'; import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js'; import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js'; -import { MCPConfigFileJSON, MCPConfigFileEntryJSON, MCPServer, RawMCPToolCall, MCPToolErrorResponse, MCPServerEventResponse, MCPToolCallParams } from '../common/mcpServiceTypes.js'; +import { MCPConfigFileJSON, MCPConfigFileEntryJSON, MCPServer, RawMCPToolCall, MCPToolErrorResponse, MCPServerEventResponse, MCPToolCallParams, removeMCPToolNamePrefix } from '../common/mcpServiceTypes.js'; import { Transport } from '@modelcontextprotocol/sdk/shared/transport.js'; import { CallToolResult } from '@modelcontextprotocol/sdk/types.js'; import { MCPUserStateOfName } from '../common/voidSettingsTypes.js'; @@ -310,7 +310,7 @@ export class MCPChannel implements IServerChannel { // Call the tool with the provided parameters const response = await client.callTool({ - name: toolName, + name: removeMCPToolNamePrefix(toolName), arguments: params }) const { content } = response as CallToolResult @@ -354,41 +354,11 @@ export class MCPChannel implements IServerChannel { const response = await this._callTool(serverName, toolName, params) return response } catch (err) { + let errorMessage: string; // Check if it's an MCP error with a code - if (err && typeof err === 'object' && 'code' in err) { - const errorCode = err.code; - const errorName = err.name || 'Unknown Error'; - const errorMsg = err.message || ''; - - // Map common JSON-RPC error codes to user-friendly messages - let codeDescription = ''; - switch (errorCode) { - case -32700: - codeDescription = 'Parse Error'; - break; - case -32600: - codeDescription = 'Invalid Request'; - break; - case -32601: - codeDescription = 'Method Not Found'; - break; - case -32602: - codeDescription = 'Invalid Parameters'; - break; - case -32603: - codeDescription = 'Internal Error'; - break; - default: - codeDescription = `Error Code ${errorCode}`; - } - - errorMessage = `${errorName} (${codeDescription})${errorMsg ? ': ' + errorMsg : ''}`; - } else if (err && typeof err === 'object' && 'message' in err) { - // Standard error with message - errorMessage = err.message; - } else if (typeof err === 'string') { + if (typeof err === 'string') { // String error errorMessage = err; } else { From 7feb9154dae79c1be7c73b9cd587b649e5c0b0c8 Mon Sep 17 00:00:00 2001 From: Andrew Pareles Date: Fri, 30 May 2025 21:02:21 -0700 Subject: [PATCH 2/2] err codes --- .../contrib/void/electron-main/mcpChannel.ts | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/void/electron-main/mcpChannel.ts b/src/vs/workbench/contrib/void/electron-main/mcpChannel.ts index 3877117f..37607c8e 100644 --- a/src/vs/workbench/contrib/void/electron-main/mcpChannel.ts +++ b/src/vs/workbench/contrib/void/electron-main/mcpChannel.ts @@ -357,8 +357,23 @@ export class MCPChannel implements IServerChannel { let errorMessage: string; + if (typeof err === 'object' && err !== null && err['code']) { + const code = err.code + let codeDescription = '' + if (code === -32700) + codeDescription = 'Parse Error'; + if (code === -32600) + codeDescription = 'Invalid Request'; + if (code === -32601) + codeDescription = 'Method Not Found'; + if (code === -32602) + codeDescription = 'Invalid Parameters'; + if (code === -32603) + codeDescription = 'Internal Error'; + errorMessage = `${codeDescription}. Full response:\n${JSON.stringify(err, null, 2)}` + } // Check if it's an MCP error with a code - if (typeof err === 'string') { + else if (typeof err === 'string') { // String error errorMessage = err; } else {