@opensumi/ide-ai-native 3.8.1-next-1741228774.0 → 3.8.1-next-1741250387.0

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

@@ -1,8 +1,7 @@
 // OpenSumi as MCP Server 前端的代理服务
 import { Autowired, Injectable } from '@opensumi/di';
-import { AIServiceType, IAIReporter, ILogger } from '@opensumi/ide-core-common';
+import { ILogger } from '@opensumi/ide-core-common';
 
-import { BUILTIN_MCP_SERVER_NAME } from '../../common';
 import { getToolName } from '../../common/utils';
 import { IMCPServerRegistry, IMCPServerToolComponentProps, MCPLogger, MCPToolDefinition } from '../types';
 
@@ -19,27 +18,14 @@ export class MCPServerRegistry implements IMCPServerRegistry {
   private tools: MCPToolDefinition[] = [];
   private toolComponents: Record<string, React.FC<IMCPServerToolComponentProps>> = {};
 
-  private _activeMessageInfo: {
-    messageId: string;
-    sessionId: string;
-  };
-
   @Autowired(ILogger)
   private readonly baseLogger: ILogger;
 
-  @Autowired(IAIReporter)
-  private readonly aiReporter: IAIReporter;
-
   private get logger(): MCPLogger {
     return new LoggerAdapter(this.baseLogger);
   }
 
-  /** 设置当前活跃的消息信息，便于toolCall打点 */
-  set activeMessageInfo(params: { messageId: string; sessionId: string }) {
-    this._activeMessageInfo = params;
-  }
-
-  getMCPTool(name: string, serverName = BUILTIN_MCP_SERVER_NAME): MCPToolDefinition | undefined {
+  getMCPTool(name: string, serverName = 'sumi-builtin'): MCPToolDefinition | undefined {
     return this.tools.find((tool) => getToolName(tool.name, serverName) === name);
   }
 
@@ -50,7 +36,7 @@ export class MCPServerRegistry implements IMCPServerRegistry {
   registerToolComponent(
     name: string,
     component: React.FC<IMCPServerToolComponentProps>,
-    serverName = BUILTIN_MCP_SERVER_NAME,
+    serverName = 'sumi-builtin',
   ): void {
     this.toolComponents[getToolName(name, serverName)] = component;
   }
@@ -78,31 +64,14 @@ export class MCPServerRegistry implements IMCPServerRegistry {
       // 统一校验并转换
       const toolCallId = args.toolCallId;
       args = tool.inputSchema.parse(args);
-      const result = await tool.handler({ ...args, toolCallId }, this.logger);
-      this.reportToolCall(name, args, result, toolCallId);
-      return result;
+      return await tool.handler({ ...args, toolCallId }, this.logger);
     } catch (error) {
       // eslint-disable-next-line no-console
       console.error('callMCPTool error:', error);
-      this.reportToolCall(name, args, error, args.toolCallId);
       return {
         content: [{ type: 'text', text: `The tool ${name} failed to execute. Error: ${error}` }],
         isError: true,
       };
     }
   }
-
-  private reportToolCall(name: string, args: any, result: any, toolCallId: string) {
-    const tool = this.tools.find((tool) => tool.name === name);
-    if (!tool) {
-      throw new Error(`MCP tool ${name} not found`);
-    }
-    this.aiReporter.send({
-      msgType: AIServiceType.ToolCall,
-      message: JSON.stringify({ args, name, result }),
-      messageId: this._activeMessageInfo.messageId,
-      sessionId: this._activeMessageInfo.sessionId,
-      relationId: toolCallId,
-    });
-  }
 }

package/src/browser/mcp/tools/components/EditFile.tsx

@@ -13,7 +13,6 @@ import {
   useInjectable,
 } from '@opensumi/ide-core-browser';
 import { Loading } from '@opensumi/ide-core-browser/lib/components/ai-native';
-import { WorkbenchEditorService } from '@opensumi/ide-editor';
 import { ILanguageService } from '@opensumi/monaco-editor-core/esm/vs/editor/common/languages/language';
 import { IModelService } from '@opensumi/monaco-editor-core/esm/vs/editor/common/services/model';
 import { StandaloneServices } from '@opensumi/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
@@ -31,7 +30,6 @@ export const EditFileToolComponent = (props: IMCPServerToolComponentProps) => {
   const labelService = useInjectable(LabelService);
   const appConfig = useInjectable<AppConfig>(AppConfig);
   const applyService = useInjectable<BaseApplyService>(BaseApplyService);
-  const editorService = useInjectable<WorkbenchEditorService>(WorkbenchEditorService);
   const { target_file = '', code_edit, instructions } = args || {};
   const absolutePath = path.join(appConfig.workspaceDir, target_file);
   const [codeBlockData, setCodeBlockData] = useState<CodeBlockData | undefined>(
@@ -57,20 +55,15 @@ export const EditFileToolComponent = (props: IMCPServerToolComponentProps) => {
 
   useEffect(() => {
     const disposable = applyService.onCodeBlockUpdate((codeBlockData) => {
-      if (codeBlockData.toolCallId === toolCallId) {
-        setCodeBlockData({ ...codeBlockData });
-      }
+      setCodeBlockData({ ...codeBlockData });
     });
     return () => {
       disposable.dispose();
     };
   }, []);
 
-  const handleToggleMode = (e: React.MouseEvent<HTMLDivElement>) => {
-    e.stopPropagation();
-    setMode(mode === 'code' ? 'diff' : 'code');
-  };
-
+  // 多次迭代时，仅在首处tool组件中展示
+  // FIXME: 这个优化有必要吗？每次都展示也挺好？
   if (!args || !codeBlockData) {
     return null;
   }
@@ -84,7 +77,7 @@ export const EditFileToolComponent = (props: IMCPServerToolComponentProps) => {
         })}
         onClick={() => {
           if (codeBlockData.status === 'pending') {
-            editorService.open(URI.file(absolutePath));
+            applyService.renderApplyResult(codeBlockData, codeBlockData.updatedCode!);
           } else if (codeBlockData.status === 'success') {
             applyService.revealApplyPosition(codeBlockData);
           }
@@ -96,15 +89,15 @@ export const EditFileToolComponent = (props: IMCPServerToolComponentProps) => {
           {codeBlockData.iterationCount > 1 && (
             <span className={styles['edit-file-tool-iteration-count']}>{codeBlockData.iterationCount}/3</span>
           )}
-          {renderStatus(codeBlockData, props.result)}
+          {renderStatus(codeBlockData)}
         </div>
         <div className={styles.right}>
           <Popover title={'Show Code'} id={'edit-file-tool-show-code'}>
-            <Icon iconClass='codicon codicon-file-code' onClick={handleToggleMode} />
+            <Icon iconClass='codicon codicon-file-code' onClick={() => setMode('code')} />
           </Popover>
           {codeBlockData.applyResult?.diff && (
             <Popover title={'Show Diff'} id={'edit-file-tool-show-diff'}>
-              <Icon iconClass='codicon codicon-diff-multiple' onClick={handleToggleMode} />
+              <Icon iconClass='codicon codicon-diff-multiple' onClick={() => setMode('diff')} />
             </Popover>
           )}
         </div>
@@ -138,7 +131,7 @@ export const EditFileToolComponent = (props: IMCPServerToolComponentProps) => {
   ];
 };
 
-const renderStatus = (codeBlockData: CodeBlockData, error?: string) => {
+const renderStatus = (codeBlockData: CodeBlockData) => {
   const status = codeBlockData.status;
   switch (status) {
     case 'generating':
@@ -157,7 +150,7 @@ const renderStatus = (codeBlockData: CodeBlockData, error?: string) => {
       );
     case 'failed':
       return (
-        <Popover title={`Failed (${error})`} id={'edit-file-tool-status-failed'}>
+        <Popover title='Failed' id={'edit-file-tool-status-failed'}>
           <Icon iconClass='codicon codicon-error' style={{ color: 'var(--debugConsole-errorForeground)' }} />
         </Popover>
       );

package/src/browser/mcp/tools/components/SearchResult.tsx

@@ -0,0 +1,92 @@
+import React, { useEffect, useMemo, useState } from 'react';
+
+import { LabelService, URI, path, useInjectable } from '@opensumi/ide-core-browser';
+import { WorkbenchEditorService } from '@opensumi/ide-editor';
+import { IWorkspaceService } from '@opensumi/ide-workspace';
+
+import { IChatInternalService } from '../../../../common';
+import { ChatInternalService } from '../../../chat/chat.internal.service';
+
+import styles from './index.module.less';
+
+interface SearchResultProps {
+  args: any;
+  toolCallId: string;
+  messageId: string;
+  toolName: string;
+}
+
+export const FileSearchToolComponent: React.FC<SearchResultProps> = ({ args, toolCallId, messageId }) => (
+  <SearchResult args={args} toolCallId={toolCallId} messageId={messageId} toolName='fileSearch' />
+);
+
+export const GrepSearchToolComponent: React.FC<SearchResultProps> = ({ args, toolCallId, messageId }) => (
+  <SearchResult args={args} toolCallId={toolCallId} messageId={messageId} toolName='grepSearch' />
+);
+
+const SearchResult: React.FC<SearchResultProps> = ({ args, toolCallId, toolName, messageId }) => {
+  const [isExpanded, setIsExpanded] = useState(false);
+  const labelService = useInjectable<LabelService>(LabelService);
+  const editorService = useInjectable<WorkbenchEditorService>(WorkbenchEditorService);
+  const workspaceService = useInjectable<IWorkspaceService>(IWorkspaceService);
+  const workspaceRoot = useMemo(() => URI.parse(workspaceService.tryGetRoots()?.[0]?.uri), []);
+
+  const chatService = useInjectable<ChatInternalService>(IChatInternalService);
+  const [files, setFiles] = useState<string[]>(
+    chatService.sessionModel.history.getMessageAdditional(messageId)?.[toolCallId]?.files || [],
+  );
+  useEffect(() => {
+    const toDispose = chatService.sessionModel.history.onMessageAdditionalChange((additional) => {
+      setFiles(additional[toolCallId]?.files || []);
+    });
+    return () => {
+      toDispose.dispose();
+    };
+  }, []);
+
+  const handleFileClick = (uri: URI) => {
+    // 处理文件点击跳转
+    editorService.open(uri);
+  };
+
+  const parsedFiles = useMemo(
+    () =>
+      files.map((file) => {
+        const uri = URI.parse(file);
+        const iconClass = labelService.getIcon(uri);
+        return {
+          iconClass,
+          name: uri.path.base,
+          path: path.relative(workspaceRoot.codeUri.fsPath, uri.path.dir.toString()),
+        };
+      }),
+    [files],
+  );
+
+  return (
+    <div className={styles.container}>
+      <div className={styles.header} onClick={() => setIsExpanded(!isExpanded)}>
+        <span style={{ transform: `rotate(${isExpanded ? '90deg' : '0deg'})` }}>▶</span>
+        <span>
+          {toolName === 'fileSearch' ? `Searched files "${args.query}"` : `Grepped codebase "${args.query}"`} ·{' '}
+          {files.length} files
+        </span>
+      </div>
+      {isExpanded && (
+        <ul className={styles.fileList}>
+          {parsedFiles.map((file, index) => (
+            <li
+              key={index}
+              className={styles.fileItem}
+              onClick={() => handleFileClick(URI.file(path.join(workspaceRoot.codeUri.fsPath, file.path, file.name)))}
+            >
+              <span className={file.iconClass}></span>
+              <span style={{ flex: 1 }}>{file.name}</span>
+              <span className={styles.filePath}>{file.path}</span>
+            </li>
+          ))}
+        </ul>
+      )}
+    </div>
+  );
+};

package/src/browser/mcp/tools/components/Terminal.tsx

@@ -3,7 +3,6 @@ import React, { memo, useCallback, useMemo, useState } from 'react';
 import { useInjectable } from '@opensumi/ide-core-browser';
 import { Button, Icon } from '@opensumi/ide-core-browser/lib/components';
 import { localize } from '@opensumi/ide-core-common';
-import { stripAnsi } from '@opensumi/ide-utils/lib/ansi';
 
 import { IMCPServerToolComponentProps } from '../../../types';
 import { RunCommandHandler } from '../handlers/RunCommand';
@@ -59,23 +58,13 @@ export const TerminalToolComponent = memo((props: IMCPServerToolComponentProps)
     <div className={styles.run_cmd_tool}>
       {props.state === 'result' && (
         <div>
-          {args && (
-            <>
-              <div className={styles.command_title}>
-                <Icon icon='terminal' />
-                <span>{localize('ai.native.mcp.terminal.command')}</span>
-              </div>
-              <p className={styles.command_content}>
-                <code>$ {args.command}</code>
-              </p>
-            </>
-          )}
           <div className={styles.command_title}>
+            <Icon icon='terminal' />
             <span>{localize('ai.native.mcp.terminal.output')}</span>
           </div>
           {output ? (
             <div className={styles.command_content}>
-              <code>{stripAnsi(output.text)}</code>
+              <code>{output.text}</code>
             </div>
           ) : (
             ''

package/src/browser/mcp/tools/components/index.module.less

@@ -17,9 +17,6 @@
     align-items: center;
     justify-content: center;
   }
-  .left {
-    overflow: hidden;
-  }
   .left,
   .right {
     display: flex;
@@ -157,7 +154,6 @@
   background-color: var(--design-chatInput-background);
   padding: 10px;
   border-radius: 4px;
-  margin: 10px 0px;
 
   .command_title {
     display: flex;

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

@@ -6,13 +6,10 @@ import { IFileServiceClient } from '@opensumi/ide-file-service';
 import { IWorkspaceService } from '@opensumi/ide-workspace';
 
 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'),
+  pathInProject: z.string().describe('The relative path where the file should be created'),
+  text: z.string().describe('The content to write into the new file'),
 });
 
 @Domain(MCPServerContribution)
@@ -23,31 +20,29 @@ export class CreateNewFileWithTextTool implements MCPServerContribution {
   @Autowired(IFileServiceClient)
   private readonly fileService: IFileServiceClient;
 
-  @Autowired(BaseApplyService)
-  private applyService: BaseApplyService;
-
   registerMCPServer(registry: IMCPServerRegistry): void {
     registry.registerMCPTool(this.getToolDefinition());
-    registry.registerToolComponent('create_new_file_with_text', EditFileToolComponent);
   }
 
   getToolDefinition(): MCPToolDefinition {
     return {
       name: 'create_new_file_with_text',
-      label: 'Create File',
       description:
         'Creates a new file at the specified path within the project directory and populates it with the provided text. ' +
         'Use this tool to generate new files in your project structure. ' +
+        'Requires two parameters: ' +
+        '- pathInProject: The relative path where the file should be created ' +
+        '- text: The content to write into the new file ' +
         'Returns one of two possible responses: ' +
         '"ok" if the file was successfully created and populated, ' +
         '"can\'t find project dir" if the project directory cannot be determined. ' +
-        'Note: This tool creates any necessary parent directories automatically.',
+        'Note: Creates any necessary parent directories automatically.',
       inputSchema,
       handler: this.handler.bind(this),
     };
   }
 
-  private async handler(args: z.infer<typeof inputSchema> & { toolCallId: string }, logger: MCPLogger) {
+  private async handler(args: z.infer<typeof inputSchema>, logger: MCPLogger) {
     try {
       // 获取工作区根目录
       const workspaceRoots = this.workspaceService.tryGetRoots();
@@ -61,7 +56,7 @@ export class CreateNewFileWithTextTool implements MCPServerContribution {
 
       // 构建完整的文件路径
       const rootUri = URI.parse(workspaceRoots[0].uri);
-      const fullPath = path.join(rootUri.codeUri.fsPath, args.target_file);
+      const fullPath = path.join(rootUri.codeUri.fsPath, args.pathInProject);
       const fileUri = URI.file(fullPath);
 
       // 创建父目录
@@ -69,21 +64,17 @@ export class CreateNewFileWithTextTool implements MCPServerContribution {
       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);
+      // 写入文件内容
+      await this.fileService.createFile(fileUri.toString(), { content: args.text });
 
-      logger.appendLine(`Successfully created file at: ${args.target_file}`);
+      logger.appendLine(`Successfully created file at: ${args.pathInProject}`);
       return {
         content: [{ type: 'text', text: 'ok' }],
       };
     } catch (error) {
       logger.appendLine(`Error during file creation: ${error}`);
       return {
-        content: [{ type: 'text', text: error.message }],
+        content: [{ type: 'text', text: 'unknown error' }],
         isError: true,
       };
     }

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

@@ -1,7 +1,6 @@
 import { z } from 'zod';
 
 import { Autowired } from '@opensumi/di';
-import { getValidateInput } from '@opensumi/ide-addons/lib/browser/file-search.contribution';
 import { Domain, URI } from '@opensumi/ide-core-common';
 import { FileSearchServicePath, IFileSearchService } from '@opensumi/ide-file-search/lib/common';
 import { IWorkspaceService } from '@opensumi/ide-workspace';
@@ -10,7 +9,7 @@ import { IChatInternalService } from '../../../common';
 import { ChatInternalService } from '../../chat/chat.internal.service';
 import { IMCPServerRegistry, MCPLogger, MCPServerContribution, MCPToolDefinition } from '../../types';
 
-import { FileSearchToolComponent } from './components/ExpandableFileList';
+import { FileSearchToolComponent } from './components/SearchResult';
 
 const inputSchema = z.object({
   query: z.string().describe('Fuzzy filename to search for'),
@@ -59,7 +58,7 @@ export class FileSearchTool implements MCPServerContribution {
     }
 
     // 使用 OpenSumi 的文件搜索 API
-    const searchPattern = this.normalizeQuery(args.query);
+    const searchPattern = args.query;
     const searchResults = await this.fileSearchService.find(searchPattern, {
       rootUris: [new URI(workspaceRoots[0].uri).codeUri.fsPath],
       // TODO: 忽略配置
@@ -72,10 +71,7 @@ export class FileSearchTool implements MCPServerContribution {
 
     const files = searchResults.slice(0, MAX_RESULTS).map((file) => {
       const uri = URI.parse(file);
-      return {
-        uri: uri.codeUri.fsPath,
-        isDirectory: false, // 文件搜索结果都是文件
-      };
+      return uri.codeUri.fsPath;
     });
 
     const messages = this.chatInternalService.sessionModel.history.getMessages();
@@ -91,7 +87,7 @@ export class FileSearchTool implements MCPServerContribution {
       content: [
         {
           type: 'text',
-          text: `${files.map((f) => f.uri).join('\n')}\n${
+          text: `${files.join('\n')}\n${
             searchResults.length > MAX_RESULTS
               ? `\nFound ${searchResults.length} files matching "${args.query}", only return the first ${MAX_RESULTS} results`
               : ''
@@ -100,10 +96,4 @@ export class FileSearchTool implements MCPServerContribution {
       ],
     };
   }
-
-  private normalizeQuery(query: string): string {
-    const nonBlank = query.trim().replace(/\s/g, '');
-    const validated = getValidateInput(nonBlank);
-    return validated;
-  }
 }

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

@@ -29,7 +29,6 @@ export class GetDiagnosticsByPathTool implements MCPServerContribution {
   getToolDefinition(): MCPToolDefinition {
     return {
       name: 'get_diagnostics_by_path',
-      label: 'Get Diagnostics',
       description:
         'Retrieves diagnostic information (errors, warnings, etc.) from a specific file in the project. ' +
         'Use this tool to get information about problems in any project file. ' +

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

@@ -10,7 +10,7 @@ import { IChatInternalService } from '../../../common';
 import { ChatInternalService } from '../../chat/chat.internal.service';
 import { IMCPServerRegistry, MCPLogger, MCPServerContribution, MCPToolDefinition } from '../../types';
 
-import { GrepSearchToolComponent } from './components/ExpandableFileList';
+import { GrepSearchToolComponent } from './components/SearchResult';
 
 const inputSchema = z.object({
   query: z.string().describe('The regex pattern to search for'),
@@ -90,7 +90,7 @@ export class GrepSearchTool implements MCPServerContribution {
         return;
       }
       const results: string[] = [];
-      const files: Array<{ uri: string; isDirectory: boolean }> = [];
+      const files: string[] = [];
       for (const [fileUri, result] of this.searchService.searchResults.entries()) {
         results.push(
           `File: ${fileUri}\n${result
@@ -103,10 +103,7 @@ export class GrepSearchTool implements MCPServerContribution {
             .map((r) => `Line: ${r.line}\nContent: ${r.lineText || r.renderLineText}`)
             .join('\n')}`,
         );
-        files.push({
-          uri: fileUri,
-          isDirectory: false, // grep 搜索结果都是文件
-        });
+        files.push(fileUri);
       }
       deferred.resolve(results.join('\n\n'));
       const messages = this.chatInternalService.sessionModel.history.getMessages();

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

@@ -14,7 +14,7 @@ export class EditFileHandler {
 
   async handler(params: { targetFile: string; codeEdit: string; instructions?: string }, toolCallId: string) {
     const { targetFile, codeEdit } = params;
-    const block = await this.applyService.registerCodeBlock(targetFile, codeEdit, toolCallId);
+    const block = this.applyService.registerCodeBlock(targetFile, codeEdit, toolCallId);
     const blockData = await this.applyService.apply(block);
     return blockData;
   }

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

@@ -56,10 +56,6 @@ export class ListDirHandler {
   @Autowired(IFileServiceClient)
   private readonly fileSystemService: IFileServiceClient;
 
-  getWorkspaceDir(): string {
-    return this.appConfig.workspaceDir;
-  }
-
   async handler(args: { relativeWorkspacePath: string }) {
     const { relativeWorkspacePath } = args;
     if (!relativeWorkspacePath) {

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

@@ -49,7 +49,6 @@ export class RunCommandHandler {
   }
 
   async handler(args: z.infer<typeof inputSchema> & { toolCallId: string }, logger: MCPLogger) {
-    logger.appendLine(`Executing command: ${args.command}`);
     if (args.require_user_approval) {
       const def = new Deferred<boolean>();
       this.approvalDeferredMap.set(args.toolCallId, def);
@@ -90,7 +89,6 @@ export class RunCommandHandler {
         content: result,
       });
 
-      logger.appendLine(`Command ${args.command} finished with exit code: ${e.code}`);
       terminalClient.term.writeln(
         `\n${color.italic}> Command ${args.command} executed successfully. Terminal will close in ${
           3000 / 1000

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

@@ -3,11 +3,8 @@ import { z } from 'zod';
 import { Autowired } from '@opensumi/di';
 import { Domain } from '@opensumi/ide-core-common';
 
-import { IChatInternalService } from '../../../common';
-import { ChatInternalService } from '../../chat/chat.internal.service';
 import { IMCPServerRegistry, MCPLogger, MCPServerContribution, MCPToolDefinition } from '../../types';
 
-import { ListDirToolComponent } from './components/ExpandableFileList';
 import { ListDirHandler } from './handlers/ListDir';
 
 const inputSchema = z
@@ -29,12 +26,8 @@ export class ListDirTool implements MCPServerContribution {
   @Autowired(ListDirHandler)
   private readonly listDirHandler: ListDirHandler;
 
-  @Autowired(IChatInternalService)
-  private readonly chatInternalService: ChatInternalService;
-
   registerMCPServer(registry: IMCPServerRegistry): void {
     registry.registerMCPTool(this.getToolDefinition());
-    registry.registerToolComponent('list_dir', ListDirToolComponent);
   }
 
   getToolDefinition(): MCPToolDefinition {
@@ -48,40 +41,16 @@ export class ListDirTool implements MCPServerContribution {
     };
   }
 
-  private async handler(args: z.infer<typeof inputSchema> & { toolCallId: string }, logger: MCPLogger) {
+  private async handler(args: z.infer<typeof inputSchema>, logger: MCPLogger) {
     const result = await this.listDirHandler.handler(args);
-
-    // 构建文件 URI 列表，用于前端渲染
-    const fileUris = result.files.map((file) => {
-      const filePath = `${this.listDirHandler.getWorkspaceDir()}/${result.directoryRelativeWorkspacePath}/${file.name}`;
-      return {
-        uri: filePath,
-        isDirectory: file.isDirectory,
-      };
-    });
-
-    // 设置消息的附加数据
-    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,
-        })),
-      },
-    });
-
-    logger.appendLine(`Listed ${fileUris.length} files in directory "${args.relativeWorkspacePath}"`);
-
     return {
       content: [
         {
           type: 'text',
-          text: `Contents of directory "${args.relativeWorkspacePath}":\n${result.files
+          text: `Contents of directory:
+
+
+          ${result.files
             .map(
               (file) =>
                 `[${file.isDirectory ? 'dir' : 'file'}] ${file.name} ${

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

@@ -32,7 +32,6 @@ export class RunTerminalCommandTool implements MCPServerContribution {
   getToolDefinition(): MCPToolDefinition {
     return {
       name: 'run_terminal_cmd',
-      label: 'Run Command',
       description:
         "PROPOSE a command to run on behalf of the user.\nIf you have this tool, note that you DO have the ability to run commands directly on the USER's system.\n\nAdhere to these rules:\n1. Based on the contents of the conversation, you will be told if you are in the same shell as a previous step or a new shell.\n2. If in a new shell, you should `cd` to the right directory and do necessary setup in addition to running the command.\n3. If in the same shell, the state will persist, no need to do things like `cd` to the same directory.\n4. For ANY commands that would use a pager, you should append ` | cat` to the command (or whatever is appropriate). You MUST do this for: git, less, head, tail, more, etc.\n5. For commands that are long running/expected to run indefinitely until interruption, please run them in the background. To run jobs in the background, set `is_background` to true rather than changing the details of the command.\n6. Dont include any newlines in the command.",
       inputSchema,

package/src/browser/model/msg-history-manager.ts

@@ -57,6 +57,11 @@ export class MsgHistoryManager extends Disposable {
 
   private startIndex = 0;
 
+  private get totalTokens(): number {
+    const list = this.messageList.slice(this.startIndex);
+    return list.reduce((acc, msg) => acc + (msg.content.length || 0), 0) / 3;
+  }
+
   public get slicedMessageCount(): number {
     return this.startIndex;
   }
@@ -66,7 +71,12 @@ export class MsgHistoryManager extends Disposable {
     return list[list.length - 1]?.id;
   }
 
-  public getMessages(): IHistoryChatMessage[] {
+  public getMessages(maxTokens?: number): IHistoryChatMessage[] {
+    if (maxTokens && this.totalTokens > maxTokens) {
+      while (this.totalTokens > maxTokens) {
+        this.startIndex++;
+      }
+    }
     return this.messageList.slice(this.startIndex);
   }
 
@@ -118,10 +128,6 @@ export class MsgHistoryManager extends Disposable {
     return this.messageAdditionalMap.get(id) || {};
   }
 
-  public get sessionAdditionals() {
-    return this.messageAdditionalMap;
-  }
-
   toJSON() {
     return {
       messages: this.getMessages(),