@opensumi/ide-ai-native 3.7.1-next-1739252693.0 → 3.7.1-next-1739424847.0

package/src/browser/contrib/intelligent-completions/intelligent-completions.controller.ts

@@ -13,10 +13,13 @@ import {
 import { Emitter, ICodeEditor, ICursorPositionChangedEvent, IRange, ITextModel, Range } from '@opensumi/ide-monaco';
 import {
   IObservable,
+  IObservableSignal,
   ISettableObservable,
+  ITransaction,
   autorun,
   autorunWithStoreHandleChanges,
   derived,
+  observableSignal,
   observableValue,
   transaction,
 } from '@opensumi/ide-monaco/lib/common/observable';
@@ -85,11 +88,13 @@ export class IntelligentCompletionsController extends BaseAIMonacoEditorControll
   private aiNativeContextKey: AINativeContextKey;
   private rewriteWidget: RewriteWidget | null;
   private whenMultiLineEditsVisibleDisposable: Disposable;
+  private codeEditsTriggerSignal: IObservableSignal<void>;
 
   public mount(): IDisposable {
     this.handlerAlwaysVisiblePreference();
 
     this.codeEditsResult = observableValue<CodeEditsResultValue | undefined>(this, undefined);
+    this.codeEditsTriggerSignal = observableSignal(this);
 
     this.whenMultiLineEditsVisibleDisposable = new Disposable();
     this.multiLineDecorationModel = new MultiLineDecorationModel(this.monacoEditor);
@@ -393,6 +398,10 @@ export class IntelligentCompletionsController extends BaseAIMonacoEditorControll
     this.hide();
   });
 
