@opensumi/ide-ai-native 3.7.2-next-1740064823.0 → 3.7.2-next-1740107209.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.
Files changed (196) hide show
  1. package/lib/browser/ai-core.contribution.d.ts.map +1 -1
  2. package/lib/browser/ai-core.contribution.js +4 -0
  3. package/lib/browser/ai-core.contribution.js.map +1 -1
  4. package/lib/browser/chat/chat-agent.service.d.ts.map +1 -1
  5. package/lib/browser/chat/chat-agent.service.js +6 -0
  6. package/lib/browser/chat/chat-agent.service.js.map +1 -1
  7. package/lib/browser/chat/chat-model.d.ts.map +1 -1
  8. package/lib/browser/chat/chat-model.js +5 -23
  9. package/lib/browser/chat/chat-model.js.map +1 -1
  10. package/lib/browser/chat/chat-proxy.service.d.ts +1 -0
  11. package/lib/browser/chat/chat-proxy.service.d.ts.map +1 -1
  12. package/lib/browser/chat/chat-proxy.service.js +8 -1
  13. package/lib/browser/chat/chat-proxy.service.js.map +1 -1
  14. package/lib/browser/chat/chat.internal.service.d.ts +4 -0
  15. package/lib/browser/chat/chat.internal.service.d.ts.map +1 -1
  16. package/lib/browser/chat/chat.internal.service.js +10 -1
  17. package/lib/browser/chat/chat.internal.service.js.map +1 -1
  18. package/lib/browser/chat/chat.view.d.ts.map +1 -1
  19. package/lib/browser/chat/chat.view.js +2 -2
  20. package/lib/browser/chat/chat.view.js.map +1 -1
  21. package/lib/browser/components/ChatEditor.d.ts +1 -0
  22. package/lib/browser/components/ChatEditor.d.ts.map +1 -1
  23. package/lib/browser/components/ChatEditor.js +3 -3
  24. package/lib/browser/components/ChatEditor.js.map +1 -1
  25. package/lib/browser/components/ChatMarkdown.d.ts +1 -0
  26. package/lib/browser/components/ChatMarkdown.d.ts.map +1 -1
  27. package/lib/browser/components/ChatMarkdown.js +2 -2
  28. package/lib/browser/components/ChatMarkdown.js.map +1 -1
  29. package/lib/browser/components/ChatReply.d.ts.map +1 -1
  30. package/lib/browser/components/ChatReply.js +6 -8
  31. package/lib/browser/components/ChatReply.js.map +1 -1
  32. package/lib/browser/components/ChatToolRender.d.ts +2 -1
  33. package/lib/browser/components/ChatToolRender.d.ts.map +1 -1
  34. package/lib/browser/components/ChatToolRender.js +40 -19
  35. package/lib/browser/components/ChatToolRender.js.map +1 -1
  36. package/lib/browser/components/components.module.less +3 -2
  37. package/lib/browser/index.d.ts.map +1 -1
  38. package/lib/browser/index.js +7 -0
  39. package/lib/browser/index.js.map +1 -1
  40. package/lib/browser/mcp/base-apply.service.d.ts +67 -0
  41. package/lib/browser/mcp/base-apply.service.d.ts.map +1 -0
  42. package/lib/browser/mcp/base-apply.service.js +290 -0
  43. package/lib/browser/mcp/base-apply.service.js.map +1 -0
  44. package/lib/browser/mcp/mcp-server-proxy.service.d.ts +6 -1
  45. package/lib/browser/mcp/mcp-server-proxy.service.d.ts.map +1 -1
  46. package/lib/browser/mcp/mcp-server-proxy.service.js +2 -1
  47. package/lib/browser/mcp/mcp-server-proxy.service.js.map +1 -1
  48. package/lib/browser/mcp/mcp-server.feature.registry.d.ts +5 -1
  49. package/lib/browser/mcp/mcp-server.feature.registry.d.ts.map +1 -1
  50. package/lib/browser/mcp/mcp-server.feature.registry.js +15 -0
  51. package/lib/browser/mcp/mcp-server.feature.registry.js.map +1 -1
  52. package/lib/browser/mcp/tools/components/EditFile.d.ts +3 -0
  53. package/lib/browser/mcp/tools/components/EditFile.d.ts.map +1 -0
  54. package/lib/browser/mcp/tools/components/EditFile.js +101 -0
  55. package/lib/browser/mcp/tools/components/EditFile.js.map +1 -0
  56. package/lib/browser/mcp/tools/components/index.module.less +67 -0
  57. package/lib/browser/mcp/tools/createNewFileWithText.d.ts.map +1 -1
  58. package/lib/browser/mcp/tools/createNewFileWithText.js +1 -2
  59. package/lib/browser/mcp/tools/createNewFileWithText.js.map +1 -1
  60. package/lib/browser/mcp/tools/editFile.d.ts +8 -0
  61. package/lib/browser/mcp/tools/editFile.d.ts.map +1 -0
  62. package/lib/browser/mcp/tools/editFile.js +95 -0
  63. package/lib/browser/mcp/tools/editFile.js.map +1 -0
  64. package/lib/browser/mcp/tools/findFilesByNameSubstring.d.ts.map +1 -1
  65. package/lib/browser/mcp/tools/findFilesByNameSubstring.js +1 -2
  66. package/lib/browser/mcp/tools/findFilesByNameSubstring.js.map +1 -1
  67. package/lib/browser/mcp/tools/getCurrentFilePath.d.ts.map +1 -1
  68. package/lib/browser/mcp/tools/getCurrentFilePath.js +1 -2
  69. package/lib/browser/mcp/tools/getCurrentFilePath.js.map +1 -1
  70. package/lib/browser/mcp/tools/getDiagnosticsByPath.d.ts.map +1 -1
  71. package/lib/browser/mcp/tools/getDiagnosticsByPath.js +1 -2
  72. package/lib/browser/mcp/tools/getDiagnosticsByPath.js.map +1 -1
  73. package/lib/browser/mcp/tools/getFileTextByPath.d.ts.map +1 -1
  74. package/lib/browser/mcp/tools/getFileTextByPath.js +1 -2
  75. package/lib/browser/mcp/tools/getFileTextByPath.js.map +1 -1
  76. package/lib/browser/mcp/tools/getOpenEditorFileDiagnostics.d.ts.map +1 -1
  77. package/lib/browser/mcp/tools/getOpenEditorFileDiagnostics.js +1 -2
  78. package/lib/browser/mcp/tools/getOpenEditorFileDiagnostics.js.map +1 -1
  79. package/lib/browser/mcp/tools/getOpenEditorFileText.d.ts.map +1 -1
  80. package/lib/browser/mcp/tools/getOpenEditorFileText.js +1 -2
  81. package/lib/browser/mcp/tools/getOpenEditorFileText.js.map +1 -1
  82. package/lib/browser/mcp/tools/getSelectedText.d.ts.map +1 -1
  83. package/lib/browser/mcp/tools/getSelectedText.js +1 -2
  84. package/lib/browser/mcp/tools/getSelectedText.js.map +1 -1
  85. package/lib/browser/mcp/tools/handlers/EditFile.d.ts +10 -0
  86. package/lib/browser/mcp/tools/handlers/EditFile.d.ts.map +1 -0
  87. package/lib/browser/mcp/tools/handlers/EditFile.js +28 -0
  88. package/lib/browser/mcp/tools/handlers/EditFile.js.map +1 -0
  89. package/lib/browser/mcp/tools/handlers/ReadFile.d.ts +6 -0
  90. package/lib/browser/mcp/tools/handlers/ReadFile.d.ts.map +1 -1
  91. package/lib/browser/mcp/tools/handlers/ReadFile.js +14 -0
  92. package/lib/browser/mcp/tools/handlers/ReadFile.js.map +1 -1
  93. package/lib/browser/mcp/tools/handlers/utils.d.ts +2 -0
  94. package/lib/browser/mcp/tools/handlers/utils.d.ts.map +1 -0
  95. package/lib/browser/mcp/tools/handlers/utils.js +7 -0
  96. package/lib/browser/mcp/tools/handlers/utils.js.map +1 -0
  97. package/lib/browser/mcp/tools/listDir.d.ts.map +1 -1
  98. package/lib/browser/mcp/tools/listDir.js +2 -4
  99. package/lib/browser/mcp/tools/listDir.js.map +1 -1
  100. package/lib/browser/mcp/tools/readFile.d.ts.map +1 -1
  101. package/lib/browser/mcp/tools/readFile.js +2 -4
  102. package/lib/browser/mcp/tools/readFile.js.map +1 -1
  103. package/lib/browser/mcp/tools/replaceOpenEditorFile.d.ts.map +1 -1
  104. package/lib/browser/mcp/tools/replaceOpenEditorFile.js +6 -5
  105. package/lib/browser/mcp/tools/replaceOpenEditorFile.js.map +1 -1
  106. package/lib/browser/mcp/tools/replaceOpenEditorFileByDiffPreviewer.d.ts.map +1 -1
  107. package/lib/browser/mcp/tools/replaceOpenEditorFileByDiffPreviewer.js +1 -2
  108. package/lib/browser/mcp/tools/replaceOpenEditorFileByDiffPreviewer.js.map +1 -1
  109. package/lib/browser/mcp/tools/runTerminalCmd.d.ts.map +1 -1
  110. package/lib/browser/mcp/tools/runTerminalCmd.js +1 -2
  111. package/lib/browser/mcp/tools/runTerminalCmd.js.map +1 -1
  112. package/lib/browser/preferences/schema.d.ts.map +1 -1
  113. package/lib/browser/preferences/schema.js +5 -0
  114. package/lib/browser/preferences/schema.js.map +1 -1
  115. package/lib/browser/types.d.ts +14 -10
  116. package/lib/browser/types.d.ts.map +1 -1
  117. package/lib/browser/types.js +1 -2
  118. package/lib/browser/types.js.map +1 -1
  119. package/lib/browser/widget/inline-stream-diff/inline-stream-diff.handler.d.ts +1 -0
  120. package/lib/browser/widget/inline-stream-diff/inline-stream-diff.handler.d.ts.map +1 -1
  121. package/lib/browser/widget/inline-stream-diff/inline-stream-diff.handler.js +3 -0
  122. package/lib/browser/widget/inline-stream-diff/inline-stream-diff.handler.js.map +1 -1
  123. package/lib/browser/widget/inline-stream-diff/live-preview.component.d.ts +4 -0
  124. package/lib/browser/widget/inline-stream-diff/live-preview.component.d.ts.map +1 -1
  125. package/lib/browser/widget/inline-stream-diff/live-preview.component.js.map +1 -1
  126. package/lib/browser/widget/inline-stream-diff/live-preview.decoration.d.ts.map +1 -1
  127. package/lib/browser/widget/inline-stream-diff/live-preview.decoration.js +1 -0
  128. package/lib/browser/widget/inline-stream-diff/live-preview.decoration.js.map +1 -1
  129. package/lib/common/index.d.ts +1 -0
  130. package/lib/common/index.d.ts.map +1 -1
  131. package/lib/common/index.js.map +1 -1
  132. package/lib/common/prompts/context-prompt-provider.d.ts +14 -0
  133. package/lib/common/prompts/context-prompt-provider.d.ts.map +1 -0
  134. package/lib/common/prompts/context-prompt-provider.js +38 -0
  135. package/lib/common/prompts/context-prompt-provider.js.map +1 -0
  136. package/lib/common/utils.d.ts +1 -0
  137. package/lib/common/utils.d.ts.map +1 -1
  138. package/lib/common/utils.js +3 -1
  139. package/lib/common/utils.js.map +1 -1
  140. package/lib/node/base-language-model.d.ts +2 -2
  141. package/lib/node/base-language-model.d.ts.map +1 -1
  142. package/lib/node/base-language-model.js +8 -4
  143. package/lib/node/base-language-model.js.map +1 -1
  144. package/lib/node/mcp-server-manager-impl.d.ts.map +1 -1
  145. package/lib/node/mcp-server-manager-impl.js +2 -1
  146. package/lib/node/mcp-server-manager-impl.js.map +1 -1
  147. package/lib/node/openai/openai-language-model.d.ts +1 -1
  148. package/lib/node/openai/openai-language-model.d.ts.map +1 -1
  149. package/lib/node/openai/openai-language-model.js +2 -2
  150. package/lib/node/openai/openai-language-model.js.map +1 -1
  151. package/package.json +23 -25
  152. package/src/browser/ai-core.contribution.ts +4 -0
  153. package/src/browser/chat/chat-agent.service.ts +7 -0
  154. package/src/browser/chat/chat-model.ts +0 -2
  155. package/src/browser/chat/chat-proxy.service.ts +12 -2
  156. package/src/browser/chat/chat.internal.service.ts +12 -1
  157. package/src/browser/chat/chat.view.tsx +2 -1
  158. package/src/browser/components/ChatEditor.tsx +13 -10
  159. package/src/browser/components/ChatMarkdown.tsx +3 -1
  160. package/src/browser/components/ChatReply.tsx +8 -15
  161. package/src/browser/components/ChatToolRender.tsx +41 -20
  162. package/src/browser/components/components.module.less +3 -2
  163. package/src/browser/index.ts +7 -0
  164. package/src/browser/mcp/base-apply.service.ts +349 -0
  165. package/src/browser/mcp/mcp-server-proxy.service.ts +4 -2
  166. package/src/browser/mcp/mcp-server.feature.registry.ts +25 -3
  167. package/src/browser/mcp/tools/components/EditFile.tsx +144 -0
  168. package/src/browser/mcp/tools/components/index.module.less +67 -0
  169. package/src/browser/mcp/tools/createNewFileWithText.ts +1 -2
  170. package/src/browser/mcp/tools/editFile.ts +100 -0
  171. package/src/browser/mcp/tools/findFilesByNameSubstring.ts +1 -2
  172. package/src/browser/mcp/tools/getCurrentFilePath.ts +1 -2
  173. package/src/browser/mcp/tools/getDiagnosticsByPath.ts +1 -2
  174. package/src/browser/mcp/tools/getFileTextByPath.ts +1 -2
  175. package/src/browser/mcp/tools/getOpenEditorFileDiagnostics.ts +1 -2
  176. package/src/browser/mcp/tools/getOpenEditorFileText.ts +1 -2
  177. package/src/browser/mcp/tools/getSelectedText.ts +1 -2
  178. package/src/browser/mcp/tools/handlers/EditFile.ts +21 -0
  179. package/src/browser/mcp/tools/handlers/ReadFile.ts +19 -1
  180. package/src/browser/mcp/tools/handlers/utils.ts +3 -0
  181. package/src/browser/mcp/tools/listDir.ts +2 -4
  182. package/src/browser/mcp/tools/readFile.ts +2 -4
  183. package/src/browser/mcp/tools/replaceOpenEditorFile.ts +8 -7
  184. package/src/browser/mcp/tools/replaceOpenEditorFileByDiffPreviewer.ts +1 -2
  185. package/src/browser/mcp/tools/runTerminalCmd.ts +1 -2
  186. package/src/browser/preferences/schema.ts +5 -0
  187. package/src/browser/types.ts +15 -11
  188. package/src/browser/widget/inline-stream-diff/inline-stream-diff.handler.tsx +4 -0
  189. package/src/browser/widget/inline-stream-diff/live-preview.component.tsx +4 -0
  190. package/src/browser/widget/inline-stream-diff/live-preview.decoration.tsx +1 -0
  191. package/src/common/index.ts +1 -0
  192. package/src/common/prompts/context-prompt-provider.ts +46 -0
  193. package/src/common/utils.ts +2 -0
  194. package/src/node/base-language-model.ts +17 -4
  195. package/src/node/mcp-server-manager-impl.ts +2 -1
  196. package/src/node/openai/openai-language-model.ts +2 -2
