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

package/lib/browser/index.js

@@ -8,6 +8,7 @@ const ide_core_common_1 = require("@opensumi/ide-core-common");
 const common_1 = require("../common");
 const llm_context_1 = require("../common/llm-context");
 const mcp_server_manager_1 = require("../common/mcp-server-manager");
+const context_prompt_provider_1 = require("../common/prompts/context-prompt-provider");
 const ai_core_contribution_1 = require("./ai-core.contribution");
 const chat_agent_service_1 = require("./chat/chat-agent.service");
 const chat_agent_view_service_1 = require("./chat/chat-agent.view.service");
@@ -34,16 +35,13 @@ const service_1 = require("./languages/service");
 const mcp_server_proxy_service_1 = require("./mcp/mcp-server-proxy.service");
 const mcp_server_feature_registry_1 = require("./mcp/mcp-server.feature.registry");
 const createNewFileWithText_1 = require("./mcp/tools/createNewFileWithText");
-const findFilesByNameSubstring_1 = require("./mcp/tools/findFilesByNameSubstring");
-const getCurrentFilePath_1 = require("./mcp/tools/getCurrentFilePath");
+const editFile_1 = require("./mcp/tools/editFile");
+const fileSearch_1 = require("./mcp/tools/fileSearch");
 const getDiagnosticsByPath_1 = require("./mcp/tools/getDiagnosticsByPath");
-const getFileTextByPath_1 = require("./mcp/tools/getFileTextByPath");
 const getOpenEditorFileDiagnostics_1 = require("./mcp/tools/getOpenEditorFileDiagnostics");
-const getOpenEditorFileText_1 = require("./mcp/tools/getOpenEditorFileText");
-const getSelectedText_1 = require("./mcp/tools/getSelectedText");
+const grepSearch_1 = require("./mcp/tools/grepSearch");
 const listDir_1 = require("./mcp/tools/listDir");
 const readFile_1 = require("./mcp/tools/readFile");
-const replaceOpenEditorFileByDiffPreviewer_1 = require("./mcp/tools/replaceOpenEditorFileByDiffPreviewer");
 const runTerminalCmd_1 = require("./mcp/tools/runTerminalCmd");
 const preferences_1 = require("./preferences");
 const types_1 = require("./types");
@@ -65,16 +63,13 @@ let AINativeModule = class AINativeModule extends ide_core_browser_1.BrowserModu
             // MCP Server Contributions START
             listDir_1.ListDirTool,
             readFile_1.ReadFileTool,
+            editFile_1.EditFileTool,
             createNewFileWithText_1.CreateNewFileWithTextTool,
-            getSelectedText_1.GetSelectedTextTool,
             getOpenEditorFileDiagnostics_1.GetOpenEditorFileDiagnosticsTool,
-            getOpenEditorFileText_1.GetOpenEditorFileTextTool,
-            getFileTextByPath_1.GetFileTextByPathTool,
-            getCurrentFilePath_1.GetCurrentFilePathTool,
-            findFilesByNameSubstring_1.FindFilesByNameSubstringTool,
+            fileSearch_1.FileSearchTool,
+            grepSearch_1.GrepSearchTool,
             getDiagnosticsByPath_1.GetDiagnosticsByPathTool,
             runTerminalCmd_1.RunTerminalCommandTool,
-            replaceOpenEditorFileByDiffPreviewer_1.ReplaceOpenEditorFileByDiffPreviewerTool,
             // MCP Server Contributions END
             // Context Service
             llm_context_contribution_1.LlmContextContribution,
@@ -162,6 +157,10 @@ let AINativeModule = class AINativeModule extends ide_core_browser_1.BrowserModu
                 token: inline_diff_1.InlineDiffService,
                 useClass: inline_diff_1.InlineDiffService,
             },
