@opensumi/ide-ai-native 3.9.1-next-1752824087.0 → 3.9.1-next-1752974346.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/chat/apply.service.js +1 -1
- package/lib/browser/chat/apply.service.js.map +1 -1
- package/lib/browser/chat/chat-proxy.service.d.ts +4 -2
- package/lib/browser/chat/chat-proxy.service.d.ts.map +1 -1
- package/lib/browser/chat/chat-proxy.service.js +9 -2
- package/lib/browser/chat/chat-proxy.service.js.map +1 -1
- package/lib/browser/mcp/config/components/mcp-config.module.less +12 -0
- package/lib/browser/mcp/config/components/mcp-config.view.d.ts.map +1 -1
- package/lib/browser/mcp/config/components/mcp-config.view.js +26 -2
- package/lib/browser/mcp/config/components/mcp-config.view.js.map +1 -1
- package/lib/browser/mcp/config/mcp-config.service.d.ts +7 -0
- package/lib/browser/mcp/config/mcp-config.service.d.ts.map +1 -1
- package/lib/browser/mcp/config/mcp-config.service.js +36 -0
- package/lib/browser/mcp/config/mcp-config.service.js.map +1 -1
- package/lib/node/base-language-model.d.ts.map +1 -1
- package/lib/node/base-language-model.js +5 -0
- package/lib/node/base-language-model.js.map +1 -1
- package/package.json +25 -25
- package/src/browser/chat/apply.service.ts +1 -1
- package/src/browser/chat/chat-proxy.service.ts +9 -2
- package/src/browser/mcp/config/components/mcp-config.module.less +12 -0
- package/src/browser/mcp/config/components/mcp-config.view.tsx +39 -6
- package/src/browser/mcp/config/mcp-config.service.ts +42 -0
- package/src/node/base-language-model.ts +6 -0
|
@@ -67,7 +67,7 @@ let ApplyService = class ApplyService extends base_apply_service_1.BaseApplyServ
|
|
|
67
67
|
${codeBlock.instructions ? `\nUser's intention: ${codeBlock.instructions}\n` : ''}
|
|
68
68
|
Provide the complete updated code.
|
|
69
69
|
`, {
|
|
70
|
-
...this.chatProxyService.getRequestOptions(),
|
|
70
|
+
...(await this.chatProxyService.getRequestOptions()),
|
|
71
71
|
trimTexts: ['<updated-code>', '</updated-code>'],
|
|
72
72
|
system: 'You are a coding assistant that helps merge code updates, ensuring every modification is fully integrated.',
|
|
73
73
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply.service.js","sourceRoot":"","sources":["../../../src/browser/chat/apply.service.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,iEAOoC;AACpC,mEAAuE;AACvE,8DAA+E;AAC/E,qDAAyG;AACzG,qFAAgG;AAIhG,yCAAqD;AAErD,kEAA6D;AAE7D,6DAAwD;AAExD;;;;;GAKG;AACH,SAAS,aAAa,CAAC,UAAsB;IAC3C,OAAO,UAAU,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AACxD,CAAC;AAGM,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,qCAAgB;IAItC,KAAK,CAAC,gBAAgB,CAAC,MAAmB;QAClD,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QAChC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3B,CAAC;QACD,MAAM,SAAS,GAAG,mCAAuB,CAAC,kBAAkB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAE5E,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3B,CAAC;QAED,MAAM,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAC;QAC7B,MAAM,KAAK,GAAG,KAAK,CAAC,iBAAiB,EAAE,CAAC;QACxC,MAAM,OAAO,GAAsB;YACjC,OAAO,EAAE,kCAAqB,CAAC,IAAI;SACpC,CAAC;QACF,MAAM,EAAE,GAAG,IAAI,0CAAuB,EAAE,CAAC;QACzC,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;QAEtF,eAAe;QACf,MAAM,cAAc,GAAG,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,KAAI,EAAE,CAAC;QAEvE,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAChC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3B,CAAC;QAED,eAAe;QACf,MAAM,OAAO,CAAC,UAAU,CACtB,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAClC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACnB,IAAI,CAAC;oBACH,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,CAAC;gBACnG,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC,CAAA,CAAC;YAClB,CAAC;QACH,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAUS,KAAK,CAAC,OAAO,CAAC,SAAwB;QAK9C,MAAM,GAAG,GAAG,IAAI,sBAAG,CAAC,uBAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC;QACpF,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;QACzE,MAAM,WAAW,GAAG,cAAc,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC,QAAQ,EAAE,CAAC;QACxE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CACnD;;;;;YAKM,WAAW;;cAET,SAAS,CAAC,QAAQ;MAC1B,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,uBAAuB,SAAS,CAAC,YAAY,IAAI,CAAC,CAAC,CAAC,EAAE;;CAEpF,EACK;YACE,GAAG,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,EAAE;
|
|
1
|
+
{"version":3,"file":"apply.service.js","sourceRoot":"","sources":["../../../src/browser/chat/apply.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,8 +13,9 @@ export declare class ChatProxyService extends Disposable {
|
|
|
13
13
|
private readonly preferenceService;
|
|
14
14
|
private readonly applicationService;
|
|
15
15
|
private readonly messageService;
|
|
16
|
+
private readonly mcpConfigService;
|
|
16
17
|
private chatDeferred;
|
|
17
|
-
getRequestOptions(): {
|
|
18
|
+
getRequestOptions(): Promise<{
|
|
18
19
|
clientId: string;
|
|
19
20
|
model: string | undefined;
|
|
20
21
|
modelId: string | undefined;
|
|
@@ -22,7 +23,8 @@ export declare class ChatProxyService extends Disposable {
|
|
|
22
23
|
baseURL: string;
|
|
23
24
|
maxTokens: number | undefined;
|
|
24
25
|
system: string | undefined;
|
|
25
|
-
|
|
26
|
+
disabledTools: string[];
|
|
27
|
+
}>;
|
|
26
28
|
registerDefaultAgent(): void;
|
|
27
29
|
}
|
|
28
30
|
//# sourceMappingURL=chat-proxy.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat-proxy.service.d.ts","sourceRoot":"","sources":["../../../src/browser/chat/chat-proxy.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAML,UAAU,
|
|
1
|
+
{"version":3,"file":"chat-proxy.service.d.ts","sourceRoot":"","sources":["../../../src/browser/chat/chat-proxy.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAML,UAAU,EAMX,MAAM,2BAA2B,CAAC;AAqBnC;;GAEG;AACH,qBACa,gBAAiB,SAAQ,UAAU;IAE9C,MAAM,CAAC,QAAQ,CAAC,QAAQ,wBAAwB;IAGhD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAoB;IAGrD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAG/C,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAsB;IAG1D,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAwB;IAG9D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAc;IAGzC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAwB;IAG7D,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IAGtD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAsB;IAGzD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAkB;IAGjD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmB;IAEpD,OAAO,CAAC,YAAY,CAAwC;IAE/C,iBAAiB;;;;;;;;;;IA+BvB,oBAAoB;CAgF5B"}
|
|
@@ -13,6 +13,7 @@ const stream_1 = require("@opensumi/ide-utils/lib/stream");
|
|
|
13
13
|
const common_1 = require("../../common");
|
|
14
14
|
const system_prompt_1 = require("../../common/prompts/system-prompt");
|
|
15
15
|
const ChatToolRender_1 = require("../components/ChatToolRender");
|
|
16
|
+
const mcp_config_service_1 = require("../mcp/config/mcp-config.service");
|
|
16
17
|
const chat_feature_registry_1 = require("./chat.feature.registry");
|
|
17
18
|
/**
|
|
18
19
|
* @internal
|
|
@@ -22,7 +23,7 @@ let ChatProxyService = ChatProxyService_1 = class ChatProxyService extends ide_c
|
|
|
22
23
|
super(...arguments);
|
|
23
24
|
this.chatDeferred = new ide_core_common_1.Deferred();
|
|
24
25
|
}
|
|
25
|
-
getRequestOptions() {
|
|
26
|
+
async getRequestOptions() {
|
|
26
27
|
const model = this.preferenceService.get(ai_native_1.AINativeSettingSectionsId.LLMModelSelection);
|
|
27
28
|
const modelId = this.preferenceService.get(ai_native_1.AINativeSettingSectionsId.ModelID);
|
|
28
29
|
let apiKey = '';
|
|
@@ -43,6 +44,7 @@ let ChatProxyService = ChatProxyService_1 = class ChatProxyService extends ide_c
|
|
|
43
44
|
}
|
|
44
45
|
const maxTokens = this.preferenceService.get(ai_native_1.AINativeSettingSectionsId.MaxTokens);
|
|
45
46
|
const agent = this.chatAgentService.getAgent(ChatProxyService_1.AGENT_ID);
|
|
47
|
+
const disabledTools = await this.mcpConfigService.getDisabledTools();
|
|
46
48
|
return {
|
|
47
49
|
clientId: this.applicationService.clientId,
|
|
48
50
|
model,
|
|
@@ -51,6 +53,7 @@ let ChatProxyService = ChatProxyService_1 = class ChatProxyService extends ide_c
|
|
|
51
53
|
baseURL,
|
|
52
54
|
maxTokens,
|
|
53
55
|
system: agent === null || agent === void 0 ? void 0 : agent.metadata.systemPrompt,
|
|
56
|
+
disabledTools,
|
|
54
57
|
};
|
|
55
58
|
}
|
|
56
59
|
registerDefaultAgent() {
|
|
@@ -82,7 +85,7 @@ let ChatProxyService = ChatProxyService_1 = class ChatProxyService extends ide_c
|
|
|
82
85
|
sessionId: request.sessionId,
|
|
83
86
|
history,
|
|
84
87
|
images: request.images,
|
|
85
|
-
...this.getRequestOptions(),
|
|
88
|
+
...(await this.getRequestOptions()),
|
|
86
89
|
}, token);
|
|
87
90
|
(0, stream_1.listenReadable)(stream, {
|
|
88
91
|
onData: (data) => {
|
|
@@ -153,6 +156,10 @@ tslib_1.__decorate([
|
|
|
153
156
|
(0, di_1.Autowired)(ide_overlay_1.IMessageService),
|
|
154
157
|
tslib_1.__metadata("design:type", Object)
|
|
155
158
|
], ChatProxyService.prototype, "messageService", void 0);
|
|
159
|
+
tslib_1.__decorate([
|
|
160
|
+
(0, di_1.Autowired)(ide_core_common_1.MCPConfigServiceToken),
|
|
161
|
+
tslib_1.__metadata("design:type", mcp_config_service_1.MCPConfigService)
|
|
162
|
+
], ChatProxyService.prototype, "mcpConfigService", void 0);
|
|
156
163
|
exports.ChatProxyService = ChatProxyService = ChatProxyService_1 = tslib_1.__decorate([
|
|
157
164
|
(0, di_1.Injectable)()
|
|
158
165
|
], ChatProxyService);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat-proxy.service.js","sourceRoot":"","sources":["../../../src/browser/chat/chat-proxy.service.ts"],"names":[],"mappings":";;;;;AAAA,qCAAqD;AACrD,iEAA+D;AAC/D,+
|
|
1
|
+
{"version":3,"file":"chat-proxy.service.js","sourceRoot":"","sources":["../../../src/browser/chat/chat-proxy.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -222,4 +222,16 @@
|
|
|
222
222
|
font-weight: 500;
|
|
223
223
|
transition: all 0.2s ease;
|
|
224
224
|
cursor: pointer;
|
|
225
|
+
|
|
226
|
+
&.disabledTool {
|
|
227
|
+
opacity: 0.5;
|
|
228
|
+
background-color: var(--notification-warning-background);
|
|
229
|
+
color: var(--notification-warning-foreground);
|
|
230
|
+
text-decoration: line-through;
|
|
231
|
+
}
|
|
232
|
+
|
|
233
|
+
&:hover {
|
|
234
|
+
transform: scale(1.05);
|
|
235
|
+
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
|
|
236
|
+
}
|
|
225
237
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-config.view.d.ts","sourceRoot":"","sources":["../../../../../src/browser/mcp/config/components/mcp-config.view.tsx"],"names":[],"mappings":"AACA,OAAO,KAAsB,MAAM,OAAO,CAAC;AAc3C,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"mcp-config.view.d.ts","sourceRoot":"","sources":["../../../../../src/browser/mcp/config/components/mcp-config.view.tsx"],"names":[],"mappings":"AACA,OAAO,KAAsB,MAAM,OAAO,CAAC;AAc3C,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EA6PjC,CAAC"}
|
|
@@ -17,12 +17,18 @@ const MCPConfigView = () => {
|
|
|
17
17
|
const [editingServer, setEditingServer] = react_1.default.useState();
|
|
18
18
|
const [loadingServer, setLoadingServer] = react_1.default.useState();
|
|
19
19
|
const [isReady, setIsReady] = react_1.default.useState(mcpConfigService.isInitialized);
|
|
20
|
+
const [disabledTools, setDisabledTools] = react_1.default.useState([]);
|
|
20
21
|
const loadServers = (0, react_1.useCallback)(async () => {
|
|
21
22
|
const allServers = await mcpConfigService.getServers();
|
|
22
23
|
setServers(allServers);
|
|
23
24
|
}, [mcpConfigService]);
|
|
25
|
+
const loadDisabledTools = (0, react_1.useCallback)(async () => {
|
|
26
|
+
const disabled = await mcpConfigService.getDisabledTools();
|
|
27
|
+
setDisabledTools(disabled);
|
|
28
|
+
}, [mcpConfigService]);
|
|
24
29
|
react_1.default.useEffect(() => {
|
|
25
30
|
loadServers();
|
|
31
|
+
loadDisabledTools();
|
|
26
32
|
const disposer = mcpConfigService.onMCPServersChange((isReady) => {
|
|
27
33
|
if (isReady) {
|
|
28
34
|
setIsReady(true);
|
|
@@ -32,7 +38,7 @@ const MCPConfigView = () => {
|
|
|
32
38
|
return () => {
|
|
33
39
|
disposer.dispose();
|
|
34
40
|
};
|
|
35
|
-
}, [loadServers]);
|
|
41
|
+
}, [loadServers, loadDisabledTools]);
|
|
36
42
|
const handleServerControl = (0, react_1.useCallback)(async (serverName, start) => {
|
|
37
43
|
try {
|
|
38
44
|
setLoadingServer(serverName);
|
|
@@ -75,6 +81,19 @@ const MCPConfigView = () => {
|
|
|
75
81
|
await loadServers();
|
|
76
82
|
setLoadingServer(undefined);
|
|
77
83
|
}, [mcpConfigService, loadServers]);
|
|
84
|
+
const handleToggleTool = (0, react_1.useCallback)(async (toolName) => {
|
|
85
|
+
await mcpConfigService.toggleToolEnabled(toolName);
|
|
86
|
+
// 直接更新本地状态，避免重新从 service 加载
|
|
87
|
+
setDisabledTools((prev) => {
|
|
88
|
+
const isCurrentlyDisabled = prev.includes(toolName);
|
|
89
|
+
if (isCurrentlyDisabled) {
|
|
90
|
+
return prev.filter((name) => name !== toolName);
|
|
91
|
+
}
|
|
92
|
+
else {
|
|
93
|
+
return [...prev, toolName];
|
|
94
|
+
}
|
|
95
|
+
});
|
|
96
|
+
}, [mcpConfigService]);
|
|
78
97
|
return (react_1.default.createElement("div", { className: mcp_config_module_less_1.default.container },
|
|
79
98
|
react_1.default.createElement("div", { className: mcp_config_module_less_1.default.header },
|
|
80
99
|
react_1.default.createElement("div", null,
|
|
@@ -108,7 +127,12 @@ const MCPConfigView = () => {
|
|
|
108
127
|
server.tools && server.tools.length > 0 && (react_1.default.createElement("div", { className: mcp_config_module_less_1.default.serverDetail },
|
|
109
128
|
react_1.default.createElement("div", { className: mcp_config_module_less_1.default.detailRow },
|
|
110
129
|
react_1.default.createElement("span", { className: mcp_config_module_less_1.default.detailLabel }, "Tools:"),
|
|
111
|
-
react_1.default.createElement("span", { className: mcp_config_module_less_1.default.detailContent }, server.tools.map((tool, index) =>
|
|
130
|
+
react_1.default.createElement("span", { className: mcp_config_module_less_1.default.detailContent }, server.tools.map((tool, index) => {
|
|
131
|
+
const isDisabled = disabledTools.includes(tool.name);
|
|
132
|
+
return (react_1.default.createElement(ide_components_1.Badge, { key: index, className: (0, classnames_1.default)(mcp_config_module_less_1.default.toolTag, isDisabled && mcp_config_module_less_1.default.disabledTool), title: `${tool.description}${isDisabled ? ' (已禁用)' : ''}`, onClick: () => handleToggleTool(tool.name), style: { cursor: 'pointer' } },
|
|
133
|
+
tool.name,
|
|
134
|
+
isDisabled && react_1.default.createElement("span", { style: { marginLeft: '4px', opacity: 0.6 } }, "\u2715")));
|
|
135
|
+
}))))),
|
|
112
136
|
server.command && (react_1.default.createElement("div", { className: mcp_config_module_less_1.default.serverDetail },
|
|
113
137
|
react_1.default.createElement("div", { className: mcp_config_module_less_1.default.detailRow },
|
|
114
138
|
react_1.default.createElement("span", { className: mcp_config_module_less_1.default.detailLabel }, "Command:"),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-config.view.js","sourceRoot":"","sources":["../../../../../src/browser/mcp/config/components/mcp-config.view.tsx"],"names":[],"mappings":";;;;AAAA,oEAA6B;AAC7B,uDAA2C;AAE3C,6DAA4F;AAC5F,iEAA2D;AAC3D,+DAA4E;AAE5E,+CAA6D;AAK7D,8FAA8C;AAC9C,uDAAqE;AAE9D,MAAM,aAAa,GAAa,GAAG,EAAE;IAC1C,MAAM,gBAAgB,GAAG,IAAA,gCAAa,EAAmB,uCAAqB,CAAC,CAAC;IAChF,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAc,EAAE,CAAC,CAAC;IAC9D,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC5D,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,eAAK,CAAC,QAAQ,EAAoC,CAAC;IAC7F,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,eAAK,CAAC,QAAQ,EAAsB,CAAC;IAC/E,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"mcp-config.view.js","sourceRoot":"","sources":["../../../../../src/browser/mcp/config/components/mcp-config.view.tsx"],"names":[],"mappings":"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"}
|
|
@@ -12,8 +12,11 @@ export declare class MCPConfigService extends Disposable {
|
|
|
12
12
|
private readonly appConfig;
|
|
13
13
|
private readonly logger;
|
|
14
14
|
private chatStorage;
|
|
15
|
+
private mcpConfigStorage;
|
|
15
16
|
private whenReadyDeferred;
|
|
16
17
|
private _isInitialized;
|
|
18
|
+
private disabledToolsCache;
|
|
19
|
+
private disabledToolsCacheInitialized;
|
|
17
20
|
private readonly mcpServersChangeEventEmitter;
|
|
18
21
|
constructor();
|
|
19
22
|
private init;
|
|
@@ -28,6 +31,10 @@ export declare class MCPConfigService extends Disposable {
|
|
|
28
31
|
syncServer(serverName: string): Promise<void>;
|
|
29
32
|
getServerConfigByName(serverName: string): Promise<MCPServerDescription | undefined>;
|
|
30
33
|
getReadableServerType(type: string): string;
|
|
34
|
+
getDisabledTools(): Promise<string[]>;
|
|
35
|
+
toggleToolEnabled(toolName: string): Promise<void>;
|
|
36
|
+
isToolEnabled(toolName: string): Promise<boolean>;
|
|
31
37
|
openConfigFile(): Promise<void>;
|
|
38
|
+
private loadDisabledToolsCache;
|
|
32
39
|
}
|
|
33
40
|
//# sourceMappingURL=mcp-config.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-config.service.d.ts","sourceRoot":"","sources":["../../../../src/browser/mcp/config/mcp-config.service.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,UAAU,EAOX,MAAM,2BAA2B,CAAC;AAKnC,OAAO,EACL,oBAAoB,EAIrB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAmB,MAAM,uBAAuB,CAAC;AAGnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAEjE,qBACa,gBAAiB,SAAQ,UAAU;IAE9C,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAwB;IAGlE,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAwB;IAG9D,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IAGtD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAkB;IAGjD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAGlD,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAyB;IAGhE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IAGtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IAEjC,OAAO,CAAC,WAAW,CAAW;IAC9B,OAAO,CAAC,iBAAiB,CAAwB;IAEjD,OAAO,CAAC,cAAc,CAAS;
|
|
1
|
+
{"version":3,"file":"mcp-config.service.d.ts","sourceRoot":"","sources":["../../../../src/browser/mcp/config/mcp-config.service.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,UAAU,EAOX,MAAM,2BAA2B,CAAC;AAKnC,OAAO,EACL,oBAAoB,EAIrB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAmB,MAAM,uBAAuB,CAAC;AAGnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAEjE,qBACa,gBAAiB,SAAQ,UAAU;IAE9C,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAwB;IAGlE,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAwB;IAG9D,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IAGtD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAkB;IAGjD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAGlD,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAyB;IAGhE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IAGtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IAEjC,OAAO,CAAC,WAAW,CAAW;IAC9B,OAAO,CAAC,gBAAgB,CAAW;IACnC,OAAO,CAAC,iBAAiB,CAAwB;IAEjD,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,kBAAkB,CAA0B;IACpD,OAAO,CAAC,6BAA6B,CAAS;IAE9C,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAA0B;;YAmBzD,IAAI;IAOlB,IAAI,SAAS,kBAEZ;IAED,IAAI,aAAa,YAEhB;IAED,IAAI,kBAAkB,wDAErB;IAED,oBAAoB,CAAC,MAAM,GAAE,OAAe;IAOtC,UAAU,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAwDlC,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BhE,UAAU,CAAC,IAAI,EAAE,oBAAoB,GAAG,SAAS,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAiC1F,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAc/C,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAS7C,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;IA+B1F,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAarC,gBAAgB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAQrC,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAelD,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAQjD,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;YAsBvB,sBAAsB;CAKrC"}
|
|
@@ -17,6 +17,8 @@ let MCPConfigService = class MCPConfigService extends ide_core_common_1.Disposab
|
|
|
17
17
|
super();
|
|
18
18
|
this.whenReadyDeferred = new ide_core_common_1.Deferred();
|
|
19
19
|
this._isInitialized = false;
|
|
20
|
+
this.disabledToolsCache = new Set();
|
|
21
|
+
this.disabledToolsCacheInitialized = false;
|
|
20
22
|
this.mcpServersChangeEventEmitter = new ide_core_common_1.Emitter();
|
|
21
23
|
this.init();
|
|
22
24
|
this.disposables.push(this.mcpServerProxyService.onChangeMCPServers(() => {
|
|
@@ -29,6 +31,8 @@ let MCPConfigService = class MCPConfigService extends ide_core_common_1.Disposab
|
|
|
29
31
|
}
|
|
30
32
|
async init() {
|
|
31
33
|
this.chatStorage = await this.storageProvider(ide_core_common_1.STORAGE_NAMESPACE.CHAT);
|
|
34
|
+
this.mcpConfigStorage = await this.storageProvider(ide_core_common_1.STORAGE_NAMESPACE.MCP);
|
|
35
|
+
await this.loadDisabledToolsCache();
|
|
32
36
|
this.whenReadyDeferred.resolve();
|
|
33
37
|
}
|
|
34
38
|
get whenReady() {
|
|
@@ -203,6 +207,33 @@ let MCPConfigService = class MCPConfigService extends ide_core_common_1.Disposab
|
|
|
203
207
|
return type;
|
|
204
208
|
}
|
|
205
209
|
}
|
|
210
|
+
async getDisabledTools() {
|
|
211
|
+
await this.whenReady;
|
|
212
|
+
if (!this.disabledToolsCacheInitialized) {
|
|
213
|
+
await this.loadDisabledToolsCache();
|
|
214
|
+
}
|
|
215
|
+
return Array.from(this.disabledToolsCache);
|
|
216
|
+
}
|
|
217
|
+
async toggleToolEnabled(toolName) {
|
|
218
|
+
await this.whenReady;
|
|
219
|
+
if (!this.disabledToolsCacheInitialized) {
|
|
220
|
+
await this.loadDisabledToolsCache();
|
|
221
|
+
}
|
|
222
|
+
if (this.disabledToolsCache.has(toolName)) {
|
|
223
|
+
this.disabledToolsCache.delete(toolName);
|
|
224
|
+
}
|
|
225
|
+
else {
|
|
226
|
+
this.disabledToolsCache.add(toolName);
|
|
227
|
+
}
|
|
228
|
+
await this.mcpConfigStorage.set('disabledMCPTools', Array.from(this.disabledToolsCache));
|
|
229
|
+
}
|
|
230
|
+
async isToolEnabled(toolName) {
|
|
231
|
+
await this.whenReady;
|
|
232
|
+
if (!this.disabledToolsCacheInitialized) {
|
|
233
|
+
await this.loadDisabledToolsCache();
|
|
234
|
+
}
|
|
235
|
+
return !this.disabledToolsCache.has(toolName);
|
|
236
|
+
}
|
|
206
237
|
async openConfigFile() {
|
|
207
238
|
let config = this.preferenceService.resolve('mcp', { mcpServers: {} }, undefined);
|
|
208
239
|
if (config.scope === ide_core_common_1.PreferenceScope.Default) {
|
|
@@ -216,6 +247,11 @@ let MCPConfigService = class MCPConfigService extends ide_core_common_1.Disposab
|
|
|
216
247
|
});
|
|
217
248
|
}
|
|
218
249
|
}
|
|
250
|
+
async loadDisabledToolsCache() {
|
|
251
|
+
const disabledTools = this.mcpConfigStorage.get('disabledMCPTools', []);
|
|
252
|
+
this.disabledToolsCache = new Set(disabledTools);
|
|
253
|
+
this.disabledToolsCacheInitialized = true;
|
|
254
|
+
}
|
|
219
255
|
};
|
|
220
256
|
exports.MCPConfigService = MCPConfigService;
|
|
221
257
|
tslib_1.__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-config.service.js","sourceRoot":"","sources":["../../../../src/browser/mcp/config/mcp-config.service.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,iEAAgE;AAChE,4EAA+E;AAC/E,+DASmC;AACnC,qDAA8D;AAC9D,uDAAwD;AAExD,4CAAgH;AAChH,2EAK4C;AAC5C,iDAAmE;AACnE,0EAAoE;AAK7D,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,4BAAU;
|
|
1
|
+
{"version":3,"file":"mcp-config.service.js","sourceRoot":"","sources":["../../../../src/browser/mcp/config/mcp-config.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-language-model.d.ts","sourceRoot":"","sources":["../../src/node/base-language-model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAA2E,MAAM,IAAI,CAAC;AAG1G,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC1E,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;IAGjF,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAEvC,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;
|
|
1
|
+
{"version":3,"file":"base-language-model.d.ts","sourceRoot":"","sources":["../../src/node/base-language-model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAA2E,MAAM,IAAI,CAAC;AAG1G,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC1E,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;IAGjF,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAEvC,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;IAiCf,OAAO,CAAC,0BAA0B;IAalC,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"}
|
|
@@ -15,6 +15,11 @@ let BaseLanguageModel = class BaseLanguageModel {
|
|
|
15
15
|
if (clientId) {
|
|
16
16
|
const registry = this.toolInvocationRegistryManager.getRegistry(clientId);
|
|
17
17
|
allFunctions = options.noTool ? [] : registry.getAllFunctions();
|
|
18
|
+
// 过滤禁用的工具
|
|
19
|
+
if (options.disabledTools && options.disabledTools.length > 0) {
|
|
20
|
+
const disabledToolsSet = new Set(options.disabledTools);
|
|
21
|
+
allFunctions = allFunctions.filter((tool) => !disabledToolsSet.has(tool.name));
|
|
22
|
+
}
|
|
18
23
|
}
|
|
19
24
|
return this.handleStreamingRequest(provider, request, allFunctions, chatReadableStream, options.history || [], options.modelId, options.providerOptions, options.trimTexts, options.system, options.maxTokens, options.images, cancellationToken);
|
|
20
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-language-model.js","sourceRoot":"","sources":["../../src/node/base-language-model.ts"],"names":[],"mappings":";;;;AAAA,2BAA0G;AAE1G,qCAAqD;AAErD,2DAA0E;AAI1E,iFAI4C;AAGrC,IAAe,iBAAiB,GAAhC,MAAe,iBAAiB;IAWrC,KAAK,CAAC,OAAO,CACX,OAAe,EACf,kBAAsC,EACtC,OAA6B,EAC7B,iBAAqC;QAErC,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAClD,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QAElC,IAAI,YAAY,GAAkB,EAAE,CAAC;QACrC,yBAAyB;QACzB,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,QAAQ,GAAG,IAAI,CAAC,6BAA6B,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAC1E,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"base-language-model.js","sourceRoot":"","sources":["../../src/node/base-language-model.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-ai-native",
|
|
3
|
-
"version": "3.9.1-next-
|
|
3
|
+
"version": "3.9.1-next-1752974346.0",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib",
|
|
6
6
|
"src"
|
|
@@ -24,28 +24,28 @@
|
|
|
24
24
|
"@ai-sdk/openai": "^1.1.9",
|
|
25
25
|
"@ai-sdk/openai-compatible": "^0.1.11",
|
|
26
26
|
"@modelcontextprotocol/sdk": "^1.11.4",
|
|
27
|
-
"@opensumi/ide-addons": "3.9.1-next-
|
|
28
|
-
"@opensumi/ide-components": "3.9.1-next-
|
|
29
|
-
"@opensumi/ide-connection": "3.9.1-next-
|
|
30
|
-
"@opensumi/ide-core-common": "3.9.1-next-
|
|
31
|
-
"@opensumi/ide-core-node": "3.9.1-next-
|
|
32
|
-
"@opensumi/ide-debug": "3.9.1-next-
|
|
33
|
-
"@opensumi/ide-design": "3.9.1-next-
|
|
34
|
-
"@opensumi/ide-editor": "3.9.1-next-
|
|
35
|
-
"@opensumi/ide-file-search": "3.9.1-next-
|
|
36
|
-
"@opensumi/ide-file-service": "3.9.1-next-
|
|
37
|
-
"@opensumi/ide-main-layout": "3.9.1-next-
|
|
38
|
-
"@opensumi/ide-markers": "3.9.1-next-
|
|
39
|
-
"@opensumi/ide-monaco": "3.9.1-next-
|
|
40
|
-
"@opensumi/ide-outline": "3.9.1-next-
|
|
41
|
-
"@opensumi/ide-overlay": "3.9.1-next-
|
|
42
|
-
"@opensumi/ide-preferences": "3.9.1-next-
|
|
43
|
-
"@opensumi/ide-quick-open": "3.9.1-next-
|
|
44
|
-
"@opensumi/ide-search": "3.9.1-next-
|
|
45
|
-
"@opensumi/ide-terminal-next": "3.9.1-next-
|
|
46
|
-
"@opensumi/ide-theme": "3.9.1-next-
|
|
47
|
-
"@opensumi/ide-utils": "3.9.1-next-
|
|
48
|
-
"@opensumi/ide-workspace": "3.9.1-next-
|
|
27
|
+
"@opensumi/ide-addons": "3.9.1-next-1752974346.0",
|
|
28
|
+
"@opensumi/ide-components": "3.9.1-next-1752974346.0",
|
|
29
|
+
"@opensumi/ide-connection": "3.9.1-next-1752974346.0",
|
|
30
|
+
"@opensumi/ide-core-common": "3.9.1-next-1752974346.0",
|
|
31
|
+
"@opensumi/ide-core-node": "3.9.1-next-1752974346.0",
|
|
32
|
+
"@opensumi/ide-debug": "3.9.1-next-1752974346.0",
|
|
33
|
+
"@opensumi/ide-design": "3.9.1-next-1752974346.0",
|
|
34
|
+
"@opensumi/ide-editor": "3.9.1-next-1752974346.0",
|
|
35
|
+
"@opensumi/ide-file-search": "3.9.1-next-1752974346.0",
|
|
36
|
+
"@opensumi/ide-file-service": "3.9.1-next-1752974346.0",
|
|
37
|
+
"@opensumi/ide-main-layout": "3.9.1-next-1752974346.0",
|
|
38
|
+
"@opensumi/ide-markers": "3.9.1-next-1752974346.0",
|
|
39
|
+
"@opensumi/ide-monaco": "3.9.1-next-1752974346.0",
|
|
40
|
+
"@opensumi/ide-outline": "3.9.1-next-1752974346.0",
|
|
41
|
+
"@opensumi/ide-overlay": "3.9.1-next-1752974346.0",
|
|
42
|
+
"@opensumi/ide-preferences": "3.9.1-next-1752974346.0",
|
|
43
|
+
"@opensumi/ide-quick-open": "3.9.1-next-1752974346.0",
|
|
44
|
+
"@opensumi/ide-search": "3.9.1-next-1752974346.0",
|
|
45
|
+
"@opensumi/ide-terminal-next": "3.9.1-next-1752974346.0",
|
|
46
|
+
"@opensumi/ide-theme": "3.9.1-next-1752974346.0",
|
|
47
|
+
"@opensumi/ide-utils": "3.9.1-next-1752974346.0",
|
|
48
|
+
"@opensumi/ide-workspace": "3.9.1-next-1752974346.0",
|
|
49
49
|
"@xterm/xterm": "5.5.0",
|
|
50
50
|
"ai": "^4.3.16",
|
|
51
51
|
"ansi-regex": "^2.0.0",
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
"zod-to-json-schema": "^3.24.1"
|
|
63
63
|
},
|
|
64
64
|
"devDependencies": {
|
|
65
|
-
"@opensumi/ide-core-browser": "3.9.1-next-
|
|
65
|
+
"@opensumi/ide-core-browser": "3.9.1-next-1752974346.0"
|
|
66
66
|
},
|
|
67
|
-
"gitHead": "
|
|
67
|
+
"gitHead": "dce7b98696d49eaf5ca9fe376078015005227581"
|
|
68
68
|
}
|
|
@@ -102,7 +102,7 @@ export class ApplyService extends BaseApplyService {
|
|
|
102
102
|
Provide the complete updated code.
|
|
103
103
|
`,
|
|
104
104
|
{
|
|
105
|
-
...this.chatProxyService.getRequestOptions(),
|
|
105
|
+
...(await this.chatProxyService.getRequestOptions()),
|
|
106
106
|
trimTexts: ['<updated-code>', '</updated-code>'],
|
|
107
107
|
system:
|
|
108
108
|
'You are a coding assistant that helps merge code updates, ensuring every modification is fully integrated.',
|
|
@@ -11,6 +11,7 @@ import {
|
|
|
11
11
|
IAIReporter,
|
|
12
12
|
IApplicationService,
|
|
13
13
|
IChatProgress,
|
|
14
|
+
MCPConfigServiceToken,
|
|
14
15
|
} from '@opensumi/ide-core-common';
|
|
15
16
|
import { AINativeSettingSectionsId } from '@opensumi/ide-core-common/lib/settings/ai-native';
|
|
16
17
|
import { MonacoCommandRegistry } from '@opensumi/ide-editor/lib/browser/monaco-contrib/command/command.service';
|
|
@@ -27,6 +28,7 @@ import {
|
|
|
27
28
|
} from '../../common';
|
|
28
29
|
import { DEFAULT_SYSTEM_PROMPT } from '../../common/prompts/system-prompt';
|
|
29
30
|
import { ChatToolRender } from '../components/ChatToolRender';
|
|
31
|
+
import { MCPConfigService } from '../mcp/config/mcp-config.service';
|
|
30
32
|
import { IChatAgentViewService } from '../types';
|
|
31
33
|
|
|
32
34
|
import { ChatFeatureRegistry } from './chat.feature.registry';
|
|
@@ -66,9 +68,12 @@ export class ChatProxyService extends Disposable {
|
|
|
66
68
|
@Autowired(IMessageService)
|
|
67
69
|
private readonly messageService: IMessageService;
|
|
68
70
|
|
|
71
|
+
@Autowired(MCPConfigServiceToken)
|
|
72
|
+
private readonly mcpConfigService: MCPConfigService;
|
|
73
|
+
|
|
69
74
|
private chatDeferred: Deferred<void> = new Deferred<void>();
|
|
70
75
|
|
|
71
|
-
public getRequestOptions() {
|
|
76
|
+
public async getRequestOptions() {
|
|
72
77
|
const model = this.preferenceService.get<string>(AINativeSettingSectionsId.LLMModelSelection);
|
|
73
78
|
const modelId = this.preferenceService.get<string>(AINativeSettingSectionsId.ModelID);
|
|
74
79
|
let apiKey: string = '';
|
|
@@ -86,6 +91,7 @@ export class ChatProxyService extends Disposable {
|
|
|
86
91
|
}
|
|
87
92
|
const maxTokens = this.preferenceService.get<number>(AINativeSettingSectionsId.MaxTokens);
|
|
88
93
|
const agent = this.chatAgentService.getAgent(ChatProxyService.AGENT_ID);
|
|
94
|
+
const disabledTools = await this.mcpConfigService.getDisabledTools();
|
|
89
95
|
return {
|
|
90
96
|
clientId: this.applicationService.clientId,
|
|
91
97
|
model,
|
|
@@ -94,6 +100,7 @@ export class ChatProxyService extends Disposable {
|
|
|
94
100
|
baseURL,
|
|
95
101
|
maxTokens,
|
|
96
102
|
system: agent?.metadata.systemPrompt,
|
|
103
|
+
disabledTools,
|
|
97
104
|
};
|
|
98
105
|
}
|
|
99
106
|
|
|
@@ -139,7 +146,7 @@ export class ChatProxyService extends Disposable {
|
|
|
139
146
|
sessionId: request.sessionId,
|
|
140
147
|
history,
|
|
141
148
|
images: request.images,
|
|
142
|
-
...this.getRequestOptions(),
|
|
149
|
+
...(await this.getRequestOptions()),
|
|
143
150
|
},
|
|
144
151
|
token,
|
|
145
152
|
);
|
|
@@ -222,4 +222,16 @@
|
|
|
222
222
|
font-weight: 500;
|
|
223
223
|
transition: all 0.2s ease;
|
|
224
224
|
cursor: pointer;
|
|
225
|
+
|
|
226
|
+
&.disabledTool {
|
|
227
|
+
opacity: 0.5;
|
|
228
|
+
background-color: var(--notification-warning-background);
|
|
229
|
+
color: var(--notification-warning-foreground);
|
|
230
|
+
text-decoration: line-through;
|
|
231
|
+
}
|
|
232
|
+
|
|
233
|
+
&:hover {
|
|
234
|
+
transform: scale(1.05);
|
|
235
|
+
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
|
|
236
|
+
}
|
|
225
237
|
}
|
|
@@ -20,14 +20,21 @@ export const MCPConfigView: React.FC = () => {
|
|
|
20
20
|
const [editingServer, setEditingServer] = React.useState<MCPServerDescription | undefined>();
|
|
21
21
|
const [loadingServer, setLoadingServer] = React.useState<string | undefined>();
|
|
22
22
|
const [isReady, setIsReady] = React.useState(mcpConfigService.isInitialized);
|
|
23
|
+
const [disabledTools, setDisabledTools] = React.useState<string[]>([]);
|
|
23
24
|
|
|
24
25
|
const loadServers = useCallback(async () => {
|
|
25
26
|
const allServers = await mcpConfigService.getServers();
|
|
26
27
|
setServers(allServers);
|
|
27
28
|
}, [mcpConfigService]);
|
|
28
29
|
|
|
30
|
+
const loadDisabledTools = useCallback(async () => {
|
|
31
|
+
const disabled = await mcpConfigService.getDisabledTools();
|
|
32
|
+
setDisabledTools(disabled);
|
|
33
|
+
}, [mcpConfigService]);
|
|
34
|
+
|
|
29
35
|
React.useEffect(() => {
|
|
30
36
|
loadServers();
|
|
37
|
+
loadDisabledTools();
|
|
31
38
|
const disposer = mcpConfigService.onMCPServersChange((isReady) => {
|
|
32
39
|
if (isReady) {
|
|
33
40
|
setIsReady(true);
|
|
@@ -38,7 +45,7 @@ export const MCPConfigView: React.FC = () => {
|
|
|
38
45
|
return () => {
|
|
39
46
|
disposer.dispose();
|
|
40
47
|
};
|
|
41
|
-
}, [loadServers]);
|
|
48
|
+
}, [loadServers, loadDisabledTools]);
|
|
42
49
|
|
|
43
50
|
const handleServerControl = useCallback(
|
|
44
51
|
async (serverName: string, start: boolean) => {
|
|
@@ -102,6 +109,22 @@ export const MCPConfigView: React.FC = () => {
|
|
|
102
109
|
[mcpConfigService, loadServers],
|
|
103
110
|
);
|
|
104
111
|
|
|
112
|
+
const handleToggleTool = useCallback(
|
|
113
|
+
async (toolName: string) => {
|
|
114
|
+
await mcpConfigService.toggleToolEnabled(toolName);
|
|
115
|
+
// 直接更新本地状态，避免重新从 service 加载
|
|
116
|
+
setDisabledTools((prev) => {
|
|
117
|
+
const isCurrentlyDisabled = prev.includes(toolName);
|
|
118
|
+
if (isCurrentlyDisabled) {
|
|
119
|
+
return prev.filter((name) => name !== toolName);
|
|
120
|
+
} else {
|
|
121
|
+
return [...prev, toolName];
|
|
122
|
+
}
|
|
123
|
+
});
|
|
124
|
+
},
|
|
125
|
+
[mcpConfigService],
|
|
126
|
+
);
|
|
127
|
+
|
|
105
128
|
return (
|
|
106
129
|
<div className={styles.container}>
|
|
107
130
|
<div className={styles.header}>
|
|
@@ -196,11 +219,21 @@ export const MCPConfigView: React.FC = () => {
|
|
|
196
219
|
<div className={styles.detailRow}>
|
|
197
220
|
<span className={styles.detailLabel}>Tools:</span>
|
|
198
221
|
<span className={styles.detailContent}>
|
|
199
|
-
{server.tools.map((tool, index) =>
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
222
|
+
{server.tools.map((tool, index) => {
|
|
223
|
+
const isDisabled = disabledTools.includes(tool.name);
|
|
224
|
+
return (
|
|
225
|
+
<Badge
|
|
226
|
+
key={index}
|
|
227
|
+
className={cls(styles.toolTag, isDisabled && styles.disabledTool)}
|
|
228
|
+
title={`${tool.description}${isDisabled ? ' (已禁用)' : ''}`}
|
|
229
|
+
onClick={() => handleToggleTool(tool.name)}
|
|
230
|
+
style={{ cursor: 'pointer' }}
|
|
231
|
+
>
|
|
232
|
+
{tool.name}
|
|
233
|
+
{isDisabled && <span style={{ marginLeft: '4px', opacity: 0.6 }}>✕</span>}
|
|
234
|
+
</Badge>
|
|
235
|
+
);
|
|
236
|
+
})}
|
|
204
237
|
</span>
|
|
205
238
|
</div>
|
|
206
239
|
</div>
|
|
@@ -53,9 +53,12 @@ export class MCPConfigService extends Disposable {
|
|
|
53
53
|
private readonly logger: ILogger;
|
|
54
54
|
|
|
55
55
|
private chatStorage: IStorage;
|
|
56
|
+
private mcpConfigStorage: IStorage;
|
|
56
57
|
private whenReadyDeferred = new Deferred<void>();
|
|
57
58
|
|
|
58
59
|
private _isInitialized = false;
|
|
60
|
+
private disabledToolsCache: Set<string> = new Set();
|
|
61
|
+
private disabledToolsCacheInitialized = false;
|
|
59
62
|
|
|
60
63
|
private readonly mcpServersChangeEventEmitter = new Emitter<boolean>();
|
|
61
64
|
|
|
@@ -78,6 +81,8 @@ export class MCPConfigService extends Disposable {
|
|
|
78
81
|
|
|
79
82
|
private async init() {
|
|
80
83
|
this.chatStorage = await this.storageProvider(STORAGE_NAMESPACE.CHAT);
|
|
84
|
+
this.mcpConfigStorage = await this.storageProvider(STORAGE_NAMESPACE.MCP);
|
|
85
|
+
await this.loadDisabledToolsCache();
|
|
81
86
|
this.whenReadyDeferred.resolve();
|
|
82
87
|
}
|
|
83
88
|
|
|
@@ -283,6 +288,37 @@ export class MCPConfigService extends Disposable {
|
|
|
283
288
|
}
|
|
284
289
|
}
|
|
285
290
|
|
|
291
|
+
async getDisabledTools(): Promise<string[]> {
|
|
292
|
+
await this.whenReady;
|
|
293
|
+
if (!this.disabledToolsCacheInitialized) {
|
|
294
|
+
await this.loadDisabledToolsCache();
|
|
295
|
+
}
|
|
296
|
+
return Array.from(this.disabledToolsCache);
|
|
297
|
+
}
|
|
298
|
+
|
|
299
|
+
async toggleToolEnabled(toolName: string): Promise<void> {
|
|
300
|
+
await this.whenReady;
|
|
301
|
+
if (!this.disabledToolsCacheInitialized) {
|
|
302
|
+
await this.loadDisabledToolsCache();
|
|
303
|
+
}
|
|
304
|
+
|
|
305
|
+
if (this.disabledToolsCache.has(toolName)) {
|
|
306
|
+
this.disabledToolsCache.delete(toolName);
|
|
307
|
+
} else {
|
|
308
|
+
this.disabledToolsCache.add(toolName);
|
|
309
|
+
}
|
|
310
|
+
|
|
311
|
+
await this.mcpConfigStorage.set('disabledMCPTools', Array.from(this.disabledToolsCache));
|
|
312
|
+
}
|
|
313
|
+
|
|
314
|
+
async isToolEnabled(toolName: string): Promise<boolean> {
|
|
315
|
+
await this.whenReady;
|
|
316
|
+
if (!this.disabledToolsCacheInitialized) {
|
|
317
|
+
await this.loadDisabledToolsCache();
|
|
318
|
+
}
|
|
319
|
+
return !this.disabledToolsCache.has(toolName);
|
|
320
|
+
}
|
|
321
|
+
|
|
286
322
|
async openConfigFile(): Promise<void> {
|
|
287
323
|
let config = this.preferenceService.resolve<{ mcpServers: Record<string, any> }>(
|
|
288
324
|
'mcp',
|
|
@@ -304,4 +340,10 @@ export class MCPConfigService extends Disposable {
|
|
|
304
340
|
});
|
|
305
341
|
}
|
|
306
342
|
}
|
|
343
|
+
|
|
344
|
+
private async loadDisabledToolsCache(): Promise<void> {
|
|
345
|
+
const disabledTools = this.mcpConfigStorage.get<string[]>('disabledMCPTools', []);
|
|
346
|
+
this.disabledToolsCache = new Set(disabledTools);
|
|
347
|
+
this.disabledToolsCacheInitialized = true;
|
|
348
|
+
}
|
|
307
349
|
}
|
|
@@ -38,6 +38,12 @@ export abstract class BaseLanguageModel {
|
|
|
38
38
|
if (clientId) {
|
|
39
39
|
const registry = this.toolInvocationRegistryManager.getRegistry(clientId);
|
|
40
40
|
allFunctions = options.noTool ? [] : registry.getAllFunctions();
|
|
41
|
+
|
|
42
|
+
// 过滤禁用的工具
|
|
43
|
+
if (options.disabledTools && options.disabledTools.length > 0) {
|
|
44
|
+
const disabledToolsSet = new Set(options.disabledTools);
|
|
45
|
+
allFunctions = allFunctions.filter((tool) => !disabledToolsSet.has(tool.name));
|
|
46
|
+
}
|
|
41
47
|
}
|
|
42
48
|
|
|
43
49
|
return this.handleStreamingRequest(
|