@opensumi/ide-ai-native 3.8.1-next-1741091353.0 → 3.8.1-next-1741092802.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 (112) hide show
  1. package/lib/browser/ai-core.contribution.d.ts +3 -0
  2. package/lib/browser/ai-core.contribution.d.ts.map +1 -1
  3. package/lib/browser/ai-core.contribution.js +45 -1
  4. package/lib/browser/ai-core.contribution.js.map +1 -1
  5. package/lib/browser/chat/chat-manager.service.d.ts.map +1 -1
  6. package/lib/browser/chat/chat-manager.service.js +0 -4
  7. package/lib/browser/chat/chat-manager.service.js.map +1 -1
  8. package/lib/browser/chat/chat-proxy.service.d.ts.map +1 -1
  9. package/lib/browser/chat/chat-proxy.service.js +8 -2
  10. package/lib/browser/chat/chat-proxy.service.js.map +1 -1
  11. package/lib/browser/chat/chat.view.d.ts.map +1 -1
  12. package/lib/browser/chat/chat.view.js +1 -7
  13. package/lib/browser/chat/chat.view.js.map +1 -1
  14. package/lib/browser/components/chat-history.module.less +0 -1
  15. package/lib/browser/mcp/base-apply.service.d.ts +7 -18
  16. package/lib/browser/mcp/base-apply.service.d.ts.map +1 -1
  17. package/lib/browser/mcp/base-apply.service.js +65 -185
  18. package/lib/browser/mcp/base-apply.service.js.map +1 -1
  19. package/lib/browser/mcp/tools/components/EditFile.d.ts.map +1 -1
  20. package/lib/browser/mcp/tools/components/EditFile.js +9 -15
  21. package/lib/browser/mcp/tools/components/EditFile.js.map +1 -1
  22. package/lib/browser/mcp/tools/components/index.module.less +0 -3
  23. package/lib/browser/mcp/tools/createNewFileWithText.d.ts +0 -1
  24. package/lib/browser/mcp/tools/createNewFileWithText.d.ts.map +1 -1
  25. package/lib/browser/mcp/tools/createNewFileWithText.js +11 -18
  26. package/lib/browser/mcp/tools/createNewFileWithText.js.map +1 -1
  27. package/lib/browser/mcp/tools/handlers/EditFile.js +1 -1
  28. package/lib/browser/mcp/tools/handlers/EditFile.js.map +1 -1
  29. package/lib/browser/model/msg-history-manager.d.ts +0 -1
  30. package/lib/browser/model/msg-history-manager.d.ts.map +1 -1
  31. package/lib/browser/model/msg-history-manager.js +0 -3
  32. package/lib/browser/model/msg-history-manager.js.map +1 -1
  33. package/lib/browser/preferences/schema.d.ts.map +1 -1
  34. package/lib/browser/preferences/schema.js +6 -1
  35. package/lib/browser/preferences/schema.js.map +1 -1
  36. package/lib/browser/widget/inline-diff/inline-diff-manager.d.ts.map +1 -1
  37. package/lib/browser/widget/inline-diff/inline-diff-manager.js +8 -68
  38. package/lib/browser/widget/inline-diff/inline-diff-manager.js.map +1 -1
  39. package/lib/browser/widget/inline-diff/inline-diff-previewer.d.ts +4 -10
  40. package/lib/browser/widget/inline-diff/inline-diff-previewer.d.ts.map +1 -1
  41. package/lib/browser/widget/inline-diff/inline-diff-previewer.js +3 -14
  42. package/lib/browser/widget/inline-diff/inline-diff-previewer.js.map +1 -1
  43. package/lib/browser/widget/inline-diff/inline-diff-widget.module.less +4 -25
  44. package/lib/browser/widget/inline-diff/inline-diff.controller.d.ts +3 -3
  45. package/lib/browser/widget/inline-diff/inline-diff.controller.d.ts.map +1 -1
  46. package/lib/browser/widget/inline-diff/inline-diff.controller.js +5 -10
  47. package/lib/browser/widget/inline-diff/inline-diff.controller.js.map +1 -1
  48. package/lib/browser/widget/inline-stream-diff/inline-stream-diff.handler.d.ts +17 -46
  49. package/lib/browser/widget/inline-stream-diff/inline-stream-diff.handler.d.ts.map +1 -1
  50. package/lib/browser/widget/inline-stream-diff/inline-stream-diff.handler.js +53 -110
  51. package/lib/browser/widget/inline-stream-diff/inline-stream-diff.handler.js.map +1 -1
  52. package/lib/browser/widget/inline-stream-diff/live-preview.decoration.d.ts +0 -4
  53. package/lib/browser/widget/inline-stream-diff/live-preview.decoration.d.ts.map +1 -1
  54. package/lib/browser/widget/inline-stream-diff/live-preview.decoration.js +1 -26
  55. package/lib/browser/widget/inline-stream-diff/live-preview.decoration.js.map +1 -1
  56. package/lib/common/index.d.ts +1 -0
  57. package/lib/common/index.d.ts.map +1 -1
  58. package/lib/common/index.js +2 -0
  59. package/lib/common/index.js.map +1 -1
  60. package/lib/common/model.d.ts +12 -0
  61. package/lib/common/model.d.ts.map +1 -0
  62. package/lib/common/model.js +83 -0
  63. package/lib/common/model.js.map +1 -0
  64. package/lib/common/types.d.ts +0 -1
  65. package/lib/common/types.d.ts.map +1 -1
  66. package/lib/node/anthropic/anthropic-language-model.d.ts +3 -1
  67. package/lib/node/anthropic/anthropic-language-model.d.ts.map +1 -1
  68. package/lib/node/anthropic/anthropic-language-model.js +6 -2
  69. package/lib/node/anthropic/anthropic-language-model.js.map +1 -1
  70. package/lib/node/base-language-model.d.ts +4 -1
  71. package/lib/node/base-language-model.d.ts.map +1 -1
  72. package/lib/node/base-language-model.js +6 -5
  73. package/lib/node/base-language-model.js.map +1 -1
  74. package/lib/node/deepseek/deepseek-language-model.d.ts +3 -1
  75. package/lib/node/deepseek/deepseek-language-model.d.ts.map +1 -1
  76. package/lib/node/deepseek/deepseek-language-model.js +6 -2
  77. package/lib/node/deepseek/deepseek-language-model.js.map +1 -1
  78. package/lib/node/openai/openai-language-model.d.ts +5 -4
  79. package/lib/node/openai/openai-language-model.d.ts.map +1 -1
  80. package/lib/node/openai/openai-language-model.js +8 -7
  81. package/lib/node/openai/openai-language-model.js.map +1 -1
  82. package/lib/node/openai-compatible/openai-compatible-language-model.d.ts +10 -0
  83. package/lib/node/openai-compatible/openai-compatible-language-model.d.ts.map +1 -0
  84. package/lib/node/openai-compatible/openai-compatible-language-model.js +32 -0
  85. package/lib/node/openai-compatible/openai-compatible-language-model.js.map +1 -0
  86. package/package.json +24 -23
  87. package/src/browser/ai-core.contribution.ts +57 -1
  88. package/src/browser/chat/chat-manager.service.ts +0 -6
  89. package/src/browser/chat/chat-proxy.service.ts +7 -2
  90. package/src/browser/chat/chat.view.tsx +2 -7
  91. package/src/browser/components/chat-history.module.less +0 -1
  92. package/src/browser/mcp/base-apply.service.ts +67 -222
  93. package/src/browser/mcp/tools/components/EditFile.tsx +9 -16
  94. package/src/browser/mcp/tools/components/index.module.less +0 -3
  95. package/src/browser/mcp/tools/createNewFileWithText.ts +12 -20
  96. package/src/browser/mcp/tools/handlers/EditFile.ts +1 -1
  97. package/src/browser/model/msg-history-manager.ts +0 -4
  98. package/src/browser/preferences/schema.ts +6 -1
  99. package/src/browser/widget/inline-diff/inline-diff-manager.tsx +21 -143
  100. package/src/browser/widget/inline-diff/inline-diff-previewer.ts +7 -25
  101. package/src/browser/widget/inline-diff/inline-diff-widget.module.less +4 -25
  102. package/src/browser/widget/inline-diff/inline-diff.controller.ts +8 -16
  103. package/src/browser/widget/inline-stream-diff/inline-stream-diff.handler.tsx +68 -139
  104. package/src/browser/widget/inline-stream-diff/live-preview.decoration.tsx +1 -30
  105. package/src/common/index.ts +2 -0
  106. package/src/common/model.ts +90 -0
  107. package/src/common/types.ts +0 -1
  108. package/src/node/anthropic/anthropic-language-model.ts +7 -2
  109. package/src/node/base-language-model.ts +9 -9
  110. package/src/node/deepseek/deepseek-language-model.ts +7 -2
  111. package/src/node/openai/openai-language-model.ts +10 -9
  112. package/src/node/openai-compatible/openai-compatible-language-model.ts +30 -0
