@theia/plugin-ext 1.64.0-next.0 → 1.64.0-next.28
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/main/browser/lm-main.d.ts +1 -1
- package/lib/main/browser/lm-main.d.ts.map +1 -1
- package/lib/main/browser/lm-main.js +28 -6
- package/lib/main/browser/lm-main.js.map +1 -1
- package/lib/plugin/lm-ext.js +1 -1
- package/lib/plugin/lm-ext.js.map +1 -1
- package/package.json +29 -29
- package/src/main/browser/lm-main.ts +30 -6
- package/src/plugin/lm-ext.ts +1 -1
|
@@ -7,7 +7,7 @@ export declare class McpServerDefinitionRegistryMainImpl implements McpServerDef
|
|
|
7
7
|
private readonly mcpServerManager;
|
|
8
8
|
constructor(rpc: RPCProtocol, container: interfaces.Container);
|
|
9
9
|
$registerMcpServerDefinitionProvider(handle: number, name: string): void;
|
|
10
|
-
$unregisterMcpServerDefinitionProvider(handle: number): void
|
|
10
|
+
$unregisterMcpServerDefinitionProvider(handle: number): Promise<void>;
|
|
11
11
|
$onDidChangeMcpServerDefinitions(handle: number): void;
|
|
12
12
|
$getServerDefinitions(handle: number): Promise<McpServerDefinitionDto[]>;
|
|
13
13
|
$resolveServerDefinition(handle: number, server: McpServerDefinitionDto): Promise<McpServerDefinitionDto | undefined>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lm-main.d.ts","sourceRoot":"","sources":["../../../src/main/browser/lm-main.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EACH,+BAA+B,EAE/B,sBAAsB,EAEzB,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"lm-main.d.ts","sourceRoot":"","sources":["../../../src/main/browser/lm-main.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EACH,+BAA+B,EAE/B,sBAAsB,EAEzB,MAAM,0BAA0B,CAAC;AAKlC,qBAAa,mCAAoC,YAAW,+BAA+B;IACvF,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiC;IACvD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA6B;IACvD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA+B;gBAG5D,GAAG,EAAE,WAAW,EAChB,SAAS,EAAE,UAAU,CAAC,SAAS;IAWnC,oCAAoC,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAKlE,sCAAsC,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB3E,gCAAgC,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAKhD,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC;IASxE,wBAAwB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,sBAAsB,GAAG,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;YAS7G,qBAAqB;IAqBnC,OAAO,CAAC,6BAA6B;CAwCxC"}
|
|
@@ -19,6 +19,7 @@ exports.McpServerDefinitionRegistryMainImpl = void 0;
|
|
|
19
19
|
const lm_protocol_1 = require("../../common/lm-protocol");
|
|
20
20
|
const plugin_api_rpc_1 = require("../../common/plugin-api-rpc");
|
|
21
21
|
const common_1 = require("@theia/ai-mcp/lib/common");
|
|
22
|
+
const core_1 = require("@theia/core");
|
|
22
23
|
class McpServerDefinitionRegistryMainImpl {
|
|
23
24
|
constructor(rpc, container) {
|
|
24
25
|
this.providers = new Map();
|
|
@@ -35,7 +36,7 @@ class McpServerDefinitionRegistryMainImpl {
|
|
|
35
36
|
this.providers.set(handle, name);
|
|
36
37
|
this.loadServerDefinitions(handle);
|
|
37
38
|
}
|
|
38
|
-
$unregisterMcpServerDefinitionProvider(handle) {
|
|
39
|
+
async $unregisterMcpServerDefinitionProvider(handle) {
|
|
39
40
|
if (!this.mcpServerManager) {
|
|
40
41
|
console.warn('MCP Server Manager not available - MCP server definitions will not be loaded');
|
|
41
42
|
return;
|
|
@@ -45,7 +46,16 @@ class McpServerDefinitionRegistryMainImpl {
|
|
|
45
46
|
console.warn(`No MCP Server provider found for handle '${handle}' - MCP server definitions will not be loaded`);
|
|
46
47
|
return;
|
|
47
48
|
}
|
|
48
|
-
this
|
|
49
|
+
// Get all servers provided by this provider and remove them server by server
|
|
50
|
+
try {
|
|
51
|
+
const definitions = await this.$getServerDefinitions(handle);
|
|
52
|
+
for (const definition of definitions) {
|
|
53
|
+
this.mcpServerManager.removeServer(definition.label);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
catch (error) {
|
|
57
|
+
console.error('Error getting server definitions for removal:', error);
|
|
58
|
+
}
|
|
49
59
|
this.providers.delete(handle);
|
|
50
60
|
}
|
|
51
61
|
$onDidChangeMcpServerDefinitions(handle) {
|
|
@@ -91,10 +101,22 @@ class McpServerDefinitionRegistryMainImpl {
|
|
|
91
101
|
}
|
|
92
102
|
convertToMcpServerDescription(definition) {
|
|
93
103
|
if ((0, lm_protocol_1.isMcpHttpServerDefinitionDto)(definition)) {
|
|
94
|
-
//
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
104
|
+
// Convert headers values to strings, filtering out null values
|
|
105
|
+
let convertedHeaders;
|
|
106
|
+
if (definition.headers) {
|
|
107
|
+
convertedHeaders = {};
|
|
108
|
+
for (const [key, value] of Object.entries(definition.headers)) {
|
|
109
|
+
if (value !== null) {
|
|
110
|
+
convertedHeaders[key] = String(value);
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
return {
|
|
115
|
+
name: definition.label,
|
|
116
|
+
serverUrl: core_1.URI.fromComponents(definition.uri).toString(),
|
|
117
|
+
headers: convertedHeaders,
|
|
118
|
+
autostart: false, // Extensions should manage their own server lifecycle
|
|
119
|
+
};
|
|
98
120
|
}
|
|
99
121
|
// Convert env values to strings, filtering out null values
|
|
100
122
|
let convertedEnv;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lm-main.js","sourceRoot":"","sources":["../../../src/main/browser/lm-main.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,mCAAmC;AACnC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAIhF,0DAKkC;AAClC,gEAA+D;AAC/D,qDAAkF;
|
|
1
|
+
{"version":3,"file":"lm-main.js","sourceRoot":"","sources":["../../../src/main/browser/lm-main.ts"],"names":[],"mappings":"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"}
|
package/lib/plugin/lm-ext.js
CHANGED
|
@@ -123,7 +123,7 @@ class LmExtImpl {
|
|
|
123
123
|
};
|
|
124
124
|
}
|
|
125
125
|
registerMcpContributions(mcpContributions) {
|
|
126
|
-
this.announcedMCPProviders
|
|
126
|
+
this.announcedMCPProviders.push(...mcpContributions.map(contribution => contribution.id));
|
|
127
127
|
}
|
|
128
128
|
}
|
|
129
129
|
exports.LmExtImpl = LmExtImpl;
|
package/lib/plugin/lm-ext.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lm-ext.js","sourceRoot":"","sources":["../../src/plugin/lm-ext.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"lm-ext.js","sourceRoot":"","sources":["../../src/plugin/lm-ext.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,oCAAoC;AACpC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAGhF,kEAA+D;AAE/D,uDAK+B;AAC/B,6DAA8D;AAE9D,qCAAwC;AACxC,6CAAiF;AASjF,MAAa,SAAS;IASlB,YAA+B,GAAgB;QAAhB,QAAG,GAAH,GAAG,CAAa;QAL9B,cAAS,GAAG,IAAI,GAAG,EAAuC,CAAC;QAC3D,4BAAuB,GAAG,IAAI,GAAG,EAAsB,CAAC;QACjE,kBAAa,GAAG,CAAC,CAAC;QAClB,0BAAqB,GAAa,EAAE,CAAC;QAGzC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,mCAAkB,CAAC,mCAAmC,CAAC,CAAC;QACvF,IAAI,CAAC,MAAM,GAAG,IAAI,qBAAY,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACnD,CAAC;IAED,mCAAmC,CAAC,EAAU,EAAE,QAAqC;QACjF,IAAI,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YAChD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,4EAA4E,EAAE,EAAE,CAAC,CAAC;QACvG,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QACpC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAErC,IAAI,CAAC,KAAK,CAAC,oCAAoC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAE5D,IAAI,QAAQ,CAAC,+BAA+B,EAAE,CAAC;YAC3C,MAAM,cAAc,GAAG,QAAQ,CAAC,+BAA+B,CAAC,GAAG,EAAE;gBACjE,IAAI,CAAC,KAAK,CAAC,gCAAgC,CAAC,MAAM,CAAC,CAAC;YACxD,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;QAC7D,CAAC;QAED,OAAO,uBAAU,CAAC,MAAM,CAAC,GAAG,EAAE;YAC1B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC9B,MAAM,cAAc,GAAG,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAChE,IAAI,cAAc,EAAE,CAAC;gBACjB,cAAc,CAAC,OAAO,EAAE,CAAC;gBACzB,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAChD,CAAC;YACD,IAAI,CAAC,KAAK,CAAC,sCAAsC,CAAC,MAAM,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,MAAc;QAC1C,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,OAAO,EAAE,CAAC;QACd,CAAC;QAED,IAAI,CAAC;YACD,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,2BAA2B,EAAE,CAAC;YACjE,IAAI,CAAC,WAAW,EAAE,CAAC;gBACf,OAAO,EAAE,CAAC;YACd,CAAC;YAED,OAAO,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yCAAyC,EAAE,KAAK,CAAC,CAAC;YACpE,OAAO,EAAE,CAAC;QACd,CAAC;IACL,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,MAAc,EAAE,MAA8B;QACzE,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,0BAA0B,EAAE,CAAC;YACpD,OAAO,MAAM,CAAC;QAClB,CAAC;QAED,IAAI,CAAC;YACD,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAC/C,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,0BAA0B,CAAC,UAAU,CAAC,CAAC;YACvE,OAAO,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC9D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wCAAwC,EAAE,KAAK,CAAC,CAAC;YACnE,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAEO,YAAY,CAAC,UAA+B;QAChD,IAAI,yBAAyB,CAAC,UAAU,CAAC,EAAE,CAAC;YACxC,OAAO;gBACH,KAAK,EAAE,UAAU,CAAC,KAAK;gBACvB,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,GAAG,EAAE,UAAU,CAAC,GAAG;gBACnB,OAAO,EAAE,UAAU,CAAC,OAAO;aAC9B,CAAC;QACN,CAAC;QACD,OAAO;YACH,OAAO,EAAE,UAAU,CAAC,OAAO;YAC3B,IAAI,EAAE,UAAU,CAAC,IAAI;YACrB,GAAG,EAAE,UAAU,CAAC,GAAG;YACnB,OAAO,EAAE,UAAU,CAAC,OAAO;YAC3B,KAAK,EAAE,UAAU,CAAC,KAAK;YACvB,GAAG,EAAE,UAAU,CAAC,GAAG;SACtB,CAAC;IACN,CAAC;IAEO,cAAc,CAAC,GAA2B;QAC9C,IAAI,IAAA,0CAA4B,EAAC,GAAG,CAAC,EAAE,CAAC;YACpC,OAAO;gBACH,KAAK,EAAE,GAAG,CAAC,KAAK;gBAChB,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,GAAG,EAAE,gBAAG,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC;gBACxB,OAAO,EAAE,GAAG,CAAC,OAAO;aACvB,CAAC;QACN,CAAC;QACD,OAAO;YACH,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,GAAG,EAAE,gBAAG,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC;YACxB,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,GAAG,EAAE,GAAG,CAAC,GAAG;SACf,CAAC;IACN,CAAC;IAED,wBAAwB,CAAC,gBAAwE;QAC7F,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC;IAC9F,CAAC;CACJ;AArHD,8BAqHC;AAED,MAAM,yBAAyB,GAAG,CAAC,UAA+B,EAAyC,EAAE,CAAC,KAAK,IAAI,UAAU,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,38 +1,38 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/plugin-ext",
|
|
3
|
-
"version": "1.64.0-next.
|
|
3
|
+
"version": "1.64.0-next.28+c0fda4c47",
|
|
4
4
|
"description": "Theia - Plugin Extension",
|
|
5
5
|
"main": "lib/common/index.js",
|
|
6
6
|
"typings": "lib/common/index.d.ts",
|
|
7
7
|
"dependencies": {
|
|
8
|
-
"@theia/ai-mcp": "1.64.0-next.
|
|
9
|
-
"@theia/bulk-edit": "1.64.0-next.
|
|
10
|
-
"@theia/callhierarchy": "1.64.0-next.
|
|
11
|
-
"@theia/console": "1.64.0-next.
|
|
12
|
-
"@theia/core": "1.64.0-next.
|
|
13
|
-
"@theia/debug": "1.64.0-next.
|
|
14
|
-
"@theia/editor": "1.64.0-next.
|
|
15
|
-
"@theia/editor-preview": "1.64.0-next.
|
|
16
|
-
"@theia/file-search": "1.64.0-next.
|
|
17
|
-
"@theia/filesystem": "1.64.0-next.
|
|
18
|
-
"@theia/markers": "1.64.0-next.
|
|
19
|
-
"@theia/messages": "1.64.0-next.
|
|
20
|
-
"@theia/monaco": "1.64.0-next.
|
|
8
|
+
"@theia/ai-mcp": "1.64.0-next.28+c0fda4c47",
|
|
9
|
+
"@theia/bulk-edit": "1.64.0-next.28+c0fda4c47",
|
|
10
|
+
"@theia/callhierarchy": "1.64.0-next.28+c0fda4c47",
|
|
11
|
+
"@theia/console": "1.64.0-next.28+c0fda4c47",
|
|
12
|
+
"@theia/core": "1.64.0-next.28+c0fda4c47",
|
|
13
|
+
"@theia/debug": "1.64.0-next.28+c0fda4c47",
|
|
14
|
+
"@theia/editor": "1.64.0-next.28+c0fda4c47",
|
|
15
|
+
"@theia/editor-preview": "1.64.0-next.28+c0fda4c47",
|
|
16
|
+
"@theia/file-search": "1.64.0-next.28+c0fda4c47",
|
|
17
|
+
"@theia/filesystem": "1.64.0-next.28+c0fda4c47",
|
|
18
|
+
"@theia/markers": "1.64.0-next.28+c0fda4c47",
|
|
19
|
+
"@theia/messages": "1.64.0-next.28+c0fda4c47",
|
|
20
|
+
"@theia/monaco": "1.64.0-next.28+c0fda4c47",
|
|
21
21
|
"@theia/monaco-editor-core": "1.96.302",
|
|
22
|
-
"@theia/navigator": "1.64.0-next.
|
|
23
|
-
"@theia/notebook": "1.64.0-next.
|
|
24
|
-
"@theia/output": "1.64.0-next.
|
|
25
|
-
"@theia/plugin": "1.64.0-next.
|
|
26
|
-
"@theia/preferences": "1.64.0-next.
|
|
27
|
-
"@theia/scm": "1.64.0-next.
|
|
28
|
-
"@theia/search-in-workspace": "1.64.0-next.
|
|
29
|
-
"@theia/task": "1.64.0-next.
|
|
30
|
-
"@theia/terminal": "1.64.0-next.
|
|
31
|
-
"@theia/test": "1.64.0-next.
|
|
32
|
-
"@theia/timeline": "1.64.0-next.
|
|
33
|
-
"@theia/typehierarchy": "1.64.0-next.
|
|
34
|
-
"@theia/variable-resolver": "1.64.0-next.
|
|
35
|
-
"@theia/workspace": "1.64.0-next.
|
|
22
|
+
"@theia/navigator": "1.64.0-next.28+c0fda4c47",
|
|
23
|
+
"@theia/notebook": "1.64.0-next.28+c0fda4c47",
|
|
24
|
+
"@theia/output": "1.64.0-next.28+c0fda4c47",
|
|
25
|
+
"@theia/plugin": "1.64.0-next.28+c0fda4c47",
|
|
26
|
+
"@theia/preferences": "1.64.0-next.28+c0fda4c47",
|
|
27
|
+
"@theia/scm": "1.64.0-next.28+c0fda4c47",
|
|
28
|
+
"@theia/search-in-workspace": "1.64.0-next.28+c0fda4c47",
|
|
29
|
+
"@theia/task": "1.64.0-next.28+c0fda4c47",
|
|
30
|
+
"@theia/terminal": "1.64.0-next.28+c0fda4c47",
|
|
31
|
+
"@theia/test": "1.64.0-next.28+c0fda4c47",
|
|
32
|
+
"@theia/timeline": "1.64.0-next.28+c0fda4c47",
|
|
33
|
+
"@theia/typehierarchy": "1.64.0-next.28+c0fda4c47",
|
|
34
|
+
"@theia/variable-resolver": "1.64.0-next.28+c0fda4c47",
|
|
35
|
+
"@theia/workspace": "1.64.0-next.28+c0fda4c47",
|
|
36
36
|
"@types/mime": "^2.0.1",
|
|
37
37
|
"@vscode/debugprotocol": "^1.51.0",
|
|
38
38
|
"@vscode/proxy-agent": "^0.13.2",
|
|
@@ -99,5 +99,5 @@
|
|
|
99
99
|
"nyc": {
|
|
100
100
|
"extends": "../../configs/nyc.json"
|
|
101
101
|
},
|
|
102
|
-
"gitHead": "
|
|
102
|
+
"gitHead": "c0fda4c4706fcd4ec1616c8e2f24673352a707d1"
|
|
103
103
|
}
|
|
@@ -24,6 +24,7 @@ import {
|
|
|
24
24
|
} from '../../common/lm-protocol';
|
|
25
25
|
import { MAIN_RPC_CONTEXT } from '../../common/plugin-api-rpc';
|
|
26
26
|
import { MCPServerManager, MCPServerDescription } from '@theia/ai-mcp/lib/common';
|
|
27
|
+
import { URI } from '@theia/core';
|
|
27
28
|
|
|
28
29
|
export class McpServerDefinitionRegistryMainImpl implements McpServerDefinitionRegistryMain {
|
|
29
30
|
private readonly proxy: McpServerDefinitionRegistryExt;
|
|
@@ -48,7 +49,7 @@ export class McpServerDefinitionRegistryMainImpl implements McpServerDefinitionR
|
|
|
48
49
|
this.loadServerDefinitions(handle);
|
|
49
50
|
}
|
|
50
51
|
|
|
51
|
-
$unregisterMcpServerDefinitionProvider(handle: number): void {
|
|
52
|
+
async $unregisterMcpServerDefinitionProvider(handle: number): Promise<void> {
|
|
52
53
|
if (!this.mcpServerManager) {
|
|
53
54
|
console.warn('MCP Server Manager not available - MCP server definitions will not be loaded');
|
|
54
55
|
return;
|
|
@@ -58,7 +59,17 @@ export class McpServerDefinitionRegistryMainImpl implements McpServerDefinitionR
|
|
|
58
59
|
console.warn(`No MCP Server provider found for handle '${handle}' - MCP server definitions will not be loaded`);
|
|
59
60
|
return;
|
|
60
61
|
}
|
|
61
|
-
|
|
62
|
+
|
|
63
|
+
// Get all servers provided by this provider and remove them server by server
|
|
64
|
+
try {
|
|
65
|
+
const definitions = await this.$getServerDefinitions(handle);
|
|
66
|
+
for (const definition of definitions) {
|
|
67
|
+
this.mcpServerManager.removeServer(definition.label);
|
|
68
|
+
}
|
|
69
|
+
} catch (error) {
|
|
70
|
+
console.error('Error getting server definitions for removal:', error);
|
|
71
|
+
}
|
|
72
|
+
|
|
62
73
|
this.providers.delete(handle);
|
|
63
74
|
}
|
|
64
75
|
|
|
@@ -108,10 +119,23 @@ export class McpServerDefinitionRegistryMainImpl implements McpServerDefinitionR
|
|
|
108
119
|
|
|
109
120
|
private convertToMcpServerDescription(definition: McpServerDefinitionDto): MCPServerDescription {
|
|
110
121
|
if (isMcpHttpServerDefinitionDto(definition)) {
|
|
111
|
-
//
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
122
|
+
// Convert headers values to strings, filtering out null values
|
|
123
|
+
let convertedHeaders: Record<string, string> | undefined;
|
|
124
|
+
if (definition.headers) {
|
|
125
|
+
convertedHeaders = {};
|
|
126
|
+
for (const [key, value] of Object.entries(definition.headers)) {
|
|
127
|
+
if (value !== null) {
|
|
128
|
+
convertedHeaders[key] = String(value);
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
return {
|
|
134
|
+
name: definition.label,
|
|
135
|
+
serverUrl: URI.fromComponents(definition.uri).toString(),
|
|
136
|
+
headers: convertedHeaders,
|
|
137
|
+
autostart: false, // Extensions should manage their own server lifecycle
|
|
138
|
+
};
|
|
115
139
|
}
|
|
116
140
|
|
|
117
141
|
// Convert env values to strings, filtering out null values
|
package/src/plugin/lm-ext.ts
CHANGED
|
@@ -150,7 +150,7 @@ export class LmExtImpl implements McpServerDefinitionRegistryExt {
|
|
|
150
150
|
}
|
|
151
151
|
|
|
152
152
|
registerMcpContributions(mcpContributions: PluginPackageMcpServerDefinitionProviderContribution[]): void {
|
|
153
|
-
this.announcedMCPProviders
|
|
153
|
+
this.announcedMCPProviders.push(...mcpContributions.map(contribution => contribution.id));
|
|
154
154
|
}
|
|
155
155
|
}
|
|
156
156
|
|