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

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

@@ -4,7 +4,7 @@ import { Autowired, Injectable } from '@opensumi/di';
 import { ILogger } from '@opensumi/ide-core-browser';
 import { Emitter, Event } from '@opensumi/ide-core-common';
 
-import { ISumiMCPServerBackend, SumiMCPServerProxyServicePath } from '../../common';
+import { BUILTIN_MCP_SERVER_NAME, ISumiMCPServerBackend, SumiMCPServerProxyServicePath } from '../../common';
 import { IMCPServerProxyService } from '../../common/types';
 import { IMCPServerRegistry, TokenMCPServerRegistry } from '../types';
 
@@ -35,7 +35,7 @@ export class MCPServerProxyService implements IMCPServerProxyService {
         name: tool.name,
         description: tool.description,
         inputSchema: zodToJsonSchema(tool.inputSchema),
-        providerName: 'sumi-builtin',
+        providerName: BUILTIN_MCP_SERVER_NAME,
       }),
     );
 
@@ -52,4 +52,16 @@ export class MCPServerProxyService implements IMCPServerProxyService {
   async getAllMCPTools() {
     return this.sumiMCPServerProxyService.getAllMCPTools();
   }
+
+  async $getServers() {
+    return this.sumiMCPServerProxyService.getServers();
+  }
+
+  async $startServer(serverName: string) {
+    await this.sumiMCPServerProxyService.startServer(serverName);
+  }
+
+  async $stopServer(serverName: string) {
+    await this.sumiMCPServerProxyService.stopServer(serverName);
+  }
 }

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

@@ -1,7 +1,8 @@
 // OpenSumi as MCP Server 前端的代理服务
 import { Autowired, Injectable } from '@opensumi/di';
-import { ILogger } from '@opensumi/ide-core-common';
+import { AIServiceType, IAIReporter, 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';
 
@@ -18,14 +19,27 @@ 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);
   }
 
