@opensumi/ide-ai-native 3.8.3-next-1745805174.0 → 3.8.3-next-1745835516.0

package/src/node/mcp-server.sse.ts

@@ -11,19 +11,20 @@ import { SSEClientTransportOptions } from '../common/types';
 global.EventSource = EventSource as any;
 export class SSEMCPServer implements IMCPServer {
   private name: string;
-  public serverHost: string;
+  public url: string;
   private transportOptions?: SSEClientTransportOptions;
   private client: Client;
   private started: boolean = false;
+  private toolNameMap: Map<string, string> = new Map(); // Map sanitized tool names to original names
 
   constructor(
     name: string,
-    serverHost: string,
+    url: string,
     private readonly logger?: ILogger,
     private readonly options?: SSEClientTransportOptions,
   ) {
     this.name = name;
-    this.serverHost = serverHost;
+    this.url = url;
     this.transportOptions = options;
   }
 
@@ -43,11 +44,11 @@ export class SSEMCPServer implements IMCPServer {
     if (this.started) {
       return;
     }
-    this.logger?.log(`Starting server "${this.name}" with serverHost: ${this.serverHost}`);
+    this.logger?.log(`Starting server "${this.name}" with url: ${this.url}`);
 
     const SSEClientTransport = (await import('@modelcontextprotocol/sdk/client/sse.js')).SSEClientTransport;
 
-    const transport = new SSEClientTransport(new URL(this.serverHost), this.transportOptions);
+    const transport = new SSEClientTransport(new URL(this.url), this.transportOptions);
 
     transport.onerror = (error) => {
       this.logger?.error('Transport Error:', error);
@@ -66,8 +67,13 @@ export class SSEMCPServer implements IMCPServer {
       this.logger?.error('Error in MCP client:', error);
     };
 
-    await this.client.connect(transport);
-    this.started = true;
+    try {
+      await this.client.connect(transport);
+      this.started = true;
+    } catch (error) {
+      this.logger?.error(`Error in startServer for ${this.name}:`, error);
+      throw error;
+    }
   }
 
   async callTool(toolName: string, toolCallId: string, arg_string: string) {
@@ -76,13 +82,15 @@ export class SSEMCPServer implements IMCPServer {
       args = JSON.parse(arg_string);
     } catch (error) {
       this.logger?.error(
-        `Failed to parse arguments for calling tool "${toolName}" in MCP server "${this.name}" with serverHost "${this.serverHost}".
+        `Failed to parse arguments for calling tool "${toolName}" in MCP server "${this.name}" with url "${this.url}".
                 Invalid JSON: ${arg_string}`,
         error,
       );
     }
+    // Convert sanitized tool name back to original name if it exists in the map
+    const originalToolName = this.toolNameMap.get(toolName) || toolName;
     const params = {
-      name: toolName,
+      name: originalToolName,
       arguments: args,
       toolCallId,
     };
@@ -90,13 +98,32 @@ export class SSEMCPServer implements IMCPServer {
   }
 
   async getTools() {
-    const tools = await this.client.listTools();
-    this.logger?.log(`Got tools from MCP server "${this.name}" with serverHost "${this.serverHost}":`, tools);
-    return tools;
+    const originalTools = await this.client.listTools();
+    this.toolNameMap.clear();
+    const toolsArray = originalTools.tools || [];
+    const sanitizedToolsArray = toolsArray.map((tool) => {
+      const originalName = tool.name;
+      // Remove Chinese characters from the tool name
+      // Claude 3.5+ Sonnet 不支持中文 Tool Name
+      const sanitizedName = originalName.replace(/[\u4e00-\u9fa5]/g, '');
+      // If the name changed, store the mapping
+      if (sanitizedName !== originalName) {
+        this.toolNameMap.set(sanitizedName, originalName);
+        return { ...tool, name: sanitizedName };
+      }
+      return tool;
+    });
+    const sanitizedTools = {
+      ...originalTools,
+      tools: sanitizedToolsArray,
+    };
+    this.logger?.log(`Got tools from MCP server "${this.name}" with url "${this.url}":`, sanitizedTools);
+    this.logger?.log('Tool name mapping: ', Object.fromEntries(this.toolNameMap));
+    return sanitizedTools;
   }
 
-  update(serverHost: string): void {
-    this.serverHost = serverHost;
+  update(url: string): void {
+    this.url = url;
   }
 
   async stop(): Promise<void> {

package/src/node/mcp-server.stdio.ts

@@ -14,6 +14,7 @@ export class StdioMCPServer implements IMCPServer {
   private client: Client;
   private env?: { [key: string]: string };
   private started: boolean = false;
+  private toolNameMap: Map<string, string> = new Map(); // Map sanitized tool names to original names
 
   constructor(
     name: string,
@@ -95,8 +96,10 @@ export class StdioMCPServer implements IMCPServer {
         error,
       );
     }
+    // Convert sanitized tool name back to original name if it exists in the map
+    const originalToolName = this.toolNameMap.get(toolName) || toolName;
     const params = {
-      name: toolName,
+      name: originalToolName,
       arguments: args,
       toolCallId,
     };
@@ -104,7 +107,28 @@ export class StdioMCPServer implements IMCPServer {
   }
 
   async getTools() {
-    return await this.client.listTools();
+    const originalTools = await this.client.listTools();
+    this.toolNameMap.clear();
+    // Process tool names to remove Chinese characters and create mapping
+    const toolsArray = originalTools.tools || [];
+    const sanitizedToolsArray = toolsArray.map((tool) => {
+      const originalName = tool.name;
+      // Remove Chinese characters from the tool name
+      // Claude 3.5+ Sonnet 不支持中文 Tool Name
+      const sanitizedName = originalName.replace(/[\u4e00-\u9fa5]/g, '');
+      if (sanitizedName !== originalName) {
+        this.toolNameMap.set(sanitizedName, originalName);
+        return { ...tool, name: sanitizedName };
+      }
+      return tool;
+    });
+    const sanitizedTools = {
+      ...originalTools,
+      tools: sanitizedToolsArray,
+    };
+    this.logger?.log(`Got tools from MCP server "${this.name}":`, sanitizedTools);
+    this.logger?.log('Tool name mapping: ', Object.fromEntries(this.toolNameMap));
+    return sanitizedTools;
   }
 
   update(command: string, args?: string[], env?: { [key: string]: string }): void {