@opensumi/ide-ai-native 3.8.2-next-1741622293.0 → 3.8.3-next-1741661270.0

package/lib/browser/components/change-list.module.less

@@ -0,0 +1,126 @@
+.container {
+  margin: 0 12px;
+  background: var(--design-chatInput-background);
+  border-radius: 9px 9px 0 0;
+  border: 1px solid var(--kt-input-border);
+  border-bottom: none;
+  overflow: hidden;
+  padding-bottom: 6px;
+}
+
+.header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 8px 12px 2px 12px;
+  background-color: transparent;
+  cursor: pointer;
+  user-select: none;
+  font-size: 12px;
+  color: var(--descriptionForeground);
+}
+
+.title:hover {
+  color: var(--design-text-highlightForeground);
+  .toggleButton :global(.kt-icon) {
+    color: var(--design-text-highlightForeground);
+    transition: color 0.2s ease-in-out;
+  }
+}
+
+.toggleButton {
+  background: none;
+  border: none;
+  cursor: pointer;
+  padding: 0;
+  width: 16px;
+  height: 16px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 12px;
+}
+
+.title {
+  gap: 6px;
+  transition: color 0.2s ease-in-out;
+  display: flex;
+}
+
+.fileList {
+  list-style: none;
+  margin: 0;
+  padding: 0 12px;
+}
+
+.fileItem {
+  display: flex;
+  align-items: center;
+  padding: 4px 0;
+  cursor: pointer;
+  border: none;
+  font-size: 13px;
+  color: var(--descriptionForeground);
+}
+
+.fileItem:hover {
+  background-color: var(--design-block-hoverBackground);
+}
+
+.fileIcon {
+  margin-right: 6px;
+  width: 16px;
+  height: 16px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.fileInfo {
+  flex: 1;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  overflow: hidden;
+  :global(.kt-popover-trigger) {
+    margin-left: 8px;
+  }
+  :global(.codicon) {
+    font-size: 12px !important;
+    position: relative;
+    top: 1px;
+  }
+}
+
+.filePath {
+  font-size: 12px;
+  margin: 0;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.fileStats {
+  font-size: 12px;
+  display: flex;
+  align-items: center;
+  gap: 4px;
+}
+
+.additions {
+  color: #52c41a;
+}
+
+.deletions {
+  color: var(--debugConsole-errorForeground);
+}
+
+.noChange {
+  color: #6a737d;
+  font-style: italic;
+  white-space: nowrap;
+}
+
+.collapsed {
+  display: none;
+}

package/lib/browser/components/chat-history.module.less

@@ -78,7 +78,7 @@
   .dm-chat-history-list {
     overflow: auto;
     max-height: 400px;
-    max-width: 400px;
+    width: 300px;
     margin-top: 4px;
     font-size: 13px;
   }

package/lib/browser/components/components.module.less

@@ -527,3 +527,17 @@
     align-items: center;
   }
 }
+
+.status {
+  :global {
+    .codicon-pass {
+      color: #52c41a;
+    }
+    .codicon-error {
+      color: var(--debugConsole-errorForeground);
+    }
+    .codicon-circle-slash {
+      color: var(--input-placeholderForeground);
+    }
+  }
+}

package/lib/browser/contrib/inline-completions/prompt/matcher.js

@@ -210,8 +210,8 @@ class WindowedMatcher {
                 tokens.slice(startLine, endLine).forEach((token) => token.forEach((word) => size.add(word)));
                 cache.push(size);
             }
