@opensumi/ide-ai-native 3.8.1-next-1741080291.0 → 3.8.1-next-1741091353.0

package/src/browser/widget/inline-diff/inline-diff-previewer.ts

@@ -1,5 +1,6 @@
 import { Autowired, INJECTOR_TOKEN, Injectable, Injector } from '@opensumi/di';
 import { Disposable, ErrorResponse, IDisposable, ReplyResponse } from '@opensumi/ide-core-common';
+import { WorkbenchEditorService } from '@opensumi/ide-editor';
 import { EOL, ICodeEditor, IPosition, ITextModel, Position, Selection } from '@opensumi/ide-monaco';
 import { ContentWidgetPositionPreference } from '@opensumi/ide-monaco/lib/browser/monaco-exports/editor';
 import { empty, getLeadingWhitespace } from '@opensumi/ide-utils/lib/strings';
@@ -14,7 +15,12 @@ import {
 
 import { EResultKind } from '../inline-chat/inline-chat.service';
 import { AIInlineContentWidget } from '../inline-chat/inline-content-widget';
-import { EComputerMode, InlineStreamDiffHandler } from '../inline-stream-diff/inline-stream-diff.handler';
+import {
+  BaseInlineStreamDiffHandler,
+  EComputerMode,
+  InlineStreamDiffHandler,
+  ReverseInlineStreamDiffHandler,
+} from '../inline-stream-diff/inline-stream-diff.handler';
 
 import { InlineDiffWidget } from './inline-diff-widget';
 
@@ -29,6 +35,11 @@ export interface IDiffPreviewerOptions {
    * 默认情况下，removed widget 会在 `runWhenIdle` 内被添加，如果需要立即添加，可以设置为 true
    */
   renderRemovedWidgetImmediately?: boolean;
+
+  /**
+   * 是否为回退模式，即 setValue 内容作为 original，编辑器 getValue 内容作为 modified
+   */
+  reverse?: boolean;
 }
 
 export interface IInlineDiffPreviewerNode extends IDisposable {
@@ -41,6 +52,8 @@ export abstract class BaseInlineDiffPreviewer<N extends IInlineDiffPreviewerNode
   @Autowired(INJECTOR_TOKEN)
   protected readonly injector: Injector;
 
+  @Autowired(WorkbenchEditorService)
+  protected readonly editorService: WorkbenchEditorService;
   protected inlineContentWidget: AIInlineContentWidget | null = null;
   protected selection: Selection;
   protected model: ITextModel;
@@ -124,7 +137,7 @@ export abstract class BaseInlineDiffPreviewer<N extends IInlineDiffPreviewerNode
     return Disposable.NULL;
   }
 
-  protected abstract createNode(): N;
+  protected abstract createNode(reverse?: boolean): N;
   abstract onData(data: ReplyResponse): void;
   abstract handleAction(action: EResultKind): void;
   abstract getPosition(): IPosition;
@@ -136,7 +149,7 @@ export abstract class BaseInlineDiffPreviewer<N extends IInlineDiffPreviewerNode
     },
   ): void {
     this.selection = selection;
-    this.node = this.createNode();
+    this.node = this.createNode(options.reverse);
     this.node.setPreviewerOptions(options);
   }
 
@@ -311,8 +324,8 @@ export class SideBySideInlineDiffWidget extends BaseInlineDiffPreviewer<InlineDi
 }
 
 @Injectable({ multiple: true })
