@opensumi/ide-ai-native 3.7.2-next-1740448398.0 → 3.7.2-next-1741226843.0

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

@@ -1,18 +1,19 @@
 import { Autowired } from '@opensumi/di';
 import {
-  AINativeConfigService,
   ClientAppContribution,
   Key,
   KeybindingContribution,
   KeybindingRegistry,
   KeybindingScope,
 } from '@opensumi/ide-core-browser';
-import { AI_CODE_EDITS_COMMANDS } from '@opensumi/ide-core-browser/lib/ai-native/command';
+import {
+  AI_MULTI_LINE_COMPLETION_ACCEPT,
+  AI_MULTI_LINE_COMPLETION_DISCARD,
+} from '@opensumi/ide-core-browser/lib/ai-native/command';
 import { MultiLineEditsIsVisible } from '@opensumi/ide-core-browser/lib/contextkey/ai-native';
 import { CommandContribution, CommandRegistry, Domain } from '@opensumi/ide-core-common';
 import { WorkbenchEditorService } from '@opensumi/ide-editor';
 import { WorkbenchEditorServiceImpl } from '@opensumi/ide-editor/lib/browser/workbench-editor.service';
-import { transaction } from '@opensumi/ide-monaco/lib/common/observable';
 
 import { IntelligentCompletionsController } from './intelligent-completions.controller';
 
@@ -21,11 +22,8 @@ export class IntelligentCompletionsContribution implements KeybindingContributio
   @Autowired(WorkbenchEditorService)
   private readonly workbenchEditorService: WorkbenchEditorServiceImpl;
 
