@opensumi/ide-ai-native 3.8.3-next-1745835516.0 → 3.8.3-next-1745835843.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/mcp/config/mcp-config.service.js +5 -5
- package/lib/browser/mcp/config/mcp-config.service.js.map +1 -1
- package/lib/browser/mcp/mcp-preferences.d.ts.map +1 -1
- package/lib/browser/mcp/mcp-preferences.js +20 -17
- package/lib/browser/mcp/mcp-preferences.js.map +1 -1
- package/package.json +24 -24
- package/src/browser/mcp/config/mcp-config.service.ts +6 -6
- package/src/browser/mcp/mcp-preferences.ts +20 -17
|
@@ -40,13 +40,13 @@ let MCPConfigService = class MCPConfigService extends ide_core_common_1.Disposab
|
|
|
40
40
|
}
|
|
41
41
|
async getServers() {
|
|
42
42
|
// Get workspace MCP server configurations
|
|
43
|
-
const { value: mcpConfig } = this.preferenceService.resolve('mcp', { mcpServers:
|
|
44
|
-
if (
|
|
43
|
+
const { value: mcpConfig, scope } = this.preferenceService.resolve('mcp', { mcpServers: [] }, undefined);
|
|
44
|
+
if (scope === ide_core_common_1.PreferenceScope.Default) {
|
|
45
45
|
const runningServers = await this.mcpServerProxyService.$getServers();
|
|
46
46
|
const builtinServer = runningServers.find((server) => server.name === common_1.BUILTIN_MCP_SERVER_NAME);
|
|
47
47
|
return builtinServer ? [builtinServer] : [];
|
|
48
48
|
}
|
|
49
|
-
const userServers = mcpConfig.mcpServers.map((server) => {
|
|
49
|
+
const userServers = mcpConfig === null || mcpConfig === void 0 ? void 0 : mcpConfig.mcpServers.map((server) => {
|
|
50
50
|
const name = Object.keys(server)[0];
|
|
51
51
|
const serverConfig = server[name];
|
|
52
52
|
if (serverConfig.url) {
|
|
@@ -67,7 +67,7 @@ let MCPConfigService = class MCPConfigService extends ide_core_common_1.Disposab
|
|
|
67
67
|
const runningServers = await this.mcpServerProxyService.$getServers();
|
|
68
68
|
const builtinServer = runningServers.find((server) => server.name === common_1.BUILTIN_MCP_SERVER_NAME);
|
|
69
69
|
// Merge server configs with running status
|
|
70
|
-
const allServers = userServers.map((server) => {
|
|
70
|
+
const allServers = userServers === null || userServers === void 0 ? void 0 : userServers.map((server) => {
|
|
71
71
|
const runningServer = runningServers.find((s) => s.name === server.name);
|
|
72
72
|
return {
|
|
73
73
|
...server,
|
|
@@ -110,7 +110,7 @@ let MCPConfigService = class MCPConfigService extends ide_core_common_1.Disposab
|
|
|
110
110
|
await this.whenReady;
|
|
111
111
|
const { value: mcpConfig } = this.preferenceService.resolve('mcp', { mcpServers: [] }, undefined);
|
|
112
112
|
const servers = mcpConfig.mcpServers;
|
|
113
|
-
const existingIndex = servers === null || servers === void 0 ? void 0 : servers.findIndex((s) => s
|
|
113
|
+
const existingIndex = servers === null || servers === void 0 ? void 0 : servers.findIndex((s) => Object.keys(s)[0] === data.name);
|
|
114
114
|
let serverConfig;
|
|
115
115
|
if (data.type === types_1.MCP_SERVER_TYPE.SSE) {
|
|
116
116
|
serverConfig = { [data.name]: { url: data.url } };
|
|
@@ -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,iEAAqD;AACrD,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;IA2B9C;QACE,KAAK,EAAE,CAAC;QALF,sBAAiB,GAAG,IAAI,0BAAQ,EAAQ,CAAC;QAEhC,iCAA4B,GAAG,IAAI,yBAAO,EAAW,CAAC;QAKrE,IAAI,CAAC,IAAI,EAAE,CAAC;QACZ,IAAI,CAAC,WAAW,CAAC,IAAI,CACnB,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,GAAG,EAAE;YACjD,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC9B,CAAC,CAAC,CACH,CAAC;QACF,IAAI,CAAC,WAAW,CAAC,IAAI,CACnB,IAAI,CAAC,iBAAiB,CAAC,0BAA0B,CAAC,KAAK,EAAE,GAAG,EAAE;YAC5D,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC9B,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,IAAI;QAChB,IAAI,CAAC,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,mCAAiB,CAAC,IAAI,CAAC,CAAC;QACtE,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,CAAC;IACnC,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC;IACxC,CAAC;IAED,IAAI,kBAAkB;QACpB,OAAO,IAAI,CAAC,4BAA4B,CAAC,KAAK,CAAC;IACjD,CAAC;IAED,oBAAoB,CAAC,SAAkB,KAAK;QAC1C,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,UAAU;QACd,0CAA0C;QAC1C,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,
|
|
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":"mcp-preferences.d.ts","sourceRoot":"","sources":["../../../src/browser/mcp/mcp-preferences.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAgB,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAEtE,eAAO,MAAM,YAAY,8BAA6B,CAAC;AAEvD,eAAO,MAAM,oBAAoB,EAAE,gBAUlC,CAAC;AAEF,eAAO,MAAM,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"mcp-preferences.d.ts","sourceRoot":"","sources":["../../../src/browser/mcp/mcp-preferences.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAgB,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAEtE,eAAO,MAAM,YAAY,8BAA6B,CAAC;AAEvD,eAAO,MAAM,oBAAoB,EAAE,gBAUlC,CAAC;AAEF,eAAO,MAAM,SAAS,EAAE,WAiCvB,CAAC"}
|
|
@@ -21,24 +21,27 @@ exports.MCPSchema = {
|
|
|
21
21
|
default: { mcpServers: [] },
|
|
22
22
|
properties: {
|
|
23
23
|
mcpServers: {
|
|
24
|
-
type: '
|
|
24
|
+
type: 'array',
|
|
25
25
|
description: 'List of MCP Servers. Add new servers or edit existing ones by using IntelliSense.',
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
26
|
+
items: {
|
|
27
|
+
type: 'object',
|
|
28
|
+
properties: {
|
|
29
|
+
command: {
|
|
30
|
+
type: 'string',
|
|
31
|
+
description: 'The command to start the MCP server.',
|
|
32
|
+
},
|
|
33
|
+
args: {
|
|
34
|
+
type: 'array',
|
|
35
|
+
description: 'The arguments for the command to start the MCP server.',
|
|
36
|
+
},
|
|
37
|
+
env: {
|
|
38
|
+
type: 'object',
|
|
39
|
+
description: 'The environment variables for the command to start the MCP server.',
|
|
40
|
+
},
|
|
41
|
+
url: {
|
|
42
|
+
type: 'string',
|
|
43
|
+
description: 'The SSE URL for the MCP server.',
|
|
44
|
+
},
|
|
42
45
|
},
|
|
43
46
|
},
|
|
44
47
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-preferences.js","sourceRoot":"","sources":["../../../src/browser/mcp/mcp-preferences.ts"],"names":[],"mappings":";;;AAGa,QAAA,YAAY,GAAG,GAAG,6CAAgB,OAAO,CAAC;AAE1C,QAAA,oBAAoB,GAAqB;IACpD,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,UAAU;IACjB,UAAU,EAAE;QACV,GAAG,EAAE;YACH,IAAI,EAAE,oBAAY;YAClB,WAAW,EAAE,kCAAkC;YAC/C,YAAY,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE;SACjC;KACF;CACF,CAAC;AAEW,QAAA,SAAS,GAAgB;IACpC,GAAG,EAAE,oBAAY;IACjB,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,KAAK;IACZ,QAAQ,EAAE,EAAE;IACZ,OAAO,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE;IAC3B,UAAU,EAAE;QACV,UAAU,EAAE;YACV,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"mcp-preferences.js","sourceRoot":"","sources":["../../../src/browser/mcp/mcp-preferences.ts"],"names":[],"mappings":";;;AAGa,QAAA,YAAY,GAAG,GAAG,6CAAgB,OAAO,CAAC;AAE1C,QAAA,oBAAoB,GAAqB;IACpD,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,UAAU;IACjB,UAAU,EAAE;QACV,GAAG,EAAE;YACH,IAAI,EAAE,oBAAY;YAClB,WAAW,EAAE,kCAAkC;YAC/C,YAAY,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE;SACjC;KACF;CACF,CAAC;AAEW,QAAA,SAAS,GAAgB;IACpC,GAAG,EAAE,oBAAY;IACjB,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,KAAK;IACZ,QAAQ,EAAE,EAAE;IACZ,OAAO,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE;IAC3B,UAAU,EAAE;QACV,UAAU,EAAE;YACV,IAAI,EAAE,OAAO;YACb,WAAW,EAAE,mFAAmF;YAChG,KAAK,EAAE;gBACL,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACV,OAAO,EAAE;wBACP,IAAI,EAAE,QAAQ;wBACd,WAAW,EAAE,sCAAsC;qBACpD;oBACD,IAAI,EAAE;wBACJ,IAAI,EAAE,OAAO;wBACb,WAAW,EAAE,wDAAwD;qBACtE;oBACD,GAAG,EAAE;wBACH,IAAI,EAAE,QAAQ;wBACd,WAAW,EAAE,oEAAoE;qBAClF;oBACD,GAAG,EAAE;wBACH,IAAI,EAAE,QAAQ;wBACd,WAAW,EAAE,iCAAiC;qBAC/C;iBACF;aACF;SACF;KACF;CACF,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-ai-native",
|
|
3
|
-
"version": "3.8.3-next-
|
|
3
|
+
"version": "3.8.3-next-1745835843.0",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib",
|
|
6
6
|
"src"
|
|
@@ -24,27 +24,27 @@
|
|
|
24
24
|
"@ai-sdk/openai": "^1.1.9",
|
|
25
25
|
"@ai-sdk/openai-compatible": "^0.1.11",
|
|
26
26
|
"@modelcontextprotocol/sdk": "^1.3.1",
|
|
27
|
-
"@opensumi/ide-addons": "3.8.3-next-
|
|
28
|
-
"@opensumi/ide-components": "3.8.3-next-
|
|
29
|
-
"@opensumi/ide-connection": "3.8.3-next-
|
|
30
|
-
"@opensumi/ide-core-common": "3.8.3-next-
|
|
31
|
-
"@opensumi/ide-core-node": "3.8.3-next-
|
|
32
|
-
"@opensumi/ide-debug": "3.8.3-next-
|
|
33
|
-
"@opensumi/ide-design": "3.8.3-next-
|
|
34
|
-
"@opensumi/ide-editor": "3.8.3-next-
|
|
35
|
-
"@opensumi/ide-file-search": "3.8.3-next-
|
|
36
|
-
"@opensumi/ide-file-service": "3.8.3-next-
|
|
37
|
-
"@opensumi/ide-main-layout": "3.8.3-next-
|
|
38
|
-
"@opensumi/ide-markers": "3.8.3-next-
|
|
39
|
-
"@opensumi/ide-monaco": "3.8.3-next-
|
|
40
|
-
"@opensumi/ide-outline": "3.8.3-next-
|
|
41
|
-
"@opensumi/ide-overlay": "3.8.3-next-
|
|
42
|
-
"@opensumi/ide-preferences": "3.8.3-next-
|
|
43
|
-
"@opensumi/ide-search": "3.8.3-next-
|
|
44
|
-
"@opensumi/ide-terminal-next": "3.8.3-next-
|
|
45
|
-
"@opensumi/ide-theme": "3.8.3-next-
|
|
46
|
-
"@opensumi/ide-utils": "3.8.3-next-
|
|
47
|
-
"@opensumi/ide-workspace": "3.8.3-next-
|
|
27
|
+
"@opensumi/ide-addons": "3.8.3-next-1745835843.0",
|
|
28
|
+
"@opensumi/ide-components": "3.8.3-next-1745835843.0",
|
|
29
|
+
"@opensumi/ide-connection": "3.8.3-next-1745835843.0",
|
|
30
|
+
"@opensumi/ide-core-common": "3.8.3-next-1745835843.0",
|
|
31
|
+
"@opensumi/ide-core-node": "3.8.3-next-1745835843.0",
|
|
32
|
+
"@opensumi/ide-debug": "3.8.3-next-1745835843.0",
|
|
33
|
+
"@opensumi/ide-design": "3.8.3-next-1745835843.0",
|
|
34
|
+
"@opensumi/ide-editor": "3.8.3-next-1745835843.0",
|
|
35
|
+
"@opensumi/ide-file-search": "3.8.3-next-1745835843.0",
|
|
36
|
+
"@opensumi/ide-file-service": "3.8.3-next-1745835843.0",
|
|
37
|
+
"@opensumi/ide-main-layout": "3.8.3-next-1745835843.0",
|
|
38
|
+
"@opensumi/ide-markers": "3.8.3-next-1745835843.0",
|
|
39
|
+
"@opensumi/ide-monaco": "3.8.3-next-1745835843.0",
|
|
40
|
+
"@opensumi/ide-outline": "3.8.3-next-1745835843.0",
|
|
41
|
+
"@opensumi/ide-overlay": "3.8.3-next-1745835843.0",
|
|
42
|
+
"@opensumi/ide-preferences": "3.8.3-next-1745835843.0",
|
|
43
|
+
"@opensumi/ide-search": "3.8.3-next-1745835843.0",
|
|
44
|
+
"@opensumi/ide-terminal-next": "3.8.3-next-1745835843.0",
|
|
45
|
+
"@opensumi/ide-theme": "3.8.3-next-1745835843.0",
|
|
46
|
+
"@opensumi/ide-utils": "3.8.3-next-1745835843.0",
|
|
47
|
+
"@opensumi/ide-workspace": "3.8.3-next-1745835843.0",
|
|
48
48
|
"@xterm/xterm": "5.5.0",
|
|
49
49
|
"ai": "^4.1.45",
|
|
50
50
|
"ansi-regex": "^2.0.0",
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
"zod-to-json-schema": "^3.24.1"
|
|
62
62
|
},
|
|
63
63
|
"devDependencies": {
|
|
64
|
-
"@opensumi/ide-core-browser": "3.8.3-next-
|
|
64
|
+
"@opensumi/ide-core-browser": "3.8.3-next-1745835843.0"
|
|
65
65
|
},
|
|
66
|
-
"gitHead": "
|
|
66
|
+
"gitHead": "b7a150321e5fa3d3879f5dd30d8f4946d155dc59"
|
|
67
67
|
}
|
|
@@ -89,19 +89,19 @@ export class MCPConfigService extends Disposable {
|
|
|
89
89
|
|
|
90
90
|
async getServers(): Promise<MCPServer[]> {
|
|
91
91
|
// Get workspace MCP server configurations
|
|
92
|
-
const { value: mcpConfig } = this.preferenceService.resolve<{ mcpServers: Record<string, any> }>(
|
|
92
|
+
const { value: mcpConfig, scope } = this.preferenceService.resolve<{ mcpServers: Record<string, any>[] }>(
|
|
93
93
|
'mcp',
|
|
94
|
-
{ mcpServers:
|
|
94
|
+
{ mcpServers: [] },
|
|
95
95
|
undefined,
|
|
96
96
|
);
|
|
97
97
|
|
|
98
|
-
if (
|
|
98
|
+
if (scope === PreferenceScope.Default) {
|
|
99
99
|
const runningServers = await this.mcpServerProxyService.$getServers();
|
|
100
100
|
const builtinServer = runningServers.find((server) => server.name === BUILTIN_MCP_SERVER_NAME);
|
|
101
101
|
return builtinServer ? [builtinServer] : [];
|
|
102
102
|
}
|
|
103
103
|
|
|
104
|
-
const userServers = mcpConfig
|
|
104
|
+
const userServers = mcpConfig?.mcpServers.map((server) => {
|
|
105
105
|
const name = Object.keys(server)[0];
|
|
106
106
|
const serverConfig = server[name];
|
|
107
107
|
if (serverConfig.url) {
|
|
@@ -124,7 +124,7 @@ export class MCPConfigService extends Disposable {
|
|
|
124
124
|
const builtinServer = runningServers.find((server) => server.name === BUILTIN_MCP_SERVER_NAME);
|
|
125
125
|
|
|
126
126
|
// Merge server configs with running status
|
|
127
|
-
const allServers = userServers
|
|
127
|
+
const allServers = userServers?.map((server) => {
|
|
128
128
|
const runningServer = runningServers.find((s) => s.name === server.name);
|
|
129
129
|
return {
|
|
130
130
|
...server,
|
|
@@ -174,7 +174,7 @@ export class MCPConfigService extends Disposable {
|
|
|
174
174
|
undefined,
|
|
175
175
|
);
|
|
176
176
|
const servers = mcpConfig!.mcpServers;
|
|
177
|
-
const existingIndex = servers?.findIndex((s) => s
|
|
177
|
+
const existingIndex = servers?.findIndex((s) => Object.keys(s)[0] === data.name);
|
|
178
178
|
|
|
179
179
|
let serverConfig;
|
|
180
180
|
if (data.type === MCP_SERVER_TYPE.SSE) {
|
|
@@ -23,24 +23,27 @@ export const MCPSchema: IJSONSchema = {
|
|
|
23
23
|
default: { mcpServers: [] },
|
|
24
24
|
properties: {
|
|
25
25
|
mcpServers: {
|
|
26
|
-
type: '
|
|
26
|
+
type: 'array',
|
|
27
27
|
description: 'List of MCP Servers. Add new servers or edit existing ones by using IntelliSense.',
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
28
|
+
items: {
|
|
29
|
+
type: 'object',
|
|
30
|
+
properties: {
|
|
31
|
+
command: {
|
|
32
|
+
type: 'string',
|
|
33
|
+
description: 'The command to start the MCP server.',
|
|
34
|
+
},
|
|
35
|
+
args: {
|
|
36
|
+
type: 'array',
|
|
37
|
+
description: 'The arguments for the command to start the MCP server.',
|
|
38
|
+
},
|
|
39
|
+
env: {
|
|
40
|
+
type: 'object',
|
|
41
|
+
description: 'The environment variables for the command to start the MCP server.',
|
|
42
|
+
},
|
|
43
|
+
url: {
|
|
44
|
+
type: 'string',
|
|
45
|
+
description: 'The SSE URL for the MCP server.',
|
|
46
|
+
},
|
|
44
47
|
},
|
|
45
48
|
},
|
|
46
49
|
},
|