-export class LiveInlineDiffPreviewer extends BaseInlineDiffPreviewer<InlineStreamDiffHandler> {
-  private listenNode(node: InlineStreamDiffHandler): void {
+export class LiveInlineDiffPreviewer extends BaseInlineDiffPreviewer<BaseInlineStreamDiffHandler> {
+  private listenNode(node: BaseInlineStreamDiffHandler): void {
     node.addDispose(node.onDidEditChange(() => this.layout()));
     node.addDispose(
       node.onPartialEditWidgetListChange((widgets) => {
@@ -331,8 +344,13 @@ export class LiveInlineDiffPreviewer extends BaseInlineDiffPreviewer<InlineStrea
     this.addDispose(node);
   }
 
-  createNode(): InlineStreamDiffHandler {
-    const node = this.injector.get(InlineStreamDiffHandler, [this.monacoEditor]);
+  createNode(reverse?: boolean): BaseInlineStreamDiffHandler {
+    let node: BaseInlineStreamDiffHandler;
+    if (reverse) {
+      node = this.injector.get(ReverseInlineStreamDiffHandler, [this.monacoEditor]);
+    } else {
+      node = this.injector.get(InlineStreamDiffHandler, [this.monacoEditor]);
+    }
     node.initialize(this.selection);
     this.listenNode(node);
     return node;

package/src/browser/widget/inline-diff/inline-diff-widget.module.less

@@ -22,12 +22,33 @@
 
 .inlineDiffManager {
   display: flex;
-  padding: 12px 16px;
-  justify-content: center;
+  border-radius: 13px;
+  align-items: center;
   position: absolute;
-  bottom: 0;
+  bottom: 18px;
   left: 50%;
   transform: translateX(-50%);
-  gap: 12px;
+  overflow: hidden;
   z-index: 999;
+  > div {
+    display: flex;
+    align-items: center;
+  }
+  .mid {
+    border-right: 1px solid var(--design-borderColor);
+  }
+  :global(.codicon) {
+    font-size: 20px;
+    padding: 6px;
+    color: var(--kt-primaryButton-foreground);
+    background-color: var(--kt-primaryButton-hoverBackground);
+    &:hover {
+      background-color: var(--kt-primaryButton-background);
+    }
+  }
+}
+.disabled {
+  // color: var(--kt-button-disableForeground) !important;
+  background-color: var(--kt-button-disableBackground) !important;
+  cursor: not-allowed;
 }

package/src/browser/widget/inline-diff/inline-diff.controller.ts

@@ -3,6 +3,7 @@ import {
   AINativeSettingSectionsId,
   ChatResponse,
   Disposable,
+  DisposableCollection,
   Emitter,
   Event,
   IDisposable,
@@ -23,7 +24,7 @@ import { BaseAIMonacoEditorController } from '../../contrib/base';
 import { EInlineDiffPreviewMode } from '../../preferences/schema';
 import { InlineChatController } from '../inline-chat/inline-chat-controller';
 import { EResultKind } from '../inline-chat/inline-chat.service';
-import { InlineStreamDiffHandler } from '../inline-stream-diff/inline-stream-diff.handler';
+import { BaseInlineStreamDiffHandler } from '../inline-stream-diff/inline-stream-diff.handler';
 
 import {
   BaseInlineDiffPreviewer,
@@ -33,7 +34,7 @@ import {
 } from './inline-diff-previewer';
 import { InlineDiffWidget } from './inline-diff-widget';
 
-type IInlineDiffPreviewer = BaseInlineDiffPreviewer<InlineDiffWidget | InlineStreamDiffHandler>;
+type IInlineDiffPreviewer = BaseInlineDiffPreviewer<InlineDiffWidget | BaseInlineStreamDiffHandler>;
 
 export class InlineDiffController extends BaseAIMonacoEditorController {
   public static readonly ID = 'editor.contrib.ai.inline.diff';
@@ -118,28 +119,26 @@ export class InlineDiffController extends BaseAIMonacoEditorController {
       chatResponse?: ChatResponse | InlineChatController;
       previewerOptions?: IDiffPreviewerOptions;
     },
-  ): BaseInlineDiffPreviewer<InlineDiffWidget | InlineStreamDiffHandler> {
+  ): BaseInlineDiffPreviewer<InlineDiffWidget | BaseInlineStreamDiffHandler> {
     const { crossSelection, chatResponse } = options;
 
     const disposable = new Disposable();
 
     const previewer = this.createDiffPreviewer(monacoEditor, crossSelection, options.previewerOptions);
-    transaction((tx) => {
-      this.currentPreviewer.set(previewer, tx);
-      this.previewerStore.set(previewer.modelId, previewer);
-    });
 
     const onFinish = () => {
       previewer.layout();
       disposable.dispose();
     };
 
+    const previewerDisposable = new DisposableCollection();
+
     disposable.addDispose(
       previewer.onReady(() => {
         if (InlineChatController.is(chatResponse)) {
           const controller = chatResponse as InlineChatController;
 
-          disposable.addDispose([
+          previewerDisposable.pushAll([
             controller.onData((data) => {
               if (ReplyResponse.is(data)) {
                 this.renderDiff(previewer, data);
@@ -167,6 +166,10 @@ export class InlineDiffController extends BaseAIMonacoEditorController {
       }),
     );
 
+    previewer.onDispose(() => {
+      previewerDisposable.dispose();
+    });
+    disposable.addDispose(previewerDisposable);
     previewer.layout();
     return previewer;
   }
@@ -196,6 +199,11 @@ export class InlineDiffController extends BaseAIMonacoEditorController {
       }),
     );
 
+    transaction((tx) => {
+      this.currentPreviewer.set(previewer, tx);
+      this.previewerStore.set(previewer.modelId, previewer);
+    });
+
     return previewer;
   }
 

package/src/browser/widget/inline-stream-diff/inline-stream-diff.handler.tsx

@@ -44,10 +44,13 @@ export enum EComputerMode {
 
 const inlineStreamDiffComputer = new InlineStreamDiffComputer();
 
+/**
+ * Abstract base class for inline streaming diff handlers
+ */
 @Injectable({ multiple: true })
-export class InlineStreamDiffHandler extends Disposable implements IInlineDiffPreviewerNode {
+export abstract class BaseInlineStreamDiffHandler extends Disposable implements IInlineDiffPreviewerNode {
   @Autowired(INJECTOR_TOKEN)
-  private readonly injector: Injector;
+  protected readonly injector: Injector;
 
   protected readonly _onDidEditChange = this.registerDispose(new Emitter<void>());
   public readonly onDidEditChange: Event<void> = this._onDidEditChange.event;
@@ -57,15 +60,14 @@ export class InlineStreamDiffHandler extends Disposable implements IInlineDiffPr
 
   public previewerOptions: IDiffPreviewerOptions;
 
-  private originalModel: ITextModel;
-  private virtualModel: ITextModel;
+  protected savedModel: ITextModel;
+  protected virtualModel: ITextModel;
 
-  private rawOriginalTextLines: string[];
-  private rawOriginalTextLinesTokens: LineTokens[] = [];
-  private undoRedoGroup: UndoRedoGroup = new UndoRedoGroup();
+  protected rawSavedTextLines: string[];
+  protected rawOriginTextLinesTokens: LineTokens[] | undefined;
+  protected undoRedoGroup: UndoRedoGroup = new UndoRedoGroup();
 
-  private readonly diffModel: ISettableObservable<IComputeDiffData | undefined> = observableValue(this, undefined);
-  private readonly finallyDiffModel: ISettableObservable<IComputeDiffData | undefined> = observableValue(
+  protected readonly finallyDiffModel: ISettableObservable<IComputeDiffData | undefined> = observableValue(
     this,
     undefined,
   );
@@ -73,14 +75,15 @@ export class InlineStreamDiffHandler extends Disposable implements IInlineDiffPr
   public livePreviewDiffDecorationModel: LivePreviewDiffDecorationModel;
 
   public get uri() {
-    return this.originalModel.uri;
+    return this.savedModel.uri;
   }
 
-  constructor(private readonly monacoEditor: ICodeEditor) {
+  constructor(protected readonly monacoEditor: ICodeEditor) {
     super();
 
     const modelService = StandaloneServices.get(IModelService);
-    this.virtualModel = modelService.createModel(
+    const savedModel = this.monacoEditor.getModel()!;
+    const setModel = modelService.createModel(
       '',
       null,
       Uri.from({
@@ -89,7 +92,8 @@ export class InlineStreamDiffHandler extends Disposable implements IInlineDiffPr
       }),
       true,
     );
-    this.originalModel = this.monacoEditor.getModel()!;
+    this.savedModel = savedModel;
+    this.virtualModel = setModel;
 
     this.livePreviewDiffDecorationModel = this.injector.get(LivePreviewDiffDecorationModel, [this.monacoEditor]);
     this.addDispose(this.livePreviewDiffDecorationModel);
@@ -113,45 +117,21 @@ export class InlineStreamDiffHandler extends Disposable implements IInlineDiffPr
     });
   }
 
-  initialize(selection: Selection): void {
-    const eol = this.originalModel.getEOL();
-    const startPosition = selection.getStartPosition();
-    const endPosition = selection.getEndPosition();
-
-    this.rawOriginalTextLines = this.originalModel
-      .getValueInRange(Range.fromPositions(startPosition, endPosition))
-      .split(eol);
-
-    this.rawOriginalTextLinesTokens = this.rawOriginalTextLines.map((_, index) => {
-      const lineNumber = startPosition.lineNumber + index;
-      this.originalModel.tokenization.forceTokenization(lineNumber);
-      const lineTokens = this.originalModel.tokenization.getLineTokens(lineNumber);
-      return lineTokens;
-    });
-
-    const zone = LineRange.fromRangeInclusive(
-      Range.fromPositions(
-        { lineNumber: selection.startLineNumber, column: 1 },
-        { lineNumber: selection.endLineNumber, column: Number.MAX_SAFE_INTEGER },
-      ),
-    );
-
-    this.livePreviewDiffDecorationModel.initialize(zone);
-  }
+  abstract initialize(selection: Selection): void;
 
   getVirtualModelValue() {
     return this.virtualModel.getValue();
   }
 
   getOriginModelValue() {
-    return this.rawOriginalTextLines.join('\n');
+    return this.rawSavedTextLines.join('\n');
   }
 
   get onPartialEditWidgetListChange() {
     return this.livePreviewDiffDecorationModel.onPartialEditWidgetListChange;
   }
 
-  private computeDiff(
+  protected computeDiff(
     originalTextLines: string[],
     newTextLines: string[],
     computerMode: EComputerMode = EComputerMode.default,
@@ -285,7 +265,12 @@ export class InlineStreamDiffHandler extends Disposable implements IInlineDiffPr
           },
           textLines: removedTextLines.map((text, index) => ({
             text,
-            lineTokens: this.rawOriginalTextLinesTokens[removedLinesOriginalRange.startLineNumber - 1 + index],
+            lineTokens:
+              this.rawOriginTextLinesTokens?.[removedLinesOriginalRange.startLineNumber - 1 + index] ||
+              LineTokens.createEmpty(text, {
+                encodeLanguageId: () => 0,
+                decodeLanguageId: () => 'plaintext',
+              }),
           })),
         });
       }
@@ -298,6 +283,11 @@ export class InlineStreamDiffHandler extends Disposable implements IInlineDiffPr
     });
   }
 
+  /**
+   * Get the original model for diff operations
+   */
+  protected abstract getOriginalModel(): ITextModel;
+
   /**
    * 令当前的 inline diff 在流式渲染过程当中使用 pushEditOperations 进行编辑的操作都放在同一组 undo/redo 堆栈里
    * 一旦撤销到最顶层则关闭当前的 inline diff
@@ -310,22 +300,24 @@ export class InlineStreamDiffHandler extends Disposable implements IInlineDiffPr
     });
   }
 
-  private renderDiffEdits(diffModel: IComputeDiffData): void {
+  protected renderDiffEdits(diffModel: IComputeDiffData): void {
     const { activeLine, newFullRangeTextLines, pendingRange } = diffModel;
-    const eol = this.originalModel.getEOL();
     const zone = this.getZone();
 
+    const originalModel = this.getOriginalModel();
+    const eol = originalModel.getEOL();
+
     const validZone =
       zone.startLineNumber < zone.endLineNumberExclusive
         ? new Range(
             zone.startLineNumber,
             1,
             zone.endLineNumberExclusive - 1,
-            this.originalModel.getLineMaxColumn(zone.endLineNumberExclusive - 1),
+            originalModel.getLineMaxColumn(zone.endLineNumberExclusive - 1),
           )
         : new Range(zone.startLineNumber, 1, zone.startLineNumber, 1);
 
-    const newOriginalTextLines = this.originalModel.getValueInRange(validZone).split(eol);
+    const newOriginalTextLines = originalModel.getValueInRange(validZone).split(eol);
     const diffComputation = linesDiffComputers.getDefault().computeDiff(newOriginalTextLines, newFullRangeTextLines, {
       computeMoves: false,
       maxComputationTimeMs: 200,
@@ -370,7 +362,7 @@ export class InlineStreamDiffHandler extends Disposable implements IInlineDiffPr
             validZone.startLineNumber + change.original.startLineNumber - 1,
             1,
             validZone.startLineNumber + change.original.endLineNumberExclusive - 2,
-            this.originalModel.getLineMaxColumn(validZone.startLineNumber + change.original.endLineNumberExclusive - 2),
+            originalModel.getLineMaxColumn(validZone.startLineNumber + change.original.endLineNumberExclusive - 2),
           );
         }
         const edit = {
@@ -381,7 +373,7 @@ export class InlineStreamDiffHandler extends Disposable implements IInlineDiffPr
         realTimeChanges.push(edit);
       }
     }
-    this.originalModel.pushEditOperations(null, realTimeChanges, () => null, this.undoRedoGroup);
+    originalModel.pushEditOperations(null, realTimeChanges, () => null, this.undoRedoGroup);
 
     /**
      * 根据 newFullRangeTextLines 内容长度重新计算 zone，避免超过最大长度，进而影响未选中的代码区域
@@ -421,17 +413,20 @@ export class InlineStreamDiffHandler extends Disposable implements IInlineDiffPr
     this._onDidEditChange.fire();
   }
 
-  public recompute(computerMode: EComputerMode, newContent?: string): IComputeDiffData {
-    if (newContent) {
-      this.virtualModel.setValue(newContent);
+  public recompute(computerMode: EComputerMode, content?: string): IComputeDiffData {
+    if (content) {
+      this.virtualModel.setValue(content);
     }
 
-    const newTextLines = this.virtualModel.getLinesContent();
-    return this.computeDiff(this.rawOriginalTextLines, newTextLines, computerMode);
+    const textLines = this.virtualModel.getLinesContent();
+    return this.processDiffComputation(textLines, computerMode);
   }
 
-  private currentEditLine = 0;
-  private isEditing = false;
+  protected currentEditLine = 0;
+  protected isEditing = false;
+
+  protected abstract processDiffComputation(currentText: string[], computerMode?: EComputerMode): IComputeDiffData;
+
   public async rateRenderEditController(): Promise<void> {
     if (this.isEditing === false) {
       this.isEditing = true;
@@ -443,19 +438,14 @@ export class InlineStreamDiffHandler extends Disposable implements IInlineDiffPr
 
         const virtualTextLines = this.virtualModel.getLinesContent();
         const currentText = virtualTextLines.slice(0, this.currentEditLine);
-        const currentDiffModel = this.computeDiff(this.rawOriginalTextLines, currentText);
-        transaction((tx) => {
-          this.diffModel.set(currentDiffModel, tx);
-        });
-
-        this.onDiffFinishedEmitter.fire(currentDiffModel);
+        const currentDiffModel = this.processDiffComputation(currentText);
 
-        if (this.originalModel.id === this.monacoEditor.getModel()?.id) {
+        if (this.savedModel.id === this.monacoEditor.getModel()?.id) {
           this.renderDiffEdits(currentDiffModel);
         }
 
         this.currentEditLine += 1;
-
+        // 这个 sleep 会带来潜在的时序问题，如 finallyRender 时模型已经被 dispose
         await sleep(FRAME_THREE);
       }
 
@@ -469,10 +459,7 @@ export class InlineStreamDiffHandler extends Disposable implements IInlineDiffPr
   }
 
   public addLinesToDiff(newText: string, computerMode: EComputerMode = EComputerMode.default): void {
-    const diffModel = this.recompute(computerMode, newText);
-    transaction((tx) => {
-      this.diffModel.set(diffModel, tx);
-    });
+    this.recompute(computerMode, newText);
   }
 
   public pushRateFinallyDiffStack(diffModel: IComputeDiffData): void {
@@ -488,14 +475,17 @@ export class InlineStreamDiffHandler extends Disposable implements IInlineDiffPr
   public finallyRender(diffModel: IComputeDiffData): void {
     transaction((tx) => {
       this.finallyDiffModel.set(diffModel, tx);
-      this.diffModel.set(diffModel, tx);
     });
 
-    if (this.originalModel.id !== this.monacoEditor.getModel()?.id) {
+    if (this.savedModel.id !== this.monacoEditor.getModel()?.id) {
       return;
     }
 
     this.onDiffFinishedEmitter.fire(diffModel);
+
+    if (this.livePreviewDiffDecorationModel.disposed) {
+      return;
+    }
     this.renderPartialEditWidgets(diffModel);
     this.renderDiffEdits(diffModel);
     this.pushStackElement();
@@ -537,3 +527,84 @@ export class InlineStreamDiffHandler extends Disposable implements IInlineDiffPr
     return this.livePreviewDiffDecorationModel.getTotalCodeInfo();
   }
 }
+
+/**
+ * Regular inline stream diff handler (non-reverse mode)
+ */
+@Injectable({ multiple: true })
+export class InlineStreamDiffHandler extends BaseInlineStreamDiffHandler {
+  initialize(selection: Selection): void {
+    const eol = this.savedModel.getEOL();
+    const startPosition = selection.getStartPosition();
+    const endPosition = selection.getEndPosition();
+
+    this.rawSavedTextLines = this.savedModel
+      .getValueInRange(Range.fromPositions(startPosition, endPosition))
+      .split(eol);
+
+    const zone = LineRange.fromRangeInclusive(
+      Range.fromPositions(
+        { lineNumber: selection.startLineNumber, column: 1 },
+        { lineNumber: selection.endLineNumber, column: Number.MAX_SAFE_INTEGER },
+      ),
+    );
+
+    this.livePreviewDiffDecorationModel.initialize(zone);
+    this.rawOriginTextLinesTokens = this.rawSavedTextLines.map((_, index) => {
+      const lineNumber = startPosition.lineNumber + index;
+      this.savedModel.tokenization.forceTokenization(lineNumber);
+      const lineTokens = this.savedModel.tokenization.getLineTokens(lineNumber);
+      return lineTokens;
+    });
+  }
+
+  protected processDiffComputation(currentText: string[], computerMode?: EComputerMode): IComputeDiffData {
+    return this.computeDiff(this.rawSavedTextLines, currentText, computerMode);
+  }
+
+  protected getOriginalModel(): ITextModel {
+    return this.savedModel;
+  }
+}
+
+/**
+ * Reverse inline stream diff handler
+ * In reverse mode, the roles of savedModel and virtualModel are swapped
+ */
+@Injectable({ multiple: true })
+export class ReverseInlineStreamDiffHandler extends BaseInlineStreamDiffHandler {
+  recompute(computerMode: EComputerMode, content?: string): IComputeDiffData {
+    const result = super.recompute(computerMode, content);
+    this.rawOriginTextLinesTokens = this.virtualModel.getLinesContent().map((_, index) => {
+      const lineNumber = index + 1;
+      this.virtualModel.tokenization.forceTokenization(lineNumber);
+      const lineTokens = this.virtualModel.tokenization.getLineTokens(lineNumber);
+      return lineTokens;
+    });
+    return result;
+  }
+
+  initialize(): void {
+    const eol = this.savedModel.getEOL();
+
+    // reverse 模式不支持 range
+    this.rawSavedTextLines = this.savedModel.getValue().split(eol);
+
+    // TODO: reverse 模式暂不支持 range
+    const zone = LineRange.fromRangeInclusive(
+      Range.fromPositions(
+        { lineNumber: 1, column: 1 },
+        { lineNumber: this.virtualModel.getLineCount(), column: Number.MAX_SAFE_INTEGER },
+      ),
+    );
+    this.livePreviewDiffDecorationModel.initialize(zone);
+  }
+
+  protected getOriginalModel(): ITextModel {
+    return this.virtualModel;
+  }
+
+  protected processDiffComputation(currentText: string[], computerMode?: EComputerMode): IComputeDiffData {
+    return this.computeDiff(currentText, this.rawSavedTextLines, computerMode);
+  }
+}

package/src/browser/widget/inline-stream-diff/live-preview.decoration.tsx

@@ -7,11 +7,13 @@ import {
   Emitter,
   Event,
   IAIReporter,
+  localize,
   runWhenIdle,
 } from '@opensumi/ide-core-common';
 import { ISingleEditOperation } from '@opensumi/ide-editor';
 import { ICodeEditor, IEditorDecorationsCollection, ITextModel, Position, Range } from '@opensumi/ide-monaco';
 import { StandaloneServices } from '@opensumi/ide-monaco/lib/browser/monaco-api/services';
+import { IMessageService } from '@opensumi/ide-overlay';
 import { EditOperation } from '@opensumi/monaco-editor-core/esm/vs/editor/common/core/editOperation';
 import { LineRange } from '@opensumi/monaco-editor-core/esm/vs/editor/common/core/lineRange';
 import { ModelDecorationOptions } from '@opensumi/monaco-editor-core/esm/vs/editor/common/model/textModel';
@@ -67,6 +69,9 @@ export class LivePreviewDiffDecorationModel extends Disposable {
   @Autowired(InlineDiffService)
   private readonly inlineDiffService: InlineDiffService;
 
+  @Autowired(IMessageService)
+  private readonly messageService: IMessageService;
+
   private activeLineDec: IEditorDecorationsCollection;
   private pendingRangeDec: IEditorDecorationsCollection;
   private aiNativeContextKey: AINativeContextKey;
@@ -87,6 +92,10 @@ export class LivePreviewDiffDecorationModel extends Disposable {
   private removedZoneWidgets: RemovedZoneWidget[] = [];
   private zone: LineRange;
 
+  public get partialEditWidgetCount() {
+    return this.partialEditWidgetList.length;
+  }
+
   constructor(private readonly monacoEditor: ICodeEditor) {
     super();
     this.model = this.monacoEditor.getModel()!;
@@ -616,7 +625,7 @@ export class LivePreviewDiffDecorationModel extends Disposable {
     if (this.options.renderRemovedWidgetImmediately) {
       run();
     } else {
-      runWhenIdle(run);
+      this.addDispose(runWhenIdle(run));
     }
   }
 
@@ -681,6 +690,26 @@ export class LivePreviewDiffDecorationModel extends Disposable {
     }
   }
 
+  currentChangeIndex: number = 0;
+
+  revealSiblingChange(direction: 'up' | 'down') {
+    this.currentChangeIndex = this.currentChangeIndex + (direction === 'up' ? -1 : 1);
+    if (this.currentChangeIndex >= 0 && this.currentChangeIndex < this.partialEditWidgetList.length) {
+      const siblingChange = this.partialEditWidgetList[this.currentChangeIndex];
+      const pos = siblingChange.getPosition();
+      if (pos?.position) {
+        this.monacoEditor.revealLineInCenter(pos.position!.lineNumber);
+        return this.currentChangeIndex;
+      }
+    } else {
+      this.messageService.info(
+        direction === 'up'
+          ? localize('aiNative.inlineDiff.noMoreChangesUp')
+          : localize('aiNative.inlineDiff.noMoreChangesDown'),
+      );
+    }
+  }
+
   setPreviewerOptions(options: IModelOptions) {
     this.options = options;
   }

package/src/common/index.ts

@@ -19,8 +19,6 @@ import { IPosition, ITextModel, InlineCompletionContext } from '@opensumi/ide-mo
 import { MCPServerDescription } from './mcp-server-manager';
 import { MCPTool } from './types';
 
-export * from './model';
-
 export const IAINativeService = Symbol('IAINativeService');
 
 /**

package/src/common/llm-context.ts

@@ -15,13 +15,13 @@ export interface LLMContextService {
    */
   cleanFileContext(): void;
 
-  onDidContextFilesChangeEvent: Event<FileContext[]>;
+  onDidContextFilesChangeEvent: Event<{ viewed: FileContext[]; attached: FileContext[]; version: number }>;
 
   /**
    * 从 context 中移除文件
    * @param uri URI
    */
-  removeFileFromContext(uri: URI): void;
+  removeFileFromContext(uri: URI, isManual?: boolean): void;
 
   /** 导出为可序列化格式 */
   serialize(): SerializedContext;
@@ -30,12 +30,18 @@ export interface LLMContextService {
 export interface FileContext {
   uri: URI;
   selection?: [number, number];
-  isManual: boolean;
 }
 
 export const LLMContextServiceToken = Symbol('LLMContextService');
 
+export interface AttachFileContext {
+  content: string;
+  lineErrors: string[];
+  path: string;
+  language: string;
+}
+
 export interface SerializedContext {
   recentlyViewFiles: string[];
-  attachedFiles: Array<{ content: string; lineErrors: string[]; path: string; language: string }>;
+  attachedFiles: Array<AttachFileContext>;
 }