@opensumi/ide-ai-native 3.7.1-next-1739774311.0 → 3.7.1

package/src/browser/ai-core.contribution.ts

@@ -27,7 +27,6 @@ import {
 } from '@opensumi/ide-core-browser';
 import {
   AI_CHAT_VISIBLE,
-  AI_INLINE_CHAT_INTERACTIVE_INPUT_CANCEL,
   AI_INLINE_CHAT_INTERACTIVE_INPUT_VISIBLE,
   AI_INLINE_CHAT_VISIBLE,
   AI_INLINE_COMPLETION_REPORTER,
@@ -38,7 +37,6 @@ import {
   InlineChatIsVisible,
   InlineDiffPartialEditsIsVisible,
   InlineHintWidgetIsVisible,
-  InlineInputWidgetIsStreaming,
   InlineInputWidgetIsVisible,
 } from '@opensumi/ide-core-browser/lib/contextkey/ai-native';
 import { DesignLayoutConfig } from '@opensumi/ide-core-browser/lib/layout/constants';
@@ -58,9 +56,8 @@ import {
   runWhenIdle,
 } from '@opensumi/ide-core-common';
 import { DESIGN_MENU_BAR_RIGHT } from '@opensumi/ide-design';
-import { IEditor, WorkbenchEditorService } from '@opensumi/ide-editor';
+import { IEditor } from '@opensumi/ide-editor';
 import { BrowserEditorContribution, IEditorFeatureRegistry } from '@opensumi/ide-editor/lib/browser';
-import { WorkbenchEditorServiceImpl } from '@opensumi/ide-editor/lib/browser/workbench-editor.service';
 import { IMainLayoutService } from '@opensumi/ide-main-layout';
 import { ISettingRegistry, SettingContribution } from '@opensumi/ide-preferences';
 import { EditorContributionInstantiation } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/editorExtensions';
@@ -104,11 +101,11 @@ import {
 } from './types';
 import { InlineChatEditorController } from './widget/inline-chat/inline-chat-editor.controller';
 import { InlineChatFeatureRegistry } from './widget/inline-chat/inline-chat.feature.registry';
-import { InlineChatService } from './widget/inline-chat/inline-chat.service';
+import { AIInlineChatService } from './widget/inline-chat/inline-chat.service';
 import { InlineDiffController } from './widget/inline-diff/inline-diff.controller';
 import { InlineHintController } from './widget/inline-hint/inline-hint.controller';
 import { InlineInputController } from './widget/inline-input/inline-input.controller';
-import { InlineInputService } from './widget/inline-input/inline-input.service';
+import { InlineInputChatService } from './widget/inline-input/inline-input.service';
 import { InlineStreamDiffService } from './widget/inline-stream-diff/inline-stream-diff.service';
 import { SumiLightBulbWidget } from './widget/light-bulb';
 
@@ -194,10 +191,10 @@ export class AINativeBrowserContribution
   private readonly chatProxyService: ChatProxyService;
 
   @Autowired(IAIInlineChatService)
-  private readonly aiInlineChatService: InlineChatService;
+  private readonly aiInlineChatService: AIInlineChatService;
 
-  @Autowired(InlineInputService)
-  private readonly inlineInputService: InlineInputService;
+  @Autowired(InlineInputChatService)
+  private readonly inlineInputChatService: InlineInputChatService;
 
   @Autowired(InlineStreamDiffService)
   private readonly inlineStreamDiffService: InlineStreamDiffService;
@@ -208,9 +205,6 @@ export class AINativeBrowserContribution
   @Autowired(CodeActionSingleHandler)
   private readonly codeActionSingleHandler: CodeActionSingleHandler;
 
-  @Autowired(WorkbenchEditorService)
-  private readonly workbenchEditorService: WorkbenchEditorServiceImpl;
-
   constructor() {
     this.registerFeature();
   }
@@ -243,7 +237,7 @@ export class AINativeBrowserContribution
         EditorContributionInstantiation.BeforeFirstInteraction,
       );
 
-      if (this.inlineInputService.getInteractiveInputHandler()) {
+      if (this.inlineChatFeatureRegistry.getInteractiveInputHandler()) {
         register(
           InlineHintController.ID,
           new SyncDescriptor(InlineHintController, [this.injector]),
@@ -260,7 +254,7 @@ export class AINativeBrowserContribution
       register(
         IntelligentCompletionsController.ID,
         new SyncDescriptor(IntelligentCompletionsController, [this.injector]),
-        EditorContributionInstantiation.Eager,
+        EditorContributionInstantiation.AfterFirstRender,
       );
       register(
         InlineCompletionsController.ID,
@@ -371,10 +365,6 @@ export class AINativeBrowserContribution
             id: AINativeSettingSectionsId.CodeEditsLineChange,
             localized: 'preference.ai.native.codeEdits.lineChange',
           },
-          {
-            id: AINativeSettingSectionsId.CodeEditsTyping,
-            localized: 'preference.ai.native.codeEdits.typing',
-          },
         ],
       });
     }