-  @Autowired(AINativeConfigService)
-  private readonly aiNativeConfigService: AINativeConfigService;
-
   registerCommands(commands: CommandRegistry): void {
-    commands.registerCommand(AI_CODE_EDITS_COMMANDS.DISCARD, {
+    commands.registerCommand(AI_MULTI_LINE_COMPLETION_DISCARD, {
       execute: () => {
         const editor = this.workbenchEditorService.currentCodeEditor;
         if (editor) {
@@ -34,7 +32,7 @@ export class IntelligentCompletionsContribution implements KeybindingContributio
       },
     });
 
-    commands.registerCommand(AI_CODE_EDITS_COMMANDS.ACCEPT, {
+    commands.registerCommand(AI_MULTI_LINE_COMPLETION_ACCEPT, {
       execute: () => {
         const editor = this.workbenchEditorService.currentCodeEditor;
         if (editor) {
@@ -42,24 +40,11 @@ export class IntelligentCompletionsContribution implements KeybindingContributio
         }
       },
     });
-
-    commands.registerCommand(AI_CODE_EDITS_COMMANDS.TRIGGER, {
-      execute: () => {
-        const editor = this.workbenchEditorService.currentCodeEditor;
-        if (editor) {
-          transaction((tx) => {
-            IntelligentCompletionsController.get(editor.monacoEditor)?.trigger(tx);
-          });
-        }
-      },
-    });
   }
 
   registerKeybindings(keybindings: KeybindingRegistry): void {
-    const { codeEdits } = this.aiNativeConfigService;
-
     keybindings.registerKeybinding({
-      command: AI_CODE_EDITS_COMMANDS.DISCARD.id,
+      command: AI_MULTI_LINE_COMPLETION_DISCARD.id,
       keybinding: Key.ESCAPE.code,
       when: MultiLineEditsIsVisible.raw,
       priority: 100,
@@ -67,20 +52,11 @@ export class IntelligentCompletionsContribution implements KeybindingContributio
 
     keybindings.registerKeybinding(
       {
-        command: AI_CODE_EDITS_COMMANDS.ACCEPT.id,
+        command: AI_MULTI_LINE_COMPLETION_ACCEPT.id,
         keybinding: Key.TAB.code,
         when: MultiLineEditsIsVisible.raw,
       },
       KeybindingScope.USER,
     );
-
-    keybindings.registerKeybinding(
-      {
-        command: AI_CODE_EDITS_COMMANDS.TRIGGER.id,
-        keybinding: codeEdits.triggerKeybinding,
-        when: 'editorFocus',
-      },
-      KeybindingScope.USER,
-    );
   }
 }

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

@@ -1,10 +1,4 @@
-import {
-  ContextKeyChangeEvent,
-  Key,
-  KeybindingRegistry,
-  KeybindingScope,
-  PreferenceService,
-} from '@opensumi/ide-core-browser';
+import { Key, KeybindingRegistry, KeybindingScope, PreferenceService } from '@opensumi/ide-core-browser';
 import { MultiLineEditsIsVisible } from '@opensumi/ide-core-browser/lib/contextkey/ai-native';
 import {
   AINativeSettingSectionsId,
@@ -20,13 +14,9 @@ import { Emitter, ICodeEditor, ICursorPositionChangedEvent, IRange, ITextModel,
 import {
   IObservable,
   ISettableObservable,
-  ITransaction,
   autorun,
   autorunWithStoreHandleChanges,
   derived,
-  derivedHandleChanges,
-  derivedOpts,
-  observableFromEvent,
   observableValue,
   transaction,
 } from '@opensumi/ide-monaco/lib/common/observable';
@@ -36,9 +26,9 @@ import { inlineSuggestCommitId } from '@opensumi/monaco-editor-core/esm/vs/edito
 import { InlineCompletionContextKeys } from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys';
 import { InlineCompletionsController } from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController';
 import {
-  ObservableSuggestWidgetAdapter,
+  SuggestItemInfo,
   SuggestWidgetAdaptor,
-} from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/inlineCompletions/browser/model/suggestWidgetAdapter';
+} from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/inlineCompletions/browser/model/suggestWidgetAdaptor';
 import { ContextKeyExpr } from '@opensumi/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey';
 
 import { AINativeContextKey } from '../../ai-core.contextkeys';
@@ -57,10 +47,8 @@ import { IntelligentCompletionsRegistry } from './intelligent-completions.featur
 import { CodeEditsSourceCollection } from './source/base';
 import { LineChangeCodeEditsSource } from './source/line-change.source';
 import { LintErrorCodeEditsSource } from './source/lint-error.source';
-import { TriggerCodeEditsSource } from './source/trigger.source';
-import { TypingCodeEditsSource } from './source/typing.source';
 
-import { CodeEditsResultValue, VALID_TIME } from './index';
+import { CodeEditsResultValue } from './index';
 
 export class IntelligentCompletionsController extends BaseAIMonacoEditorController {
   public static readonly ID = 'editor.contrib.ai.intelligent.completions';
@@ -95,29 +83,22 @@ export class IntelligentCompletionsController extends BaseAIMonacoEditorControll
   private codeEditsSourceCollection: CodeEditsSourceCollection;
   private aiNativeContextKey: AINativeContextKey;
   private rewriteWidget: RewriteWidget | null;
-  private multiLineEditsIsVisibleObs: IObservable<boolean>;
+  private whenMultiLineEditsVisibleDisposable: Disposable;
 
   public mount(): IDisposable {
     this.handlerAlwaysVisiblePreference();
 
     this.codeEditsResult = observableValue<CodeEditsResultValue | undefined>(this, undefined);
+
+    this.whenMultiLineEditsVisibleDisposable = new Disposable();
     this.multiLineDecorationModel = new MultiLineDecorationModel(this.monacoEditor);
     this.additionsDeletionsDecorationModel = new AdditionsDeletionsDecorationModel(this.monacoEditor);
     this.aiNativeContextKey = this.injector.get(AINativeContextKey, [this.monacoEditor.contextKeyService]);
     this.codeEditsSourceCollection = this.injector.get(CodeEditsSourceCollection, [
-      [LintErrorCodeEditsSource, LineChangeCodeEditsSource, TypingCodeEditsSource, TriggerCodeEditsSource],
+      [LintErrorCodeEditsSource, LineChangeCodeEditsSource],
       this.monacoEditor,
     ]);
 
-    const multiLineEditsIsVisibleKey = new Set([MultiLineEditsIsVisible.raw]);
-    this.multiLineEditsIsVisibleObs = observableFromEvent(
-      this,
-      Event.filter(this.aiNativeContextKey.contextKeyService!.onDidChangeContext, (e: ContextKeyChangeEvent) =>
-        e.payload.affectsSome(multiLineEditsIsVisibleKey),
-      ),
-      () => !!this.aiNativeContextKey.multiLineEditsIsVisible.get(),
-    );
-
     this.registerFeature(this.monacoEditor);
     return this.featureDisposable;
   }
@@ -161,24 +142,16 @@ export class IntelligentCompletionsController extends BaseAIMonacoEditorControll
             const model = inlineCompletionsController.model.read(reader);
             model?.inlineCompletionState.read(reader);
 
-            const observableSuggestWidgetAdapter = inlineCompletionsController[
-              '_suggestWidgetAdapter'
-            ] as ObservableSuggestWidgetAdapter;
-            if (!observableSuggestWidgetAdapter) {
-              return;
+            const suggestWidgetSelectedItem = inlineCompletionsController['_suggestWidgetSelectedItem'] as IObservable<
+              SuggestItemInfo | undefined,
+              unknown
+            >;
+            const selectedItem = suggestWidgetSelectedItem.get();
+            if (selectedItem) {
+              const suggestWidgetAdaptor = inlineCompletionsController['_suggestWidgetAdaptor'] as SuggestWidgetAdaptor;
+              suggestWidgetAdaptor['_currentSuggestItemInfo'] = undefined;
+              (suggestWidgetAdaptor['_onDidSelectedItemChange'] as Emitter<void>).fire();
             }
-
-            const selectedItem = observableSuggestWidgetAdapter.selectedItem.get();
-            if (!selectedItem) {
-              return;
-            }
-
-            const suggestWidgetAdaptor = observableSuggestWidgetAdapter[
-              '_suggestWidgetAdaptor'
-            ] as SuggestWidgetAdaptor;
-
-            suggestWidgetAdaptor['_currentSuggestItemInfo'] = undefined;
-            (suggestWidgetAdaptor['_onDidSelectedItemChange'] as Emitter<void>).fire();
           }),
         );
       }
@@ -280,6 +253,26 @@ export class IntelligentCompletionsController extends BaseAIMonacoEditorControll
       this.additionsDeletionsDecorationModel.updateDeletionsDecoration(wordChanges, range, eol);
       this.renderRewriteWidget(wordChanges, model, range, insertTextString);
     }
+
+    if (this.whenMultiLineEditsVisibleDisposable.disposed) {
+      this.whenMultiLineEditsVisibleDisposable = new Disposable();
+    }
+    // 监听当前光标位置的变化，如果超出 range 区域则表示弃用
+    this.whenMultiLineEditsVisibleDisposable.addDispose(
+      this.monacoEditor.onDidChangeCursorPosition((event: ICursorPositionChangedEvent) => {
+        const isVisible = this.aiNativeContextKey.multiLineEditsIsVisible.get();
+        if (isVisible) {
+          const position = event.position;
+          if (position.lineNumber < range.startLineNumber || position.lineNumber > range.endLineNumber) {
+            runWhenIdle(() => {
+              this.discard.get();
+            });
+          }
+        } else {
+          this.whenMultiLineEditsVisibleDisposable.dispose();
+        }
+      }),
+    );
   }
 
   private async renderRewriteWidget(
@@ -342,52 +335,36 @@ export class IntelligentCompletionsController extends BaseAIMonacoEditorControll
       const { range, insertText } = codeEditsResult.items[0];
       const newCode = insertText;
       const originCode = this.model.getValueInRange(range);
-      return (type: keyof Pick<CodeEditsRT, 'isReceive' | 'isDrop' | 'isValid'>, defaultValue: boolean = true) => {
-        const data = {
-          [type]: defaultValue,
+      return (type: keyof Pick<CodeEditsRT, 'isReceive' | 'isDrop' | 'isValid'>) => {
+        contextBean.reporterEnd({
+          [type]: true,
           code: newCode,
           originCode,
-        };
-
-        contextBean.reporterEnd(data);
+        });
       };
     }
   });
 
-  public discard = derivedHandleChanges(
-    {
-      owner: this,
-      createEmptyChangeSummary: () => ({ lastVisibleTime: Date.now() }),
-      handleChange: (context, changeSummary) => {
-        if (context.didChange(this.multiLineEditsIsVisibleObs)) {
-          changeSummary.lastVisibleTime = Date.now();
-          return this.multiLineEditsIsVisibleObs.get();
-        }
-        return false;
-      },
-      equalityComparer: () => false,
-    },
-    (reader, changeSummary) => {
-      this.multiLineEditsIsVisibleObs.read(reader);
-
-      const lastVisibleTime = changeSummary.lastVisibleTime;
-      const report = this.reportData.read(reader);
-      let isValid = false;
-
-      if (lastVisibleTime && Date.now() - lastVisibleTime > VALID_TIME) {
-        isValid = true;
-        report?.('isDrop');
-      } else {
-        isValid = false;
-        report?.('isValid', false);
-      }
+  private lastVisibleTime = derived(this, (reader) => {
+    const isVisible = this.aiNativeContextKey.multiLineEditsIsVisible.get();
+    return isVisible ? Date.now() : undefined;
+  });
+
+  public discard = derived(this, (reader) => {
+    const lastVisibleTime = this.lastVisibleTime.read(reader);
+    const report = this.reportData.read(reader);
 
-      this.hide();
-      return isValid;
-    },
-  );
+    // 在可见的情况下超过 750ms 弃用才算有效数据，否则视为取消
+    if (lastVisibleTime && Date.now() - lastVisibleTime > 750) {
+      report?.('isDrop');
+    } else {
+      report?.('isValid');
+    }
+
+    this.hide();
+  });
 
-  public accept = derivedOpts({ owner: this, equalsFn: () => false }, (reader) => {
+  public accept = derived(this, (reader) => {
     const report = this.reportData.read(reader);
     report?.('isReceive');
 
@@ -415,13 +392,6 @@ export class IntelligentCompletionsController extends BaseAIMonacoEditorControll
     this.hide();
   });
 
-  public trigger(tx: ITransaction): void {
-    const triggerSource = this.codeEditsSourceCollection.getSource(TriggerCodeEditsSource) as TriggerCodeEditsSource;
-    if (triggerSource) {
-      triggerSource.triggerSignal.trigger(tx);
-    }
-  }
-
   private registerFeature(monacoEditor: ICodeEditor): void {
     this.featureDisposable.addDispose(
       Event.any<any>(
@@ -433,19 +403,14 @@ export class IntelligentCompletionsController extends BaseAIMonacoEditorControll
       }),
     );
 
-    // 监听当前光标位置的变化，如果超出 range 区域则表示弃用
+    const multiLineEditsIsVisibleKey = new Set([MultiLineEditsIsVisible.raw]);
+    this.featureDisposable.addDispose(this.whenMultiLineEditsVisibleDisposable);
     this.featureDisposable.addDispose(
-      this.monacoEditor.onDidChangeCursorPosition((event: ICursorPositionChangedEvent) => {
-        const isVisible = this.multiLineEditsIsVisibleObs.get();
-        const completionModel = this.codeEditsResult.get();
-
-        if (isVisible && completionModel) {
-          const position = event.position;
-          const range = completionModel.items[0].range;
-          if (position.lineNumber < range.startLineNumber || position.lineNumber > range.endLineNumber) {
-            runWhenIdle(() => {
-              this.discard.get();
-            });
+      this.aiNativeContextKey.contextKeyService!.onDidChangeContext((e) => {
+        if (e.payload.affectsSome(multiLineEditsIsVisibleKey)) {
+          const isVisible = this.aiNativeContextKey.multiLineEditsIsVisible.get();
+          if (!isVisible) {
+            this.whenMultiLineEditsVisibleDisposable.dispose();
           }
         }
       }),
@@ -466,7 +431,7 @@ export class IntelligentCompletionsController extends BaseAIMonacoEditorControll
       autorunWithStoreHandleChanges(
         {
           createEmptyChangeSummary: () => ({}),
-          handleChange: (context) => {
+          handleChange: (context, changeSummary) => {
             if (context.didChange(this.codeEditsSourceCollection.codeEditsContextBean)) {
               // 如果上一次补全结果还在，则不重复请求
               const isVisible = this.aiNativeContextKey.multiLineEditsIsVisible.get();

package/src/browser/contrib/intelligent-completions/intelligent-completions.feature.registry.ts

@@ -1,6 +1,5 @@
 import { Injectable } from '@opensumi/di';
 import { Disposable } from '@opensumi/ide-core-common';
-import { InlineEditProvider } from '@opensumi/ide-monaco';
 
 import { ICodeEditsProvider, IIntelligentCompletionProvider, IIntelligentCompletionsRegistry } from '../../types';
 
@@ -8,7 +7,6 @@ import { ICodeEditsProvider, IIntelligentCompletionProvider, IIntelligentComplet
 export class IntelligentCompletionsRegistry extends Disposable implements IIntelligentCompletionsRegistry {
   private inlineCompletionsProvider: IIntelligentCompletionProvider | undefined;
   private codeEditsProvider: ICodeEditsProvider | undefined;
-  private inlineEditProvider: InlineEditProvider | undefined;
 
   registerIntelligentCompletionProvider(provider: IIntelligentCompletionProvider): void {
     this.inlineCompletionsProvider = provider;
@@ -18,10 +16,6 @@ export class IntelligentCompletionsRegistry extends Disposable implements IIntel
     this.inlineCompletionsProvider = provider;
   }
 
-  registerInlineEditProvider(provider: InlineEditProvider): void {
-    this.inlineEditProvider = provider;
-  }
-
   registerCodeEditsProvider(provider: ICodeEditsProvider): void {
     this.codeEditsProvider = provider;
   }
@@ -33,9 +27,4 @@ export class IntelligentCompletionsRegistry extends Disposable implements IIntel
   getCodeEditsProvider(): ICodeEditsProvider | undefined {
     return this.codeEditsProvider;
   }
-
-  getInlineEditProvider(): InlineEditProvider | undefined {
-    // TODO: 支持模块内调用
-    return this.inlineEditProvider;
-  }
 }

package/src/browser/contrib/intelligent-completions/source/base.ts

@@ -7,6 +7,7 @@ import {
   Disposable,
   IAIReporter,
   IDisposable,
+  MaybePromise,
   uuid,
 } from '@opensumi/ide-core-common';
 import { CancellationTokenSource, ICodeEditor } from '@opensumi/ide-monaco';
@@ -36,26 +37,14 @@ export class CodeEditsContextBean extends Disposable {
     return this.raw;
   }
 
-  public get typing() {
-    return this.raw.typing;
-  }
-
   public get position() {
     return this.raw.position;
   }
 
-  public get data() {
-    return this.raw.data;
-  }
-
   public get token() {
     return this.source.token;
   }
 
-  public joinData(data: ICodeEditsContextBean['data']) {
-    this.raw.data = { ...this.data, ...data };
-  }
-
   public reporterStart() {
     return this.source.reporterStart();
   }
@@ -72,14 +61,16 @@ export class CodeEditsContextBean extends Disposable {
 @Injectable({ multiple: true })
 export abstract class BaseCodeEditsSource extends Disposable {
   @Autowired(IAIReporter)
-  private readonly aiReporter: IAIReporter;
+  private aiReporter: IAIReporter;
 
   @Autowired(PreferenceService)
-  protected readonly preferenceService: PreferenceService;
+  protected preferenceService: PreferenceService;
 
   private cancellationTokenSource = new CancellationTokenSource();
   private readonly relationID = observableValue<string | undefined>(this, undefined);
 
+  protected abstract doTrigger(...args: any[]): MaybePromise<void>;
+
   public readonly codeEditsContextBean = disposableObservableValue<CodeEditsContextBean | undefined>(this, undefined);
   public abstract priority: number;
   public abstract mount(): IDisposable;
@@ -109,9 +100,9 @@ export abstract class BaseCodeEditsSource extends Disposable {
     });
   }
 
-  protected setBean(bean: Omit<ICodeEditsContextBean, 'position'>) {
+  protected setBean(bean: ICodeEditsContextBean) {
     transaction((tx) => {
-      const context = new CodeEditsContextBean({ ...bean, position: this.monacoEditor.getPosition()! }, this);
+      const context = new CodeEditsContextBean(bean, this);
       this.codeEditsContextBean.set(context, tx);
     });
   }
@@ -121,7 +112,7 @@ export abstract class BaseCodeEditsSource extends Disposable {
     if (context) {
       const relationID = this.aiReporter.start(AIServiceType.CodeEdits, {
         type: AIServiceType.CodeEdits,
-        actionSource: context?.typing,
+        actionSource: context?.bean.typing,
       });
 
       transaction((tx) => {
@@ -143,26 +134,21 @@ export class CodeEditsSourceCollection extends Disposable {
   @Autowired(INJECTOR_TOKEN)
   private readonly injector: Injector;
 
-  private sources: BaseCodeEditsSource[] = [];
   public readonly codeEditsContextBean = disposableObservableValue<CodeEditsContextBean | undefined>(this, undefined);
 
-  public getSource(source: ConstructorOf<BaseCodeEditsSource>): BaseCodeEditsSource | undefined {
-    return this.sources.find((s) => s instanceof source);
-  }
-
   constructor(
     private readonly constructorSources: ConstructorOf<BaseCodeEditsSource>[],
     private readonly monacoEditor: ICodeEditor,
   ) {
     super();
 
-    this.sources = this.constructorSources.map((source) => this.injector.get(source, [this.monacoEditor]));
+    const sources = this.constructorSources.map((source) => this.injector.get(source, [this.monacoEditor]));
 
-    this.sources.forEach((source) => this.addDispose(source.mount()));
+    sources.forEach((source) => this.addDispose(source.mount()));
 
     // 观察所有 source 的 codeEditsContextBean
     const observerCodeEditsContextBean = derived((reader) => ({
-      codeEditsContextBean: new Map(this.sources.map((source) => [source, source.codeEditsContextBean.read(reader)])),
+      codeEditsContextBean: new Map(sources.map((source) => [source, source.codeEditsContextBean.read(reader)])),
     }));
 
     this.addDispose(
@@ -171,7 +157,7 @@ export class CodeEditsSourceCollection extends Disposable {
         debouncedObservable2(observerCodeEditsContextBean, 0),
         ({ lastValue, newValue }) => {
           // 只拿最新的订阅值，如果 uid 相同，表示该值没有变化，就不用往下通知了
-          const lastSources = this.sources.filter((source) => {
+          const lastSources = sources.filter((source) => {
             const newBean = newValue?.codeEditsContextBean.get(source);
             const lastBean = lastValue?.codeEditsContextBean?.get(source);
             return newBean && (!lastBean || newBean.uid !== lastBean.uid);
@@ -182,26 +168,15 @@ export class CodeEditsSourceCollection extends Disposable {
 
           for (const source of lastSources) {
             const value = source.codeEditsContextBean.get();
-            if (!value) {
-              return;
-            }
 
-            if (!contextBean) {
-              contextBean = value;
-            }
-
-            if (value.priority >= highestPriority) {
+            if (value && value.priority >= highestPriority) {
               highestPriority = value.priority;
-
-              value.joinData(contextBean.data);
               contextBean = value;
             }
-
-            // 将多个 source 的 data 合并到一起
-            contextBean.joinData(value.data);
           }
 
           transaction((tx) => {
+            // 只通知最高优先级的结果
             this.codeEditsContextBean.set(contextBean, tx);
           });
         },