+            {
+                token: context_prompt_provider_1.ChatAgentPromptProvider,
+                useClass: context_prompt_provider_1.DefaultChatAgentPromptProvider,
+            },
         ];
         this.backServices = [
             {

package/lib/browser/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"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"}

package/lib/browser/mcp/base-apply.service.d.ts

@@ -0,0 +1,67 @@
+import { AppConfig, IMarker, WithEventBus } from '@opensumi/ide-core-browser';
+import { WorkbenchEditorService } from '@opensumi/ide-editor';
+import { EditorGroupCloseEvent } from '@opensumi/ide-editor/lib/browser';
+import { Range } from '@opensumi/ide-monaco';
+import { ChatInternalService } from '../chat/chat.internal.service';
+import { FileHandler } from './tools/handlers/ReadFile';
+export declare abstract class BaseApplyService extends WithEventBus {
+    protected fileHandler: FileHandler;
+    protected chatInternalService: ChatInternalService;
+    protected appConfig: AppConfig;
+    protected readonly editorService: WorkbenchEditorService;
+    private readonly inlineDiffService;
+    private readonly markerService;
+    constructor();
+    readonly codeBlockMapObservable: import("@opensumi/ide-monaco/lib/common/observable").ISettableObservable<Map<string, CodeBlockData>, void>;
+    private activePreviewer;
+    private pendingApplyParams;
+    onEditorGroupClose(event: EditorGroupCloseEvent): void;
+    /**
+     * Get the code block data by relative or absolute path of the last assistant message
+     */
+    getCodeBlock(relativeOrAbsolutePath: string, messageId?: string): CodeBlockData | undefined;
+    getCodeBlockById(id: string): CodeBlockData | undefined;
+    protected updateCodeBlock(codeBlock: CodeBlockData): void;
+    /**
+     * Register a new code block and return its unique ID
+     */
+    registerCodeBlock(relativePath: string, content: string): string;
+    initToolCallId(blockId: string, toolCallId: string): void;
+    /**
+     * Apply changes of a code block
+     */
+    apply(relativePath: string, newContent: string, instructions?: string): Promise<CodeBlockData>;
+    reRenderPendingApply(): Promise<void>;
+    renderApplyResult(relativePath: string, newContent: string, range?: Range): Promise<{
+        diff: string;
+        diagnosticInfos: IMarker[];
+    } | undefined>;
+    /**
+     * Cancel an ongoing apply operation
+     */
+    cancelApply(relativePath: string): void;
+    cancelAllApply(): void;
+    disposeApplyForMessage(messageId: string): void;
+    revealApplyPosition(blockId: string): void;
+    protected abstract doApply(relativePath: string, newContent: string, instructions?: string): Promise<{
+        diff: string;
+        diagnosticInfos: IMarker[];
+    } | undefined>;
+    protected generateBlockId(absoluteOrRelativePath: string, messageId?: string): string;
+    protected getdiagnosticInfos(uri: string, ranges: Range[]): IMarker[];
+}
+export interface CodeBlockData {
+    id: string;
+    initToolCallId?: string;
+    content: string;
+    relativePath: string;
+    status: CodeBlockStatus;
+    iterationCount: number;
+    createdAt: number;
+    applyResult?: {
+        diff: string;
+        diagnosticInfos: IMarker[];
+    };
+}
+export type CodeBlockStatus = 'generating' | 'pending' | 'success' | 'rejected' | 'failed' | 'cancelled';
+//# sourceMappingURL=base-apply.service.d.ts.map

package/lib/browser/mcp/base-apply.service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"base-apply.service.d.ts","sourceRoot":"","sources":["../../../src/browser/mcp/base-apply.service.ts"],"names":[],"mappings":"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"}

package/lib/browser/mcp/base-apply.service.js