-  getMCPTool(name: string, serverName = 'sumi-builtin'): MCPToolDefinition | undefined {
+  /** 设置当前活跃的消息信息，便于toolCall打点 */
+  set activeMessageInfo(params: { messageId: string; sessionId: string }) {
+    this._activeMessageInfo = params;
+  }
+
+  getMCPTool(name: string, serverName = BUILTIN_MCP_SERVER_NAME): MCPToolDefinition | undefined {
     return this.tools.find((tool) => getToolName(tool.name, serverName) === name);
   }
 
@@ -36,7 +50,7 @@ export class MCPServerRegistry implements IMCPServerRegistry {
   registerToolComponent(
     name: string,
     component: React.FC<IMCPServerToolComponentProps>,
-    serverName = 'sumi-builtin',
+    serverName = BUILTIN_MCP_SERVER_NAME,
   ): void {
     this.toolComponents[getToolName(name, serverName)] = component;
   }
@@ -64,14 +78,31 @@ export class MCPServerRegistry implements IMCPServerRegistry {
       // 统一校验并转换
       const toolCallId = args.toolCallId;
       args = tool.inputSchema.parse(args);
-      return await tool.handler({ ...args, toolCallId }, this.logger);
+      const result = await tool.handler({ ...args, toolCallId }, this.logger);
+      this.reportToolCall(name, args, result, toolCallId);
+      return result;
     } 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,6 +13,7 @@ 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';
@@ -30,6 +31,7 @@ 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>(
@@ -55,15 +57,20 @@ export const EditFileToolComponent = (props: IMCPServerToolComponentProps) => {
 
   useEffect(() => {
     const disposable = applyService.onCodeBlockUpdate((codeBlockData) => {
-      setCodeBlockData({ ...codeBlockData });
+      if (codeBlockData.toolCallId === toolCallId) {
+        setCodeBlockData({ ...codeBlockData });
+      }
     });
     return () => {
       disposable.dispose();
     };
   }, []);
 
-  // 多次迭代时，仅在首处tool组件中展示
-  // FIXME: 这个优化有必要吗？每次都展示也挺好？
+  const handleToggleMode = (e: React.MouseEvent<HTMLDivElement>) => {
+    e.stopPropagation();
+    setMode(mode === 'code' ? 'diff' : 'code');
+  };
+
   if (!args || !codeBlockData) {
     return null;
   }
@@ -77,7 +84,7 @@ export const EditFileToolComponent = (props: IMCPServerToolComponentProps) => {
         })}
         onClick={() => {
           if (codeBlockData.status === 'pending') {
-            applyService.renderApplyResult(codeBlockData, codeBlockData.updatedCode!);
+            editorService.open(URI.file(absolutePath));
           } else if (codeBlockData.status === 'success') {
             applyService.revealApplyPosition(codeBlockData);
           }
@@ -89,15 +96,15 @@ export const EditFileToolComponent = (props: IMCPServerToolComponentProps) => {
           {codeBlockData.iterationCount > 1 && (
             <span className={styles['edit-file-tool-iteration-count']}>{codeBlockData.iterationCount}/3</span>
           )}
-          {renderStatus(codeBlockData)}
+          {renderStatus(codeBlockData, props.result)}
         </div>
         <div className={styles.right}>
           <Popover title={'Show Code'} id={'edit-file-tool-show-code'}>
-            <Icon iconClass='codicon codicon-file-code' onClick={() => setMode('code')} />
+            <Icon iconClass='codicon codicon-file-code' onClick={handleToggleMode} />
           </Popover>
           {codeBlockData.applyResult?.diff && (
             <Popover title={'Show Diff'} id={'edit-file-tool-show-diff'}>
-              <Icon iconClass='codicon codicon-diff-multiple' onClick={() => setMode('diff')} />
+              <Icon iconClass='codicon codicon-diff-multiple' onClick={handleToggleMode} />
             </Popover>
           )}
         </div>
@@ -131,7 +138,7 @@ export const EditFileToolComponent = (props: IMCPServerToolComponentProps) => {
   ];
 };
 
-const renderStatus = (codeBlockData: CodeBlockData) => {
+const renderStatus = (codeBlockData: CodeBlockData, error?: string) => {
   const status = codeBlockData.status;
   switch (status) {
     case 'generating':
@@ -150,7 +157,7 @@ const renderStatus = (codeBlockData: CodeBlockData) => {
       );
     case 'failed':
       return (
-        <Popover title='Failed' id={'edit-file-tool-status-failed'}>
+        <Popover title={`Failed (${error})`} id={'edit-file-tool-status-failed'}>
           <Icon iconClass='codicon codicon-error' style={{ color: 'var(--debugConsole-errorForeground)' }} />
         </Popover>
       );

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

@@ -0,0 +1,133 @@
+import React, { useEffect, useMemo, useState } from 'react';
+
+import { CommandService, 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 FileInfo {
+  uri: string;
+  isDirectory: boolean;
+}
+
+interface ExpandableFileListProps {
+  args: any;
+  toolCallId: string;
+  messageId: string;
+  toolName: string;
+  headerText?: string;
+}
+
+export const FileSearchToolComponent: React.FC<ExpandableFileListProps> = ({ args, toolCallId, messageId }) => (
+  <ExpandableFileList
+    args={args}
+    toolCallId={toolCallId}
+    messageId={messageId}
+    toolName='fileSearch'
+    headerText={`Searched files "${args.query}"`}
+  />
+);
+
+export const GrepSearchToolComponent: React.FC<ExpandableFileListProps> = ({ args, toolCallId, messageId }) => (
+  <ExpandableFileList
+    args={args}
+    toolCallId={toolCallId}
+    messageId={messageId}
+    toolName='grepSearch'
+    headerText={`Grepped codebase "${args.query}"`}
+  />
+);
+
+export const ListDirToolComponent: React.FC<ExpandableFileListProps> = ({ args, toolCallId, messageId }) => (
+  <ExpandableFileList
+    args={args}
+    toolCallId={toolCallId}
+    messageId={messageId}
+    toolName='listDir'
+    headerText={`Listed directory "${args.relative_workspace_path}"`}
+  />
+);
+
+const ExpandableFileList: React.FC<ExpandableFileListProps> = ({
+  args,
+  toolCallId,
+  toolName,
+  messageId,
+  headerText,
+}) => {
+  const [isExpanded, setIsExpanded] = useState(false);
+  const labelService = useInjectable<LabelService>(LabelService);
+  const editorService = useInjectable<WorkbenchEditorService>(WorkbenchEditorService);
+  const workspaceService = useInjectable<IWorkspaceService>(IWorkspaceService);
+  const commandService = useInjectable<CommandService>(CommandService);
+  const workspaceRoot = useMemo(() => URI.parse(workspaceService.tryGetRoots()?.[0]?.uri), []);
+
+  const chatService = useInjectable<ChatInternalService>(IChatInternalService);
+  const [fileList, setFileList] = useState<FileInfo[]>([]);
+
+  useEffect(() => {
+    const toDispose = chatService.sessionModel.history.onMessageAdditionalChange((additional) => {
+      setFileList(additional[toolCallId]?.files || []);
+    });
+    return () => {
+      toDispose.dispose();
+    };
+  }, []);
+
+  const handleFileClick = async (fileInfo: FileInfo) => {
+    // 处理文件点击跳转
+    if (!fileInfo.isDirectory) {
+      editorService.open(URI.parse(fileInfo.uri));
+    } else {
+      // 如果是目录，聚焦到文件树并展开该目录
+      const uri = URI.parse(fileInfo.uri);
+      commandService.executeCommand('filetree.location', uri);
+    }
+  };
+
+  const parsedFiles = useMemo(
+    () =>
+      fileList.map((file) => {
+        const uri = URI.parse(file.uri);
+        const iconClass = labelService.getIcon(uri, { isDirectory: file.isDirectory });
+        return {
+          iconClass,
+          name: uri.path.base,
+          path: path.relative(workspaceRoot.codeUri.fsPath, uri.path.dir.toString()),
+          uri: file.uri,
+          isDirectory: file.isDirectory,
+        };
+      }),
+    [fileList],
+  );
+
+  return (
+    <div className={styles.container}>
+      <div className={styles.header} onClick={() => setIsExpanded(!isExpanded)}>
+        <span style={{ transform: `rotate(${isExpanded ? '90deg' : '0deg'})` }}>▶</span>
+        <span>
+          {headerText} · {fileList.length} files
+        </span>
+      </div>
+      {isExpanded && (
+        <ul className={styles.fileList}>
+          {parsedFiles.map((file, index) => (
+            <li
+              key={index}
+              className={styles.fileItem}
+              onClick={() => handleFileClick({ uri: file.uri, isDirectory: file.isDirectory })}
+            >
+              <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,6 +3,7 @@ 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';
@@ -58,13 +59,23 @@ 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>{output.text}</code>
+              <code>{stripAnsi(output.text)}</code>
             </div>
           ) : (
             ''

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

@@ -17,6 +17,9 @@
     align-items: center;
     justify-content: center;
   }
+  .left {
+    overflow: hidden;
+  }
   .left,
   .right {
     display: flex;
@@ -154,6 +157,7 @@
   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,10 +6,13 @@ 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({
-  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'),
+  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)
@@ -20,29 +23,31 @@ 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: Creates any necessary parent directories automatically.',
+        'Note: This tool creates any necessary parent directories automatically.',
       inputSchema,
       handler: this.handler.bind(this),
     };
   }
 
-  private async handler(args: z.infer<typeof inputSchema>, logger: MCPLogger) {
+  private async handler(args: z.infer<typeof inputSchema> & { toolCallId: string }, logger: MCPLogger) {
     try {
       // 获取工作区根目录
       const workspaceRoots = this.workspaceService.tryGetRoots();
@@ -56,7 +61,7 @@ export class CreateNewFileWithTextTool implements MCPServerContribution {
 
       // 构建完整的文件路径
       const rootUri = URI.parse(workspaceRoots[0].uri);
-      const fullPath = path.join(rootUri.codeUri.fsPath, args.pathInProject);
+      const fullPath = path.join(rootUri.codeUri.fsPath, args.target_file);
       const fileUri = URI.file(fullPath);
 
       // 创建父目录
@@ -64,17 +69,21 @@ export class CreateNewFileWithTextTool implements MCPServerContribution {
       const parentUri = URI.file(parentDir);
       await this.fileService.createFolder(parentUri.toString());
 
-      // 写入文件内容
-      await this.fileService.createFile(fileUri.toString(), { content: args.text });
+      // 创建文件
+      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.pathInProject}`);
+      logger.appendLine(`Successfully created file at: ${args.target_file}`);
       return {
         content: [{ type: 'text', text: 'ok' }],
       };
     } catch (error) {
       logger.appendLine(`Error during file creation: ${error}`);
       return {
-        content: [{ type: 'text', text: 'unknown error' }],
+        content: [{ type: 'text', text: error.message }],
         isError: true,
       };
     }

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

@@ -1,6 +1,7 @@
 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';
@@ -9,7 +10,7 @@ import { IChatInternalService } from '../../../common';
 import { ChatInternalService } from '../../chat/chat.internal.service';
 import { IMCPServerRegistry, MCPLogger, MCPServerContribution, MCPToolDefinition } from '../../types';
 
-import { FileSearchToolComponent } from './components/SearchResult';
+import { FileSearchToolComponent } from './components/ExpandableFileList';
 
 const inputSchema = z.object({
   query: z.string().describe('Fuzzy filename to search for'),
@@ -58,7 +59,7 @@ export class FileSearchTool implements MCPServerContribution {
     }
 
     // 使用 OpenSumi 的文件搜索 API
-    const searchPattern = args.query;
+    const searchPattern = this.normalizeQuery(args.query);
     const searchResults = await this.fileSearchService.find(searchPattern, {
       rootUris: [new URI(workspaceRoots[0].uri).codeUri.fsPath],
       // TODO: 忽略配置
@@ -71,7 +72,10 @@ export class FileSearchTool implements MCPServerContribution {
 
     const files = searchResults.slice(0, MAX_RESULTS).map((file) => {
       const uri = URI.parse(file);
-      return uri.codeUri.fsPath;
+      return {
+        uri: uri.codeUri.fsPath,
+        isDirectory: false, // 文件搜索结果都是文件
+      };
     });
 
     const messages = this.chatInternalService.sessionModel.history.getMessages();
@@ -87,7 +91,7 @@ export class FileSearchTool implements MCPServerContribution {
       content: [
         {
           type: 'text',
-          text: `${files.join('\n')}\n${
+          text: `${files.map((f) => f.uri).join('\n')}\n${
             searchResults.length > MAX_RESULTS
               ? `\nFound ${searchResults.length} files matching "${args.query}", only return the first ${MAX_RESULTS} results`
               : ''
@@ -96,4 +100,10 @@ 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,6 +29,7 @@ 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/SearchResult';
+import { GrepSearchToolComponent } from './components/ExpandableFileList';
 
 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: string[] = [];
+      const files: Array<{ uri: string; isDirectory: boolean }> = [];
       for (const [fileUri, result] of this.searchService.searchResults.entries()) {
         results.push(
           `File: ${fileUri}\n${result
@@ -103,7 +103,10 @@ export class GrepSearchTool implements MCPServerContribution {
             .map((r) => `Line: ${r.line}\nContent: ${r.lineText || r.renderLineText}`)
             .join('\n')}`,
         );
-        files.push(fileUri);
+        files.push({
+          uri: fileUri,
+          isDirectory: false, // grep 搜索结果都是文件
+        });
       }
       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 = this.applyService.registerCodeBlock(targetFile, codeEdit, toolCallId);
+    const block = await this.applyService.registerCodeBlock(targetFile, codeEdit, toolCallId);
     const blockData = await this.applyService.apply(block);
     return blockData;
   }

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

@@ -56,6 +56,10 @@ 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,6 +49,7 @@ 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);
@@ -89,6 +90,7 @@ 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