@opensumi/ide-ai-native 3.8.1-next-1741317422.0 → 3.8.1
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.d.ts +16 -0
- package/lib/browser/chat/apply.service.d.ts.map +1 -0
- package/lib/browser/chat/apply.service.js +52 -0
- package/lib/browser/chat/apply.service.js.map +1 -0
- package/lib/browser/chat/chat-proxy.service.d.ts +8 -0
- package/lib/browser/chat/chat-proxy.service.d.ts.map +1 -1
- package/lib/browser/chat/chat-proxy.service.js +30 -25
- package/lib/browser/chat/chat-proxy.service.js.map +1 -1
- package/lib/browser/context/llm-context.service.d.ts.map +1 -1
- package/lib/browser/context/llm-context.service.js +2 -1
- 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 +6 -0
- package/lib/browser/index.js.map +1 -1
- package/lib/browser/mcp/config/components/mcp-config.view.d.ts.map +1 -1
- package/lib/browser/mcp/config/components/mcp-config.view.js +18 -14
- package/lib/browser/mcp/config/components/mcp-config.view.js.map +1 -1
- package/lib/browser/mcp/config/components/mcp-server-form.d.ts +4 -3
- package/lib/browser/mcp/config/components/mcp-server-form.d.ts.map +1 -1
- package/lib/browser/mcp/config/components/mcp-server-form.js +35 -6
- package/lib/browser/mcp/config/components/mcp-server-form.js.map +1 -1
- package/lib/common/index.d.ts +2 -0
- package/lib/common/index.d.ts.map +1 -1
- package/lib/common/index.js.map +1 -1
- package/lib/common/types.d.ts +8 -0
- package/lib/common/types.d.ts.map +1 -1
- package/lib/common/types.js.map +1 -1
- package/lib/node/base-language-model.js +1 -1
- package/lib/node/base-language-model.js.map +1 -1
- package/lib/node/mcp/sumi-mcp-server.d.ts +2 -0
- package/lib/node/mcp/sumi-mcp-server.d.ts.map +1 -1
- package/lib/node/mcp/sumi-mcp-server.js +6 -0
- package/lib/node/mcp/sumi-mcp-server.js.map +1 -1
- package/lib/node/mcp-server.sse.d.ts.map +1 -1
- package/lib/node/mcp-server.sse.js +1 -3
- package/lib/node/mcp-server.sse.js.map +1 -1
- package/package.json +23 -23
- package/src/browser/chat/apply.service.ts +55 -0
- package/src/browser/chat/chat-proxy.service.ts +28 -22
- package/src/browser/context/llm-context.service.ts +9 -2
- package/src/browser/index.ts +6 -0
- package/src/browser/mcp/config/components/mcp-config.view.tsx +93 -86
- package/src/browser/mcp/config/components/mcp-server-form.tsx +47 -15
- package/src/common/index.ts +2 -0
- package/src/common/types.ts +9 -0
- package/src/node/base-language-model.ts +1 -1
- package/src/node/mcp/sumi-mcp-server.ts +8 -0
- package/src/node/mcp-server.sse.ts +1 -3
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { IChatProgress } from '@opensumi/ide-core-browser';
|
|
2
|
+
import { SumiReadableStream } from '@opensumi/ide-utils/lib/stream';
|
|
3
|
+
import { Range } from '@opensumi/monaco-editor-core';
|
|
4
|
+
import { CodeBlockData } from '../../common/types';
|
|
5
|
+
import { BaseApplyService } from '../mcp/base-apply.service';
|
|
6
|
+
export declare class ApplyService extends BaseApplyService {
|
|
7
|
+
private readonly modelService;
|
|
8
|
+
private readonly aiBackService;
|
|
9
|
+
private readonly chatProxyService;
|
|
10
|
+
protected doApply(codeBlock: CodeBlockData): Promise<{
|
|
11
|
+
range?: Range;
|
|
12
|
+
stream?: SumiReadableStream<IChatProgress, Error>;
|
|
13
|
+
result?: string;
|
|
14
|
+
}>;
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=apply.service.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"apply.service.d.ts","sourceRoot":"","sources":["../../../src/browser/chat/apply.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAqC,aAAa,EAAa,MAAM,4BAA4B,CAAC;AAEzG,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAGrD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAI7D,qBACa,YAAa,SAAQ,gBAAgB;IAEhD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA8B;IAG3D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAE/C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmB;cAEpC,OAAO,CAAC,SAAS,EAAE,aAAa,GAAG,OAAO,CAAC;QACzD,KAAK,CAAC,EAAE,KAAK,CAAC;QACd,MAAM,CAAC,EAAE,kBAAkB,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;QAClD,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;CA4BH"}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ApplyService = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const di_1 = require("@opensumi/di");
|
|
6
|
+
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
7
|
+
const browser_1 = require("@opensumi/ide-editor/lib/browser");
|
|
8
|
+
const common_1 = require("../../common");
|
|
9
|
+
const base_apply_service_1 = require("../mcp/base-apply.service");
|
|
10
|
+
const chat_proxy_service_1 = require("./chat-proxy.service");
|
|
11
|
+
let ApplyService = class ApplyService extends base_apply_service_1.BaseApplyService {
|
|
12
|
+
async doApply(codeBlock) {
|
|
13
|
+
const uri = new ide_core_browser_1.URI(ide_core_browser_1.path.join(this.appConfig.workspaceDir, codeBlock.relativePath));
|
|
14
|
+
const modelReference = await this.modelService.createModelReference(uri);
|
|
15
|
+
const fileContent = modelReference.instance.getMonacoModel().getValue();
|
|
16
|
+
const stream = await this.aiBackService.requestStream(`Merge all changes from the <update> snippet into the <code> below.
|
|
17
|
+
- Preserve the code's structure, order, comments, and indentation exactly.
|
|
18
|
+
- Output only the updated code, enclosed within <updated-code> and </updated-code> tags.
|
|
19
|
+
- Do not include any additional text, explanations, placeholders, ellipses, or code fences.
|
|
20
|
+
|
|
21
|
+
<code>${fileContent}</code>
|
|
22
|
+
|
|
23
|
+
<update>${codeBlock.codeEdit}</update>
|
|
24
|
+
|
|
25
|
+
Provide the complete updated code.
|
|
26
|
+
`, {
|
|
27
|
+
...this.chatProxyService.getRequestOptions(),
|
|
28
|
+
trimTexts: ['<updated-code>', '</updated-code>'],
|
|
29
|
+
system: 'You are a coding assistant that helps merge code updates, ensuring every modification is fully integrated.',
|
|
30
|
+
});
|
|
31
|
+
return {
|
|
32
|
+
stream,
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
};
|
|
36
|
+
exports.ApplyService = ApplyService;
|
|
37
|
+
tslib_1.__decorate([
|
|
38
|
+
(0, di_1.Autowired)(browser_1.IEditorDocumentModelService),
|
|
39
|
+
tslib_1.__metadata("design:type", Object)
|
|
40
|
+
], ApplyService.prototype, "modelService", void 0);
|
|
41
|
+
tslib_1.__decorate([
|
|
42
|
+
(0, di_1.Autowired)(ide_core_browser_1.AIBackSerivcePath),
|
|
43
|
+
tslib_1.__metadata("design:type", Object)
|
|
44
|
+
], ApplyService.prototype, "aiBackService", void 0);
|
|
45
|
+
tslib_1.__decorate([
|
|
46
|
+
(0, di_1.Autowired)(common_1.ChatProxyServiceToken),
|
|
47
|
+
tslib_1.__metadata("design:type", chat_proxy_service_1.ChatProxyService)
|
|
48
|
+
], ApplyService.prototype, "chatProxyService", void 0);
|
|
49
|
+
exports.ApplyService = ApplyService = tslib_1.__decorate([
|
|
50
|
+
(0, di_1.Injectable)()
|
|
51
|
+
], ApplyService);
|
|
52
|
+
//# sourceMappingURL=apply.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"apply.service.js","sourceRoot":"","sources":["../../../src/browser/chat/apply.service.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,iEAAyG;AACzG,8DAA+E;AAI/E,yCAAqD;AAErD,kEAA6D;AAE7D,6DAAwD;AAGjD,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,qCAAgB;IAStC,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;;;CAG/B,EACK;YACE,GAAG,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,EAAE;YAC5C,SAAS,EAAE,CAAC,gBAAgB,EAAE,iBAAiB,CAAC;YAChD,MAAM,EACJ,4GAA4G;SAC/G,CACF,CAAC;QAEF,OAAO;YACL,MAAM;SACP,CAAC;IACJ,CAAC;CACF,CAAA;AAzCY,oCAAY;AAEN;IADhB,IAAA,cAAS,EAAC,qCAA2B,CAAC;;kDACoB;AAG1C;IADhB,IAAA,cAAS,EAAC,oCAAiB,CAAC;;mDACkB;AAE9B;IADhB,IAAA,cAAS,EAAC,8BAAqB,CAAC;sCACE,qCAAgB;sDAAC;uBAPzC,YAAY;IADxB,IAAA,eAAU,GAAE;GACA,YAAY,CAyCxB"}
|
|
@@ -16,6 +16,14 @@ export declare class ChatProxyService extends Disposable {
|
|
|
16
16
|
private readonly messageService;
|
|
17
17
|
private readonly appConfig;
|
|
18
18
|
private chatDeferred;
|
|
19
|
+
getRequestOptions(): {
|
|
20
|
+
clientId: string;
|
|
21
|
+
model: string | undefined;
|
|
22
|
+
modelId: string | undefined;
|
|
23
|
+
apiKey: string;
|
|
24
|
+
baseURL: string;
|
|
25
|
+
system: string | undefined;
|
|
26
|
+
};
|
|
19
27
|
registerDefaultAgent(): void;
|
|
20
28
|
}
|
|
21
29
|
//# 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,EAOL,UAAU,EAMX,MAAM,2BAA2B,CAAC;AAoBnC;;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,aAAa,CAAc;IAGnC,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,SAAS,CAAY;IAEtC,OAAO,CAAC,YAAY,CAAwC;IAErD,oBAAoB;
|
|
1
|
+
{"version":3,"file":"chat-proxy.service.d.ts","sourceRoot":"","sources":["../../../src/browser/chat/chat-proxy.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAOL,UAAU,EAMX,MAAM,2BAA2B,CAAC;AAoBnC;;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,aAAa,CAAc;IAGnC,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,SAAS,CAAY;IAEtC,OAAO,CAAC,YAAY,CAAwC;IAErD,iBAAiB;;;;;;;;IA2BjB,oBAAoB;CAoF5B"}
|
|
@@ -22,6 +22,35 @@ let ChatProxyService = ChatProxyService_1 = class ChatProxyService extends ide_c
|
|
|
22
22
|
super(...arguments);
|
|
23
23
|
this.chatDeferred = new ide_core_common_1.Deferred();
|
|
24
24
|
}
|
|
25
|
+
getRequestOptions() {
|
|
26
|
+
const model = this.preferenceService.get(ai_native_1.AINativeSettingSectionsId.LLMModelSelection);
|
|
27
|
+
const modelId = this.preferenceService.get(ai_native_1.AINativeSettingSectionsId.ModelID);
|
|
28
|
+
let apiKey = '';
|
|
29
|
+
let baseURL = '';
|
|
30
|
+
if (model === 'deepseek') {
|
|
31
|
+
apiKey = this.preferenceService.get(ai_native_1.AINativeSettingSectionsId.DeepseekApiKey, '');
|
|
32
|
+
}
|
|
33
|
+
else if (model === 'openai') {
|
|
34
|
+
apiKey = this.preferenceService.get(ai_native_1.AINativeSettingSectionsId.OpenaiApiKey, '');
|
|
35
|
+
}
|
|
36
|
+
else if (model === 'anthropic') {
|
|
37
|
+
apiKey = this.preferenceService.get(ai_native_1.AINativeSettingSectionsId.AnthropicApiKey, '');
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
// openai-compatible 为兜底
|
|
41
|
+
apiKey = this.preferenceService.get(ai_native_1.AINativeSettingSectionsId.OpenaiApiKey, '');
|
|
42
|
+
baseURL = this.preferenceService.get(ai_native_1.AINativeSettingSectionsId.OpenaiBaseURL, '');
|
|
43
|
+
}
|
|
44
|
+
const agent = this.chatAgentService.getAgent(ChatProxyService_1.AGENT_ID);
|
|
45
|
+
return {
|
|
46
|
+
clientId: this.applicationService.clientId,
|
|
47
|
+
model,
|
|
48
|
+
modelId,
|
|
49
|
+
apiKey,
|
|
50
|
+
baseURL,
|
|
51
|
+
system: agent === null || agent === void 0 ? void 0 : agent.metadata.systemPrompt,
|
|
52
|
+
};
|
|
53
|
+
}
|
|
25
54
|
registerDefaultAgent() {
|
|
26
55
|
this.chatAgentViewService.registerChatComponent({
|
|
27
56
|
id: 'toolCall',
|
|
@@ -46,35 +75,11 @@ let ChatProxyService = ChatProxyService_1 = class ChatProxyService extends ide_c
|
|
|
46
75
|
prompt = slashCommandPrompt;
|
|
47
76
|
}
|
|
48
77
|
}
|
|
49
|
-
const model = this.preferenceService.get(ai_native_1.AINativeSettingSectionsId.LLMModelSelection);
|
|
50
|
-
const modelId = this.preferenceService.get(ai_native_1.AINativeSettingSectionsId.ModelID);
|
|
51
|
-
let apiKey = '';
|
|
52
|
-
let baseURL = '';
|
|
53
|
-
if (model === 'deepseek') {
|
|
54
|
-
apiKey = this.preferenceService.get(ai_native_1.AINativeSettingSectionsId.DeepseekApiKey, '');
|
|
55
|
-
}
|
|
56
|
-
else if (model === 'openai') {
|
|
57
|
-
apiKey = this.preferenceService.get(ai_native_1.AINativeSettingSectionsId.OpenaiApiKey, '');
|
|
58
|
-
}
|
|
59
|
-
else if (model === 'anthropic') {
|
|
60
|
-
apiKey = this.preferenceService.get(ai_native_1.AINativeSettingSectionsId.AnthropicApiKey, '');
|
|
61
|
-
}
|
|
62
|
-
else {
|
|
63
|
-
// openai-compatible 为兜底
|
|
64
|
-
apiKey = this.preferenceService.get(ai_native_1.AINativeSettingSectionsId.OpenaiApiKey, '');
|
|
65
|
-
baseURL = this.preferenceService.get(ai_native_1.AINativeSettingSectionsId.OpenaiBaseURL, '');
|
|
66
|
-
}
|
|
67
|
-
const agent = this.chatAgentService.getAgent(ChatProxyService_1.AGENT_ID);
|
|
68
78
|
const stream = await this.aiBackService.requestStream(prompt, {
|
|
69
79
|
requestId: request.requestId,
|
|
70
80
|
sessionId: request.sessionId,
|
|
71
81
|
history,
|
|
72
|
-
|
|
73
|
-
apiKey,
|
|
74
|
-
model,
|
|
75
|
-
modelId,
|
|
76
|
-
baseURL,
|
|
77
|
-
system: agent === null || agent === void 0 ? void 0 : agent.metadata.systemPrompt,
|
|
82
|
+
...this.getRequestOptions(),
|
|
78
83
|
}, token);
|
|
79
84
|
(0, stream_1.listenReadable)(stream, {
|
|
80
85
|
onData: (data) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat-proxy.service.js","sourceRoot":"","sources":["../../../src/browser/chat/chat-proxy.service.ts"],"names":[],"mappings":";;;;;AAAA,qCAAqD;AACrD,iEAA0E;AAC1E,+DAamC;AACnC,gFAA6F;AAC7F,6GAAgH;AAChH,uDAAwD;AACxD,2DAAgE;AAEhE,yCAOsB;AACtB,iEAA8D;AAG9D,yDAAiD;AACjD,mEAA8D;AAE9D;;GAEG;AAEI,IAAM,gBAAgB,wBAAtB,MAAM,gBAAiB,SAAQ,4BAAU;IAAzC;;QAqCG,iBAAY,GAAmB,IAAI,0BAAQ,EAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"chat-proxy.service.js","sourceRoot":"","sources":["../../../src/browser/chat/chat-proxy.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llm-context.service.d.ts","sourceRoot":"","sources":["../../../src/browser/context/llm-context.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,gEAAgE,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAE,MAAM,yDAAyD,CAAC;AAEvF,OAAO,EAAW,GAAG,EAAE,MAAM,qCAAqC,CAAC;AACnE,OAAO,EAIL,2BAA2B,EAC5B,MAAM,kDAAkD,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"llm-context.service.d.ts","sourceRoot":"","sources":["../../../src/browser/context/llm-context.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,gEAAgE,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAE,MAAM,yDAAyD,CAAC;AAEvF,OAAO,EAAW,GAAG,EAAE,MAAM,qCAAqC,CAAC;AACnE,OAAO,EAIL,2BAA2B,EAC5B,MAAM,kDAAkD,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAGxE,OAAO,EAAqB,WAAW,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAEhH,qBACa,qBAAsB,SAAQ,YAAa,YAAW,iBAAiB;IAElF,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAGxC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,2BAA2B,CAAC;IAGhE,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,cAAc,CAAC;IAEjD,OAAO,CAAC,gBAAgB,CAAS;IAEjC,OAAO,CAAC,cAAc,CAAK;IAE3B,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAM;IAC1C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAM;IACxC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAqB;IACnD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqB;IACvD,OAAO,CAAC,QAAQ,CAAC,8BAA8B,CAI1C;IACL,4BAA4B;gBAJlB,WAAW,EAAE;kBACX,WAAW,EAAE;iBACd,MAAM;OAEwD;IAEzE,OAAO,CAAC,aAAa;IAYrB,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,QAAQ,UAAQ,GAAG,IAAI;IAiBhF,OAAO,CAAC,mBAAmB;IAI3B,gBAAgB;IAKhB,OAAO,CAAC,kBAAkB;IAQ1B,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,UAAQ,GAAG,IAAI;IASvD,mBAAmB,IAAI,IAAI;IAS3B,OAAO,CAAC,2BAA2B;IAmDnC,kBAAkB,IAAI,IAAI;IAI1B,SAAS,IAAI,iBAAiB;IAU9B,OAAO,CAAC,0BAA0B;IAMlC,OAAO,CAAC,sBAAsB;IAM9B,OAAO,CAAC,qBAAqB;IAoB7B,OAAO,CAAC,aAAa;CAStB"}
|
|
@@ -10,6 +10,7 @@ const utils_1 = require("@opensumi/ide-core-common/lib/utils");
|
|
|
10
10
|
const types_1 = require("@opensumi/ide-editor/lib/browser/doc-model/types");
|
|
11
11
|
const types_2 = require("@opensumi/ide-editor/lib/browser/types");
|
|
12
12
|
const types_3 = require("@opensumi/ide-markers/lib/common/types");
|
|
13
|
+
const ide_monaco_1 = require("@opensumi/ide-monaco");
|
|
13
14
|
let LLMContextServiceImpl = class LLMContextServiceImpl extends event_decorator_1.WithEventBus {
|
|
14
15
|
constructor() {
|
|
15
16
|
super(...arguments);
|
|
@@ -136,7 +137,7 @@ let LLMContextServiceImpl = class LLMContextServiceImpl extends event_decorator_
|
|
|
136
137
|
return null;
|
|
137
138
|
}
|
|
138
139
|
return {
|
|
139
|
-
content: ref.instance.getText(),
|
|
140
|
+
content: ref.instance.getText(file.selection && new ide_monaco_1.Range(file.selection[0], Infinity, file.selection[1], Infinity)),
|
|
140
141
|
lineErrors: this.getFileErrors(file.uri),
|
|
141
142
|
path: workspaceRoot.relative(file.uri).toString(),
|
|
142
143
|
language: ref.instance.languageId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llm-context.service.js","sourceRoot":"","sources":["../../../src/browser/context/llm-context.service.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,oGAA2F;AAC3F,6FAAuF;AACvF,iFAAqF;AACrF,+DAAmE;AACnE,4EAK0D;AAC1D,kEAAoF;AACpF,kEAAwE;
|
|
1
|
+
{"version":3,"file":"llm-context.service.js","sourceRoot":"","sources":["../../../src/browser/context/llm-context.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAGL,qBAAqB,EACrB,aAAa,EASd,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAGL,qBAAqB,EACrB,aAAa,EASd,MAAM,4BAA4B,CAAC;AAgEpC,qBACa,cAAe,SAAQ,aAAa;IAE/C,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,qBAAqB,CAAC;;IAOzD,oBAAoB,WAAqD;IACzE,SAAS,EAAE,QAAQ,EAAE,CAsHnB;IAEF,YAAY;;;;;;;;;;;;SAcV;CACH"}
|
package/lib/browser/index.js
CHANGED
|
@@ -10,6 +10,7 @@ const llm_context_1 = require("../common/llm-context");
|
|
|
10
10
|
const mcp_server_manager_1 = require("../common/mcp-server-manager");
|
|
11
11
|
const context_prompt_provider_1 = require("../common/prompts/context-prompt-provider");
|
|
12
12
|
const ai_core_contribution_1 = require("./ai-core.contribution");
|
|
13
|
+
const apply_service_1 = require("./chat/apply.service");
|
|
13
14
|
const chat_agent_service_1 = require("./chat/chat-agent.service");
|
|
14
15
|
const chat_agent_view_service_1 = require("./chat/chat-agent.view.service");
|
|
15
16
|
const chat_manager_service_1 = require("./chat/chat-manager.service");
|
|
@@ -32,6 +33,7 @@ const rename_feature_registry_1 = require("./contrib/rename/rename.feature.regis
|
|
|
32
33
|
const terminal_ai_contributon_1 = require("./contrib/terminal/terminal-ai.contributon");
|
|
33
34
|
const terminal_feature_registry_1 = require("./contrib/terminal/terminal.feature.registry");
|
|
34
35
|
const service_1 = require("./languages/service");
|
|
36
|
+
const base_apply_service_1 = require("./mcp/base-apply.service");
|
|
35
37
|
const mcp_config_commands_1 = require("./mcp/config/mcp-config.commands");
|
|
36
38
|
const mcp_config_contribution_1 = require("./mcp/config/mcp-config.contribution");
|
|
37
39
|
const mcp_server_proxy_service_1 = require("./mcp/mcp-server-proxy.service");
|
|
@@ -165,6 +167,10 @@ let AINativeModule = class AINativeModule extends ide_core_browser_1.BrowserModu
|
|
|
165
167
|
token: context_prompt_provider_1.ChatAgentPromptProvider,
|
|
166
168
|
useClass: context_prompt_provider_1.DefaultChatAgentPromptProvider,
|
|
167
169
|
},
|
|
170
|
+
{
|
|
171
|
+
token: base_apply_service_1.BaseApplyService,
|
|
172
|
+
useClass: apply_service_1.ApplyService,
|
|
173
|
+
},
|
|
168
174
|
];
|
|
169
175
|
this.backServices = [
|
|
170
176
|
{
|
package/lib/browser/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;
|
|
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;AAe3C,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EA2OjC,CAAC"}
|
|
@@ -16,11 +16,12 @@ const mcp_server_form_1 = require("./mcp-server-form");
|
|
|
16
16
|
const MCPConfigView = () => {
|
|
17
17
|
const mcpServerProxyService = (0, ide_core_browser_1.useInjectable)(mcp_server_proxy_service_1.MCPServerProxyService);
|
|
18
18
|
const preferenceService = (0, ide_core_browser_1.useInjectable)(preferences_1.PreferenceService);
|
|
19
|
+
const sumiMCPServerBackendProxy = (0, ide_core_browser_1.useInjectable)(common_1.SumiMCPServerProxyServicePath);
|
|
19
20
|
const logger = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.ILogger);
|
|
20
21
|
const [servers, setServers] = react_1.default.useState([]);
|
|
21
22
|
const [formVisible, setFormVisible] = react_1.default.useState(false);
|
|
22
23
|
const [editingServer, setEditingServer] = react_1.default.useState();
|
|
23
|
-
const loadServers = react_1.
|
|
24
|
+
const loadServers = (0, react_1.useCallback)(async () => {
|
|
24
25
|
const allServers = await mcpServerProxyService.$getServers();
|
|
25
26
|
setServers(allServers);
|
|
26
27
|
}, [mcpServerProxyService]);
|
|
@@ -32,8 +33,8 @@ const MCPConfigView = () => {
|
|
|
32
33
|
return () => {
|
|
33
34
|
disposer.dispose();
|
|
34
35
|
};
|
|
35
|
-
}, [
|
|
36
|
-
const handleServerControl = async (serverName, start) => {
|
|
36
|
+
}, []);
|
|
37
|
+
const handleServerControl = (0, react_1.useCallback)(async (serverName, start) => {
|
|
37
38
|
try {
|
|
38
39
|
if (start) {
|
|
39
40
|
await mcpServerProxyService.$startServer(serverName);
|
|
@@ -85,26 +86,27 @@ const MCPConfigView = () => {
|
|
|
85
86
|
catch (error) {
|
|
86
87
|
logger.error(`Failed to ${start ? 'start' : 'stop'} server ${serverName}:`, error);
|
|
87
88
|
}
|
|
88
|
-
};
|
|
89
|
-
const handleAddServer = () => {
|
|
89
|
+
}, [mcpServerProxyService, preferenceService, sumiMCPServerBackendProxy, loadServers]);
|
|
90
|
+
const handleAddServer = (0, react_1.useCallback)(() => {
|
|
90
91
|
setEditingServer(undefined);
|
|
91
92
|
setFormVisible(true);
|
|
92
|
-
};
|
|
93
|
-
const handleEditServer = (server) => {
|
|
93
|
+
}, [editingServer, formVisible]);
|
|
94
|
+
const handleEditServer = (0, react_1.useCallback)((server) => {
|
|
94
95
|
const servers = preferenceService.get(ide_core_browser_1.AINativeSettingSectionsId.MCPServers, []);
|
|
95
96
|
const serverConfig = servers.find((s) => s.name === server.name);
|
|
96
97
|
if (serverConfig) {
|
|
97
98
|
setEditingServer(serverConfig);
|
|
98
99
|
setFormVisible(true);
|
|
99
100
|
}
|
|
100
|
-
};
|
|
101
|
-
const handleDeleteServer = async (serverName) => {
|
|
101
|
+
}, [editingServer, formVisible]);
|
|
102
|
+
const handleDeleteServer = (0, react_1.useCallback)(async (serverName) => {
|
|
102
103
|
const servers = preferenceService.get(ide_core_browser_1.AINativeSettingSectionsId.MCPServers, []);
|
|
103
104
|
const updatedServers = servers.filter((s) => s.name !== serverName);
|
|
105
|
+
sumiMCPServerBackendProxy.removeServer(serverName);
|
|
104
106
|
await preferenceService.set(ide_core_browser_1.AINativeSettingSectionsId.MCPServers, updatedServers);
|
|
105
107
|
await loadServers();
|
|
106
|
-
};
|
|
107
|
-
const handleSaveServer = async (data) => {
|
|
108
|
+
}, [editingServer, formVisible]);
|
|
109
|
+
const handleSaveServer = (0, react_1.useCallback)(async (data) => {
|
|
108
110
|
const servers = preferenceService.get(ide_core_browser_1.AINativeSettingSectionsId.MCPServers, []);
|
|
109
111
|
const existingIndex = servers.findIndex((s) => s.name === data.name);
|
|
110
112
|
if (existingIndex >= 0) {
|
|
@@ -113,10 +115,12 @@ const MCPConfigView = () => {
|
|
|
113
115
|
else {
|
|
114
116
|
servers.push(data);
|
|
115
117
|
}
|
|
116
|
-
|
|
118
|
+
setServers(servers);
|
|
117
119
|
setFormVisible(false);
|
|
120
|
+
await sumiMCPServerBackendProxy.addOrUpdateServer(data);
|
|
121
|
+
await preferenceService.set(ide_core_browser_1.AINativeSettingSectionsId.MCPServers, servers);
|
|
118
122
|
await loadServers();
|
|
119
|
-
};
|
|
123
|
+
}, [servers, formVisible, loadServers]);
|
|
120
124
|
const getReadableServerType = (0, react_1.useCallback)((type) => {
|
|
121
125
|
switch (type) {
|
|
122
126
|
case types_1.MCP_SERVER_TYPE.STDIO:
|
|
@@ -165,7 +169,7 @@ const MCPConfigView = () => {
|
|
|
165
169
|
react_1.default.createElement("div", { className: mcp_config_module_less_1.default.detailRow },
|
|
166
170
|
react_1.default.createElement("span", { className: mcp_config_module_less_1.default.detailLabel }, "Server Link:"),
|
|
167
171
|
react_1.default.createElement("span", { className: (0, classnames_1.default)(mcp_config_module_less_1.default.detailContent, mcp_config_module_less_1.default.link) }, server.serverHost)))))))),
|
|
168
|
-
react_1.default.createElement(mcp_server_form_1.MCPServerForm, { visible: formVisible, initialData: editingServer, onSave: handleSaveServer, onCancel: () => setFormVisible(false) })));
|
|
172
|
+
react_1.default.createElement(mcp_server_form_1.MCPServerForm, { visible: formVisible, initialData: editingServer, servers: servers, onSave: handleSaveServer, onCancel: () => setFormVisible(false) })));
|
|
169
173
|
};
|
|
170
174
|
exports.MCPConfigView = MCPConfigView;
|
|
171
175
|
//# sourceMappingURL=mcp-config.view.js.map
|
|
@@ -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,6DAAiD;AACjD,iEAA+F;AAC/F,4EAA+E;AAC/E,+DAAqD;AAErD,+
|
|
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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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import
|
|
2
|
-
import { MCP_SERVER_TYPE } from '../../../../common/types';
|
|
1
|
+
import { FC } from 'react';
|
|
2
|
+
import { MCPServer, MCP_SERVER_TYPE } from '../../../../common/types';
|
|
3
3
|
export interface MCPServerFormData {
|
|
4
4
|
name: string;
|
|
5
5
|
command?: string;
|
|
@@ -11,9 +11,10 @@ export interface MCPServerFormData {
|
|
|
11
11
|
interface Props {
|
|
12
12
|
visible: boolean;
|
|
13
13
|
initialData?: MCPServerFormData;
|
|
14
|
+
servers: MCPServer[];
|
|
14
15
|
onSave: (data: MCPServerFormData) => void;
|
|
15
16
|
onCancel: () => void;
|
|
16
17
|
}
|
|
17
|
-
export declare const MCPServerForm:
|
|
18
|
+
export declare const MCPServerForm: FC<Props>;
|
|
18
19
|
export {};
|
|
19
20
|
//# sourceMappingURL=mcp-server-form.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-server-form.d.ts","sourceRoot":"","sources":["../../../../../src/browser/mcp/config/components/mcp-server-form.tsx"],"names":[],"mappings":"AACA,
|
|
1
|
+
{"version":3,"file":"mcp-server-form.d.ts","sourceRoot":"","sources":["../../../../../src/browser/mcp/config/components/mcp-server-form.tsx"],"names":[],"mappings":"AACA,OAAc,EAAe,EAAE,EAA+C,MAAM,OAAO,CAAC;AAS5F,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAGtE,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,IAAI,EAAE,eAAe,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,UAAU,KAAK;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAChC,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,MAAM,EAAE,CAAC,IAAI,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC1C,QAAQ,EAAE,MAAM,IAAI,CAAC;CACtB;AAED,eAAO,MAAM,aAAa,EAAE,EAAE,CAAC,KAAK,CAuOnC,CAAC"}
|
|
@@ -7,11 +7,13 @@ const react_1 = tslib_1.__importStar(require("react"));
|
|
|
7
7
|
const ide_components_1 = require("@opensumi/ide-components");
|
|
8
8
|
const button_1 = require("@opensumi/ide-components/lib/button");
|
|
9
9
|
const modal_1 = require("@opensumi/ide-components/lib/modal");
|
|
10
|
+
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
10
11
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
12
|
+
const ide_overlay_1 = require("@opensumi/ide-overlay");
|
|
11
13
|
const types_1 = require("../../../../common/types");
|
|
12
14
|
const mcp_server_form_module_less_1 = tslib_1.__importDefault(require("./mcp-server-form.module.less"));
|
|
13
|
-
const MCPServerForm = ({ visible, initialData, onSave, onCancel }) => {
|
|
14
|
-
const [formData, setFormData] = react_1.
|
|
15
|
+
const MCPServerForm = ({ visible, initialData, onSave, onCancel, servers: existingServers }) => {
|
|
16
|
+
const [formData, setFormData] = (0, react_1.useState)(() => ({
|
|
15
17
|
name: '',
|
|
16
18
|
command: '',
|
|
17
19
|
args: [],
|
|
@@ -19,8 +21,9 @@ const MCPServerForm = ({ visible, initialData, onSave, onCancel }) => {
|
|
|
19
21
|
type: types_1.MCP_SERVER_TYPE.STDIO,
|
|
20
22
|
...initialData,
|
|
21
23
|
}));
|
|
22
|
-
const
|
|
23
|
-
const [
|
|
24
|
+
const messageService = (0, ide_core_browser_1.useInjectable)(ide_overlay_1.IMessageService);
|
|
25
|
+
const [argsText, setArgsText] = (0, react_1.useState)(() => { var _a; return ((_a = initialData === null || initialData === void 0 ? void 0 : initialData.args) === null || _a === void 0 ? void 0 : _a.join(' ')) || ''; });
|
|
26
|
+
const [envText, setEnvText] = (0, react_1.useState)(() => {
|
|
24
27
|
if (!(initialData === null || initialData === void 0 ? void 0 : initialData.env)) {
|
|
25
28
|
return '';
|
|
26
29
|
}
|
|
@@ -28,7 +31,7 @@ const MCPServerForm = ({ visible, initialData, onSave, onCancel }) => {
|
|
|
28
31
|
.map(([key, value]) => `${key}=${value}`)
|
|
29
32
|
.join('\n');
|
|
30
33
|
});
|
|
31
|
-
react_1.
|
|
34
|
+
(0, react_1.useEffect)(() => {
|
|
32
35
|
var _a;
|
|
33
36
|
setFormData({
|
|
34
37
|
name: '',
|
|
@@ -48,6 +51,10 @@ const MCPServerForm = ({ visible, initialData, onSave, onCancel }) => {
|
|
|
48
51
|
const handleSubmit = (e) => {
|
|
49
52
|
var _a;
|
|
50
53
|
e.preventDefault();
|
|
54
|
+
const isValid = validateForm(formData);
|
|
55
|
+
if (!isValid) {
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
51
58
|
const form = {
|
|
52
59
|
...formData,
|
|
53
60
|
};
|
|
@@ -73,7 +80,6 @@ const MCPServerForm = ({ visible, initialData, onSave, onCancel }) => {
|
|
|
73
80
|
};
|
|
74
81
|
const handleCommandChange = (0, react_1.useCallback)((e) => {
|
|
75
82
|
setFormData({ ...formData, command: e.target.value });
|
|
76
|
-
setArgsText(e.target.value.split(' ').filter(Boolean).join(' '));
|
|
77
83
|
}, [formData, argsText]);
|
|
78
84
|
const handleArgsChange = (0, react_1.useCallback)((e) => {
|
|
79
85
|
setArgsText(e.target.value);
|
|
@@ -107,6 +113,29 @@ const MCPServerForm = ({ visible, initialData, onSave, onCancel }) => {
|
|
|
107
113
|
react_1.default.createElement("textarea", { value: formData.serverHost, onChange: handleServerHostChange, placeholder: (0, ide_core_common_1.localize)('ai.native.mcp.serverHost.placeHolder'), rows: 3 }))));
|
|
108
114
|
}
|
|
109
115
|
}, [formData, argsText, envText]);
|
|
116
|
+
const validateForm = (0, react_1.useCallback)((formData) => {
|
|
117
|
+
var _a, _b;
|
|
118
|
+
if (formData.name.trim() === '') {
|
|
119
|
+
messageService.error((0, ide_core_common_1.localize)('ai.native.mcp.name.isRequired'));
|
|
120
|
+
return false;
|
|
121
|
+
}
|
|
122
|
+
if (existingServers.some((server) => server.name.toLocaleLowerCase() === formData.name.toLocaleLowerCase())) {
|
|
123
|
+
messageService.error((0, ide_core_common_1.formatLocalize)('ai.native.mcp.serverNameExists', formData.name));
|
|
124
|
+
return false;
|
|
125
|
+
}
|
|
126
|
+
if (formData.type === types_1.MCP_SERVER_TYPE.SSE) {
|
|
127
|
+
const isServerHostValid = ((_a = formData.serverHost) === null || _a === void 0 ? void 0 : _a.trim()) !== '';
|
|
128
|
+
if (!isServerHostValid) {
|
|
129
|
+
messageService.error((0, ide_core_common_1.localize)('ai.native.mcp.serverHost.isRequired'));
|
|
130
|
+
}
|
|
131
|
+
return isServerHostValid;
|
|
132
|
+
}
|
|
133
|
+
const isCommandValid = ((_b = formData.command) === null || _b === void 0 ? void 0 : _b.trim()) !== '';
|
|
134
|
+
if (!isCommandValid) {
|
|
135
|
+
messageService.error((0, ide_core_common_1.localize)('ai.native.mcp.command.isRequired'));
|
|
136
|
+
}
|
|
137
|
+
return isCommandValid;
|
|
138
|
+
}, [existingServers]);
|
|
110
139
|
return (react_1.default.createElement(modal_1.Modal, { title: initialData ? (0, ide_core_common_1.localize)('ai.native.mcp.editMCPServer.title') : (0, ide_core_common_1.localize)('ai.native.mcp.addMCPServer.title'), visible: visible, onCancel: onCancel, centered: true, width: 600, footer: null, style: {
|
|
111
140
|
background: 'var(--editor-background)',
|
|
112
141
|
} },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-server-form.js","sourceRoot":"","sources":["../../../../../src/browser/mcp/config/components/mcp-server-form.tsx"],"names":[],"mappings":";;;;AAAA,oEAA6B;AAC7B,
|
|
1
|
+
{"version":3,"file":"mcp-server-form.js","sourceRoot":"","sources":["../../../../../src/browser/mcp/config/components/mcp-server-form.tsx"],"names":[],"mappings":"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"}
|
package/lib/common/index.d.ts
CHANGED
|
@@ -99,6 +99,8 @@ export interface ISumiMCPServerBackend {
|
|
|
99
99
|
}>>;
|
|
100
100
|
startServer(serverName: string): Promise<void>;
|
|
101
101
|
stopServer(serverName: string): Promise<void>;
|
|
102
|
+
addOrUpdateServer(description: MCPServerDescription): void;
|
|
103
|
+
removeServer(name: string): void;
|
|
102
104
|
}
|
|
103
105
|
export declare const SumiMCPServerProxyServicePath = "SumiMCPServerProxyServicePath";
|
|
104
106
|
export interface IChatAgentService {
|