@opensumi/ide-ai-native 3.7.2-next-1740107209.0 → 3.7.2-next-1740365741.0

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

@@ -7,23 +7,8 @@ import { ITerminalController, ITerminalGroupViewService } from '@opensumi/ide-te
 
 import { IMCPServerRegistry, MCPLogger, MCPServerContribution, MCPToolDefinition } from '../../types';
 
-const color = {
-  italic: '\x1b[3m',
-  reset: '\x1b[0m',
-};
-
-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.",
-    ),
-});
+import { TerminalToolComponent } from './components/Terminal';
+import { RunCommandHandler, inputSchema } from './handlers/RunCommand';
 
 @Domain(MCPServerContribution)
 export class RunTerminalCommandTool implements MCPServerContribution {
@@ -36,10 +21,12 @@ export class RunTerminalCommandTool implements MCPServerContribution {
   @Autowired(ITerminalGroupViewService)
   protected readonly terminalView: ITerminalGroupViewService;
 
-  private terminalId = 0;
+  @Autowired(RunCommandHandler)
+  private readonly runCommandHandler: RunCommandHandler;
 
   registerMCPServer(registry: IMCPServerRegistry): void {
     registry.registerMCPTool(this.getToolDefinition());
+    registry.registerToolComponent('run_terminal_cmd', TerminalToolComponent);
   }
 
   getToolDefinition(): MCPToolDefinition {
@@ -52,55 +39,7 @@ export class RunTerminalCommandTool implements MCPServerContribution {
     };
   }
 
-  getShellLaunchConfig(command: string) {
-    return {
-      name: `MCP:Terminal_${this.terminalId++}`,
-      cwd: this.appConfig.workspaceDir,
-      args: ['-c', command],
-    };
-  }
-
-  private async handler(args: z.infer<typeof inputSchema>, logger: MCPLogger) {
-    if (args.require_user_approval) {
-      // FIXME: support approval
-    }
-
-    const terminalClient = await this.terminalController.createTerminalWithWidget({
-      config: this.getShellLaunchConfig(args.command),
-      closeWhenExited: false,
-    });
-
-    this.terminalController.showTerminalPanel();
-
-    const result: { type: string; text: string }[] = [];
-    const def = new Deferred<{ isError?: boolean; content: { type: string; text: string }[] }>();
-
-    terminalClient.onOutput((e) => {
-      result.push({
-        type: 'output',
-        text: e.data.toString(),
-      });
-    });
-
-    terminalClient.onExit((e) => {
-      const isError = e.code !== 0;
-      def.resolve({
-        isError,
-        content: result,
-      });
-
-      terminalClient.term.writeln(
-        `\n${color.italic}> Command ${args.command} executed successfully. Terminal will close in ${
-          3000 / 1000
-        } seconds.${color.reset}\n`,
-      );
-
-      setTimeout(() => {
-        terminalClient.dispose();
-        this.terminalView.removeWidget(terminalClient.id);
-      }, 3000);
-    });
-
-    return def.promise;
+  private async handler(args: z.infer<typeof inputSchema> & { toolCallId: string }, logger: MCPLogger) {
+    return this.runCommandHandler.handler(args, logger);
   }
 }

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

@@ -5,13 +5,24 @@ import { IHistoryChatMessage } from '@opensumi/ide-core-common/lib/types/ai-nati
 
 type IExcludeMessage = Omit<IHistoryChatMessage, 'id' | 'order'>;
 
-@Injectable({ multiple: false })
 export class MsgHistoryManager extends Disposable {
   private messageMap: Map<string, IHistoryChatMessage> = new Map();
+  private messageAdditionalMap: Map<string, Record<string, any>> = new Map();
 
   private readonly _onMessageChange = new Emitter<IHistoryChatMessage[]>();
   public readonly onMessageChange: Event<IHistoryChatMessage[]> = this._onMessageChange.event;
 
+  private readonly _onMessageAdditionalChange = new Emitter<Record<string, any>>();
+  public readonly onMessageAdditionalChange: Event<Record<string, any>> = this._onMessageAdditionalChange.event;
+
+  constructor(data?: { additional: Record<string, any>; messages: IHistoryChatMessage[] }) {
+    super();
+    if (data) {
+      this.messageMap = new Map(data.messages.map((item) => [item.id, item]));
+      this.messageAdditionalMap = new Map(Object.entries(data.additional));
+    }
+  }
+
   override dispose(): void {
     this.clearMessages();
     super.dispose();
@@ -19,6 +30,7 @@ export class MsgHistoryManager extends Disposable {
 
   public clearMessages() {
     this.messageMap.clear();
+    this.messageAdditionalMap.clear();
   }
 
   private doAddMessage(message: IExcludeMessage): string {
@@ -70,4 +82,25 @@ export class MsgHistoryManager extends Disposable {
       content: message.content,
     });
   }
+
+  public setMessageAdditional(id: string, additional: Record<string, any>) {
+    if (!this.messageMap.has(id)) {
+      return;
+    }
+
+    this.messageAdditionalMap.set(id, additional);
+
+    this._onMessageAdditionalChange.fire(additional);
+  }
+
+  public getMessageAdditional(id: string): Record<string, any> {
+    return this.messageAdditionalMap.get(id) || {};
+  }
+
+  toJSON() {
+    return {
+      messages: this.getMessages(),
+      additional: Object.fromEntries(this.messageAdditionalMap.entries()),
+    };
+  }
 }

package/src/common/mcp-server-manager.ts

@@ -1,19 +1,24 @@
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 
 export interface MCPServerManager {
-    callTool(serverName: string, toolName: string, arg_string: string): ReturnType<Client['callTool']>;
-    removeServer(name: string): void;
-    addOrUpdateServer(description: MCPServerDescription): void;
-    // invoke in node.js only
-    addOrUpdateServerDirectly(server: any): void;
-    initBuiltinServer(builtinMCPServer: any): void;
-    getTools(serverName: string): ReturnType<Client['listTools']>;
-    getServerNames(): Promise<string[]>;
-    startServer(serverName: string): Promise<void>;
-    stopServer(serverName: string): Promise<void>;
-    getStartedServers(): Promise<string[]>;
-    registerTools(serverName: string): Promise<void>;
-    addExternalMCPServers(servers: MCPServerDescription[]): void;
+  callTool(
+    serverName: string,
+    toolName: string,
+    toolCallId: string,
+    arg_string: string,
+  ): ReturnType<Client['callTool']>;
+  removeServer(name: string): void;
+  addOrUpdateServer(description: MCPServerDescription): void;
+  // invoke in node.js only
+  addOrUpdateServerDirectly(server: any): void;
+  initBuiltinServer(builtinMCPServer: any): void;
+  getTools(serverName: string): ReturnType<Client['listTools']>;
+  getServerNames(): Promise<string[]>;
+  startServer(serverName: string): Promise<void>;
+  stopServer(serverName: string): Promise<void>;
+  getStartedServers(): Promise<string[]>;
+  registerTools(serverName: string): Promise<void>;
+  addExternalMCPServers(servers: MCPServerDescription[]): void;
 }
 
 export type MCPTool = Awaited<ReturnType<MCPServerManager['getTools']>>['tools'][number];

package/src/common/tool-invocation-registry.ts

@@ -1,33 +1,32 @@
+import { ToolExecutionOptions } from 'ai';
 import { z } from 'zod';
 
 import { Injectable } from '@opensumi/di';
 
-import { MCPToolParameter } from './mcp-server-manager';
-
 export const ToolParameterSchema = z.object({
-    type: z.enum(['string', 'number', 'boolean', 'object', 'array']),
-    description: z.string().optional(),
-    enum: z.array(z.any()).optional(),
-    items: z.lazy(() => ToolParameterSchema).optional(),
-    properties: z.record(z.lazy(() => ToolParameterSchema)).optional(),
-    required: z.array(z.string()).optional(),
+  type: z.enum(['string', 'number', 'boolean', 'object', 'array']),
+  description: z.string().optional(),
+  enum: z.array(z.any()).optional(),
+  items: z.lazy(() => ToolParameterSchema).optional(),
+  properties: z.record(z.lazy(() => ToolParameterSchema)).optional(),
+  required: z.array(z.string()).optional(),
 });
 
 export type ToolParameter = z.infer<typeof ToolParameterSchema>;
 
 export interface ToolRequest {
-    id: string;
-    name: string;
-    parameters?: any;
-    description?: string;
-    handler: (arg_string: string) => Promise<any>;
-    providerName?: string;
+  id: string;
+  name: string;
+  parameters?: any;
+  description?: string;
+  handler: (arg_string: string, options?: ToolExecutionOptions) => Promise<any>;
+  providerName?: string;
 }
 
 export namespace ToolRequest {
-    export function isToolParameter(obj: unknown): obj is ToolParameter {
-        return ToolParameterSchema.safeParse(obj).success;
-    }
+  export function isToolParameter(obj: unknown): obj is ToolParameter {
+    return ToolParameterSchema.safeParse(obj).success;
+  }
 }
 
 export const ToolInvocationRegistry = Symbol('ToolInvocationRegistry');
@@ -36,135 +35,134 @@ export const ToolInvocationRegistry = Symbol('ToolInvocationRegistry');
  * 为 Agent 提供的所有可用函数调用的注册表
  */
 export interface ToolInvocationRegistry {
-    /**
-     * 在注册表中注册一个工具
-     *
-     * @param tool - 要注册的 `ToolRequest` 对象
-     */
-    registerTool(tool: ToolRequest): void;
-
-    /**
-     * 从注册表中获取特定的 `ToolRequest`
-     *
-     * @param toolId - 要获取的工具的唯一标识符
-     * @returns 对应提供的工具 ID 的 `ToolRequest` 对象，
-     *          如果在注册表中找不到该工具，则返回 `undefined`
-     */
-    getFunction(toolId: string): ToolRequest | undefined;
-
-    /**
-     * 从注册表中获取多个 `ToolRequest`
-     *
-     * @param toolIds - 要获取的工具 ID 列表
-     * @returns 指定工具 ID 的 `ToolRequest` 对象数组
-     *          如果找不到某个工具 ID，将在返回的数组中跳过该工具
-     */
-    getFunctions(...toolIds: string[]): ToolRequest[];
-
-    /**
-     * 获取当前注册表中的所有 `ToolRequest`
-     *
-     * @returns 注册表中所有 `ToolRequest` 对象的数组
-     */
-    getAllFunctions(): ToolRequest[];
-
-    /**
-     * 注销特定工具提供者的所有工具
-     *
-     * @param providerName - 要移除其工具的工具提供者名称（在 `ToolRequest` 中指定）
-     */
-    unregisterAllTools(providerName: string): void;
+  /**
+   * 在注册表中注册一个工具
+   *
+   * @param tool - 要注册的 `ToolRequest` 对象
+   */
+  registerTool(tool: ToolRequest): void;
+
+  /**
+   * 从注册表中获取特定的 `ToolRequest`
+   *
+   * @param toolId - 要获取的工具的唯一标识符
+   * @returns 对应提供的工具 ID 的 `ToolRequest` 对象，
+   *          如果在注册表中找不到该工具，则返回 `undefined`
+   */
+  getFunction(toolId: string): ToolRequest | undefined;
+
+  /**
+   * 从注册表中获取多个 `ToolRequest`
+   *
+   * @param toolIds - 要获取的工具 ID 列表
+   * @returns 指定工具 ID 的 `ToolRequest` 对象数组
+   *          如果找不到某个工具 ID，将在返回的数组中跳过该工具
+   */
+  getFunctions(...toolIds: string[]): ToolRequest[];
+
+  /**
+   * 获取当前注册表中的所有 `ToolRequest`
+   *
+   * @returns 注册表中所有 `ToolRequest` 对象的数组
+   */
+  getAllFunctions(): ToolRequest[];
+
+  /**
+   * 注销特定工具提供者的所有工具
+   *
+   * @param providerName - 要移除其工具的工具提供者名称（在 `ToolRequest` 中指定）
+   */
+  unregisterAllTools(providerName: string): void;
 }
 
 export const ToolProvider = Symbol('ToolProvider');
 export interface ToolProvider {
-    getTool(): ToolRequest;
+  getTool(): ToolRequest;
 }
 
 export class ToolInvocationRegistryImpl implements ToolInvocationRegistry {
-    private tools: Map<string, ToolRequest> = new Map<string, ToolRequest>();
-
-    unregisterAllTools(providerName: string): void {
-        const toolsToRemove: string[] = [];
-        for (const [id, tool] of this.tools.entries()) {
-            if (tool.providerName === providerName) {
-                toolsToRemove.push(id);
-            }
-        }
-        toolsToRemove.forEach((id) => this.tools.delete(id));
-    }
-
-    getAllFunctions(): ToolRequest[] {
-        return Array.from(this.tools.values());
+  private tools: Map<string, ToolRequest> = new Map<string, ToolRequest>();
+
+  unregisterAllTools(providerName: string): void {
+    const toolsToRemove: string[] = [];
+    for (const [id, tool] of this.tools.entries()) {
+      if (tool.providerName === providerName) {
+        toolsToRemove.push(id);
+      }
     }
-
-    registerTool(tool: ToolRequest): void {
-        if (this.tools.has(tool.id)) {
-            // TODO: 使用适当的日志机制
-            this.tools.set(tool.id, tool);
-        } else {
-            this.tools.set(tool.id, tool);
-        }
-    }
-
-    getFunction(toolId: string): ToolRequest | undefined {
-        return this.tools.get(toolId);
-    }
-
-    getFunctions(...toolIds: string[]): ToolRequest[] {
-        const tools: ToolRequest[] = toolIds.map((toolId) => {
-            const tool = this.tools.get(toolId);
-            if (tool) {
-                return tool;
-            } else {
-                throw new Error(`找不到 ID 为 ${toolId} 的函数`);
-            }
-        });
-        return tools;
+    toolsToRemove.forEach((id) => this.tools.delete(id));
+  }
+
+  getAllFunctions(): ToolRequest[] {
+    return Array.from(this.tools.values());
+  }
+
+  registerTool(tool: ToolRequest): void {
+    if (this.tools.has(tool.id)) {
+      // TODO: 使用适当的日志机制
+      this.tools.set(tool.id, tool);
+    } else {
+      this.tools.set(tool.id, tool);
     }
+  }
+
+  getFunction(toolId: string): ToolRequest | undefined {
+    return this.tools.get(toolId);
+  }
+
+  getFunctions(...toolIds: string[]): ToolRequest[] {
+    const tools: ToolRequest[] = toolIds.map((toolId) => {
+      const tool = this.tools.get(toolId);
+      if (tool) {
+        return tool;
+      } else {
+        throw new Error(`找不到 ID 为 ${toolId} 的函数`);
+      }
+    });
+    return tools;
+  }
 }
 
 /**
  * 管理多个 ToolInvocationRegistry 实例的管理器，每个实例与一个 clientId 关联
  */
 export interface IToolInvocationRegistryManager {
-    /**
-     * 获取或创建特定 clientId 的 ToolInvocationRegistry
-     */
-    getRegistry(clientId: string): ToolInvocationRegistry;
-
-    /**
-     * 移除特定 clientId 的 ToolInvocationRegistry
-     */
-    removeRegistry(clientId: string): void;
-
-    /**
-     * 检查特定 clientId 是否存在对应的注册表
-     */
-    hasRegistry(clientId: string): boolean;
+  /**
+   * 获取或创建特定 clientId 的 ToolInvocationRegistry
+   */
+  getRegistry(clientId: string): ToolInvocationRegistry;
+
+  /**
+   * 移除特定 clientId 的 ToolInvocationRegistry
+   */
+  removeRegistry(clientId: string): void;
+
+  /**
+   * 检查特定 clientId 是否存在对应的注册表
+   */
+  hasRegistry(clientId: string): boolean;
 }
 
 export const ToolInvocationRegistryManager = Symbol('ToolInvocationRegistryManager');
 
 @Injectable()
 export class ToolInvocationRegistryManagerImpl implements IToolInvocationRegistryManager {
-    private registries: Map<string, ToolInvocationRegistry> = new Map();
-
-    getRegistry(clientId: string): ToolInvocationRegistry {
-        let registry = this.registries.get(clientId);
-        if (!registry) {
-            registry = new ToolInvocationRegistryImpl();
-            this.registries.set(clientId, registry);
-        }
-        return registry;
-    }
+  private registries: Map<string, ToolInvocationRegistry> = new Map();
 
-    removeRegistry(clientId: string): void {
-        this.registries.delete(clientId);
+  getRegistry(clientId: string): ToolInvocationRegistry {
+    let registry = this.registries.get(clientId);
+    if (!registry) {
+      registry = new ToolInvocationRegistryImpl();
+      this.registries.set(clientId, registry);
     }
+    return registry;
+  }
 
-    hasRegistry(clientId: string): boolean {
-        return this.registries.has(clientId);
-    }
-}
+  removeRegistry(clientId: string): void {
+    this.registries.delete(clientId);
+  }
 
+  hasRegistry(clientId: string): boolean {
+    return this.registries.has(clientId);
+  }
+}

package/src/node/base-language-model.ts

@@ -1,4 +1,4 @@
-import { CoreMessage, jsonSchema, streamText, tool } from 'ai';
+import { CoreMessage, ToolExecutionOptions, jsonSchema, streamText, tool } from 'ai';
 
 import { Autowired, Injectable } from '@opensumi/di';
 import { ChatMessageRole, IAIBackServiceOption, IChatMessage } from '@opensumi/ide-core-common';
@@ -66,7 +66,8 @@ export abstract class BaseLanguageModel {
       description: toolRequest.description || '',
       // TODO 这里应该是 z.object 而不是 JSON Schema
       parameters: jsonSchema(toolRequest.parameters),
-      execute: async (args: any) => await toolRequest.handler(JSON.stringify(args)),
+      execute: async (args: any, options: ToolExecutionOptions) =>
+        await toolRequest.handler(JSON.stringify(args), options),
     });
   }
 

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

@@ -156,7 +156,7 @@ export class BuiltinMCPServer implements IMCPServer {
     this.started = true;
   }
 
-  async callTool(toolName: string, arg_string: string): Promise<any> {
+  async callTool(toolName: string, toolCallId: string, arg_string: string): Promise<any> {
     if (!this.started) {
       throw new Error('MCP Server not started');
     }
@@ -171,7 +171,10 @@ export class BuiltinMCPServer implements IMCPServer {
       );
       throw error;
     }
-    return this.sumiMCPServer.callMCPTool(toolName, args);
+    return this.sumiMCPServer.callMCPTool(toolName, {
+      ...args,
+      toolCallId,
+    });
   }
 
   async getTools(): ReturnType<Client['listTools']> {

package/src/node/mcp-server-manager-impl.ts

@@ -1,3 +1,5 @@
+import { ToolExecutionOptions } from 'ai';
+
 import { ILogger } from '@opensumi/ide-core-common';
 
 import { MCPServerDescription, MCPServerManager, MCPTool } from '../common/mcp-server-manager';
@@ -42,12 +44,17 @@ export class MCPServerManagerImpl implements MCPServerManager {
     return startedServers;
   }
 
-  callTool(serverName: string, toolName: string, arg_string: string): ReturnType<IMCPServer['callTool']> {
+  callTool(
+    serverName: string,
+    toolName: string,
+    toolCallId: string,
+    arg_string: string,
+  ): ReturnType<IMCPServer['callTool']> {
     const server = this.servers.get(serverName);
     if (!server) {
       throw new Error(`MCP server "${toolName}" not found.`);
     }
-    return server.callTool(toolName, arg_string);
+    return server.callTool(toolName, toolCallId, arg_string);
   }
 
   async startServer(serverName: string): Promise<void> {
@@ -71,9 +78,9 @@ export class MCPServerManagerImpl implements MCPServerManager {
       providerName: serverName,
       parameters: tool.inputSchema,
       description: tool.description,
-      handler: async (arg_string: string) => {
+      handler: async (arg_string: string, options?: ToolExecutionOptions) => {
         try {
-          const res = await this.callTool(serverName, tool.name, arg_string);
+          const res = await this.callTool(serverName, tool.name, options?.toolCallId || '', arg_string);
           this.logger.debug(`[MCP: ${serverName}] ${tool.name} called with ${arg_string}`);
           this.logger.debug('Tool execution result:', res);
           return JSON.stringify(res);

package/src/node/mcp-server.ts

@@ -8,7 +8,7 @@ export interface IMCPServer {
   isStarted(): boolean;
   start(): Promise<void>;
   getServerName(): string;
-  callTool(toolName: string, arg_string: string): ReturnType<Client['callTool']>;
+  callTool(toolName: string, toolCallId: string, arg_string: string): ReturnType<Client['callTool']>;
   getTools(): ReturnType<Client['listTools']>;
   update(command: string, args?: string[], env?: { [key: string]: string }): void;
   stop(): void;
@@ -87,7 +87,7 @@ export class MCPServerImpl implements IMCPServer {
     this.started = true;
   }
 
-  async callTool(toolName: string, arg_string: string) {
+  async callTool(toolName: string, toolCallId: string, arg_string: string) {
     let args;
     try {
       args = JSON.parse(arg_string);
@@ -101,6 +101,7 @@ export class MCPServerImpl implements IMCPServer {
     const params = {
       name: toolName,
       arguments: args,
+      toolCallId,
     };
     return this.client.callTool(params);
   }

package/lib/browser/mcp/tools/findFilesByNameSubstring.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"findFilesByNameSubstring.d.ts","sourceRoot":"","sources":["../../../../src/browser/mcp/tools/findFilesByNameSubstring.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,kBAAkB,EAAa,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAMtG,qBACa,4BAA6B,YAAW,qBAAqB;IAExE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAoB;IAGrD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqB;IAEvD,iBAAiB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;IAIrD,iBAAiB,IAAI,iBAAiB;YAiBxB,OAAO;CA+CtB"}