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

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

@@ -0,0 +1,115 @@
+import z from 'zod';
+
+import { Autowired, Injectable } from '@opensumi/di';
+import { AppConfig } from '@opensumi/ide-core-browser';
+import { ITerminalController, ITerminalGroupViewService } from '@opensumi/ide-terminal-next';
+import { Deferred } from '@opensumi/ide-utils/lib/promises';
+
+import { MCPLogger } from '../../../types';
+
+const color = {
+  italic: '\x1b[3m',
+  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.",
+    ),
+});
+
+@Injectable()
+export class RunCommandHandler {
+  @Autowired(ITerminalController)
+  protected readonly terminalController: ITerminalController;
+
+  @Autowired(AppConfig)
+  protected readonly appConfig: AppConfig;
+
+  @Autowired(ITerminalGroupViewService)
+  protected readonly terminalView: ITerminalGroupViewService;
+
+  private approvalDeferredMap = new Map<string, Deferred<boolean>>();
+
+  private terminalId = 0;
+
+  getShellLaunchConfig(command: string) {
+    return {
+      name: `MCP:Terminal_${this.terminalId++}`,
+      cwd: this.appConfig.workspaceDir,
+      args: ['-c', command],
+    };
+  }
+
+  async handler(args: z.infer<typeof inputSchema> & { toolCallId: string }, logger: MCPLogger) {
+    if (args.require_user_approval) {
+      const def = new Deferred<boolean>();
+      this.approvalDeferredMap.set(args.toolCallId, def);
+      const approval = await def.promise;
+      if (!approval) {
+        return {
+          isError: false,
+          content: [
+            {
+              type: 'text',
+              text: 'User rejection',
+            },
+          ],
+        };
+      }
+    }
+    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: 'text',
+        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;
+  }
+
+  handleApproval(callId: string, approval: boolean) {
+    if (!this.approvalDeferredMap.has(callId)) {
+      return;
+    }
+
+    const def = this.approvalDeferredMap.get(callId);
+    def?.resolve(approval);
+  }
+}

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,7 +5,6 @@ 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();
@@ -16,6 +15,14 @@ export class MsgHistoryManager extends Disposable {
   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();
@@ -89,4 +96,11 @@ export class MsgHistoryManager extends Disposable {
   public getMessageAdditional(id: string): Record<string, any> {
     return this.messageAdditionalMap.get(id) || {};
   }
+
+  toJSON() {
+    return {
+      messages: this.getMessages(),
+      additional: Object.fromEntries(this.messageAdditionalMap.entries()),
+    };
+  }
 }