Merge branch 'main' into feat/move-terminal

Author: Marckon

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/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/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();
@@ -224,9 +227,21 @@ export class InlineChatEditorController extends BaseAIMonacoEditorController {
       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);
@@ -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) {