@opensumi/ide-ai-native 3.7.1-next-1739439717.0 → 3.7.1-next-1739521933.0

package/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}`,

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

@@ -12,10 +12,15 @@ export interface IIntelligentCompletionsResult<T = any> {
   extra?: T;
 }
 
-export type ICodeEditsContextBean =
-  | { typing: ECodeEditsSourceTyping.LinterErrors; position: IPosition; data: ILinterErrorData }
-  | { typing: ECodeEditsSourceTyping.LineChange; position: IPosition; data: ILineChangeData }
-  | { typing: ECodeEditsSourceTyping.Typing; position: IPosition; data: IModelContentChangedEvent };
+export interface ICodeEditsContextBean {
+  typing: ECodeEditsSourceTyping;
+  position: IPosition;
+  data: {
+    [ECodeEditsSourceTyping.LinterErrors]?: ILinterErrorData;
+    [ECodeEditsSourceTyping.LineChange]?: ILineChangeData;
+    [ECodeEditsSourceTyping.Typing]?: IModelContentChangedEvent;
+  };
+}
 
 export interface ICodeEdit {
   /**

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

@@ -1,19 +1,18 @@
 import { Autowired } from '@opensumi/di';
 import {
+  AINativeConfigService,
   ClientAppContribution,
   Key,
   KeybindingContribution,
   KeybindingRegistry,
   KeybindingScope,
 } from '@opensumi/ide-core-browser';
-import {
-  AI_MULTI_LINE_COMPLETION_ACCEPT,
-  AI_MULTI_LINE_COMPLETION_DISCARD,
-} from '@opensumi/ide-core-browser/lib/ai-native/command';
+import { AI_CODE_EDITS_COMMANDS } 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';
 
@@ -22,8 +21,11 @@ export class IntelligentCompletionsContribution implements KeybindingContributio
   @Autowired(WorkbenchEditorService)
   private readonly workbenchEditorService: WorkbenchEditorServiceImpl;
 
+  @Autowired(AINativeConfigService)
+  private readonly aiNativeConfigService: AINativeConfigService;
+
   registerCommands(commands: CommandRegistry): void {
-    commands.registerCommand(AI_MULTI_LINE_COMPLETION_DISCARD, {
+    commands.registerCommand(AI_CODE_EDITS_COMMANDS.DISCARD, {
       execute: () => {
         const editor = this.workbenchEditorService.currentCodeEditor;
         if (editor) {
@@ -32,7 +34,7 @@ export class IntelligentCompletionsContribution implements KeybindingContributio
       },
     });
 
-    commands.registerCommand(AI_MULTI_LINE_COMPLETION_ACCEPT, {
+    commands.registerCommand(AI_CODE_EDITS_COMMANDS.ACCEPT, {
       execute: () => {
         const editor = this.workbenchEditorService.currentCodeEditor;
         if (editor) {
@@ -40,11 +42,24 @@ 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_MULTI_LINE_COMPLETION_DISCARD.id,
+      command: AI_CODE_EDITS_COMMANDS.DISCARD.id,
       keybinding: Key.ESCAPE.code,
       when: MultiLineEditsIsVisible.raw,
       priority: 100,
@@ -52,11 +67,17 @@ export class IntelligentCompletionsContribution implements KeybindingContributio
 
     keybindings.registerKeybinding(
       {
-        command: AI_MULTI_LINE_COMPLETION_ACCEPT.id,
+        command: AI_CODE_EDITS_COMMANDS.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

@@ -13,10 +13,13 @@ import {
 import { Emitter, ICodeEditor, ICursorPositionChangedEvent, IRange, ITextModel, Range } from '@opensumi/ide-monaco';
 import {
   IObservable,
+  IObservableSignal,
   ISettableObservable,
+  ITransaction,
   autorun,
   autorunWithStoreHandleChanges,
   derived,
+  observableSignal,
   observableValue,
   transaction,
 } from '@opensumi/ide-monaco/lib/common/observable';
@@ -85,11 +88,13 @@ export class IntelligentCompletionsController extends BaseAIMonacoEditorControll
   private aiNativeContextKey: AINativeContextKey;
   private rewriteWidget: RewriteWidget | null;
   private whenMultiLineEditsVisibleDisposable: Disposable;
+  private codeEditsTriggerSignal: IObservableSignal<void>;
 
   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);
@@ -393,6 +398,10 @@ 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>(
@@ -432,16 +441,19 @@ export class IntelligentCompletionsController extends BaseAIMonacoEditorControll
       autorunWithStoreHandleChanges(
         {
           createEmptyChangeSummary: () => ({}),
-          handleChange: (context, changeSummary) => {
+          handleChange: (context) => {
             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,7 +7,6 @@ import {
   Disposable,
   IAIReporter,
   IDisposable,
-  MaybePromise,
   uuid,
 } from '@opensumi/ide-core-common';
 import { CancellationTokenSource, ICodeEditor } from '@opensumi/ide-monaco';
@@ -37,14 +36,26 @@ 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();
   }
@@ -69,8 +80,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;
@@ -100,9 +109,9 @@ export abstract class BaseCodeEditsSource extends Disposable {
     });
   }
 
-  protected setBean(bean: ICodeEditsContextBean) {
+  protected setBean(bean: Omit<ICodeEditsContextBean, 'position'>) {
     transaction((tx) => {
-      const context = new CodeEditsContextBean(bean, this);
+      const context = new CodeEditsContextBean({ ...bean, position: this.monacoEditor.getPosition()! }, this);
       this.codeEditsContextBean.set(context, tx);
     });
   }
@@ -112,7 +121,7 @@ export abstract class BaseCodeEditsSource extends Disposable {
     if (context) {
       const relationID = this.aiReporter.start(AIServiceType.CodeEdits, {
         type: AIServiceType.CodeEdits,
-        actionSource: context?.bean.typing,
+        actionSource: context?.typing,
       });
 
       transaction((tx) => {
@@ -168,11 +177,23 @@ export class CodeEditsSourceCollection extends Disposable {
 
           for (const source of lastSources) {
             const value = source.codeEditsContextBean.get();
+            if (!value) {
+              return;
+            }
+
+            if (!contextBean) {
+              contextBean = value;
+            }
 
-            if (value && value.priority >= highestPriority) {
+            if (value.priority >= highestPriority) {
               highestPriority = value.priority;
+
+              value.joinData(contextBean.data);
               contextBean = value;
             }
+
+            // 将多个 source 的 data 合并到一起
+            contextBean.joinData(value.data);
           }
 
           transaction((tx) => {

package/src/browser/contrib/intelligent-completions/source/line-change.source.ts

@@ -1,6 +1,7 @@
 import { Injectable } from '@opensumi/di';
 import { AINativeSettingSectionsId, ECodeEditsSourceTyping, IDisposable } from '@opensumi/ide-core-common';
-import { ICursorPositionChangedEvent, Position } from '@opensumi/ide-monaco';
+import { ICursorPositionChangedEvent } from '@opensumi/ide-monaco';
+import { autorunDelta, observableFromEvent } from '@opensumi/ide-monaco/lib/common/observable';
 
 import { BaseCodeEditsSource } from './base';
 
@@ -11,37 +12,41 @@ export interface ILineChangeData {
 
 @Injectable({ multiple: true })
 export class LineChangeCodeEditsSource extends BaseCodeEditsSource {
-  public priority = 2;
-
-  private prePosition = this.monacoEditor.getPosition();
+  public priority = 1;
 
   public mount(): IDisposable {
+    const positionChangeObs = observableFromEvent<ICursorPositionChangedEvent>(
+      this,
+      this.monacoEditor.onDidChangeCursorPosition,
+      (event: ICursorPositionChangedEvent) => event,
+    );
+
     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;
+      autorunDelta(positionChangeObs, ({ lastValue, newValue }) => {
+        const isLineChangeEnabled = this.preferenceService.getValid(
+          AINativeSettingSectionsId.CodeEditsLineChange,
+          false,
+        );
+        if (!isLineChangeEnabled) {
+          return false;
+        }
+
+        const prePosition = lastValue?.position;
+        const currentPosition = newValue?.position;
+        if (prePosition && prePosition.lineNumber !== currentPosition?.lineNumber) {
+          this.setBean({
+            typing: ECodeEditsSourceTyping.LineChange,
+            data: {
+              [ECodeEditsSourceTyping.LineChange]: {
+                preLineNumber: prePosition.lineNumber,
+                currentLineNumber: currentPosition.lineNumber,
+              },
+            },
+          });
         }
       }),
     );
-    return this;
-  }
-
-  protected doTrigger(position: Position) {
-    const isLineChangeEnabled = this.preferenceService.getValid(AINativeSettingSectionsId.CodeEditsLineChange, false);
 
-    if (!isLineChangeEnabled || !position) {
-      return;
-    }
-
-    this.setBean({
-      typing: ECodeEditsSourceTyping.LineChange,
-      position,
-      data: {
-        preLineNumber: this.prePosition?.lineNumber,
-        currentLineNumber: position.lineNumber,
-      },
-    });
+    return this;
   }
 }

package/src/browser/contrib/intelligent-completions/source/lint-error.source.ts

@@ -1,14 +1,8 @@
-import { Autowired, Injectable } from '@opensumi/di';
-import {
-  AINativeSettingSectionsId,
-  ECodeEditsSourceTyping,
-  Event,
-  FRAME_THREE,
-  IDisposable,
-} from '@opensumi/ide-core-common';
+import { Injectable } from '@opensumi/di';
+import { AINativeSettingSectionsId, ECodeEditsSourceTyping, IDisposable } from '@opensumi/ide-core-common';
 import { ICursorPositionChangedEvent, IPosition, Position } from '@opensumi/ide-monaco';
 import { URI } from '@opensumi/ide-monaco/lib/browser/monaco-api';
-import { IWorkspaceService } from '@opensumi/ide-workspace';
+import { autorunDelta, observableFromEvent } from '@opensumi/ide-monaco/lib/common/observable';
 import { StandaloneServices } from '@opensumi/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
 import {
   IMarker,
@@ -20,7 +14,6 @@ import {
 import { BaseCodeEditsSource } from './base';
 
 export interface ILinterErrorData {
-  relativeWorkspacePath: string;
   errors: Array<IMarkerErrorData>;
 }
 
@@ -58,22 +51,19 @@ namespace MarkerErrorData {
 
 @Injectable({ multiple: true })
 export class LintErrorCodeEditsSource extends BaseCodeEditsSource {
-  public priority = 1;
-
-  @Autowired(IWorkspaceService)
-  private readonly workspaceService: IWorkspaceService;
+  public priority = 0;
 
   public mount(): IDisposable {
-    let prePosition = this.monacoEditor.getPosition();
+    const positionChangeObs = observableFromEvent<ICursorPositionChangedEvent>(
+      this,
+      this.monacoEditor.onDidChangeCursorPosition,
+      (event: ICursorPositionChangedEvent) => event,
+    );
 
     this.addDispose(
-      // 仅在光标的行号发生变化时，才触发
-      Event.debounce(
-        this.monacoEditor.onDidChangeCursorPosition,
-        (_, e) => e,
-        FRAME_THREE,
-      )(async (event: ICursorPositionChangedEvent) => {
-        const currentPosition = event.position;
+      autorunDelta(positionChangeObs, ({ lastValue, newValue }) => {
+        const prePosition = lastValue?.position;
+        const currentPosition = newValue?.position;
 
         // 如果是 selection 则不触发
         const selection = this.monacoEditor.getSelection();
@@ -81,16 +71,16 @@ export class LintErrorCodeEditsSource extends BaseCodeEditsSource {
           return;
         }
 
-        if (prePosition && prePosition.lineNumber !== currentPosition.lineNumber) {
-          await this.doTrigger(currentPosition);
+        // 仅在光标的行号发生变化时，才触发
+        if (prePosition && prePosition.lineNumber !== currentPosition?.lineNumber) {
+          this.doTrigger(currentPosition);
         }
-        prePosition = currentPosition;
       }),
     );
     return this;
   }
 
-  protected async doTrigger(position: Position) {
+  protected doTrigger(position: Position) {
     const isLintErrorsEnabled = this.preferenceService.getValid(AINativeSettingSectionsId.CodeEditsLintErrors, false);
 
     if (!isLintErrorsEnabled || !this.model) {
@@ -104,14 +94,12 @@ export class LintErrorCodeEditsSource extends BaseCodeEditsSource {
     markers = markers.filter((marker) => Math.abs(marker.startLineNumber - position.lineNumber) <= 1);
 
     if (markers.length) {
-      const relativeWorkspacePath = await this.workspaceService.asRelativePath(resource.path);
-
       this.setBean({
         typing: ECodeEditsSourceTyping.LinterErrors,
-        position,
         data: {
-          relativeWorkspacePath: relativeWorkspacePath?.path ?? resource.path,
-          errors: markers.map((marker) => MarkerErrorData.toData(marker)),
+          [ECodeEditsSourceTyping.LinterErrors]: {
+            errors: markers.map((marker) => MarkerErrorData.toData(marker)),
+          },
         },
       });
     }

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

@@ -1,26 +1,23 @@
 import { Injectable } from '@opensumi/di';
 import { AINativeSettingSectionsId, ECodeEditsSourceTyping, IDisposable } from '@opensumi/ide-core-common';
-import { IModelContentChangedEvent, Position } from '@opensumi/ide-monaco';
+import { IModelContentChangedEvent } from '@opensumi/ide-monaco';
 
 import { BaseCodeEditsSource } from './base';
 
 @Injectable({ multiple: true })
 export class TypingCodeEditsSource extends BaseCodeEditsSource {
-  public priority = 0;
+  public priority = 2;
 
   public mount(): IDisposable {
     this.addDispose(
       this.monacoEditor.onDidChangeModelContent((event: IModelContentChangedEvent) => {
-        const position = this.monacoEditor.getPosition();
-        if (position) {
-          this.doTrigger(position, event);
-        }
+        this.doTrigger(event);
       }),
     );
     return this;
   }
 
-  protected async doTrigger(position: Position, data: IModelContentChangedEvent) {
+  protected async doTrigger(data: IModelContentChangedEvent) {
     const isTypingEnabled = this.preferenceService.getValid(AINativeSettingSectionsId.CodeEditsTyping, false);
 
     if (!isTypingEnabled || !this.model) {
@@ -29,8 +26,9 @@ export class TypingCodeEditsSource extends BaseCodeEditsSource {
 
     this.setBean({
       typing: ECodeEditsSourceTyping.Typing,
-      position,
-      data,
+      data: {
+        [ECodeEditsSourceTyping.Typing]: data,
+      },
     });
   }
 }

package/src/browser/contrib/terminal/component/terminal-command-suggest-controller.tsx

@@ -1,4 +1,4 @@
-import { debounce } from 'lodash';
+import debounce from 'lodash/debounce';
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 
 import { Emitter, localize } from '@opensumi/ide-core-browser';

package/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,

package/src/browser/layout/ai-layout.tsx

@@ -10,11 +10,14 @@ export const AILayout = () => {
   const { layout } = getStorageValue();
   const designLayoutConfig = useInjectable(DesignLayoutConfig);
 
-  const defaultRightSize = useMemo(() => designLayoutConfig.useMergeRightWithLeftPanel ? 0 : 49, [designLayoutConfig.useMergeRightWithLeftPanel]);
+  const defaultRightSize = useMemo(
+    () => (designLayoutConfig.useMergeRightWithLeftPanel ? 0 : 49),
+    [designLayoutConfig.useMergeRightWithLeftPanel],
+  );
 
   return (
     <BoxPanel direction='top-to-bottom'>
-      <SlotRenderer id='top' defaultSize={layout.top?.currentId ? layout.top?.size || 35 : 0} slot='top' />
+      <SlotRenderer id='top' defaultSize={layout.top?.currentId ? layout.top?.size || 32 : 32} slot='top' />
       <SplitPanel
         id='main-horizontal-ai'
         flex={1}