@@ -0,0 +1,290 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseApplyService = void 0;
+const tslib_1 = require("tslib");
+const diff_1 = require("diff");
+const di_1 = require("@opensumi/di");
+const ide_core_browser_1 = require("@opensumi/ide-core-browser");
+const ide_editor_1 = require("@opensumi/ide-editor");
+const browser_1 = require("@opensumi/ide-editor/lib/browser");
+const ide_markers_1 = require("@opensumi/ide-markers");
+const ide_monaco_1 = require("@opensumi/ide-monaco");
+const observable_1 = require("@opensumi/ide-monaco/lib/common/observable");
+const ide_utils_1 = require("@opensumi/ide-utils");
+const common_1 = require("../../common");
+const chat_internal_service_1 = require("../chat/chat.internal.service");
+const inline_diff_1 = require("../widget/inline-diff");
+const ReadFile_1 = require("./tools/handlers/ReadFile");
+// 提供代码块的唯一索引，迭代轮次，生成状态管理（包括取消），关联文件位置这些信息的记录，后续并行 apply 的支持
+class BaseApplyService extends ide_core_browser_1.WithEventBus {
+    constructor() {
+        super();
+        this.codeBlockMapObservable = (0, observable_1.observableValue)(this, new Map());
+        this.addDispose(this.chatInternalService.onCancelRequest(() => {
+            this.cancelAllApply();
+        }));
+        this.addDispose(this.chatInternalService.onRegenerateRequest(() => {
+            const messages = this.chatInternalService.sessionModel.history.getMessages();
+            const messageId = messages[messages.length - 1].id;
+            messageId && this.disposeApplyForMessage(messageId);
+        }));
+    }
+    onEditorGroupClose(event) {
+        var _a, _b;
+        if (((_b = (_a = this.activePreviewer) === null || _a === void 0 ? void 0 : _a.getNode()) === null || _b === void 0 ? void 0 : _b.uri.path.toString()) === event.payload.resource.uri.path.toString()) {
+            this.activePreviewer.dispose();
+            this.activePreviewer = undefined;
+        }
+    }
+    /**
+     * Get the code block data by relative or absolute path of the last assistant message
+     */
+    getCodeBlock(relativeOrAbsolutePath, messageId) {
+        if (!relativeOrAbsolutePath) {
+            return undefined;
+        }
+        const blockId = this.generateBlockId(relativeOrAbsolutePath, messageId);
+        return this.codeBlockMapObservable.get().get(blockId);
+    }
+    getCodeBlockById(id) {
+        return this.codeBlockMapObservable.get().get(id);
+    }
+    updateCodeBlock(codeBlock) {
+        const codeBlockMap = new Map(this.codeBlockMapObservable.get());
+        codeBlockMap.set(codeBlock.id, codeBlock);
+        (0, observable_1.transaction)((tx) => {
+            this.codeBlockMapObservable.set(codeBlockMap, tx);
+        });
+    }
+    /**
+     * Register a new code block and return its unique ID
+     */
+    registerCodeBlock(relativePath, content) {
+        const blockId = this.generateBlockId(relativePath);
+        if (!this.codeBlockMapObservable.get().has(blockId)) {
+            this.codeBlockMapObservable.get().set(blockId, {
+                id: blockId,
+                content,
+                relativePath,
+                status: 'generating',
+                iterationCount: 0,
+                createdAt: Date.now(),
+            });
+        }
+        return blockId;
+    }
+    initToolCallId(blockId, toolCallId) {
+        const blockData = this.getCodeBlockById(blockId);
+        if (blockData && !blockData.initToolCallId) {
+            blockData.initToolCallId = toolCallId;
+        }
+    }
+    /**
+     * Apply changes of a code block
+     */
+    async apply(relativePath, newContent, instructions) {
+        const blockData = this.getCodeBlock(relativePath);
+        if (!blockData) {
+            throw new Error('Code block not found');
+        }
+        try {
+            if (++blockData.iterationCount > 3) {
+                throw new Error('Max iteration count exceeded');
+            }
+            blockData.status = 'generating';
+            blockData.content = newContent;
+            this.updateCodeBlock(blockData);
+            const applyDiffResult = await this.doApply(relativePath, newContent, instructions);
+            blockData.applyResult = applyDiffResult;
+            this.updateCodeBlock(blockData);
+            return blockData;
+        }
+        catch (err) {
+            blockData.status = 'failed';
+            this.updateCodeBlock(blockData);
+            throw err;
+        }
+    }
+    async reRenderPendingApply() {
+        if (!this.pendingApplyParams) {
+            throw new Error('No pending apply params');
+        }
+        const result = await this.renderApplyResult(this.pendingApplyParams.relativePath, this.pendingApplyParams.newContent, this.pendingApplyParams.range);
+        if (result) {
+            const blockData = this.getCodeBlock(this.pendingApplyParams.relativePath);
+            blockData.applyResult = result;
+            this.updateCodeBlock(blockData);
+        }
+    }
+    async renderApplyResult(relativePath, newContent, range) {
+        var _a;
+        // 用户可能会关闭编辑器，所以需要缓存参数
+        this.pendingApplyParams = {
+            relativePath,
+            newContent,
+            range,
+        };
+        const blockData = this.getCodeBlock(relativePath);
+        if (!blockData) {
+            throw new Error('Code block not found');
+        }
+        const openResult = await this.editorService.open(ide_utils_1.URI.file(ide_utils_1.path.join(this.appConfig.workspaceDir, relativePath)));
+        if (!openResult) {
+            throw new Error('Failed to open editor');
+        }
+        const editor = openResult.group.codeEditor.monacoEditor;
+        const inlineDiffController = inline_diff_1.InlineDiffController.get(editor);
+        blockData.status = 'pending';
+        this.updateCodeBlock(blockData);
+        range = range || ((_a = editor.getModel()) === null || _a === void 0 ? void 0 : _a.getFullModelRange());
+        // Create diff previewer
+        const previewer = inlineDiffController.createDiffPreviewer(editor, ide_monaco_1.Selection.fromRange(range, ide_monaco_1.SelectionDirection.LTR), {
+            disposeWhenEditorClosed: true,
+            renderRemovedWidgetImmediately: true,
+        });
+        this.activePreviewer = previewer;
+        const fullOriginalContent = editor.getModel().getValue();
+        const savedContent = editor.getModel().getValueInRange(range);
+        const deferred = new ide_utils_1.Deferred();
+        if (newContent === savedContent) {
+            blockData.status = 'success';
+            deferred.resolve();
+        }
+        else {
+            previewer.setValue(newContent);
+            this.addDispose(this.inlineDiffService.onPartialEdit((event) => {
+                // TODO 支持自动保存
+                if (event.totalPartialEditCount === event.resolvedPartialEditCount) {
+                    if (event.acceptPartialEditCount > 0) {
+                        blockData.status = 'success';
+                        const appliedResult = editor.getModel().getValue();
+                        const diffResult = (0, diff_1.createPatch)(relativePath, fullOriginalContent, appliedResult)
+                            .split('\n')
+                            .slice(4)
+                            .join('\n');
+                        const rangesFromDiffHunk = diffResult
+                            .split('\n')
+                            .map((line) => {
+                            if (line.startsWith('@@')) {
+                                const [, , , start, end] = line.match(/@@ -(\d+),(\d+) \+(\d+),(\d+) @@/);
+                                return new ide_monaco_1.Range(parseInt(start, 10), 0, parseInt(end, 10), 0);
+                            }
+                            return null;
+                        })
+                            .filter((range) => range !== null);
+                        const diagnosticInfos = this.getdiagnosticInfos(editor.getModel().uri.toString(), rangesFromDiffHunk);
+                        // 移除开头的几个固定信息，避免浪费 tokens
+                        deferred.resolve({
+                            diff: diffResult,
+                            diagnosticInfos,
+                        });
+                    }
+                    else {
+                        // 用户全部取消
+                        blockData.status = 'cancelled';
+                        deferred.resolve();
+                    }
+                }
+            }));
+        }
+        return deferred.promise;
+    }
+    /**
+     * Cancel an ongoing apply operation
+     */
+    cancelApply(relativePath) {
+        var _a;
+        const blockData = this.getCodeBlock(relativePath);
+        if (blockData && (blockData.status === 'generating' || blockData.status === 'pending')) {
+            if (this.activePreviewer) {
+                (_a = this.activePreviewer.getNode()) === null || _a === void 0 ? void 0 : _a.livePreviewDiffDecorationModel.discardUnProcessed();
+                this.activePreviewer.dispose();
+            }
+            blockData.status = 'cancelled';
+            this.updateCodeBlock(blockData);
+        }
+    }
+    cancelAllApply() {
+        this.codeBlockMapObservable.get().forEach((blockData) => {
+            if (blockData.status === 'generating' || blockData.status === 'pending') {
+                this.cancelApply(blockData.relativePath);
+            }
+        });
+    }
+    disposeApplyForMessage(messageId) {
+        this.codeBlockMapObservable.get().forEach((blockData) => {
+            if (blockData.id.endsWith(':' + messageId)) {
+                if (blockData.status === 'generating') {
+                    this.cancelApply(blockData.relativePath);
+                }
+                this.codeBlockMapObservable.get().delete(blockData.id);
+            }
+        });
+    }
+    revealApplyPosition(blockId) {
+        var _a;
+        const blockData = this.codeBlockMapObservable.get().get(blockId);
+        if (blockData) {
+            const hunkInfo = (_a = blockData.applyResult) === null || _a === void 0 ? void 0 : _a.diff.split('\n').find((line) => line.startsWith('@@'));
+            let startLine = 0;
+            let endLine = 0;
+            if (hunkInfo) {
+                // 取改动后的区间
+                const [, , , start, end] = hunkInfo.match(/@@ -(\d+),(\d+) \+(\d+),(\d+) @@/);
+                startLine = parseInt(start, 10) - 1;
+                endLine = parseInt(end, 10) - 1;
+            }
+            this.editorService.open(ide_utils_1.URI.file(ide_utils_1.path.join(this.appConfig.workspaceDir, blockData.relativePath)));
+            const editor = this.editorService.currentEditor;
+            if (editor) {
+                editor.setSelection(new ide_monaco_1.Selection(startLine, 0, endLine, 0));
+            }
+        }
+    }
+    generateBlockId(absoluteOrRelativePath, messageId) {
+        if (!absoluteOrRelativePath.startsWith('/')) {
+            absoluteOrRelativePath = ide_utils_1.path.join(this.appConfig.workspaceDir, absoluteOrRelativePath);
+        }
+        const sessionId = this.chatInternalService.sessionModel.sessionId;
+        const messages = this.chatInternalService.sessionModel.history.getMessages();
+        messageId = messageId || messages[messages.length - 1].id;
+        return `${sessionId}:${absoluteOrRelativePath}:${messageId || '-'}`;
+    }
+    getdiagnosticInfos(uri, ranges) {
+        const markers = this.markerService.getManager().getMarkers({ resource: uri });
+        return markers.filter((marker) => marker.severity >= ide_core_browser_1.MarkerSeverity.Warning &&
+            ranges.some((range) => range.containsPosition(new ide_monaco_1.Position(marker.startLineNumber, marker.startColumn))));
+    }
+}
+exports.BaseApplyService = BaseApplyService;
+tslib_1.__decorate([
+    (0, di_1.Autowired)(ReadFile_1.FileHandler),
+    tslib_1.__metadata("design:type", ReadFile_1.FileHandler)
+], BaseApplyService.prototype, "fileHandler", void 0);
+tslib_1.__decorate([
+    (0, di_1.Autowired)(common_1.IChatInternalService),
+    tslib_1.__metadata("design:type", chat_internal_service_1.ChatInternalService)
+], BaseApplyService.prototype, "chatInternalService", void 0);
+tslib_1.__decorate([
+    (0, di_1.Autowired)(ide_core_browser_1.AppConfig),
+    tslib_1.__metadata("design:type", Object)
+], BaseApplyService.prototype, "appConfig", void 0);
+tslib_1.__decorate([
+    (0, di_1.Autowired)(ide_editor_1.WorkbenchEditorService),
+    tslib_1.__metadata("design:type", ide_editor_1.WorkbenchEditorService)
+], BaseApplyService.prototype, "editorService", void 0);
+tslib_1.__decorate([
+    (0, di_1.Autowired)(inline_diff_1.InlineDiffService),
+    tslib_1.__metadata("design:type", inline_diff_1.InlineDiffService)
+], BaseApplyService.prototype, "inlineDiffService", void 0);
+tslib_1.__decorate([
+    (0, di_1.Autowired)(ide_markers_1.IMarkerService),
+    tslib_1.__metadata("design:type", Object)
+], BaseApplyService.prototype, "markerService", void 0);
+tslib_1.__decorate([
+    (0, ide_core_browser_1.OnEvent)(browser_1.EditorGroupCloseEvent),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [browser_1.EditorGroupCloseEvent]),
+    tslib_1.__metadata("design:returntype", void 0)
+], BaseApplyService.prototype, "onEditorGroupClose", null);
+//# sourceMappingURL=base-apply.service.js.map

