@opensumi/ide-ai-native 3.9.1-next-1747791726.0 → 3.9.1-next-1747829468.0

package/src/browser/chat/apply.service.ts

@@ -1,16 +1,6 @@
 import { Autowired, Injectable } from '@opensumi/di';
-import {
-  AIBackSerivcePath,
-  CancellationTokenSource,
-  IAIBackService,
-  IChatProgress,
-  URI,
-  path,
-} from '@opensumi/ide-core-browser';
-import { CommandService } from '@opensumi/ide-core-common/lib/command';
+import { AIBackSerivcePath, IAIBackService, IChatProgress, URI, path } from '@opensumi/ide-core-browser';
 import { IEditorDocumentModelService } from '@opensumi/ide-editor/lib/browser';
-import { CodeAction, CodeActionContext, CodeActionTriggerType, ICodeEditor } from '@opensumi/ide-monaco';
-import { languageFeaturesService } from '@opensumi/ide-monaco/lib/browser/monaco-api/languages';
 import { SumiReadableStream } from '@opensumi/ide-utils/lib/stream';
 import { Range } from '@opensumi/monaco-editor-core';
 
@@ -20,59 +10,8 @@ import { BaseApplyService } from '../mcp/base-apply.service';
 
 import { ChatProxyService } from './chat-proxy.service';
 
