@opensumi/ide-ai-native 3.7.1 → 3.7.2-next-1739848467.0

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/preferences/schema.ts

@@ -58,5 +58,9 @@ export const aiNativePreferenceSchema: PreferenceSchema = {
       type: 'boolean',
       default: false,
     },
+    [AINativeSettingSectionsId.CodeEditsTyping]: {
+      type: 'boolean',
+      default: false,
+    },
   },
 };

package/src/browser/types.ts

@@ -13,7 +13,15 @@ import {
   MaybePromise,
   MergeConflictEditorMode,
 } from '@opensumi/ide-core-common';
-import { ICodeEditor, IRange, ITextModel, NewSymbolNamesProvider, Position } from '@opensumi/ide-monaco';
+import {
+  ICodeEditor,
+  IRange,
+  ISelection,
+  ITextModel,
+  InlineEditProvider,
+  NewSymbolNamesProvider,
+  Position,
+} from '@opensumi/ide-monaco';
 import { SumiReadableStream } from '@opensumi/ide-utils/lib/stream';
 import { IMarker } from '@opensumi/monaco-editor-core/esm/vs/platform/markers/common/markers';
 
@@ -42,9 +50,11 @@ interface IBaseInlineChatHandler<T extends any[]> {
   providerDiffPreviewStrategy?: (...args: T) => MaybePromise<ChatResponse | InlineChatController>;
 }
 
-export type IEditorInlineChatHandler = IBaseInlineChatHandler<[editor: ICodeEditor, token: CancellationToken]>;
+export type IEditorInlineChatHandler = IBaseInlineChatHandler<
+  [editor: ICodeEditor, selection: ISelection, token: CancellationToken]
+>;
 export type IInteractiveInputHandler = IBaseInlineChatHandler<
