Merge branch 'main' into jl.tt

Author: Ricbet

.github/workflows/e2e.yml

@@ -59,7 +59,7 @@ jobs:
 
       - name: Upload test results
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: playwright-report
           path: tools/playwright/test-results

packages/ai-native/src/browser/ai-core.contextkeys.ts

@@ -5,6 +5,7 @@ import {
   InlineCompletionIsTrigger,
   InlineDiffPartialEditsIsVisible,
   InlineHintWidgetIsVisible,
+  InlineInputWidgetIsStreaming,
   InlineInputWidgetIsVisible,
   MultiLineEditsIsVisible,
 } from '@opensumi/ide-core-browser/lib/contextkey/ai-native';
@@ -22,6 +23,7 @@ export class AINativeContextKey {
   public readonly inlineCompletionIsTrigger: IContextKey<boolean>;
   public readonly inlineHintWidgetIsVisible: IContextKey<boolean>;
   public readonly inlineInputWidgetIsVisible: IContextKey<boolean>;
+  public readonly inlineInputWidgetIsStreaming: IContextKey<boolean>;
   public readonly inlineDiffPartialEditsIsVisible: IContextKey<boolean>;
   public readonly multiLineEditsIsVisible: IContextKey<boolean>;
   public get contextKeyService() {
@@ -34,6 +36,7 @@ export class AINativeContextKey {
     this.inlineCompletionIsTrigger = InlineCompletionIsTrigger.bind(this._contextKeyService);
     this.inlineHintWidgetIsVisible = InlineHintWidgetIsVisible.bind(this._contextKeyService);
     this.inlineInputWidgetIsVisible = InlineInputWidgetIsVisible.bind(this._contextKeyService);
+    this.inlineInputWidgetIsStreaming = InlineInputWidgetIsStreaming.bind(this._contextKeyService);
     this.inlineDiffPartialEditsIsVisible = InlineDiffPartialEditsIsVisible.bind(this._contextKeyService);
     this.multiLineEditsIsVisible = MultiLineEditsIsVisible.bind(this._contextKeyService);
   }

packages/ai-native/src/browser/ai-core.contribution.ts

@@ -27,6 +27,7 @@ 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,
@@ -37,6 +38,7 @@ 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';
@@ -56,8 +58,9 @@ import {
   runWhenIdle,
 } from '@opensumi/ide-core-common';
 import { DESIGN_MENU_BAR_RIGHT } from '@opensumi/ide-design';
-import { IEditor } from '@opensumi/ide-editor';
+import { IEditor, WorkbenchEditorService } 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';
@@ -101,11 +104,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 { AIInlineChatService } from './widget/inline-chat/inline-chat.service';
+import { InlineChatService } 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 { InlineInputChatService } from './widget/inline-input/inline-input.service';
+import { InlineInputService } from './widget/inline-input/inline-input.service';
 import { InlineStreamDiffService } from './widget/inline-stream-diff/inline-stream-diff.service';
 import { SumiLightBulbWidget } from './widget/light-bulb';
 
@@ -191,10 +194,10 @@ export class AINativeBrowserContribution
   private readonly chatProxyService: ChatProxyService;
 
   @Autowired(IAIInlineChatService)
-  private readonly aiInlineChatService: AIInlineChatService;
+  private readonly aiInlineChatService: InlineChatService;
 
-  @Autowired(InlineInputChatService)
-  private readonly inlineInputChatService: InlineInputChatService;
+  @Autowired(InlineInputService)
+  private readonly inlineInputService: InlineInputService;
 
   @Autowired(InlineStreamDiffService)
   private readonly inlineStreamDiffService: InlineStreamDiffService;
@@ -205,6 +208,9 @@ export class AINativeBrowserContribution
   @Autowired(CodeActionSingleHandler)
   private readonly codeActionSingleHandler: CodeActionSingleHandler;
 
+  @Autowired(WorkbenchEditorService)
+  private readonly workbenchEditorService: WorkbenchEditorServiceImpl;
+
   constructor() {
     this.registerFeature();
   }
@@ -237,7 +243,7 @@ export class AINativeBrowserContribution
         EditorContributionInstantiation.BeforeFirstInteraction,
       );
 
-      if (this.inlineChatFeatureRegistry.getInteractiveInputHandler()) {
+      if (this.inlineInputService.getInteractiveInputHandler()) {
         register(
           InlineHintController.ID,
           new SyncDescriptor(InlineHintController, [this.injector]),
@@ -418,14 +424,48 @@ export class AINativeBrowserContribution
     });
 
     commands.registerCommand(AI_INLINE_CHAT_INTERACTIVE_INPUT_VISIBLE, {
-      execute: (isVisible: boolean) => {
-        if (isVisible) {
-          this.inlineInputChatService.visible();
-        } else {
-          this.inlineInputChatService.hide();
+      execute: async (isVisible: boolean) => {
+        if (!isVisible) {
+          this.inlineInputService.hide();
+          return;
+        }
+
+        // 每次在展示 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;
         }
 
-        this.aiInlineChatService._onInteractiveInputVisible.fire(isVisible);
+        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();
+        }
       },
     });
 
@@ -516,12 +556,12 @@ export class AINativeBrowserContribution
         when: `editorFocus && ${InlineChatIsVisible.raw}`,
       });
 