-            const target = cache[index];
-            const score = this.similarityScore(target, this.referenceTokens);
+            const traget = cache[index];
+            const score = this.similarityScore(traget, this.referenceTokens);
             snippets.push({
                 score,
                 startLine,

package/lib/browser/contrib/inline-completions/prompt/similarSnippets.d.ts

@@ -1,7 +1,7 @@
 import { Injector } from '@opensumi/di';
 import { IEditorDocumentModel } from '@opensumi/ide-editor';
 import { ICompletionContext, MatchSimilarSnippet, NeighboringTabsOption, ResourceDocument, SimilarFileOptions } from '../types';
-export declare const getOpenedTabFileList: (documents: IEditorDocumentModel[]) => IEditorDocumentModel[];
+export declare const getOpenedTabFileList: (docuemnts: IEditorDocumentModel[]) => IEditorDocumentModel[];
 export declare const getRecentEditFileList: () => never[];
 export declare const getNeighboringDocument: (type: NeighboringTabsOption, injector: Injector) => Promise<IEditorDocumentModel[]>;
 export declare const getNeighboringResource: (targetFileName: string, languageId: string, option: SimilarFileOptions, injector: Injector) => Promise<ResourceDocument[]>;

package/lib/browser/contrib/inline-completions/prompt/similarSnippets.js

@@ -7,9 +7,9 @@ const utils_1 = require("../../../../common/utils");
 const types_1 = require("../types");
 const const_1 = require("./const");
 const jaccardMatcher_1 = require("./jaccardMatcher");
-const getOpenedTabFileList = (documents) => {
+const getOpenedTabFileList = (docuemnts) => {
     // 过滤超大文档
-    const recentFiles = documents.filter((document) => (0, utils_1.isDocumentValid)(document));
+    const recentFiles = docuemnts.filter((document) => (0, utils_1.isDocumentValid)(document));
     return recentFiles;
 };
 exports.getOpenedTabFileList = getOpenedTabFileList;

package/lib/browser/contrib/intelligent-completions/view/default.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"default.d.ts","sourceRoot":"","sources":["../../../../../src/browser/contrib/intelligent-completions/view/default.ts"],"names":[],"mappings":"AA6BA,OAAO,EAAE,oBAAoB,EAA+B,MAAM,UAAU,CAAC;AAE7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AA2B3C,qBAAa,oBAAqB,SAAQ,iBAAiB;IACzD,OAAO,CAAC,sBAAsB,CAO3B;IAEH,OAAO,CAAC,uBAAuB,CAQ5B;IAEI,MAAM,CAAC,eAAe,EAAE,oBAAoB,GAAG,IAAI;IAkEnD,MAAM,IAAI,IAAI;IAKd,OAAO,IAAI,IAAI;IAOf,IAAI,IAAI,IAAI;CAGpB"}
+{"version":3,"file":"default.d.ts","sourceRoot":"","sources":["../../../../../src/browser/contrib/intelligent-completions/view/default.ts"],"names":[],"mappings":"AA6BA,OAAO,EAAE,oBAAoB,EAA+B,MAAM,UAAU,CAAC;AAG7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AA2B3C,qBAAa,oBAAqB,SAAQ,iBAAiB;IACzD,OAAO,CAAC,sBAAsB,CAO3B;IAEH,OAAO,CAAC,uBAAuB,CAQ5B;IAEI,MAAM,CAAC,eAAe,EAAE,oBAAoB,GAAG,IAAI;IAkEnD,MAAM,IAAI,IAAI;IAKd,OAAO,IAAI,IAAI;IAOf,IAAI,IAAI,IAAI;CAGpB"}

package/lib/browser/contrib/intelligent-completions/view/default.js.map

@@ -1 +1 @@
-{"version":3,"file":"default.js","sourceRoot":"","sources":["../../../../../src/browser/contrib/intelligent-completions/view/default.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"default.js","sourceRoot":"","sources":["../../../../../src/browser/contrib/intelligent-completions/view/default.ts"],"names":[],"mappings":";;;AAAA,8EAA0F;AAC1F,+DAA2D;AAC3D,qDAM8B;AAC9B,2EAMoD;AACpD,mFAAqG;AAErG,qKAAkK;AAElK,wJAGoH;AACpH,0JAGqH;AAKrH,iCAA2C;AAE3C;;GAEG;AACH,MAAM,aAAa;IACjB,YACkB,QAAkB,EAClB,OAAgC,EAChC,SAAiB;QAFjB,aAAQ,GAAR,QAAQ,CAAU;QAClB,YAAO,GAAP,OAAO,CAAyB;QAChC,cAAS,GAAT,SAAS,CAAQ;IAChC,CAAC;IAEG,SAAS,CAAC,KAAoB;QACnC,OAAO,CACL,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC;YACpC,IAAA,wBAAe,EAAC,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE,KAAK,CAAC,OAAO,CAAC,sBAAsB,EAAE,IAAA,mBAAU,GAAE,CAAC;YACxG,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,KAAK,wCAA2B,CAAC,SAAS;gBAClE,IAAI,CAAC,OAAO,CAAC,WAAW,KAAK,wCAA2B,CAAC,QAAQ,CAAC;YACpE,IAAI,CAAC,SAAS,KAAK,KAAK,CAAC,SAAS,CACnC,CAAC;IACJ,CAAC;IAED,IAAW,iBAAiB;QAC1B,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,KAAK,wCAA2B,CAAC,QAAQ,CAAC;IAC3E,CAAC;CACF;AAED,MAAa,oBAAqB,SAAQ,wBAAiB;IAA3D;;QACU,2BAAsB,GAAoD,IAAA,oBAAO,EAAC,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE;YACzG,MAAM,2BAA2B,GAAG,yDAA2B,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACvF,IAAI,CAAC,2BAA2B,EAAE,CAAC;gBACjC,OAAO;YACT,CAAC;YAED,OAAO,2BAA2B,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;QAEK,4BAAuB,GAAqD,IAAA,oBAAO,EAAC,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE;YAC3G,MAAM,KAAK,GAAG,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACvD,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,OAAO;YACT,CAAC;YAED,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAA4B,CAAC;YAC3D,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CAAC;IAmFL,CAAC;IAjFQ,MAAM,CAAC,eAAqC;;QACjD,MAAM,MAAM,GAAG,IAAI,CAAC,uBAAuB,CAAC,GAAG,EAAE,CAAC;QAClD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO;QACT,CAAC;QAED,MAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE,0CAAG,CAAC,CAAC,CAAC;QACrD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO;QACT,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QACzC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO;QACT,CAAC;QAED,MAAM,eAAe,GAAG,KAAK,CAAC,eAAe,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QAC1E,sBAAsB;QACtB,IAAI,eAAe,KAAK,eAAe,CAAC,SAAS,EAAE,CAAC;YAClD,OAAO;QACT,CAAC;QAED,IAAA,6BAAgB,EAAC,KAAK,EAAE,EAAE,EAAE,EAAE;YAC5B,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;YACjD,MAAM,OAAO,GAA4B;gBACvC,WAAW,EAAE,wCAA2B,CAAC,SAAS;gBAClD,sBAAsB,EAAE,SAAS;gBACjC,wBAAwB,EAAE,KAAK;gBAC/B,kBAAkB,EAAE,IAAI;aACzB,CAAC;YAEF,MAAM,OAAO,GAAG,IAAI,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,SAAU,CAAC,CAAC;YACjE,MAAM,WAAW,GAAmC,MAAM,IAAA,mDAAwB,EAChF;gBACE,GAAG,EAAE,GAAG,EAAE,CAAC;oBACT;wBACE,wBAAwB,EAAE,GAAG,EAAE,GAAE,CAAC;wBAClC,0BAA0B,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK;4BACrD,OAAO,eAAe,CAAC;wBACzB,CAAC;wBACD,qBAAqB,EAAE,GAAG,EAAE,CAAC,EAAE;wBAC/B,eAAe,EAAE,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE;4BACrC,MAAM,cAAc,GAAmB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,gCAAc,CAAC,CAAC;4BACzE,cAAc,CAAC,cAAc,CAAC,gCAAsB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;wBACnE,CAAC;qBACwD;iBAC5D;aAC+D,EAClE,kBAAK,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,EACtC,KAAK,EACL,OAAO,CACR,CAAC;YAEF,MAAM,WAAW,GAAG,IAAI,mDAAyB,CAC/C,WAAW,EACX,OAAO,EACP,KAAK,EACL,IAAI,CAAC,SAAS,CAAC,SAAS,EACxB,IAAA,4BAAe,EAAC,IAAI,CAAC,CACtB,CAAC;YAEF,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;YAC9C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,MAAM;QACX,MAAM,KAAK,GAAG,IAAI,CAAC,sBAAsB,CAAC,GAAG,EAAE,CAAC;QAChD,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,EAAE,CAAC;IAClB,CAAC;IAEM,OAAO;QACZ,MAAM,KAAK,GAAG,IAAI,CAAC,sBAAsB,CAAC,GAAG,EAAE,CAAC;QAChD,IAAA,wBAAW,EAAC,CAAC,EAAE,EAAE,EAAE;YACjB,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,IAAI;;QACT,MAAA,MAAA,IAAI,CAAC,uBAAuB,CAAC,GAAG,EAAE,0CAAE,iBAAiB,0CAAE,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACnF,CAAC;CACF;AArGD,oDAqGC"}

package/lib/browser/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAGL,qBAAqB,EACrB,aAAa,EASd,MAAM,4BAA4B,CAAC;AAgEpC,qBACa,cAAe,SAAQ,aAAa;IAE/C,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,qBAAqB,CAAC;;IAOzD,oBAAoB,WAAqD;IACzE,SAAS,EAAE,QAAQ,EAAE,CAsHnB;IAEF,YAAY;;;;;;;;;;;;SAcV;CACH"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAGL,qBAAqB,EACrB,aAAa,EASd,MAAM,4BAA4B,CAAC;AAiEpC,qBACa,cAAe,SAAQ,aAAa;IAE/C,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,qBAAqB,CAAC;;IAOzD,oBAAoB,WAAqD;IACzE,SAAS,EAAE,QAAQ,EAAE,CAsHnB;IAEF,YAAY;;;;;;;;;;;;SAcV;CACH"}

package/lib/browser/index.js

@@ -159,14 +159,14 @@ let AINativeModule = class AINativeModule extends ide_core_browser_1.BrowserModu
                 token: common_1.IAIInlineCompletionsProvider,
                 useClass: completeProvider_1.AIInlineCompletionsProvider,
             },
-            {
-                token: inline_diff_1.InlineDiffService,
-                useClass: inline_diff_1.InlineDiffService,
-            },
             {
                 token: context_prompt_provider_1.ChatAgentPromptProvider,
                 useClass: context_prompt_provider_1.DefaultChatAgentPromptProvider,
             },
+            {
+                token: common_1.InlineDiffServiceToken,
+                useClass: inline_diff_1.InlineDiffService,
+            },
             {
                 token: base_apply_service_1.BaseApplyService,
                 useClass: apply_service_1.ApplyService,

package/lib/browser/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"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"}

package/lib/browser/mcp/base-apply.service.d.ts

@@ -7,7 +7,7 @@ import { SumiReadableStream } from '@opensumi/ide-utils/lib/stream';
 import { CodeBlockData } from '../../common/types';
 import { ChatInternalService } from '../chat/chat.internal.service';
 import { BaseInlineDiffPreviewer } from '../widget/inline-diff';
-import { BaseInlineStreamDiffHandler } from '../widget/inline-stream-diff/inline-stream-diff.handler';
+import type { BaseInlineStreamDiffHandler } from '../widget/inline-stream-diff/inline-stream-diff.handler';
 export declare abstract class BaseApplyService extends WithEventBus {
     protected chatInternalService: ChatInternalService;
     protected appConfig: AppConfig;
@@ -31,7 +31,7 @@ export declare abstract class BaseApplyService extends WithEventBus {
      */
     getUriCodeBlocks(uri: URI): CodeBlockData[] | undefined;
     getPendingPaths(sessionId?: string): string[];
-    protected getSessionCodeBlocks(sessionId?: string): CodeBlockData[];
+    getSessionCodeBlocks(sessionId?: string): CodeBlockData[];
     getCodeBlock(toolCallId: string, messageId?: string): CodeBlockData | undefined;
     protected updateCodeBlock(codeBlock: CodeBlockData): void;
     registerCodeBlock(relativePath: string, content: string, toolCallId: string, instructions?: string): Promise<CodeBlockData>;
@@ -40,17 +40,25 @@ export declare abstract class BaseApplyService extends WithEventBus {
      * Apply changes of a code block
      */
     apply(codeBlock: CodeBlockData): Promise<CodeBlockData>;
+    /**
+     * 渲染apply结果（支持流式和直接输出结果）
+     * 副作用：渲染时会添加accept、reject操作监听器，监听到结果时会自动更新codeBlock的result
+     */
     renderApplyResult(editor: ICodeEditor, codeBlock: CodeBlockData, updatedContentOrStream: string | SumiReadableStream<IChatProgress>, range?: Range): Promise<{
-        diff: string;
-        diagnosticInfos: IMarker[];
-    } | undefined>;
+        result?: {
+            diff: string;
+            diagnosticInfos: IMarker[];
+        };
+        updatedCode: string;
+    }>;
     /**
      * Cancel an ongoing apply operation
      */
     cancelApply(blockData: CodeBlockData, keepStatus?: boolean): void;
     cancelAllApply(sessionId?: string): void;
     revealApplyPosition(blockData: CodeBlockData): void;
-    processAll(uri: URI, type: 'accept' | 'reject'): void;
+    processAll(type: 'accept' | 'reject', uri?: URI): void;
+    protected doProcess(type: 'accept' | 'reject', relativePath: string): void;
     protected listenPartialEdit(model: ITextModel, codeBlock: CodeBlockData): Promise<{
         diff: string;
         diagnosticInfos: IMarker[];

package/lib/browser/mcp/base-apply.service.d.ts.map

@@ -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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"}
+{"version":3,"file":"base-apply.service.d.ts","sourceRoot":"","sources":["../../../src/browser/mcp/base-apply.service.ts"],"names":[],"mappings":"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"}

package/lib/browser/mcp/base-apply.service.js

@@ -86,7 +86,7 @@ class BaseApplyService extends ide_core_browser_1.WithEventBus {
         // 使用最后一个版本内容渲染 apply 内容
         if (filePendingApplies.length > 0 && filePendingApplies[0].updatedCode) {
             const editor = event.payload.group.codeEditor.monacoEditor;
-            this.renderApplyResult(editor, filePendingApplies[0], filePendingApplies[0].updatedCode);
+            await this.renderApplyResult(editor, filePendingApplies[0], filePendingApplies[0].updatedCode);
         }
     }
     get currentPreviewer() {
@@ -112,8 +112,9 @@ class BaseApplyService extends ide_core_browser_1.WithEventBus {
         return sessionCodeBlocks.filter((block) => block.status === 'pending').map((block) => block.relativePath);
     }
     getSessionCodeBlocks(sessionId) {
-        sessionId = sessionId || this.chatInternalService.sessionModel.sessionId;
-        const sessionModel = this.chatInternalService.getSession(sessionId);
+        const sessionModel = sessionId
+            ? this.chatInternalService.getSession(sessionId)
+            : this.chatInternalService.sessionModel;
         if (!sessionModel) {
             throw new Error(`Session ${sessionId} not found`);
         }
@@ -215,17 +216,12 @@ class BaseApplyService extends ide_core_browser_1.WithEventBus {
             if (!result) {
                 throw new Error('Failed to open file');
             }
-            if (typeof fastApplyFileResult.result === 'string') {
-                codeBlock.updatedCode = fastApplyFileResult.result;
-                codeBlock.status = 'pending';
-                this.updateCodeBlock(codeBlock);
-            }
-            const applyResult = await this.renderApplyResult(result.group.codeEditor.monacoEditor, codeBlock, (fastApplyFileResult.result || fastApplyFileResult.stream), fastApplyFileResult.range);
-            if (applyResult) {
-                // 用户实际接受的 apply 结果
-                codeBlock.applyResult = applyResult;
-                this.updateCodeBlock(codeBlock);
-            }
+            const res = await this.renderApplyResult(result.group.codeEditor.monacoEditor, codeBlock, (fastApplyFileResult.result || fastApplyFileResult.stream), fastApplyFileResult.range);
+            codeBlock.updatedCode = res.updatedCode;
+            codeBlock.status = 'pending';
+            // 用户实际接受的 apply 结果
+            codeBlock.applyResult = res.result;
+            this.updateCodeBlock(codeBlock);
             return codeBlock;
         }
         catch (err) {
@@ -237,26 +233,28 @@ class BaseApplyService extends ide_core_browser_1.WithEventBus {
             this.duringApply = false;
         }
     }
+    /**
+     * 渲染apply结果（支持流式和直接输出结果）
+     * 副作用：渲染时会添加accept、reject操作监听器，监听到结果时会自动更新codeBlock的result
+     */
     async renderApplyResult(editor, codeBlock, updatedContentOrStream, range) {
-        var _a, _b;
+        var _a, _b, _c;
         const deferred = new ide_utils_1.Deferred();
         const inlineDiffController = inline_diff_1.InlineDiffController.get(editor);
         range = range || editor.getModel().getFullModelRange();
         if (typeof updatedContentOrStream === 'string') {
+            const updatedContent = updatedContentOrStream;
             const editorCurrentContent = editor.getModel().getValue();
             const uri = ide_utils_1.URI.file(ide_utils_1.path.join(this.appConfig.workspaceDir, codeBlock.relativePath));
             const document = this.editorDocumentModelService.getModelReference(uri);
-            if (editorCurrentContent !== updatedContentOrStream || (document === null || document === void 0 ? void 0 : document.instance.dirty)) {
-                (_a = editor.getModel()) === null || _a === void 0 ? void 0 : _a.pushEditOperations([], [editOperation_1.EditOperation.replace(range, updatedContentOrStream)], () => null);
+            if (editorCurrentContent !== updatedContent || (document === null || document === void 0 ? void 0 : document.instance.dirty)) {
+                (_a = editor.getModel()) === null || _a === void 0 ? void 0 : _a.pushEditOperations([], [editOperation_1.EditOperation.replace(range, updatedContent)], () => null);
                 await this.editorService.save(uri);
             }
             const uriPendingCodeBlocks = (_b = this.getUriCodeBlocks(uri)) === null || _b === void 0 ? void 0 : _b.filter((block) => block.status === 'pending');
             const earlistPendingCodeBlock = uriPendingCodeBlocks === null || uriPendingCodeBlocks === void 0 ? void 0 : uriPendingCodeBlocks[uriPendingCodeBlocks.length - 1];
-            if (((earlistPendingCodeBlock === null || earlistPendingCodeBlock === void 0 ? void 0 : earlistPendingCodeBlock.originalCode) || codeBlock.originalCode) === updatedContentOrStream) {
-                codeBlock.status = 'cancelled';
-                this.updateCodeBlock(codeBlock);
-                deferred.resolve();
-                return;
+            if (((_c = (earlistPendingCodeBlock || codeBlock)) === null || _c === void 0 ? void 0 : _c.originalCode) === updatedContent) {
+                throw new Error('No changes applied');
             }
             // Create diff previewer
             const previewer = inlineDiffController.createDiffPreviewer(editor, ide_monaco_1.Selection.fromRange(range, ide_monaco_1.SelectionDirection.LTR), {
@@ -276,11 +274,14 @@ class BaseApplyService extends ide_core_browser_1.WithEventBus {
                 this.updateCodeBlock(codeBlock);
                 this.editorService.save(ide_utils_1.URI.file(ide_utils_1.path.join(this.appConfig.workspaceDir, codeBlock.relativePath)));
             });
-            const { diff, rangesFromDiffHunk } = this.getDiffResult(codeBlock.originalCode, codeBlock.updatedCode || updatedContentOrStream, codeBlock.relativePath);
+            const { diff, rangesFromDiffHunk } = this.getDiffResult(codeBlock.originalCode, updatedContent, codeBlock.relativePath);
             const diagnosticInfos = this.getDiagnosticInfos(editor.getModel().uri.toString(), rangesFromDiffHunk);
             deferred.resolve({
-                diff,
-                diagnosticInfos,
+                result: {
+                    diff,
+                    diagnosticInfos,
+                },
+                updatedCode: updatedContent,
             });
         }
         else {
@@ -303,21 +304,22 @@ class BaseApplyService extends ide_core_browser_1.WithEventBus {
             this.addDispose(
             // 流式输出结束后，转为直接输出逻辑
             previewer.getNode().onDiffFinished(async (diffModel) => {
-                codeBlock.updatedCode = diffModel.newFullRangeTextLines.join('\n');
                 // TODO: 添加 reapply
+                const updatedCode = diffModel.newFullRangeTextLines.join('\n');
                 // 实际应用结果为空，则取消
-                if (codeBlock.updatedCode === codeBlock.originalCode) {
-                    codeBlock.status = 'failed';
-                    this.updateCodeBlock(codeBlock);
+                if (codeBlock.originalCode === updatedCode) {
                     previewer.dispose();
                     deferred.reject(new Error('no changes applied'));
                     return;
                 }
-                codeBlock.status = 'pending';
-                this.updateCodeBlock(codeBlock);
                 previewer.dispose();
-                const result = await this.renderApplyResult(editor, codeBlock, codeBlock.updatedCode);
-                deferred.resolve(result);
+                try {
+                    const res = await this.renderApplyResult(editor, codeBlock, updatedCode);
+                    deferred.resolve(res);
+                }
+                catch (err) {
+                    deferred.reject(err);
+                }
             }));
             this.activePreviewerMap.set(codeBlock.relativePath, previewer);
         }
@@ -365,14 +367,37 @@ class BaseApplyService extends ide_core_browser_1.WithEventBus {
             editor.setSelection(new ide_monaco_1.Selection(startLine, 0, endLine, 0));
         }
     }
-    processAll(uri, type) {
-        var _a, _b, _c;
-        const codeBlocks = (_a = this.getUriCodeBlocks(uri)) === null || _a === void 0 ? void 0 : _a.filter((block) => block.status === 'pending');
+    processAll(type, uri) {
+        var _a;
+        const codeBlocks = uri
+            ? (_a = this.getUriCodeBlocks(uri)) === null || _a === void 0 ? void 0 : _a.filter((block) => block.status === 'pending')
+            : this.getSessionCodeBlocks().filter((block) => block.status === 'pending');
         if (!(codeBlocks === null || codeBlocks === void 0 ? void 0 : codeBlocks.length)) {
             throw new Error('No pending code block found');
         }
-        const decorationModel = (_c = (_b = this.activePreviewerMap
-            .get(codeBlocks[0].relativePath)) === null || _b === void 0 ? void 0 : _b.getNode()) === null || _c === void 0 ? void 0 : _c.livePreviewDiffDecorationModel;
+        const relativePaths = uri
+            ? [codeBlocks[0].relativePath]
+            : codeBlocks
+                .map((block) => block.relativePath)
+                .reduce((acc, cur) => {
+                if (acc.includes(cur)) {
+                    return acc;
+                }
+                acc.push(cur);
+                return acc;
+            }, []);
+        relativePaths.forEach((relativePath) => {
+            this.doProcess(type, relativePath);
+        });
+        codeBlocks.forEach((codeBlock) => {
+            codeBlock.status = type === 'accept' ? 'success' : 'cancelled';
+            // TODO: 批量更新
+            this.updateCodeBlock(codeBlock);
+        });
+    }
+    doProcess(type, relativePath) {
+        var _a, _b;
+        const decorationModel = (_b = (_a = this.activePreviewerMap.get(relativePath)) === null || _a === void 0 ? void 0 : _a.getNode()) === null || _b === void 0 ? void 0 : _b.livePreviewDiffDecorationModel;
         if (!decorationModel) {
             throw new Error('No active previewer found');
         }
@@ -382,18 +407,12 @@ class BaseApplyService extends ide_core_browser_1.WithEventBus {
         else {
             decorationModel.discardUnProcessed();
         }
-        this.editorService.save(uri);
-        codeBlocks.forEach((codeBlock) => {
-            codeBlock.status = type === 'accept' ? 'success' : 'cancelled';
-            // TODO: 批量更新
-            this.updateCodeBlock(codeBlock);
-        });
+        this.editorService.save(ide_utils_1.URI.file(ide_utils_1.path.join(this.appConfig.workspaceDir, relativePath)));
     }
     listenPartialEdit(model, codeBlock) {
         const deferred = new ide_utils_1.Deferred();
         const uriString = model.uri.toString();
         const toDispose = this.inlineDiffService.onPartialEdit((event) => {
-            // TODO 支持自动保存
             if (event.totalPartialEditCount === event.resolvedPartialEditCount &&
                 event.uri.path === model.uri.path.toString()) {
                 if (event.acceptPartialEditCount > 0) {
@@ -408,11 +427,19 @@ class BaseApplyService extends ide_core_browser_1.WithEventBus {
                         actionSource: ide_core_browser_1.ActionSourceEnum.Chat,
                         sessionId: this.chatInternalService.sessionModel.sessionId,
                         isReceive: true,
-                        isDrop: false,
-                        code: codeBlock.codeEdit,
+                        // 是否有丢弃部分代码
+                        isDrop: event.acceptPartialEditCount !== event.totalPartialEditCount,
+                        code: appliedResult,
+                        originCode: codeBlock.originalCode,
                         message: JSON.stringify({
                             diff,
                             diagnosticInfos,
+                            instructions: codeBlock.instructions,
+                            codeEdit: codeBlock.codeEdit,
+                            partialEditCount: event.totalPartialEditCount,
+                            acceptPartialEditCount: event.acceptPartialEditCount,
+                            addedLinesCount: event.totalAddedLinesCount,
+                            deletedLinesCount: event.totalDeletedLinesCount,
                         }),
                     });
                     deferred.resolve({
@@ -431,8 +458,11 @@ class BaseApplyService extends ide_core_browser_1.WithEventBus {
                         sessionId: this.chatInternalService.sessionModel.sessionId,
                         isReceive: false,
                         isDrop: true,
-                        code: codeBlock.codeEdit,
                         originCode: codeBlock.originalCode,
+                        message: JSON.stringify({
+                            instructions: codeBlock.instructions,
+                            codeEdit: codeBlock.codeEdit,
+                        }),
                     });
                 }
                 this.editorListenerMap.disposeKey(uriString);
@@ -458,8 +488,6 @@ class BaseApplyService extends ide_core_browser_1.WithEventBus {
             rangesFromDiffHunk,
         };
     }
-    // FIXME: 貌似筛选逻辑不太对，需要重构
-    // TODO: 支持使用内存中的document获取诊断信息，实现并行apply accept
     getDiagnosticInfos(uri, ranges) {
         const markers = this.markerService.getManager().getMarkers({ resource: uri });
         return markers.filter((marker) => marker.severity >= ide_core_browser_1.MarkerSeverity.Warning &&
@@ -480,8 +508,8 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", ide_editor_1.WorkbenchEditorService)
 ], BaseApplyService.prototype, "editorService", void 0);
 tslib_1.__decorate([
-    (0, di_1.Autowired)(inline_diff_1.InlineDiffService),
-    tslib_1.__metadata("design:type", inline_diff_1.InlineDiffService)
+    (0, di_1.Autowired)(common_1.InlineDiffServiceToken),
+    tslib_1.__metadata("design:type", Object)
 ], BaseApplyService.prototype, "inlineDiffService", void 0);
 tslib_1.__decorate([
     (0, di_1.Autowired)(ide_markers_1.IMarkerService),