@opensumi/ide-ai-native 3.8.2-next-1741408460.0 → 3.8.2-next-1741413805.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.
@@ -21,7 +21,7 @@ let ApplyService = class ApplyService extends base_apply_service_1.BaseApplyServ
21
21
  <code>${fileContent}</code>
22
22
 
23
23
  <update>${codeBlock.codeEdit}</update>
24
-
24
+ ${codeBlock.instructions ? `\nUser's intention: ${codeBlock.instructions}\n` : ''}
25
25
  Provide the complete updated code.
26
26
  `, {
27
27
  ...this.chatProxyService.getRequestOptions(),
@@ -1 +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"}
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;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;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"}
@@ -1 +1 @@
1
- {"version":3,"file":"ChatToolRender.d.ts","sourceRoot":"","sources":["../../../src/browser/components/ChatToolRender.tsx"],"names":[],"mappings":"AACA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAKxC,OAAO,EAAE,gBAAgB,EAAQ,MAAM,2BAA2B,CAAC;AAQnE,eAAO,MAAM,cAAc,UAAW;IAAE,KAAK,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,6BAkF/F,CAAC"}
1
+ {"version":3,"file":"ChatToolRender.d.ts","sourceRoot":"","sources":["../../../src/browser/components/ChatToolRender.tsx"],"names":[],"mappings":"AACA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAKxC,OAAO,EAAE,gBAAgB,EAAQ,MAAM,2BAA2B,CAAC;AAOnE,eAAO,MAAM,cAAc,UAAW;IAAE,KAAK,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,6BAiF/F,CAAC"}
@@ -8,7 +8,6 @@ const ide_core_browser_1 = require("@opensumi/ide-core-browser");
8
8
  const components_1 = require("@opensumi/ide-core-browser/lib/components");
9
9
  const ai_native_1 = require("@opensumi/ide-core-browser/lib/components/ai-native");
10
10
  const ide_core_common_1 = require("@opensumi/ide-core-common");
11
- const localize_1 = require("@opensumi/ide-core-common/lib/localize");
12
11
  const types_1 = require("../types");
13
12
  const ChatEditor_1 = require("./ChatEditor");
14
13
  const ChatToolRender_module_less_1 = tslib_1.__importDefault(require("./ChatToolRender.module.less"));
@@ -52,24 +51,19 @@ const ChatToolRender = (props) => {
52
51
  setIsExpanded(!isExpanded);
53
52
  };
54
53
  const stateInfo = getStateInfo(value.state);
55
- return ToolComponent && (value.state === 'complete' || value.state === 'result') ? (react_1.default.createElement(ToolComponent, { state: value.state, args: getParsedArgs(), result: value.result, index: value.index, messageId: messageId, toolCallId: value.id })) : (react_1.default.createElement("div", { className: ChatToolRender_module_less_1.default.chat_tool_render },
56
- react_1.default.createElement("div", { className: ChatToolRender_module_less_1.default.tool_header, onClick: toggleExpand },
57
- react_1.default.createElement("div", { className: ChatToolRender_module_less_1.default.tool_name },
58
- react_1.default.createElement(components_1.Icon, { iconClass: `codicon codicon-chevron-${isExpanded ? 'down' : 'right'}` }),
59
- react_1.default.createElement(components_1.Icon, { size: 'small', iconClass: (0, classnames_1.default)('codicon codicon-tools', ChatToolRender_module_less_1.default.tool_icon) }),
60
- react_1.default.createElement("span", { className: ChatToolRender_module_less_1.default.tool_label }, label)),
61
- value.state && (react_1.default.createElement("div", { className: ChatToolRender_module_less_1.default.tool_state },
62
- react_1.default.createElement("span", { className: ChatToolRender_module_less_1.default.state_icon }, stateInfo.icon)))),
63
- react_1.default.createElement("div", { className: (0, classnames_1.default)(ChatToolRender_module_less_1.default.tool_content, { [ChatToolRender_module_less_1.default.expanded]: isExpanded }) },
64
- ((_b = value === null || value === void 0 ? void 0 : value.function) === null || _b === void 0 ? void 0 : _b.arguments) && (react_1.default.createElement("div", { className: ChatToolRender_module_less_1.default.tool_arguments },
65
- react_1.default.createElement("div", { className: ChatToolRender_module_less_1.default.section_label },
66
- (0, localize_1.localize)('ai.native.mcp.tool.arguments'),
67
- ":"),
54
+ return ToolComponent && (value.state === 'complete' || value.state === 'result') ? (react_1.default.createElement(ToolComponent, { state: value.state, args: getParsedArgs(), result: value.result, index: value.index, messageId: messageId, toolCallId: value.id })) : (react_1.default.createElement("div", { className: ChatToolRender_module_less_1.default['chat-tool-render'] },
55
+ react_1.default.createElement("div", { className: ChatToolRender_module_less_1.default['tool-header'], onClick: toggleExpand },
56
+ react_1.default.createElement("div", { className: ChatToolRender_module_less_1.default['tool-name'] },
57
+ react_1.default.createElement(components_1.Icon, { iconClass: `codicon codicon-triangle-${isExpanded ? 'down' : 'right'}` }),
58
+ label),
59
+ value.state && (react_1.default.createElement("div", { className: ChatToolRender_module_less_1.default['tool-state'] },
60
+ react_1.default.createElement("span", { className: ChatToolRender_module_less_1.default['state-icon'] }, stateInfo.icon)))),
61
+ react_1.default.createElement("div", { className: (0, classnames_1.default)(ChatToolRender_module_less_1.default['tool-content'], { [ChatToolRender_module_less_1.default.expanded]: isExpanded }) },
62
+ ((_b = value === null || value === void 0 ? void 0 : value.function) === null || _b === void 0 ? void 0 : _b.arguments) && (react_1.default.createElement("div", { className: ChatToolRender_module_less_1.default['tool-arguments'] },
63
+ react_1.default.createElement("div", { className: ChatToolRender_module_less_1.default['section-label'] }, "Arguments"),
68
64
  react_1.default.createElement(ChatEditor_1.CodeEditorWithHighlight, { input: (_c = value === null || value === void 0 ? void 0 : value.function) === null || _c === void 0 ? void 0 : _c.arguments, language: 'json', relationId: (0, ide_core_common_1.uuid)(4) }))),
69
- (value === null || value === void 0 ? void 0 : value.result) && (react_1.default.createElement("div", { className: ChatToolRender_module_less_1.default.tool_result },
70
- react_1.default.createElement("div", { className: ChatToolRender_module_less_1.default.section_label },
71
- (0, localize_1.localize)('ai.native.mcp.tool.results'),
72
- ":"),
65
+ (value === null || value === void 0 ? void 0 : value.result) && (react_1.default.createElement("div", { className: ChatToolRender_module_less_1.default['tool-result'] },
66
+ react_1.default.createElement("div", { className: ChatToolRender_module_less_1.default['section-label'] }, "Result"),
73
67
  react_1.default.createElement(ChatEditor_1.CodeEditorWithHighlight, { input: value.result, language: 'json', relationId: (0, ide_core_common_1.uuid)(4) }))))));
74
68
  };
75
69
  exports.ChatToolRender = ChatToolRender;
@@ -1 +1 @@
1
- {"version":3,"file":"ChatToolRender.js","sourceRoot":"","sources":["../../../src/browser/components/ChatToolRender.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ChatToolRender.js","sourceRoot":"","sources":["../../../src/browser/components/ChatToolRender.tsx"],"names":[],"mappings":"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"}
@@ -1,14 +1,14 @@
1
- .chat_tool_render {
1
+ .chat-tool-render {
2
2
  margin: 8px 0;
3
3
  border: 1px solid var(--design-borderColor);
4
4
  border-radius: 6px;
5
5
  overflow: hidden;
6
6
 
7
- .tool_header {
7
+ .tool-header {
8
8
  display: flex;
9
9
  align-items: center;
10
10
  justify-content: space-between;
11
- padding: 4px;
11
+ padding: 8px 12px;
12
12
  background-color: var(--design-block-background);
13
13
  cursor: pointer;
14
14
  user-select: none;
@@ -18,25 +18,14 @@
18
18
  }
19
19
  }
20
20
 
21
- .tool_name {
22
- font-size: 12px;
21
+ .tool-name {
23
22
  display: flex;
24
23
  align-items: center;
25
24
  font-weight: 500;
26
25
  color: var(--design-text-foreground);
27
26
  }
28
27
 
29
- .tool_icon {
30
- font-size: 12px !important;
31
- }
32
-
33
- .tool_label {
34
- margin-left: 5px;
35
- font-size: 11px;
36
- color: var(--descriptionForeground);
37
- }
38
-
39
- .expand_icon {
28
+ .expand-icon {
40
29
  display: inline-block;
41
30
  margin-right: 8px;
42
31
  transition: transform 0.2s;
@@ -47,29 +36,29 @@
47
36
  }
48
37
  }
49
38
 
50
- .tool_state {
39
+ .tool-state {
51
40
  display: flex;
52
41
  align-items: center;
53
42
  font-size: 12px;
54
43
  color: var(--design-text-placeholderForeground);
55
44
  }
56
45
 
57
- .state_icon {
46
+ .state-icon {
58
47
  display: flex;
59
48
  align-items: center;
60
49
  margin-right: 6px;
61
50
  }
62
51
 
63
- .loading_icon {
52
+ .loading-icon {
64
53
  width: 12px;
65
54
  height: 12px;
66
55
  }
67
56
 
68
- .state_label {
57
+ .state-label {
69
58
  margin-left: 4px;
70
59
  }
71
60
 
72
- .tool_content {
61
+ .tool-content {
73
62
  max-height: 0;
74
63
  overflow: hidden;
75
64
  transition: max-height 0.3s ease-out;
@@ -80,19 +69,18 @@
80
69
  }
81
70
  }
82
71
 
83
- .tool_arguments,
84
- .tool_result {
85
- font-size: 11px;
86
- padding: 5px;
72
+ .tool-arguments,
73
+ .tool-result {
74
+ padding: 12px;
87
75
  }
88
76
 
89
- .section_label {
77
+ .section-label {
90
78
  font-size: 12px;
91
79
  color: var(--design-text-placeholderForeground);
92
80
  margin-bottom: 8px;
93
81
  }
94
82
 
95
- .tool_result {
83
+ .tool-result {
96
84
  border-top: 1px solid var(--design-borderColor);
97
85
  }
98
86
  }
@@ -34,7 +34,7 @@ export declare abstract class BaseApplyService extends WithEventBus {
34
34
  protected getSessionCodeBlocks(sessionId?: string): CodeBlockData[];
35
35
  getCodeBlock(toolCallId: string, messageId?: string): CodeBlockData | undefined;
36
36
  protected updateCodeBlock(codeBlock: CodeBlockData): void;
37
- registerCodeBlock(relativePath: string, content: string, toolCallId: string): Promise<CodeBlockData>;
37
+ registerCodeBlock(relativePath: string, content: string, toolCallId: string, instructions?: string): Promise<CodeBlockData>;
38
38
  private duringApply?;
39
39
  /**
40
40
  * Apply changes of a code block
@@ -1 +1 @@
1
- {"version":3,"file":"base-apply.service.d.ts","sourceRoot":"","sources":["../../../src/browser/mcp/base-apply.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"base-apply.service.d.ts","sourceRoot":"","sources":["../../../src/browser/mcp/base-apply.service.ts"],"names":[],"mappings":"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"}
@@ -150,7 +150,7 @@ class BaseApplyService extends ide_core_browser_1.WithEventBus {
150
150
  });
151
151
  this.onCodeBlockUpdateEmitter.fire(codeBlock);
152
152
  }
153
- async registerCodeBlock(relativePath, content, toolCallId) {
153
+ async registerCodeBlock(relativePath, content, toolCallId, instructions) {
154
154
  var _a, _b;
155
155
  const lastMessageId = this.chatInternalService.sessionModel.history.lastMessageId;
156
156
  const uriCodeBlocks = this.getUriCodeBlocks(ide_utils_1.URI.file(ide_utils_1.path.join(this.appConfig.workspaceDir, relativePath)));
@@ -164,6 +164,7 @@ class BaseApplyService extends ide_core_browser_1.WithEventBus {
164
164
  createdAt: Date.now(),
165
165
  toolCallId,
166
166
  messageId: lastMessageId,
167
+ instructions,
167
168
  // TODO: 支持range
168
169
  originalCode: originalModelRef.instance.getText(),
169
170
  };
@@ -446,8 +447,8 @@ class BaseApplyService extends ide_core_browser_1.WithEventBus {
446
447
  .split('\n')
447
448
  .map((line) => {
448
449
  if (line.startsWith('@@')) {
449
- const [, , , start, end] = line.match(/@@ -(\d+),(\d+) \+(\d+),(\d+) @@/);
450
- return new ide_monaco_1.Range(parseInt(start, 10), 0, parseInt(end, 10), 0);
450
+ const [, , , start, lineCount] = line.match(/@@ -(\d+),(\d+) \+(\d+),(\d+) @@/);
451
+ return new ide_monaco_1.Range(parseInt(start, 10), 0, parseInt(start, 10) + parseInt(lineCount, 10) - 1, 0);
451
452
  }
452
453
  return null;
453
454
  })
@@ -457,6 +458,7 @@ class BaseApplyService extends ide_core_browser_1.WithEventBus {
457
458
  rangesFromDiffHunk,
458
459
  };
459
460
  }
461
+ // FIXME: 貌似筛选逻辑不太对,需要重构
460
462
  // TODO: 支持使用内存中的document获取诊断信息,实现并行apply accept
461
463
  getDiagnosticInfos(uri, ranges) {
462
464
  const markers = this.markerService.getManager().getMarkers({ resource: uri });
@@ -1 +1 @@
1
- {"version":3,"file":"base-apply.service.js","sourceRoot":"","sources":["../../../src/browser/mcp/base-apply.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"base-apply.service.js","sourceRoot":"","sources":["../../../src/browser/mcp/base-apply.service.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;AAgB3C,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EA8OjC,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"}
@@ -8,8 +8,7 @@ const ide_components_1 = require("@opensumi/ide-components");
8
8
  const ide_core_browser_1 = require("@opensumi/ide-core-browser");
9
9
  const preferences_1 = require("@opensumi/ide-core-browser/lib/preferences");
10
10
  const ide_core_common_1 = require("@opensumi/ide-core-common");
11
- const common_1 = require("@opensumi/ide-overlay/lib/common");
12
- const common_2 = require("../../../../common");
11
+ const common_1 = require("../../../../common");
13
12
  const types_1 = require("../../../../common/types");
14
13
  const mcp_server_proxy_service_1 = require("../../mcp-server-proxy.service");
15
14
  const mcp_config_module_less_1 = tslib_1.__importDefault(require("./mcp-config.module.less"));
@@ -17,9 +16,8 @@ const mcp_server_form_1 = require("./mcp-server-form");
17
16
  const MCPConfigView = () => {
18
17
  const mcpServerProxyService = (0, ide_core_browser_1.useInjectable)(mcp_server_proxy_service_1.MCPServerProxyService);
19
18
  const preferenceService = (0, ide_core_browser_1.useInjectable)(preferences_1.PreferenceService);
20
- const sumiMCPServerBackendProxy = (0, ide_core_browser_1.useInjectable)(common_2.SumiMCPServerProxyServicePath);
19
+ const sumiMCPServerBackendProxy = (0, ide_core_browser_1.useInjectable)(common_1.SumiMCPServerProxyServicePath);
21
20
  const logger = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.ILogger);
22
- const messageService = (0, ide_core_browser_1.useInjectable)(common_1.IMessageService);
23
21
  const [servers, setServers] = react_1.default.useState([]);
24
22
  const [formVisible, setFormVisible] = react_1.default.useState(false);
25
23
  const [editingServer, setEditingServer] = react_1.default.useState();
@@ -48,15 +46,15 @@ const MCPConfigView = () => {
48
46
  const servers = preferenceService.get(ide_core_browser_1.AINativeSettingSectionsId.MCPServers, []);
49
47
  let updatedServers = servers;
50
48
  // 处理内置服务器的特殊情况
51
- if (serverName === common_2.BUILTIN_MCP_SERVER_NAME) {
52
- const builtinServerExists = servers.some((server) => server.name === common_2.BUILTIN_MCP_SERVER_NAME);
49
+ if (serverName === common_1.BUILTIN_MCP_SERVER_NAME) {
50
+ const builtinServerExists = servers.some((server) => server.name === common_1.BUILTIN_MCP_SERVER_NAME);
53
51
  if (!builtinServerExists && !start) {
54
52
  // 如果是停止内置服务器且之前没有配置,添加一个新的配置项
55
53
  // 内置服务器不需要 command,因为它是直接集成在 IDE 中的
56
54
  updatedServers = [
57
55
  ...servers,
58
56
  {
59
- name: common_2.BUILTIN_MCP_SERVER_NAME,
57
+ name: common_1.BUILTIN_MCP_SERVER_NAME,
60
58
  enabled: false,
61
59
  command: '', // 内置服务器的 command 为空字符串
62
60
  type: types_1.MCP_SERVER_TYPE.STDIO,
@@ -66,7 +64,7 @@ const MCPConfigView = () => {
66
64
  else {
67
65
  // 如果已经存在配置,更新 enabled 状态
68
66
  updatedServers = servers.map((server) => {
69
- if (server.name === common_2.BUILTIN_MCP_SERVER_NAME) {
67
+ if (server.name === common_1.BUILTIN_MCP_SERVER_NAME) {
70
68
  return { ...server, enabled: start };
71
69
  }
72
70
  return server;
@@ -86,9 +84,7 @@ const MCPConfigView = () => {
86
84
  await loadServers();
87
85
  }
88
86
  catch (error) {
89
- const msg = error.message || error;
90
87
  logger.error(`Failed to ${start ? 'start' : 'stop'} server ${serverName}:`, error);
91
- messageService.error(`Failed to ${start ? 'start' : 'stop'} server ${serverName}:` + msg);
92
88
  }
93
89
  }, [mcpServerProxyService, preferenceService, sumiMCPServerBackendProxy, loadServers]);
94
90
  const handleAddServer = (0, react_1.useCallback)(() => {
@@ -148,11 +144,11 @@ const MCPConfigView = () => {
148
144
  react_1.default.createElement("div", { className: mcp_config_module_less_1.default.serverTitleRow },
149
145
  react_1.default.createElement("h3", { className: mcp_config_module_less_1.default.serverName }, server.name)),
150
146
  react_1.default.createElement("div", { className: mcp_config_module_less_1.default.serverActions },
151
- server.name !== common_2.BUILTIN_MCP_SERVER_NAME && (react_1.default.createElement("button", { className: mcp_config_module_less_1.default.iconButton, title: 'Edit', onClick: () => handleEditServer(server) },
147
+ server.name !== common_1.BUILTIN_MCP_SERVER_NAME && (react_1.default.createElement("button", { className: mcp_config_module_less_1.default.iconButton, title: 'Edit', onClick: () => handleEditServer(server) },
152
148
  react_1.default.createElement("i", { className: 'codicon codicon-edit' }))),
153
149
  react_1.default.createElement("button", { className: mcp_config_module_less_1.default.iconButton, title: server.isStarted ? 'Stop' : 'Start', onClick: () => handleServerControl(server.name, !server.isStarted) },
154
150
  react_1.default.createElement("i", { className: `codicon ${server.isStarted ? 'codicon-debug-stop' : 'codicon-debug-start'}` })),
155
- server.name !== common_2.BUILTIN_MCP_SERVER_NAME && (react_1.default.createElement("button", { className: mcp_config_module_less_1.default.iconButton, title: 'Delete', onClick: () => handleDeleteServer(server.name) },
151
+ server.name !== common_1.BUILTIN_MCP_SERVER_NAME && (react_1.default.createElement("button", { className: mcp_config_module_less_1.default.iconButton, title: 'Delete', onClick: () => handleDeleteServer(server.name) },
156
152
  react_1.default.createElement("i", { className: 'codicon codicon-trash' }))))),
157
153
  react_1.default.createElement("div", { className: mcp_config_module_less_1.default.serverDetail },
158
154
  react_1.default.createElement("div", { className: mcp_config_module_less_1.default.detailRow },
@@ -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;AACrD,6DAAmE;AAEnE,+CAAmH;AAEnH,oDAAsE;AACtE,6EAAuE;AAEvE,8FAA8C;AAC9C,uDAAqE;AAE9D,MAAM,aAAa,GAAa,GAAG,EAAE;IAC1C,MAAM,qBAAqB,GAAG,IAAA,gCAAa,EAAwB,gDAAqB,CAAC,CAAC;IAC1F,MAAM,iBAAiB,GAAG,IAAA,gCAAa,EAAoB,+BAAiB,CAAC,CAAC;IAC9E,MAAM,yBAAyB,GAAG,IAAA,gCAAa,EAAwB,sCAA6B,CAAC,CAAC;IACtG,MAAM,MAAM,GAAG,IAAA,gCAAa,EAAU,0BAAO,CAAC,CAAC;IAC/C,MAAM,cAAc,GAAG,IAAA,gCAAa,EAAkB,wBAAe,CAAC,CAAC;IACvE,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,EAAiC,CAAC;IAE1F,MAAM,WAAW,GAAG,IAAA,mBAAW,EAAC,KAAK,IAAI,EAAE;QACzC,MAAM,UAAU,GAAG,MAAM,qBAAqB,CAAC,WAAW,EAAE,CAAC;QAC7D,UAAU,CAAC,UAAU,CAAC,CAAC;IACzB,CAAC,EAAE,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAE5B,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,WAAW,EAAE,CAAC;QACd,MAAM,QAAQ,GAAG,qBAAqB,CAAC,kBAAkB,CAAC,GAAG,EAAE;YAC7D,WAAW,EAAE,CAAC;QAChB,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,EAAE;YACV,QAAQ,CAAC,OAAO,EAAE,CAAC;QACrB,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,mBAAmB,GAAG,IAAA,mBAAW,EACrC,KAAK,EAAE,UAAkB,EAAE,KAAc,EAAE,EAAE;QAC3C,IAAI,CAAC;YACH,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,qBAAqB,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;YACvD,CAAC;iBAAM,CAAC;gBACN,MAAM,qBAAqB,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;YACtD,CAAC;YAED,sCAAsC;YACtC,MAAM,OAAO,GAAG,iBAAiB,CAAC,GAAG,CAAyB,4CAAyB,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YACxG,IAAI,cAAc,GAAG,OAAO,CAAC;YAC7B,eAAe;YACf,IAAI,UAAU,KAAK,gCAAuB,EAAE,CAAC;gBAC3C,MAAM,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,gCAAuB,CAAC,CAAC;gBAC9F,IAAI,CAAC,mBAAmB,IAAI,CAAC,KAAK,EAAE,CAAC;oBACnC,8BAA8B;oBAC9B,oCAAoC;oBACpC,cAAc,GAAG;wBACf,GAAG,OAAO;wBACV;4BACE,IAAI,EAAE,gCAAuB;4BAC7B,OAAO,EAAE,KAAK;4BACd,OAAO,EAAE,EAAE,EAAE,uBAAuB;4BACpC,IAAI,EAAE,uBAAe,CAAC,KAAK;yBAC5B;qBACF,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,yBAAyB;oBACzB,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;wBACtC,IAAI,MAAM,CAAC,IAAI,KAAK,gCAAuB,EAAE,CAAC;4BAC5C,OAAO,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;wBACvC,CAAC;wBACD,OAAO,MAAM,CAAC;oBAChB,CAAC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,YAAY;gBACZ,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;oBACtC,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;wBAC/B,OAAO,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;oBACvC,CAAC;oBACD,OAAO,MAAM,CAAC;gBAChB,CAAC,CAAC,CAAC;YACL,CAAC;YAED,MAAM,iBAAiB,CAAC,GAAG,CAAC,4CAAyB,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;YAClF,MAAM,WAAW,EAAE,CAAC;QACtB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC;YACnC,MAAM,CAAC,KAAK,CAAC,aAAa,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,WAAW,UAAU,GAAG,EAAE,KAAK,CAAC,CAAC;YACnF,cAAc,CAAC,KAAK,CAAC,aAAa,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,WAAW,UAAU,GAAG,GAAG,GAAG,CAAC,CAAC;QAC5F,CAAC;IACH,CAAC,EACD,CAAC,qBAAqB,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,WAAW,CAAC,CACnF,CAAC;IAEF,MAAM,eAAe,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QACvC,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC5B,cAAc,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC,EAAE,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC,CAAC;IAEjC,MAAM,gBAAgB,GAAG,IAAA,mBAAW,EAClC,CAAC,MAAiB,EAAE,EAAE;QACpB,MAAM,OAAO,GAAG,iBAAiB,CAAC,GAAG,CAAsB,4CAAyB,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QACrG,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC;QAEjE,IAAI,YAAY,EAAE,CAAC;YACjB,gBAAgB,CAAC,YAAY,CAAC,CAAC;YAC/B,cAAc,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC;IACH,CAAC,EACD,CAAC,aAAa,EAAE,WAAW,CAAC,CAC7B,CAAC;IAEF,MAAM,kBAAkB,GAAG,IAAA,mBAAW,EACpC,KAAK,EAAE,UAAkB,EAAE,EAAE;QAC3B,MAAM,OAAO,GAAG,iBAAiB,CAAC,GAAG,CAAsB,4CAAyB,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QACrG,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;QACpE,yBAAyB,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QACnD,MAAM,iBAAiB,CAAC,GAAG,CAAC,4CAAyB,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QAClF,MAAM,WAAW,EAAE,CAAC;IACtB,CAAC,EACD,CAAC,aAAa,EAAE,WAAW,CAAC,CAC7B,CAAC;IAEF,MAAM,gBAAgB,GAAG,IAAA,mBAAW,EAClC,KAAK,EAAE,IAAuB,EAAE,EAAE;QAChC,MAAM,OAAO,GAAG,iBAAiB,CAAC,GAAG,CAAsB,4CAAyB,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QACrG,MAAM,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC;QAErE,IAAI,aAAa,IAAI,CAAC,EAAE,CAAC;YACvB,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC;QAChC,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrB,CAAC;QACD,UAAU,CAAC,OAAsB,CAAC,CAAC;QACnC,cAAc,CAAC,KAAK,CAAC,CAAC;QACtB,MAAM,yBAAyB,CAAC,iBAAiB,CAAC,IAA4B,CAAC,CAAC;QAChF,MAAM,iBAAiB,CAAC,GAAG,CAAC,4CAAyB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAC3E,MAAM,WAAW,EAAE,CAAC;IACtB,CAAC,EACD,CAAC,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC,CACpC,CAAC;IAEF,MAAM,qBAAqB,GAAG,IAAA,mBAAW,EAAC,CAAC,IAAY,EAAE,EAAE;QACzD,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,uBAAe,CAAC,KAAK;gBACxB,OAAO,IAAA,0BAAQ,EAAC,0BAA0B,CAAC,CAAC;YAC9C,KAAK,uBAAe,CAAC,GAAG;gBACtB,OAAO,IAAA,0BAAQ,EAAC,wBAAwB,CAAC,CAAC;YAC5C,KAAK,uBAAe,CAAC,OAAO;gBAC1B,OAAO,IAAA,0BAAQ,EAAC,4BAA4B,CAAC,CAAC;YAChD;gBACE,OAAO,IAAI,CAAC;QAChB,CAAC;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CACL,uCAAK,SAAS,EAAE,gCAAM,CAAC,SAAS;QAC9B,uCAAK,SAAS,EAAE,gCAAM,CAAC,MAAM;YAC3B;gBACE,sCAAI,SAAS,EAAE,gCAAM,CAAC,KAAK,kBAAkB;gBAC7C,qCAAG,SAAS,EAAE,gCAAM,CAAC,WAAW,0CAAyC,CACrE;YACN,0CAAQ,SAAS,EAAE,gCAAM,CAAC,SAAS,EAAE,OAAO,EAAE,eAAe,2BAEpD,CACL;QACN,uCAAK,SAAS,EAAE,gCAAM,CAAC,WAAW,IAC/B,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CACvB,uCAAK,GAAG,EAAE,MAAM,CAAC,IAAI,EAAE,SAAS,EAAE,gCAAM,CAAC,UAAU;YACjD,uCAAK,SAAS,EAAE,gCAAM,CAAC,YAAY;gBACjC,uCAAK,SAAS,EAAE,gCAAM,CAAC,cAAc;oBACnC,sCAAI,SAAS,EAAE,gCAAM,CAAC,UAAU,IAAG,MAAM,CAAC,IAAI,CAAM,CAChD;gBACN,uCAAK,SAAS,EAAE,gCAAM,CAAC,aAAa;oBACjC,MAAM,CAAC,IAAI,KAAK,gCAAuB,IAAI,CAC1C,0CAAQ,SAAS,EAAE,gCAAM,CAAC,UAAU,EAAE,KAAK,EAAC,MAAM,EAAC,OAAO,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,MAAM,CAAC;wBACxF,qCAAG,SAAS,EAAC,sBAAsB,GAAG,CAC/B,CACV;oBACD,0CACE,SAAS,EAAE,gCAAM,CAAC,UAAU,EAC5B,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAC1C,OAAO,EAAE,GAAG,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC;wBAElE,qCAAG,SAAS,EAAE,WAAW,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,qBAAqB,EAAE,GAAI,CACvF;oBACR,MAAM,CAAC,IAAI,KAAK,gCAAuB,IAAI,CAC1C,0CAAQ,SAAS,EAAE,gCAAM,CAAC,UAAU,EAAE,KAAK,EAAC,QAAQ,EAAC,OAAO,EAAE,GAAG,EAAE,CAAC,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC;wBACjG,qCAAG,SAAS,EAAC,uBAAuB,GAAG,CAChC,CACV,CACG,CACF;YACN,uCAAK,SAAS,EAAE,gCAAM,CAAC,YAAY;gBACjC,uCAAK,SAAS,EAAE,gCAAM,CAAC,SAAS;oBAC9B,wCAAM,SAAS,EAAE,gCAAM,CAAC,WAAW,cAAgB;oBACnD,wCAAM,SAAS,EAAE,GAAG,gCAAM,CAAC,YAAY,IAAI,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,gCAAM,CAAC,OAAO,CAAC,CAAC,CAAC,gCAAM,CAAC,OAAO,EAAE,IAC5F,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CACpC,CACH;gBACL,MAAM,CAAC,IAAI,IAAI,CACd,uCAAK,SAAS,EAAE,gCAAM,CAAC,SAAS;oBAC9B,wCAAM,SAAS,EAAE,gCAAM,CAAC,WAAW,YAAc;oBACjD,8BAAC,sBAAK,IAAC,SAAS,EAAE,IAAA,oBAAG,EAAC,gCAAM,CAAC,UAAU,EAAE,gCAAM,CAAC,OAAO,CAAC,IAAG,qBAAqB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAS,CAClG,CACP,CACG;YACL,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,CAC1C,uCAAK,SAAS,EAAE,gCAAM,CAAC,YAAY;gBACjC,uCAAK,SAAS,EAAE,gCAAM,CAAC,SAAS;oBAC9B,wCAAM,SAAS,EAAE,gCAAM,CAAC,WAAW,aAAe;oBAClD,wCAAM,SAAS,EAAE,gCAAM,CAAC,aAAa,IAClC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CACjC,wCAAM,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,gCAAM,CAAC,OAAO,IACxC,IAAI,CACA,CACR,CAAC,CACG,CACH,CACF,CACP;YACA,MAAM,CAAC,OAAO,IAAI,CACjB,uCAAK,SAAS,EAAE,gCAAM,CAAC,YAAY;gBACjC,uCAAK,SAAS,EAAE,gCAAM,CAAC,SAAS;oBAC9B,wCAAM,SAAS,EAAE,gCAAM,CAAC,WAAW,eAAiB;oBACpD,wCAAM,SAAS,EAAE,gCAAM,CAAC,aAAa,IAAG,MAAM,CAAC,OAAO,CAAQ,CAC1D,CACF,CACP;YACA,MAAM,CAAC,UAAU,IAAI,CACpB,uCAAK,SAAS,EAAE,gCAAM,CAAC,YAAY;gBACjC,uCAAK,SAAS,EAAE,gCAAM,CAAC,SAAS;oBAC9B,wCAAM,SAAS,EAAE,gCAAM,CAAC,WAAW,mBAAqB;oBACxD,wCAAM,SAAS,EAAE,IAAA,oBAAG,EAAC,gCAAM,CAAC,aAAa,EAAE,gCAAM,CAAC,IAAI,CAAC,IAAG,MAAM,CAAC,UAAU,CAAQ,CAC/E,CACF,CACP,CACG,CACP,CAAC,CACE;QACN,8BAAC,+BAAa,IACZ,OAAO,EAAE,WAAW,EACpB,WAAW,EAAE,aAAa,EAC1B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,gBAAgB,EACxB,QAAQ,EAAE,GAAG,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,GACrC,CACE,CACP,CAAC;AACJ,CAAC,CAAC;AA9OW,QAAA,aAAa,iBA8OxB"}
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,+CAAmH;AAEnH,oDAAsE;AACtE,6EAAuE;AAEvE,8FAA8C;AAC9C,uDAAqE;AAE9D,MAAM,aAAa,GAAa,GAAG,EAAE;IAC1C,MAAM,qBAAqB,GAAG,IAAA,gCAAa,EAAwB,gDAAqB,CAAC,CAAC;IAC1F,MAAM,iBAAiB,GAAG,IAAA,gCAAa,EAAoB,+BAAiB,CAAC,CAAC;IAC9E,MAAM,yBAAyB,GAAG,IAAA,gCAAa,EAAwB,sCAA6B,CAAC,CAAC;IACtG,MAAM,MAAM,GAAG,IAAA,gCAAa,EAAU,0BAAO,CAAC,CAAC;IAC/C,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,EAAiC,CAAC;IAE1F,MAAM,WAAW,GAAG,IAAA,mBAAW,EAAC,KAAK,IAAI,EAAE;QACzC,MAAM,UAAU,GAAG,MAAM,qBAAqB,CAAC,WAAW,EAAE,CAAC;QAC7D,UAAU,CAAC,UAAU,CAAC,CAAC;IACzB,CAAC,EAAE,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAE5B,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,WAAW,EAAE,CAAC;QACd,MAAM,QAAQ,GAAG,qBAAqB,CAAC,kBAAkB,CAAC,GAAG,EAAE;YAC7D,WAAW,EAAE,CAAC;QAChB,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,EAAE;YACV,QAAQ,CAAC,OAAO,EAAE,CAAC;QACrB,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,mBAAmB,GAAG,IAAA,mBAAW,EACrC,KAAK,EAAE,UAAkB,EAAE,KAAc,EAAE,EAAE;QAC3C,IAAI,CAAC;YACH,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,qBAAqB,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;YACvD,CAAC;iBAAM,CAAC;gBACN,MAAM,qBAAqB,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;YACtD,CAAC;YAED,sCAAsC;YACtC,MAAM,OAAO,GAAG,iBAAiB,CAAC,GAAG,CAAyB,4CAAyB,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YACxG,IAAI,cAAc,GAAG,OAAO,CAAC;YAC7B,eAAe;YACf,IAAI,UAAU,KAAK,gCAAuB,EAAE,CAAC;gBAC3C,MAAM,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,gCAAuB,CAAC,CAAC;gBAC9F,IAAI,CAAC,mBAAmB,IAAI,CAAC,KAAK,EAAE,CAAC;oBACnC,8BAA8B;oBAC9B,oCAAoC;oBACpC,cAAc,GAAG;wBACf,GAAG,OAAO;wBACV;4BACE,IAAI,EAAE,gCAAuB;4BAC7B,OAAO,EAAE,KAAK;4BACd,OAAO,EAAE,EAAE,EAAE,uBAAuB;4BACpC,IAAI,EAAE,uBAAe,CAAC,KAAK;yBAC5B;qBACF,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,yBAAyB;oBACzB,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;wBACtC,IAAI,MAAM,CAAC,IAAI,KAAK,gCAAuB,EAAE,CAAC;4BAC5C,OAAO,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;wBACvC,CAAC;wBACD,OAAO,MAAM,CAAC;oBAChB,CAAC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,YAAY;gBACZ,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;oBACtC,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;wBAC/B,OAAO,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;oBACvC,CAAC;oBACD,OAAO,MAAM,CAAC;gBAChB,CAAC,CAAC,CAAC;YACL,CAAC;YAED,MAAM,iBAAiB,CAAC,GAAG,CAAC,4CAAyB,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;YAClF,MAAM,WAAW,EAAE,CAAC;QACtB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,aAAa,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,WAAW,UAAU,GAAG,EAAE,KAAK,CAAC,CAAC;QACrF,CAAC;IACH,CAAC,EACD,CAAC,qBAAqB,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,WAAW,CAAC,CACnF,CAAC;IAEF,MAAM,eAAe,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QACvC,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC5B,cAAc,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC,EAAE,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC,CAAC;IAEjC,MAAM,gBAAgB,GAAG,IAAA,mBAAW,EAClC,CAAC,MAAiB,EAAE,EAAE;QACpB,MAAM,OAAO,GAAG,iBAAiB,CAAC,GAAG,CAAsB,4CAAyB,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QACrG,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC;QAEjE,IAAI,YAAY,EAAE,CAAC;YACjB,gBAAgB,CAAC,YAAY,CAAC,CAAC;YAC/B,cAAc,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC;IACH,CAAC,EACD,CAAC,aAAa,EAAE,WAAW,CAAC,CAC7B,CAAC;IAEF,MAAM,kBAAkB,GAAG,IAAA,mBAAW,EACpC,KAAK,EAAE,UAAkB,EAAE,EAAE;QAC3B,MAAM,OAAO,GAAG,iBAAiB,CAAC,GAAG,CAAsB,4CAAyB,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QACrG,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;QACpE,yBAAyB,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QACnD,MAAM,iBAAiB,CAAC,GAAG,CAAC,4CAAyB,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QAClF,MAAM,WAAW,EAAE,CAAC;IACtB,CAAC,EACD,CAAC,aAAa,EAAE,WAAW,CAAC,CAC7B,CAAC;IAEF,MAAM,gBAAgB,GAAG,IAAA,mBAAW,EAClC,KAAK,EAAE,IAAuB,EAAE,EAAE;QAChC,MAAM,OAAO,GAAG,iBAAiB,CAAC,GAAG,CAAsB,4CAAyB,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QACrG,MAAM,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC;QAErE,IAAI,aAAa,IAAI,CAAC,EAAE,CAAC;YACvB,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC;QAChC,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrB,CAAC;QACD,UAAU,CAAC,OAAsB,CAAC,CAAC;QACnC,cAAc,CAAC,KAAK,CAAC,CAAC;QACtB,MAAM,yBAAyB,CAAC,iBAAiB,CAAC,IAA4B,CAAC,CAAC;QAChF,MAAM,iBAAiB,CAAC,GAAG,CAAC,4CAAyB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAC3E,MAAM,WAAW,EAAE,CAAC;IACtB,CAAC,EACD,CAAC,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC,CACpC,CAAC;IAEF,MAAM,qBAAqB,GAAG,IAAA,mBAAW,EAAC,CAAC,IAAY,EAAE,EAAE;QACzD,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,uBAAe,CAAC,KAAK;gBACxB,OAAO,IAAA,0BAAQ,EAAC,0BAA0B,CAAC,CAAC;YAC9C,KAAK,uBAAe,CAAC,GAAG;gBACtB,OAAO,IAAA,0BAAQ,EAAC,wBAAwB,CAAC,CAAC;YAC5C,KAAK,uBAAe,CAAC,OAAO;gBAC1B,OAAO,IAAA,0BAAQ,EAAC,4BAA4B,CAAC,CAAC;YAChD;gBACE,OAAO,IAAI,CAAC;QAChB,CAAC;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CACL,uCAAK,SAAS,EAAE,gCAAM,CAAC,SAAS;QAC9B,uCAAK,SAAS,EAAE,gCAAM,CAAC,MAAM;YAC3B;gBACE,sCAAI,SAAS,EAAE,gCAAM,CAAC,KAAK,kBAAkB;gBAC7C,qCAAG,SAAS,EAAE,gCAAM,CAAC,WAAW,0CAAyC,CACrE;YACN,0CAAQ,SAAS,EAAE,gCAAM,CAAC,SAAS,EAAE,OAAO,EAAE,eAAe,2BAEpD,CACL;QACN,uCAAK,SAAS,EAAE,gCAAM,CAAC,WAAW,IAC/B,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CACvB,uCAAK,GAAG,EAAE,MAAM,CAAC,IAAI,EAAE,SAAS,EAAE,gCAAM,CAAC,UAAU;YACjD,uCAAK,SAAS,EAAE,gCAAM,CAAC,YAAY;gBACjC,uCAAK,SAAS,EAAE,gCAAM,CAAC,cAAc;oBACnC,sCAAI,SAAS,EAAE,gCAAM,CAAC,UAAU,IAAG,MAAM,CAAC,IAAI,CAAM,CAChD;gBACN,uCAAK,SAAS,EAAE,gCAAM,CAAC,aAAa;oBACjC,MAAM,CAAC,IAAI,KAAK,gCAAuB,IAAI,CAC1C,0CAAQ,SAAS,EAAE,gCAAM,CAAC,UAAU,EAAE,KAAK,EAAC,MAAM,EAAC,OAAO,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,MAAM,CAAC;wBACxF,qCAAG,SAAS,EAAC,sBAAsB,GAAG,CAC/B,CACV;oBACD,0CACE,SAAS,EAAE,gCAAM,CAAC,UAAU,EAC5B,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAC1C,OAAO,EAAE,GAAG,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC;wBAElE,qCAAG,SAAS,EAAE,WAAW,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,qBAAqB,EAAE,GAAI,CACvF;oBACR,MAAM,CAAC,IAAI,KAAK,gCAAuB,IAAI,CAC1C,0CAAQ,SAAS,EAAE,gCAAM,CAAC,UAAU,EAAE,KAAK,EAAC,QAAQ,EAAC,OAAO,EAAE,GAAG,EAAE,CAAC,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC;wBACjG,qCAAG,SAAS,EAAC,uBAAuB,GAAG,CAChC,CACV,CACG,CACF;YACN,uCAAK,SAAS,EAAE,gCAAM,CAAC,YAAY;gBACjC,uCAAK,SAAS,EAAE,gCAAM,CAAC,SAAS;oBAC9B,wCAAM,SAAS,EAAE,gCAAM,CAAC,WAAW,cAAgB;oBACnD,wCAAM,SAAS,EAAE,GAAG,gCAAM,CAAC,YAAY,IAAI,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,gCAAM,CAAC,OAAO,CAAC,CAAC,CAAC,gCAAM,CAAC,OAAO,EAAE,IAC5F,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CACpC,CACH;gBACL,MAAM,CAAC,IAAI,IAAI,CACd,uCAAK,SAAS,EAAE,gCAAM,CAAC,SAAS;oBAC9B,wCAAM,SAAS,EAAE,gCAAM,CAAC,WAAW,YAAc;oBACjD,8BAAC,sBAAK,IAAC,SAAS,EAAE,IAAA,oBAAG,EAAC,gCAAM,CAAC,UAAU,EAAE,gCAAM,CAAC,OAAO,CAAC,IAAG,qBAAqB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAS,CAClG,CACP,CACG;YACL,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,CAC1C,uCAAK,SAAS,EAAE,gCAAM,CAAC,YAAY;gBACjC,uCAAK,SAAS,EAAE,gCAAM,CAAC,SAAS;oBAC9B,wCAAM,SAAS,EAAE,gCAAM,CAAC,WAAW,aAAe;oBAClD,wCAAM,SAAS,EAAE,gCAAM,CAAC,aAAa,IAClC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CACjC,wCAAM,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,gCAAM,CAAC,OAAO,IACxC,IAAI,CACA,CACR,CAAC,CACG,CACH,CACF,CACP;YACA,MAAM,CAAC,OAAO,IAAI,CACjB,uCAAK,SAAS,EAAE,gCAAM,CAAC,YAAY;gBACjC,uCAAK,SAAS,EAAE,gCAAM,CAAC,SAAS;oBAC9B,wCAAM,SAAS,EAAE,gCAAM,CAAC,WAAW,eAAiB;oBACpD,wCAAM,SAAS,EAAE,gCAAM,CAAC,aAAa,IAAG,MAAM,CAAC,OAAO,CAAQ,CAC1D,CACF,CACP;YACA,MAAM,CAAC,UAAU,IAAI,CACpB,uCAAK,SAAS,EAAE,gCAAM,CAAC,YAAY;gBACjC,uCAAK,SAAS,EAAE,gCAAM,CAAC,SAAS;oBAC9B,wCAAM,SAAS,EAAE,gCAAM,CAAC,WAAW,mBAAqB;oBACxD,wCAAM,SAAS,EAAE,IAAA,oBAAG,EAAC,gCAAM,CAAC,aAAa,EAAE,gCAAM,CAAC,IAAI,CAAC,IAAG,MAAM,CAAC,UAAU,CAAQ,CAC/E,CACF,CACP,CACG,CACP,CAAC,CACE;QACN,8BAAC,+BAAa,IACZ,OAAO,EAAE,WAAW,EACpB,WAAW,EAAE,aAAa,EAC1B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,gBAAgB,EACxB,QAAQ,EAAE,GAAG,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,GACrC,CACE,CACP,CAAC;AACJ,CAAC,CAAC;AA3OW,QAAA,aAAa,iBA2OxB"}
@@ -1 +1 @@
1
- {"version":3,"file":"mcp-config.contribution.js","sourceRoot":"","sources":["../../../../src/browser/mcp/config/mcp-config.contribution.ts"],"names":[],"mappings":";;;;AAAA,qCAAyC;AACzC,sEAAuE;AACvE,+DAAwD;AACxD,kEAMgD;AAChD,6DAA8D;AAC9D,+DAAuE;AAEvE,kEAA6D;AAE7D,MAAM,aAAa,GAAG,4BAA4B,CAAC;AACtC,QAAA,+BAA+B,GAAG,YAAY,CAAC;AAKrD,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAUhC,uBAAuB,CAAC,QAAiC;QACvD,QAAQ,CAAC,uBAAuB,CAAC;YAC/B,GAAG,EAAE,aAAa;YAClB,MAAM,EAAE,uCAA+B;YACvC,SAAS,EAAE,+BAAa;YACxB,UAAU,EAAE,iCAAyB,CAAC,iBAAiB;SACxD,CAAC,CAAC;QAEH,QAAQ,CAAC,+BAA+B,CAAC,uCAA+B,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE;YAC9F,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,WAAW;gBACjB,WAAW,EAAE,aAAa;aAC3B,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,gBAAgB,CAAC,OAAwB;QACvC,OAAO,CAAC,wBAAwB,CAAC;YAC/B,MAAM,EAAE,uCAA+B;YACvC,eAAe,EAAE,KAAK,EAAE,GAAQ,EAA+B,EAAE;gBAC/D,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,cAAc,EAAE,CAAC;gBAE5C,OAAO;oBACL,GAAG;oBACH,IAAI,EAAE,mBAAmB;oBACzB,IAAI,EAAE,UAAU;oBAChB,QAAQ,EAAE;wBACR,UAAU;qBACX;iBACF,CAAC;YACJ,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AA3CY,sDAAqB;AAEb;IADlB,IAAA,cAAS,EAAC,0BAAiB,CAAC;;+DAC0B;AAGpC;IADlB,IAAA,cAAS,EAAC,qBAAW,CAAC;sCACS,qBAAW;0DAAC;AAG5C;IADC,IAAA,cAAS,GAAE;sCACE,uBAAY;2DAAC;gCARhB,qBAAqB;IADjC,IAAA,wBAAM,EAAC,iCAAyB,CAAC;GACrB,qBAAqB,CA2CjC"}
1
+ {"version":3,"file":"mcp-config.contribution.js","sourceRoot":"","sources":["../../../../src/browser/mcp/config/mcp-config.contribution.ts"],"names":[],"mappings":";;;;AAAA,qCAAyC;AACzC,sEAAuE;AACvE,+DAAiE;AACjE,kEAMgD;AAChD,6DAA8D;AAC9D,+DAAuE;AAEvE,kEAA6D;AAE7D,MAAM,aAAa,GAAG,4BAA4B,CAAC;AACtC,QAAA,+BAA+B,GAAG,YAAY,CAAC;AAKrD,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAUhC,uBAAuB,CAAC,QAAiC;QACvD,QAAQ,CAAC,uBAAuB,CAAC;YAC/B,GAAG,EAAE,aAAa;YAClB,MAAM,EAAE,uCAA+B;YACvC,SAAS,EAAE,+BAAa;YACxB,UAAU,EAAE,iCAAyB,CAAC,iBAAiB;SACxD,CAAC,CAAC;QAEH,QAAQ,CAAC,+BAA+B,CAAC,uCAA+B,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE;YAC9F,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,WAAW;gBACjB,WAAW,EAAE,aAAa;aAC3B,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,gBAAgB,CAAC,OAAwB;QACvC,OAAO,CAAC,wBAAwB,CAAC;YAC/B,MAAM,EAAE,uCAA+B;YACvC,eAAe,EAAE,KAAK,EAAE,GAAQ,EAA+B,EAAE;gBAC/D,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,cAAc,EAAE,CAAC;gBAE5C,OAAO;oBACL,GAAG;oBACH,IAAI,EAAE,mBAAmB;oBACzB,IAAI,EAAE,UAAU;oBAChB,QAAQ,EAAE;wBACR,UAAU;qBACX;iBACF,CAAC;YACJ,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AA3CY,sDAAqB;AAEb;IADlB,IAAA,cAAS,EAAC,0BAAiB,CAAC;;+DAC0B;AAGpC;IADlB,IAAA,cAAS,EAAC,qBAAW,CAAC;sCACS,qBAAW;0DAAC;AAG5C;IADC,IAAA,cAAS,GAAE;sCACE,uBAAY;2DAAC;gCARhB,qBAAqB;IADjC,IAAA,wBAAM,EAAC,iCAAyB,CAAC;GACrB,qBAAqB,CA2CjC"}
@@ -11,8 +11,8 @@ const base_apply_service_1 = require("../../base-apply.service");
11
11
  */
12
12
  let EditFileHandler = class EditFileHandler {
13
13
  async handler(params, toolCallId) {
14
- const { targetFile, codeEdit } = params;
15
- const block = await this.applyService.registerCodeBlock(targetFile, codeEdit, toolCallId);
14
+ const { targetFile, codeEdit, instructions } = params;
15
+ const block = await this.applyService.registerCodeBlock(targetFile, codeEdit, toolCallId, instructions);
16
16
  const blockData = await this.applyService.apply(block);
17
17
  return blockData;
18
18
  }
@@ -1 +1 @@
1
- {"version":3,"file":"EditFile.js","sourceRoot":"","sources":["../../../../../src/browser/mcp/tools/handlers/EditFile.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AAErD,iEAA4D;AAE5D;;;;GAIG;AAEI,IAAM,eAAe,GAArB,MAAM,eAAe;IAI1B,KAAK,CAAC,OAAO,CAAC,MAAuE,EAAE,UAAkB;QACvG,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;QACxC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QAC1F,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACvD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF,CAAA;AAVY,0CAAe;AAElB;IADP,IAAA,cAAS,EAAC,qCAAgB,CAAC;sCACN,qCAAgB;qDAAC;0BAF5B,eAAe;IAD3B,IAAA,eAAU,GAAE;GACA,eAAe,CAU3B"}
1
+ {"version":3,"file":"EditFile.js","sourceRoot":"","sources":["../../../../../src/browser/mcp/tools/handlers/EditFile.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AAErD,iEAA4D;AAE5D;;;;GAIG;AAEI,IAAM,eAAe,GAArB,MAAM,eAAe;IAI1B,KAAK,CAAC,OAAO,CAAC,MAAuE,EAAE,UAAkB;QACvG,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;QACtD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;QACxG,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACvD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF,CAAA;AAVY,0CAAe;AAElB;IADP,IAAA,cAAS,EAAC,qCAAgB,CAAC;sCACN,qCAAgB;qDAAC;0BAF5B,eAAe;IAD3B,IAAA,eAAU,GAAE;GACA,eAAe,CAU3B"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@opensumi/ide-ai-native",
3
- "version": "3.8.2-next-1741408460.0",
3
+ "version": "3.8.2-next-1741413805.0",
4
4
  "files": [
5
5
  "lib",
6
6
  "src"
@@ -24,26 +24,26 @@
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.2-next-1741408460.0",
28
- "@opensumi/ide-components": "3.8.2-next-1741408460.0",
29
- "@opensumi/ide-connection": "3.8.2-next-1741408460.0",
30
- "@opensumi/ide-core-common": "3.8.2-next-1741408460.0",
31
- "@opensumi/ide-core-node": "3.8.2-next-1741408460.0",
32
- "@opensumi/ide-debug": "3.8.2-next-1741408460.0",
33
- "@opensumi/ide-design": "3.8.2-next-1741408460.0",
34
- "@opensumi/ide-editor": "3.8.2-next-1741408460.0",
35
- "@opensumi/ide-file-search": "3.8.2-next-1741408460.0",
36
- "@opensumi/ide-file-service": "3.8.2-next-1741408460.0",
37
- "@opensumi/ide-main-layout": "3.8.2-next-1741408460.0",
38
- "@opensumi/ide-markers": "3.8.2-next-1741408460.0",
39
- "@opensumi/ide-monaco": "3.8.2-next-1741408460.0",
40
- "@opensumi/ide-overlay": "3.8.2-next-1741408460.0",
41
- "@opensumi/ide-preferences": "3.8.2-next-1741408460.0",
42
- "@opensumi/ide-search": "3.8.2-next-1741408460.0",
43
- "@opensumi/ide-terminal-next": "3.8.2-next-1741408460.0",
44
- "@opensumi/ide-theme": "3.8.2-next-1741408460.0",
45
- "@opensumi/ide-utils": "3.8.2-next-1741408460.0",
46
- "@opensumi/ide-workspace": "3.8.2-next-1741408460.0",
27
+ "@opensumi/ide-addons": "3.8.2-next-1741413805.0",
28
+ "@opensumi/ide-components": "3.8.2-next-1741413805.0",
29
+ "@opensumi/ide-connection": "3.8.2-next-1741413805.0",
30
+ "@opensumi/ide-core-common": "3.8.2-next-1741413805.0",
31
+ "@opensumi/ide-core-node": "3.8.2-next-1741413805.0",
32
+ "@opensumi/ide-debug": "3.8.2-next-1741413805.0",
33
+ "@opensumi/ide-design": "3.8.2-next-1741413805.0",
34
+ "@opensumi/ide-editor": "3.8.2-next-1741413805.0",
35
+ "@opensumi/ide-file-search": "3.8.2-next-1741413805.0",
36
+ "@opensumi/ide-file-service": "3.8.2-next-1741413805.0",
37
+ "@opensumi/ide-main-layout": "3.8.2-next-1741413805.0",
38
+ "@opensumi/ide-markers": "3.8.2-next-1741413805.0",
39
+ "@opensumi/ide-monaco": "3.8.2-next-1741413805.0",
40
+ "@opensumi/ide-overlay": "3.8.2-next-1741413805.0",
41
+ "@opensumi/ide-preferences": "3.8.2-next-1741413805.0",
42
+ "@opensumi/ide-search": "3.8.2-next-1741413805.0",
43
+ "@opensumi/ide-terminal-next": "3.8.2-next-1741413805.0",
44
+ "@opensumi/ide-theme": "3.8.2-next-1741413805.0",
45
+ "@opensumi/ide-utils": "3.8.2-next-1741413805.0",
46
+ "@opensumi/ide-workspace": "3.8.2-next-1741413805.0",
47
47
  "@xterm/xterm": "5.5.0",
48
48
  "ai": "^4.1.45",
49
49
  "ansi-regex": "^2.0.0",
@@ -59,7 +59,7 @@
59
59
  "zod-to-json-schema": "^3.24.1"
60
60
  },
61
61
  "devDependencies": {
62
- "@opensumi/ide-core-browser": "3.8.2-next-1741408460.0"
62
+ "@opensumi/ide-core-browser": "3.8.2-next-1741413805.0"
63
63
  },
64
- "gitHead": "b55c757320fcd2eb6b231308882b7cfa1fb559af"
64
+ "gitHead": "93f47033c97b8eeef210beae18eff15975f163e2"
65
65
  }
@@ -37,7 +37,7 @@ export class ApplyService extends BaseApplyService {
37
37
  <code>${fileContent}</code>
38
38
 
39
39
  <update>${codeBlock.codeEdit}</update>
40
-
40
+ ${codeBlock.instructions ? `\nUser's intention: ${codeBlock.instructions}\n` : ''}
41
41
  Provide the complete updated code.