-/**
- * Filter code actions to only apply batch fixes
- * Skip individual fixes as consecutive WorkspaceEdits may interfere with each other
- * @param codeAction The code action to check
- * @returns boolean indicating if the action is auto-fixable
- */
-function isAutoFixable(codeAction: CodeAction): boolean {
-  return codeAction.title.toLowerCase().includes('all');
-}
-
 @Injectable()
 export class ApplyService extends BaseApplyService {
-  @Autowired(CommandService)
-  private commandService: CommandService;
-
-  protected async postApplyHandler(editor: ICodeEditor): Promise<void> {
-    const model = editor.getModel();
-    if (!model) {
-      return Promise.resolve();
-    }
-    const providers = languageFeaturesService.codeActionProvider.ordered(model);
-
-    if (!providers) {
-      return Promise.resolve();
-    }
-
-    const [provider] = providers;
-    const range = model.getFullModelRange();
-    const context: CodeActionContext = {
-      trigger: CodeActionTriggerType.Auto,
-    };
-    const ts = new CancellationTokenSource();
-    const actionList = await provider.provideCodeActions(model, range, context, ts.token);
-
-    // 提取所有可修复的代码操作
-    const fixableActions = actionList?.actions.filter(isAutoFixable) || [];
-
-    if (fixableActions.length === 0) {
-      return Promise.resolve();
-    }
-
-    // 执行所有可修复的代码操作
-    await Promise.allSettled(
-      fixableActions.map(async (action) => {
-        if (action.command) {
-          try {
-            await this.commandService.executeCommand(action.command.id, ...(action.command.arguments || []));
-          } catch (err) {}
-        }
-      }),
-    );
-  }
-
   @Autowired(IEditorDocumentModelService)
   private readonly modelService: IEditorDocumentModelService;
 

package/src/browser/mcp/base-apply.service.ts

@@ -63,8 +63,6 @@ export abstract class BaseApplyService extends WithEventBus {
 
   private currentSessionId?: string;
 
-  protected abstract postApplyHandler(editor: ICodeEditor): Promise<void>;
-
   constructor() {
     super();
     this.addDispose(
@@ -315,26 +313,10 @@ export abstract class BaseApplyService extends WithEventBus {
       );
       codeBlock.updatedCode = res.updatedCode;
       codeBlock.status = 'pending';
-
-      // apply 结果流式输出完成后，自动尝试修复代码中的 lint 错误
-      if (this.postApplyHandler && typeof this.postApplyHandler === 'function') {
-        try {
-          await this.postApplyHandler(result.group.codeEditor.monacoEditor);
-        } catch (error) {}
-      }
-
-      const textModel = result.group.codeEditor.monacoEditor.getModel();
-      const diagnosticInfos = this.getDiagnosticInfos(textModel!.uri.toString(), res.result?.rangesFromDiffHunk || []);
-
       // 用户实际接受的 apply 结果
-      if (res.result) {
-        codeBlock.applyResult = {
-          diff: res.result?.diff,
-          diagnosticInfos,
-        };
-      }
-
+      codeBlock.applyResult = res.result;
       this.updateCodeBlock(codeBlock);
+
       return codeBlock;
     } catch (err) {
       codeBlock.status = 'failed';
@@ -354,8 +336,8 @@ export abstract class BaseApplyService extends WithEventBus {
     codeBlock: CodeBlockData,
     updatedContentOrStream: string | SumiReadableStream<IChatProgress>,
     range?: Range,
-  ): Promise<{ result?: { diff: string; rangesFromDiffHunk: Range[] }; updatedCode: string }> {
-    const deferred = new Deferred<{ result?: { diff: string; rangesFromDiffHunk: Range[] }; updatedCode: string }>();
+  ): Promise<{ result?: { diff: string; diagnosticInfos: IMarker[] }; updatedCode: string }> {
+    const deferred = new Deferred<{ result?: { diff: string; diagnosticInfos: IMarker[] }; updatedCode: string }>();
     const inlineDiffController = InlineDiffController.get(editor)!;
     range = range || editor.getModel()!.getFullModelRange();
 
@@ -391,11 +373,7 @@ export abstract class BaseApplyService extends WithEventBus {
 
       this.listenPartialEdit(editor.getModel()!, codeBlock).then((result) => {
         if (result) {
-          const diagnosticInfos = this.getDiagnosticInfos(editor.getModel()!.uri.toString(), rangesFromDiffHunk);
-          codeBlock.applyResult = {
-            diff: result.diff,
-            diagnosticInfos,
-          };
+          codeBlock.applyResult = result;
         }
         this.updateCodeBlock(codeBlock);
         this.editorService.save(URI.file(path.join(this.appConfig.workspaceDir, codeBlock.relativePath)));
@@ -406,10 +384,11 @@ export abstract class BaseApplyService extends WithEventBus {
         updatedContent,
         codeBlock.relativePath,
       );
+      const diagnosticInfos = this.getDiagnosticInfos(editor.getModel()!.uri.toString(), rangesFromDiffHunk);
       deferred.resolve({
         result: {
           diff,
-          rangesFromDiffHunk,
+          diagnosticInfos,
         },
         updatedCode: updatedContent,
       });
@@ -555,7 +534,7 @@ export abstract class BaseApplyService extends WithEventBus {
   }
 
   protected listenPartialEdit(model: ITextModel, codeBlock: CodeBlockData) {
-    const deferred = new Deferred<{ diff: string; rangesFromDiffHunk: Range[] }>();
+    const deferred = new Deferred<{ diff: string; diagnosticInfos: IMarker[] }>();
     const uriString = model.uri.toString();
     const toDispose = this.inlineDiffService.onPartialEdit((event) => {
       if (
@@ -595,7 +574,7 @@ export abstract class BaseApplyService extends WithEventBus {
           });
           deferred.resolve({
             diff,
-            rangesFromDiffHunk,
+            diagnosticInfos,
           });
         } else {
           // 用户全部取消

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

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

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

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

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

@@ -111,11 +111,14 @@ export class GrepSearchTool implements MCPServerContribution {
       }
       deferred.resolve(results.join('\n\n'));
       const messages = this.chatInternalService.sessionModel.history.getMessages();
-      this.chatInternalService.sessionModel.history.setMessageAdditional(messages[messages.length - 1].id, {
-        [args.toolCallId]: {
-          files,
-        },
-      });
+      const messageId = messages[messages.length - 1]?.id;
+      if (messageId) {
+        this.chatInternalService.sessionModel.history.setMessageAdditional(messageId, {
+          [args.toolCallId]: {
+            files,
+          },
+        });
+      }
     });
     const text = await deferred.promise;
     return {

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

@@ -63,18 +63,21 @@ export class ListDirTool implements MCPServerContribution {
 
     // 设置消息的附加数据
     const messages = this.chatInternalService.sessionModel.history.getMessages();
-    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,
-        })),
-      },
-    });
+    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,
+          })),
+        },
+      });
+    }
 
     logger.appendLine(`Listed ${fileUris.length} files in directory "${args.relativeWorkspacePath}"`);
 

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

@@ -1,5 +1,6 @@
 // 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';
@@ -47,8 +48,6 @@ 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) => {