package/lib/browser/mcp/base-apply.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"base-apply.service.js","sourceRoot":"","sources":["../../../src/browser/mcp/base-apply.service.ts"],"names":[],"mappings":"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"}

package/lib/browser/mcp/mcp-server-proxy.service.d.ts

@@ -16,7 +16,12 @@ export declare class MCPServerProxyService implements IMCPServerProxyService {
     $getMCPTools(): Promise<{
         name: string;
         description: string;
-        inputSchema: any;
+        inputSchema: import("zod-to-json-schema").JsonSchema7Type & {
+            $schema?: string | undefined;
+            definitions?: {
+                [key: string]: import("zod-to-json-schema").JsonSchema7Type;
+            } | undefined;
+        };
         providerName: string;
     }[]>;
     $updateMCPServers(): Promise<void>;

package/lib/browser/mcp/mcp-server-proxy.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-server-proxy.service.d.ts","sourceRoot":"","sources":["../../../src/browser/mcp/mcp-server-proxy.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAW,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAG3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAG5D,qBACa,qBAAsB,YAAW,sBAAsB;IAElE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqB;IAGvD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IAGjC,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAwB;IAElE,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAsB;IAC1D,SAAgB,kBAAkB,EAAE,KAAK,CAAC,GAAG,CAAC,CAAkC;IAGhF,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG;;;;;;;IAK9B,YAAY;;;;;;IAiBZ,iBAAiB;IAIjB,cAAc;CAGrB"}
+{"version":3,"file":"mcp-server-proxy.service.d.ts","sourceRoot":"","sources":["../../../src/browser/mcp/mcp-server-proxy.service.ts"],"names":[],"mappings":"AAIA,OAAO,EAAW,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAG3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAG5D,qBACa,qBAAsB,YAAW,sBAAsB;IAElE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqB;IAGvD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IAGjC,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAwB;IAElE,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAsB;IAC1D,SAAgB,kBAAkB,EAAE,KAAK,CAAC,GAAG,CAAC,CAAkC;IAGhF,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG;;;;;;;IAK9B,YAAY;;;;;;;;;;;IAiBZ,iBAAiB;IAIjB,cAAc;CAGrB"}

package/lib/browser/mcp/mcp-server-proxy.service.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MCPServerProxyService = void 0;
 const tslib_1 = require("tslib");
+const zod_to_json_schema_1 = require("zod-to-json-schema");
 const di_1 = require("@opensumi/di");
 const ide_core_browser_1 = require("@opensumi/ide-core-browser");
 const ide_core_common_1 = require("@opensumi/ide-core-common");
@@ -23,7 +24,7 @@ let MCPServerProxyService = class MCPServerProxyService {
         ({
             name: tool.name,
             description: tool.description,
-            inputSchema: tool.inputSchema,
+            inputSchema: (0, zod_to_json_schema_1.zodToJsonSchema)(tool.inputSchema),
             providerName: 'sumi-builtin',
         }));
         this.logger.log('SUMI MCP tools', tools);

package/lib/browser/mcp/mcp-server-proxy.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-server-proxy.service.js","sourceRoot":"","sources":["../../../src/browser/mcp/mcp-server-proxy.service.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,iEAAqD;AACrD,+DAA2D;AAE3D,yCAAoF;AAEpF,oCAAsE;AAG/D,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAA3B;QAUY,wBAAmB,GAAG,IAAI,yBAAO,EAAO,CAAC;QAC1C,uBAAkB,GAAe,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC;IAgClF,CAAC;IA9BC,2BAA2B;IAC3B,YAAY,CAAC,IAAY,EAAE,IAAS;QAClC,OAAO,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACxD,CAAC;IAED,8BAA8B;IAC9B,KAAK,CAAC,YAAY;QAChB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACpE,eAAe;QACd,CAAC;YACA,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,YAAY,EAAE,cAAc;SAC7B,CAAC,CACH,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;QAEzC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,sBAAsB;IACtB,KAAK,CAAC,iBAAiB;QACrB,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,OAAO,IAAI,CAAC,yBAAyB,CAAC,cAAc,EAAE,CAAC;IACzD,CAAC;CACF,CAAA;AA3CY,sDAAqB;AAEf;IADhB,IAAA,cAAS,EAAC,8BAAsB,CAAC;;gEACqB;AAGtC;IADhB,IAAA,cAAS,EAAC,0BAAO,CAAC;;qDACc;AAGhB;IADhB,IAAA,cAAS,EAAC,sCAA6B,CAAC;;wEACyB;gCARvD,qBAAqB;IADjC,IAAA,eAAU,GAAE;GACA,qBAAqB,CA2CjC"}
+{"version":3,"file":"mcp-server-proxy.service.js","sourceRoot":"","sources":["../../../src/browser/mcp/mcp-server-proxy.service.ts"],"names":[],"mappings":";;;;AAAA,2DAAqD;AAErD,qCAAqD;AACrD,iEAAqD;AACrD,+DAA2D;AAE3D,yCAAoF;AAEpF,oCAAsE;AAG/D,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAA3B;QAUY,wBAAmB,GAAG,IAAI,yBAAO,EAAO,CAAC;QAC1C,uBAAkB,GAAe,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC;IAgClF,CAAC;IA9BC,2BAA2B;IAC3B,YAAY,CAAC,IAAY,EAAE,IAAS;QAClC,OAAO,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACxD,CAAC;IAED,8BAA8B;IAC9B,KAAK,CAAC,YAAY;QAChB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACpE,eAAe;QACf,CAAC;YACC,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,WAAW,EAAE,IAAA,oCAAe,EAAC,IAAI,CAAC,WAAW,CAAC;YAC9C,YAAY,EAAE,cAAc;SAC7B,CAAC,CACH,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;QAEzC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,sBAAsB;IACtB,KAAK,CAAC,iBAAiB;QACrB,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,OAAO,IAAI,CAAC,yBAAyB,CAAC,cAAc,EAAE,CAAC;IACzD,CAAC;CACF,CAAA;AA3CY,sDAAqB;AAEf;IADhB,IAAA,cAAS,EAAC,8BAAsB,CAAC;;gEACqB;AAGtC;IADhB,IAAA,cAAS,EAAC,0BAAO,CAAC;;qDACc;AAGhB;IADhB,IAAA,cAAS,EAAC,sCAA6B,CAAC;;wEACyB;gCARvD,qBAAqB;IADjC,IAAA,eAAU,GAAE;GACA,qBAAqB,CA2CjC"}

package/lib/browser/mcp/mcp-server.feature.registry.d.ts

@@ -1,9 +1,13 @@
-import { IMCPServerRegistry, MCPToolDefinition } from '../types';
+import { IMCPServerRegistry, IMCPServerToolComponentProps, MCPToolDefinition } from '../types';
 export declare class MCPServerRegistry implements IMCPServerRegistry {
     private tools;
+    private toolComponents;
     private readonly baseLogger;
     private get logger();
+    getMCPTool(name: string, serverName?: string): MCPToolDefinition | undefined;
     registerMCPTool(tool: MCPToolDefinition): void;
+    registerToolComponent(name: string, component: React.FC<IMCPServerToolComponentProps>, serverName?: string): void;
+    getToolComponent(name: string): React.FC<IMCPServerToolComponentProps> | undefined;
     getMCPTools(): MCPToolDefinition[];
     callMCPTool(name: string, args: any): Promise<{
         content: {

package/lib/browser/mcp/mcp-server.feature.registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-server.feature.registry.d.ts","sourceRoot":"","sources":["../../../src/browser/mcp/mcp-server.feature.registry.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAa,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAU5E,qBACa,iBAAkB,YAAW,kBAAkB;IAC1D,OAAO,CAAC,KAAK,CAA2B;IAGxC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAU;IAErC,OAAO,KAAK,MAAM,GAEjB;IAED,eAAe,CAAC,IAAI,EAAE,iBAAiB,GAAG,IAAI;IAI9C,WAAW,IAAI,iBAAiB,EAAE;IAI5B,WAAW,CACf,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,GAAG,GACR,OAAO,CAAC;QACT,OAAO,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QAC1C,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB,CAAC;CAcH"}
+{"version":3,"file":"mcp-server.feature.registry.d.ts","sourceRoot":"","sources":["../../../src/browser/mcp/mcp-server.feature.registry.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAAE,4BAA4B,EAAa,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAU1G,qBACa,iBAAkB,YAAW,kBAAkB;IAC1D,OAAO,CAAC,KAAK,CAA2B;IACxC,OAAO,CAAC,cAAc,CAA8D;IAGpF,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAU;IAErC,OAAO,KAAK,MAAM,GAEjB;IAED,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,SAAiB,GAAG,iBAAiB,GAAG,SAAS;IAIpF,eAAe,CAAC,IAAI,EAAE,iBAAiB,GAAG,IAAI;IAI9C,qBAAqB,CACnB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,4BAA4B,CAAC,EACjD,UAAU,SAAiB,GAC1B,IAAI;IAIP,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC,EAAE,CAAC,4BAA4B,CAAC,GAAG,SAAS;IAIlF,WAAW,IAAI,iBAAiB,EAAE;IAI5B,WAAW,CACf,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,GAAG,GACR,OAAO,CAAC;QACT,OAAO,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QAC1C,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB,CAAC;CAmBH"}

package/lib/browser/mcp/mcp-server.feature.registry.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 // OpenSumi as MCP Server 前端的代理服务
 const di_1 = require("@opensumi/di");
 const ide_core_common_1 = require("@opensumi/ide-core-common");
+const utils_1 = require("../../common/utils");
 class LoggerAdapter {
     constructor(logger) {
         this.logger = logger;
@@ -16,13 +17,23 @@ class LoggerAdapter {
 let MCPServerRegistry = class MCPServerRegistry {
     constructor() {
         this.tools = [];
+        this.toolComponents = {};
     }
     get logger() {
         return new LoggerAdapter(this.baseLogger);
     }
+    getMCPTool(name, serverName = 'sumi-builtin') {
+        return this.tools.find((tool) => (0, utils_1.getToolName)(tool.name, serverName) === name);
+    }
     registerMCPTool(tool) {
         this.tools.push(tool);
     }
+    registerToolComponent(name, component, serverName = 'sumi-builtin') {
+        this.toolComponents[(0, utils_1.getToolName)(name, serverName)] = component;
+    }
+    getToolComponent(name) {
+        return this.toolComponents[name];
+    }
     getMCPTools() {
         return this.tools;
     }
@@ -32,9 +43,14 @@ let MCPServerRegistry = class MCPServerRegistry {
             if (!tool) {
                 throw new Error(`MCP tool ${name} not found`);
             }
-            return await tool.handler(args, this.logger);
+            // 统一校验并转换
+            const toolCallId = args.toolCallId;
+            args = tool.inputSchema.parse(args);
+            return await tool.handler({ ...args, toolCallId }, this.logger);
         }
         catch (error) {
+            // eslint-disable-next-line no-console
+            console.error('callMCPTool error:', error);
             return {
                 content: [{ type: 'text', text: `The tool ${name} failed to execute. Error: ${error}` }],
                 isError: true,

package/lib/browser/mcp/mcp-server.feature.registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-server.feature.registry.js","sourceRoot":"","sources":["../../../src/browser/mcp/mcp-server.feature.registry.ts"],"names":[],"mappings":";;;;AAAA,iCAAiC;AACjC,qCAAqD;AACrD,+DAAoE;AAIpE,MAAM,aAAa;IACjB,YAA6B,MAAe;QAAf,WAAM,GAAN,MAAM,CAAS;IAAI,CAAC;IAEjD,UAAU,CAAC,OAAe;QACxB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;CACF;AAGM,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAAvB;QACG,UAAK,GAAwB,EAAE,CAAC;IAqC1C,CAAC;IAhCC,IAAY,MAAM;QAChB,OAAO,IAAI,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC5C,CAAC;IAED,eAAe,CAAC,IAAuB;QACrC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,WAAW,CACf,IAAY,EACZ,IAAS;QAKT,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;YAC3D,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,MAAM,IAAI,KAAK,CAAC,YAAY,IAAI,YAAY,CAAC,CAAC;YAChD,CAAC;YACD,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC/C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO;gBACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,IAAI,8BAA8B,KAAK,EAAE,EAAE,CAAC;gBACxF,OAAO,EAAE,IAAI;aACd,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAA;AAtCY,8CAAiB;AAIX;IADhB,IAAA,cAAS,EAAC,yBAAO,CAAC;;qDACkB;4BAJ1B,iBAAiB;IAD7B,IAAA,eAAU,GAAE;GACA,iBAAiB,CAsC7B"}
+{"version":3,"file":"mcp-server.feature.registry.js","sourceRoot":"","sources":["../../../src/browser/mcp/mcp-server.feature.registry.ts"],"names":[],"mappings":";;;;AAAA,iCAAiC;AACjC,qCAAqD;AACrD,+DAAoD;AAEpD,8CAAiD;AAGjD,MAAM,aAAa;IACjB,YAA6B,MAAe;QAAf,WAAM,GAAN,MAAM,CAAS;IAAG,CAAC;IAEhD,UAAU,CAAC,OAAe;QACxB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;CACF;AAGM,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAAvB;QACG,UAAK,GAAwB,EAAE,CAAC;QAChC,mBAAc,GAA2D,EAAE,CAAC;IA0DtF,CAAC;IArDC,IAAY,MAAM;QAChB,OAAO,IAAI,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC5C,CAAC;IAED,UAAU,CAAC,IAAY,EAAE,UAAU,GAAG,cAAc;QAClD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,mBAAW,EAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,KAAK,IAAI,CAAC,CAAC;IAChF,CAAC;IAED,eAAe,CAAC,IAAuB;QACrC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;IAED,qBAAqB,CACnB,IAAY,EACZ,SAAiD,EACjD,UAAU,GAAG,cAAc;QAE3B,IAAI,CAAC,cAAc,CAAC,IAAA,mBAAW,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC,GAAG,SAAS,CAAC;IACjE,CAAC;IAED,gBAAgB,CAAC,IAAY;QAC3B,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,WAAW,CACf,IAAY,EACZ,IAAS;QAKT,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;YAC3D,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,MAAM,IAAI,KAAK,CAAC,YAAY,IAAI,YAAY,CAAC,CAAC;YAChD,CAAC;YACD,UAAU;YACV,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;YACnC,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACpC,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,IAAI,EAAE,UAAU,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAClE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,sCAAsC;YACtC,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;YAC3C,OAAO;gBACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,IAAI,8BAA8B,KAAK,EAAE,EAAE,CAAC;gBACxF,OAAO,EAAE,IAAI;aACd,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAA;AA5DY,8CAAiB;AAKX;IADhB,IAAA,cAAS,EAAC,yBAAO,CAAC;;qDACkB;4BAL1B,iBAAiB;IAD7B,IAAA,eAAU,GAAE;GACA,iBAAiB,CA4D7B"}

package/lib/browser/mcp/tools/components/EditFile.d.ts

@@ -0,0 +1,3 @@
+import { IMCPServerToolComponentProps } from '../../../types';
+export declare const EditFileToolComponent: (props: IMCPServerToolComponentProps) => any[] | null;
+//# sourceMappingURL=EditFile.d.ts.map

package/lib/browser/mcp/tools/components/EditFile.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"EditFile.d.ts","sourceRoot":"","sources":["../../../../../src/browser/mcp/tools/components/EditFile.tsx"],"names":[],"mappings":"AAqBA,OAAO,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAC;AAuC9D,eAAO,MAAM,qBAAqB,UAAW,4BAA4B,iBAmFxE,CAAC"}