-  [editor: ICodeEditor, value: string, token: CancellationToken]
+  [editor: ICodeEditor, selection: ISelection, value: string, token: CancellationToken]
 >;
 
 export enum ERunStrategy {
@@ -224,14 +234,39 @@ export type ICodeEditsProvider = (
   token: CancellationToken,
 ) => MaybePromise<ICodeEditsResult | undefined>;
 
+export type IIntelligentInlineEditProvider = (
+  editor: ICodeEditor,
+  position: IPosition,
+  contextBean: IAICompletionOption,
+  token: CancellationToken,
+) => MaybePromise<IIntelligentCompletionsResult>;
+
+/**
+ * Interface for registering intelligent completion providers and code edits providers.
+ */
 export interface IIntelligentCompletionsRegistry {
   /**
-   *  @deprecated use registerInlineCompletionProvider API
+   * Registers an intelligent completion provider.
+   * @deprecated Use the `registerInlineCompletionsProvider` method instead.
+   * @param provider - The intelligent completion provider to register.
    */
   registerIntelligentCompletionProvider(provider: IIntelligentCompletionProvider): void;
+
+  /**
+   * Registers an inline completions provider.
+   * @param provider - The intelligent completion provider to register.
+   */
   registerInlineCompletionsProvider(provider: IIntelligentCompletionProvider): void;
+
+  /**
+   * Registers an inline edit provider.
+   * @param provider The inline edit provider to register.
+   */
+  registerInlineEditProvider(provider: InlineEditProvider): void;
+
   /**
-   * 注册 code edits 功能
+   * Registers a code edits provider.
+   * @param provider - The code edits provider to register.
    */
   registerCodeEditsProvider(provider: ICodeEditsProvider): void;
 }

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

@@ -15,6 +15,7 @@ import {
   Disposable,
   ErrorResponse,
   Event,
+  FRAME_THREE,
   IAIReporter,
   IDisposable,
   ILogServiceClient,
@@ -30,14 +31,14 @@ import * as monaco from '@opensumi/ide-monaco';
 import { ICodeEditor } from '@opensumi/ide-monaco';
 import { monacoApi } from '@opensumi/ide-monaco/lib/browser/monaco-api';
 
+import { AINativeContextKey } from '../../ai-core.contextkeys';
 import { BaseAIMonacoEditorController } from '../../contrib/base';
 import { CodeActionService } from '../../contrib/code-action/code-action.service';
-import { ERunStrategy } from '../../types';
 import { InlineDiffController } from '../inline-diff/inline-diff.controller';
 
 import { InlineChatController } from './inline-chat-controller';
 import { InlineChatFeatureRegistry } from './inline-chat.feature.registry';
-import { AIInlineChatService, EInlineChatStatus, EResultKind } from './inline-chat.service';
+import { EInlineChatStatus, EResultKind, InlineChatService } from './inline-chat.service';
 import { AIInlineContentWidget } from './inline-content-widget';
 
 export class InlineChatEditorController extends BaseAIMonacoEditorController {
@@ -51,7 +52,7 @@ export class InlineChatEditorController extends BaseAIMonacoEditorController {
     return this.injector.get(AINativeConfigService);
   }
 
-  private get aiInlineChatService(): AIInlineChatService {
+  private get aiInlineChatService(): InlineChatService {
     return this.injector.get(IAIInlineChatService);
   }
 
@@ -86,11 +87,13 @@ export class InlineChatEditorController extends BaseAIMonacoEditorController {
   private aiInlineContentWidget: AIInlineContentWidget;
   private aiInlineChatDisposable: Disposable = new Disposable();
   private aiInlineChatOperationDisposable: Disposable = new Disposable();
+  private aiNativeContextKey: AINativeContextKey;
   private inlineChatInUsing = false;
 
   private inlineDiffController: InlineDiffController;
 
   mount(): IDisposable {
+    this.aiNativeContextKey = this.injector.get(AINativeContextKey, [this.monacoEditor.contextKeyService]);
     this.inlineDiffController = InlineDiffController.get(this.monacoEditor)!;
 
     if (!this.monacoEditor) {
@@ -178,7 +181,7 @@ export class InlineChatEditorController extends BaseAIMonacoEditorController {
       Event.debounce(
         Event.any<any>(this.monacoEditor.onDidChangeCursorSelection, this.monacoEditor.onMouseUp),
         (_, e) => e,
-        100,
+        FRAME_THREE,
       )(() => {
         if (!prefInlineChatAutoVisible || !needShowInlineChat) {
           return;
@@ -197,7 +200,7 @@ export class InlineChatEditorController extends BaseAIMonacoEditorController {
     return this.featureDisposable;
   }
 
-  private disposeAllWidget() {
+  public disposeAllWidget() {
     [this.aiInlineContentWidget, this.aiInlineChatDisposable, this.aiInlineChatOperationDisposable].forEach(
       (widget) => {
         widget?.dispose();
@@ -219,14 +222,26 @@ export class InlineChatEditorController extends BaseAIMonacoEditorController {
 
   protected async showInlineChat(monacoEditor: monaco.ICodeEditor): Promise<void> {
     // 调试状态下禁用 inline chat。影响调试体验
-    const inDebugMode = this.contextKeyService.getContextValue(CONTEXT_IN_DEBUG_MODE_KEY);
+    const inDebugMode = this.contextKeyService.getContextKeyValue(CONTEXT_IN_DEBUG_MODE_KEY);
     if (inDebugMode) {
       return;
     }
 
+    // 如果 inline input 正在展示，则不展示 inline chat
+    const isInlineInputVisible = this.aiNativeContextKey.inlineInputWidgetIsVisible.get();
+    if (isInlineInputVisible) {
+      return;
+    }
+
+    const isInlineStreaming = this.aiNativeContextKey.inlineInputWidgetIsStreaming.get();
+    if (isInlineStreaming) {
+      return;
+    }
+
     if (!this.aiNativeConfigService.capabilities.supportsInlineChat) {
       return;
     }
+
     if (this.inlineChatInUsing) {
       return;
     }
@@ -243,12 +258,6 @@ export class InlineChatEditorController extends BaseAIMonacoEditorController {
 
     this.showInlineContentWidget(monacoEditor, selection);
 
-    this.aiInlineChatDisposable.addDispose(
-      this.inlineChatFeatureRegistry.onChatClick(() => {
-        this.aiInlineChatService.launchInputVisible(true);
-      }),
-    );
-
     this.aiInlineChatDisposable.addDispose(
       this.aiInlineContentWidget.onActionClick(({ actionId, source }) => {
         const handler = this.inlineChatFeatureRegistry.getEditorHandler(actionId);
@@ -271,7 +280,7 @@ export class InlineChatEditorController extends BaseAIMonacoEditorController {
             return undefined;
           }
 
-          return strategy.bind(this, monacoEditor, this.token);
+          return strategy.bind(this, monacoEditor, crossSelection, this.token);
         };
 
         this.runAction({
@@ -288,7 +297,7 @@ export class InlineChatEditorController extends BaseAIMonacoEditorController {
             });
             return relationId;
           },
-          execute: handler.execute ? handler.execute!.bind(this, monacoEditor, this.token) : undefined,
+          execute: handler.execute ? handler.execute!.bind(this, monacoEditor, crossSelection, this.token) : undefined,
           providerPreview: previewer(),
           extraData: {
             actionSource: source === 'codeAction' ? ActionSourceEnum.CodeAction : ActionSourceEnum.InlineChat,
@@ -297,49 +306,6 @@ export class InlineChatEditorController extends BaseAIMonacoEditorController {
         });
       }),
     );
-
-    this.aiInlineChatDisposable.addDispose(
-      this.aiInlineContentWidget.onInteractiveInputValue(async (value) => {
-        const handler = this.inlineChatFeatureRegistry.getInteractiveInputHandler();
-
-        if (!handler) {
-          return;
-        }
-
-        const strategy = await this.inlineChatFeatureRegistry.getInteractiveInputStrategyHandler()(monacoEditor, value);
-
-        const crossSelection = this.getCrossSelection(monacoEditor);
-        if (!crossSelection) {
-          return;
-        }
-
-        this.runAction({
-          monacoEditor,
-          crossSelection,
-          reporterFn: () => {
-            const relationId = this.aiReporter.start(AIServiceType.InlineChatInput, {
-              message: value,
-              type: AIServiceType.InlineChatInput,
-              source: 'input',
-              actionSource: ActionSourceEnum.InlineChatInput,
-            });
-            return relationId;
-          },
-          execute:
-            handler.execute && strategy === ERunStrategy.EXECUTE
-              ? handler.execute!.bind(this, monacoEditor, value, this.token)
-              : undefined,
-          providerPreview:
-            handler.providePreviewStrategy && strategy === ERunStrategy.PREVIEW
-              ? handler.providePreviewStrategy.bind(this, monacoEditor, value, this.token)
-              : undefined,
-          extraData: {
-            actionSource: ActionSourceEnum.InlineChatInput,
-            actionType: strategy,
-          },
-        });
-      }),
-    );
   }
 
   private getCrossSelection(monacoEditor: monaco.ICodeEditor) {
@@ -480,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) {
@@ -506,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);
@@ -543,12 +508,6 @@ export class InlineChatEditorController extends BaseAIMonacoEditorController {
       return;
     }
 
-    this.visibleDiffWidget({
-      monacoEditor,
-      options: { crossSelection, chatResponse: response },
-      reportInfo: { relationId, startTime, isRetry, actionType, actionSource },
-    });
-
     this.aiInlineChatOperationDisposable.addDispose([
       this.aiInlineContentWidget.onResultClick((kind: EResultKind) => {
         const modifyContent = this.inlineDiffController.getModifyContent();
@@ -614,6 +573,12 @@ export class InlineChatEditorController extends BaseAIMonacoEditorController {
         });
       }),
     ]);
+
+    this.visibleDiffWidget({
+      monacoEditor,
+      options: { crossSelection, chatResponse: response },
+      reportInfo: { relationId, startTime, isRetry, actionType, actionSource },
+    });
   }
 
   public async runAction(params: {