@opensumi/ide-ai-native 3.9.1-next-1749175927.0 → 3.9.1-next-1749196667.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.map +1 -1
- package/lib/browser/ai-core.contribution.js +4 -9
- package/lib/browser/ai-core.contribution.js.map +1 -1
- package/lib/browser/chat/apply.service.d.ts +0 -3
- package/lib/browser/chat/apply.service.d.ts.map +1 -1
- package/lib/browser/chat/apply.service.js +0 -47
- package/lib/browser/chat/apply.service.js.map +1 -1
- package/lib/browser/chat/chat-manager.service.d.ts +0 -1
- package/lib/browser/chat/chat-manager.service.d.ts.map +1 -1
- package/lib/browser/chat/chat-manager.service.js +3 -9
- package/lib/browser/chat/chat-manager.service.js.map +1 -1
- package/lib/browser/chat/chat-model.d.ts +1 -8
- package/lib/browser/chat/chat-model.d.ts.map +1 -1
- package/lib/browser/chat/chat-model.js +76 -113
- package/lib/browser/chat/chat-model.js.map +1 -1
- package/lib/browser/chat/chat-proxy.service.d.ts +2 -0
- package/lib/browser/chat/chat-proxy.service.d.ts.map +1 -1
- package/lib/browser/chat/chat-proxy.service.js +57 -50
- package/lib/browser/chat/chat-proxy.service.js.map +1 -1
- package/lib/browser/chat/chat.feature.registry.d.ts +1 -4
- package/lib/browser/chat/chat.feature.registry.d.ts.map +1 -1
- package/lib/browser/chat/chat.feature.registry.js +0 -6
- package/lib/browser/chat/chat.feature.registry.js.map +1 -1
- package/lib/browser/chat/chat.view.d.ts.map +1 -1
- package/lib/browser/chat/chat.view.js +10 -51
- package/lib/browser/chat/chat.view.js.map +1 -1
- package/lib/browser/components/ChatEditor.js +2 -2
- package/lib/browser/components/ChatEditor.js.map +1 -1
- package/lib/browser/components/ChatHistory.d.ts.map +1 -1
- package/lib/browser/components/ChatHistory.js +1 -2
- package/lib/browser/components/ChatHistory.js.map +1 -1
- package/lib/browser/components/ChatMentionInput.d.ts.map +1 -1
- package/lib/browser/components/ChatMentionInput.js +28 -124
- package/lib/browser/components/ChatMentionInput.js.map +1 -1
- package/lib/browser/components/ChatToolRender.d.ts.map +1 -1
- package/lib/browser/components/ChatToolRender.js +2 -7
- package/lib/browser/components/ChatToolRender.js.map +1 -1
- package/lib/browser/components/ChatToolRender.module.less +0 -25
- package/lib/browser/components/components.module.less +0 -7
- package/lib/browser/components/mention-input/mention-input.d.ts.map +1 -1
- package/lib/browser/components/mention-input/mention-input.js +13 -155
- package/lib/browser/components/mention-input/mention-input.js.map +1 -1
- package/lib/browser/components/mention-input/mention-input.module.less +0 -165
- package/lib/browser/components/mention-input/types.d.ts +1 -15
- package/lib/browser/components/mention-input/types.d.ts.map +1 -1
- package/lib/browser/components/mention-input/types.js +0 -1
- package/lib/browser/components/mention-input/types.js.map +1 -1
- package/lib/browser/components/utils.d.ts +2 -2
- package/lib/browser/context/llm-context.service.d.ts +2 -21
- package/lib/browser/context/llm-context.service.d.ts.map +1 -1
- package/lib/browser/context/llm-context.service.js +20 -162
- package/lib/browser/context/llm-context.service.js.map +1 -1
- package/lib/browser/contrib/intelligent-completions/decoration/additions-deletions.decoration.d.ts.map +1 -1
- package/lib/browser/contrib/intelligent-completions/decoration/additions-deletions.decoration.js.map +1 -1
- package/lib/browser/contrib/intelligent-completions/diff-computer.js +1 -1
- package/lib/browser/contrib/intelligent-completions/diff-computer.js.map +1 -1
- package/lib/browser/contrib/terminal/terminal.feature.registry.js.map +1 -1
- package/lib/browser/index.d.ts.map +1 -1
- package/lib/browser/index.js +0 -7
- package/lib/browser/index.js.map +1 -1
- package/lib/browser/layout/ai-layout.d.ts.map +1 -1
- package/lib/browser/layout/ai-layout.js +4 -6
- package/lib/browser/layout/ai-layout.js.map +1 -1
- package/lib/browser/layout/tabbar.view.d.ts +1 -1
- package/lib/browser/layout/tabbar.view.d.ts.map +1 -1
- package/lib/browser/layout/tabbar.view.js +12 -5
- package/lib/browser/layout/tabbar.view.js.map +1 -1
- package/lib/browser/mcp/base-apply.service.d.ts +4 -5
- package/lib/browser/mcp/base-apply.service.d.ts.map +1 -1
- package/lib/browser/mcp/base-apply.service.js +5 -23
- package/lib/browser/mcp/base-apply.service.js.map +1 -1
- package/lib/browser/mcp/mcp-server-proxy.service.d.ts +1 -3
- package/lib/browser/mcp/mcp-server-proxy.service.d.ts.map +1 -1
- package/lib/browser/mcp/mcp-server-proxy.service.js +0 -4
- package/lib/browser/mcp/mcp-server-proxy.service.js.map +1 -1
- package/lib/browser/mcp/tools/getDiagnosticsByPath.js.map +1 -1
- package/lib/browser/mcp/tools/getOpenEditorFileDiagnostics.js.map +1 -1
- package/lib/browser/mcp/tools/handlers/ListDir.js.map +1 -1
- package/lib/browser/mcp/tools/runTerminalCmd.js.map +1 -1
- package/lib/browser/model/msg-history-manager.d.ts +1 -47
- package/lib/browser/model/msg-history-manager.d.ts.map +1 -1
- package/lib/browser/model/msg-history-manager.js +2 -127
- package/lib/browser/model/msg-history-manager.js.map +1 -1
- package/lib/browser/preferences/schema.d.ts.map +1 -1
- package/lib/browser/preferences/schema.js +0 -5
- package/lib/browser/preferences/schema.js.map +1 -1
- package/lib/browser/types.d.ts +1 -12
- package/lib/browser/types.d.ts.map +1 -1
- package/lib/browser/types.js.map +1 -1
- package/lib/browser/widget/inline-stream-diff/live-preview.component.d.ts.map +1 -1
- package/lib/browser/widget/inline-stream-diff/live-preview.component.js.map +1 -1
- package/lib/common/index.d.ts +1 -5
- package/lib/common/index.d.ts.map +1 -1
- package/lib/common/index.js +0 -2
- package/lib/common/index.js.map +1 -1
- package/lib/common/llm-context.d.ts +0 -19
- package/lib/common/llm-context.d.ts.map +1 -1
- package/lib/common/llm-context.js.map +1 -1
- package/lib/common/prompts/context-prompt-provider.d.ts +2 -0
- package/lib/common/prompts/context-prompt-provider.d.ts.map +1 -1
- package/lib/common/prompts/context-prompt-provider.js +29 -35
- package/lib/common/prompts/context-prompt-provider.js.map +1 -1
- package/lib/common/types.d.ts +0 -21
- package/lib/common/types.d.ts.map +1 -1
- package/lib/common/types.js.map +1 -1
- package/lib/common/utils.d.ts +0 -1
- package/lib/common/utils.d.ts.map +1 -1
- package/lib/common/utils.js +2 -5
- package/lib/common/utils.js.map +1 -1
- package/lib/node/base-language-model.d.ts +1 -2
- package/lib/node/base-language-model.d.ts.map +1 -1
- package/lib/node/base-language-model.js +1 -10
- package/lib/node/base-language-model.js.map +1 -1
- package/lib/node/mcp/sumi-mcp-server.d.ts +1 -3
- package/lib/node/mcp/sumi-mcp-server.d.ts.map +1 -1
- package/lib/node/mcp/sumi-mcp-server.js +1 -7
- package/lib/node/mcp/sumi-mcp-server.js.map +1 -1
- package/lib/node/mcp-server-manager-impl.d.ts +1 -3
- package/lib/node/mcp-server-manager-impl.d.ts.map +1 -1
- package/lib/node/mcp-server-manager-impl.js +2 -14
- package/lib/node/mcp-server-manager-impl.js.map +1 -1
- package/package.json +24 -25
- package/src/browser/ai-core.contribution.ts +4 -14
- package/src/browser/chat/apply.service.ts +1 -62
- package/src/browser/chat/chat-manager.service.ts +7 -16
- package/src/browser/chat/chat-model.ts +73 -130
- package/src/browser/chat/chat-proxy.service.ts +81 -68
- package/src/browser/chat/chat.feature.registry.ts +1 -17
- package/src/browser/chat/chat.view.tsx +12 -74
- package/src/browser/components/ChatEditor.tsx +1 -1
- package/src/browser/components/ChatHistory.tsx +1 -2
- package/src/browser/components/ChatMentionInput.tsx +32 -144
- package/src/browser/components/ChatToolRender.module.less +0 -25
- package/src/browser/components/ChatToolRender.tsx +2 -10
- package/src/browser/components/components.module.less +0 -7
- package/src/browser/components/mention-input/mention-input.module.less +0 -165
- package/src/browser/components/mention-input/mention-input.tsx +29 -244
- package/src/browser/components/mention-input/types.ts +0 -15
- package/src/browser/context/llm-context.service.ts +21 -182
- package/src/browser/contrib/intelligent-completions/decoration/additions-deletions.decoration.ts +1 -1
- package/src/browser/contrib/intelligent-completions/diff-computer.ts +1 -1
- package/src/browser/contrib/terminal/terminal.feature.registry.ts +1 -1
- package/src/browser/index.ts +0 -8
- package/src/browser/layout/ai-layout.tsx +8 -12
- package/src/browser/layout/tabbar.view.tsx +23 -10
- package/src/browser/mcp/base-apply.service.ts +10 -30
- package/src/browser/mcp/mcp-server-proxy.service.ts +1 -6
- package/src/browser/mcp/tools/getDiagnosticsByPath.ts +1 -1
- package/src/browser/mcp/tools/getOpenEditorFileDiagnostics.ts +1 -1
- package/src/browser/mcp/tools/handlers/ListDir.ts +1 -1
- package/src/browser/mcp/tools/runTerminalCmd.ts +1 -1
- package/src/browser/model/msg-history-manager.ts +2 -181
- package/src/browser/preferences/schema.ts +0 -5
- package/src/browser/types.ts +0 -18
- package/src/browser/widget/inline-stream-diff/live-preview.component.tsx +1 -0
- package/src/common/index.ts +1 -6
- package/src/common/llm-context.ts +0 -23
- package/src/common/prompts/context-prompt-provider.ts +40 -55
- package/src/common/types.ts +0 -18
- package/src/common/utils.ts +1 -4
- package/src/node/base-language-model.ts +13 -10
- package/src/node/mcp/sumi-mcp-server.ts +2 -10
- package/src/node/mcp-server-manager-impl.ts +2 -17
- package/lib/browser/rules/rules.contribution.d.ts +0 -29
- package/lib/browser/rules/rules.contribution.d.ts.map +0 -1
- package/lib/browser/rules/rules.contribution.js +0 -94
- package/lib/browser/rules/rules.contribution.js.map +0 -1
- package/lib/browser/rules/rules.module.less +0 -174
- package/lib/browser/rules/rules.service.d.ts +0 -25
- package/lib/browser/rules/rules.service.d.ts.map +0 -1
- package/lib/browser/rules/rules.service.js +0 -180
- package/lib/browser/rules/rules.service.js.map +0 -1
- package/lib/browser/rules/rules.view.d.ts +0 -3
- package/lib/browser/rules/rules.view.d.ts.map +0 -1
- package/lib/browser/rules/rules.view.js +0 -76
- package/lib/browser/rules/rules.view.js.map +0 -1
- package/lib/common/MDC_PARSER_README.md +0 -171
- package/lib/common/image-compression.d.ts +0 -25
- package/lib/common/image-compression.d.ts.map +0 -1
- package/lib/common/image-compression.js +0 -153
- package/lib/common/image-compression.js.map +0 -1
- package/lib/common/mdc-parser.d.ts +0 -60
- package/lib/common/mdc-parser.d.ts.map +0 -1
- package/lib/common/mdc-parser.js +0 -246
- package/lib/common/mdc-parser.js.map +0 -1
- package/lib/common/prompts/system-prompt.d.ts +0 -2
- package/lib/common/prompts/system-prompt.d.ts.map +0 -1
- package/lib/common/prompts/system-prompt.js +0 -5
- package/lib/common/prompts/system-prompt.js.map +0 -1
- package/src/browser/rules/rules.contribution.ts +0 -105
- package/src/browser/rules/rules.module.less +0 -174
- package/src/browser/rules/rules.service.ts +0 -189
- package/src/browser/rules/rules.view.tsx +0 -127
- package/src/common/MDC_PARSER_README.md +0 -171
- package/src/common/image-compression.ts +0 -174
- package/src/common/mdc-parser.ts +0 -295
- package/src/common/prompts/system-prompt.ts +0 -2
|
@@ -8,54 +8,37 @@ const ide_workspace_1 = require("@opensumi/ide-workspace");
|
|
|
8
8
|
exports.ChatAgentPromptProvider = Symbol('ChatAgentPromptProvider');
|
|
9
9
|
let DefaultChatAgentPromptProvider = class DefaultChatAgentPromptProvider {
|
|
10
10
|
async provideContextPrompt(context, userMessage) {
|
|
11
|
-
|
|
12
|
-
if (context.attachedFiles.some((file) => file.path === (currentFileInfo === null || currentFileInfo === void 0 ? void 0 : currentFileInfo.path))) {
|
|
13
|
-
currentFileInfo = null;
|
|
14
|
-
}
|
|
11
|
+
const currentFileInfo = context.attachedFiles.length > 0 || context.attachedFolders.length > 0 ? null : await this.getCurrentFileInfo();
|
|
15
12
|
return this.buildPromptTemplate({
|
|
16
|
-
|
|
17
|
-
|
|
13
|
+
recentFiles: this.buildRecentFilesSection(context.recentlyViewFiles),
|
|
14
|
+
attachedFiles: this.buildAttachedFilesSection(context.attachedFiles),
|
|
15
|
+
attachedFolders: this.buildAttachedFoldersSection(context.attachedFolders),
|
|
18
16
|
currentFile: currentFileInfo,
|
|
19
|
-
attachedRules: context.attachedRules,
|
|
20
|
-
globalRules: context.globalRules,
|
|
21
17
|
userMessage,
|
|
22
18
|
});
|
|
23
19
|
}
|
|
24
20
|
async getCurrentFileInfo() {
|
|
25
|
-
var _a
|
|
21
|
+
var _a;
|
|
26
22
|
const editor = this.workbenchEditorService.currentEditor;
|
|
27
23
|
const currentModel = editor === null || editor === void 0 ? void 0 : editor.currentDocumentModel;
|
|
28
24
|
if (!(currentModel === null || currentModel === void 0 ? void 0 : currentModel.uri)) {
|
|
29
25
|
return null;
|
|
30
26
|
}
|
|
31
27
|
const currentPath = ((_a = (await this.workspaceService.asRelativePath(currentModel.uri))) === null || _a === void 0 ? void 0 : _a.path) || currentModel.uri.codeUri.fsPath;
|
|
32
|
-
// 获取当前选中行信息
|
|
33
|
-
const selection = (_b = editor === null || editor === void 0 ? void 0 : editor.monacoEditor) === null || _b === void 0 ? void 0 : _b.getSelection();
|
|
34
|
-
const currentLine = selection ? selection.startLineNumber : undefined;
|
|
35
|
-
let lineContent = '';
|
|
36
|
-
if (currentLine && (editor === null || editor === void 0 ? void 0 : editor.monacoEditor)) {
|
|
37
|
-
const model = editor.monacoEditor.getModel();
|
|
38
|
-
if (model) {
|
|
39
|
-
lineContent = ((_c = model.getLineContent(currentLine)) === null || _c === void 0 ? void 0 : _c.trim()) || '';
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
28
|
return {
|
|
43
29
|
path: currentPath,
|
|
44
30
|
languageId: currentModel.languageId,
|
|
45
31
|
content: currentModel.getText(),
|
|
46
|
-
currentLine,
|
|
47
|
-
lineContent,
|
|
48
32
|
};
|
|
49
33
|
}
|
|
50
|
-
|
|
34
|
+
buildPromptTemplate({ recentFiles, attachedFiles, attachedFolders, currentFile, userMessage, }) {
|
|
51
35
|
const sections = [
|
|
52
|
-
...globalRules,
|
|
53
|
-
...attachedFolders,
|
|
54
36
|
'<additional_data>',
|
|
55
37
|
'Below are some potentially helpful/relevant pieces of information for figuring out to respond',
|
|
38
|
+
recentFiles,
|
|
39
|
+
attachedFiles,
|
|
40
|
+
attachedFolders,
|
|
56
41
|
this.buildCurrentFileSection(currentFile),
|
|
57
|
-
this.buildAttachedFilesSection(attachedFiles),
|
|
58
|
-
...attachedRules,
|
|
59
42
|
'</additional_data>',
|
|
60
43
|
'<user_query>',
|
|
61
44
|
userMessage,
|
|
@@ -63,6 +46,14 @@ let DefaultChatAgentPromptProvider = class DefaultChatAgentPromptProvider {
|
|
|
63
46
|
].filter(Boolean);
|
|
64
47
|
return sections.join('\n');
|
|
65
48
|
}
|
|
49
|
+
buildRecentFilesSection(files) {
|
|
50
|
+
if (!files.length) {
|
|
51
|
+
return '';
|
|
52
|
+
}
|
|
53
|
+
return `<recently_viewed_files>
|
|
54
|
+
${files.map((file, idx) => ` ${idx + 1}: ${file}`).join('\n')}
|
|
55
|
+
</recently_viewed_files>`;
|
|
56
|
+
}
|
|
66
57
|
buildAttachedFilesSection(files) {
|
|
67
58
|
if (!files.length) {
|
|
68
59
|
return '';
|
|
@@ -80,9 +71,8 @@ let DefaultChatAgentPromptProvider = class DefaultChatAgentPromptProvider {
|
|
|
80
71
|
return `<attached_files>\n${fileContents}\n</attached_files>`;
|
|
81
72
|
}
|
|
82
73
|
buildFileContentSection(file) {
|
|
83
|
-
var _a, _b;
|
|
84
74
|
return `<file_contents>
|
|
85
|
-
\`\`\`${file.path}
|
|
75
|
+
\`\`\`${file.path}
|
|
86
76
|
${file.content}
|
|
87
77
|
\`\`\`
|
|
88
78
|
</file_contents>`;
|
|
@@ -93,17 +83,21 @@ ${file.content}
|
|
|
93
83
|
}
|
|
94
84
|
return `<linter_errors>\n${errors.join('\n')}\n</linter_errors>`;
|
|
95
85
|
}
|
|
86
|
+
buildAttachedFoldersSection(folders) {
|
|
87
|
+
if (!folders.length) {
|
|
88
|
+
return '';
|
|
89
|
+
}
|
|
90
|
+
return `<attached_folders>\n${folders.join('\n')}</attached_folders>`;
|
|
91
|
+
}
|
|
96
92
|
buildCurrentFileSection(fileInfo) {
|
|
97
93
|
if (!fileInfo) {
|
|
98
94
|
return '';
|
|
99
95
|
}
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
currentFileSection += '\n</current_file>';
|
|
106
|
-
return currentFileSection;
|
|
96
|
+
return `<current_opened_file>
|
|
97
|
+
\`\`\`${fileInfo.languageId} ${fileInfo.path}
|
|
98
|
+
${fileInfo.content}
|
|
99
|
+
\`\`\`
|
|
100
|
+
</current_opened_file>`;
|
|
107
101
|
}
|
|
108
102
|
};
|
|
109
103
|
exports.DefaultChatAgentPromptProvider = DefaultChatAgentPromptProvider;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-prompt-provider.js","sourceRoot":"","sources":["../../../src/common/prompts/context-prompt-provider.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,mEAAgF;AAChF,2DAA4D;AAI/C,QAAA,uBAAuB,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC;AAWlE,IAAM,8BAA8B,GAApC,MAAM,8BAA8B;IAOzC,KAAK,CAAC,oBAAoB,CAAC,OAA0B,EAAE,WAAmB;QACxE,
|
|
1
|
+
{"version":3,"file":"context-prompt-provider.js","sourceRoot":"","sources":["../../../src/common/prompts/context-prompt-provider.ts"],"names":[],"mappings":"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"}
|
package/lib/common/types.d.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { IMarker } from '@opensumi/ide-core-browser';
|
|
2
2
|
import { Uri } from '@opensumi/monaco-editor-core';
|
|
3
|
-
import { ImageCompressionOptions } from './image-compression';
|
|
4
3
|
export declare enum NearestCodeBlockType {
|
|
5
4
|
Block = "block",
|
|
6
5
|
Line = "line"
|
|
@@ -20,18 +19,6 @@ export interface INearestCodeBlock {
|
|
|
20
19
|
offset: number;
|
|
21
20
|
type?: NearestCodeBlockType;
|
|
22
21
|
}
|
|
23
|
-
export type IMCPToolResultContent = {
|
|
24
|
-
type: 'text';
|
|
25
|
-
text: string;
|
|
26
|
-
} | {
|
|
27
|
-
type: 'image';
|
|
28
|
-
data: string;
|
|
29
|
-
mimeType?: string;
|
|
30
|
-
};
|
|
31
|
-
export interface IMCPToolResult {
|
|
32
|
-
content: IMCPToolResultContent[];
|
|
33
|
-
isError?: boolean;
|
|
34
|
-
}
|
|
35
22
|
export interface IMCPServerProxyService {
|
|
36
23
|
$callMCPTool(name: string, args: any): Promise<{
|
|
37
24
|
content: {
|
|
@@ -48,7 +35,6 @@ export interface IMCPServerProxyService {
|
|
|
48
35
|
}>>;
|
|
49
36
|
$startServer(serverName: string): Promise<void>;
|
|
50
37
|
$stopServer(serverName: string): Promise<void>;
|
|
51
|
-
$compressToolResult(result: IMCPToolResult, options: ImageCompressionOptions): Promise<IMCPToolResult>;
|
|
52
38
|
}
|
|
53
39
|
export interface MCPServer {
|
|
54
40
|
name: string;
|
|
@@ -125,11 +111,4 @@ export interface SSEClientTransportOptions {
|
|
|
125
111
|
*/
|
|
126
112
|
requestInit?: RequestInit;
|
|
127
113
|
}
|
|
128
|
-
export interface ProjectRule {
|
|
129
|
-
path: string;
|
|
130
|
-
content: string;
|
|
131
|
-
description?: string;
|
|
132
|
-
globs?: string | string[];
|
|
133
|
-
alwaysApply?: boolean;
|
|
134
|
-
}
|
|
135
114
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/common/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AACrD,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAC;AAEnD,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/common/types.ts"],"names":[],"mappings":"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"}
|
package/lib/common/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/common/types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/common/types.ts"],"names":[],"mappings":";;;AAGA,IAAY,oBAGX;AAHD,WAAY,oBAAoB;IAC9B,uCAAe,CAAA;IACf,qCAAa,CAAA;AACf,CAAC,EAHW,oBAAoB,oCAApB,oBAAoB,QAG/B;AAuDD,IAAY,eAIX;AAJD,WAAY,eAAe;IACzB,kCAAe,CAAA;IACf,8BAAW,CAAA;IACX,sCAAmB,CAAA;AACrB,CAAC,EAJW,eAAe,+BAAf,eAAe,QAI1B;AAsBD,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,iCAAiB,CAAA;IACjB,mCAAmB,CAAA;AACrB,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB"}
|
package/lib/common/utils.d.ts
CHANGED
|
@@ -4,7 +4,6 @@ export declare const isDocumentTooShort: (document: IEditorDocumentModel) => boo
|
|
|
4
4
|
export declare const isDocumentValid: (document: IEditorDocumentModel) => boolean;
|
|
5
5
|
export declare const extractCodeBlocks: (content: string) => string;
|
|
6
6
|
export declare const toClaudeToolName: (name: string) => string;
|
|
7
|
-
export declare const TOOL_NAME_SEPARATOR = "__";
|
|
8
7
|
export declare const getToolName: (toolName: string, serverName: string) => string;
|
|
9
8
|
export declare const cleanAttachedTextWrapper: (text: string) => string;
|
|
10
9
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAO5D,eAAO,MAAM,kBAAkB,aAAc,oBAAoB,YAShE,CAAC;AAEF,eAAO,MAAM,kBAAkB,aAAc,oBAAoB,YAAiD,CAAC;AAEnH,eAAO,MAAM,eAAe,aAAc,oBAAoB,YAK7D,CAAC;AAGF,eAAO,MAAM,iBAAiB,YAAa,MAAM,KAAG,MAuBnD,CAAC;AAGF,eAAO,MAAM,gBAAgB,SAAU,MAAM,WAAqD,CAAC;AAEnG,eAAO,MAAM,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAO5D,eAAO,MAAM,kBAAkB,aAAc,oBAAoB,YAShE,CAAC;AAEF,eAAO,MAAM,kBAAkB,aAAc,oBAAoB,YAAiD,CAAC;AAEnH,eAAO,MAAM,eAAe,aAAc,oBAAoB,YAK7D,CAAC;AAGF,eAAO,MAAM,iBAAiB,YAAa,MAAM,KAAG,MAuBnD,CAAC;AAGF,eAAO,MAAM,gBAAgB,SAAU,MAAM,WAAqD,CAAC;AAEnG,eAAO,MAAM,WAAW,aAAc,MAAM,cAAc,MAAM,WACuC,CAAC;AAExG,eAAO,MAAM,wBAAwB,SAAU,MAAM,WAMpD,CAAC"}
|
package/lib/common/utils.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.cleanAttachedTextWrapper = exports.getToolName = exports.
|
|
3
|
+
exports.cleanAttachedTextWrapper = exports.getToolName = exports.toClaudeToolName = exports.extractCodeBlocks = exports.isDocumentValid = exports.isDocumentTooShort = exports.isDocumentTooLarge = void 0;
|
|
4
4
|
const index_1 = require("./index");
|
|
5
5
|
const BACK_QUOTE_3_SYMBOL = '```';
|
|
6
6
|
const MIN_PROMPT_CHARS = 10;
|
|
@@ -51,10 +51,7 @@ exports.extractCodeBlocks = extractCodeBlocks;
|
|
|
51
51
|
// 确保 Tool Name 符合 Claude 3.5+ Sonnet 要求的 ^[a-zA-Z0-9_-]{1,64}$ 正则
|
|
52
52
|
const toClaudeToolName = (name) => name.replace(/[^a-zA-Z0-9_-]/g, '').slice(0, 64);
|
|
53
53
|
exports.toClaudeToolName = toClaudeToolName;
|
|
54
|
-
|
|
55
|
-
const getToolName = (toolName, serverName) => serverName === index_1.BUILTIN_MCP_SERVER_NAME
|
|
56
|
-
? toolName
|
|
57
|
-
: (0, exports.toClaudeToolName)(`mcp${exports.TOOL_NAME_SEPARATOR}${serverName}${exports.TOOL_NAME_SEPARATOR}${toolName}`);
|
|
54
|
+
const getToolName = (toolName, serverName) => serverName === index_1.BUILTIN_MCP_SERVER_NAME ? toolName : (0, exports.toClaudeToolName)(`mcp_${serverName}_${toolName}`);
|
|
58
55
|
exports.getToolName = getToolName;
|
|
59
56
|
const cleanAttachedTextWrapper = (text) => {
|
|
60
57
|
const rgAttachedFile = /`<attached_file>(.*)`/g;
|
package/lib/common/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":";;;AAEA,mCAAkD;AAElD,MAAM,mBAAmB,GAAG,KAAK,CAAC;AAClC,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAErB,MAAM,kBAAkB,GAAG,CAAC,QAA8B,EAAE,EAAE;IACnE,IAAI,CAAC;QACH,QAAQ,CAAC,OAAO,EAAE,CAAC;IACrB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,CAAC,YAAY,UAAU,EAAE,CAAC;YAC5B,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AATW,QAAA,kBAAkB,sBAS7B;AAEK,MAAM,kBAAkB,GAAG,CAAC,QAA8B,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,MAAM,GAAG,gBAAgB,CAAC;AAAtG,QAAA,kBAAkB,sBAAoF;AAE5G,MAAM,eAAe,GAAG,CAAC,QAA8B,EAAE,EAAE;IAChE,IAAI,IAAA,0BAAkB,EAAC,QAAQ,CAAC,IAAI,IAAA,0BAAkB,EAAC,QAAQ,CAAC,EAAE,CAAC;QACjE,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AALW,QAAA,eAAe,mBAK1B;AAEF,eAAe;AACR,MAAM,iBAAiB,GAAG,CAAC,OAAe,EAAU,EAAE;IAC3D,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAElC,IAAI,WAAW,GAAa,EAAE,CAAC;IAC/B,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,IAAI,SAAS,GAAG,CAAC,CAAC;IAElB,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;QACxB,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE,CAAC;YAC5D,OAAO,GAAG,IAAI,CAAC;YACf,SAAS,GAAG,CAAC,GAAG,CAAC,CAAC;QACpB,CAAC;aAAM,IAAI,OAAO,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE,CAAC;YAClE,OAAO,GAAG,KAAK,CAAC;YAChB,MAAM,OAAO,GAAG,CAAC,CAAC;YAClB,WAAW,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAChD,CAAC;QAED,IAAI,OAAO,IAAI,SAAS,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;YACnC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC,CAAC;AAvBW,QAAA,iBAAiB,qBAuB5B;AAEF,kEAAkE;AAC3D,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAAtF,QAAA,gBAAgB,oBAAsE;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
import { CoreMessage } from 'ai';
|
|
2
2
|
import { IAIBackServiceOption } from '@opensumi/ide-core-common';
|
|
3
|
-
import { ChatReadableStream
|
|
3
|
+
import { ChatReadableStream } from '@opensumi/ide-core-node';
|
|
4
4
|
import { CancellationToken } from '@opensumi/ide-utils';
|
|
5
5
|
import { ModelInfo } from '../common';
|
|
6
6
|
import { IToolInvocationRegistryManager, ToolRequest } from '../common/tool-invocation-registry';
|
|
7
7
|
export declare abstract class BaseLanguageModel {
|
|
8
8
|
static ModelOptions: Record<string, ModelInfo>;
|
|
9
9
|
protected readonly toolInvocationRegistryManager: IToolInvocationRegistryManager;
|
|
10
|
-
protected readonly logger: INodeLogger;
|
|
11
10
|
protected abstract initializeProvider(options: IAIBackServiceOption): any;
|
|
12
11
|
request(request: string, chatReadableStream: ChatReadableStream, options: IAIBackServiceOption, cancellationToken?: CancellationToken): Promise<any>;
|
|
13
12
|
private convertToolRequestToAITool;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-language-model.d.ts","sourceRoot":"","sources":["../../src/node/base-language-model.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"base-language-model.d.ts","sourceRoot":"","sources":["../../src/node/base-language-model.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EAQZ,MAAM,IAAI,CAAC;AAGZ,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EACL,8BAA8B,EAE9B,WAAW,EACZ,MAAM,oCAAoC,CAAC;AAE5C,8BACsB,iBAAiB;IACrC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAG/C,SAAS,CAAC,QAAQ,CAAC,6BAA6B,EAAE,8BAA8B,CAAC;IAEjF,SAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,OAAO,EAAE,oBAAoB,GAAG,GAAG;IAEnE,OAAO,CACX,OAAO,EAAE,MAAM,EACf,kBAAkB,EAAE,kBAAkB,EACtC,OAAO,EAAE,oBAAoB,EAC7B,iBAAiB,CAAC,EAAE,iBAAiB,GACpC,OAAO,CAAC,GAAG,CAAC;IA2Bf,OAAO,CAAC,0BAA0B;IAUlC,SAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,GAAG;IAE3E,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,GAAG,SAAS;cAE9F,sBAAsB,CACpC,QAAQ,EAAE,GAAG,EACb,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,WAAW,EAAE,EACpB,kBAAkB,EAAE,kBAAkB,EACtC,OAAO,GAAE,WAAW,EAAO,EAC3B,OAAO,CAAC,EAAE,MAAM,EAChB,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACrC,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,YAAY,CAAC,EAAE,MAAM,EACrB,SAAS,CAAC,EAAE,MAAM,EAClB,MAAM,CAAC,EAAE,MAAM,EAAE,EACjB,iBAAiB,CAAC,EAAE,iBAAiB,GACpC,OAAO,CAAC,GAAG,CAAC;CAiKhB"}
|
|
@@ -4,7 +4,6 @@ exports.BaseLanguageModel = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const ai_1 = require("ai");
|
|
6
6
|
const di_1 = require("@opensumi/di");
|
|
7
|
-
const ide_core_node_1 = require("@opensumi/ide-core-node");
|
|
8
7
|
const tool_invocation_registry_1 = require("../common/tool-invocation-registry");
|
|
9
8
|
let BaseLanguageModel = class BaseLanguageModel {
|
|
10
9
|
async request(request, chatReadableStream, options, cancellationToken) {
|
|
@@ -23,11 +22,7 @@ let BaseLanguageModel = class BaseLanguageModel {
|
|
|
23
22
|
description: toolRequest.description || '',
|
|
24
23
|
// TODO 这里应该是 z.object 而不是 JSON Schema
|
|
25
24
|
parameters: (0, ai_1.jsonSchema)(toolRequest.parameters),
|
|
26
|
-
execute: async (args, options) =>
|
|
27
|
-
// 执行原始工具
|
|
28
|
-
const result = await toolRequest.handler(JSON.stringify(args), options);
|
|
29
|
-
return result;
|
|
30
|
-
},
|
|
25
|
+
execute: async (args, options) => await toolRequest.handler(JSON.stringify(args), options),
|
|
31
26
|
});
|
|
32
27
|
}
|
|
33
28
|
async handleStreamingRequest(provider, request, tools, chatReadableStream, history = [], modelId, providerOptions, trimTexts, systemPrompt, maxTokens, images, cancellationToken) {
|
|
@@ -190,10 +185,6 @@ tslib_1.__decorate([
|
|
|
190
185
|
(0, di_1.Autowired)(tool_invocation_registry_1.ToolInvocationRegistryManager),
|
|
191
186
|
tslib_1.__metadata("design:type", Object)
|
|
192
187
|
], BaseLanguageModel.prototype, "toolInvocationRegistryManager", void 0);
|
|
193
|
-
tslib_1.__decorate([
|
|
194
|
-
(0, di_1.Autowired)(ide_core_node_1.INodeLogger),
|
|
195
|
-
tslib_1.__metadata("design:type", Object)
|
|
196
|
-
], BaseLanguageModel.prototype, "logger", void 0);
|
|
197
188
|
exports.BaseLanguageModel = BaseLanguageModel = tslib_1.__decorate([
|
|
198
189
|
(0, di_1.Injectable)()
|
|
199
190
|
], BaseLanguageModel);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-language-model.js","sourceRoot":"","sources":["../../src/node/base-language-model.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"base-language-model.js","sourceRoot":"","sources":["../../src/node/base-language-model.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,8 @@ import { Server } from '@modelcontextprotocol/sdk/server/index.js';
|
|
|
3
3
|
import { RPCService } from '@opensumi/ide-connection';
|
|
4
4
|
import { ILogger } from '@opensumi/ide-core-common';
|
|
5
5
|
import { ISumiMCPServerBackend } from '../../common';
|
|
6
|
-
import { ImageCompressionOptions } from '../../common/image-compression';
|
|
7
6
|
import { IMCPServer, MCPServerDescription } from '../../common/mcp-server-manager';
|
|
8
|
-
import { IMCPServerProxyService,
|
|
7
|
+
import { IMCPServerProxyService, MCPTool, MCP_SERVER_TYPE } from '../../common/types';
|
|
9
8
|
export declare class SumiMCPServerBackend extends RPCService<IMCPServerProxyService> implements ISumiMCPServerBackend {
|
|
10
9
|
private readonly mcpServerManager;
|
|
11
10
|
private readonly toolInvocationRegistryManager;
|
|
@@ -14,7 +13,6 @@ export declare class SumiMCPServerBackend extends RPCService<IMCPServerProxyServ
|
|
|
14
13
|
private clientId;
|
|
15
14
|
constructor();
|
|
16
15
|
setConnectionClientId(clientId: string): void;
|
|
17
|
-
$compressToolResult(result: IMCPToolResult, options: ImageCompressionOptions): Promise<IMCPToolResult>;
|
|
18
16
|
$getMCPTools(): Promise<MCPTool[]>;
|
|
19
17
|
$getMCPServerByName(name: string): IMCPServer | undefined;
|
|
20
18
|
callMCPTool(name: string, args: any): Promise<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sumi-mcp-server.d.ts","sourceRoot":"","sources":["../../../src/node/mcp/sumi-mcp-server.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AACnE,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAInE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAIpD,OAAO,EAA2B,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC9E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"sumi-mcp-server.d.ts","sourceRoot":"","sources":["../../../src/node/mcp/sumi-mcp-server.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AACnE,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAInE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAIpD,OAAO,EAA2B,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAEnF,OAAO,EAAE,sBAAsB,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAUtF,qBACa,oBAAqB,SAAQ,UAAU,CAAC,sBAAsB,CAAE,YAAW,qBAAqB;IAG3G,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAuB;IAGxD,OAAO,CAAC,QAAQ,CAAC,6BAA6B,CAAiC;IAG/E,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IAEjC,OAAO,CAAC,MAAM,CAAqB;IAGnC,OAAO,CAAC,QAAQ,CAAc;;IAOvB,qBAAqB,CAAC,QAAQ,EAAE,MAAM;IAKvC,YAAY;IASlB,mBAAmB,CAAC,IAAI,EAAE,MAAM;IAI1B,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG;;;;;;;IAOzC,SAAS;;;;;;;;;;;;;;;;;;;;;;;IAKH,eAAe,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IAU9B,qBAAqB,CAAC,OAAO,EAAE,OAAO;IAOtC,uBAAuB,CAAC,OAAO,EAAE,oBAAoB,EAAE;IAM9D,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;IAqCrB,WAAW;;;;;;;;;;;;;;;;;;;;;;IA6DX,YAAY,CAAC,UAAU,EAAE,MAAM;IAK/B,WAAW,CAAC,UAAU,EAAE,MAAM;IAK7B,kBAAkB,CAAC,WAAW,EAAE,oBAAoB;IAK9C,aAAa,CAAC,IAAI,EAAE,MAAM;IAI1B,WAAW,CAAC,IAAI,EAAE,MAAM;CAGtC;AAED,eAAO,MAAM,qBAAqB,eAAkC,CAAC;AAErE,qBAAa,gBAAiB,YAAW,UAAU;IAGrC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAAwB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAFzF,OAAO,CAAC,OAAO,CAAkB;gBAEJ,aAAa,EAAE,oBAAoB,EAAmB,MAAM,EAAE,OAAO;IAElG,SAAS,IAAI,OAAO;IAIpB,aAAa,IAAI,MAAM;IAIvB,SAAS,IAAI,MAAM,GAAG,IAAI;IAIpB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAStB,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAqBhF,QAAQ,IAAI,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAQjD,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,IAAI;IAIlF,IAAI,IAAI,IAAI;CAOb"}
|
|
@@ -26,18 +26,12 @@ let SumiMCPServerBackend = class SumiMCPServerBackend extends ide_connection_1.R
|
|
|
26
26
|
super();
|
|
27
27
|
// 对应 BrowserTab 的 clientId
|
|
28
28
|
this.clientId = '';
|
|
29
|
-
this.mcpServerManager = new mcp_server_manager_impl_1.MCPServerManagerImpl(this.toolInvocationRegistryManager, this.logger
|
|
29
|
+
this.mcpServerManager = new mcp_server_manager_impl_1.MCPServerManagerImpl(this.toolInvocationRegistryManager, this.logger);
|
|
30
30
|
}
|
|
31
31
|
setConnectionClientId(clientId) {
|
|
32
32
|
this.clientId = clientId;
|
|
33
33
|
this.mcpServerManager.setClientId(clientId);
|
|
34
34
|
}
|
|
35
|
-
async $compressToolResult(result, options) {
|
|
36
|
-
if (!this.client) {
|
|
37
|
-
throw new Error('SUMI MCP RPC Client not initialized');
|
|
38
|
-
}
|
|
39
|
-
return this.client.$compressToolResult(result, options);
|
|
40
|
-
}
|
|
41
35
|
async $getMCPTools() {
|
|
42
36
|
if (!this.client) {
|
|
43
37
|
throw new Error('SUMI MCP RPC Client not initialized');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sumi-mcp-server.js","sourceRoot":"","sources":["../../../src/node/mcp/sumi-mcp-server.ts"],"names":[],"mappings":";AAAA,2DAA2D;AAC3D,mCAAmC;;;;AAGnC,wEAAmE;AACnE,iEAAmG;AAEnG,qCAAqD;AACrD,6DAAsD;AACtD,+DAAoD;AACpD,2DAAsD;AAEtD,iFAAwC;AACxC,yCAA8E;
|
|
1
|
+
{"version":3,"file":"sumi-mcp-server.js","sourceRoot":"","sources":["../../../src/node/mcp/sumi-mcp-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,15 @@
|
|
|
1
1
|
import { ILogger } from '@opensumi/ide-core-common';
|
|
2
|
-
import { ISumiMCPServerBackend } from '../common';
|
|
3
2
|
import { IMCPServer, MCPServerDescription, MCPServerManager } from '../common/mcp-server-manager';
|
|
4
3
|
import { IToolInvocationRegistryManager } from '../common/tool-invocation-registry';
|
|
5
4
|
import { BuiltinMCPServer } from './mcp/sumi-mcp-server';
|
|
6
5
|
export declare class MCPServerManagerImpl implements MCPServerManager {
|
|
7
6
|
private readonly toolInvocationRegistryManager;
|
|
8
7
|
private readonly logger;
|
|
9
|
-
private readonly proxy;
|
|
10
8
|
protected servers: Map<string, IMCPServer>;
|
|
11
9
|
private clientId;
|
|
12
10
|
private shellPath;
|
|
13
11
|
getServers(): Map<string, IMCPServer>;
|
|
14
|
-
constructor(toolInvocationRegistryManager: IToolInvocationRegistryManager, logger: ILogger
|
|
12
|
+
constructor(toolInvocationRegistryManager: IToolInvocationRegistryManager, logger: ILogger);
|
|
15
13
|
updateShellPath(): Promise<void>;
|
|
16
14
|
setClientId(clientId: string): void;
|
|
17
15
|
private unregisterServerTools;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-server-manager-impl.d.ts","sourceRoot":"","sources":["../../src/node/mcp-server-manager-impl.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAGpD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"mcp-server-manager-impl.d.ts","sourceRoot":"","sources":["../../src/node/mcp-server-manager-impl.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAGpD,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,gBAAgB,EAAW,MAAM,8BAA8B,CAAC;AAC3G,OAAO,EAAE,8BAA8B,EAAe,MAAM,oCAAoC,CAAC;AAIjG,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAIzD,qBAAa,oBAAqB,YAAW,gBAAgB;IAazD,OAAO,CAAC,QAAQ,CAAC,6BAA6B;IAC9C,OAAO,CAAC,QAAQ,CAAC,MAAM;IAbzB,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAa;IAGvD,OAAO,CAAC,QAAQ,CAAS;IAEzB,OAAO,CAAC,SAAS,CAAqB;IAEtC,UAAU,IAAI,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC;gBAKlB,6BAA6B,EAAE,8BAA8B,EAC7D,MAAM,EAAE,OAAO;IAG5B,eAAe;IAOrB,WAAW,CAAC,QAAQ,EAAE,MAAM;IAI5B,OAAO,CAAC,qBAAqB;IAKvB,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAW7C,iBAAiB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAU5C,QAAQ,CACN,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IAQ/B,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAS9C,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAIzC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS;IAIrD,OAAO,CAAC,oBAAoB;IAuBf,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAehD,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IAQ7E,iBAAiB,CAAC,WAAW,EAAE,oBAAoB,GAAG,IAAI;IAyB1D,yBAAyB,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;IAK7C,iBAAiB,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,OAAO,GAAE,OAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ7F,qBAAqB,CAAC,OAAO,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB3E,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAa1B,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAW9C"}
|
|
@@ -11,10 +11,9 @@ class MCPServerManagerImpl {
|
|
|
11
11
|
getServers() {
|
|
12
12
|
return this.servers;
|
|
13
13
|
}
|
|
14
|
-
constructor(toolInvocationRegistryManager, logger
|
|
14
|
+
constructor(toolInvocationRegistryManager, logger) {
|
|
15
15
|
this.toolInvocationRegistryManager = toolInvocationRegistryManager;
|
|
16
16
|
this.logger = logger;
|
|
17
|
-
this.proxy = proxy;
|
|
18
17
|
this.servers = new Map();
|
|
19
18
|
}
|
|
20
19
|
async updateShellPath() {
|
|
@@ -79,22 +78,11 @@ class MCPServerManagerImpl {
|
|
|
79
78
|
parameters: tool.inputSchema,
|
|
80
79
|
description: tool.description,
|
|
81
80
|
handler: async (arg_string, options) => {
|
|
82
|
-
var _a;
|
|
83
81
|
try {
|
|
84
82
|
const res = await this.callTool(serverName, tool.name, (options === null || options === void 0 ? void 0 : options.toolCallId) || '', arg_string);
|
|
85
83
|
this.logger.debug(`[MCP: ${serverName}] ${tool.name} called with ${arg_string}`);
|
|
86
84
|
this.logger.debug('Tool execution result:', res);
|
|
87
|
-
|
|
88
|
-
if (((_a = this.proxy) === null || _a === void 0 ? void 0 : _a.$compressToolResult) &&
|
|
89
|
-
(compressedResult.content || []).some((item) => item.type === 'image')) {
|
|
90
|
-
compressedResult = await this.proxy.$compressToolResult(res, {
|
|
91
|
-
maxSizeKB: 100,
|
|
92
|
-
maxWidth: 600,
|
|
93
|
-
quality: 0.6,
|
|
94
|
-
});
|
|
95
|
-
}
|
|
96
|
-
this.logger.debug('Compressed tool execution result:', compressedResult);
|
|
97
|
-
return JSON.stringify(compressedResult);
|
|
85
|
+
return JSON.stringify(res);
|
|
98
86
|
}
|
|
99
87
|
catch (error) {
|
|
100
88
|
this.logger.error(`Error in tool handler for ${tool.name} on MCP server ${serverName}:`, error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-server-manager-impl.js","sourceRoot":"","sources":["../../src/node/mcp-server-manager-impl.ts"],"names":[],"mappings":";;;AAGA,2DAAuD;
|
|
1
|
+
{"version":3,"file":"mcp-server-manager-impl.js","sourceRoot":"","sources":["../../src/node/mcp-server-manager-impl.ts"],"names":[],"mappings":"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"}
|