42
42
  `,
43
43
  {
@@ -1,14 +1,14 @@
1
- .chat_tool_render {
1
+ .chat-tool-render {
2
2
  margin: 8px 0;
3
3
  border: 1px solid var(--design-borderColor);
4
4
  border-radius: 6px;
5
5
  overflow: hidden;
6
6
 
7
- .tool_header {
7
+ .tool-header {
8
8
  display: flex;
9
9
  align-items: center;
10
10
  justify-content: space-between;
11
- padding: 4px;
11
+ padding: 8px 12px;
12
12
  background-color: var(--design-block-background);
13
13
  cursor: pointer;
14
14
  user-select: none;
@@ -18,25 +18,14 @@
18
18
  }
19
19
  }
20
20
 
21
- .tool_name {
22
- font-size: 12px;
21
+ .tool-name {
23
22
  display: flex;
24
23
  align-items: center;
25
24
  font-weight: 500;
26
25
  color: var(--design-text-foreground);
27
26
  }
28
27
 
29
- .tool_icon {
30
- font-size: 12px !important;
31
- }
32
-
33
- .tool_label {
34
- margin-left: 5px;
35
- font-size: 11px;
36
- color: var(--descriptionForeground);
37
- }
38
-
39
- .expand_icon {
28
+ .expand-icon {
40
29
  display: inline-block;
41
30
  margin-right: 8px;
42
31
  transition: transform 0.2s;
@@ -47,29 +36,29 @@
47
36
  }
48
37
  }
49
38
 
50
- .tool_state {
39
+ .tool-state {
51
40
  display: flex;
52
41
  align-items: center;
53
42
  font-size: 12px;
54
43
  color: var(--design-text-placeholderForeground);
55
44
  }
56
45
 
57
- .state_icon {
46
+ .state-icon {
58
47
  display: flex;
59
48
  align-items: center;
60
49
  margin-right: 6px;
61
50
  }
62
51
 
63
- .loading_icon {
52
+ .loading-icon {
64
53
  width: 12px;
65
54
  height: 12px;
66
55
  }
67
56
 
68
- .state_label {
57
+ .state-label {
69
58
  margin-left: 4px;
70
59
  }
71
60
 
72
- .tool_content {
61
+ .tool-content {
73
62
  max-height: 0;
74
63
  overflow: hidden;
75
64
  transition: max-height 0.3s ease-out;
@@ -80,19 +69,18 @@
80
69
  }
81
70
  }
82
71
 
83
- .tool_arguments,
84
- .tool_result {
85
- font-size: 11px;
86
- padding: 5px;
72
+ .tool-arguments,
73
+ .tool-result {
74
+ padding: 12px;
87
75
  }
88
76
 
89
- .section_label {
77
+ .section-label {
90
78
  font-size: 12px;
91
79
  color: var(--design-text-placeholderForeground);
92
80
  margin-bottom: 8px;
93
81
  }
94
82
 
95
- .tool_result {
83
+ .tool-result {
96
84
  border-top: 1px solid var(--design-borderColor);
97
85
  }
98
86
  }
@@ -5,7 +5,6 @@ import { useInjectable } from '@opensumi/ide-core-browser';
5
5
  import { Icon } from '@opensumi/ide-core-browser/lib/components';
6
6
  import { Loading } from '@opensumi/ide-core-browser/lib/components/ai-native';
7
7
  import { IChatToolContent, uuid } from '@opensumi/ide-core-common';
8
- import { localize } from '@opensumi/ide-core-common/lib/localize';
9
8
 
10
9
  import { IMCPServerRegistry, TokenMCPServerRegistry } from '../types';
11
10
 
@@ -65,29 +64,28 @@ export const ChatToolRender = (props: { value: IChatToolContent['content']; mess
65
64
  toolCallId={value.id}
66
65
  />
67
66
  ) : (
68
- <div className={styles.chat_tool_render}>
69
- <div className={styles.tool_header} onClick={toggleExpand}>
70
- <div className={styles.tool_name}>
71
- <Icon iconClass={`codicon codicon-chevron-${isExpanded ? 'down' : 'right'}`} />
72
- <Icon size='small' iconClass={cls('codicon codicon-tools', styles.tool_icon)} />
73
- <span className={styles.tool_label}>{label}</span>
67
+ <div className={styles['chat-tool-render']}>
68
+ <div className={styles['tool-header']} onClick={toggleExpand}>
69
+ <div className={styles['tool-name']}>
70
+ <Icon iconClass={`codicon codicon-triangle-${isExpanded ? 'down' : 'right'}`} />
71
+ {label}
74
72
  </div>
75
73
  {value.state && (
76
- <div className={styles.tool_state}>
77
- <span className={styles.state_icon}>{stateInfo.icon}</span>
74
+ <div className={styles['tool-state']}>
75
+ <span className={styles['state-icon']}>{stateInfo.icon}</span>
78
76
  </div>
79
77
  )}
80
78
  </div>
81
- <div className={cls(styles.tool_content, { [styles.expanded]: isExpanded })}>
79
+ <div className={cls(styles['tool-content'], { [styles.expanded]: isExpanded })}>
82
80
  {value?.function?.arguments && (
83
- <div className={styles.tool_arguments}>
84
- <div className={styles.section_label}>{localize('ai.native.mcp.tool.arguments')}:</div>
81
+ <div className={styles['tool-arguments']}>
82
+ <div className={styles['section-label']}>Arguments</div>
85
83
  <CodeEditorWithHighlight input={value?.function?.arguments} language={'json'} relationId={uuid(4)} />
86
84
  </div>
87
85
  )}
88
86
  {value?.result && (
89
- <div className={styles.tool_result}>
90
- <div className={styles.section_label}>{localize('ai.native.mcp.tool.results')}:</div>
87
+ <div className={styles['tool-result']}>
88
+ <div className={styles['section-label']}>Result</div>
91
89
  <CodeEditorWithHighlight input={value.result} language={'json'} relationId={uuid(4)} />
92
90
  </div>
93
91
  )}
@@ -225,7 +225,12 @@ export abstract class BaseApplyService extends WithEventBus {
225
225
  this.onCodeBlockUpdateEmitter.fire(codeBlock);
226
226
  }
227
227
 
228
- async registerCodeBlock(relativePath: string, content: string, toolCallId: string): Promise<CodeBlockData> {
228
+ async registerCodeBlock(
229
+ relativePath: string,
230
+ content: string,
231
+ toolCallId: string,
232
+ instructions?: string,
233
+ ): Promise<CodeBlockData> {
229
234
  const lastMessageId = this.chatInternalService.sessionModel.history.lastMessageId!;
230
235
  const uriCodeBlocks = this.getUriCodeBlocks(URI.file(path.join(this.appConfig.workspaceDir, relativePath)));
231
236
  const originalModelRef = await this.editorDocumentModelService.createModelReference(
@@ -240,6 +245,7 @@ export abstract class BaseApplyService extends WithEventBus {
240
245
  createdAt: Date.now(),
241
246
  toolCallId,
242
247
  messageId: lastMessageId,
248
+ instructions,
243
249
  // TODO: 支持range
244
250
  originalCode: originalModelRef.instance.getText(),
245
251
  };
@@ -565,8 +571,8 @@ export abstract class BaseApplyService extends WithEventBus {
565
571
  .split('\n')
566
572
  .map((line) => {
567
573
  if (line.startsWith('@@')) {
568
- const [, , , start, end] = line.match(/@@ -(\d+),(\d+) \+(\d+),(\d+) @@/)!;
569
- return new Range(parseInt(start, 10), 0, parseInt(end, 10), 0);
574
+ const [, , , start, lineCount] = line.match(/@@ -(\d+),(\d+) \+(\d+),(\d+) @@/)!;
575
+ return new Range(parseInt(start, 10), 0, parseInt(start, 10) + parseInt(lineCount, 10) - 1, 0);
570
576
  }
571
577
  return null;
572
578
  })
@@ -587,6 +593,7 @@ export abstract class BaseApplyService extends WithEventBus {
587
593
  result?: string;
588
594
  }>;
589
595
 
596
+ // FIXME: 貌似筛选逻辑不太对,需要重构
590
597
  // TODO: 支持使用内存中的document获取诊断信息,实现并行apply accept
591
598
  protected getDiagnosticInfos(uri: string, ranges: Range[]) {
592
599
  const markers = this.markerService.getManager().getMarkers({ resource: uri });
@@ -5,7 +5,6 @@ import { Badge } from '@opensumi/ide-components';
5
5
  import { AINativeSettingSectionsId, ILogger, useInjectable } from '@opensumi/ide-core-browser';
6
6
  import { PreferenceService } from '@opensumi/ide-core-browser/lib/preferences';
7
7
  import { localize } from '@opensumi/ide-core-common';
8
- import { IMessageService } from '@opensumi/ide-overlay/lib/common';
9
8
 
10
9
  import { BUILTIN_MCP_SERVER_NAME, ISumiMCPServerBackend, SumiMCPServerProxyServicePath } from '../../../../common';
11
10
  import { MCPServerDescription } from '../../../../common/mcp-server-manager';
@@ -20,7 +19,6 @@ export const MCPConfigView: React.FC = () => {
20
19
  const preferenceService = useInjectable<PreferenceService>(PreferenceService);
21
20
  const sumiMCPServerBackendProxy = useInjectable<ISumiMCPServerBackend>(SumiMCPServerProxyServicePath);
22
21
  const logger = useInjectable<ILogger>(ILogger);
23
- const messageService = useInjectable<IMessageService>(IMessageService);
24
22
  const [servers, setServers] = React.useState<MCPServer[]>([]);
25
23
  const [formVisible, setFormVisible] = React.useState(false);
26
24
  const [editingServer, setEditingServer] = React.useState<MCPServerFormData | undefined>();
@@ -90,9 +88,7 @@ export const MCPConfigView: React.FC = () => {
90
88
  await preferenceService.set(AINativeSettingSectionsId.MCPServers, updatedServers);
91
89
  await loadServers();
92
90
  } catch (error) {
93
- const msg = error.message || error;
94
91
  logger.error(`Failed to ${start ? 'start' : 'stop'} server ${serverName}:`, error);
95
- messageService.error(`Failed to ${start ? 'start' : 'stop'} server ${serverName}:` + msg);
96
92
  }
97
93
  },
98
94
  [mcpServerProxyService, preferenceService, sumiMCPServerBackendProxy, loadServers],
@@ -1,6 +1,6 @@
1
1
  import { Autowired } from '@opensumi/di';
2
2
  import { LabelService } from '@opensumi/ide-core-browser/lib/services';
3
- import { Domain, URI } from '@opensumi/ide-core-common';
3
+ import { Domain, Schemes, URI } from '@opensumi/ide-core-common';
4
4
  import {
5
5
  BrowserEditorContribution,
6
6
  EditorComponentRegistry,
@@ -13,8 +13,8 @@ export class EditFileHandler {
13
13
  private applyService: BaseApplyService;
14
14
 
15
15
  async handler(params: { targetFile: string; codeEdit: string; instructions?: string }, toolCallId: string) {
16
- const { targetFile, codeEdit } = params;
17
- const block = await this.applyService.registerCodeBlock(targetFile, codeEdit, toolCallId);
16
+ const { targetFile, codeEdit, instructions } = params;
17
+ const block = await this.applyService.registerCodeBlock(targetFile, codeEdit, toolCallId, instructions);
18
18
  const blockData = await this.applyService.apply(block);
19
19
  return blockData;
20
20
  }