@opensumi/ide-ai-native 3.7.2-next-1740107209.0 → 3.7.2-next-1740365741.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/browser/ai-core.contribution.d.ts +3 -1
- package/lib/browser/ai-core.contribution.d.ts.map +1 -1
- package/lib/browser/ai-core.contribution.js +13 -1
- package/lib/browser/ai-core.contribution.js.map +1 -1
- package/lib/browser/chat/chat-manager.service.d.ts +30 -2
- package/lib/browser/chat/chat-manager.service.d.ts.map +1 -1
- package/lib/browser/chat/chat-manager.service.js +45 -1
- package/lib/browser/chat/chat-manager.service.js.map +1 -1
- package/lib/browser/chat/chat-model.d.ts +33 -6
- package/lib/browser/chat/chat-model.d.ts.map +1 -1
- package/lib/browser/chat/chat-model.js +50 -29
- package/lib/browser/chat/chat-model.js.map +1 -1
- package/lib/browser/chat/chat-proxy.service.d.ts +1 -1
- package/lib/browser/chat/chat-proxy.service.d.ts.map +1 -1
- package/lib/browser/chat/chat-proxy.service.js +1 -1
- package/lib/browser/chat/chat-proxy.service.js.map +1 -1
- package/lib/browser/chat/chat.internal.service.d.ts +4 -2
- package/lib/browser/chat/chat.internal.service.d.ts.map +1 -1
- package/lib/browser/chat/chat.internal.service.js +31 -12
- package/lib/browser/chat/chat.internal.service.js.map +1 -1
- package/lib/browser/chat/chat.module.less +8 -42
- package/lib/browser/chat/chat.view.d.ts.map +1 -1
- package/lib/browser/chat/chat.view.js +85 -31
- package/lib/browser/chat/chat.view.js.map +1 -1
- package/lib/browser/components/ChatContext/index.d.ts.map +1 -1
- package/lib/browser/components/ChatContext/index.js +18 -2
- package/lib/browser/components/ChatContext/index.js.map +1 -1
- package/lib/browser/components/ChatContext/style.module.less +12 -0
- package/lib/browser/components/ChatHistory.d.ts +21 -0
- package/lib/browser/components/ChatHistory.d.ts.map +1 -0
- package/lib/browser/components/ChatHistory.js +148 -0
- package/lib/browser/components/ChatHistory.js.map +1 -0
- package/lib/browser/components/ChatReply.d.ts.map +1 -1
- package/lib/browser/components/ChatReply.js +3 -1
- package/lib/browser/components/ChatReply.js.map +1 -1
- package/lib/browser/components/ChatThinking.js +1 -1
- package/lib/browser/components/ChatThinking.js.map +1 -1
- package/lib/browser/components/ChatToolRender.d.ts +1 -1
- package/lib/browser/components/ChatToolRender.d.ts.map +1 -1
- package/lib/browser/components/ChatToolRender.js +15 -18
- package/lib/browser/components/ChatToolRender.js.map +1 -1
- package/lib/browser/components/chat-history.css +139 -0
- package/lib/browser/components/components.module.less +2 -2
- package/lib/browser/components/utils.d.ts +2 -2
- package/lib/browser/context/llm-context.service.d.ts +1 -0
- package/lib/browser/context/llm-context.service.d.ts.map +1 -1
- package/lib/browser/context/llm-context.service.js +24 -18
- package/lib/browser/context/llm-context.service.js.map +1 -1
- package/lib/browser/index.d.ts.map +1 -1
- package/lib/browser/index.js +5 -13
- package/lib/browser/index.js.map +1 -1
- package/lib/browser/layout/layout.module.less +1 -1
- package/lib/browser/mcp/mcp-server.feature.registry.d.ts.map +1 -1
- package/lib/browser/mcp/mcp-server.feature.registry.js +2 -1
- package/lib/browser/mcp/mcp-server.feature.registry.js.map +1 -1
- package/lib/browser/mcp/tools/components/SearchResult.d.ts +11 -0
- package/lib/browser/mcp/tools/components/SearchResult.d.ts.map +1 -0
- package/lib/browser/mcp/tools/components/SearchResult.js +60 -0
- package/lib/browser/mcp/tools/components/SearchResult.js.map +1 -0
- package/lib/browser/mcp/tools/components/Terminal.d.ts +4 -0
- package/lib/browser/mcp/tools/components/Terminal.d.ts.map +1 -0
- package/lib/browser/mcp/tools/components/Terminal.js +64 -0
- package/lib/browser/mcp/tools/components/Terminal.js.map +1 -0
- package/lib/browser/mcp/tools/components/index.module.less +101 -0
- package/lib/browser/mcp/tools/{findFilesByNameSubstring.d.ts → fileSearch.d.ts} +3 -2
- package/lib/browser/mcp/tools/fileSearch.d.ts.map +1 -0
- package/lib/browser/mcp/tools/fileSearch.js +94 -0
- package/lib/browser/mcp/tools/fileSearch.js.map +1 -0
- package/lib/browser/mcp/tools/{getFileTextByPath.d.ts → grepSearch.d.ts} +4 -3
- package/lib/browser/mcp/tools/grepSearch.d.ts.map +1 -0
- package/lib/browser/mcp/tools/grepSearch.js +118 -0
- package/lib/browser/mcp/tools/grepSearch.js.map +1 -0
- package/lib/browser/mcp/tools/handlers/RunCommand.d.ts +43 -0
- package/lib/browser/mcp/tools/handlers/RunCommand.d.ts.map +1 -0
- package/lib/browser/mcp/tools/handlers/RunCommand.js +104 -0
- package/lib/browser/mcp/tools/handlers/RunCommand.js.map +1 -0
- package/lib/browser/mcp/tools/listDir.d.ts.map +1 -1
- package/lib/browser/mcp/tools/listDir.js +1 -0
- package/lib/browser/mcp/tools/listDir.js.map +1 -1
- package/lib/browser/mcp/tools/readFile.d.ts.map +1 -1
- package/lib/browser/mcp/tools/readFile.js +1 -0
- package/lib/browser/mcp/tools/readFile.js.map +1 -1
- package/lib/browser/mcp/tools/runTerminalCmd.d.ts +1 -6
- package/lib/browser/mcp/tools/runTerminalCmd.d.ts.map +1 -1
- package/lib/browser/mcp/tools/runTerminalCmd.js +9 -55
- package/lib/browser/mcp/tools/runTerminalCmd.js.map +1 -1
- package/lib/browser/model/msg-history-manager.d.ts +15 -0
- package/lib/browser/model/msg-history-manager.d.ts.map +1 -1
- package/lib/browser/model/msg-history-manager.js +28 -9
- package/lib/browser/model/msg-history-manager.js.map +1 -1
- package/lib/common/mcp-server-manager.d.ts +1 -1
- package/lib/common/mcp-server-manager.d.ts.map +1 -1
- package/lib/common/mcp-server-manager.js.map +1 -1
- package/lib/common/tool-invocation-registry.d.ts +2 -1
- package/lib/common/tool-invocation-registry.d.ts.map +1 -1
- package/lib/common/tool-invocation-registry.js.map +1 -1
- package/lib/node/base-language-model.d.ts.map +1 -1
- package/lib/node/base-language-model.js +1 -1
- package/lib/node/base-language-model.js.map +1 -1
- package/lib/node/mcp/sumi-mcp-server.d.ts +1 -1
- package/lib/node/mcp/sumi-mcp-server.d.ts.map +1 -1
- package/lib/node/mcp/sumi-mcp-server.js +5 -2
- package/lib/node/mcp/sumi-mcp-server.js.map +1 -1
- package/lib/node/mcp-server-manager-impl.d.ts +1 -1
- package/lib/node/mcp-server-manager-impl.d.ts.map +1 -1
- package/lib/node/mcp-server-manager-impl.js +4 -4
- package/lib/node/mcp-server-manager-impl.js.map +1 -1
- package/lib/node/mcp-server.d.ts +2 -2
- package/lib/node/mcp-server.d.ts.map +1 -1
- package/lib/node/mcp-server.js +2 -1
- package/lib/node/mcp-server.js.map +1 -1
- package/package.json +23 -22
- package/src/browser/ai-core.contribution.ts +13 -1
- package/src/browser/chat/chat-manager.service.ts +83 -7
- package/src/browser/chat/chat-model.ts +62 -12
- package/src/browser/chat/chat-proxy.service.ts +1 -1
- package/src/browser/chat/chat.internal.service.ts +23 -5
- package/src/browser/chat/chat.module.less +8 -42
- package/src/browser/chat/chat.view.tsx +143 -60
- package/src/browser/components/ChatContext/index.tsx +19 -3
- package/src/browser/components/ChatContext/style.module.less +12 -0
- package/src/browser/components/ChatHistory.tsx +292 -0
- package/src/browser/components/ChatReply.tsx +5 -1
- package/src/browser/components/ChatThinking.tsx +1 -1
- package/src/browser/components/ChatToolRender.tsx +13 -15
- package/src/browser/components/chat-history.css +139 -0
- package/src/browser/components/components.module.less +2 -2
- package/src/browser/context/llm-context.service.ts +30 -18
- package/src/browser/index.ts +5 -13
- package/src/browser/layout/layout.module.less +1 -1
- package/src/browser/mcp/mcp-server.feature.registry.ts +2 -1
- package/src/browser/mcp/tools/components/SearchResult.tsx +92 -0
- package/src/browser/mcp/tools/components/Terminal.tsx +97 -0
- package/src/browser/mcp/tools/components/index.module.less +101 -0
- package/src/browser/mcp/tools/fileSearch.ts +99 -0
- package/src/browser/mcp/tools/grepSearch.ts +121 -0
- package/src/browser/mcp/tools/handlers/RunCommand.ts +115 -0
- package/src/browser/mcp/tools/listDir.ts +1 -0
- package/src/browser/mcp/tools/readFile.ts +1 -0
- package/src/browser/mcp/tools/runTerminalCmd.ts +7 -68
- package/src/browser/model/msg-history-manager.ts +34 -1
- package/src/common/mcp-server-manager.ts +18 -13
- package/src/common/tool-invocation-registry.ts +122 -124
- package/src/node/base-language-model.ts +3 -2
- package/src/node/mcp/sumi-mcp-server.ts +5 -2
- package/src/node/mcp-server-manager-impl.ts +11 -4
- package/src/node/mcp-server.ts +3 -2
- package/lib/browser/mcp/tools/findFilesByNameSubstring.d.ts.map +0 -1
- package/lib/browser/mcp/tools/findFilesByNameSubstring.js +0 -91
- package/lib/browser/mcp/tools/findFilesByNameSubstring.js.map +0 -1
- package/lib/browser/mcp/tools/getCurrentFilePath.d.ts +0 -8
- package/lib/browser/mcp/tools/getCurrentFilePath.d.ts.map +0 -1
- package/lib/browser/mcp/tools/getCurrentFilePath.js +0 -48
- package/lib/browser/mcp/tools/getCurrentFilePath.js.map +0 -1
- package/lib/browser/mcp/tools/getFileTextByPath.d.ts.map +0 -1
- package/lib/browser/mcp/tools/getFileTextByPath.js +0 -96
- package/lib/browser/mcp/tools/getFileTextByPath.js.map +0 -1
- package/lib/browser/mcp/tools/getOpenEditorFileText.d.ts +0 -8
- package/lib/browser/mcp/tools/getOpenEditorFileText.d.ts.map +0 -1
- package/lib/browser/mcp/tools/getOpenEditorFileText.js +0 -49
- package/lib/browser/mcp/tools/getOpenEditorFileText.js.map +0 -1
- package/lib/browser/mcp/tools/getSelectedText.d.ts +0 -8
- package/lib/browser/mcp/tools/getSelectedText.d.ts.map +0 -1
- package/lib/browser/mcp/tools/getSelectedText.js +0 -56
- package/lib/browser/mcp/tools/getSelectedText.js.map +0 -1
- package/lib/browser/mcp/tools/replaceOpenEditorFile.d.ts +0 -8
- package/lib/browser/mcp/tools/replaceOpenEditorFile.d.ts.map +0 -1
- package/lib/browser/mcp/tools/replaceOpenEditorFile.js +0 -80
- package/lib/browser/mcp/tools/replaceOpenEditorFile.js.map +0 -1
- package/lib/browser/mcp/tools/replaceOpenEditorFileByDiffPreviewer.d.ts +0 -8
- package/lib/browser/mcp/tools/replaceOpenEditorFileByDiffPreviewer.d.ts.map +0 -1
- package/lib/browser/mcp/tools/replaceOpenEditorFileByDiffPreviewer.js +0 -83
- package/lib/browser/mcp/tools/replaceOpenEditorFileByDiffPreviewer.js.map +0 -1
- package/src/browser/mcp/tools/findFilesByNameSubstring.ts +0 -92
- package/src/browser/mcp/tools/getCurrentFilePath.ts +0 -48
- package/src/browser/mcp/tools/getFileTextByPath.ts +0 -96
- package/src/browser/mcp/tools/getOpenEditorFileText.ts +0 -49
- package/src/browser/mcp/tools/getSelectedText.ts +0 -56
- package/src/browser/mcp/tools/replaceOpenEditorFile.ts +0 -81
- package/src/browser/mcp/tools/replaceOpenEditorFileByDiffPreviewer.ts +0 -90
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { IMCPServerRegistry, MCPServerContribution, MCPToolDefinition } from '../../types';
|
|
2
|
-
export declare class
|
|
2
|
+
export declare class GrepSearchTool implements MCPServerContribution {
|
|
3
3
|
private readonly workspaceService;
|
|
4
|
-
private readonly
|
|
4
|
+
private readonly searchService;
|
|
5
|
+
private readonly chatInternalService;
|
|
5
6
|
registerMCPServer(registry: IMCPServerRegistry): void;
|
|
6
7
|
getToolDefinition(): MCPToolDefinition;
|
|
7
8
|
private handler;
|
|
8
9
|
}
|
|
9
|
-
//# sourceMappingURL=
|
|
10
|
+
//# sourceMappingURL=grepSearch.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"grepSearch.d.ts","sourceRoot":"","sources":["../../../../src/browser/mcp/tools/grepSearch.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,kBAAkB,EAAa,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAoBtG,qBACa,cAAe,YAAW,qBAAqB;IAE1D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAoB;IAGrD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA6B;IAG3D,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAsB;IAE1D,iBAAiB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;IAKrD,iBAAiB,IAAI,iBAAiB;YAYxB,OAAO;CA8DtB"}
|
|
@@ -0,0 +1,118 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.GrepSearchTool = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const zod_1 = require("zod");
|
|
6
|
+
const di_1 = require("@opensumi/di");
|
|
7
|
+
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
8
|
+
const ide_search_1 = require("@opensumi/ide-search");
|
|
9
|
+
const search_service_1 = require("@opensumi/ide-search/lib/browser/search.service");
|
|
10
|
+
const ide_workspace_1 = require("@opensumi/ide-workspace");
|
|
11
|
+
const common_1 = require("../../../common");
|
|
12
|
+
const chat_internal_service_1 = require("../../chat/chat.internal.service");
|
|
13
|
+
const types_1 = require("../../types");
|
|
14
|
+
const SearchResult_1 = require("./components/SearchResult");
|
|
15
|
+
const inputSchema = zod_1.z.object({
|
|
16
|
+
query: zod_1.z.string().describe('The regex pattern to search for'),
|
|
17
|
+
case_sensitive: zod_1.z.boolean().optional().describe('Whether the search should be case sensitive'),
|
|
18
|
+
include_pattern: zod_1.z
|
|
19
|
+
.string()
|
|
20
|
+
.optional()
|
|
21
|
+
.describe('Glob pattern for files to include (e.g. "*.ts" for TypeScript files)'),
|
|
22
|
+
exclude_pattern: zod_1.z.string().optional().describe('Glob pattern for files to exclude'),
|
|
23
|
+
explanation: zod_1.z
|
|
24
|
+
.string()
|
|
25
|
+
.optional()
|
|
26
|
+
.describe('One sentence explanation as to why this tool is being used, and how it contributes to the goal.'),
|
|
27
|
+
});
|
|
28
|
+
const MAX_RESULTS = 50;
|
|
29
|
+
let GrepSearchTool = class GrepSearchTool {
|
|
30
|
+
registerMCPServer(registry) {
|
|
31
|
+
registry.registerMCPTool(this.getToolDefinition());
|
|
32
|
+
registry.registerToolComponent('grep_search', SearchResult_1.GrepSearchToolComponent);
|
|
33
|
+
}
|
|
34
|
+
getToolDefinition() {
|
|
35
|
+
return {
|
|
36
|
+
name: 'grep_search',
|
|
37
|
+
label: 'Search Contents',
|
|
38
|
+
description:
|
|
39
|
+
// TODO: 支持语义化搜索后需要描述清楚优劣势
|
|
40
|
+
'Fast text-based regex search that finds exact pattern matches within files or directories, utilizing the ripgrep command for efficient searching.\nResults will be formatted in the style of ripgrep and can be configured to include line numbers and content.\nTo avoid overwhelming output, the results are capped at 50 matches.\nUse the include or exclude patterns to filter the search scope by file type or specific paths.\n\nThis is best for finding exact text matches or regex patterns.',
|
|
41
|
+
inputSchema,
|
|
42
|
+
handler: this.handler.bind(this),
|
|
43
|
+
};
|
|
44
|
+
}
|
|
45
|
+
async handler(args, logger) {
|
|
46
|
+
var _a, _b;
|
|
47
|
+
if (!args.query) {
|
|
48
|
+
throw new Error('No ripgrep search parameters provided. Need to give at least a query.');
|
|
49
|
+
}
|
|
50
|
+
// 获取工作区根目录
|
|
51
|
+
const workspaceRoots = this.workspaceService.tryGetRoots();
|
|
52
|
+
if (!workspaceRoots || workspaceRoots.length === 0) {
|
|
53
|
+
throw new Error('Cannot determine project directory');
|
|
54
|
+
}
|
|
55
|
+
// 使用 OpenSumi 的文件搜索 API
|
|
56
|
+
const searchPattern = args.query;
|
|
57
|
+
await this.searchService.doSearch(searchPattern, {
|
|
58
|
+
isMatchCase: !!args.case_sensitive,
|
|
59
|
+
include: (_a = args.include_pattern) === null || _a === void 0 ? void 0 : _a.split(','),
|
|
60
|
+
exclude: (_b = args.exclude_pattern) === null || _b === void 0 ? void 0 : _b.split(','),
|
|
61
|
+
maxResults: MAX_RESULTS,
|
|
62
|
+
isUseRegexp: true,
|
|
63
|
+
isToggleOpen: false,
|
|
64
|
+
isDetailOpen: false,
|
|
65
|
+
isWholeWord: false,
|
|
66
|
+
isOnlyOpenEditors: false,
|
|
67
|
+
isIncludeIgnored: false,
|
|
68
|
+
}, ide_core_common_1.CancellationToken.None);
|
|
69
|
+
const deferred = new ide_core_common_1.Deferred();
|
|
70
|
+
this.searchService.onDidChange(() => {
|
|
71
|
+
if (this.searchService.isSearching) {
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
74
|
+
const results = [];
|
|
75
|
+
const files = [];
|
|
76
|
+
for (const [fileUri, result] of this.searchService.searchResults.entries()) {
|
|
77
|
+
results.push(`File: ${fileUri}\n${result
|
|
78
|
+
.reduce((acc, r) => {
|
|
79
|
+
if (acc.find((a) => a.line === r.line)) {
|
|
80
|
+
return acc;
|
|
81
|
+
}
|
|
82
|
+
return [...acc, r];
|
|
83
|
+
}, [])
|
|
84
|
+
.map((r) => `Line: ${r.line}\nContent: ${r.lineText || r.renderLineText}`)
|
|
85
|
+
.join('\n')}`);
|
|
86
|
+
files.push(fileUri);
|
|
87
|
+
}
|
|
88
|
+
deferred.resolve(results.join('\n\n'));
|
|
89
|
+
const messages = this.chatInternalService.sessionModel.history.getMessages();
|
|
90
|
+
this.chatInternalService.sessionModel.history.setMessageAdditional(messages[messages.length - 1].id, {
|
|
91
|
+
[args.toolCallId]: {
|
|
92
|
+
files,
|
|
93
|
+
},
|
|
94
|
+
});
|
|
95
|
+
});
|
|
96
|
+
const text = await deferred.promise;
|
|
97
|
+
return {
|
|
98
|
+
content: [{ type: 'text', text }],
|
|
99
|
+
};
|
|
100
|
+
}
|
|
101
|
+
};
|
|
102
|
+
exports.GrepSearchTool = GrepSearchTool;
|
|
103
|
+
tslib_1.__decorate([
|
|
104
|
+
(0, di_1.Autowired)(ide_workspace_1.IWorkspaceService),
|
|
105
|
+
tslib_1.__metadata("design:type", Object)
|
|
106
|
+
], GrepSearchTool.prototype, "workspaceService", void 0);
|
|
107
|
+
tslib_1.__decorate([
|
|
108
|
+
(0, di_1.Autowired)(ide_search_1.IContentSearchClientService),
|
|
109
|
+
tslib_1.__metadata("design:type", search_service_1.ContentSearchClientService)
|
|
110
|
+
], GrepSearchTool.prototype, "searchService", void 0);
|
|
111
|
+
tslib_1.__decorate([
|
|
112
|
+
(0, di_1.Autowired)(common_1.IChatInternalService),
|
|
113
|
+
tslib_1.__metadata("design:type", chat_internal_service_1.ChatInternalService)
|
|
114
|
+
], GrepSearchTool.prototype, "chatInternalService", void 0);
|
|
115
|
+
exports.GrepSearchTool = GrepSearchTool = tslib_1.__decorate([
|
|
116
|
+
(0, ide_core_common_1.Domain)(types_1.MCPServerContribution)
|
|
117
|
+
], GrepSearchTool);
|
|
118
|
+
//# sourceMappingURL=grepSearch.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"grepSearch.js","sourceRoot":"","sources":["../../../../src/browser/mcp/tools/grepSearch.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import z from 'zod';
|
|
2
|
+
import { AppConfig } from '@opensumi/ide-core-browser';
|
|
3
|
+
import { ITerminalController, ITerminalGroupViewService } from '@opensumi/ide-terminal-next';
|
|
4
|
+
import { MCPLogger } from '../../../types';
|
|
5
|
+
export declare const inputSchema: z.ZodObject<{
|
|
6
|
+
command: z.ZodString;
|
|
7
|
+
is_background: z.ZodBoolean;
|
|
8
|
+
explanation: z.ZodString;
|
|
9
|
+
require_user_approval: z.ZodBoolean;
|
|
10
|
+
}, "strip", z.ZodTypeAny, {
|
|
11
|
+
command: string;
|
|
12
|
+
explanation: string;
|
|
13
|
+
is_background: boolean;
|
|
14
|
+
require_user_approval: boolean;
|
|
15
|
+
}, {
|
|
16
|
+
command: string;
|
|
17
|
+
explanation: string;
|
|
18
|
+
is_background: boolean;
|
|
19
|
+
require_user_approval: boolean;
|
|
20
|
+
}>;
|
|
21
|
+
export declare class RunCommandHandler {
|
|
22
|
+
protected readonly terminalController: ITerminalController;
|
|
23
|
+
protected readonly appConfig: AppConfig;
|
|
24
|
+
protected readonly terminalView: ITerminalGroupViewService;
|
|
25
|
+
private approvalDeferredMap;
|
|
26
|
+
private terminalId;
|
|
27
|
+
getShellLaunchConfig(command: string): {
|
|
28
|
+
name: string;
|
|
29
|
+
cwd: string;
|
|
30
|
+
args: string[];
|
|
31
|
+
};
|
|
32
|
+
handler(args: z.infer<typeof inputSchema> & {
|
|
33
|
+
toolCallId: string;
|
|
34
|
+
}, logger: MCPLogger): Promise<{
|
|
35
|
+
isError?: boolean;
|
|
36
|
+
content: {
|
|
37
|
+
type: string;
|
|
38
|
+
text: string;
|
|
39
|
+
}[];
|
|
40
|
+
}>;
|
|
41
|
+
handleApproval(callId: string, approval: boolean): void;
|
|
42
|
+
}
|
|
43
|
+
//# sourceMappingURL=RunCommand.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"RunCommand.d.ts","sourceRoot":"","sources":["../../../../../src/browser/mcp/tools/handlers/RunCommand.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAC;AAGpB,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAG7F,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAO3C,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;EAWtB,CAAC;AAEH,qBACa,iBAAiB;IAE5B,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,mBAAmB,CAAC;IAG3D,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAGxC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,yBAAyB,CAAC;IAE3D,OAAO,CAAC,mBAAmB,CAAwC;IAEnE,OAAO,CAAC,UAAU,CAAK;IAEvB,oBAAoB,CAAC,OAAO,EAAE,MAAM;;;;;IAQ9B,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,GAAG;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,EAAE,MAAM,EAAE,SAAS;kBAyBpD,OAAO;iBAAW;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAA;SAAE,EAAE;;IA+BzF,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO;CAQjD"}
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.RunCommandHandler = exports.inputSchema = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const zod_1 = tslib_1.__importDefault(require("zod"));
|
|
6
|
+
const di_1 = require("@opensumi/di");
|
|
7
|
+
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
8
|
+
const ide_terminal_next_1 = require("@opensumi/ide-terminal-next");
|
|
9
|
+
const promises_1 = require("@opensumi/ide-utils/lib/promises");
|
|
10
|
+
const color = {
|
|
11
|
+
italic: '\x1b[3m',
|
|
12
|
+
reset: '\x1b[0m',
|
|
13
|
+
};
|
|
14
|
+
exports.inputSchema = zod_1.default.object({
|
|
15
|
+
command: zod_1.default.string().describe('The terminal command to execute'),
|
|
16
|
+
is_background: zod_1.default.boolean().describe('Whether the command should be run in the background'),
|
|
17
|
+
explanation: zod_1.default
|
|
18
|
+
.string()
|
|
19
|
+
.describe('One sentence explanation as to why this command needs to be run and how it contributes to the goal.'),
|
|
20
|
+
require_user_approval: zod_1.default
|
|
21
|
+
.boolean()
|
|
22
|
+
.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."),
|
|
23
|
+
});
|
|
24
|
+
let RunCommandHandler = class RunCommandHandler {
|
|
25
|
+
constructor() {
|
|
26
|
+
this.approvalDeferredMap = new Map();
|
|
27
|
+
this.terminalId = 0;
|
|
28
|
+
}
|
|
29
|
+
getShellLaunchConfig(command) {
|
|
30
|
+
return {
|
|
31
|
+
name: `MCP:Terminal_${this.terminalId++}`,
|
|
32
|
+
cwd: this.appConfig.workspaceDir,
|
|
33
|
+
args: ['-c', command],
|
|
34
|
+
};
|
|
35
|
+
}
|
|
36
|
+
async handler(args, logger) {
|
|
37
|
+
if (args.require_user_approval) {
|
|
38
|
+
const def = new promises_1.Deferred();
|
|
39
|
+
this.approvalDeferredMap.set(args.toolCallId, def);
|
|
40
|
+
const approval = await def.promise;
|
|
41
|
+
if (!approval) {
|
|
42
|
+
return {
|
|
43
|
+
isError: false,
|
|
44
|
+
content: [
|
|
45
|
+
{
|
|
46
|
+
type: 'text',
|
|
47
|
+
text: 'User rejection',
|
|
48
|
+
},
|
|
49
|
+
],
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
const terminalClient = await this.terminalController.createTerminalWithWidget({
|
|
54
|
+
config: this.getShellLaunchConfig(args.command),
|
|
55
|
+
closeWhenExited: false,
|
|
56
|
+
});
|
|
57
|
+
this.terminalController.showTerminalPanel();
|
|
58
|
+
const result = [];
|
|
59
|
+
const def = new promises_1.Deferred();
|
|
60
|
+
terminalClient.onOutput((e) => {
|
|
61
|
+
result.push({
|
|
62
|
+
type: 'text',
|
|
63
|
+
text: e.data.toString(),
|
|
64
|
+
});
|
|
65
|
+
});
|
|
66
|
+
terminalClient.onExit((e) => {
|
|
67
|
+
const isError = e.code !== 0;
|
|
68
|
+
def.resolve({
|
|
69
|
+
isError,
|
|
70
|
+
content: result,
|
|
71
|
+
});
|
|
72
|
+
terminalClient.term.writeln(`\n${color.italic}> Command ${args.command} executed successfully. Terminal will close in ${3000 / 1000} seconds.${color.reset}\n`);
|
|
73
|
+
setTimeout(() => {
|
|
74
|
+
terminalClient.dispose();
|
|
75
|
+
this.terminalView.removeWidget(terminalClient.id);
|
|
76
|
+
}, 3000);
|
|
77
|
+
});
|
|
78
|
+
return def.promise;
|
|
79
|
+
}
|
|
80
|
+
handleApproval(callId, approval) {
|
|
81
|
+
if (!this.approvalDeferredMap.has(callId)) {
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
const def = this.approvalDeferredMap.get(callId);
|
|
85
|
+
def === null || def === void 0 ? void 0 : def.resolve(approval);
|
|
86
|
+
}
|
|
87
|
+
};
|
|
88
|
+
exports.RunCommandHandler = RunCommandHandler;
|
|
89
|
+
tslib_1.__decorate([
|
|
90
|
+
(0, di_1.Autowired)(ide_terminal_next_1.ITerminalController),
|
|
91
|
+
tslib_1.__metadata("design:type", Object)
|
|
92
|
+
], RunCommandHandler.prototype, "terminalController", void 0);
|
|
93
|
+
tslib_1.__decorate([
|
|
94
|
+
(0, di_1.Autowired)(ide_core_browser_1.AppConfig),
|
|
95
|
+
tslib_1.__metadata("design:type", Object)
|
|
96
|
+
], RunCommandHandler.prototype, "appConfig", void 0);
|
|
97
|
+
tslib_1.__decorate([
|
|
98
|
+
(0, di_1.Autowired)(ide_terminal_next_1.ITerminalGroupViewService),
|
|
99
|
+
tslib_1.__metadata("design:type", Object)
|
|
100
|
+
], RunCommandHandler.prototype, "terminalView", void 0);
|
|
101
|
+
exports.RunCommandHandler = RunCommandHandler = tslib_1.__decorate([
|
|
102
|
+
(0, di_1.Injectable)()
|
|
103
|
+
], RunCommandHandler);
|
|
104
|
+
//# sourceMappingURL=RunCommand.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"RunCommand.js","sourceRoot":"","sources":["../../../../../src/browser/mcp/tools/handlers/RunCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listDir.d.ts","sourceRoot":"","sources":["../../../../src/browser/mcp/tools/listDir.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAAa,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"listDir.d.ts","sourceRoot":"","sources":["../../../../src/browser/mcp/tools/listDir.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAAa,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAkBtG,qBACa,WAAY,YAAW,qBAAqB;IAEvD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAEhD,iBAAiB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;IAIrD,iBAAiB,IAAI,iBAAiB;YAWxB,OAAO;CAqBtB"}
|
|
@@ -14,6 +14,7 @@ const inputSchema = zod_1.z
|
|
|
14
14
|
.describe("Path to list contents of, relative to the workspace root. Ex: './' is the root of the workspace"),
|
|
15
15
|
explanation: zod_1.z
|
|
16
16
|
.string()
|
|
17
|
+
.optional()
|
|
17
18
|
.describe('One sentence explanation as to why this tool is being used, and how it contributes to the goal.'),
|
|
18
19
|
})
|
|
19
20
|
.transform((data) => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listDir.js","sourceRoot":"","sources":["../../../../src/browser/mcp/tools/listDir.ts"],"names":[],"mappings":";;;;AAAA,6BAAwB;AAExB,qCAAyC;AACzC,+DAAmD;AAEnD,uCAAsG;AAEtG,gDAAoD;AAEpD,MAAM,WAAW,GAAG,OAAC;KAClB,MAAM,CAAC;IACN,uBAAuB,EAAE,OAAC;SACvB,MAAM,EAAE;SACR,QAAQ,CAAC,iGAAiG,CAAC;IAC9G,WAAW,EAAE,OAAC;SACX,MAAM,EAAE;SACR,QAAQ,CAAC,iGAAiG,CAAC;CAC/G,CAAC;KACD,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACpB,qBAAqB,EAAE,IAAI,CAAC,uBAAuB;CACpD,CAAC,CAAC,CAAC;AAGC,IAAM,WAAW,GAAjB,MAAM,WAAW;IAItB,iBAAiB,CAAC,QAA4B;QAC5C,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,iBAAiB;QACf,OAAO;YACL,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,gBAAgB;YACvB,WAAW,EACT,6QAA6Q;YAC/Q,WAAW;YACX,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;SACjC,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,OAAO,CAAC,IAAiC,EAAE,MAAiB;QACxE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACvD,OAAO;YACL,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE;;;YAGJ,MAAM,CAAC,KAAK;yBACX,GAAG,CACF,CAAC,IAAI,EAAE,EAAE;;wBACP,OAAA,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,IAAI,IACjD,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,MAAA,IAAI,CAAC,WAAW,mCAAI,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,OAAO,IAAI,CAAC,QAAQ,SAC7F,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,cAAc,EAAE,EAAE,CAAA;qBAAA,CACvD;yBACA,IAAI,CAAC,IAAI,CAAC,EAAE;iBAChB;aACF;SACF,CAAC;IACJ,CAAC;CACF,CAAA;AAxCY,kCAAW;AAEL;IADhB,IAAA,cAAS,EAAC,wBAAc,CAAC;sCACO,wBAAc;mDAAC;sBAFrC,WAAW;IADvB,IAAA,wBAAM,EAAC,6BAAqB,CAAC;GACjB,WAAW,CAwCvB"}
|
|
1
|
+
{"version":3,"file":"listDir.js","sourceRoot":"","sources":["../../../../src/browser/mcp/tools/listDir.ts"],"names":[],"mappings":";;;;AAAA,6BAAwB;AAExB,qCAAyC;AACzC,+DAAmD;AAEnD,uCAAsG;AAEtG,gDAAoD;AAEpD,MAAM,WAAW,GAAG,OAAC;KAClB,MAAM,CAAC;IACN,uBAAuB,EAAE,OAAC;SACvB,MAAM,EAAE;SACR,QAAQ,CAAC,iGAAiG,CAAC;IAC9G,WAAW,EAAE,OAAC;SACX,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,iGAAiG,CAAC;CAC/G,CAAC;KACD,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACpB,qBAAqB,EAAE,IAAI,CAAC,uBAAuB;CACpD,CAAC,CAAC,CAAC;AAGC,IAAM,WAAW,GAAjB,MAAM,WAAW;IAItB,iBAAiB,CAAC,QAA4B;QAC5C,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,iBAAiB;QACf,OAAO;YACL,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,gBAAgB;YACvB,WAAW,EACT,6QAA6Q;YAC/Q,WAAW;YACX,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;SACjC,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,OAAO,CAAC,IAAiC,EAAE,MAAiB;QACxE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACvD,OAAO;YACL,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE;;;YAGJ,MAAM,CAAC,KAAK;yBACX,GAAG,CACF,CAAC,IAAI,EAAE,EAAE;;wBACP,OAAA,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,IAAI,IACjD,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,MAAA,IAAI,CAAC,WAAW,mCAAI,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,OAAO,IAAI,CAAC,QAAQ,SAC7F,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,cAAc,EAAE,EAAE,CAAA;qBAAA,CACvD;yBACA,IAAI,CAAC,IAAI,CAAC,EAAE;iBAChB;aACF;SACF,CAAC;IACJ,CAAC;CACF,CAAA;AAxCY,kCAAW;AAEL;IADhB,IAAA,cAAS,EAAC,wBAAc,CAAC;sCACO,wBAAc;mDAAC;sBAFrC,WAAW;IADvB,IAAA,wBAAM,EAAC,6BAAqB,CAAC;GACjB,WAAW,CAwCvB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"readFile.d.ts","sourceRoot":"","sources":["../../../../src/browser/mcp/tools/readFile.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAAa,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"readFile.d.ts","sourceRoot":"","sources":["../../../../src/browser/mcp/tools/readFile.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAAa,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAsBtG,qBACa,YAAa,YAAW,qBAAqB;IAExD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAE1C,iBAAiB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;IAIrD,iBAAiB,IAAI,iBAAiB;YAoBxB,OAAO;CAwBtB"}
|
|
@@ -15,6 +15,7 @@ const inputSchema = zod_1.z
|
|
|
15
15
|
end_line_one_indexed_inclusive: zod_1.z.number().describe('The one-indexed line number to end reading at (inclusive).'),
|
|
16
16
|
explanation: zod_1.z
|
|
17
17
|
.string()
|
|
18
|
+
.optional()
|
|
18
19
|
.describe('One sentence explanation as to why this tool is being used, and how it contributes to the goal.'),
|
|
19
20
|
})
|
|
20
21
|
.transform((data) => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"readFile.js","sourceRoot":"","sources":["../../../../src/browser/mcp/tools/readFile.ts"],"names":[],"mappings":";;;;AAAA,6BAAwB;AAExB,qCAAyC;AACzC,+DAAmD;AAEnD,uCAAsG;AAEtG,kDAAkD;AAElD,MAAM,WAAW,GAAG,OAAC;KAClB,MAAM,CAAC;IACN,uBAAuB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,+DAA+D,CAAC;IAC7G,uBAAuB,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,qDAAqD,CAAC;IACpG,sBAAsB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,gEAAgE,CAAC;IAC7G,8BAA8B,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,4DAA4D,CAAC;IACjH,WAAW,EAAE,OAAC;SACX,MAAM,EAAE;SACR,QAAQ,CAAC,iGAAiG,CAAC;CAC/G,CAAC;KACD,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACpB,qBAAqB,EAAE,IAAI,CAAC,uBAAuB;IACnD,cAAc,EAAE,IAAI,CAAC,uBAAuB;IAC5C,mBAAmB,EAAE,IAAI,CAAC,sBAAsB;IAChD,0BAA0B,EAAE,IAAI,CAAC,8BAA8B;CAChE,CAAC,CAAC,CAAC;AAGC,IAAM,YAAY,GAAlB,MAAM,YAAY;IAIvB,iBAAiB,CAAC,QAA4B;QAC5C,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,iBAAiB;QACf,OAAO;YACL,IAAI,EAAE,WAAW;YACjB,KAAK,EAAE,WAAW;YAClB,WAAW,EAAE;;;;;;;;;;+KAU4J;YACzK,WAAW;YACX,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;SACjC,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,OAAO,CAAC,IAAiC,EAAE,MAAiB;QACxE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACrD,OAAO;YACL,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,MAAM,CAAC,mBAAmB;wBAC9B,CAAC,CAAC,eAAe,MAAM,CAAC,qBAAqB,eAAe,IAAI,CAAC,mBAAmB,IAChF,IAAI,CAAC,0BACP;;;KAGT,MAAM,CAAC,qBAAsB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE;EACjD,MAAM,CAAC,QAAQ;OACV;wBACK,CAAC,CAAC,oBAAoB,IAAI,CAAC,qBAAqB;;;EAG1D,MAAM,CAAC,QAAQ;OACV;iBACE;aACF;SACF,CAAC;IACJ,CAAC;CACF,CAAA;AApDY,oCAAY;AAEN;IADhB,IAAA,cAAS,EAAC,sBAAW,CAAC;sCACO,sBAAW;iDAAC;uBAF/B,YAAY;IADxB,IAAA,wBAAM,EAAC,6BAAqB,CAAC;GACjB,YAAY,CAoDxB"}
|
|
1
|
+
{"version":3,"file":"readFile.js","sourceRoot":"","sources":["../../../../src/browser/mcp/tools/readFile.ts"],"names":[],"mappings":";;;;AAAA,6BAAwB;AAExB,qCAAyC;AACzC,+DAAmD;AAEnD,uCAAsG;AAEtG,kDAAkD;AAElD,MAAM,WAAW,GAAG,OAAC;KAClB,MAAM,CAAC;IACN,uBAAuB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,+DAA+D,CAAC;IAC7G,uBAAuB,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,qDAAqD,CAAC;IACpG,sBAAsB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,gEAAgE,CAAC;IAC7G,8BAA8B,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,4DAA4D,CAAC;IACjH,WAAW,EAAE,OAAC;SACX,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,iGAAiG,CAAC;CAC/G,CAAC;KACD,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACpB,qBAAqB,EAAE,IAAI,CAAC,uBAAuB;IACnD,cAAc,EAAE,IAAI,CAAC,uBAAuB;IAC5C,mBAAmB,EAAE,IAAI,CAAC,sBAAsB;IAChD,0BAA0B,EAAE,IAAI,CAAC,8BAA8B;CAChE,CAAC,CAAC,CAAC;AAGC,IAAM,YAAY,GAAlB,MAAM,YAAY;IAIvB,iBAAiB,CAAC,QAA4B;QAC5C,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,iBAAiB;QACf,OAAO;YACL,IAAI,EAAE,WAAW;YACjB,KAAK,EAAE,WAAW;YAClB,WAAW,EAAE;;;;;;;;;;+KAU4J;YACzK,WAAW;YACX,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;SACjC,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,OAAO,CAAC,IAAiC,EAAE,MAAiB;QACxE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACrD,OAAO;YACL,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,MAAM,CAAC,mBAAmB;wBAC9B,CAAC,CAAC,eAAe,MAAM,CAAC,qBAAqB,eAAe,IAAI,CAAC,mBAAmB,IAChF,IAAI,CAAC,0BACP;;;KAGT,MAAM,CAAC,qBAAsB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE;EACjD,MAAM,CAAC,QAAQ;OACV;wBACK,CAAC,CAAC,oBAAoB,IAAI,CAAC,qBAAqB;;;EAG1D,MAAM,CAAC,QAAQ;OACV;iBACE;aACF;SACF,CAAC;IACJ,CAAC;CACF,CAAA;AApDY,oCAAY;AAEN;IADhB,IAAA,cAAS,EAAC,sBAAW,CAAC;sCACO,sBAAW;iDAAC;uBAF/B,YAAY;IADxB,IAAA,wBAAM,EAAC,6BAAqB,CAAC;GACjB,YAAY,CAoDxB"}
|
|
@@ -5,14 +5,9 @@ export declare class RunTerminalCommandTool implements MCPServerContribution {
|
|
|
5
5
|
protected readonly terminalController: ITerminalController;
|
|
6
6
|
protected readonly appConfig: AppConfig;
|
|
7
7
|
protected readonly terminalView: ITerminalGroupViewService;
|
|
8
|
-
private
|
|
8
|
+
private readonly runCommandHandler;
|
|
9
9
|
registerMCPServer(registry: IMCPServerRegistry): void;
|
|
10
10
|
getToolDefinition(): MCPToolDefinition;
|
|
11
|
-
getShellLaunchConfig(command: string): {
|
|
12
|
-
name: string;
|
|
13
|
-
cwd: string;
|
|
14
|
-
args: string[];
|
|
15
|
-
};
|
|
16
11
|
private handler;
|
|
17
12
|
}
|
|
18
13
|
//# sourceMappingURL=runTerminalCmd.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runTerminalCmd.d.ts","sourceRoot":"","sources":["../../../../src/browser/mcp/tools/runTerminalCmd.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEvD,OAAO,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,mDAAmD,CAAC;AAEnH,OAAO,EAAE,kBAAkB,EAAa,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"runTerminalCmd.d.ts","sourceRoot":"","sources":["../../../../src/browser/mcp/tools/runTerminalCmd.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEvD,OAAO,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,mDAAmD,CAAC;AAEnH,OAAO,EAAE,kBAAkB,EAAa,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAKtG,qBACa,sBAAuB,YAAW,qBAAqB;IAElE,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,mBAAmB,CAAC;IAG3D,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAGxC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,yBAAyB,CAAC;IAG3D,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IAEtD,iBAAiB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;IAKrD,iBAAiB,IAAI,iBAAiB;YAUxB,OAAO;CAGtB"}
|
|
@@ -2,78 +2,28 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.RunTerminalCommandTool = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const zod_1 = require("zod");
|
|
6
5
|
const di_1 = require("@opensumi/di");
|
|
7
6
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
8
7
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
9
8
|
const controller_1 = require("@opensumi/ide-terminal-next/lib/common/controller");
|
|
10
9
|
const types_1 = require("../../types");
|
|
11
|
-
const
|
|
12
|
-
|
|
13
|
-
reset: '\x1b[0m',
|
|
14
|
-
};
|
|
15
|
-
const inputSchema = zod_1.z.object({
|
|
16
|
-
command: zod_1.z.string().describe('The terminal command to execute'),
|
|
17
|
-
is_background: zod_1.z.boolean().describe('Whether the command should be run in the background'),
|
|
18
|
-
explanation: zod_1.z
|
|
19
|
-
.string()
|
|
20
|
-
.describe('One sentence explanation as to why this command needs to be run and how it contributes to the goal.'),
|
|
21
|
-
require_user_approval: zod_1.z
|
|
22
|
-
.boolean()
|
|
23
|
-
.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."),
|
|
24
|
-
});
|
|
10
|
+
const Terminal_1 = require("./components/Terminal");
|
|
11
|
+
const RunCommand_1 = require("./handlers/RunCommand");
|
|
25
12
|
let RunTerminalCommandTool = class RunTerminalCommandTool {
|
|
26
|
-
constructor() {
|
|
27
|
-
this.terminalId = 0;
|
|
28
|
-
}
|
|
29
13
|
registerMCPServer(registry) {
|
|
30
14
|
registry.registerMCPTool(this.getToolDefinition());
|
|
15
|
+
registry.registerToolComponent('run_terminal_cmd', Terminal_1.TerminalToolComponent);
|
|
31
16
|
}
|
|
32
17
|
getToolDefinition() {
|
|
33
18
|
return {
|
|
34
19
|
name: 'run_terminal_cmd',
|
|
35
20
|
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.",
|
|
36
|
-
inputSchema,
|
|
21
|
+
inputSchema: RunCommand_1.inputSchema,
|
|
37
22
|
handler: this.handler.bind(this),
|
|
38
23
|
};
|
|
39
24
|
}
|
|
40
|
-
getShellLaunchConfig(command) {
|
|
41
|
-
return {
|
|
42
|
-
name: `MCP:Terminal_${this.terminalId++}`,
|
|
43
|
-
cwd: this.appConfig.workspaceDir,
|
|
44
|
-
args: ['-c', command],
|
|
45
|
-
};
|
|
46
|
-
}
|
|
47
25
|
async handler(args, logger) {
|
|
48
|
-
|
|
49
|
-
// FIXME: support approval
|
|
50
|
-
}
|
|
51
|
-
const terminalClient = await this.terminalController.createTerminalWithWidget({
|
|
52
|
-
config: this.getShellLaunchConfig(args.command),
|
|
53
|
-
closeWhenExited: false,
|
|
54
|
-
});
|
|
55
|
-
this.terminalController.showTerminalPanel();
|
|
56
|
-
const result = [];
|
|
57
|
-
const def = new ide_core_common_1.Deferred();
|
|
58
|
-
terminalClient.onOutput((e) => {
|
|
59
|
-
result.push({
|
|
60
|
-
type: 'output',
|
|
61
|
-
text: e.data.toString(),
|
|
62
|
-
});
|
|
63
|
-
});
|
|
64
|
-
terminalClient.onExit((e) => {
|
|
65
|
-
const isError = e.code !== 0;
|
|
66
|
-
def.resolve({
|
|
67
|
-
isError,
|
|
68
|
-
content: result,
|
|
69
|
-
});
|
|
70
|
-
terminalClient.term.writeln(`\n${color.italic}> Command ${args.command} executed successfully. Terminal will close in ${3000 / 1000} seconds.${color.reset}\n`);
|
|
71
|
-
setTimeout(() => {
|
|
72
|
-
terminalClient.dispose();
|
|
73
|
-
this.terminalView.removeWidget(terminalClient.id);
|
|
74
|
-
}, 3000);
|
|
75
|
-
});
|
|
76
|
-
return def.promise;
|
|
26
|
+
return this.runCommandHandler.handler(args, logger);
|
|
77
27
|
}
|
|
78
28
|
};
|
|
79
29
|
exports.RunTerminalCommandTool = RunTerminalCommandTool;
|
|
@@ -89,6 +39,10 @@ tslib_1.__decorate([
|
|
|
89
39
|
(0, di_1.Autowired)(controller_1.ITerminalGroupViewService),
|
|
90
40
|
tslib_1.__metadata("design:type", Object)
|
|
91
41
|
], RunTerminalCommandTool.prototype, "terminalView", void 0);
|
|
42
|
+
tslib_1.__decorate([
|
|
43
|
+
(0, di_1.Autowired)(RunCommand_1.RunCommandHandler),
|
|
44
|
+
tslib_1.__metadata("design:type", RunCommand_1.RunCommandHandler)
|
|
45
|
+
], RunTerminalCommandTool.prototype, "runCommandHandler", void 0);
|
|
92
46
|
exports.RunTerminalCommandTool = RunTerminalCommandTool = tslib_1.__decorate([
|
|
93
47
|
(0, ide_core_common_1.Domain)(types_1.MCPServerContribution)
|
|
94
48
|
], RunTerminalCommandTool);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runTerminalCmd.js","sourceRoot":"","sources":["../../../../src/browser/mcp/tools/runTerminalCmd.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"runTerminalCmd.js","sourceRoot":"","sources":["../../../../src/browser/mcp/tools/runTerminalCmd.ts"],"names":[],"mappings":";;;;AAEA,qCAAyC;AACzC,iEAAuD;AACvD,+DAA6D;AAC7D,kFAAmH;AAEnH,uCAAsG;AAEtG,oDAA8D;AAC9D,sDAAuE;AAGhE,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAajC,iBAAiB,CAAC,QAA4B;QAC5C,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;QACnD,QAAQ,CAAC,qBAAqB,CAAC,kBAAkB,EAAE,gCAAqB,CAAC,CAAC;IAC5E,CAAC;IAED,iBAAiB;QACf,OAAO;YACL,IAAI,EAAE,kBAAkB;YACxB,WAAW,EACT,u9BAAu9B;YACz9B,WAAW,EAAX,wBAAW;YACX,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;SACjC,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,OAAO,CAAC,IAA0D,EAAE,MAAiB;QACjG,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACtD,CAAC;CACF,CAAA;AA/BY,wDAAsB;AAEd;IADlB,IAAA,cAAS,EAAC,gCAAmB,CAAC;;kEAC4B;AAGxC;IADlB,IAAA,cAAS,EAAC,4BAAS,CAAC;;yDACmB;AAGrB;IADlB,IAAA,cAAS,EAAC,sCAAyB,CAAC;;4DACsB;AAG1C;IADhB,IAAA,cAAS,EAAC,8BAAiB,CAAC;sCACO,8BAAiB;iEAAC;iCAX3C,sBAAsB;IADlC,IAAA,wBAAM,EAAC,6BAAqB,CAAC;GACjB,sBAAsB,CA+BlC"}
|
|
@@ -3,8 +3,15 @@ import { IHistoryChatMessage } from '@opensumi/ide-core-common/lib/types/ai-nati
|
|
|
3
3
|
type IExcludeMessage = Omit<IHistoryChatMessage, 'id' | 'order'>;
|
|
4
4
|
export declare class MsgHistoryManager extends Disposable {
|
|
5
5
|
private messageMap;
|
|
6
|
+
private messageAdditionalMap;
|
|
6
7
|
private readonly _onMessageChange;
|
|
7
8
|
readonly onMessageChange: Event<IHistoryChatMessage[]>;
|
|
9
|
+
private readonly _onMessageAdditionalChange;
|
|
10
|
+
readonly onMessageAdditionalChange: Event<Record<string, any>>;
|
|
11
|
+
constructor(data?: {
|
|
12
|
+
additional: Record<string, any>;
|
|
13
|
+
messages: IHistoryChatMessage[];
|
|
14
|
+
});
|
|
8
15
|
dispose(): void;
|
|
9
16
|
clearMessages(): void;
|
|
10
17
|
private doAddMessage;
|
|
@@ -12,6 +19,14 @@ export declare class MsgHistoryManager extends Disposable {
|
|
|
12
19
|
addUserMessage(message: Required<Pick<IExcludeMessage, 'agentId' | 'agentCommand' | 'content' | 'relationId'>>): string;
|
|
13
20
|
addAssistantMessage(message: Omit<IExcludeMessage, 'role'>): string;
|
|
14
21
|
updateAssistantMessage(id: string, message: Omit<IExcludeMessage, 'role'>): void;
|
|
22
|
+
setMessageAdditional(id: string, additional: Record<string, any>): void;
|
|
23
|
+
getMessageAdditional(id: string): Record<string, any>;
|
|
24
|
+
toJSON(): {
|
|
25
|
+
messages: IHistoryChatMessage[];
|
|
26
|
+
additional: {
|
|
27
|
+
[k: string]: Record<string, any>;
|
|
28
|
+
};
|
|
29
|
+
};
|
|
15
30
|
}
|
|
16
31
|
export {};
|
|
17
32
|
//# sourceMappingURL=msg-history-manager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"msg-history-manager.d.ts","sourceRoot":"","sources":["../../../src/browser/model/msg-history-manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAW,KAAK,EAAQ,MAAM,2BAA2B,CAAC;AAE7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AAEpF,KAAK,eAAe,GAAG,IAAI,CAAC,mBAAmB,EAAE,IAAI,GAAG,OAAO,CAAC,CAAC;AAEjE,
|
|
1
|
+
{"version":3,"file":"msg-history-manager.d.ts","sourceRoot":"","sources":["../../../src/browser/model/msg-history-manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAW,KAAK,EAAQ,MAAM,2BAA2B,CAAC;AAE7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AAEpF,KAAK,eAAe,GAAG,IAAI,CAAC,mBAAmB,EAAE,IAAI,GAAG,OAAO,CAAC,CAAC;AAEjE,qBAAa,iBAAkB,SAAQ,UAAU;IAC/C,OAAO,CAAC,UAAU,CAA+C;IACjE,OAAO,CAAC,oBAAoB,CAA+C;IAE3E,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAwC;IACzE,SAAgB,eAAe,EAAE,KAAK,CAAC,mBAAmB,EAAE,CAAC,CAA+B;IAE5F,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAAsC;IACjF,SAAgB,yBAAyB,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAyC;gBAElG,IAAI,CAAC,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAAC,QAAQ,EAAE,mBAAmB,EAAE,CAAA;KAAE;IAQ9E,OAAO,IAAI,IAAI;IAKjB,aAAa;IAKpB,OAAO,CAAC,YAAY;IAiBb,WAAW,IAAI,mBAAmB,EAAE;IAIpC,cAAc,CACnB,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,eAAe,EAAE,SAAS,GAAG,cAAc,GAAG,SAAS,GAAG,YAAY,CAAC,CAAC,GAC9F,MAAM;IAOF,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,GAAG,MAAM;IAOnE,sBAAsB,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC;IAazE,oBAAoB,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAUhE,oBAAoB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAI5D,MAAM;;;;;;CAMP"}
|
|
@@ -1,15 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.MsgHistoryManager = void 0;
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
|
-
const di_1 = require("@opensumi/di");
|
|
6
4
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
7
|
-
|
|
8
|
-
constructor() {
|
|
9
|
-
super(
|
|
5
|
+
class MsgHistoryManager extends ide_core_common_1.Disposable {
|
|
6
|
+
constructor(data) {
|
|
7
|
+
super();
|
|
10
8
|
this.messageMap = new Map();
|
|
9
|
+
this.messageAdditionalMap = new Map();
|
|
11
10
|
this._onMessageChange = new ide_core_common_1.Emitter();
|
|
12
11
|
this.onMessageChange = this._onMessageChange.event;
|
|
12
|
+
this._onMessageAdditionalChange = new ide_core_common_1.Emitter();
|
|
13
|
+
this.onMessageAdditionalChange = this._onMessageAdditionalChange.event;
|
|
14
|
+
if (data) {
|
|
15
|
+
this.messageMap = new Map(data.messages.map((item) => [item.id, item]));
|
|
16
|
+
this.messageAdditionalMap = new Map(Object.entries(data.additional));
|
|
17
|
+
}
|
|
13
18
|
}
|
|
14
19
|
dispose() {
|
|
15
20
|
this.clearMessages();
|
|
@@ -17,6 +22,7 @@ let MsgHistoryManager = class MsgHistoryManager extends ide_core_common_1.Dispos
|
|
|
17
22
|
}
|
|
18
23
|
clearMessages() {
|
|
19
24
|
this.messageMap.clear();
|
|
25
|
+
this.messageAdditionalMap.clear();
|
|
20
26
|
}
|
|
21
27
|
doAddMessage(message) {
|
|
22
28
|
const id = (0, ide_core_common_1.uuid)(6);
|
|
@@ -56,9 +62,22 @@ let MsgHistoryManager = class MsgHistoryManager extends ide_core_common_1.Dispos
|
|
|
56
62
|
content: message.content,
|
|
57
63
|
});
|
|
58
64
|
}
|
|
59
|
-
|
|
65
|
+
setMessageAdditional(id, additional) {
|
|
66
|
+
if (!this.messageMap.has(id)) {
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
69
|
+
this.messageAdditionalMap.set(id, additional);
|
|
70
|
+
this._onMessageAdditionalChange.fire(additional);
|
|
71
|
+
}
|
|
72
|
+
getMessageAdditional(id) {
|
|
73
|
+
return this.messageAdditionalMap.get(id) || {};
|
|
74
|
+
}
|
|
75
|
+
toJSON() {
|
|
76
|
+
return {
|
|
77
|
+
messages: this.getMessages(),
|
|
78
|
+
additional: Object.fromEntries(this.messageAdditionalMap.entries()),
|
|
79
|
+
};
|
|
80
|
+
}
|
|
81
|
+
}
|
|
60
82
|
exports.MsgHistoryManager = MsgHistoryManager;
|
|
61
|
-
exports.MsgHistoryManager = MsgHistoryManager = tslib_1.__decorate([
|
|
62
|
-
(0, di_1.Injectable)({ multiple: false })
|
|
63
|
-
], MsgHistoryManager);
|
|
64
83
|
//# sourceMappingURL=msg-history-manager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"msg-history-manager.js","sourceRoot":"","sources":["../../../src/browser/model/msg-history-manager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"msg-history-manager.js","sourceRoot":"","sources":["../../../src/browser/model/msg-history-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Client } from '@modelcontextprotocol/sdk/client/index.js';
|
|
2
2
|
export interface MCPServerManager {
|
|
3
|
-
callTool(serverName: string, toolName: string, arg_string: string): ReturnType<Client['callTool']>;
|
|
3
|
+
callTool(serverName: string, toolName: string, toolCallId: string, arg_string: string): ReturnType<Client['callTool']>;
|
|
4
4
|
removeServer(name: string): void;
|
|
5
5
|
addOrUpdateServer(description: MCPServerDescription): void;
|
|
6
6
|
addOrUpdateServerDirectly(server: any): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-server-manager.d.ts","sourceRoot":"","sources":["../../src/common/mcp-server-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAEnE,MAAM,WAAW,gBAAgB;
|
|
1
|
+
{"version":3,"file":"mcp-server-manager.d.ts","sourceRoot":"","sources":["../../src/common/mcp-server-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAEnE,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CACN,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;IAClC,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,iBAAiB,CAAC,WAAW,EAAE,oBAAoB,GAAG,IAAI,CAAC;IAE3D,yBAAyB,CAAC,MAAM,EAAE,GAAG,GAAG,IAAI,CAAC;IAC7C,iBAAiB,CAAC,gBAAgB,EAAE,GAAG,GAAG,IAAI,CAAC;IAC/C,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;IAC9D,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACpC,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,iBAAiB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACvC,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjD,qBAAqB,CAAC,OAAO,EAAE,oBAAoB,EAAE,GAAG,IAAI,CAAC;CAC9D;AAED,MAAM,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;AAEzF,MAAM,MAAM,gBAAgB,GAAG,OAAO,CAAC,UAAU,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC;AAEjH,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAEhB;;OAEG;IACH,GAAG,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACjC;AAED,eAAO,MAAM,gBAAgB,eAA6B,CAAC;AAC3D,eAAO,MAAM,oBAAoB,6BAA6B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-server-manager.js","sourceRoot":"","sources":["../../src/common/mcp-server-manager.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"mcp-server-manager.js","sourceRoot":"","sources":["../../src/common/mcp-server-manager.ts"],"names":[],"mappings":";;;AAiDa,QAAA,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC;AAC9C,QAAA,oBAAoB,GAAG,0BAA0B,CAAC"}
|