@@ -424,48 +414,14 @@ export class AINativeBrowserContribution
     });
 
     commands.registerCommand(AI_INLINE_CHAT_INTERACTIVE_INPUT_VISIBLE, {
-      execute: async (isVisible: boolean) => {
-        if (!isVisible) {
-          this.inlineInputService.hide();
-          return;
+      execute: (isVisible: boolean) => {
+        if (isVisible) {
+          this.inlineInputChatService.visible();
+        } else {
+          this.inlineInputChatService.hide();
         }
 
-        // 每次在展示 inline input 的时候，先隐藏 inline chat
-        this.commandService.executeCommand(AI_INLINE_CHAT_VISIBLE.id, false);
-
-        const editor = this.workbenchEditorService.currentCodeEditor;
-        if (!editor) {
-          return;
-        }
-
-        const position = editor.monacoEditor.getPosition();
-        if (!position) {
-          return;
-        }
-
-        const selection = editor.monacoEditor.getSelection();
-        const isEmptyLine = position ? editor.monacoEditor.getModel()?.getLineLength(position.lineNumber) === 0 : false;
-
-        if (isEmptyLine) {
-          this.inlineInputService.visibleByPosition(position);
-          return;
-        }
-
-        if (selection && !selection.isEmpty()) {
-          this.inlineInputService.visibleBySelection(selection);
-          return;
-        }
-
-        this.inlineInputService.visibleByNearestCodeBlock(position, editor.monacoEditor);
-      },
-    });
-
-    commands.registerCommand(AI_INLINE_CHAT_INTERACTIVE_INPUT_CANCEL, {
-      execute: () => {
-        const editor = this.workbenchEditorService.currentCodeEditor;
-        if (editor) {
-          InlineInputController.get(editor.monacoEditor)?.cancelToken();
-        }
+        this.aiInlineChatService._onInteractiveInputVisible.fire(isVisible);
       },
     });
 
@@ -556,12 +512,12 @@ export class AINativeBrowserContribution
         when: `editorFocus && ${InlineChatIsVisible.raw}`,
       });
 