-      if (this.inlineChatFeatureRegistry.getInteractiveInputHandler()) {
+      if (this.inlineInputService.getInteractiveInputHandler()) {
         // 当 Inline Chat （浮动组件）展示时，通过 CMD K 唤起 Inline Input
         keybindings.registerKeybinding(
           {
             command: AI_INLINE_CHAT_INTERACTIVE_INPUT_VISIBLE.id,
-            keybinding: 'ctrlcmd+k',
+            keybinding: this.aiNativeConfigService.inlineChat.inputKeybinding,
             args: true,
             priority: 0,
             when: `editorFocus && (${InlineChatIsVisible.raw} || inlineSuggestionVisible)`,
@@ -536,11 +576,18 @@ 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: 'ctrlcmd+k',
+            keybinding: this.aiNativeConfigService.inlineChat.inputKeybinding,
             args: true,
             priority: 0,
             when: `editorFocus && ${InlineHintWidgetIsVisible.raw} && ${InlineChatIsVisible.not}`,

packages/ai-native/src/browser/contrib/intelligent-completions/source/base.ts

@@ -69,8 +69,6 @@ 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;

packages/ai-native/src/browser/contrib/intelligent-completions/source/line-change.source.ts

@@ -1,47 +1,102 @@
 import { Injectable } from '@opensumi/di';
 import { AINativeSettingSectionsId, ECodeEditsSourceTyping, IDisposable } from '@opensumi/ide-core-common';
-import { ICursorPositionChangedEvent, Position } from '@opensumi/ide-monaco';
+import { ICursorPositionChangedEvent, IModelContentChangedEvent } from '@opensumi/ide-monaco';
+import {
+  autorunDelta,
+  derivedHandleChanges,
+  observableFromEvent,
+  recomputeInitiallyAndOnChange,
+} from '@opensumi/ide-monaco/lib/common/observable';
 
 import { BaseCodeEditsSource } from './base';
 
 export interface ILineChangeData {
   currentLineNumber: number;
   preLineNumber?: number;
+  change?: IModelContentChangedEvent;
 }
 
 @Injectable({ multiple: true })
 export class LineChangeCodeEditsSource extends BaseCodeEditsSource {
   public priority = 2;
 
-  private prePosition = this.monacoEditor.getPosition();
-
   public mount(): IDisposable {
+    const modelContentChangeObs = observableFromEvent<IModelContentChangedEvent>(
+      this,
+      this.monacoEditor.onDidChangeModelContent,
+      (event: IModelContentChangedEvent) => event,
+    );
+    const positionChangeObs = observableFromEvent<ICursorPositionChangedEvent>(
+      this,
+      this.monacoEditor.onDidChangeCursorPosition,
+      (event: ICursorPositionChangedEvent) => event,
+    );
+
+    const latestModelContentChangeObs = derivedHandleChanges(
+      {
+        owner: this,
+        createEmptyChangeSummary: () => ({ change: undefined }),
+        handleChange: (ctx, changeSummary: { change: IModelContentChangedEvent | undefined }) => {
+          // 如果只是改了光标则设置 change 为空，避免获取到缓存的 change
+          if (ctx.didChange(positionChangeObs)) {
+            changeSummary.change = undefined;
+          } else {
+            changeSummary.change = modelContentChangeObs.get();
+          }
+          return true;
+        },
+      },
+      (reader, changeSummary) => {
+        positionChangeObs.read(reader);
+        modelContentChangeObs.read(reader);
+        return changeSummary.change;
+      },
+    );
+
+    this.addDispose(recomputeInitiallyAndOnChange(latestModelContentChangeObs));
+
+    let lastModelContent: IModelContentChangedEvent | undefined;
     this.addDispose(
-      this.monacoEditor.onDidChangeCursorPosition((event: ICursorPositionChangedEvent) => {
-        const currentPosition = event.position;
-        if (this.prePosition && this.prePosition.lineNumber !== currentPosition.lineNumber) {
-          this.doTrigger(currentPosition);
-          this.prePosition = currentPosition;
-        }
+      /**
+       * 由于 monaco 的 changeModelContent 事件比 changeCursorPosition 事件先触发，所以这里需要拿上一次的值进行消费
+       * 否则永远返回 undefined
+       */
+      autorunDelta(latestModelContentChangeObs, ({ lastValue }) => {
+        lastModelContent = lastValue;
       }),
     );
-    return this;
-  }
 
-  protected doTrigger(position: Position) {
-    const isLineChangeEnabled = this.preferenceService.getValid(AINativeSettingSectionsId.CodeEditsLineChange, false);
+    this.addDispose(
+      autorunDelta(positionChangeObs, ({ lastValue, newValue }) => {
+        const contentChange = lastModelContent;
 
-    if (!isLineChangeEnabled || !position) {
-      return;
-    }
+        const isLineChangeEnabled = this.preferenceService.getValid(
+          AINativeSettingSectionsId.CodeEditsLineChange,
+          false,
+        );
+        if (!isLineChangeEnabled) {
+          return false;
+        }
 
-    this.setBean({
-      typing: ECodeEditsSourceTyping.LineChange,
-      position,
-      data: {
-        preLineNumber: this.prePosition?.lineNumber,
-        currentLineNumber: position.lineNumber,
-      },
-    });
+        const prePosition = lastValue?.position;
+        const currentPosition = newValue?.position;
+        if (prePosition && prePosition.lineNumber !== currentPosition?.lineNumber) {
+          this.setBean({
+            typing: ECodeEditsSourceTyping.LineChange,
+            position: currentPosition,
+            data: {
+              preLineNumber: prePosition.lineNumber,
+              currentLineNumber: currentPosition.lineNumber,
+              change: contentChange,
+            },
+          });
+        }
+
+        // 消费完之后设置为 undefined，避免下次获取到缓存的值
+        lastModelContent = undefined;
+      }),
+    );
+
+    return this;
   }
 }

packages/ai-native/src/browser/index.ts

@@ -46,7 +46,7 @@ import { LanguageParserService } from './languages/service';
 import { AINativePreferencesContribution } from './preferences';
 import { AINativeCoreContribution } from './types';
 import { InlineChatFeatureRegistry } from './widget/inline-chat/inline-chat.feature.registry';
-import { AIInlineChatService } from './widget/inline-chat/inline-chat.service';
+import { InlineChatService } from './widget/inline-chat/inline-chat.service';
 import { InlineDiffService } from './widget/inline-diff';
 
 @Injectable()
@@ -90,7 +90,7 @@ export class AINativeModule extends BrowserModule {
     },
     {
       token: IAIInlineChatService,
-      useClass: AIInlineChatService,
+      useClass: InlineChatService,
     },
     {
       token: IChatManagerService,

packages/ai-native/src/browser/types.ts

@@ -13,7 +13,7 @@ import {
   MaybePromise,
   MergeConflictEditorMode,
 } from '@opensumi/ide-core-common';
-import { ICodeEditor, IRange, ITextModel, NewSymbolNamesProvider, Position } from '@opensumi/ide-monaco';
+import { ICodeEditor, IRange, ISelection, ITextModel, 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';
 
@@ -44,7 +44,7 @@ interface IBaseInlineChatHandler<T extends any[]> {
 
 export type IEditorInlineChatHandler = IBaseInlineChatHandler<[editor: ICodeEditor, token: CancellationToken]>;
 export type IInteractiveInputHandler = IBaseInlineChatHandler<
-  [editor: ICodeEditor, value: string, token: CancellationToken]
+  [editor: ICodeEditor, selection: ISelection, value: string, token: CancellationToken]
 >;
 
 export enum ERunStrategy {