@@ -0,0 +1,290 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.BaseApplyService = void 0;
4
+ const tslib_1 = require("tslib");
5
+ const diff_1 = require("diff");
6
+ const di_1 = require("@opensumi/di");
7
+ const ide_core_browser_1 = require("@opensumi/ide-core-browser");
8
+ const ide_editor_1 = require("@opensumi/ide-editor");
9
+ const browser_1 = require("@opensumi/ide-editor/lib/browser");
10
+ const ide_markers_1 = require("@opensumi/ide-markers");
11
+ const ide_monaco_1 = require("@opensumi/ide-monaco");
12
+ const observable_1 = require("@opensumi/ide-monaco/lib/common/observable");
13
+ const ide_utils_1 = require("@opensumi/ide-utils");
14
+ const common_1 = require("../../common");
15
+ const chat_internal_service_1 = require("../chat/chat.internal.service");
16
+ const inline_diff_1 = require("../widget/inline-diff");
17
+ const ReadFile_1 = require("./tools/handlers/ReadFile");
18
+ // 提供代码块的唯一索引,迭代轮次,生成状态管理(包括取消),关联文件位置这些信息的记录,后续并行 apply 的支持
19
+ class BaseApplyService extends ide_core_browser_1.WithEventBus {
20
+ constructor() {
21
+ super();
22
+ this.codeBlockMapObservable = (0, observable_1.observableValue)(this, new Map());
23
+ this.addDispose(this.chatInternalService.onCancelRequest(() => {
24
+ this.cancelAllApply();
25
+ }));
26
+ this.addDispose(this.chatInternalService.onRegenerateRequest(() => {
27
+ const messages = this.chatInternalService.sessionModel.history.getMessages();
28
+ const messageId = messages[messages.length - 1].id;
29
+ messageId && this.disposeApplyForMessage(messageId);
30
+ }));
31
+ }
32
+ onEditorGroupClose(event) {
33
+ var _a, _b;
34
+ if (((_b = (_a = this.activePreviewer) === null || _a === void 0 ? void 0 : _a.getNode()) === null || _b === void 0 ? void 0 : _b.uri.path.toString()) === event.payload.resource.uri.path.toString()) {
35
+ this.activePreviewer.dispose();
36
+ this.activePreviewer = undefined;
37
+ }
38
+ }
39
+ /**
40
+ * Get the code block data by relative or absolute path of the last assistant message
41
+ */
42
+ getCodeBlock(relativeOrAbsolutePath, messageId) {
43
+ if (!relativeOrAbsolutePath) {
44
+ return undefined;
45
+ }
46
+ const blockId = this.generateBlockId(relativeOrAbsolutePath, messageId);
47
+ return this.codeBlockMapObservable.get().get(blockId);
48
+ }
49
+ getCodeBlockById(id) {
50
+ return this.codeBlockMapObservable.get().get(id);
51
+ }
52
+ updateCodeBlock(codeBlock) {
53
+ const codeBlockMap = new Map(this.codeBlockMapObservable.get());
54
+ codeBlockMap.set(codeBlock.id, codeBlock);
55
+ (0, observable_1.transaction)((tx) => {
56
+ this.codeBlockMapObservable.set(codeBlockMap, tx);
57
+ });
58
+ }
59
+ /**
60
+ * Register a new code block and return its unique ID
61
+ */
62
+ registerCodeBlock(relativePath, content) {
63
+ const blockId = this.generateBlockId(relativePath);
64
+ if (!this.codeBlockMapObservable.get().has(blockId)) {
65
+ this.codeBlockMapObservable.get().set(blockId, {
66
+ id: blockId,
67
+ content,
68
+ relativePath,
69
+ status: 'generating',
70
+ iterationCount: 0,
71
+ createdAt: Date.now(),
72
+ });
73
+ }
74
+ return blockId;
75
+ }
76
+ initToolCallId(blockId, toolCallId) {
77
+ const blockData = this.getCodeBlockById(blockId);
78
+ if (blockData && !blockData.initToolCallId) {
79
+ blockData.initToolCallId = toolCallId;
80
+ }
81
+ }
82
+ /**
83
+ * Apply changes of a code block
84
+ */
85
+ async apply(relativePath, newContent, instructions) {
86
+ const blockData = this.getCodeBlock(relativePath);
87
+ if (!blockData) {
88
+ throw new Error('Code block not found');
89
+ }
90
+ try {
91
+ if (++blockData.iterationCount > 3) {
92
+ throw new Error('Max iteration count exceeded');
93
+ }
94
+ blockData.status = 'generating';
95
+ blockData.content = newContent;
96
+ this.updateCodeBlock(blockData);
97
+ const applyDiffResult = await this.doApply(relativePath, newContent, instructions);
98
+ blockData.applyResult = applyDiffResult;
99
+ this.updateCodeBlock(blockData);
100
+ return blockData;
101
+ }
102
+ catch (err) {
103
+ blockData.status = 'failed';
104
+ this.updateCodeBlock(blockData);
105
+ throw err;
106
+ }
107
+ }
108
+ async reRenderPendingApply() {
109
+ if (!this.pendingApplyParams) {
110
+ throw new Error('No pending apply params');
111
+ }
112
+ const result = await this.renderApplyResult(this.pendingApplyParams.relativePath, this.pendingApplyParams.newContent, this.pendingApplyParams.range);
113
+ if (result) {
114
+ const blockData = this.getCodeBlock(this.pendingApplyParams.relativePath);
115
+ blockData.applyResult = result;
116
+ this.updateCodeBlock(blockData);
117
+ }
118
+ }
119
+ async renderApplyResult(relativePath, newContent, range) {
120
+ var _a;
121
+ // 用户可能会关闭编辑器,所以需要缓存参数
122
+ this.pendingApplyParams = {
123
+ relativePath,
124
+ newContent,
125
+ range,
126
+ };
127
+ const blockData = this.getCodeBlock(relativePath);
128
+ if (!blockData) {
129
+ throw new Error('Code block not found');
130
+ }
131
+ const openResult = await this.editorService.open(ide_utils_1.URI.file(ide_utils_1.path.join(this.appConfig.workspaceDir, relativePath)));
132
+ if (!openResult) {
133
+ throw new Error('Failed to open editor');
134
+ }
135
+ const editor = openResult.group.codeEditor.monacoEditor;
136
+ const inlineDiffController = inline_diff_1.InlineDiffController.get(editor);
137
+ blockData.status = 'pending';
138
+ this.updateCodeBlock(blockData);
139
+ range = range || ((_a = editor.getModel()) === null || _a === void 0 ? void 0 : _a.getFullModelRange());
140
+ // Create diff previewer
141
+ const previewer = inlineDiffController.createDiffPreviewer(editor, ide_monaco_1.Selection.fromRange(range, ide_monaco_1.SelectionDirection.LTR), {
142
+ disposeWhenEditorClosed: true,
143
+ renderRemovedWidgetImmediately: true,
144
+ });
145
+ this.activePreviewer = previewer;
146
+ const fullOriginalContent = editor.getModel().getValue();
147
+ const savedContent = editor.getModel().getValueInRange(range);
148
+ const deferred = new ide_utils_1.Deferred();
149
+ if (newContent === savedContent) {
150
+ blockData.status = 'success';
151
+ deferred.resolve();
152
+ }
153
+ else {
154
+ previewer.setValue(newContent);
155
+ this.addDispose(this.inlineDiffService.onPartialEdit((event) => {
156
+ // TODO 支持自动保存
157
+ if (event.totalPartialEditCount === event.resolvedPartialEditCount) {
158
+ if (event.acceptPartialEditCount > 0) {
159
+ blockData.status = 'success';
160
+ const appliedResult = editor.getModel().getValue();
161
+ const diffResult = (0, diff_1.createPatch)(relativePath, fullOriginalContent, appliedResult)
162
+ .split('\n')
163
+ .slice(4)
164
+ .join('\n');
165
+ const rangesFromDiffHunk = diffResult
166
+ .split('\n')
167
+ .map((line) => {
168
+ if (line.startsWith('@@')) {
169
+ const [, , , start, end] = line.match(/@@ -(\d+),(\d+) \+(\d+),(\d+) @@/);
170
+ return new ide_monaco_1.Range(parseInt(start, 10), 0, parseInt(end, 10), 0);
171
+ }
172
+ return null;
173
+ })
174
+ .filter((range) => range !== null);
175
+ const diagnosticInfos = this.getdiagnosticInfos(editor.getModel().uri.toString(), rangesFromDiffHunk);
176
+ // 移除开头的几个固定信息,避免浪费 tokens
177
+ deferred.resolve({
178
+ diff: diffResult,
179
+ diagnosticInfos,
180
+ });
181
+ }
182
+ else {
183
+ // 用户全部取消
184
+ blockData.status = 'cancelled';
185
+ deferred.resolve();
186
+ }
187
+ }
188
+ }));
189
+ }
190
+ return deferred.promise;
191
+ }
192
+ /**
193
+ * Cancel an ongoing apply operation
194
+ */
195
+ cancelApply(relativePath) {
196
+ var _a;
197
+ const blockData = this.getCodeBlock(relativePath);
198
+ if (blockData && (blockData.status === 'generating' || blockData.status === 'pending')) {
199
+ if (this.activePreviewer) {
200
+ (_a = this.activePreviewer.getNode()) === null || _a === void 0 ? void 0 : _a.livePreviewDiffDecorationModel.discardUnProcessed();
201
+ this.activePreviewer.dispose();
202
+ }
203
+ blockData.status = 'cancelled';
204
+ this.updateCodeBlock(blockData);
205
+ }
206
+ }
207
+ cancelAllApply() {
208
+ this.codeBlockMapObservable.get().forEach((blockData) => {
209
+ if (blockData.status === 'generating' || blockData.status === 'pending') {
210
+ this.cancelApply(blockData.relativePath);
211
+ }
212
+ });
213
+ }
214
+ disposeApplyForMessage(messageId) {
215
+ this.codeBlockMapObservable.get().forEach((blockData) => {
216
+ if (blockData.id.endsWith(':' + messageId)) {
217
+ if (blockData.status === 'generating') {
218
+ this.cancelApply(blockData.relativePath);
219
+ }
220
+ this.codeBlockMapObservable.get().delete(blockData.id);
221
+ }
222
+ });
223
+ }
224
+ revealApplyPosition(blockId) {
225
+ var _a;
226
+ const blockData = this.codeBlockMapObservable.get().get(blockId);
227
+ if (blockData) {
228
+ const hunkInfo = (_a = blockData.applyResult) === null || _a === void 0 ? void 0 : _a.diff.split('\n').find((line) => line.startsWith('@@'));
229
+ let startLine = 0;
230
+ let endLine = 0;
231
+ if (hunkInfo) {
232
+ // 取改动后的区间
233
+ const [, , , start, end] = hunkInfo.match(/@@ -(\d+),(\d+) \+(\d+),(\d+) @@/);
234
+ startLine = parseInt(start, 10) - 1;
235
+ endLine = parseInt(end, 10) - 1;
236
+ }
237
+ this.editorService.open(ide_utils_1.URI.file(ide_utils_1.path.join(this.appConfig.workspaceDir, blockData.relativePath)));
238
+ const editor = this.editorService.currentEditor;
239
+ if (editor) {
240
+ editor.setSelection(new ide_monaco_1.Selection(startLine, 0, endLine, 0));
241
+ }
242
+ }
243
+ }
244
+ generateBlockId(absoluteOrRelativePath, messageId) {
245
+ if (!absoluteOrRelativePath.startsWith('/')) {
246
+ absoluteOrRelativePath = ide_utils_1.path.join(this.appConfig.workspaceDir, absoluteOrRelativePath);
247
+ }
248
+ const sessionId = this.chatInternalService.sessionModel.sessionId;
249
+ const messages = this.chatInternalService.sessionModel.history.getMessages();
250
+ messageId = messageId || messages[messages.length - 1].id;
251
+ return `${sessionId}:${absoluteOrRelativePath}:${messageId || '-'}`;
252
+ }
253
+ getdiagnosticInfos(uri, ranges) {
254
+ const markers = this.markerService.getManager().getMarkers({ resource: uri });
255
+ return markers.filter((marker) => marker.severity >= ide_core_browser_1.MarkerSeverity.Warning &&
256
+ ranges.some((range) => range.containsPosition(new ide_monaco_1.Position(marker.startLineNumber, marker.startColumn))));
257
+ }
258
+ }
259
+ exports.BaseApplyService = BaseApplyService;
260
+ tslib_1.__decorate([
261
+ (0, di_1.Autowired)(ReadFile_1.FileHandler),
262
+ tslib_1.__metadata("design:type", ReadFile_1.FileHandler)
263
+ ], BaseApplyService.prototype, "fileHandler", void 0);
264
+ tslib_1.__decorate([
265
+ (0, di_1.Autowired)(common_1.IChatInternalService),
266
+ tslib_1.__metadata("design:type", chat_internal_service_1.ChatInternalService)
267
+ ], BaseApplyService.prototype, "chatInternalService", void 0);
268
+ tslib_1.__decorate([
269
+ (0, di_1.Autowired)(ide_core_browser_1.AppConfig),
270
+ tslib_1.__metadata("design:type", Object)
271
+ ], BaseApplyService.prototype, "appConfig", void 0);
272
+ tslib_1.__decorate([
273
+ (0, di_1.Autowired)(ide_editor_1.WorkbenchEditorService),
274
+ tslib_1.__metadata("design:type", ide_editor_1.WorkbenchEditorService)
275
+ ], BaseApplyService.prototype, "editorService", void 0);
276
+ tslib_1.__decorate([
277
+ (0, di_1.Autowired)(inline_diff_1.InlineDiffService),
278
+ tslib_1.__metadata("design:type", inline_diff_1.InlineDiffService)
279
+ ], BaseApplyService.prototype, "inlineDiffService", void 0);
280
+ tslib_1.__decorate([
281
+ (0, di_1.Autowired)(ide_markers_1.IMarkerService),
282
+ tslib_1.__metadata("design:type", Object)
283
+ ], BaseApplyService.prototype, "markerService", void 0);
284
+ tslib_1.__decorate([
285
+ (0, ide_core_browser_1.OnEvent)(browser_1.EditorGroupCloseEvent),
286
+ tslib_1.__metadata("design:type", Function),
287
+ tslib_1.__metadata("design:paramtypes", [browser_1.EditorGroupCloseEvent]),
288
+ tslib_1.__metadata("design:returntype", void 0)
289
+ ], BaseApplyService.prototype, "onEditorGroupClose", null);
290
+ //# sourceMappingURL=base-apply.service.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"base-apply.service.js","sourceRoot":"","sources":["../../../src/browser/mcp/base-apply.service.ts"],"names":[],"mappings":"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"}
@@ -16,7 +16,12 @@ export declare class MCPServerProxyService implements IMCPServerProxyService {
16
16
  $getMCPTools(): Promise<{
17
17
  name: string;
18
18
  description: string;
19
- inputSchema: any;
19
+ inputSchema: import("zod-to-json-schema").JsonSchema7Type & {
20
+ $schema?: string | undefined;
21
+ definitions?: {
22
+ [key: string]: import("zod-to-json-schema").JsonSchema7Type;
23
+ } | undefined;
24
+ };
20
25
  providerName: string;
21
26
  }[]>;
22
27
  $updateMCPServers(): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"mcp-server-proxy.service.d.ts","sourceRoot":"","sources":["../../../src/browser/mcp/mcp-server-proxy.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAW,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAG3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAG5D,qBACa,qBAAsB,YAAW,sBAAsB;IAElE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqB;IAGvD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IAGjC,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAwB;IAElE,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAsB;IAC1D,SAAgB,kBAAkB,EAAE,KAAK,CAAC,GAAG,CAAC,CAAkC;IAGhF,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG;;;;;;;IAK9B,YAAY;;;;;;IAiBZ,iBAAiB;IAIjB,cAAc;CAGrB"}
1
+ {"version":3,"file":"mcp-server-proxy.service.d.ts","sourceRoot":"","sources":["../../../src/browser/mcp/mcp-server-proxy.service.ts"],"names":[],"mappings":"AAIA,OAAO,EAAW,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAG3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAG5D,qBACa,qBAAsB,YAAW,sBAAsB;IAElE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqB;IAGvD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IAGjC,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAwB;IAElE,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAsB;IAC1D,SAAgB,kBAAkB,EAAE,KAAK,CAAC,GAAG,CAAC,CAAkC;IAGhF,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG;;;;;;;IAK9B,YAAY;;;;;;;;;;;IAiBZ,iBAAiB;IAIjB,cAAc;CAGrB"}
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.MCPServerProxyService = void 0;
4
4
  const tslib_1 = require("tslib");
5
+ const zod_to_json_schema_1 = require("zod-to-json-schema");
5
6
  const di_1 = require("@opensumi/di");
6
7
  const ide_core_browser_1 = require("@opensumi/ide-core-browser");
7
8
  const ide_core_common_1 = require("@opensumi/ide-core-common");
@@ -23,7 +24,7 @@ let MCPServerProxyService = class MCPServerProxyService {
23
24
  ({
24
25
  name: tool.name,
25
26
  description: tool.description,
26
- inputSchema: tool.inputSchema,
27
+ inputSchema: (0, zod_to_json_schema_1.zodToJsonSchema)(tool.inputSchema),
27
28
  providerName: 'sumi-builtin',
28
29
  }));
29
30
  this.logger.log('SUMI MCP tools', tools);
@@ -1 +1 @@
1
- {"version":3,"file":"mcp-server-proxy.service.js","sourceRoot":"","sources":["../../../src/browser/mcp/mcp-server-proxy.service.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,iEAAqD;AACrD,+DAA2D;AAE3D,yCAAoF;AAEpF,oCAAsE;AAG/D,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAA3B;QAUY,wBAAmB,GAAG,IAAI,yBAAO,EAAO,CAAC;QAC1C,uBAAkB,GAAe,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC;IAgClF,CAAC;IA9BC,2BAA2B;IAC3B,YAAY,CAAC,IAAY,EAAE,IAAS;QAClC,OAAO,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACxD,CAAC;IAED,8BAA8B;IAC9B,KAAK,CAAC,YAAY;QAChB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACpE,eAAe;QACd,CAAC;YACA,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,YAAY,EAAE,cAAc;SAC7B,CAAC,CACH,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;QAEzC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,sBAAsB;IACtB,KAAK,CAAC,iBAAiB;QACrB,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,OAAO,IAAI,CAAC,yBAAyB,CAAC,cAAc,EAAE,CAAC;IACzD,CAAC;CACF,CAAA;AA3CY,sDAAqB;AAEf;IADhB,IAAA,cAAS,EAAC,8BAAsB,CAAC;;gEACqB;AAGtC;IADhB,IAAA,cAAS,EAAC,0BAAO,CAAC;;qDACc;AAGhB;IADhB,IAAA,cAAS,EAAC,sCAA6B,CAAC;;wEACyB;gCARvD,qBAAqB;IADjC,IAAA,eAAU,GAAE;GACA,qBAAqB,CA2CjC"}
1
+ {"version":3,"file":"mcp-server-proxy.service.js","sourceRoot":"","sources":["../../../src/browser/mcp/mcp-server-proxy.service.ts"],"names":[],"mappings":";;;;AAAA,2DAAqD;AAErD,qCAAqD;AACrD,iEAAqD;AACrD,+DAA2D;AAE3D,yCAAoF;AAEpF,oCAAsE;AAG/D,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAA3B;QAUY,wBAAmB,GAAG,IAAI,yBAAO,EAAO,CAAC;QAC1C,uBAAkB,GAAe,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC;IAgClF,CAAC;IA9BC,2BAA2B;IAC3B,YAAY,CAAC,IAAY,EAAE,IAAS;QAClC,OAAO,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACxD,CAAC;IAED,8BAA8B;IAC9B,KAAK,CAAC,YAAY;QAChB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACpE,eAAe;QACf,CAAC;YACC,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,WAAW,EAAE,IAAA,oCAAe,EAAC,IAAI,CAAC,WAAW,CAAC;YAC9C,YAAY,EAAE,cAAc;SAC7B,CAAC,CACH,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;QAEzC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,sBAAsB;IACtB,KAAK,CAAC,iBAAiB;QACrB,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,OAAO,IAAI,CAAC,yBAAyB,CAAC,cAAc,EAAE,CAAC;IACzD,CAAC;CACF,CAAA;AA3CY,sDAAqB;AAEf;IADhB,IAAA,cAAS,EAAC,8BAAsB,CAAC;;gEACqB;AAGtC;IADhB,IAAA,cAAS,EAAC,0BAAO,CAAC;;qDACc;AAGhB;IADhB,IAAA,cAAS,EAAC,sCAA6B,CAAC;;wEACyB;gCARvD,qBAAqB;IADjC,IAAA,eAAU,GAAE;GACA,qBAAqB,CA2CjC"}
@@ -1,9 +1,13 @@
1
- import { IMCPServerRegistry, MCPToolDefinition } from '../types';
1
+ import { IMCPServerRegistry, IMCPServerToolComponentProps, MCPToolDefinition } from '../types';
2
2
  export declare class MCPServerRegistry implements IMCPServerRegistry {
3
3
  private tools;
4
+ private toolComponents;
4
5
  private readonly baseLogger;
5
6
  private get logger();
7
+ getMCPTool(name: string, serverName?: string): MCPToolDefinition | undefined;
6
8
  registerMCPTool(tool: MCPToolDefinition): void;
9
+ registerToolComponent(name: string, component: React.FC<IMCPServerToolComponentProps>, serverName?: string): void;
10
+ getToolComponent(name: string): React.FC<IMCPServerToolComponentProps> | undefined;
7
11
  getMCPTools(): MCPToolDefinition[];
8
12
  callMCPTool(name: string, args: any): Promise<{
9
13
  content: {
@@ -1 +1 @@
1
- {"version":3,"file":"mcp-server.feature.registry.d.ts","sourceRoot":"","sources":["../../../src/browser/mcp/mcp-server.feature.registry.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAa,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAU5E,qBACa,iBAAkB,YAAW,kBAAkB;IAC1D,OAAO,CAAC,KAAK,CAA2B;IAGxC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAU;IAErC,OAAO,KAAK,MAAM,GAEjB;IAED,eAAe,CAAC,IAAI,EAAE,iBAAiB,GAAG,IAAI;IAI9C,WAAW,IAAI,iBAAiB,EAAE;IAI5B,WAAW,CACf,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,GAAG,GACR,OAAO,CAAC;QACT,OAAO,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QAC1C,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB,CAAC;CAcH"}
1
+ {"version":3,"file":"mcp-server.feature.registry.d.ts","sourceRoot":"","sources":["../../../src/browser/mcp/mcp-server.feature.registry.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAAE,4BAA4B,EAAa,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAU1G,qBACa,iBAAkB,YAAW,kBAAkB;IAC1D,OAAO,CAAC,KAAK,CAA2B;IACxC,OAAO,CAAC,cAAc,CAA8D;IAGpF,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAU;IAErC,OAAO,KAAK,MAAM,GAEjB;IAED,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,SAAiB,GAAG,iBAAiB,GAAG,SAAS;IAIpF,eAAe,CAAC,IAAI,EAAE,iBAAiB,GAAG,IAAI;IAI9C,qBAAqB,CACnB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,4BAA4B,CAAC,EACjD,UAAU,SAAiB,GAC1B,IAAI;IAIP,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC,EAAE,CAAC,4BAA4B,CAAC,GAAG,SAAS;IAIlF,WAAW,IAAI,iBAAiB,EAAE;IAI5B,WAAW,CACf,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,GAAG,GACR,OAAO,CAAC;QACT,OAAO,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QAC1C,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB,CAAC;CAkBH"}
@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
5
5
  // OpenSumi as MCP Server 前端的代理服务
6
6
  const di_1 = require("@opensumi/di");
7
7
  const ide_core_common_1 = require("@opensumi/ide-core-common");
8
+ const utils_1 = require("../../common/utils");
8
9
  class LoggerAdapter {
9
10
  constructor(logger) {
10
11
  this.logger = logger;
@@ -16,13 +17,23 @@ class LoggerAdapter {
16
17
  let MCPServerRegistry = class MCPServerRegistry {
17
18
  constructor() {
18
19
  this.tools = [];
20
+ this.toolComponents = {};
19
21
  }
20
22
  get logger() {
21
23
  return new LoggerAdapter(this.baseLogger);
22
24
  }
25
+ getMCPTool(name, serverName = 'sumi-builtin') {
26
+ return this.tools.find((tool) => (0, utils_1.getToolName)(tool.name, serverName) === name);
27
+ }
23
28
  registerMCPTool(tool) {
24
29
  this.tools.push(tool);
25
30
  }
31
+ registerToolComponent(name, component, serverName = 'sumi-builtin') {
32
+ this.toolComponents[(0, utils_1.getToolName)(name, serverName)] = component;
33
+ }
34
+ getToolComponent(name) {
35
+ return this.toolComponents[name];
36
+ }
26
37
  getMCPTools() {
27
38
  return this.tools;
28
39
  }
@@ -32,9 +43,13 @@ let MCPServerRegistry = class MCPServerRegistry {
32
43
  if (!tool) {
33
44
  throw new Error(`MCP tool ${name} not found`);
34
45
  }
46
+ // 统一校验并转换
47
+ args = tool.inputSchema.parse(args);
35
48
  return await tool.handler(args, this.logger);
36
49
  }
37
50
  catch (error) {
51
+ // eslint-disable-next-line no-console
52
+ console.error('callMCPTool error:', error);
38
53
  return {
39
54
  content: [{ type: 'text', text: `The tool ${name} failed to execute. Error: ${error}` }],
40
55
  isError: true,
@@ -1 +1 @@
1
- {"version":3,"file":"mcp-server.feature.registry.js","sourceRoot":"","sources":["../../../src/browser/mcp/mcp-server.feature.registry.ts"],"names":[],"mappings":";;;;AAAA,iCAAiC;AACjC,qCAAqD;AACrD,+DAAoE;AAIpE,MAAM,aAAa;IACjB,YAA6B,MAAe;QAAf,WAAM,GAAN,MAAM,CAAS;IAAI,CAAC;IAEjD,UAAU,CAAC,OAAe;QACxB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;CACF;AAGM,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAAvB;QACG,UAAK,GAAwB,EAAE,CAAC;IAqC1C,CAAC;IAhCC,IAAY,MAAM;QAChB,OAAO,IAAI,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC5C,CAAC;IAED,eAAe,CAAC,IAAuB;QACrC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,WAAW,CACf,IAAY,EACZ,IAAS;QAKT,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;YAC3D,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,MAAM,IAAI,KAAK,CAAC,YAAY,IAAI,YAAY,CAAC,CAAC;YAChD,CAAC;YACD,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC/C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO;gBACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,IAAI,8BAA8B,KAAK,EAAE,EAAE,CAAC;gBACxF,OAAO,EAAE,IAAI;aACd,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAA;AAtCY,8CAAiB;AAIX;IADhB,IAAA,cAAS,EAAC,yBAAO,CAAC;;qDACkB;4BAJ1B,iBAAiB;IAD7B,IAAA,eAAU,GAAE;GACA,iBAAiB,CAsC7B"}
1
+ {"version":3,"file":"mcp-server.feature.registry.js","sourceRoot":"","sources":["../../../src/browser/mcp/mcp-server.feature.registry.ts"],"names":[],"mappings":";;;;AAAA,iCAAiC;AACjC,qCAAqD;AACrD,+DAAoD;AAEpD,8CAAiD;AAGjD,MAAM,aAAa;IACjB,YAA6B,MAAe;QAAf,WAAM,GAAN,MAAM,CAAS;IAAG,CAAC;IAEhD,UAAU,CAAC,OAAe;QACxB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;CACF;AAGM,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAAvB;QACG,UAAK,GAAwB,EAAE,CAAC;QAChC,mBAAc,GAA2D,EAAE,CAAC;IAyDtF,CAAC;IApDC,IAAY,MAAM;QAChB,OAAO,IAAI,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC5C,CAAC;IAED,UAAU,CAAC,IAAY,EAAE,UAAU,GAAG,cAAc;QAClD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,mBAAW,EAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,KAAK,IAAI,CAAC,CAAC;IAChF,CAAC;IAED,eAAe,CAAC,IAAuB;QACrC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;IAED,qBAAqB,CACnB,IAAY,EACZ,SAAiD,EACjD,UAAU,GAAG,cAAc;QAE3B,IAAI,CAAC,cAAc,CAAC,IAAA,mBAAW,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC,GAAG,SAAS,CAAC;IACjE,CAAC;IAED,gBAAgB,CAAC,IAAY;QAC3B,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,WAAW,CACf,IAAY,EACZ,IAAS;QAKT,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;YAC3D,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,MAAM,IAAI,KAAK,CAAC,YAAY,IAAI,YAAY,CAAC,CAAC;YAChD,CAAC;YACD,UAAU;YACV,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACpC,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC/C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,sCAAsC;YACtC,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;YAC3C,OAAO;gBACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,IAAI,8BAA8B,KAAK,EAAE,EAAE,CAAC;gBACxF,OAAO,EAAE,IAAI;aACd,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAA;AA3DY,8CAAiB;AAKX;IADhB,IAAA,cAAS,EAAC,yBAAO,CAAC;;qDACkB;4BAL1B,iBAAiB;IAD7B,IAAA,eAAU,GAAE;GACA,iBAAiB,CA2D7B"}
@@ -0,0 +1,3 @@
1
+ import { IMCPServerToolComponentProps } from '../../../types';
2
+ export declare const EditFileToolComponent: (props: IMCPServerToolComponentProps) => any[] | null;
3
+ //# sourceMappingURL=EditFile.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"EditFile.d.ts","sourceRoot":"","sources":["../../../../../src/browser/mcp/tools/components/EditFile.tsx"],"names":[],"mappings":"AAqBA,OAAO,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAC;AAuC9D,eAAO,MAAM,qBAAqB,UAAW,4BAA4B,iBAmFxE,CAAC"}
@@ -0,0 +1,101 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.EditFileToolComponent = void 0;
4
+ const tslib_1 = require("tslib");
5
+ const classnames_1 = tslib_1.__importDefault(require("classnames"));
6
+ const react_1 = tslib_1.__importStar(require("react"));
7
+ const ide_components_1 = require("@opensumi/ide-components");
8
+ const ide_core_browser_1 = require("@opensumi/ide-core-browser");
9
+ const ai_native_1 = require("@opensumi/ide-core-browser/lib/components/ai-native");
10
+ const language_1 = require("@opensumi/monaco-editor-core/esm/vs/editor/common/languages/language");
11
+ const model_1 = require("@opensumi/monaco-editor-core/esm/vs/editor/common/services/model");
12
+ const standaloneServices_1 = require("@opensumi/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices");
13
+ const ChatMarkdown_1 = require("../../../components/ChatMarkdown");
14
+ const base_apply_service_1 = require("../../base-apply.service");
15
+ const index_module_less_1 = tslib_1.__importDefault(require("./index.module.less"));
16
+ const renderStatus = (codeBlockData) => {
17
+ const status = codeBlockData.status;
18
+ switch (status) {
19
+ case 'generating':
20
+ return react_1.default.createElement(ai_native_1.Loading, null);
21
+ case 'pending':
22
+ return (react_1.default.createElement(ide_components_1.Popover, { title: status, id: 'edit-file-tool-status-pending' },
23
+ react_1.default.createElement(ide_components_1.Icon, { iconClass: 'codicon codicon-circle-large' })));
24
+ case 'success':
25
+ return (react_1.default.createElement(ide_components_1.Popover, { title: status, id: 'edit-file-tool-status-success' },
26
+ react_1.default.createElement(ide_components_1.Icon, { iconClass: 'codicon codicon-check-all' })));
27
+ case 'failed':
28
+ return (react_1.default.createElement(ide_components_1.Popover, { title: status, id: 'edit-file-tool-status-failed' },
29
+ react_1.default.createElement(ide_components_1.Icon, { iconClass: 'codicon codicon-error', color: 'var(--vscode-input-errorForeground)' })));
30
+ case 'cancelled':
31
+ return (react_1.default.createElement(ide_components_1.Popover, { title: status, id: 'edit-file-tool-status-cancelled' },
32
+ react_1.default.createElement(ide_components_1.Icon, { iconClass: 'codicon codicon-close', color: 'var(--vscode-input-placeholderForeground)' })));
33
+ default:
34
+ return null;
35
+ }
36
+ };
37
+ const EditFileToolComponent = (props) => {
38
+ var _a;
39
+ const { args, messageId, toolCallId } = props;
40
+ const labelService = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.LabelService);
41
+ const appConfig = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.AppConfig);
42
+ const applyService = (0, ide_core_browser_1.useInjectable)(base_apply_service_1.BaseApplyService);
43
+ const { target_file = '', code_edit, instructions } = args || {};
44
+ const absolutePath = ide_core_browser_1.path.join(appConfig.workspaceDir, target_file);
45
+ const codeBlockData = applyService.getCodeBlock(absolutePath, messageId);
46
+ (0, ide_core_browser_1.useAutorun)(applyService.codeBlockMapObservable);
47
+ if (toolCallId && codeBlockData) {
48
+ applyService.initToolCallId(codeBlockData.id, toolCallId);
49
+ }
50
+ const icon = (0, react_1.useMemo)(() => {
51
+ if (!target_file) {
52
+ return;
53
+ }
54
+ const icon = `file-icon ${labelService.getIcon(ide_core_browser_1.URI.file(absolutePath))}`;
55
+ return icon;
56
+ }, [target_file, absolutePath]);
57
+ const languageId = (0, react_1.useMemo)(() => {
58
+ if (!target_file) {
59
+ return;
60
+ }
61
+ const modelService = standaloneServices_1.StandaloneServices.get(model_1.IModelService);
62
+ const languageService = standaloneServices_1.StandaloneServices.get(language_1.ILanguageService);
63
+ const detectedModeId = (0, ide_core_browser_1.detectModeId)(modelService, languageService, ide_core_browser_1.Uri.file(absolutePath));
64
+ return detectedModeId;
65
+ }, [target_file, absolutePath]);
66
+ // 多次迭代时,仅在首处tool组件中展示
67
+ if (!args || !codeBlockData || (toolCallId && toolCallId !== codeBlockData.initToolCallId)) {
68
+ return null;
69
+ }
70
+ return [
71
+ instructions && react_1.default.createElement("p", null, instructions),
72
+ react_1.default.createElement("div", { className: index_module_less_1.default['edit-file-tool'], key: `edit-file-tool-${codeBlockData.id}` },
73
+ react_1.default.createElement("div", { className: (0, classnames_1.default)(index_module_less_1.default['edit-file-tool-header'], {
74
+ clickable: codeBlockData.status === 'pending' || codeBlockData.status === 'success',
75
+ }), onClick: () => {
76
+ if (codeBlockData.status === 'pending') {
77
+ applyService.reRenderPendingApply();
78
+ }
79
+ else if (codeBlockData.status === 'success') {
80
+ applyService.revealApplyPosition(codeBlockData.id);
81
+ }
82
+ } },
83
+ icon && react_1.default.createElement("span", { className: icon }),
84
+ react_1.default.createElement("span", { className: index_module_less_1.default['edit-file-tool-file-name'] }, target_file),
85
+ codeBlockData.iterationCount > 1 && (react_1.default.createElement("span", { className: index_module_less_1.default['edit-file-tool-iteration-count'] },
86
+ codeBlockData.iterationCount,
87
+ "/3")),
88
+ renderStatus(codeBlockData)),
89
+ react_1.default.createElement(ChatMarkdown_1.ChatMarkdown, { markdown: `\`\`\`${languageId || ''}\n${code_edit}\n\`\`\``, hideInsert: true })),
90
+ codeBlockData.applyResult && codeBlockData.applyResult.diagnosticInfos.length > 0 && (react_1.default.createElement("div", { className: index_module_less_1.default['edit-file-tool-diagnostic-errors'], key: `edit-file-tool-diagnostic-errors-${codeBlockData.id}` },
91
+ react_1.default.createElement("div", { className: index_module_less_1.default['title'] }, "Found Lints:"), (_a = codeBlockData.applyResult) === null || _a === void 0 ? void 0 :
92
+ _a.diagnosticInfos.map((info) => (react_1.default.createElement("div", { key: info.message, className: (0, classnames_1.default)({
93
+ [index_module_less_1.default['error']]: info.severity === ide_core_browser_1.MarkerSeverity.Error,
94
+ [index_module_less_1.default['warning']]: info.severity === ide_core_browser_1.MarkerSeverity.Warning,
95
+ }) },
96
+ react_1.default.createElement(ide_components_1.Icon, { className: `codicon codicon-${info.severity === ide_core_browser_1.MarkerSeverity.Error ? 'error' : 'warning'}` }),
97
+ info.message.split('\n')[0]))))),
98
+ ];
99
+ };
100
+ exports.EditFileToolComponent = EditFileToolComponent;
101
+ //# sourceMappingURL=EditFile.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"EditFile.js","sourceRoot":"","sources":["../../../../../src/browser/mcp/tools/components/EditFile.tsx"],"names":[],"mappings":"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"}
@@ -0,0 +1,67 @@
1
+ .edit-file-tool-header {
2
+ display: flex;
3
+ align-items: center;
4
+ padding: 2px 8px;
5
+ border-bottom: 1px solid var(--vscode-commandCenter-inactiveBorder);
6
+ background-color: var(--design-block-background);
7
+ font-size: 10px;
8
+ margin-bottom: -4px;
9
+ border-radius: 8px 8px 0 0;
10
+ > span {
11
+ margin-right: 4px;
12
+ }
13
+ :global(span.codicon) {
14
+ font-size: 12px;
15
+ }
16
+ :global(.kt-popover-trigger) {
17
+ display: flex;
18
+ align-items: center;
19
+ justify-content: center;
20
+ }
21
+ }
22
+ .edit-file-tool {
23
+ border: 1px solid var(--vscode-commandCenter-inactiveBorder);
24
+ border-radius: 4px;
25
+ margin: 8px 0;
26
+ :global(.language-badge) {
27
+ border-top-left-radius: 0;
28
+ }
29
+ pre > code {
30
+ border-radius: 0 0 8px 8px !important;
31
+ }
32
+ }
33
+ .edit-file-tool-iteration-count {
34
+ color: var(--vscode-input-placeholderForeground);
35
+ margin-left: 4px;
36
+ }
37
+ :global(.clickable) {
38
+ cursor: pointer;
39
+ }
40
+ .edit-file-tool-diagnostic-errors {
41
+ padding: 8px;
42
+ border: 1px solid var(--vscode-commandCenter-inactiveBorder);
43
+ background-color: var(--design-block-background);
44
+ border-radius: 8px;
45
+ font-size: 12px;
46
+ margin: 4px 0;
47
+ > div {
48
+ display: flex;
49
+ align-items: center;
50
+ padding: 2px 0;
51
+ }
52
+ :global(.codicon) {
53
+ margin-right: 4px;
54
+ }
55
+ .title {
56
+ margin-bottom: 3px;
57
+ display: inline-block;
58
+ }
59
+ }
60
+ .error,
61
+ .error > span {
62
+ color: var(--debugConsole-errorForeground);
63
+ }
64
+ .warning,
65
+ .warning > span {
66
+ color: var(--debugConsole-warningForeground);
67
+ }
@@ -1 +1 @@
1
- {"version":3,"file":"createNewFileWithText.d.ts","sourceRoot":"","sources":["../../../../src/browser/mcp/tools/createNewFileWithText.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,kBAAkB,EAAa,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAOtG,qBACa,yBAA0B,YAAW,qBAAqB;IAErE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAoB;IAGrD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;IAEjD,iBAAiB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;IAIrD,iBAAiB,IAAI,iBAAiB;YAkBxB,OAAO;CAqCtB"}
1
+ {"version":3,"file":"createNewFileWithText.d.ts","sourceRoot":"","sources":["../../../../src/browser/mcp/tools/createNewFileWithText.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,kBAAkB,EAAa,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAOtG,qBACa,yBAA0B,YAAW,qBAAqB;IAErE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAoB;IAGrD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;IAEjD,iBAAiB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;IAIrD,iBAAiB,IAAI,iBAAiB;YAkBxB,OAAO;CAqCtB"}