@opensumi/ide-ai-native 3.9.1-next-1747897586.0 → 3.9.1-next-1747917815.0

package/src/browser/components/ChatEditor.tsx

@@ -25,7 +25,7 @@ import {
   localize,
   runWhenIdle,
 } from '@opensumi/ide-core-common';
-import { insertSnippetWithMonacoEditor } from '@opensumi/ide-editor/lib/browser/editor-collection.service';
+import { insertSnippetWithMonacoEditor } from '@opensumi/ide-editor/lib/browser/base-editor-wrapper';
 import { MonacoCommandRegistry } from '@opensumi/ide-editor/lib/browser/monaco-contrib/command/command.service';
 import { ITheme, IThemeService } from '@opensumi/ide-theme';
 import { WorkbenchThemeService } from '@opensumi/ide-theme/lib/browser/workbench.theme.service';

package/src/browser/mcp/mcp-server.feature.registry.ts

@@ -44,12 +44,7 @@ export class MCPServerRegistry implements IMCPServerRegistry {
   }
 
   registerMCPTool(tool: MCPToolDefinition): void {
-    const existingIndex = this.tools.findIndex((t) => t.name === tool.name);
-    if (existingIndex !== -1) {
-      this.tools[existingIndex] = tool;
-    } else {
-      this.tools.push(tool);
-    }
+    this.tools.push(tool);
   }
 
   registerToolComponent(

package/src/browser/mcp/tools/createNewFileWithText.ts

@@ -10,15 +10,10 @@ import { BaseApplyService } from '../base-apply.service';
 
 import { EditFileToolComponent } from './components/EditFile';
 
-const inputSchema = z
-  .object({
-    target_file: z.string().describe('The relative path where the file should be created'),
-    code_edit: z.string().describe('The content to write into the new file'),
-  })
-  .transform((data) => ({
-    targetFile: data.target_file,
-    codeEdit: data.code_edit,
-  }));
+const inputSchema = z.object({
+  target_file: z.string().describe('The relative path where the file should be created'),
+  code_edit: z.string().describe('The content to write into the new file'),
+});
 
 @Domain(MCPServerContribution)
 export class CreateNewFileWithTextTool implements MCPServerContribution {
@@ -67,7 +62,7 @@ export class CreateNewFileWithTextTool implements MCPServerContribution {
 
       // 构建完整的文件路径
       const rootUri = URI.parse(workspaceRoots[0].uri);
-      const fullPath = path.join(rootUri.codeUri.fsPath, args.targetFile);
+      const fullPath = path.join(rootUri.codeUri.fsPath, args.target_file);
       const fileUri = URI.file(fullPath);
 
       // 创建父目录
@@ -79,10 +74,10 @@ export class CreateNewFileWithTextTool implements MCPServerContribution {
       await this.fileService.createFile(fileUri.toString());
 
       // 使用 applyService 写入文件内容
-      const codeBlock = await this.applyService.registerCodeBlock(args.targetFile, args.codeEdit, args.toolCallId);
+      const codeBlock = await this.applyService.registerCodeBlock(args.target_file, args.code_edit, args.toolCallId);
       await this.applyService.apply(codeBlock);
 
-      logger.appendLine(`Successfully created file at: ${args.targetFile}`);
+      logger.appendLine(`Successfully created file at: ${args.target_file}`);
       return {
         content: [{ type: 'text', text: 'ok' }],
       };

package/src/browser/mcp/tools/fileSearch.ts

@@ -80,14 +80,11 @@ export class FileSearchTool implements MCPServerContribution {
     });
 
     const messages = this.chatInternalService.sessionModel.history.getMessages();
-    const messageId = messages[messages.length - 1]?.id;
-    if (messageId) {
-      this.chatInternalService.sessionModel.history.setMessageAdditional(messageId, {
-        [args.toolCallId]: {
-          files,
-        },
-      });
-    }
+    this.chatInternalService.sessionModel.history.setMessageAdditional(messages[messages.length - 1].id, {
+      [args.toolCallId]: {
+        files,
+      },
+    });
 
     logger.appendLine(`Found ${files.length} files matching "${args.query}"`);
 

package/src/browser/mcp/tools/grepSearch.ts

@@ -12,27 +12,19 @@ import { IMCPServerRegistry, MCPLogger, MCPServerContribution, MCPToolDefinition
 
 import { GrepSearchToolComponent } from './components/ExpandableFileList';
 
-const inputSchema = z
-  .object({
-    query: z.string().describe('The regex pattern to search for'),
-    case_sensitive: z.boolean().optional().describe('Whether the search should be case sensitive'),
-    include_pattern: z
-      .string()
-      .optional()
-      .describe('Glob pattern for files to include (e.g. "*.ts" for TypeScript files)'),
-    exclude_pattern: z.string().optional().describe('Glob pattern for files to exclude'),
-    explanation: z
-      .string()
-      .optional()
-      .describe('One sentence explanation as to why this tool is being used, and how it contributes to the goal.'),
-  })
-  .transform((data) => ({
-    query: data.query,
-    caseSensitive: data.case_sensitive,
-    includePattern: data.include_pattern,
-    excludePattern: data.exclude_pattern,
-    explanation: data.explanation,
-  }));
+const inputSchema = z.object({
+  query: z.string().describe('The regex pattern to search for'),
+  case_sensitive: z.boolean().optional().describe('Whether the search should be case sensitive'),
+  include_pattern: z
+    .string()
+    .optional()
+    .describe('Glob pattern for files to include (e.g. "*.ts" for TypeScript files)'),
+  exclude_pattern: z.string().optional().describe('Glob pattern for files to exclude'),
+  explanation: z
+    .string()
+    .optional()
+    .describe('One sentence explanation as to why this tool is being used, and how it contributes to the goal.'),
+});
 
 const MAX_RESULTS = 50;
 
@@ -80,9 +72,9 @@ export class GrepSearchTool implements MCPServerContribution {
     await this.searchService.doSearch(
       searchPattern,
       {
-        isMatchCase: !!args.caseSensitive,
-        include: args.includePattern?.split(','),
-        exclude: args.excludePattern?.split(','),
+        isMatchCase: !!args.case_sensitive,
+        include: args.include_pattern?.split(','),
+        exclude: args.exclude_pattern?.split(','),
         maxResults: MAX_RESULTS,
         isUseRegexp: true,
         isToggleOpen: false,
@@ -119,14 +111,11 @@ export class GrepSearchTool implements MCPServerContribution {
       }
       deferred.resolve(results.join('\n\n'));
       const messages = this.chatInternalService.sessionModel.history.getMessages();
-      const messageId = messages[messages.length - 1]?.id;
-      if (messageId) {
-        this.chatInternalService.sessionModel.history.setMessageAdditional(messageId, {
-          [args.toolCallId]: {
-            files,
-          },
-        });
-      }
+      this.chatInternalService.sessionModel.history.setMessageAdditional(messages[messages.length - 1].id, {
+        [args.toolCallId]: {
+          files,
+        },
+      });
     });
     const text = await deferred.promise;
     return {

package/src/browser/mcp/tools/handlers/ListDir.ts

@@ -1,5 +1,5 @@
 import { Autowired, Injectable } from '@opensumi/di';
-import { AppConfig, URI, path } from '@opensumi/ide-core-browser';
+import { AppConfig, Throttler, URI } from '@opensumi/ide-core-browser';
 import { IFileServiceClient } from '@opensumi/ide-file-service';
 
 /**
@@ -67,7 +67,7 @@ export class ListDirHandler {
     }
 
     // 解析相对路径
-    const absolutePath = path.join(this.appConfig.workspaceDir, relativeWorkspacePath);
+    const absolutePath = `${this.appConfig.workspaceDir}/${relativeWorkspacePath}`;
     const fileStat = await this.fileSystemService.getFileStat(absolutePath, true);
     // 验证路径有效性
     if (!fileStat || !fileStat.isDirectory) {

package/src/browser/mcp/tools/handlers/ReadFile.ts

@@ -1,7 +1,7 @@
 import { Autowired, Injectable } from '@opensumi/di';
 import { FileSearchQuickCommandHandler } from '@opensumi/ide-addons/lib/browser/file-search.contribution';
 import { AppConfig } from '@opensumi/ide-core-browser';
-import { CancellationToken, URI, path } from '@opensumi/ide-core-common';
+import { CancellationToken, URI } from '@opensumi/ide-core-common';
 import { IEditorDocumentModelRef, IEditorDocumentModelService } from '@opensumi/ide-editor/lib/browser';
 import { IFileServiceClient } from '@opensumi/ide-file-service';
 
@@ -107,7 +107,7 @@ export class FileHandler {
       throw new Error('No read file parameters provided. Need to give at least the path.');
     }
 
-    const uri = new URI(path.join(this.appConfig.workspaceDir, fileParams.relativeWorkspacePath));
+    const uri = new URI(`${this.appConfig.workspaceDir}/${fileParams.relativeWorkspacePath}`);
     if (!uri) {
       const similarFiles = await this.findSimilarFiles(fileParams.relativeWorkspacePath, 3);
       throw this.createFileNotFoundError(fileParams.relativeWorkspacePath, similarFiles);

package/src/browser/mcp/tools/handlers/RunCommand.ts

@@ -13,25 +13,18 @@ const color = {
   reset: '\x1b[0m',
 };
 
-export const inputSchema = z
-  .object({
-    command: z.string().describe('The terminal command to execute'),
-    is_background: z.boolean().describe('Whether the command should be run in the background'),
-    explanation: z
-      .string()
-      .describe('One sentence explanation as to why this command needs to be run and how it contributes to the goal.'),
-    require_user_approval: z
-      .boolean()
-      .describe(
-        "Whether the user must approve the command before it is executed. Only set this to false if the command is safe and if it matches the user's requirements for commands that should be executed automatically.",
-      ),
-  })
-  .transform((data) => ({
-    command: data.command,
-    isBackground: data.is_background,
-    explanation: data.explanation,
-    requireUserApproval: data.require_user_approval,
-  }));
+export const inputSchema = z.object({
+  command: z.string().describe('The terminal command to execute'),
+  is_background: z.boolean().describe('Whether the command should be run in the background'),
+  explanation: z
+    .string()
+    .describe('One sentence explanation as to why this command needs to be run and how it contributes to the goal.'),
+  require_user_approval: z
+    .boolean()
+    .describe(
+      "Whether the user must approve the command before it is executed. Only set this to false if the command is safe and if it matches the user's requirements for commands that should be executed automatically.",
+    ),
+});
 
 @Injectable()
 export class RunCommandHandler {
@@ -73,7 +66,7 @@ export class RunCommandHandler {
 
   async handler(args: z.infer<typeof inputSchema> & { toolCallId: string }, logger: MCPLogger) {
     logger.appendLine(`Executing command: ${args.command}`);
-    if (this.isAlwaysApproval(args.requireUserApproval)) {
+    if (this.isAlwaysApproval(args.require_user_approval)) {
       const def = new Deferred<boolean>();
       this.approvalDeferredMap.set(args.toolCallId, def);
       const approval = await def.promise;
@@ -100,7 +93,7 @@ export class RunCommandHandler {
     const result: { type: string; text: string }[] = [];
     const def = new Deferred<{ isError?: boolean; content: { type: string; text: string }[] }>();
 
-    if (args.isBackground) {
+    if (args.is_background) {
       def.resolve({
         isError: false,
         content: [{ type: 'text', text: `Successful run command ${args.command} in background.` }],

package/src/browser/mcp/tools/listDir.ts

@@ -63,21 +63,18 @@ export class ListDirTool implements MCPServerContribution {
 
     // 设置消息的附加数据
     const messages = this.chatInternalService.sessionModel.history.getMessages();
-    const messageId = messages[messages.length - 1]?.id;
-    if (messageId) {
-      this.chatInternalService.sessionModel.history.setMessageAdditional(messageId, {
-        [args.toolCallId]: {
-          files: fileUris,
-          title: `Listed directory "${args.relativeWorkspacePath}"`,
-          details: result.files.map((file) => ({
-            type: file.isDirectory ? 'dir' : 'file',
-            name: file.name,
-            info: file.isDirectory ? `${file.numChildren ?? '?'} items` : `${file.size}KB, ${file.numLines} lines`,
-            lastModified: file.lastModified,
-          })),
-        },
-      });
-    }
+    this.chatInternalService.sessionModel.history.setMessageAdditional(messages[messages.length - 1].id, {
+      [args.toolCallId]: {
+        files: fileUris,
+        title: `Listed directory "${args.relativeWorkspacePath}"`,
+        details: result.files.map((file) => ({
+          type: file.isDirectory ? 'dir' : 'file',
+          name: file.name,
+          info: file.isDirectory ? `${file.numChildren ?? '?'} items` : `${file.size}KB, ${file.numLines} lines`,
+          lastModified: file.lastModified,
+        })),
+      },
+    });
 
     logger.appendLine(`Listed ${fileUris.length} files in directory "${args.relativeWorkspacePath}"`);
 

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

@@ -1,6 +1,5 @@
 // have to import with extension since the exports map is ./* -> ./dist/cjs/*
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
 import { EventSource } from 'eventsource';
 
 import { ILogger } from '@opensumi/ide-core-common';
@@ -48,6 +47,8 @@ export class SSEMCPServer implements IMCPServer {
     }
     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.url), this.transportOptions);
 
     transport.onerror = (error) => {