@@ -10,28 +10,20 @@ const browser_1 = require("@opensumi/ide-editor/lib/browser");
10
10
  const ide_markers_1 = require("@opensumi/ide-markers");
11
11
  const ide_monaco_1 = require("@opensumi/ide-monaco");
12
12
  const ide_utils_1 = require("@opensumi/ide-utils");
13
- const editOperation_1 = require("@opensumi/monaco-editor-core/esm/vs/editor/common/core/editOperation");
14
13
  const common_1 = require("../../common");
15
14
  const chat_internal_service_1 = require("../chat/chat.internal.service");
16
15
  const inline_chat_controller_1 = require("../widget/inline-chat/inline-chat-controller");
17
16
  const inline_diff_1 = require("../widget/inline-diff");
17
+ const ReadFile_1 = require("./tools/handlers/ReadFile");
18
+ // 提供代码块的唯一索引,迭代轮次,生成状态管理(包括取消),关联文件位置这些信息的记录,后续并行 apply 的支持
18
19
  class BaseApplyService extends ide_core_browser_1.WithEventBus {
19
20
  constructor() {
20
21
  super();
21
22
  this.onCodeBlockUpdateEmitter = new ide_utils_1.Emitter();
22
23
  this.onCodeBlockUpdate = this.onCodeBlockUpdateEmitter.event;
23
- this.activePreviewerMap = this.registerDispose(new ide_utils_1.DisposableMap());
24
- this.editorListenerMap = this.registerDispose(new ide_utils_1.DisposableMap());
25
24
  this.addDispose(this.chatInternalService.onCancelRequest(() => {
26
25
  this.cancelAllApply();
27
26
  }));
28
- this.currentSessionId = this.chatInternalService.sessionModel.sessionId;
29
- this.addDispose(this.chatInternalService.onChangeSession((sessionId) => {
30
- if (sessionId !== this.currentSessionId) {
31
- this.cancelAllApply();
32
- this.currentSessionId = sessionId;
33
- }
34
- }));
35
27
  this.addDispose(this.chatInternalService.onRegenerateRequest(() => {
36
28
  const messages = this.chatInternalService.sessionModel.history.getMessages();
37
29
  const messageId = messages[messages.length - 1].id;
@@ -53,56 +45,25 @@ class BaseApplyService extends ide_core_browser_1.WithEventBus {
53
45
  const message = sessionModel.history.getMessageAdditional(messageId);
54
46
  return message === null || message === void 0 ? void 0 : message.codeBlockMap;
55
47
  }
56
- getSessionCodeBlocksForPath(relativePath, sessionId) {
57
- sessionId = sessionId || this.chatInternalService.sessionModel.sessionId;
58
- const sessionModel = this.chatInternalService.getSession(sessionId);
59
- if (!sessionModel) {
60
- throw new Error(`Session ${sessionId} not found`);
61
- }
62
- const sessionAdditionals = sessionModel.history.sessionAdditionals;
63
- const codeBlocks = Array.from(sessionAdditionals.values())
64
- .map((additional) => additional.codeBlockMap)
65
- .reduce((acc, cur) => {
66
- Object.values(cur).forEach((block) => {
67
- if (block.relativePath === relativePath) {
68
- acc.push(block);
69
- }
70
- });
71
- return acc;
72
- }, [])
73
- .sort((a, b) => b.version - a.version);
74
- return codeBlocks;
75
- }
76
48
  onEditorGroupClose(event) {
77
- const relativePath = ide_utils_1.path.relative(this.appConfig.workspaceDir, event.payload.resource.uri.path.toString());
78
- const activePreviewer = this.activePreviewerMap.get(relativePath);
79
- if (activePreviewer) {
80
- this.activePreviewerMap.disposeKey(relativePath);
49
+ var _a, _b;
50
+ 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()) {
51
+ this.activePreviewer.dispose();
52
+ this.activePreviewer = undefined;
81
53
  }
82
- this.editorListenerMap.disposeKey(event.payload.resource.uri.toString());
83
54
  }
84
55
  async onEditorGroupOpen(event) {
85
- const relativePath = ide_utils_1.path.relative(this.appConfig.workspaceDir, event.payload.resource.uri.path.toString());
86
- if (this.duringApply ||
87
- this.activePreviewerMap.has(relativePath) ||
88
- !this.chatInternalService.sessionModel.history.getMessages().length) {
56
+ if (!this.chatInternalService.sessionModel.history.getMessages().length) {
89
57
  return;
90
58
  }
59
+ const relativePath = ide_utils_1.path.relative(this.appConfig.workspaceDir, event.payload.resource.uri.path.toString());
91
60
  const filePendingApplies = Object.values(this.getMessageCodeBlocks(this.chatInternalService.sessionModel.history.lastMessageId) || {}).filter((block) => block.relativePath === relativePath && block.status === 'pending');
92
61
  // TODO: 刷新后重新应用,事件无法恢复 & 恢复继续请求,需要改造成批量apply形式
93
- if (filePendingApplies.length > 0 && filePendingApplies[0].updatedCode) {
94
- const editor = event.payload.group.codeEditor.monacoEditor;
95
- this.renderApplyResult(editor, filePendingApplies[0], filePendingApplies[0].updatedCode);
62
+ // TODO: 暂时只支持 pending 串行的 apply,后续支持批量apply后统一accept
63
+ if (filePendingApplies.length > 0) {
64
+ this.renderApplyResult(filePendingApplies[0], filePendingApplies[0].updatedCode);
96
65
  }
97
66
  }
98
- get currentPreviewer() {
99
- var _a;
100
- const currentUri = (_a = this.editorService.currentEditor) === null || _a === void 0 ? void 0 : _a.currentUri;
101
- if (!currentUri) {
102
- return undefined;
103
- }
104
- return this.activePreviewerMap.get(ide_utils_1.path.relative(this.appConfig.workspaceDir, currentUri.path.toString()));
105
- }
106
67
  getUriPendingCodeBlock(uri) {
107
68
  const messageId = this.chatInternalService.sessionModel.history.lastMessageId;
108
69
  if (!messageId) {
@@ -115,24 +76,6 @@ class BaseApplyService extends ide_core_browser_1.WithEventBus {
115
76
  return Object.values(codeBlockMap).find((block) => block.relativePath === ide_utils_1.path.relative(this.appConfig.workspaceDir, uri.path.toString()) &&
116
77
  block.status === 'pending');
117
78
  }
118
- getPendingPaths(sessionId) {
119
- sessionId = sessionId || this.chatInternalService.sessionModel.sessionId;
120
- const sessionModel = this.chatInternalService.getSession(sessionId);
121
- if (!sessionModel) {
122
- throw new Error(`Session ${sessionId} not found`);
123
- }
124
- const sessionAdditionals = sessionModel.history.sessionAdditionals;
125
- return Array.from(sessionAdditionals.values())
126
- .map((additional) => additional.codeBlockMap)
127
- .reduce((acc, cur) => {
128
- Object.values(cur).forEach((block) => {
129
- if (block.status === 'pending' && !acc.includes(block.relativePath)) {
130
- acc.push(block.relativePath);
131
- }
132
- });
133
- return acc;
134
- }, []);
135
- }
136
79
  getCodeBlock(toolCallId, messageId) {
137
80
  messageId = messageId || this.chatInternalService.sessionModel.history.lastMessageId;
138
81
  if (!messageId) {
@@ -159,11 +102,10 @@ class BaseApplyService extends ide_core_browser_1.WithEventBus {
159
102
  });
160
103
  this.onCodeBlockUpdateEmitter.fire(codeBlock);
161
104
  }
162
- async registerCodeBlock(relativePath, content, toolCallId) {
105
+ registerCodeBlock(relativePath, content, toolCallId) {
163
106
  var _a, _b;
164
107
  const lastMessageId = this.chatInternalService.sessionModel.history.lastMessageId;
165
108
  const savedCodeBlockMap = this.getMessageCodeBlocks(lastMessageId) || {};
166
- const originalModelRef = await this.editorDocumentModelService.createModelReference(ide_utils_1.URI.file(ide_utils_1.path.join(this.appConfig.workspaceDir, relativePath)));
167
109
  const newBlock = {
168
110
  codeEdit: content,
169
111
  relativePath,
@@ -172,13 +114,11 @@ class BaseApplyService extends ide_core_browser_1.WithEventBus {
172
114
  version: 1,
173
115
  createdAt: Date.now(),
174
116
  toolCallId,
175
- // TODO: 支持range
176
- originalCode: originalModelRef.instance.getText(),
177
117
  };
178
118
  const samePathCodeBlocks = Object.values(savedCodeBlockMap).filter((block) => block.relativePath === relativePath);
179
119
  if (samePathCodeBlocks.length > 0) {
180
120
  newBlock.version = samePathCodeBlocks.length;
181
- for (const block of samePathCodeBlocks.sort((a, b) => a.version - b.version)) {
121
+ for (const block of samePathCodeBlocks.sort((a, b) => b.version - a.version)) {
182
122
  // 如果连续的上一个同文件apply结果存在LintError,则iterationCount++
183
123
  if (block.relativePath === relativePath && ((_b = (_a = block.applyResult) === null || _a === void 0 ? void 0 : _a.diagnosticInfos) === null || _b === void 0 ? void 0 : _b.length)) {
184
124
  newBlock.iterationCount++;
@@ -200,29 +140,15 @@ class BaseApplyService extends ide_core_browser_1.WithEventBus {
200
140
  */
201
141
  async apply(codeBlock) {
202
142
  try {
203
- this.duringApply = true;
204
143
  if (codeBlock.iterationCount > 3) {
205
144
  throw new Error('Lint error max iteration count exceeded');
206
145
  }
207
- // 新建文件场景,直接返回codeEdit
208
- const fastApplyFileResult = !codeBlock.originalCode
209
- ? {
210
- result: codeBlock.codeEdit,
211
- }
212
- : await this.doApply(codeBlock);
146
+ const fastApplyFileResult = await this.doApply(codeBlock);
213
147
  if (!fastApplyFileResult.stream && !fastApplyFileResult.result) {
214
148
  throw new Error('No apply content provided');
215
149
  }
216
- if (this.activePreviewerMap.has(codeBlock.relativePath)) {
217
- this.activePreviewerMap.disposeKey(codeBlock.relativePath);
218
- }
219
- // FIXME: 同一个bubble单个文件多次写入(如迭代)兼容
220
150
  // trigger diffPreivewer & return expected diff result directly
221
- const result = await this.editorService.open(ide_utils_1.URI.file(ide_utils_1.path.join(this.appConfig.workspaceDir, codeBlock.relativePath)));
222
- if (!result) {
223
- throw new Error('Failed to open file');
224
- }
225
- const applyResult = await this.renderApplyResult(result.group.codeEditor.monacoEditor, codeBlock, (fastApplyFileResult.result || fastApplyFileResult.stream), fastApplyFileResult.range);
151
+ const applyResult = await this.renderApplyResult(codeBlock, (fastApplyFileResult.result || fastApplyFileResult.stream), fastApplyFileResult.range);
226
152
  if (applyResult) {
227
153
  // 用户实际接受的 apply 结果
228
154
  codeBlock.applyResult = applyResult;
@@ -235,61 +161,39 @@ class BaseApplyService extends ide_core_browser_1.WithEventBus {
235
161
  this.updateCodeBlock(codeBlock);
236
162
  throw err;
237
163
  }
238
- finally {
239
- this.duringApply = false;
240
- }
241
164
  }
242
- async renderApplyResult(editor, codeBlock, updatedContentOrStream, range) {
165
+ async renderApplyResult(codeBlock, updatedContentOrStream, range) {
243
166
  var _a;
244
- const deferred = new ide_utils_1.Deferred();
167
+ const { relativePath } = codeBlock;
168
+ const openResult = await this.editorService.open(ide_utils_1.URI.file(ide_utils_1.path.join(this.appConfig.workspaceDir, relativePath)));
169
+ if (!openResult) {
170
+ throw new Error('Failed to open editor');
171
+ }
172
+ const editor = openResult.group.codeEditor.monacoEditor;
245
173
  const inlineDiffController = inline_diff_1.InlineDiffController.get(editor);
246
- range = range || editor.getModel().getFullModelRange();
174
+ codeBlock.status = 'pending';
175
+ // 强刷展示 manager 视图
176
+ this.eventBus.fire(new browser_1.RegisterEditorSideComponentEvent());
177
+ this.updateCodeBlock(codeBlock);
178
+ const fullOriginalContent = editor.getModel().getValue();
179
+ range = range || ((_a = editor.getModel()) === null || _a === void 0 ? void 0 : _a.getFullModelRange());
180
+ // const savedRangeContent = editor.getModel()!.getValueInRange(range);
247
181
  if (typeof updatedContentOrStream === 'string') {
248
- const editorCurrentContent = editor.getModel().getValue();
249
- const document = this.editorDocumentModelService.getModelReference(ide_utils_1.URI.file(ide_utils_1.path.join(this.appConfig.workspaceDir, codeBlock.relativePath)));
250
- if (editorCurrentContent !== updatedContentOrStream || (document === null || document === void 0 ? void 0 : document.instance.dirty)) {
251
- (_a = editor.getModel()) === null || _a === void 0 ? void 0 : _a.pushEditOperations([], [editOperation_1.EditOperation.replace(range, updatedContentOrStream)], () => null);
252
- await this.editorService.save(ide_utils_1.URI.file(ide_utils_1.path.join(this.appConfig.workspaceDir, codeBlock.relativePath)));
253
- }
254
- const earlistPendingCodeBlock = this.getSessionCodeBlocksForPath(codeBlock.relativePath).find((block) => block.status === 'pending');
255
- if (((earlistPendingCodeBlock === null || earlistPendingCodeBlock === void 0 ? void 0 : earlistPendingCodeBlock.originalCode) || codeBlock.originalCode) === updatedContentOrStream) {
256
- codeBlock.status = 'cancelled';
257
- this.updateCodeBlock(codeBlock);
258
- deferred.resolve();
259
- return;
260
- }
261
182
  // Create diff previewer
262
183
  const previewer = inlineDiffController.createDiffPreviewer(editor, ide_monaco_1.Selection.fromRange(range, ide_monaco_1.SelectionDirection.LTR), {
263
184
  disposeWhenEditorClosed: true,
264
185
  renderRemovedWidgetImmediately: true,
265
- reverse: true,
266
186
  });
267
- this.activePreviewerMap.set(codeBlock.relativePath, previewer);
187
+ // TODO: 支持多个diffPreviewer
188
+ this.activePreviewer = previewer;
268
189
  codeBlock.updatedCode = updatedContentOrStream;
269
- codeBlock.status = 'pending';
270
- this.updateCodeBlock(codeBlock);
271
- // 新建文件场景,为避免model为空,加一个空行
272
- previewer.setValue((earlistPendingCodeBlock === null || earlistPendingCodeBlock === void 0 ? void 0 : earlistPendingCodeBlock.originalCode) || codeBlock.originalCode || '\n');
273
- // 强刷展示 manager 视图
274
- this.eventBus.fire(new browser_1.RegisterEditorSideComponentEvent());
275
- this.listenPartialEdit(editor.getModel(), codeBlock).then((result) => {
276
- if (result) {
277
- codeBlock.applyResult = result;
278
- }
279
- this.updateCodeBlock(codeBlock);
280
- this.editorService.save(ide_utils_1.URI.file(ide_utils_1.path.join(this.appConfig.workspaceDir, codeBlock.relativePath)));
281
- });
282
- const { diff, rangesFromDiffHunk } = this.getDiffResult(codeBlock.originalCode, codeBlock.updatedCode, codeBlock.relativePath);
283
- const diagnosticInfos = this.getDiagnosticInfos(editor.getModel().uri.toString(), rangesFromDiffHunk);
284
- deferred.resolve({
285
- diff,
286
- diagnosticInfos,
287
- });
190
+ previewer.setValue(updatedContentOrStream);
288
191
  }
289
192
  else {
290
193
  const controller = new inline_chat_controller_1.InlineChatController();
291
194
  controller.mountReadable(updatedContentOrStream);
292
- const previewer = inlineDiffController.showPreviewerByStream(editor, {
195
+ const inlineDiffHandler = inline_diff_1.InlineDiffController.get(editor);
196
+ this.activePreviewer = inlineDiffHandler.showPreviewerByStream(editor, {
293
197
  crossSelection: ide_monaco_1.Selection.fromRange(range, ide_monaco_1.SelectionDirection.LTR),
294
198
  chatResponse: controller,
295
199
  previewerOptions: {
@@ -297,38 +201,22 @@ class BaseApplyService extends ide_core_browser_1.WithEventBus {
297
201
  renderRemovedWidgetImmediately: false,
298
202
  },
299
203
  });
300
- this.addDispose(
301
- // 流式输出结束后,转为直接输出逻辑
302
- previewer.getNode().onDiffFinished(async (diffModel) => {
204
+ this.addDispose(this.activePreviewer.getNode().onDiffFinished((diffModel) => {
303
205
  codeBlock.updatedCode = diffModel.newFullRangeTextLines.join('\n');
304
- // TODO: 添加 reapply
305
- // 实际应用结果为空,则取消
306
- if (codeBlock.updatedCode === codeBlock.originalCode) {
307
- codeBlock.status = 'cancelled';
308
- this.updateCodeBlock(codeBlock);
309
- previewer.dispose();
310
- deferred.resolve();
311
- return;
312
- }
313
206
  this.updateCodeBlock(codeBlock);
314
- previewer.dispose();
315
- const result = await this.renderApplyResult(editor, codeBlock, codeBlock.updatedCode);
316
- deferred.resolve(result);
317
207
  }));
318
- this.activePreviewerMap.set(codeBlock.relativePath, previewer);
319
208
  }
320
- return deferred.promise;
209
+ return this.listenPartialEdit(editor, codeBlock, fullOriginalContent);
321
210
  }
322
211
  /**
323
212
  * Cancel an ongoing apply operation
324
213
  */
325
214
  cancelApply(blockData) {
326
- var _a, _b;
215
+ var _a;
327
216
  if (blockData.status === 'generating' || blockData.status === 'pending') {
328
- if (this.activePreviewerMap.has(blockData.relativePath)) {
329
- (_b = (_a = this.activePreviewerMap
330
- .get(blockData.relativePath)) === null || _a === void 0 ? void 0 : _a.getNode()) === null || _b === void 0 ? void 0 : _b.livePreviewDiffDecorationModel.discardUnProcessed();
331
- this.activePreviewerMap.disposeKey(blockData.relativePath);
217
+ if (this.activePreviewer) {
218
+ (_a = this.activePreviewer.getNode()) === null || _a === void 0 ? void 0 : _a.livePreviewDiffDecorationModel.discardUnProcessed();
219
+ this.activePreviewer.dispose();
332
220
  }
333
221
  blockData.status = 'cancelled';
334
222
  this.updateCodeBlock(blockData);
@@ -368,8 +256,7 @@ class BaseApplyService extends ide_core_browser_1.WithEventBus {
368
256
  if (!codeBlock) {
369
257
  throw new Error('No pending code block found');
370
258
  }
371
- const decorationModel = (_b = (_a = this.activePreviewerMap
372
- .get(codeBlock.relativePath)) === null || _a === void 0 ? void 0 : _a.getNode()) === null || _b === void 0 ? void 0 : _b.livePreviewDiffDecorationModel;
259
+ const decorationModel = (_b = (_a = this.activePreviewer) === null || _a === void 0 ? void 0 : _a.getNode()) === null || _b === void 0 ? void 0 : _b.livePreviewDiffDecorationModel;
373
260
  if (!decorationModel) {
374
261
  throw new Error('No active previewer found');
375
262
  }
@@ -383,21 +270,32 @@ class BaseApplyService extends ide_core_browser_1.WithEventBus {
383
270
  codeBlock.status = type === 'accept' ? 'success' : 'cancelled';
384
271
  this.updateCodeBlock(codeBlock);
385
272
  }
386
- listenPartialEdit(model, codeBlock) {
273
+ listenPartialEdit(editor, codeBlock, fullOriginalContent) {
387
274
  const deferred = new ide_utils_1.Deferred();
388
- const uriString = model.uri.toString();
389
275
  const toDispose = this.inlineDiffService.onPartialEdit((event) => {
390
276
  // TODO 支持自动保存
391
- if (event.totalPartialEditCount === event.resolvedPartialEditCount &&
392
- event.uri.path === model.uri.path.toString()) {
277
+ if (event.totalPartialEditCount === event.resolvedPartialEditCount) {
393
278
  if (event.acceptPartialEditCount > 0) {
394
279
  codeBlock.status = 'success';
395
- const appliedResult = model.getValue();
396
- const { diff, rangesFromDiffHunk } = this.getDiffResult(codeBlock.originalCode, appliedResult, codeBlock.relativePath);
397
- const diagnosticInfos = this.getDiagnosticInfos(model.uri.toString(), rangesFromDiffHunk);
280
+ const appliedResult = editor.getModel().getValue();
281
+ const diffResult = (0, diff_1.createPatch)(codeBlock.relativePath, fullOriginalContent, appliedResult)
282
+ .split('\n')
283
+ .slice(4)
284
+ .join('\n');
285
+ const rangesFromDiffHunk = diffResult
286
+ .split('\n')
287
+ .map((line) => {
288
+ if (line.startsWith('@@')) {
289
+ const [, , , start, end] = line.match(/@@ -(\d+),(\d+) \+(\d+),(\d+) @@/);
290
+ return new ide_monaco_1.Range(parseInt(start, 10), 0, parseInt(end, 10), 0);
291
+ }
292
+ return null;
293
+ })
294
+ .filter((range) => range !== null);
295
+ const diagnosticInfos = this.getDiagnosticInfos(editor.getModel().uri.toString(), rangesFromDiffHunk);
398
296
  // 移除开头的几个固定信息,避免浪费 tokens
399
297
  deferred.resolve({
400
- diff,
298
+ diff: diffResult,
401
299
  diagnosticInfos,
402
300
  });
403
301
  }
@@ -406,29 +304,11 @@ class BaseApplyService extends ide_core_browser_1.WithEventBus {
406
304
  codeBlock.status = 'cancelled';
407
305
  deferred.resolve();
408
306
  }
409
- this.editorListenerMap.disposeKey(uriString);
307
+ toDispose.dispose();
410
308
  }
411
309
  });
412
- this.editorListenerMap.set(uriString, toDispose);
413
310
  return deferred.promise;
414
311
  }
415
- getDiffResult(originalContent, appliedResult, relativePath) {
416
- const diffResult = (0, diff_1.createPatch)(relativePath, originalContent, appliedResult).split('\n').slice(4).join('\n');
417
- const rangesFromDiffHunk = diffResult
418
- .split('\n')
419
- .map((line) => {
420
- if (line.startsWith('@@')) {
421
- const [, , , start, end] = line.match(/@@ -(\d+),(\d+) \+(\d+),(\d+) @@/);
422
- return new ide_monaco_1.Range(parseInt(start, 10), 0, parseInt(end, 10), 0);
423
- }
424
- return null;
425
- })
426
- .filter((range) => range !== null);
427
- return {
428
- diff: diffResult,
429
- rangesFromDiffHunk,
430
- };
431
- }
432
312
  // TODO: 支持使用内存中的document获取诊断信息,实现并行apply accept
433
313
  getDiagnosticInfos(uri, ranges) {
434
314
  const markers = this.markerService.getManager().getMarkers({ resource: uri });
@@ -437,6 +317,10 @@ class BaseApplyService extends ide_core_browser_1.WithEventBus {
437
317
  }
438
318
  }
439
319
  exports.BaseApplyService = BaseApplyService;
320
+ tslib_1.__decorate([
321
+ (0, di_1.Autowired)(ReadFile_1.FileHandler),
322
+ tslib_1.__metadata("design:type", ReadFile_1.FileHandler)
323
+ ], BaseApplyService.prototype, "fileHandler", void 0);
440
324
  tslib_1.__decorate([
441
325
  (0, di_1.Autowired)(common_1.IChatInternalService),
442
326
  tslib_1.__metadata("design:type", chat_internal_service_1.ChatInternalService)
@@ -457,10 +341,6 @@ tslib_1.__decorate([
457
341
  (0, di_1.Autowired)(ide_markers_1.IMarkerService),
458
342
  tslib_1.__metadata("design:type", Object)
459
343
  ], BaseApplyService.prototype, "markerService", void 0);
460
- tslib_1.__decorate([
461
- (0, di_1.Autowired)(browser_1.IEditorDocumentModelService),
462
- tslib_1.__metadata("design:type", Object)
463
- ], BaseApplyService.prototype, "editorDocumentModelService", void 0);
464
344
  tslib_1.__decorate([
465
345
  (0, ide_core_browser_1.OnEvent)(browser_1.EditorGroupCloseEvent),
466
346
  tslib_1.__metadata("design:type", Function),
@@ -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":"EditFile.d.ts","sourceRoot":"","sources":["../../../../../src/browser/mcp/tools/components/EditFile.tsx"],"names":[],"mappings":"AAsBA,OAAO,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAC;AAK9D,eAAO,MAAM,qBAAqB,UAAW,4BAA4B,iBA+GxE,CAAC"}
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;AAK9D,eAAO,MAAM,qBAAqB,UAAW,4BAA4B,iBAyGxE,CAAC"}
@@ -7,7 +7,6 @@ const react_1 = tslib_1.__importStar(require("react"));
7
7
  const ide_components_1 = require("@opensumi/ide-components");
8
8
  const ide_core_browser_1 = require("@opensumi/ide-core-browser");
9
9
  const ai_native_1 = require("@opensumi/ide-core-browser/lib/components/ai-native");
10
- const ide_editor_1 = require("@opensumi/ide-editor");
11
10
  const language_1 = require("@opensumi/monaco-editor-core/esm/vs/editor/common/languages/language");
12
11
  const model_1 = require("@opensumi/monaco-editor-core/esm/vs/editor/common/services/model");
13
12
  const standaloneServices_1 = require("@opensumi/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices");
@@ -21,7 +20,6 @@ const EditFileToolComponent = (props) => {
21
20
  const labelService = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.LabelService);
22
21
  const appConfig = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.AppConfig);
23
22
  const applyService = (0, ide_core_browser_1.useInjectable)(base_apply_service_1.BaseApplyService);
24
- const editorService = (0, ide_core_browser_1.useInjectable)(ide_editor_1.WorkbenchEditorService);
25
23
  const { target_file = '', code_edit, instructions } = args || {};
26
24
  const absolutePath = ide_core_browser_1.path.join(appConfig.workspaceDir, target_file);
27
25
  const [codeBlockData, setCodeBlockData] = (0, react_1.useState)(applyService.getCodeBlock(toolCallId, messageId));
@@ -43,18 +41,14 @@ const EditFileToolComponent = (props) => {
43
41
  }, [target_file, absolutePath]);
44
42
  (0, react_1.useEffect)(() => {
45
43
  const disposable = applyService.onCodeBlockUpdate((codeBlockData) => {
46
- if (codeBlockData.toolCallId === toolCallId) {
47
- setCodeBlockData({ ...codeBlockData });
48
- }
44
+ setCodeBlockData({ ...codeBlockData });
49
45
  });
50
46
  return () => {
51
47
  disposable.dispose();
52
48
  };
53
49
  }, []);
54
- const handleToggleMode = (e) => {
55
- e.stopPropagation();
56
- setMode(mode === 'code' ? 'diff' : 'code');
57
- };
50
+ // 多次迭代时,仅在首处tool组件中展示
51
+ // FIXME: 这个优化有必要吗?每次都展示也挺好?
58
52
  if (!args || !codeBlockData) {
59
53
  return null;
60
54
  }
@@ -65,7 +59,7 @@ const EditFileToolComponent = (props) => {
65
59
  clickable: codeBlockData.status === 'pending' || codeBlockData.status === 'success',
66
60
  }), onClick: () => {
67
61
  if (codeBlockData.status === 'pending') {
68
- editorService.open(ide_core_browser_1.URI.file(absolutePath));
62
+ applyService.renderApplyResult(codeBlockData, codeBlockData.updatedCode);
69
63
  }
70
64
  else if (codeBlockData.status === 'success') {
71
65
  applyService.revealApplyPosition(codeBlockData);
@@ -77,12 +71,12 @@ const EditFileToolComponent = (props) => {
77
71
  codeBlockData.iterationCount > 1 && (react_1.default.createElement("span", { className: index_module_less_1.default['edit-file-tool-iteration-count'] },
78
72
  codeBlockData.iterationCount,
79
73
  "/3")),
80
- renderStatus(codeBlockData, props.result)),
74
+ renderStatus(codeBlockData)),
81
75
  react_1.default.createElement("div", { className: index_module_less_1.default.right },
82
76
  react_1.default.createElement(ide_components_1.Popover, { title: 'Show Code', id: 'edit-file-tool-show-code' },
83
- react_1.default.createElement(ide_components_1.Icon, { iconClass: 'codicon codicon-file-code', onClick: handleToggleMode })),
77
+ react_1.default.createElement(ide_components_1.Icon, { iconClass: 'codicon codicon-file-code', onClick: () => setMode('code') })),
84
78
  ((_a = codeBlockData.applyResult) === null || _a === void 0 ? void 0 : _a.diff) && (react_1.default.createElement(ide_components_1.Popover, { title: 'Show Diff', id: 'edit-file-tool-show-diff' },
85
- react_1.default.createElement(ide_components_1.Icon, { iconClass: 'codicon codicon-diff-multiple', onClick: handleToggleMode }))))),
79
+ react_1.default.createElement(ide_components_1.Icon, { iconClass: 'codicon codicon-diff-multiple', onClick: () => setMode('diff') }))))),
86
80
  react_1.default.createElement(ChatMarkdown_1.ChatMarkdown, { markdown: mode === 'code'
87
81
  ? `\`\`\`${languageId || ''}\n${code_edit}\n\`\`\``
88
82
  : `\`\`\`diff\n${(_b = codeBlockData.applyResult) === null || _b === void 0 ? void 0 : _b.diff}\n\`\`\``, hideInsert: true })),
@@ -97,7 +91,7 @@ const EditFileToolComponent = (props) => {
97
91
  ];
98
92
  };
99
93
  exports.EditFileToolComponent = EditFileToolComponent;
100
- const renderStatus = (codeBlockData, error) => {
94
+ const renderStatus = (codeBlockData) => {
101
95
  const status = codeBlockData.status;
102
96
  switch (status) {
103
97
  case 'generating':
@@ -109,7 +103,7 @@ const renderStatus = (codeBlockData, error) => {
109
103
  return (react_1.default.createElement(ide_components_1.Popover, { title: 'Success', id: 'edit-file-tool-status-success' },
110
104
  react_1.default.createElement(ide_components_1.Icon, { iconClass: 'codicon codicon-check-all' })));
111
105
  case 'failed':
112
- return (react_1.default.createElement(ide_components_1.Popover, { title: `Failed (${error})`, id: 'edit-file-tool-status-failed' },
106
+ return (react_1.default.createElement(ide_components_1.Popover, { title: 'Failed', id: 'edit-file-tool-status-failed' },
113
107
  react_1.default.createElement(ide_components_1.Icon, { iconClass: 'codicon codicon-error', style: { color: 'var(--debugConsole-errorForeground)' } })));
114
108
  case 'cancelled':
115
109
  return (react_1.default.createElement(ide_components_1.Popover, { title: 'Cancelled', id: 'edit-file-tool-status-cancelled' },
@@ -1 +1 @@
1
- {"version":3,"file":"EditFile.js","sourceRoot":"","sources":["../../../../../src/browser/mcp/tools/components/EditFile.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"EditFile.js","sourceRoot":"","sources":["../../../../../src/browser/mcp/tools/components/EditFile.tsx"],"names":[],"mappings":";;;;AAAA,oEAA6B;AAC7B,uDAA4D;AAE5D,6DAAyD;AACzD,iEASoC;AACpC,mFAA8E;AAC9E,mGAAwG;AACxG,4FAAiG;AACjG,yHAAsH;AAGtH,mEAAgE;AAEhE,iEAA4D;AAE5D,oFAAyC;AAElC,MAAM,qBAAqB,GAAG,CAAC,KAAmC,EAAE,EAAE;;IAC3E,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;IAC9C,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAA,gBAAQ,EAAkB,MAAM,CAAC,CAAC;IAC1D,MAAM,YAAY,GAAG,IAAA,gCAAa,EAAC,+BAAY,CAAC,CAAC;IACjD,MAAM,SAAS,GAAG,IAAA,gCAAa,EAAY,4BAAS,CAAC,CAAC;IACtD,MAAM,YAAY,GAAG,IAAA,gCAAa,EAAmB,qCAAgB,CAAC,CAAC;IACvE,MAAM,EAAE,WAAW,GAAG,EAAE,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC;IACjE,MAAM,YAAY,GAAG,uBAAI,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;IACpE,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,IAAA,gBAAQ,EAChD,YAAY,CAAC,YAAY,CAAC,UAAU,EAAE,SAAS,CAAC,CACjD,CAAC;IAEF,MAAM,IAAI,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE;QACxB,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;QACD,MAAM,IAAI,GAAG,aAAa,YAAY,CAAC,OAAO,CAAC,sBAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC;QACzE,OAAO,IAAI,CAAC;IACd,CAAC,EAAE,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC;IAChC,MAAM,UAAU,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE;QAC9B,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;QACD,MAAM,YAAY,GAAG,uCAAkB,CAAC,GAAG,CAAC,qBAAa,CAAC,CAAC;QAC3D,MAAM,eAAe,GAAG,uCAAkB,CAAC,GAAG,CAAC,2BAAgB,CAAC,CAAC;QACjE,MAAM,cAAc,GAAG,IAAA,+BAAY,EAAC,YAAY,EAAE,eAAe,EAAE,sBAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;QAC3F,OAAO,cAAc,CAAC;IACxB,CAAC,EAAE,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC;IAEhC,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,MAAM,UAAU,GAAG,YAAY,CAAC,iBAAiB,CAAC,CAAC,aAAa,EAAE,EAAE;YAClE,gBAAgB,CAAC,EAAE,GAAG,aAAa,EAAE,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;QACH,OAAO,GAAG,EAAE;YACV,UAAU,CAAC,OAAO,EAAE,CAAC;QACvB,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,sBAAsB;IACtB,4BAA4B;IAC5B,IAAI,CAAC,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO;QACL,YAAY,IAAI,yCAAI,YAAY,CAAK;QACrC,uCAAK,SAAS,EAAE,2BAAM,CAAC,gBAAgB,CAAC,EAAE,GAAG,EAAE,gBAAgB;YAC7D,uCACE,SAAS,EAAE,IAAA,oBAAG,EAAC,2BAAM,CAAC,uBAAuB,CAAC,EAAE;oBAC9C,SAAS,EAAE,aAAa,CAAC,MAAM,KAAK,SAAS,IAAI,aAAa,CAAC,MAAM,KAAK,SAAS;iBACpF,CAAC,EACF,OAAO,EAAE,GAAG,EAAE;oBACZ,IAAI,aAAa,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;wBACvC,YAAY,CAAC,iBAAiB,CAAC,aAAa,EAAE,aAAa,CAAC,WAAY,CAAC,CAAC;oBAC5E,CAAC;yBAAM,IAAI,aAAa,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;wBAC9C,YAAY,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC;oBAClD,CAAC;gBACH,CAAC;gBAED,uCAAK,SAAS,EAAE,2BAAM,CAAC,IAAI;oBACxB,IAAI,IAAI,wCAAM,SAAS,EAAE,IAAI,GAAS;oBACvC,wCAAM,SAAS,EAAE,2BAAM,CAAC,0BAA0B,CAAC,IAAG,WAAW,CAAQ;oBACxE,aAAa,CAAC,cAAc,GAAG,CAAC,IAAI,CACnC,wCAAM,SAAS,EAAE,2BAAM,CAAC,gCAAgC,CAAC;wBAAG,aAAa,CAAC,cAAc;6BAAU,CACnG;oBACA,YAAY,CAAC,aAAa,CAAC,CACxB;gBACN,uCAAK,SAAS,EAAE,2BAAM,CAAC,KAAK;oBAC1B,8BAAC,wBAAO,IAAC,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE,0BAA0B;wBACzD,8BAAC,qBAAI,IAAC,SAAS,EAAC,2BAA2B,EAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,GAAI,CACtE;oBACT,CAAA,MAAA,aAAa,CAAC,WAAW,0CAAE,IAAI,KAAI,CAClC,8BAAC,wBAAO,IAAC,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE,0BAA0B;wBACzD,8BAAC,qBAAI,IAAC,SAAS,EAAC,+BAA+B,EAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,GAAI,CAC1E,CACX,CACG,CACF;YACN,8BAAC,2BAAY,IACX,QAAQ,EACN,IAAI,KAAK,MAAM;oBACb,CAAC,CAAC,SAAS,UAAU,IAAI,EAAE,KAAK,SAAS,UAAU;oBACnD,CAAC,CAAC,eAAe,MAAA,aAAa,CAAC,WAAW,0CAAE,IAAI,UAAU,EAE9D,UAAU,EAAE,IAAI,GAChB,CACE;QACN,aAAa,CAAC,WAAW,IAAI,aAAa,CAAC,WAAW,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,IAAI,CACnF,uCAAK,SAAS,EAAE,2BAAM,CAAC,kCAAkC,CAAC,EAAE,GAAG,EAAE,kCAAkC;YACjG,uCAAK,SAAS,EAAE,2BAAM,CAAC,OAAO,CAAC,mBAAoB,EAClD,MAAA,aAAa,CAAC,WAAW;eAAE,eAAe,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CACxD,uCACE,GAAG,EAAE,IAAI,CAAC,OAAO,EACjB,SAAS,EAAE,IAAA,oBAAG,EAAC;oBACb,CAAC,2BAAM,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,KAAK,iCAAc,CAAC,KAAK;oBACzD,CAAC,2BAAM,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,KAAK,iCAAc,CAAC,OAAO;iBAC9D,CAAC;gBAEF,8BAAC,qBAAI,IAAC,SAAS,EAAE,mBAAmB,IAAI,CAAC,QAAQ,KAAK,iCAAc,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,EAAE,GAAI;gBACrG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CACxB,CACP,CAAC,CACE,CACP;KACF,CAAC;AACJ,CAAC,CAAC;AAzGW,QAAA,qBAAqB,yBAyGhC;AAEF,MAAM,YAAY,GAAG,CAAC,aAA4B,EAAE,EAAE;IACpD,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC;IACpC,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,YAAY;YACf,OAAO,8BAAC,mBAAO,OAAG,CAAC;QACrB,KAAK,SAAS;YACZ,OAAO,CACL,8BAAC,wBAAO,IAAC,KAAK,EAAC,SAAS,EAAC,EAAE,EAAE,+BAA+B;gBAC1D,8BAAC,qBAAI,IAAC,SAAS,EAAC,8BAA8B,GAAG,CACzC,CACX,CAAC;QACJ,KAAK,SAAS;YACZ,OAAO,CACL,8BAAC,wBAAO,IAAC,KAAK,EAAC,SAAS,EAAC,EAAE,EAAE,+BAA+B;gBAC1D,8BAAC,qBAAI,IAAC,SAAS,EAAC,2BAA2B,GAAG,CACtC,CACX,CAAC;QACJ,KAAK,QAAQ;YACX,OAAO,CACL,8BAAC,wBAAO,IAAC,KAAK,EAAC,QAAQ,EAAC,EAAE,EAAE,8BAA8B;gBACxD,8BAAC,qBAAI,IAAC,SAAS,EAAC,uBAAuB,EAAC,KAAK,EAAE,EAAE,KAAK,EAAE,qCAAqC,EAAE,GAAI,CAC3F,CACX,CAAC;QACJ,KAAK,WAAW;YACd,OAAO,CACL,8BAAC,wBAAO,IAAC,KAAK,EAAC,WAAW,EAAC,EAAE,EAAE,iCAAiC;gBAC9D,8BAAC,qBAAI,IAAC,SAAS,EAAC,uBAAuB,EAAC,KAAK,EAAE,EAAE,KAAK,EAAE,oCAAoC,EAAE,GAAI,CAC1F,CACX,CAAC;QACJ;YACE,OAAO,IAAI,CAAC;IAChB,CAAC;AACH,CAAC,CAAC"}
@@ -17,9 +17,6 @@
17
17
  align-items: center;
18
18
  justify-content: center;
19
19
  }
20
- .left {
21
- overflow: hidden;
22
- }
23
20
  .left,
24
21
  .right {
25
22
  display: flex;
@@ -2,7 +2,6 @@ import { IMCPServerRegistry, MCPServerContribution, MCPToolDefinition } from '..
2
2
  export declare class CreateNewFileWithTextTool implements MCPServerContribution {
3
3
  private readonly workspaceService;
4
4
  private readonly fileService;
5
- private applyService;
6
5
  registerMCPServer(registry: IMCPServerRegistry): void;
7
6
  getToolDefinition(): MCPToolDefinition;
8
7
  private handler;
@@ -1 +1 @@
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;AAUtG,qBACa,yBAA0B,YAAW,qBAAqB;IAErE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAoB;IAGrD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;IAGjD,OAAO,CAAC,YAAY,CAAmB;IAEvC,iBAAiB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;IAKrD,iBAAiB,IAAI,iBAAiB;YAgBxB,OAAO;CAyCtB"}
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;YAmBxB,OAAO;CAqCtB"}