-      if (this.inlineInputService.getInteractiveInputHandler()) {
+      if (this.inlineChatFeatureRegistry.getInteractiveInputHandler()) {
         // 当 Inline Chat （浮动组件）展示时，通过 CMD K 唤起 Inline Input
         keybindings.registerKeybinding(
           {
             command: AI_INLINE_CHAT_INTERACTIVE_INPUT_VISIBLE.id,
-            keybinding: this.aiNativeConfigService.inlineChat.inputKeybinding,
+            keybinding: 'ctrlcmd+k',
             args: true,
             priority: 0,
             when: `editorFocus && (${InlineChatIsVisible.raw} || inlineSuggestionVisible)`,
@@ -576,18 +532,11 @@ export class AINativeBrowserContribution
           priority: 0,
           when: `editorFocus && ${InlineInputWidgetIsVisible.raw}`,
         });
-        // 当 Inline Input 流式编辑时，通过 ESC 退出
-        keybindings.registerKeybinding({
-          command: AI_INLINE_CHAT_INTERACTIVE_INPUT_CANCEL.id,
-          keybinding: 'esc',
-          priority: 1,
-          when: `editorFocus && ${InlineInputWidgetIsStreaming.raw}`,
-        });
         // 当出现 CMD K 展示信息时，通过快捷键快速唤起 Inline Input
         keybindings.registerKeybinding(
           {
             command: AI_INLINE_CHAT_INTERACTIVE_INPUT_VISIBLE.id,
-            keybinding: this.aiNativeConfigService.inlineChat.inputKeybinding,
+            keybinding: 'ctrlcmd+k',
             args: true,
             priority: 0,
             when: `editorFocus && ${InlineHintWidgetIsVisible.raw} && ${InlineChatIsVisible.not}`,

package/src/browser/components/ChatMarkdown.tsx

@@ -1,5 +1,5 @@
 import cls from 'classnames';
-import React, { useEffect, useRef, useState } from 'react';
+import React, { ReactNode, useEffect, useRef, useState } from 'react';
 
 import { MarkdownReactParser, MarkdownReactRenderer } from '@opensumi/ide-components/lib/markdown-react';
 import { IMarkedOptions, marked } from '@opensumi/ide-components/lib/utils';

package/src/browser/components/WelcomeMsg.tsx

@@ -14,7 +14,7 @@ import {
 import { isMarkdownString } from '@opensumi/monaco-editor-core/esm/vs/base/common/htmlContent';
 
 import 'react-chat-elements/dist/main.css';
-import { IChatAgentService, ISampleQuestions } from '../../common';
+import { IChatAgentService, IChatReplyFollowup, ISampleQuestions } from '../../common';
 import { ChatService } from '../chat/chat.api.service';
 import { ChatFeatureRegistry } from '../chat/chat.feature.registry';
 import { ChatRenderRegistry } from '../chat/chat.render.registry';

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

@@ -1,15 +1,9 @@
 import { Disposable, ECodeEditsSourceTyping } from '@opensumi/ide-core-common';
-import { IModelContentChangedEvent, IPosition, IRange, InlineCompletion } from '@opensumi/ide-monaco';
+import { IPosition, IRange, InlineCompletion } from '@opensumi/ide-monaco';
 
 import type { ILineChangeData } from './source/line-change.source';
 import type { ILinterErrorData } from './source/lint-error.source';
 
-/**
- * 有效弃用时间（毫秒）
- * 在可见的情况下超过 750ms 弃用才算有效数据，否则视为无效数据
- */
-export const VALID_TIME = 750;
-
 export interface IIntelligentCompletionsResult<T = any> {
   readonly items: InlineCompletion[];
   /**
@@ -18,15 +12,9 @@ export interface IIntelligentCompletionsResult<T = any> {
   extra?: T;
 }
 
-export interface ICodeEditsContextBean {
-  typing: ECodeEditsSourceTyping;
-  position: IPosition;
-  data: {
-    [ECodeEditsSourceTyping.LinterErrors]?: ILinterErrorData;
-    [ECodeEditsSourceTyping.LineChange]?: ILineChangeData;
-    [ECodeEditsSourceTyping.Typing]?: IModelContentChangedEvent;
-  };
-}
+export type ICodeEditsContextBean =
+  | { typing: ECodeEditsSourceTyping.LinterErrors; position: IPosition; data: ILinterErrorData }
+  | { typing: ECodeEditsSourceTyping.LineChange; position: IPosition; data: ILineChangeData };
 
 export interface ICodeEdit {
   /**

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,17 +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',
-    });
   }
 }

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,
@@ -19,16 +13,10 @@ import {
 import { Emitter, ICodeEditor, ICursorPositionChangedEvent, IRange, ITextModel, Range } from '@opensumi/ide-monaco';
 import {
   IObservable,
-  IObservableSignal,
   ISettableObservable,
-  ITransaction,
   autorun,
   autorunWithStoreHandleChanges,
   derived,
-  derivedHandleChanges,
-  derivedOpts,
-  observableFromEvent,
-  observableSignal,
   observableValue,
   transaction,
 } from '@opensumi/ide-monaco/lib/common/observable';
@@ -59,9 +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 { 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';
@@ -96,32 +83,22 @@ export class IntelligentCompletionsController extends BaseAIMonacoEditorControll
   private codeEditsSourceCollection: CodeEditsSourceCollection;
   private aiNativeContextKey: AINativeContextKey;
   private rewriteWidget: RewriteWidget | null;
-  private codeEditsTriggerSignal: IObservableSignal<void>;
-  private multiLineEditsIsVisibleObs: IObservable<boolean>;
+  private whenMultiLineEditsVisibleDisposable: Disposable;
 
   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);
     this.additionsDeletionsDecorationModel = new AdditionsDeletionsDecorationModel(this.monacoEditor);
     this.aiNativeContextKey = this.injector.get(AINativeContextKey, [this.monacoEditor.contextKeyService]);
     this.codeEditsSourceCollection = this.injector.get(CodeEditsSourceCollection, [
-      [LintErrorCodeEditsSource, LineChangeCodeEditsSource, TypingCodeEditsSource],
+      [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;
   }
@@ -276,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(
@@ -338,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);
+
+    // 在可见的情况下超过 750ms 弃用才算有效数据，否则视为取消
+    if (lastVisibleTime && Date.now() - lastVisibleTime > 750) {
+      report?.('isDrop');
+    } else {
+      report?.('isValid');
+    }
 
-      this.hide();
-      return isValid;
-    },
-  );
+    this.hide();
+  });
 
-  public accept = derivedOpts({ owner: this, equalsFn: () => false }, (reader) => {
+  public accept = derived(this, (reader) => {
     const report = this.reportData.read(reader);
     report?.('isReceive');
 
@@ -411,10 +392,6 @@ 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>(
@@ -426,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();
           }
         }
       }),
@@ -459,19 +431,16 @@ export class IntelligentCompletionsController extends BaseAIMonacoEditorControll
       autorunWithStoreHandleChanges(
         {
           createEmptyChangeSummary: () => ({}),
-          handleChange: (context) => {
+          handleChange: (context, changeSummary) => {
             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/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();
   }
@@ -80,6 +69,8 @@ export abstract class BaseCodeEditsSource extends Disposable {
   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) => {
@@ -177,23 +168,11 @@ 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) => {