@opensumi/ide-ai-native 3.9.1-next-1749204089.0 → 3.9.1-next-1749538805.0

package/src/browser/layout/ai-layout.tsx

@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react';
 
-import { SlotRenderer, useInjectable } from '@opensumi/ide-core-browser';
+import { SlotLocation, SlotRenderer, useInjectable } from '@opensumi/ide-core-browser';
 import { BoxPanel, SplitPanel, getStorageValue } from '@opensumi/ide-core-browser/lib/components';
 import { DesignLayoutConfig } from '@opensumi/ide-core-browser/lib/layout/constants';
 
@@ -32,9 +32,9 @@ export const AILayout = () => {
           resizeHandleClassName={'design-slot_resize_horizontal'}
         >
           <SlotRenderer
-            slot='left'
+            slot={SlotLocation.view}
             isTabbar={true}
-            defaultSize={layout.left?.currentId ? layout.left?.size || 310 : 49}
+            defaultSize={layout[SlotLocation.view]?.currentId ? layout[SlotLocation.view]?.size || 310 : 49}
             minResize={280}
             minSize={49}
           />
@@ -42,16 +42,20 @@ export const AILayout = () => {
             <SlotRenderer flex={2} flexGrow={1} minResize={200} slot='main' />
             <SlotRenderer
               flex={1}
-              defaultSize={layout.bottom?.currentId ? layout.bottom?.size : 24}
+              defaultSize={layout[SlotLocation.panel]?.currentId ? layout[SlotLocation.panel]?.size : 24}
               minResize={160}
-              slot='bottom'
+              slot={SlotLocation.panel}
               isTabbar={true}
             />
           </SplitPanel>
           <SlotRenderer
-            slot='right'
+            slot={SlotLocation.extendView}
             isTabbar={true}
-            defaultSize={layout.right?.currentId ? layout.right?.size || 360 : defaultRightSize}
+            defaultSize={
+              layout[SlotLocation.extendView]?.currentId
+                ? layout[SlotLocation.extendView]?.size || 360
+                : defaultRightSize
+            }
             minResize={280}
             minSize={defaultRightSize}
           />
@@ -59,7 +63,7 @@ export const AILayout = () => {
         <SlotRenderer
           slot={AI_CHAT_VIEW_ID}
           isTabbar={true}
-          defaultSize={layout.AI_Chat?.currentId ? layout.AI_Chat?.size || 360 : 0}
+          defaultSize={layout['AI-Chat']?.currentId ? layout['AI-Chat']?.size || 360 : 0}
           maxResize={420}
           minResize={280}
           minSize={0}

package/src/browser/layout/tabbar.view.tsx

@@ -1,5 +1,5 @@
 import cls from 'classnames';
-import React, { useCallback, useEffect, useMemo } from 'react';
+import React, { useCallback, useMemo } from 'react';
 
 import {
   ComponentRegistryInfo,
@@ -29,25 +29,18 @@ import {
   TabbarViewBase,
 } from '@opensumi/ide-main-layout/lib/browser/tabbar/bar.view';
 import { BaseTabPanelView, ContainerView } from '@opensumi/ide-main-layout/lib/browser/tabbar/panel.view';
-import { TabRendererBase, TabbarConfig } from '@opensumi/ide-main-layout/lib/browser/tabbar/renderer.view';
+import { TabRendererBase } from '@opensumi/ide-main-layout/lib/browser/tabbar/renderer.view';
 import { TabbarService, TabbarServiceFactory } from '@opensumi/ide-main-layout/lib/browser/tabbar/tabbar.service';
 
 import { AI_CHAT_VIEW_ID } from '../../common';
 
 import styles from './layout.module.less';
 
-const ChatTabbarRenderer: React.FC = () => {
-  const { side } = React.useContext(TabbarConfig);
-  const tabbarService: TabbarService = useInjectable(TabbarServiceFactory)(side);
-  useEffect(() => {
-    tabbarService.setIsLatter(true);
-  }, [tabbarService]);
-  return (
-    <div style={{ width: 0 }}>
-      <TabbarViewBase tabSize={0} MoreTabView={IconElipses} TabView={IconTabView} barSize={0} panelBorderSize={1} />
-    </div>
-  );
-};
+const ChatTabbarRenderer: React.FC = () => (
+  <div style={{ width: 0 }}>
+    <TabbarViewBase tabSize={0} MoreTabView={IconElipses} TabView={IconTabView} barSize={0} panelBorderSize={0} />
+  </div>
+);
 
 export const AIChatTabRenderer = ({
   className,
@@ -110,7 +103,7 @@ export const AILeftTabRenderer = ({
 const AILeftTabbarRenderer: React.FC = () => {
   const layoutService = useInjectable<IMainLayoutService>(IMainLayoutService);
 
-  const tabbarService: TabbarService = useInjectable(TabbarServiceFactory)(SlotLocation.right);
+  const tabbarService: TabbarService = useInjectable(TabbarServiceFactory)(SlotLocation.extendView);
   const currentContainerId = useAutorun(tabbarService.currentContainerId);
 
   const extraMenus = React.useMemo(() => layoutService.getExtraMenu(), [layoutService]);
@@ -154,14 +147,8 @@ const AILeftTabbarRenderer: React.FC = () => {
   );
 };
 
-export const AIRightTabRenderer = ({
-  className,
-  components,
-}: {
-  className: string;
-  components: ComponentRegistryInfo[];
-}) => {
-  const tabbarService: TabbarService = useInjectable(TabbarServiceFactory)(SlotLocation.right);
+export const AIRightTabRenderer = ({ components }: { className: string; components: ComponentRegistryInfo[] }) => {
+  const tabbarService: TabbarService = useInjectable(TabbarServiceFactory)(SlotLocation.extendView);
   const designLayoutConfig = useInjectable<DesignLayoutConfig>(DesignLayoutConfig);
 
   const handleClose = useCallback(() => {

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

@@ -8,7 +8,6 @@ import {
   AppConfig,
   IAIReporter,
   IChatProgress,
-  IMarker,
   MarkerSeverity,
   OnEvent,
   WithEventBus,
@@ -63,6 +62,8 @@ export abstract class BaseApplyService extends WithEventBus {
 
   private currentSessionId?: string;
 
+  protected abstract postApplyHandler(editor: ICodeEditor): Promise<void>;
+
   constructor() {
     super();
     this.addDispose(
@@ -313,10 +314,26 @@ 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 结果
-      codeBlock.applyResult = res.result;
-      this.updateCodeBlock(codeBlock);
+      if (res.result) {
+        codeBlock.applyResult = {
+          diff: res.result?.diff,
+          diagnosticInfos,
+        };
+      }
 
+      this.updateCodeBlock(codeBlock);
       return codeBlock;
     } catch (err) {
       codeBlock.status = 'failed';
@@ -336,8 +353,8 @@ export abstract class BaseApplyService extends WithEventBus {
     codeBlock: CodeBlockData,
     updatedContentOrStream: string | SumiReadableStream<IChatProgress>,
     range?: Range,
-  ): Promise<{ result?: { diff: string; diagnosticInfos: IMarker[] }; updatedCode: string }> {
-    const deferred = new Deferred<{ result?: { diff: string; diagnosticInfos: IMarker[] }; updatedCode: string }>();
+  ): Promise<{ result?: { diff: string; rangesFromDiffHunk: Range[] }; updatedCode: string }> {
+    const deferred = new Deferred<{ result?: { diff: string; rangesFromDiffHunk: Range[] }; updatedCode: string }>();
     const inlineDiffController = InlineDiffController.get(editor)!;
     range = range || editor.getModel()!.getFullModelRange();
 
@@ -373,7 +390,11 @@ export abstract class BaseApplyService extends WithEventBus {
 
       this.listenPartialEdit(editor.getModel()!, codeBlock).then((result) => {
         if (result) {
-          codeBlock.applyResult = result;
+          const diagnosticInfos = this.getDiagnosticInfos(editor.getModel()!.uri.toString(), rangesFromDiffHunk);
+          codeBlock.applyResult = {
+            diff: result.diff,
+            diagnosticInfos,
+          };
         }
         this.updateCodeBlock(codeBlock);
         this.editorService.save(URI.file(path.join(this.appConfig.workspaceDir, codeBlock.relativePath)));
@@ -384,11 +405,10 @@ export abstract class BaseApplyService extends WithEventBus {
         updatedContent,
         codeBlock.relativePath,
       );
-      const diagnosticInfos = this.getDiagnosticInfos(editor.getModel()!.uri.toString(), rangesFromDiffHunk);
       deferred.resolve({
         result: {
           diff,
-          diagnosticInfos,
+          rangesFromDiffHunk,
         },
         updatedCode: updatedContent,
       });
@@ -534,7 +554,7 @@ export abstract class BaseApplyService extends WithEventBus {
   }
 
   protected listenPartialEdit(model: ITextModel, codeBlock: CodeBlockData) {
-    const deferred = new Deferred<{ diff: string; diagnosticInfos: IMarker[] }>();
+    const deferred = new Deferred<{ diff: string; rangesFromDiffHunk: Range[] }>();
     const uriString = model.uri.toString();
     const toDispose = this.inlineDiffService.onPartialEdit((event) => {
       if (
@@ -574,7 +594,7 @@ export abstract class BaseApplyService extends WithEventBus {
           });
           deferred.resolve({
             diff,
-            diagnosticInfos,
+            rangesFromDiffHunk,
           });
         } else {
           // 用户全部取消

package/src/browser/mcp/mcp-server-proxy.service.ts

@@ -5,7 +5,8 @@ import { ILogger } from '@opensumi/ide-core-browser';
 import { Emitter, Event } from '@opensumi/ide-core-common';
 
 import { BUILTIN_MCP_SERVER_NAME, ISumiMCPServerBackend, SumiMCPServerProxyServicePath } from '../../common';
-import { IMCPServerProxyService } from '../../common/types';
+import { ImageCompressionOptions, compressToolResultSmart } from '../../common/image-compression';
+import { IMCPServerProxyService, IMCPToolResult } from '../../common/types';
 import { IMCPServerRegistry, TokenMCPServerRegistry } from '../types';
 
 @Injectable()
@@ -64,4 +65,8 @@ export class MCPServerProxyService implements IMCPServerProxyService {
   async $stopServer(serverName: string) {
     await this.sumiMCPServerProxyService.$stopServer(serverName);
   }
+
+  async $compressToolResult(result: IMCPToolResult, options: ImageCompressionOptions) {
+    return compressToolResultSmart(result, options);
+  }
 }

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/createNewFileWithText.ts

@@ -1,30 +1,27 @@
 import { z } from 'zod';
 
 import { Autowired } from '@opensumi/di';
-import { Domain, URI, path } from '@opensumi/ide-core-common';
-import { IFileServiceClient } from '@opensumi/ide-file-service';
-import { IWorkspaceService } from '@opensumi/ide-workspace';
+import { Domain } from '@opensumi/ide-core-common';
 
 import { IMCPServerRegistry, MCPLogger, MCPServerContribution, MCPToolDefinition } from '../../types';
-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'),
-});
+import { CreateNewFileWithTextHandler } from './handlers/CreateNewFileWithText';
+
+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,
+  }));
 
 @Domain(MCPServerContribution)
 export class CreateNewFileWithTextTool implements MCPServerContribution {
-  @Autowired(IWorkspaceService)
-  private readonly workspaceService: IWorkspaceService;
-
-  @Autowired(IFileServiceClient)
-  private readonly fileService: IFileServiceClient;
-
-  @Autowired(BaseApplyService)
-  private applyService: BaseApplyService;
+  @Autowired(CreateNewFileWithTextHandler)
+  private readonly createNewFileWithTextHandler: CreateNewFileWithTextHandler;
 
   registerMCPServer(registry: IMCPServerRegistry): void {
     registry.registerMCPTool(this.getToolDefinition());
@@ -50,36 +47,10 @@ export class CreateNewFileWithTextTool implements MCPServerContribution {
 
   private async handler(args: z.infer<typeof inputSchema> & { toolCallId: string }, logger: MCPLogger) {
     try {
-      // 获取工作区根目录
-      const workspaceRoots = this.workspaceService.tryGetRoots();
-      if (!workspaceRoots || workspaceRoots.length === 0) {
-        logger.appendLine('Error: Cannot determine project directory');
-        return {
-          content: [{ type: 'text', text: "can't find project dir" }],
-          isError: true,
-        };
-      }
-
-      // 构建完整的文件路径
-      const rootUri = URI.parse(workspaceRoots[0].uri);
-      const fullPath = path.join(rootUri.codeUri.fsPath, args.target_file);
-      const fileUri = URI.file(fullPath);
-
-      // 创建父目录
-      const parentDir = path.dirname(fullPath);
-      const parentUri = URI.file(parentDir);
-      await this.fileService.createFolder(parentUri.toString());
-
-      // 创建文件
-      await this.fileService.createFile(fileUri.toString());
-
-      // 使用 applyService 写入文件内容
-      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.target_file}`);
+      await this.createNewFileWithTextHandler.handler(args, args.toolCallId);
+      logger.appendLine(`Successfully created file at: ${args.targetFile}`);
       return {
-        content: [{ type: 'text', text: 'ok' }],
+        content: [{ type: 'text', text: 'create file with text success' }],
       };
     } catch (error) {
       logger.appendLine(`Error during file creation: ${error}`);

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/getDiagnosticsByPath.ts

@@ -2,7 +2,7 @@ import * as path from 'path';
 
 import { z } from 'zod';
 
-import { Autowired, Injectable } from '@opensumi/di';
+import { Autowired } from '@opensumi/di';
 import { Domain, URI } from '@opensumi/ide-core-common';
 import { IWorkspaceService } from '@opensumi/ide-workspace';
 import { URI as MonacoURI } from '@opensumi/monaco-editor-core/esm/vs/base/common/uri';

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

@@ -2,7 +2,7 @@ import * as path from 'path';
 
 import { z } from 'zod';
 
-import { Autowired, Injectable } from '@opensumi/di';
+import { Autowired } from '@opensumi/di';
 import { Domain, URI } from '@opensumi/ide-core-common';
 import { WorkbenchEditorService } from '@opensumi/ide-editor';
 import { IWorkspaceService } from '@opensumi/ide-workspace';

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

@@ -12,19 +12,27 @@ 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.'),
-});
+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 MAX_RESULTS = 50;
 
@@ -72,9 +80,9 @@ export class GrepSearchTool implements MCPServerContribution {
     await this.searchService.doSearch(
       searchPattern,
       {
-        isMatchCase: !!args.case_sensitive,
-        include: args.include_pattern?.split(','),
-        exclude: args.exclude_pattern?.split(','),
+        isMatchCase: !!args.caseSensitive,
+        include: args.includePattern?.split(','),
+        exclude: args.excludePattern?.split(','),
         maxResults: MAX_RESULTS,
         isUseRegexp: true,
         isToggleOpen: false,
@@ -111,11 +119,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/handlers/CreateNewFileWithText.ts

@@ -0,0 +1,49 @@
+import { Autowired, Injectable } from '@opensumi/di';
+import { URI, path } from '@opensumi/ide-core-common';
+import { IFileServiceClient } from '@opensumi/ide-file-service';
+import { IWorkspaceService } from '@opensumi/ide-workspace';
+
+import { CodeBlockData } from '../../../../common/types';
+import { BaseApplyService } from '../../base-apply.service';
+
+/**
+ * 创建新文件处理器
+ * 用于处理创建新文件并写入内容的操作
+ */
+@Injectable()
+export class CreateNewFileWithTextHandler {
+  @Autowired(IWorkspaceService)
+  private readonly workspaceService: IWorkspaceService;
+
+  @Autowired(IFileServiceClient)
+  private readonly fileService: IFileServiceClient;
+
+  @Autowired(BaseApplyService)
+  private applyService: BaseApplyService;
+
+  async handler(params: { targetFile: string; codeEdit: string }, toolCallId: string): Promise<CodeBlockData> {
+    // 获取工作区根目录
+    const workspaceRoots = this.workspaceService.tryGetRoots();
+    if (!workspaceRoots || workspaceRoots.length === 0) {
+      throw new Error("can't find project dir");
+    }
+
+    // 构建完整的文件路径
+    const rootUri = URI.parse(workspaceRoots[0].uri);
+    const fullPath = path.join(rootUri.codeUri.fsPath, params.targetFile);
+    const fileUri = URI.file(fullPath);
+
+    // 创建父目录
+    const parentDir = path.dirname(fullPath);
+    const parentUri = URI.file(parentDir);
+    await this.fileService.createFolder(parentUri.toString());
+
+    // 创建文件
+    await this.fileService.createFile(fileUri.toString());
+
+    // 使用 applyService 写入文件内容
+    const codeBlock = await this.applyService.registerCodeBlock(params.targetFile, params.codeEdit, toolCallId);
+    await this.applyService.apply(codeBlock);
+    return codeBlock;
+  }
+}

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

@@ -1,5 +1,5 @@
 import { Autowired, Injectable } from '@opensumi/di';
-import { AppConfig, Throttler, URI } from '@opensumi/ide-core-browser';
+import { AppConfig, URI, path } from '@opensumi/ide-core-browser';
 import { IFileServiceClient } from '@opensumi/ide-file-service';
 
 /**
@@ -67,7 +67,7 @@ export class ListDirHandler {
     }
 
     // 解析相对路径
-    const absolutePath = `${this.appConfig.workspaceDir}/${relativeWorkspacePath}`;
+    const absolutePath = path.join(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 } from '@opensumi/ide-core-common';
+import { CancellationToken, URI, path } 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(`${this.appConfig.workspaceDir}/${fileParams.relativeWorkspacePath}`);
+    const uri = new URI(path.join(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,18 +13,25 @@ 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.",
-    ),
-});
+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,
+  }));
 
 @Injectable()
 export class RunCommandHandler {
@@ -66,7 +73,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.require_user_approval)) {
+    if (this.isAlwaysApproval(args.requireUserApproval)) {
       const def = new Deferred<boolean>();
       this.approvalDeferredMap.set(args.toolCallId, def);
       const approval = await def.promise;
@@ -93,7 +100,7 @@ export class RunCommandHandler {
     const result: { type: string; text: string }[] = [];
     const def = new Deferred<{ isError?: boolean; content: { type: string; text: string }[] }>();
 
-    if (args.is_background) {
+    if (args.isBackground) {
       def.resolve({
         isError: false,
         content: [{ type: 'text', text: `Successful run command ${args.command} in background.` }],

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/browser/mcp/tools/runTerminalCmd.ts

@@ -2,7 +2,7 @@ import { z } from 'zod';
 
 import { Autowired } from '@opensumi/di';
 import { AppConfig } from '@opensumi/ide-core-browser';
-import { Deferred, Domain } from '@opensumi/ide-core-common';
+import { Domain } from '@opensumi/ide-core-common';
 import { ITerminalController, ITerminalGroupViewService } from '@opensumi/ide-terminal-next/lib/common/controller';
 
 import { IMCPServerRegistry, MCPLogger, MCPServerContribution, MCPToolDefinition } from '../../types';