@opensumi/ide-ai-native 3.8.1-next-1740452912.0 → 3.8.1-next-1740465035.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 +10 -3
- package/lib/browser/ai-core.contribution.js.map +1 -1
- package/lib/browser/chat/chat-manager.service.d.ts +5 -0
- package/lib/browser/chat/chat-manager.service.d.ts.map +1 -1
- package/lib/browser/chat/chat-manager.service.js +18 -1
- package/lib/browser/chat/chat-manager.service.js.map +1 -1
- package/lib/browser/chat/chat-model.d.ts +2 -0
- package/lib/browser/chat/chat-model.d.ts.map +1 -1
- package/lib/browser/chat/chat-model.js +8 -2
- package/lib/browser/chat/chat-model.js.map +1 -1
- package/lib/browser/chat/chat.module.less +1 -2
- package/lib/browser/chat/chat.view.d.ts.map +1 -1
- package/lib/browser/chat/chat.view.js +14 -9
- package/lib/browser/chat/chat.view.js.map +1 -1
- package/lib/browser/components/ChatContext/index.js +2 -2
- package/lib/browser/components/ChatContext/index.js.map +1 -1
- package/lib/browser/components/chat-history.css +1 -1
- package/lib/browser/context/llm-context.service.d.ts +16 -5
- package/lib/browser/context/llm-context.service.d.ts.map +1 -1
- package/lib/browser/context/llm-context.service.js +78 -47
- 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 +4 -0
- package/lib/browser/index.js.map +1 -1
- package/lib/browser/mcp/config/components/mcp-config.module.less +178 -0
- package/lib/browser/mcp/config/components/mcp-config.view.d.ts +3 -0
- package/lib/browser/mcp/config/components/mcp-config.view.d.ts.map +1 -0
- package/lib/browser/mcp/config/components/mcp-config.view.js +150 -0
- package/lib/browser/mcp/config/components/mcp-config.view.js.map +1 -0
- package/lib/browser/mcp/config/components/mcp-server-form.d.ts +16 -0
- package/lib/browser/mcp/config/components/mcp-server-form.d.ts.map +1 -0
- package/lib/browser/mcp/config/components/mcp-server-form.js +84 -0
- package/lib/browser/mcp/config/components/mcp-server-form.js.map +1 -0
- package/lib/browser/mcp/config/components/mcp-server-form.module.less +78 -0
- package/lib/browser/mcp/config/mcp-config.commands.d.ts +10 -0
- package/lib/browser/mcp/config/mcp-config.commands.d.ts.map +1 -0
- package/lib/browser/mcp/config/mcp-config.commands.js +35 -0
- package/lib/browser/mcp/config/mcp-config.commands.js.map +1 -0
- package/lib/browser/mcp/config/mcp-config.contribution.d.ts +16 -0
- package/lib/browser/mcp/config/mcp-config.contribution.d.ts.map +1 -0
- package/lib/browser/mcp/config/mcp-config.contribution.js +62 -0
- package/lib/browser/mcp/config/mcp-config.contribution.js.map +1 -0
- package/lib/browser/mcp/mcp-server-proxy.service.d.ts +6 -0
- package/lib/browser/mcp/mcp-server-proxy.service.d.ts.map +1 -1
- package/lib/browser/mcp/mcp-server-proxy.service.js +10 -1
- package/lib/browser/mcp/mcp-server-proxy.service.js.map +1 -1
- package/lib/browser/mcp/mcp-server.feature.registry.d.ts.map +1 -1
- package/lib/browser/mcp/mcp-server.feature.registry.js +3 -2
- package/lib/browser/mcp/mcp-server.feature.registry.js.map +1 -1
- package/lib/browser/mcp/tools/handlers/RunCommand.d.ts.map +1 -1
- package/lib/browser/mcp/tools/handlers/RunCommand.js +2 -0
- package/lib/browser/mcp/tools/handlers/RunCommand.js.map +1 -1
- package/lib/browser/preferences/schema.d.ts.map +1 -1
- package/lib/browser/preferences/schema.js +16 -0
- package/lib/browser/preferences/schema.js.map +1 -1
- package/lib/common/index.d.ts +8 -1
- package/lib/common/index.d.ts.map +1 -1
- package/lib/common/index.js +3 -1
- package/lib/common/index.js.map +1 -1
- package/lib/common/llm-context.d.ts +12 -9
- package/lib/common/llm-context.d.ts.map +1 -1
- package/lib/common/llm-context.js.map +1 -1
- package/lib/common/mcp-server-manager.d.ts +17 -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/prompts/context-prompt-provider.d.ts +2 -3
- package/lib/common/prompts/context-prompt-provider.d.ts.map +1 -1
- package/lib/common/prompts/context-prompt-provider.js +21 -22
- package/lib/common/prompts/context-prompt-provider.js.map +1 -1
- package/lib/common/tool-invocation-registry.d.ts +2 -2
- package/lib/common/tool-invocation-registry.d.ts.map +1 -1
- package/lib/common/tool-invocation-registry.js +1 -1
- package/lib/common/tool-invocation-registry.js.map +1 -1
- package/lib/common/types.d.ts +6 -0
- package/lib/common/types.d.ts.map +1 -1
- package/lib/common/utils.d.ts.map +1 -1
- package/lib/common/utils.js +2 -1
- package/lib/common/utils.js.map +1 -1
- package/lib/node/mcp/sumi-mcp-server.d.ts +17 -3
- package/lib/node/mcp/sumi-mcp-server.d.ts.map +1 -1
- package/lib/node/mcp/sumi-mcp-server.js +59 -6
- package/lib/node/mcp/sumi-mcp-server.js.map +1 -1
- package/lib/node/mcp-server-manager-impl.d.ts +4 -3
- package/lib/node/mcp-server-manager-impl.d.ts.map +1 -1
- package/lib/node/mcp-server-manager-impl.js +26 -6
- package/lib/node/mcp-server-manager-impl.js.map +1 -1
- package/lib/node/mcp-server.d.ts +5 -16
- package/lib/node/mcp-server.d.ts.map +1 -1
- package/lib/node/mcp-server.js +12 -6
- package/lib/node/mcp-server.js.map +1 -1
- package/lib/node/openai/openai-language-model.d.ts +4 -3
- package/lib/node/openai/openai-language-model.d.ts.map +1 -1
- package/lib/node/openai/openai-language-model.js +3 -2
- package/lib/node/openai/openai-language-model.js.map +1 -1
- package/package.json +27 -27
- package/src/browser/ai-core.contribution.ts +13 -4
- package/src/browser/chat/chat-manager.service.ts +17 -1
- package/src/browser/chat/chat-model.ts +18 -3
- package/src/browser/chat/chat.module.less +1 -2
- package/src/browser/chat/chat.view.tsx +45 -23
- package/src/browser/components/ChatContext/index.tsx +2 -2
- package/src/browser/components/chat-history.css +1 -1
- package/src/browser/context/llm-context.service.ts +90 -54
- package/src/browser/index.ts +4 -0
- package/src/browser/mcp/config/components/mcp-config.module.less +178 -0
- package/src/browser/mcp/config/components/mcp-config.view.tsx +215 -0
- package/src/browser/mcp/config/components/mcp-server-form.module.less +78 -0
- package/src/browser/mcp/config/components/mcp-server-form.tsx +144 -0
- package/src/browser/mcp/config/mcp-config.commands.ts +29 -0
- package/src/browser/mcp/config/mcp-config.contribution.ts +65 -0
- package/src/browser/mcp/mcp-server-proxy.service.ts +14 -2
- package/src/browser/mcp/mcp-server.feature.registry.ts +3 -2
- package/src/browser/mcp/tools/handlers/RunCommand.ts +2 -0
- package/src/browser/preferences/schema.ts +16 -0
- package/src/common/index.ts +7 -1
- package/src/common/llm-context.ts +10 -4
- package/src/common/mcp-server-manager.ts +17 -1
- package/src/common/prompts/context-prompt-provider.ts +26 -28
- package/src/common/tool-invocation-registry.ts +2 -2
- package/src/common/types.ts +6 -0
- package/src/common/utils.ts +3 -1
- package/src/node/mcp/sumi-mcp-server.ts +67 -9
- package/src/node/mcp-server-manager-impl.ts +30 -9
- package/src/node/mcp-server.ts +11 -14
- package/src/node/openai/openai-language-model.ts +7 -4
|
@@ -10,28 +10,31 @@ export interface LLMContextService {
|
|
|
10
10
|
* 清除上下文
|
|
11
11
|
*/
|
|
12
12
|
cleanFileContext(): void;
|
|
13
|
-
onDidContextFilesChangeEvent: Event<
|
|
13
|
+
onDidContextFilesChangeEvent: Event<{
|
|
14
|
+
viewed: FileContext[];
|
|
15
|
+
attached: FileContext[];
|
|
16
|
+
}>;
|
|
14
17
|
/**
|
|
15
18
|
* 从 context 中移除文件
|
|
16
19
|
* @param uri URI
|
|
17
20
|
*/
|
|
18
|
-
removeFileFromContext(uri: URI): void;
|
|
21
|
+
removeFileFromContext(uri: URI, isManual?: boolean): void;
|
|
19
22
|
/** 导出为可序列化格式 */
|
|
20
23
|
serialize(): SerializedContext;
|
|
21
24
|
}
|
|
22
25
|
export interface FileContext {
|
|
23
26
|
uri: URI;
|
|
24
27
|
selection?: [number, number];
|
|
25
|
-
isManual: boolean;
|
|
26
28
|
}
|
|
27
29
|
export declare const LLMContextServiceToken: unique symbol;
|
|
30
|
+
export interface AttachFileContext {
|
|
31
|
+
content: string;
|
|
32
|
+
lineErrors: string[];
|
|
33
|
+
path: string;
|
|
34
|
+
language: string;
|
|
35
|
+
}
|
|
28
36
|
export interface SerializedContext {
|
|
29
37
|
recentlyViewFiles: string[];
|
|
30
|
-
attachedFiles: Array<
|
|
31
|
-
content: string;
|
|
32
|
-
lineErrors: string[];
|
|
33
|
-
path: string;
|
|
34
|
-
language: string;
|
|
35
|
-
}>;
|
|
38
|
+
attachedFiles: Array<AttachFileContext>;
|
|
36
39
|
}
|
|
37
40
|
//# sourceMappingURL=llm-context.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llm-context.d.ts","sourceRoot":"","sources":["../../src/common/llm-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,qCAAqC,CAAC;AAEjE,MAAM,WAAW,iBAAiB;IAChC,mBAAmB,IAAI,IAAI,CAAC;IAE5B,kBAAkB,IAAI,IAAI,CAAC;IAE3B;;OAEG;IACH,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAEnF;;OAEG;IACH,gBAAgB,IAAI,IAAI,CAAC;IAEzB,4BAA4B,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"llm-context.d.ts","sourceRoot":"","sources":["../../src/common/llm-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,qCAAqC,CAAC;AAEjE,MAAM,WAAW,iBAAiB;IAChC,mBAAmB,IAAI,IAAI,CAAC;IAE5B,kBAAkB,IAAI,IAAI,CAAC;IAE3B;;OAEG;IACH,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAEnF;;OAEG;IACH,gBAAgB,IAAI,IAAI,CAAC;IAEzB,4BAA4B,EAAE,KAAK,CAAC;QAAE,MAAM,EAAE,WAAW,EAAE,CAAC;QAAC,QAAQ,EAAE,WAAW,EAAE,CAAA;KAAE,CAAC,CAAC;IAExF;;;OAGG;IACH,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAE1D,gBAAgB;IAChB,SAAS,IAAI,iBAAiB,CAAC;CAChC;AAED,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,GAAG,CAAC;IACT,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B;AAED,eAAO,MAAM,sBAAsB,eAA8B,CAAC;AAElE,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,iBAAiB;IAChC,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,aAAa,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC;CACzC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llm-context.js","sourceRoot":"","sources":["../../src/common/llm-context.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"llm-context.js","sourceRoot":"","sources":["../../src/common/llm-context.ts"],"names":[],"mappings":";;;AAkCa,QAAA,sBAAsB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC"}
|
|
@@ -1,10 +1,21 @@
|
|
|
1
1
|
import { Client } from '@modelcontextprotocol/sdk/client/index.js';
|
|
2
|
+
export interface IMCPServer {
|
|
3
|
+
isStarted(): boolean;
|
|
4
|
+
start(): Promise<void>;
|
|
5
|
+
getServerName(): string;
|
|
6
|
+
callTool(toolName: string, toolCallId: string, arg_string: string): ReturnType<Client['callTool']>;
|
|
7
|
+
getTools(): ReturnType<Client['listTools']>;
|
|
8
|
+
update(command: string, args?: string[], env?: {
|
|
9
|
+
[key: string]: string;
|
|
10
|
+
}): void;
|
|
11
|
+
stop(): void;
|
|
12
|
+
}
|
|
2
13
|
export interface MCPServerManager {
|
|
3
14
|
callTool(serverName: string, toolName: string, toolCallId: string, arg_string: string): ReturnType<Client['callTool']>;
|
|
4
15
|
removeServer(name: string): void;
|
|
5
16
|
addOrUpdateServer(description: MCPServerDescription): void;
|
|
6
17
|
addOrUpdateServerDirectly(server: any): void;
|
|
7
|
-
initBuiltinServer(builtinMCPServer: any): void;
|
|
18
|
+
initBuiltinServer(builtinMCPServer: any, enabled: boolean): void;
|
|
8
19
|
getTools(serverName: string): ReturnType<Client['listTools']>;
|
|
9
20
|
getServerNames(): Promise<string[]>;
|
|
10
21
|
startServer(serverName: string): Promise<void>;
|
|
@@ -12,6 +23,7 @@ export interface MCPServerManager {
|
|
|
12
23
|
getStartedServers(): Promise<string[]>;
|
|
13
24
|
registerTools(serverName: string): Promise<void>;
|
|
14
25
|
addExternalMCPServers(servers: MCPServerDescription[]): void;
|
|
26
|
+
getServers(): Map<string, IMCPServer>;
|
|
15
27
|
}
|
|
16
28
|
export type MCPTool = Awaited<ReturnType<MCPServerManager['getTools']>>['tools'][number];
|
|
17
29
|
export type MCPToolParameter = Awaited<ReturnType<MCPServerManager['getTools']>>['tools'][number]['inputSchema'];
|
|
@@ -34,6 +46,10 @@ export interface MCPServerDescription {
|
|
|
34
46
|
env?: {
|
|
35
47
|
[key: string]: string;
|
|
36
48
|
};
|
|
49
|
+
/**
|
|
50
|
+
* Whether to enable the MCP server.
|
|
51
|
+
*/
|
|
52
|
+
enabled?: boolean;
|
|
37
53
|
}
|
|
38
54
|
export declare const MCPServerManager: unique symbol;
|
|
39
55
|
export declare const MCPServerManagerPath = "ServicesMCPServerManager";
|
|
@@ -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;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;
|
|
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,UAAU;IACzB,SAAS,IAAI,OAAO,CAAC;IACrB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,aAAa,IAAI,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;IACnG,QAAQ,IAAI,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;IAC5C,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAChF,IAAI,IAAI,IAAI,CAAC;CACd;AAED,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,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IACjE,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;IAC7D,UAAU,IAAI,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;CACvC;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;IAEhC;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;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":";;;AAiEa,QAAA,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC;AAC9C,QAAA,oBAAoB,GAAG,0BAA0B,CAAC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { MaybePromise } from '@opensumi/ide-core-common/lib/utils';
|
|
2
1
|
import { SerializedContext } from '../llm-context';
|
|
3
2
|
export declare const ChatAgentPromptProvider: unique symbol;
|
|
4
3
|
export interface ChatAgentPromptProvider {
|
|
@@ -6,9 +5,9 @@ export interface ChatAgentPromptProvider {
|
|
|
6
5
|
* 提供上下文提示
|
|
7
6
|
* @param context 上下文
|
|
8
7
|
*/
|
|
9
|
-
provideContextPrompt(context: SerializedContext, userMessage: string):
|
|
8
|
+
provideContextPrompt(context: SerializedContext, userMessage: string): string;
|
|
10
9
|
}
|
|
11
10
|
export declare class DefaultChatAgentPromptProvider implements ChatAgentPromptProvider {
|
|
12
|
-
provideContextPrompt(context: SerializedContext, userMessage: string):
|
|
11
|
+
provideContextPrompt(context: SerializedContext, userMessage: string): string;
|
|
13
12
|
}
|
|
14
13
|
//# sourceMappingURL=context-prompt-provider.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-prompt-provider.d.ts","sourceRoot":"","sources":["../../../src/common/prompts/context-prompt-provider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"context-prompt-provider.d.ts","sourceRoot":"","sources":["../../../src/common/prompts/context-prompt-provider.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,eAAO,MAAM,uBAAuB,eAAoC,CAAC;AAEzE,MAAM,WAAW,uBAAuB;IACtC;;;OAGG;IACH,oBAAoB,CAAC,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;CAC/E;AAED,qBACa,8BAA+B,YAAW,uBAAuB;IAC5E,oBAAoB,CAAC,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM;CA2B9E"}
|
|
@@ -7,28 +7,27 @@ exports.ChatAgentPromptProvider = Symbol('ChatAgentPromptProvider');
|
|
|
7
7
|
let DefaultChatAgentPromptProvider = class DefaultChatAgentPromptProvider {
|
|
8
8
|
provideContextPrompt(context, userMessage) {
|
|
9
9
|
return `
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
</user_query>`;
|
|
10
|
+
<additional_data>
|
|
11
|
+
Below are some potentially helpful/relevant pieces of information for figuring out to respond
|
|
12
|
+
<recently_viewed_files>
|
|
13
|
+
${context.recentlyViewFiles.map((file, idx) => ` ${idx + 1}: ${file}`).join('\n')}
|
|
14
|
+
</recently_viewed_files>
|
|
15
|
+
<attached_files>
|
|
16
|
+
${context.attachedFiles.map((file) => `
|
|
17
|
+
<file_contents>
|
|
18
|
+
\`\`\`${file.language} ${file.path}
|
|
19
|
+
${file.content}
|
|
20
|
+
\`\`\`
|
|
21
|
+
</file_contents>
|
|
22
|
+
<linter_errors>
|
|
23
|
+
${file.lineErrors.join('\n')}
|
|
24
|
+
</linter_errors>
|
|
25
|
+
`)}
|
|
26
|
+
</attached_files>
|
|
27
|
+
</additional_data>
|
|
28
|
+
<user_query>
|
|
29
|
+
${userMessage}
|
|
30
|
+
</user_query>`;
|
|
32
31
|
}
|
|
33
32
|
};
|
|
34
33
|
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,qCAA0C;
|
|
1
|
+
{"version":3,"file":"context-prompt-provider.js","sourceRoot":"","sources":["../../../src/common/prompts/context-prompt-provider.ts"],"names":[],"mappings":";;;;AAAA,qCAA0C;AAI7B,QAAA,uBAAuB,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC;AAWlE,IAAM,8BAA8B,GAApC,MAAM,8BAA8B;IACzC,oBAAoB,CAAC,OAA0B,EAAE,WAAmB;QAClE,OAAO;;;;EAIT,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;;;MAG9E,OAAO,CAAC,aAAa,CAAC,GAAG,CACzB,CAAC,IAAI,EAAE,EAAE,CACP;;YAEI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI;MAChC,IAAI,CAAC,OAAO;;;;MAIZ,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC;;eAEjB,CACV;;;;EAIH,WAAW;cACC,CAAC;IACb,CAAC;CACF,CAAA;AA5BY,wEAA8B;yCAA9B,8BAA8B;IAD1C,IAAA,eAAU,GAAE;GACA,8BAA8B,CA4B1C"}
|
|
@@ -51,7 +51,7 @@ export interface ToolInvocationRegistry {
|
|
|
51
51
|
*
|
|
52
52
|
* @param providerName - 要移除其工具的工具提供者名称(在 `ToolRequest` 中指定)
|
|
53
53
|
*/
|
|
54
|
-
|
|
54
|
+
unregisterProviderTools(providerName: string): void;
|
|
55
55
|
}
|
|
56
56
|
export declare const ToolProvider: unique symbol;
|
|
57
57
|
export interface ToolProvider {
|
|
@@ -59,7 +59,7 @@ export interface ToolProvider {
|
|
|
59
59
|
}
|
|
60
60
|
export declare class ToolInvocationRegistryImpl implements ToolInvocationRegistry {
|
|
61
61
|
private tools;
|
|
62
|
-
|
|
62
|
+
unregisterProviderTools(providerName: string): void;
|
|
63
63
|
getAllFunctions(): ToolRequest[];
|
|
64
64
|
registerTool(tool: ToolRequest): void;
|
|
65
65
|
getFunction(toolId: string): ToolRequest | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-invocation-registry.d.ts","sourceRoot":"","sources":["../../src/common/tool-invocation-registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,IAAI,CAAC;AAC1C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,eAAO,MAAM,mBAAmB,KAO9B,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEhE,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAC9E,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,yBAAiB,WAAW,CAAC;IAC3B,SAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,aAAa,CAElE;CACF;AAED,eAAO,MAAM,sBAAsB,eAAmC,CAAC;AAEvE;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC;;;;OAIG;IACH,YAAY,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI,CAAC;IAEtC;;;;;;OAMG;IACH,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS,CAAC;IAErD;;;;;;OAMG;IACH,YAAY,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,WAAW,EAAE,CAAC;IAElD;;;;OAIG;IACH,eAAe,IAAI,WAAW,EAAE,CAAC;IAEjC;;;;OAIG;IACH,
|
|
1
|
+
{"version":3,"file":"tool-invocation-registry.d.ts","sourceRoot":"","sources":["../../src/common/tool-invocation-registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,IAAI,CAAC;AAC1C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,eAAO,MAAM,mBAAmB,KAO9B,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEhE,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAC9E,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,yBAAiB,WAAW,CAAC;IAC3B,SAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,aAAa,CAElE;CACF;AAED,eAAO,MAAM,sBAAsB,eAAmC,CAAC;AAEvE;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC;;;;OAIG;IACH,YAAY,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI,CAAC;IAEtC;;;;;;OAMG;IACH,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS,CAAC;IAErD;;;;;;OAMG;IACH,YAAY,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,WAAW,EAAE,CAAC;IAElD;;;;OAIG;IACH,eAAe,IAAI,WAAW,EAAE,CAAC;IAEjC;;;;OAIG;IACH,uBAAuB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CACrD;AAED,eAAO,MAAM,YAAY,eAAyB,CAAC;AACnD,MAAM,WAAW,YAAY;IAC3B,OAAO,IAAI,WAAW,CAAC;CACxB;AAED,qBAAa,0BAA2B,YAAW,sBAAsB;IACvE,OAAO,CAAC,KAAK,CAA4D;IAEzE,uBAAuB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI;IAUnD,eAAe,IAAI,WAAW,EAAE;IAIhC,YAAY,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI;IASrC,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAIpD,YAAY,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,WAAW,EAAE;CAWlD;AAED;;GAEG;AACH,MAAM,WAAW,8BAA8B;IAC7C;;OAEG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,sBAAsB,CAAC;IAEtD;;OAEG;IACH,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IAEvC;;OAEG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;CACxC;AAED,eAAO,MAAM,6BAA6B,eAA0C,CAAC;AAErF,qBACa,iCAAkC,YAAW,8BAA8B;IACtF,OAAO,CAAC,UAAU,CAAkD;IAEpE,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,sBAAsB;IASrD,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAItC,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;CAGvC"}
|
|
@@ -25,7 +25,7 @@ class ToolInvocationRegistryImpl {
|
|
|
25
25
|
constructor() {
|
|
26
26
|
this.tools = new Map();
|
|
27
27
|
}
|
|
28
|
-
|
|
28
|
+
unregisterProviderTools(providerName) {
|
|
29
29
|
const toolsToRemove = [];
|
|
30
30
|
for (const [id, tool] of this.tools.entries()) {
|
|
31
31
|
if (tool.providerName === providerName) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-invocation-registry.js","sourceRoot":"","sources":["../../src/common/tool-invocation-registry.ts"],"names":[],"mappings":";;;;AACA,6BAAwB;AAExB,qCAA0C;AAE7B,QAAA,mBAAmB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC1C,IAAI,EAAE,OAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAChE,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,IAAI,EAAE,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,GAAG,EAAE,CAAC,CAAC,QAAQ,EAAE;IACjC,KAAK,EAAE,OAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,2BAAmB,CAAC,CAAC,QAAQ,EAAE;IACnD,UAAU,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,2BAAmB,CAAC,CAAC,CAAC,QAAQ,EAAE;IAClE,QAAQ,EAAE,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;CACzC,CAAC,CAAC;AAaH,IAAiB,WAAW,CAI3B;AAJD,WAAiB,WAAW;IAC1B,SAAgB,eAAe,CAAC,GAAY;QAC1C,OAAO,2BAAmB,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;IACpD,CAAC;IAFe,2BAAe,kBAE9B,CAAA;AACH,CAAC,EAJgB,WAAW,2BAAX,WAAW,QAI3B;AAEY,QAAA,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AA8C1D,QAAA,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AAKnD,MAAa,0BAA0B;IAAvC;QACU,UAAK,GAA6B,IAAI,GAAG,EAAuB,CAAC;IAwC3E,CAAC;IAtCC,
|
|
1
|
+
{"version":3,"file":"tool-invocation-registry.js","sourceRoot":"","sources":["../../src/common/tool-invocation-registry.ts"],"names":[],"mappings":";;;;AACA,6BAAwB;AAExB,qCAA0C;AAE7B,QAAA,mBAAmB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC1C,IAAI,EAAE,OAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAChE,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,IAAI,EAAE,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,GAAG,EAAE,CAAC,CAAC,QAAQ,EAAE;IACjC,KAAK,EAAE,OAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,2BAAmB,CAAC,CAAC,QAAQ,EAAE;IACnD,UAAU,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,2BAAmB,CAAC,CAAC,CAAC,QAAQ,EAAE;IAClE,QAAQ,EAAE,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;CACzC,CAAC,CAAC;AAaH,IAAiB,WAAW,CAI3B;AAJD,WAAiB,WAAW;IAC1B,SAAgB,eAAe,CAAC,GAAY;QAC1C,OAAO,2BAAmB,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;IACpD,CAAC;IAFe,2BAAe,kBAE9B,CAAA;AACH,CAAC,EAJgB,WAAW,2BAAX,WAAW,QAI3B;AAEY,QAAA,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AA8C1D,QAAA,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AAKnD,MAAa,0BAA0B;IAAvC;QACU,UAAK,GAA6B,IAAI,GAAG,EAAuB,CAAC;IAwC3E,CAAC;IAtCC,uBAAuB,CAAC,YAAoB;QAC1C,MAAM,aAAa,GAAa,EAAE,CAAC;QACnC,KAAK,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;YAC9C,IAAI,IAAI,CAAC,YAAY,KAAK,YAAY,EAAE,CAAC;gBACvC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACzB,CAAC;QACH,CAAC;QACD,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;IACvD,CAAC;IAED,eAAe;QACb,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IACzC,CAAC;IAED,YAAY,CAAC,IAAiB;QAC5B,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YAC5B,kBAAkB;YAClB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAChC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;IAED,WAAW,CAAC,MAAc;QACxB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC;IAED,YAAY,CAAC,GAAG,OAAiB;QAC/B,MAAM,KAAK,GAAkB,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAClD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACpC,IAAI,IAAI,EAAE,CAAC;gBACT,OAAO,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,YAAY,MAAM,MAAM,CAAC,CAAC;YAC5C,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AAzCD,gEAyCC;AAsBY,QAAA,6BAA6B,GAAG,MAAM,CAAC,+BAA+B,CAAC,CAAC;AAG9E,IAAM,iCAAiC,GAAvC,MAAM,iCAAiC;IAAvC;QACG,eAAU,GAAwC,IAAI,GAAG,EAAE,CAAC;IAkBtE,CAAC;IAhBC,WAAW,CAAC,QAAgB;QAC1B,IAAI,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC7C,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,QAAQ,GAAG,IAAI,0BAA0B,EAAE,CAAC;YAC5C,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC1C,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,cAAc,CAAC,QAAgB;QAC7B,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;IAED,WAAW,CAAC,QAAgB;QAC1B,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACvC,CAAC;CACF,CAAA;AAnBY,8EAAiC;4CAAjC,iCAAiC;IAD7C,IAAA,eAAU,GAAE;GACA,iCAAiC,CAmB7C"}
|
package/lib/common/types.d.ts
CHANGED
|
@@ -27,6 +27,12 @@ export interface IMCPServerProxyService {
|
|
|
27
27
|
}>;
|
|
28
28
|
$getMCPTools(): Promise<MCPTool[]>;
|
|
29
29
|
$updateMCPServers(): Promise<void>;
|
|
30
|
+
$getServers(): Promise<Array<{
|
|
31
|
+
name: string;
|
|
32
|
+
isStarted: boolean;
|
|
33
|
+
}>>;
|
|
34
|
+
$startServer(serverName: string): Promise<void>;
|
|
35
|
+
$stopServer(serverName: string): Promise<void>;
|
|
30
36
|
}
|
|
31
37
|
export interface MCPTool {
|
|
32
38
|
name: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/common/types.ts"],"names":[],"mappings":"AAAA,oBAAY,oBAAoB;IAC9B,KAAK,UAAU;IACf,IAAI,SAAS;CACd;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE;QACL,KAAK,EAAE;YACL,IAAI,EAAE,MAAM,CAAC;YACb,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC;QACF,GAAG,EAAE;YACH,IAAI,EAAE,MAAM,CAAC;YACb,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC;KACH,CAAC;IACF,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,oBAAoB,CAAC;CAC7B;AAGD,MAAM,WAAW,sBAAsB;IACrC,YAAY,CACV,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,CAAC;IAEH,YAAY,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAEnC,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/common/types.ts"],"names":[],"mappings":"AAAA,oBAAY,oBAAoB;IAC9B,KAAK,UAAU;IACf,IAAI,SAAS;CACd;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE;QACL,KAAK,EAAE;YACL,IAAI,EAAE,MAAM,CAAC;YACb,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC;QACF,GAAG,EAAE;YACH,IAAI,EAAE,MAAM,CAAC;YACb,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC;KACH,CAAC;IACF,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,oBAAoB,CAAC;CAC7B;AAGD,MAAM,WAAW,sBAAsB;IACrC,YAAY,CACV,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,CAAC;IAEH,YAAY,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAEnC,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnC,WAAW,IAAI,OAAO,CAAC,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC,CAAC;IAEpE,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEhD,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAChD;AAED,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,GAAG,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;CACtB"}
|
|
@@ -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;
|
|
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;AAEF,eAAO,MAAM,WAAW,aAAc,MAAM,gCAA0E,CAAC"}
|
package/lib/common/utils.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getToolName = exports.extractCodeBlocks = exports.isDocumentValid = exports.isDocumentTooShort = exports.isDocumentTooLarge = void 0;
|
|
4
|
+
const index_1 = require("./index");
|
|
4
5
|
const BACK_QUOTE_3_SYMBOL = '```';
|
|
5
6
|
const MIN_PROMPT_CHARS = 10;
|
|
6
7
|
const isDocumentTooLarge = (document) => {
|
|
@@ -47,6 +48,6 @@ const extractCodeBlocks = (content) => {
|
|
|
47
48
|
return newContents.join('\n');
|
|
48
49
|
};
|
|
49
50
|
exports.extractCodeBlocks = extractCodeBlocks;
|
|
50
|
-
const getToolName = (toolName, serverName =
|
|
51
|
+
const getToolName = (toolName, serverName = index_1.BUILTIN_MCP_SERVER_NAME) => `mcp_${serverName}_${toolName}`;
|
|
51
52
|
exports.getToolName = getToolName;
|
|
52
53
|
//# sourceMappingURL=utils.js.map
|
package/lib/common/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":";;;AAEA,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;AAEK,MAAM,WAAW,GAAG,CAAC,QAAgB,EAAE,UAAU,GAAG,
|
|
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;AAEK,MAAM,WAAW,GAAG,CAAC,QAAgB,EAAE,UAAU,GAAG,+BAAuB,EAAE,EAAE,CAAC,OAAO,UAAU,IAAI,QAAQ,EAAE,CAAC;AAA1G,QAAA,WAAW,eAA+F"}
|
|
@@ -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 { MCPServerDescription } from '../../common/mcp-server-manager';
|
|
6
|
+
import { IMCPServer, MCPServerDescription } from '../../common/mcp-server-manager';
|
|
7
7
|
import { IMCPServerProxyService, MCPTool } from '../../common/types';
|
|
8
|
-
import { IMCPServer } from '../mcp-server';
|
|
9
8
|
export declare class SumiMCPServerBackend extends RPCService<IMCPServerProxyService> implements ISumiMCPServerBackend {
|
|
10
9
|
private readonly mcpServerManager;
|
|
11
10
|
private readonly toolInvocationRegistryManager;
|
|
@@ -46,7 +45,7 @@ export declare class SumiMCPServerBackend extends RPCService<IMCPServerProxyServ
|
|
|
46
45
|
} | undefined;
|
|
47
46
|
}> | undefined;
|
|
48
47
|
getAllMCPTools(): Promise<MCPTool[]>;
|
|
49
|
-
initBuiltinMCPServer(): Promise<void>;
|
|
48
|
+
initBuiltinMCPServer(enabled: boolean): Promise<void>;
|
|
50
49
|
initExternalMCPServers(servers: MCPServerDescription[]): Promise<void>;
|
|
51
50
|
initExposedMCPServer(): Promise<Server<{
|
|
52
51
|
method: string;
|
|
@@ -71,6 +70,21 @@ export declare class SumiMCPServerBackend extends RPCService<IMCPServerProxyServ
|
|
|
71
70
|
[x: string]: unknown;
|
|
72
71
|
} | undefined;
|
|
73
72
|
}>>;
|
|
73
|
+
getServers(): Promise<({
|
|
74
|
+
name: string;
|
|
75
|
+
isStarted: boolean;
|
|
76
|
+
type: string;
|
|
77
|
+
tools: string[];
|
|
78
|
+
command?: undefined;
|
|
79
|
+
} | {
|
|
80
|
+
name: string;
|
|
81
|
+
isStarted: boolean;
|
|
82
|
+
type: string;
|
|
83
|
+
command: string;
|
|
84
|
+
tools: string[];
|
|
85
|
+
})[]>;
|
|
86
|
+
startServer(serverName: string): Promise<void>;
|
|
87
|
+
stopServer(serverName: string): Promise<void>;
|
|
74
88
|
}
|
|
75
89
|
export declare const TokenBuiltinMCPServer: unique symbol;
|
|
76
90
|
export declare class BuiltinMCPServer implements IMCPServer {
|
|
@@ -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;AAGpD,OAAO,
|
|
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;AAGpD,OAAO,EAA2B,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAEnF,OAAO,EAAE,sBAAsB,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AASrE,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,WAAW;IASX,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG;;;;;;;IAOzC,SAAS;;;;;;;;;;;;;;;;;;;;;;;IAKH,cAAc,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IAU7B,oBAAoB,CAAC,OAAO,EAAE,OAAO;IAOrC,sBAAsB,CAAC,OAAO,EAAE,oBAAoB,EAAE;IAM7D,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;IAqCpB,UAAU;;;;;;;;;;;;;IAkDV,WAAW,CAAC,UAAU,EAAE,MAAM;IAK9B,UAAU,CAAC,UAAU,EAAE,MAAM;CAIpC;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;IAIjB,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"}
|
|
@@ -10,7 +10,9 @@ const di_1 = require("@opensumi/di");
|
|
|
10
10
|
const ide_connection_1 = require("@opensumi/ide-connection");
|
|
11
11
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
12
12
|
const ide_core_node_1 = require("@opensumi/ide-core-node");
|
|
13
|
+
const common_1 = require("../../common");
|
|
13
14
|
const tool_invocation_registry_1 = require("../../common/tool-invocation-registry");
|
|
15
|
+
const mcp_server_1 = require("../mcp-server");
|
|
14
16
|
const mcp_server_manager_impl_1 = require("../mcp-server-manager-impl");
|
|
15
17
|
// 每个 BrowserTab 都对应了一个 SumiMCPServerBackend 实例
|
|
16
18
|
// SumiMCPServerBackend 需要做的事情:
|
|
@@ -33,7 +35,6 @@ let SumiMCPServerBackend = class SumiMCPServerBackend extends ide_connection_1.R
|
|
|
33
35
|
}
|
|
34
36
|
// 获取 MCP 工具
|
|
35
37
|
const tools = await this.client.$getMCPTools();
|
|
36
|
-
this.logger.log('[Node backend] SUMI MCP tools', tools);
|
|
37
38
|
return tools;
|
|
38
39
|
}
|
|
39
40
|
async callMCPTool(name, args) {
|
|
@@ -55,11 +56,11 @@ let SumiMCPServerBackend = class SumiMCPServerBackend extends ide_connection_1.R
|
|
|
55
56
|
providerName: tool.providerName || 'no-provider-name',
|
|
56
57
|
}));
|
|
57
58
|
}
|
|
58
|
-
async initBuiltinMCPServer() {
|
|
59
|
+
async initBuiltinMCPServer(enabled) {
|
|
59
60
|
var _a;
|
|
60
61
|
const builtinMCPServer = new BuiltinMCPServer(this, this.logger);
|
|
61
62
|
this.mcpServerManager.setClientId(this.clientId);
|
|
62
|
-
await this.mcpServerManager.initBuiltinServer(builtinMCPServer);
|
|
63
|
+
await this.mcpServerManager.initBuiltinServer(builtinMCPServer, enabled);
|
|
63
64
|
(_a = this.client) === null || _a === void 0 ? void 0 : _a.$updateMCPServers();
|
|
64
65
|
}
|
|
65
66
|
async initExternalMCPServers(servers) {
|
|
@@ -99,6 +100,59 @@ let SumiMCPServerBackend = class SumiMCPServerBackend extends ide_connection_1.R
|
|
|
99
100
|
});
|
|
100
101
|
return this.server;
|
|
101
102
|
}
|
|
103
|
+
async getServers() {
|
|
104
|
+
const servers = Array.from(this.mcpServerManager.getServers().entries());
|
|
105
|
+
const serverInfos = await Promise.all(servers.map(async ([serverName, server]) => {
|
|
106
|
+
var _a;
|
|
107
|
+
let toolNames = [];
|
|
108
|
+
if (server.isStarted()) {
|
|
109
|
+
// 只获取正在运行的 MCP Server 的工具列表
|
|
110
|
+
const toolsResponse = await server.getTools();
|
|
111
|
+
toolNames = toolsResponse.tools.map((tool) => tool.name);
|
|
112
|
+
}
|
|
113
|
+
// OpenSumi 内置的 MCP Server
|
|
114
|
+
if (serverName === common_1.BUILTIN_MCP_SERVER_NAME) {
|
|
115
|
+
return {
|
|
116
|
+
name: server.getServerName(),
|
|
117
|
+
isStarted: server.isStarted(),
|
|
118
|
+
type: 'builtin rpc',
|
|
119
|
+
tools: toolNames,
|
|
120
|
+
};
|
|
121
|
+
}
|
|
122
|
+
// 第三方 Stdio 类型的 MCP Server
|
|
123
|
+
if (server instanceof mcp_server_1.StdioMCPServerImpl) {
|
|
124
|
+
return {
|
|
125
|
+
name: server.getServerName(),
|
|
126
|
+
isStarted: server.isStarted(),
|
|
127
|
+
type: 'stdio',
|
|
128
|
+
command: server.command + ' ' + (((_a = server.args) === null || _a === void 0 ? void 0 : _a.join(' ')) || ''),
|
|
129
|
+
tools: toolNames,
|
|
130
|
+
};
|
|
131
|
+
}
|
|
132
|
+
// TODO SSE 类型的 MCP Server
|
|
133
|
+
return {
|
|
134
|
+
name: server.getServerName(),
|
|
135
|
+
isStarted: server.isStarted(),
|
|
136
|
+
type: '[MOCK] stdio',
|
|
137
|
+
command: '[MOCK] npx sumi-ide-mcp-server',
|
|
138
|
+
tools: toolNames,
|
|
139
|
+
};
|
|
140
|
+
}));
|
|
141
|
+
// 将 builtin server 放在第一位
|
|
142
|
+
const builtinServer = serverInfos.find((server) => server.name === common_1.BUILTIN_MCP_SERVER_NAME);
|
|
143
|
+
const otherServers = serverInfos.filter((server) => server.name !== common_1.BUILTIN_MCP_SERVER_NAME);
|
|
144
|
+
return builtinServer ? [builtinServer, ...otherServers] : otherServers;
|
|
145
|
+
}
|
|
146
|
+
async startServer(serverName) {
|
|
147
|
+
var _a;
|
|
148
|
+
await this.mcpServerManager.startServer(serverName);
|
|
149
|
+
(_a = this.client) === null || _a === void 0 ? void 0 : _a.$updateMCPServers();
|
|
150
|
+
}
|
|
151
|
+
async stopServer(serverName) {
|
|
152
|
+
var _a;
|
|
153
|
+
await this.mcpServerManager.stopServer(serverName);
|
|
154
|
+
(_a = this.client) === null || _a === void 0 ? void 0 : _a.$updateMCPServers();
|
|
155
|
+
}
|
|
102
156
|
};
|
|
103
157
|
exports.SumiMCPServerBackend = SumiMCPServerBackend;
|
|
104
158
|
tslib_1.__decorate([
|
|
@@ -118,13 +172,13 @@ class BuiltinMCPServer {
|
|
|
118
172
|
constructor(sumiMCPServer, logger) {
|
|
119
173
|
this.sumiMCPServer = sumiMCPServer;
|
|
120
174
|
this.logger = logger;
|
|
121
|
-
this.started =
|
|
175
|
+
this.started = false;
|
|
122
176
|
}
|
|
123
177
|
isStarted() {
|
|
124
178
|
return this.started;
|
|
125
179
|
}
|
|
126
180
|
getServerName() {
|
|
127
|
-
return
|
|
181
|
+
return common_1.BUILTIN_MCP_SERVER_NAME;
|
|
128
182
|
}
|
|
129
183
|
async start() {
|
|
130
184
|
if (this.started) {
|
|
@@ -157,7 +211,6 @@ class BuiltinMCPServer {
|
|
|
157
211
|
throw new Error('MCP Server not started');
|
|
158
212
|
}
|
|
159
213
|
const tools = await this.sumiMCPServer.getMCPTools();
|
|
160
|
-
this.logger.debug('[BuiltinMCPServer] getTools', tools);
|
|
161
214
|
return { tools };
|
|
162
215
|
}
|
|
163
216
|
update(_command, _args, _env) {
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"sumi-mcp-server.js","sourceRoot":"","sources":["../../../src/node/mcp/sumi-mcp-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,16 @@
|
|
|
1
1
|
import { ILogger } from '@opensumi/ide-core-common';
|
|
2
|
-
import { MCPServerDescription, MCPServerManager } from '../common/mcp-server-manager';
|
|
2
|
+
import { IMCPServer, MCPServerDescription, MCPServerManager } from '../common/mcp-server-manager';
|
|
3
3
|
import { IToolInvocationRegistryManager } from '../common/tool-invocation-registry';
|
|
4
4
|
import { BuiltinMCPServer } from './mcp/sumi-mcp-server';
|
|
5
|
-
import { IMCPServer } from './mcp-server';
|
|
6
5
|
export declare class MCPServerManagerImpl implements MCPServerManager {
|
|
7
6
|
private readonly toolInvocationRegistryManager;
|
|
8
7
|
private readonly logger;
|
|
9
8
|
protected servers: Map<string, IMCPServer>;
|
|
10
9
|
private clientId;
|
|
10
|
+
getServers(): Map<string, IMCPServer>;
|
|
11
11
|
constructor(toolInvocationRegistryManager: IToolInvocationRegistryManager, logger: ILogger);
|
|
12
12
|
setClientId(clientId: string): void;
|
|
13
|
+
private unregisterServerTools;
|
|
13
14
|
stopServer(serverName: string): Promise<void>;
|
|
14
15
|
getStartedServers(): Promise<string[]>;
|
|
15
16
|
callTool(serverName: string, toolName: string, toolCallId: string, arg_string: string): ReturnType<IMCPServer['callTool']>;
|
|
@@ -20,7 +21,7 @@ export declare class MCPServerManagerImpl implements MCPServerManager {
|
|
|
20
21
|
getTools(serverName: string): ReturnType<IMCPServer['getTools']>;
|
|
21
22
|
addOrUpdateServer(description: MCPServerDescription): void;
|
|
22
23
|
addOrUpdateServerDirectly(server: IMCPServer): void;
|
|
23
|
-
initBuiltinServer(builtinMCPServer: BuiltinMCPServer): Promise<void>;
|
|
24
|
+
initBuiltinServer(builtinMCPServer: BuiltinMCPServer, enabled?: boolean): Promise<void>;
|
|
24
25
|
addExternalMCPServers(servers: MCPServerDescription[]): Promise<void>;
|
|
25
26
|
removeServer(name: string): void;
|
|
26
27
|
}
|
|
@@ -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;AAEpD,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAW,MAAM,8BAA8B,CAAC;
|
|
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;AAEpD,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,gBAAgB,EAAW,MAAM,8BAA8B,CAAC;AAC3G,OAAO,EAAE,8BAA8B,EAAe,MAAM,oCAAoC,CAAC;AAGjG,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGzD,qBAAa,oBAAqB,YAAW,gBAAgB;IAWzD,OAAO,CAAC,QAAQ,CAAC,6BAA6B;IAC9C,OAAO,CAAC,QAAQ,CAAC,MAAM;IAXzB,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAa;IAGvD,OAAO,CAAC,QAAQ,CAAS;IAEzB,UAAU,IAAI,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC;gBAKlB,6BAA6B,EAAE,8BAA8B,EAC7D,MAAM,EAAE,OAAO;IAGlC,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,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;IAY1D,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;IAW3E,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;CAYjC"}
|