+  public trigger(tx: ITransaction): void {
+    this.codeEditsTriggerSignal.trigger(tx);
+  }
+
   private registerFeature(monacoEditor: ICodeEditor): void {
     this.featureDisposable.addDispose(
       Event.any<any>(
@@ -432,16 +441,19 @@ export class IntelligentCompletionsController extends BaseAIMonacoEditorControll
       autorunWithStoreHandleChanges(
         {
           createEmptyChangeSummary: () => ({}),
-          handleChange: (context, changeSummary) => {
+          handleChange: (context) => {
             if (context.didChange(this.codeEditsSourceCollection.codeEditsContextBean)) {
               // 如果上一次补全结果还在，则不重复请求
               const isVisible = this.aiNativeContextKey.multiLineEditsIsVisible.get();
               return !isVisible;
+            } else if (context.didChange(this.codeEditsTriggerSignal)) {
+              return true;
             }
             return false;
           },
         },
         async (reader, _, store) => {
+          this.codeEditsTriggerSignal.read(reader);
           const context = this.codeEditsSourceCollection.codeEditsContextBean.read(reader);
 
           const provider = this.intelligentCompletionsRegistry.getCodeEditsProvider();

package/src/browser/contrib/terminal/component/terminal-command-suggest-controller.tsx

@@ -1,4 +1,4 @@
-import { debounce } from 'lodash';
+import debounce from 'lodash/debounce';
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 
 import { Emitter, localize } from '@opensumi/ide-core-browser';

package/src/browser/layout/ai-layout.tsx

@@ -10,11 +10,14 @@ export const AILayout = () => {
   const { layout } = getStorageValue();
   const designLayoutConfig = useInjectable(DesignLayoutConfig);
 
-  const defaultRightSize = useMemo(() => designLayoutConfig.useMergeRightWithLeftPanel ? 0 : 49, [designLayoutConfig.useMergeRightWithLeftPanel]);
+  const defaultRightSize = useMemo(
+    () => (designLayoutConfig.useMergeRightWithLeftPanel ? 0 : 49),
+    [designLayoutConfig.useMergeRightWithLeftPanel],
+  );
 
   return (
     <BoxPanel direction='top-to-bottom'>
-      <SlotRenderer id='top' defaultSize={layout.top?.currentId ? layout.top?.size || 35 : 0} slot='top' />
+      <SlotRenderer id='top' defaultSize={layout.top?.currentId ? layout.top?.size || 32 : 32} slot='top' />
       <SplitPanel
         id='main-horizontal-ai'
         flex={1}

package/src/browser/model/enhanceDecorationsCollection.ts

@@ -1,20 +1,15 @@
-import { Disposable, Emitter, Event, isDefined, isUndefined } from '@opensumi/ide-core-common';
+import { Disposable, Emitter, Event, isDefined, isUndefined, uuid } from '@opensumi/ide-core-common';
 import {
   ICodeEditor,
   IContentSizeChangedEvent,
   IModelDecorationOptions,
-  IModelDecorationsChangeAccessor,
   IModelDeltaDecoration,
   IPosition,
   IRange,
   ITextModel,
-  Range,
 } from '@opensumi/ide-monaco';
-import { space } from '@opensumi/ide-utils/lib/strings';
 import { UndoRedoGroup } from '@opensumi/monaco-editor-core/esm/vs/platform/undoRedo/common/undoRedo';
 
-import styles from './styles.module.less';
-
 export interface IDecorationSerializableState {
   startPosition: IPosition;
   endPosition: IPosition;
@@ -28,8 +23,10 @@ interface IDeltaData extends IModelDeltaDecoration {
 
 export interface IEnhanceModelDeltaDecoration extends IDeltaData {
   id: string;
+  decorationId: string;
   isHidden: boolean;
   readonly editorDecoration: IModelDeltaDecoration;
+  show(): void;
   hide(): void;
   resume(): void;
   getRange(): IRange;
@@ -47,12 +44,13 @@ export interface IDeltaDecorationsOptions {
   group?: UndoRedoGroup;
 }
 
-class DeltaDecorations implements IEnhanceModelDeltaDecoration {
+export class DeltaDecorations implements IEnhanceModelDeltaDecoration {
   length: number;
   range: IRange;
   options: IModelDecorationOptions;
 
   private resumeRange: IRange;
+  private _decorationId: string;
   private _group: UndoRedoGroup;
 
   private _hidden = false;
@@ -72,6 +70,10 @@ class DeltaDecorations implements IEnhanceModelDeltaDecoration {
     return this.metadata.id;
   }
 
+  get decorationId(): string {
+    return this._decorationId;
+  }
+
   get editorDecoration(): IModelDeltaDecoration {
     return this.metadata.editorDecoration;
   }
@@ -108,25 +110,6 @@ class DeltaDecorations implements IEnhanceModelDeltaDecoration {
     this._group = group;
   }
 
-  private changeVisibility(newClassName: string, newRange: Range): void {
-    if (!this.options.className) {
-      return;
-    }
-
-    const classList = this.options.className
-      .split(space)
-      .filter((s) => s !== styles.hidden && s !== styles.visible)
-      .filter(Boolean);
-    classList.push(newClassName);
-
-    this.options.className = classList.join(space);
-
-    this.codeEditor.changeDecorations((accessor) => {
-      accessor.changeDecorationOptions(this.id, this.options);
-      accessor.changeDecoration(this.id, newRange);
-    });
-  }
-
   setRange(newRange: IRange): void {
     this.range = newRange;
   }
@@ -136,28 +119,45 @@ class DeltaDecorations implements IEnhanceModelDeltaDecoration {
   }
 
   dispose(): void {
+    this.hide();
     this.deltaData.dispose?.();
   }
 
+  show(): void {
+    this.codeEditor.changeDecorations((accessor) => {
+      this._decorationId = accessor.addDecoration(this.range, this.options);
+    });
+  }
+
   hide(): void {
     this.resumeRange = this.range;
     this._hidden = true;
-    const startPosition = { lineNumber: this.range.startLineNumber, column: 1 };
-    const newRange = Range.fromPositions(startPosition);
-    this.changeVisibility(styles.hidden, newRange);
+    if (this._decorationId) {
+      this.codeEditor.changeDecorations((accessor) => {
+        accessor.removeDecoration(this._decorationId);
+      });
+    }
   }
 
   resume(): void {
+    if (!this._hidden) {
+      return;
+    }
+
     this._hidden = false;
-    this.changeVisibility(styles.visible, Range.lift(this.resumeRange));
+    this.codeEditor.changeDecorations((accessor) => {
+      this._decorationId = accessor.addDecoration(this.resumeRange, this.options);
+    });
   }
 }
 
-export class EnhanceDecorationsCollection extends Disposable {
-  private deltaDecorations: IEnhanceModelDeltaDecoration[] = [];
+export class EnhanceDecorationsCollection<
+  T extends IEnhanceModelDeltaDecoration = IEnhanceModelDeltaDecoration,
+> extends Disposable {
+  private deltaDecorations: T[] = [];
 
-  protected readonly _onDidDecorationsChange = this.registerDispose(new Emitter<IEnhanceModelDeltaDecoration[]>());
-  public readonly onDidDecorationsChange: Event<IEnhanceModelDeltaDecoration[]> = this._onDidDecorationsChange.event;
+  protected readonly _onDidDecorationsChange = this.registerDispose(new Emitter<T[]>());
+  public readonly onDidDecorationsChange: Event<T[]> = this._onDidDecorationsChange.event;
 
   private get model(): ITextModel {
     return this.codeEditor.getModel()!;
@@ -182,11 +182,11 @@ export class EnhanceDecorationsCollection extends Disposable {
   private flush(): void {
     this.deltaDecorations = this.deltaDecorations.map((d) => {
       const {
-        id,
+        decorationId,
         editorDecoration: { range },
       } = d;
 
-      const newRange = this.model.getDecorationRange(id);
+      const newRange = this.model.getDecorationRange(decorationId);
       d.setRange(newRange ?? range);
 
       return d;
@@ -196,66 +196,51 @@ export class EnhanceDecorationsCollection extends Disposable {
   }
 
   private delete(id: string): void {
-    this.codeEditor.changeDecorations((accessor) => {
-      accessor.removeDecoration(id);
-
-      this.deltaDecorations = this.deltaDecorations.filter((d) => d.id !== id);
-    });
+    this.deltaDecorations = this.deltaDecorations.filter((d) => d.id !== id);
   }
 
   protected createDecorations(metaData: IDeltaDecorationsOptions) {
-    return new DeltaDecorations(metaData);
+    return new DeltaDecorations(metaData) as unknown as T;
   }
 
-  set(
-    decorations: (IModelDeltaDecoration &
-      Partial<Pick<IEnhanceModelDeltaDecoration, 'length' | 'isHidden' | 'group'>>)[],
-  ): void {
+  set(decorations: (IModelDeltaDecoration & Partial<Pick<T, 'length' | 'isHidden' | 'group'>>)[]): void {
     this.clear();
 
-    this.codeEditor.changeDecorations((accessor: IModelDecorationsChangeAccessor) => {
-      const newDecorations: IEnhanceModelDeltaDecoration[] = [];
-
-      for (const decoration of decorations) {
-        const id = accessor.addDecoration(decoration.range, decoration.options);
-        newDecorations.push(
-          this.createDecorations({
-            id,
-            editorDecoration: decoration,
-            codeEditor: this.codeEditor,
-            isHidden: decoration.isHidden,
-            group: decoration.group,
-            deltaData: {
-              dispose: () => this.delete(id),
-              length: decoration.length,
-            },
-          }),
-        );
-      }
-
-      this.deltaDecorations = newDecorations;
+    this.deltaDecorations = decorations.map((decoration) => {
+      const id = uuid(6);
+
+      const dec = this.createDecorations({
+        id,
+        editorDecoration: decoration,
+        codeEditor: this.codeEditor,
+        isHidden: decoration.isHidden,
+        group: decoration.group,
+        deltaData: {
+          dispose: () => this.delete(id),
+          length: decoration.length,
+        },
+      });
+
+      dec.show();
+
+      return dec;
     });
   }
 
-  getDecorations(): IEnhanceModelDeltaDecoration[] {
+  getDecorations(): T[] {
     return this.deltaDecorations;
   }
 
-  getDecorationByGroup(group: UndoRedoGroup): IEnhanceModelDeltaDecoration | undefined {
+  getDecorationByGroup(group: UndoRedoGroup): T | undefined {
     return this.deltaDecorations.find((d) => d.group === group);
   }
 
-  getDecorationByLineNumber(lineNumber: number): IEnhanceModelDeltaDecoration | undefined {
+  getDecorationByLineNumber(lineNumber: number): T | undefined {
     return this.deltaDecorations.find((d) => d.getRange().startLineNumber === lineNumber);
   }
 
   clear(): void {
-    this.codeEditor.changeDecorations((accessor) => {
-      for (const decoration of this.deltaDecorations) {
-        accessor.removeDecoration(decoration.id);
-      }
-
-      this.deltaDecorations = [];
-    });
+    this.deltaDecorations.map((d) => d.dispose());
+    this.deltaDecorations = [];
   }
 }

package/src/browser/widget/inline-chat/inline-chat-editor.controller.ts

@@ -446,7 +446,7 @@ export class InlineChatEditorController extends BaseAIMonacoEditorController {
     }
 
     const diffPreviewer = this.inlineDiffController.showPreviewerByStream(monacoEditor, options);
-    diffPreviewer.mount(this.aiInlineContentWidget);
+    diffPreviewer.mountWidget(this.aiInlineContentWidget);
   }
 
   private ensureInlineChatVisible(monacoEditor: monaco.ICodeEditor, crossSelection: monaco.Selection) {
@@ -472,7 +472,6 @@ export class InlineChatEditorController extends BaseAIMonacoEditorController {
     const { monacoEditor, strategy, crossSelection, relationId, isRetry, actionType, actionSource } = params;
     const model = monacoEditor.getModel();
 
-    this.inlineDiffController.destroyPreviewer(model!.uri.toString());
     this.aiInlineChatOperationDisposable.dispose();
 
     this.ensureInlineChatVisible(monacoEditor, crossSelection);

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

@@ -44,10 +44,13 @@ export abstract class BaseInlineDiffPreviewer<N extends IInlineDiffPreviewerNode
   protected inlineContentWidget: AIInlineContentWidget | null = null;
   protected selection: Selection;
   protected model: ITextModel;
+  public modelId: string;
 
   constructor(protected readonly monacoEditor: ICodeEditor) {
     super();
     this.model = this.monacoEditor.getModel()!;
+    this.modelId = this.model.id;
+
     this.addDispose(
       Disposable.create(() => {
         if (this.inlineContentWidget) {
@@ -107,11 +110,7 @@ export abstract class BaseInlineDiffPreviewer<N extends IInlineDiffPreviewerNode
     return this.node;
   }
 
-  public createNodeSnapshot(): N | undefined {
-    return this.node;
-  }
-
-  public mount(contentWidget: AIInlineContentWidget): void {
+  public mountWidget(contentWidget: AIInlineContentWidget): void {
     this.inlineContentWidget = contentWidget;
   }
 
@@ -157,20 +156,25 @@ export abstract class BaseInlineDiffPreviewer<N extends IInlineDiffPreviewerNode
   setValue(content: string): void {
     // do nothing
   }
+
   getValue(): string {
     // do nothing
     return '';
   }
+
   getOriginValue(): string {
     // do nothing
     return '';
   }
+
   onError(error: ErrorResponse): void {
     // do nothing
   }
+
   onAbort(): void {
     // do nothing
   }
+
   onEnd(): void {
     // do nothing
   }
@@ -179,6 +183,30 @@ export abstract class BaseInlineDiffPreviewer<N extends IInlineDiffPreviewerNode
     // do nothing
   }
 
+  /**
+   * 会新建一个渲染层的实例
+   * 或重新赋值渲染层的数据
+   * 适用于首次渲染
+   */
+  render(): void {
+    // do nothing
+  }
+
+  /**
+   * 仅隐藏渲染层，而不销毁实例
+   */
+  hide(): void {
+    // do nothing
+  }
+
+  /**
+   * 恢复渲染层
+   * 适用于非首次渲染
+   */
+  resume(): void {
+    // do nothing
+  }
+
   isModel(uri: string): boolean {
     return this.model.uri.toString() === uri;
   }
@@ -201,8 +229,8 @@ export class SideBySideInlineDiffWidget extends BaseInlineDiffPreviewer<InlineDi
     return widget;
   }
 
-  mount(contentWidget: AIInlineContentWidget): void {
-    super.mount(contentWidget);
+  mountWidget(contentWidget: AIInlineContentWidget): void {
+    super.mountWidget(contentWidget);
     contentWidget.addDispose(this);
   }
 
@@ -310,32 +338,6 @@ export class LiveInlineDiffPreviewer extends BaseInlineDiffPreviewer<InlineStrea
     return node;
   }
 
-  attachNode(node: InlineStreamDiffHandler): void {
-    this.node?.dispose();
-    this.node = node;
-
-    if (node) {
-      const snapshot = node.currentSnapshotStore;
-      if (snapshot) {
-        this.node.restoreDecorationSnapshot(snapshot.decorationSnapshotData);
-        this.listenNode(node);
-      }
-    }
-  }
-
-  createNodeSnapshot(): InlineStreamDiffHandler | undefined {
-    if (!this.node) {
-      return this.createNode();
-    }
-
-    // 拿前一个 node 的快照信息
-    const snapshot = this.node.createSnapshot();
-    // 创建新的实例
-    const node = this.injector.get(InlineStreamDiffHandler, [this.monacoEditor]);
-    node.restoreSnapshot(snapshot);
-    return node;
-  }
-
   getPosition(): IPosition {
     const zone = this.node?.getZone();
     if (zone) {
@@ -395,6 +397,21 @@ export class LiveInlineDiffPreviewer extends BaseInlineDiffPreviewer<InlineStrea
     }
   }
 
+  render(): void {
+    this.inlineContentWidget?.show();
+    this.node?.rateRenderEditController();
+  }
+
+  hide(): void {
+    this.inlineContentWidget?.hide();
+    this.node?.hide();
+  }
+
+  resume(): void {
+    this.inlineContentWidget?.show();
+    this.node?.resume();
+  }
+
   onData(data: ReplyResponse): void {
     const { message } = data;
     this.node?.addLinesToDiff(this.formatIndentation(message));