@opensumi/ide-ai-native 3.1.2-next-1718960862.0 → 3.1.2

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

@@ -1,18 +1,14 @@
 import { Autowired, Injectable } from '@opensumi/di';
 import { AINativeConfigService } from '@opensumi/ide-core-browser';
 import { IBrowserCtxMenu } from '@opensumi/ide-core-browser/lib/menu/next/renderer/ctxmenu/browser';
-import { Disposable, Event, IDisposable, InlineChatFeatureRegistryToken, Schemes } from '@opensumi/ide-core-common';
+import { Disposable, Event, IDisposable, Schemes } from '@opensumi/ide-core-common';
 import { DesignBrowserCtxMenuService } from '@opensumi/ide-design/lib/browser/override/menu.service';
-import { EditorCollectionService, IEditorDocumentModelRef } from '@opensumi/ide-editor';
 import { IEditor, IEditorFeatureContribution } from '@opensumi/ide-editor/lib/browser';
-import { BrowserCodeEditor, BrowserDiffEditor } from '@opensumi/ide-editor/lib/browser/editor-collection.service';
+import { BrowserCodeEditor } from '@opensumi/ide-editor/lib/browser/editor-collection.service';
 
 import { CodeActionHandler } from './contrib/code-action/code-action.handler';
 import { InlineCompletionHandler } from './contrib/inline-completions/inline-completions.handler';
-import { InlineChatFeatureRegistry } from './widget/inline-chat/inline-chat.feature.registry';
 import { InlineChatHandler } from './widget/inline-chat/inline-chat.handler';
-import { InlineHintHandler } from './widget/inline-hint/inline-hint.handler';
-import { InlineInputHandler } from './widget/inline-input/inline-input.handler';
 
 @Injectable()
 export class AIEditorContribution extends Disposable implements IEditorFeatureContribution {
@@ -25,135 +21,64 @@ export class AIEditorContribution extends Disposable implements IEditorFeatureCo
   @Autowired(InlineChatHandler)
   private readonly inlineChatHandler: InlineChatHandler;
 
-  @Autowired(InlineHintHandler)
-  private readonly inlineHintHandler: InlineHintHandler;
-
-  @Autowired(InlineInputHandler)
-  private readonly inlineInputHandler: InlineInputHandler;
-
   @Autowired(CodeActionHandler)
   private readonly codeActionHandler: CodeActionHandler;
 
   @Autowired(InlineCompletionHandler)
   private readonly inlineCompletionHandler: InlineCompletionHandler;
 
-  @Autowired(EditorCollectionService)
-  private readonly editorCollectionService: EditorCollectionService;
-
-  @Autowired(InlineChatFeatureRegistryToken)
-  private readonly inlineChatFeatureRegistry: InlineChatFeatureRegistry;
-
   private modelSessionDisposable: Disposable;
-  private editorReady: boolean = false;
-  private diffEditorReady: boolean = false;
+  private initialized: boolean = false;
 
   dispose(): void {
     super.dispose();
-    this.editorReady = false;
+    this.initialized = false;
     if (this.modelSessionDisposable) {
       this.modelSessionDisposable.dispose();
     }
   }
 
   contribute(editor: IEditor): IDisposable {
-    if (this.editorReady) {
+    if (!(editor instanceof BrowserCodeEditor) || this.initialized) {
       return this;
     }
-    this.handleDiffEditorCreated();
-    if (editor instanceof BrowserCodeEditor) {
-      this.disposables.push(
-        editor.onRefOpen((e) => {
-          this.disposables.push(...this.handleBrowserEditor(editor, e));
-        }),
-      );
-    }
-    return this;
-  }
-
-  private handleDiffEditorCreated() {
-    Event.once(this.editorCollectionService.onDiffEditorCreate)((editor) => {
-      this.disposables.push(
-        editor.onRefOpen((e) => {
-          this.disposables.push(...this.handleDiffEditor(editor as any, e));
-        }),
-      );
-    });
-  }
-
-  private handleBrowserEditor(editor: BrowserCodeEditor, e: IEditorDocumentModelRef): IDisposable[] {
-    const disposables: IDisposable[] = [];
-    const { monacoEditor } = editor;
-
-    const { uri } = e.instance;
-    if (uri.codeUri.scheme !== Schemes.file || this.editorReady) {
-      return disposables;
-    }
 
-    this.editorReady = true;
+    this.disposables.push(
+      editor.onRefOpen((e) => {
+        const { uri } = e.instance;
+        if (uri.codeUri.scheme !== Schemes.file || this.initialized) {
+          return;
+        }
 
-    disposables.push(
-      Event.debounce(
-        monacoEditor.onWillChangeModel,
-        (_, e) => e,
-        150,
-      )(() => {
+        this.initialized = true;
+
+        this.addDispose(
+          Event.debounce(
+            monacoEditor.onWillChangeModel,
+            (_, e) => e,
+            150,
+          )(() => {
+            this.mount(editor);
+          }),
+        );
         this.mount(editor);
+
+        this.addDispose(this.inlineCompletionHandler.registerInlineCompletionFeature(editor));
+        this.addDispose(this.inlineChatHandler.registerInlineChatFeature(editor));
       }),
     );
-    this.mount(editor);
 
-    disposables.push(...this.registerFeatures(editor));
-    disposables.push(
+    const { monacoEditor } = editor;
+
+    this.disposables.push(
       monacoEditor.onDidScrollChange(() => {
         if (this.ctxMenuRenderer.visible) {
           this.ctxMenuRenderer.hide(true);
         }
       }),
     );
-    return disposables;
-  }
-
-  private handleDiffEditor(editor: BrowserDiffEditor, e: IEditorDocumentModelRef): IDisposable[] {
-    const disposables: IDisposable[] = [];
-    const { monacoDiffEditor } = editor;
-
-    const { uri } = e.instance;
-    if (uri.codeUri.scheme !== Schemes.file || this.diffEditorReady) {
-      return disposables;
-    }
-
-    this.diffEditorReady = true;
 
-    disposables.push(
-      Event.debounce(
-        monacoDiffEditor.onDidUpdateDiff,
-        (_, e) => e,
-        150,
-      )(() => {
-        this.mount(editor.modifiedEditor);
-        this.mount(editor.originalEditor);
-      }),
-    );
-    this.mount(editor.modifiedEditor);
-    this.mount(editor.originalEditor);
-
-    disposables.push(...this.registerFeatures(editor.modifiedEditor, true));
-    disposables.push(...this.registerFeatures(editor.originalEditor, true));
-    return disposables;
-  }
-
-  private registerFeatures(editor: IEditor, isDiffEditor = false) {
-    const disposables: IDisposable[] = [];
-    if (!isDiffEditor) {
-      disposables.push(this.inlineCompletionHandler.registerInlineCompletionFeature(editor));
-    }
-    disposables.push(this.inlineChatHandler.registerInlineChatFeature(editor));
-
-    if (this.inlineChatFeatureRegistry.getInteractiveInputHandler() && !isDiffEditor) {
-      this.addDispose(this.inlineHintHandler.registerHintLineFeature(editor));
-      this.addDispose(this.inlineInputHandler.registerInlineInputFeature(editor));
-    }
-    return disposables;
+    return this;
   }
 
   private async mount(editor: IEditor): Promise<void> {

package/src/browser/contextkey/ai-native.contextkey.service.ts

@@ -1,11 +1,6 @@
 import { Autowired, Injectable, Optional } from '@opensumi/di';
 import { IContextKey, IContextKeyService, IScopedContextKeyService } from '@opensumi/ide-core-browser';
-import {
-  InlineChatIsVisible,
-  InlineCompletionIsTrigger,
-  InlineHintWidgetIsVisible,
-  InlineInputWidgetIsVisible,
-} from '@opensumi/ide-core-browser/lib/contextkey/ai-native';
+import { InlineChatIsVisible, InlineCompletionIsTrigger } from '@opensumi/ide-core-browser/lib/contextkey/ai-native';
 import { ContextKeyService } from '@opensumi/monaco-editor-core/esm/vs/platform/contextkey/browser/contextKeyService';
 import { IContextKeyServiceTarget } from '@opensumi/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey';
 
@@ -18,14 +13,10 @@ export class AINativeContextKey {
 
   public readonly inlineChatIsVisible: IContextKey<boolean>;
   public readonly inlineCompletionIsTrigger: IContextKey<boolean>;
-  public readonly inlineHintWidgetIsVisible: IContextKey<boolean>;
-  public readonly inlineInputWidgetIsVisible: IContextKey<boolean>;
 
   constructor(@Optional() dom?: HTMLElement | IContextKeyServiceTarget | ContextKeyService) {
     this._contextKeyService = this.globalContextKeyService.createScoped(dom);
     this.inlineChatIsVisible = InlineChatIsVisible.bind(this._contextKeyService);
     this.inlineCompletionIsTrigger = InlineCompletionIsTrigger.bind(this._contextKeyService);
-    this.inlineHintWidgetIsVisible = InlineHintWidgetIsVisible.bind(this._contextKeyService);
-    this.inlineInputWidgetIsVisible = InlineInputWidgetIsVisible.bind(this._contextKeyService);
   }
 }

package/src/browser/contrib/code-action/code-action.handler.ts

@@ -3,7 +3,6 @@ import { PreferenceService } from '@opensumi/ide-core-browser';
 import { AINativeSettingSectionsId } from '@opensumi/ide-core-common';
 import * as monaco from '@opensumi/ide-monaco';
 import { languageFeaturesService } from '@opensumi/ide-monaco/lib/browser/monaco-api/languages';
-import { empty } from '@opensumi/ide-utils/lib/strings';
 
 import { LanguageParserService } from '../../languages/service';
 import { ICodeBlockInfo } from '../../languages/tree-sitter/language-facts/base';
@@ -54,11 +53,6 @@ export class CodeActionHandler extends IAIMonacoContribHandler {
           return;
         }
 
-        const content = model.getLineContent(range.startLineNumber);
-        if (content?.trim() === empty) {
-          return;
-        }
-
         const needStop = this.intercept(model.uri);
         if (needStop) {
           return;

package/src/browser/contrib/inline-completions/completeProvider.ts

@@ -1,14 +1,20 @@
 import { Autowired, INJECTOR_TOKEN, Injectable, Injector } from '@opensumi/di';
 import { PreferenceService } from '@opensumi/ide-core-browser';
 import { AI_INLINE_COMPLETION_REPORTER } from '@opensumi/ide-core-browser/lib/ai-native/command';
-import { AINativeSettingSectionsId, DisposableStore, URI, WithEventBus, sleep, uuid } from '@opensumi/ide-core-common';
+import {
+  AINativeSettingSectionsId,
+  DisposableStore,
+  URI,
+  WithEventBus,
+  raceCancellation,
+  sleep,
+  uuid,
+} from '@opensumi/ide-core-common';
 import { IAICompletionResultModel } from '@opensumi/ide-core-common/lib/types/ai-native';
 import { AISerivceType, IAIReporter } from '@opensumi/ide-core-common/lib/types/ai-native/reporter';
 import { IEditor } from '@opensumi/ide-editor';
 import * as monaco from '@opensumi/ide-monaco';
 
-import { AINativeContextKey } from '../../contextkey/ai-native.contextkey.service';
-
 import { DEFAULT_COMPLECTION_MODEL } from './constants';
 import { CompletionRequestBean, IInlineCompletionCache, InlineCompletionItem } from './model/competionModel';
 import { PromptCache } from './promptCache';
@@ -159,9 +165,6 @@ export class CompletionRequestTask {
 
     // 组装请求参数,向远程发起请求
     const completionRequestBean = await this.constructRequestBean(context, token);
-    if (token.isCancellationRequested) {
-      return [];
-    }
     if (this.isCancelFlag) {
       return [];
     }
@@ -171,9 +174,10 @@ export class CompletionRequestTask {
 
     let rs: IAICompletionResultModel | null;
     const cacheData = this.promptCache.getCache(completionRequestBean.prompt);
-    const relationId = this.aiReporter.start(AISerivceType.Completion, { message: AISerivceType.Completion });
-    this.aiCompletionsService.setLastRelationId(relationId);
+    const relationId =
+      cacheData?.relationId || this.aiReporter.start(AISerivceType.Completion, { message: AISerivceType.Completion });
 
+    this.aiCompletionsService.setLastRelationId(relationId);
     // 如果存在缓存
     if (cacheData) {
       rs = cacheData;
@@ -200,7 +204,7 @@ export class CompletionRequestTask {
     this.aiCompletionsService.setLastSessionId(rs.sessionId);
 
     // 如果是取消直接返回
-    if ((rs && rs.isCancel) || this.isCancelFlag) {
+    if ((rs && rs.isCancel) || token.isCancellationRequested || this.isCancelFlag) {
       this.aiCompletionsService.reporterEnd(relationId, {
         success: true,
         replytime: Date.now() - requestStartTime,
@@ -212,7 +216,7 @@ export class CompletionRequestTask {
     }
 
     if (rs && rs.codeModelList && rs.codeModelList.length > 0) {
-      this.promptCache.setCache(completionRequestBean.prompt, rs);
+      this.promptCache.setCache(completionRequestBean.prompt, { ...rs, relationId });
     }
     // 返回补全结果为空直接返回
     if (rs.codeModelList.length === 0) {
@@ -266,6 +270,7 @@ export class CompletionRequestTask {
           position.column + insertText.length + textAfterCursor.length,
         ),
         sessionId: rs.sessionId,
+        relationId,
         command: {
           id: AI_INLINE_COMPLETION_REPORTER.id,
           title: '',
@@ -323,8 +328,6 @@ export class AIInlineCompletionsProvider extends WithEventBus {
   @Autowired(PreferenceService)
   private readonly preferenceService: PreferenceService;
 
-  private aiNativeContextKey: AINativeContextKey;
-
   /**
    * 该补全是否是手动触发
    */
@@ -353,8 +356,6 @@ export class AIInlineCompletionsProvider extends WithEventBus {
   }
 
   public mountEditor(editor: IEditor): void {
-    this.aiNativeContextKey = this.injector.get(AINativeContextKey, [(editor.monacoEditor as any)._contextKeyService]);
-
     this.isManual = false;
     this.isDelEvent = false;
     this.reqStack = new ReqStack();
@@ -367,10 +368,6 @@ export class AIInlineCompletionsProvider extends WithEventBus {
     }
   }
 
-  resetContextKey() {
-    this.aiNativeContextKey.inlineCompletionIsTrigger.reset();
-  }
-
   /**
    * 用户触发编辑器后，事件的回调
    * @param document
@@ -385,8 +382,6 @@ export class AIInlineCompletionsProvider extends WithEventBus {
     context: monaco.languages.InlineCompletionContext,
     token: monaco.CancellationToken,
   ) {
-    this.aiNativeContextKey.inlineCompletionIsTrigger.set(true);
-
     // bugfix: 修复当鼠标移动到代码补全上会触发一次手势事件，增加防抖，当手势触发后，能够防抖一次
     if (context.triggerKind === monaco.InlineCompletionTriggerKind.Automatic) {
       if (
@@ -412,12 +407,6 @@ export class AIInlineCompletionsProvider extends WithEventBus {
     // 重置防止不触发自动补全事件
     this.updateIsManual(false);
 
-    // 如果用户已取消
-    if (token?.isCancellationRequested) {
-      this.aiCompletionsService.updateStatusBarItem('cancelled ', false);
-      return undefined;
-    }
-
     // 放入队列
     const requestImp = this.injector.get(CompletionRequestTask, [model, position, token, _isManual]);
 
@@ -425,7 +414,12 @@ export class AIInlineCompletionsProvider extends WithEventBus {
 
     // 如果是自动补全需要 debounce
     if (!_isManual) {
-      await sleep(this.inlineComletionsDebounceTime);
+      await raceCancellation(sleep(this.inlineComletionsDebounceTime), token);
+    }
+
+    // 如果用户已取消
+    if (token?.isCancellationRequested) {
+      return undefined;
     }
 
     const list = await this.reqStack.runReq();

package/src/browser/contrib/inline-completions/inline-completions.handler.ts

@@ -2,9 +2,13 @@ import debounce from 'lodash/debounce';
 
 import { Autowired, Injectable } from '@opensumi/di';
 import { IDisposable } from '@opensumi/ide-core-browser';
-import { Disposable, IEventBus, Sequencer } from '@opensumi/ide-core-common';
+import { AI_INLINE_COMPLETION_VISIBLE } from '@opensumi/ide-core-browser/lib/ai-native/command';
+import { CommandServiceImpl, Disposable, IEventBus, Sequencer, runWhenIdle } from '@opensumi/ide-core-common';
+import { CommandRegistry, CommandRegistryImpl, CommandService } from '@opensumi/ide-core-common';
 import { EditorSelectionChangeEvent, IEditor } from '@opensumi/ide-editor/lib/browser';
+import { InlineCompletions, Position, Range } from '@opensumi/ide-monaco';
 import { monacoApi } from '@opensumi/ide-monaco/lib/browser/monaco-api';
+import { InlineCompletionContextKeys } from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/inlineCompletions/browser/inlineCompletionContextKeys';
 
 import { IAIMiddleware } from '../../types';
 import { IAIMonacoContribHandler } from '../base';
@@ -17,12 +21,21 @@ export class InlineCompletionHandler extends IAIMonacoContribHandler {
   @Autowired(IEventBus)
   private eventBus: IEventBus;
 
+  @Autowired(CommandService)
+  private commandService: CommandServiceImpl;
+
+  @Autowired(CommandRegistry)
+  private commandRegistry: CommandRegistryImpl;
+
   @Autowired(AIInlineCompletionsProvider)
   private readonly aiInlineCompletionsProvider: AIInlineCompletionsProvider;
 
   @Autowired(AICompletionsService)
   private aiCompletionsService: AICompletionsService;
 
+  private sequencer = new Sequencer();
+  private preDidShowItems: InlineCompletions | undefined;
+
   public registerInlineCompletionFeature(editor: IEditor): IDisposable {
     const { monacoEditor } = editor;
     // 判断用户是否选择了一块区域或者移动光标 取消掉请补全求
@@ -37,9 +50,6 @@ export class InlineCompletionHandler extends IAIMonacoContribHandler {
       if (selection.startLineNumber !== selection.endLineNumber || selection.startColumn !== selection.endColumn) {
         this.aiInlineCompletionsProvider.cancelRequest();
       }
-      requestAnimationFrame(() => {
-        this.aiCompletionsService.setVisibleCompletion(false);
-      });
     };
 
     const debouncedSelectionChange = debounce(selectionChange, 50, {
@@ -68,12 +78,8 @@ export class InlineCompletionHandler extends IAIMonacoContribHandler {
           }
         }
       }),
-      monacoEditor.onWillChangeModel(() => {
-        this.aiCompletionsService.hideStatusBarItem();
-      }),
       monacoEditor.onDidBlurEditorText(() => {
-        this.aiCompletionsService.hideStatusBarItem();
-        this.aiCompletionsService.setVisibleCompletion(false);
+        this.commandService.executeCommand(AI_INLINE_COMPLETION_VISIBLE.id, false);
       }),
     );
 
@@ -95,13 +101,32 @@ export class InlineCompletionHandler extends IAIMonacoContribHandler {
   mountEditor(editor: IEditor) {
     const toDispose = new Disposable();
     this.aiInlineCompletionsProvider.mountEditor(editor);
-    toDispose.addDispose(this.aiInlineCompletionsProvider);
+
     toDispose.addDispose(super.mountEditor(editor));
+    toDispose.addDispose(this.aiInlineCompletionsProvider);
+
+    const inlineVisibleKey = new Set([InlineCompletionContextKeys.inlineSuggestionVisible.key]);
+    toDispose.addDispose(
+      editor.monacoEditor.contextKeyService.onDidChangeContext((e) => {
+        // inline completion 真正消失时
+        if (e.affectsSome(inlineVisibleKey)) {
+          const inlineSuggestionVisible = InlineCompletionContextKeys.inlineSuggestionVisible.getValue(
+            editor.monacoEditor.contextKeyService,
+          );
+          if (!inlineSuggestionVisible && this.preDidShowItems) {
+            runWhenIdle(() => {
+              this.preDidShowItems = undefined;
+              this.commandService.executeCommand(AI_INLINE_COMPLETION_VISIBLE.id, false);
+            });
+          }
+        }
+      }),
+    );
     return toDispose;
   }
 
   doContribute(): IDisposable {
-    const sequencer = new Sequencer();
+    let prePosition: Position | undefined;
 
     return monacoApi.languages.registerInlineCompletionsProvider('*', {
       groupId: 'ai-native-inline-completions',
@@ -111,15 +136,34 @@ export class InlineCompletionHandler extends IAIMonacoContribHandler {
           return;
         }
 
-        const list = await sequencer.queue(() =>
+        let resultList: InlineCompletions;
+
+        /**
+         * 如果新字符在 inline completion 的 ghost text 内，则走缓存，不重新请求
+         */
+        if (this.preDidShowItems) {
+          if (!prePosition) {
+            prePosition = position.delta(0, -1);
+          }
+
+          const lineBefore = model.getValueInRange(Range.fromPositions(prePosition, position));
+          if (this.preDidShowItems.items[0].insertText.toString().startsWith(lineBefore)) {
+            return this.preDidShowItems;
+          } else {
+            prePosition = undefined;
+          }
+        }
+
+        resultList = await this.sequencer.queue(() =>
           this.aiInlineCompletionsProvider.provideInlineCompletionItems(model, position, context, token),
         );
 
-        return list;
+        return resultList;
       },
       freeInlineCompletions() {},
       handleItemDidShow: (completions) => {
         if (completions.items.length > 0) {
+          this.preDidShowItems = completions;
           this.aiCompletionsService.setVisibleCompletion(true);
         }
       },

package/src/browser/contrib/inline-completions/model/competionModel.ts

@@ -78,4 +78,5 @@ export interface CompletionResultModelCache {
  */
 export interface InlineCompletionItem extends monaco.languages.InlineCompletion {
   sessionId: string;
+  relationId: string;
 }

package/src/browser/contrib/inline-completions/promptCache.ts

@@ -14,7 +14,7 @@ export class PromptCache {
   @Autowired(IHashCalculateService)
   private hashCalculateService: IHashCalculateService;
 
-  private cacheMap = new StaleLRUMap<string, IAICompletionResultModel>(15, 10, 60 * 1000);
+  private cacheMap = new StaleLRUMap<string, IAICompletionResultModel & { relationId: string }>(15, 10, 60 * 1000);
 
   getCache(prompt: string) {
     if (!isCacheEnable()) {

package/src/browser/contrib/inline-completions/service/ai-completions.service.ts

@@ -4,8 +4,6 @@ import {
   AIBackSerivcePath,
   CancellationTokenSource,
   Disposable,
-  Emitter,
-  Event,
   IAIBackService,
   IAICompletionOption,
   IAICompletionResultModel,
@@ -29,14 +27,11 @@ export class AICompletionsService extends Disposable {
   @Autowired(IAIReporter)
   private readonly aiReporter: IAIReporter;
 
-  private readonly _onVisibleCompletion = new Emitter<boolean>();
-  public readonly onVisibleCompletion: Event<boolean> = this._onVisibleCompletion.event;
-
   private cancelIndicator = new CancellationTokenSource();
   // 是否使用默认的补全模型
   protected isDefaultCompletionModel = true;
   // 是否显示了 inline 补全
-  private _isVisibleCompletion = false;
+  private isVisibleCompletion = false;
   // 会话 id
   private lastSessionId: string;
   // 统计 id
@@ -54,10 +49,6 @@ export class AICompletionsService extends Disposable {
     this.lastCompletionUseTime = Date.now() - preTime;
   }
 
-  public get isVisibleCompletion(): boolean {
-    return this._isVisibleCompletion;
-  }
-
   public async complete(data: CompletionRequestBean, model, position, token): Promise<IAICompletionResultModel | null> {
     const doCompletion = async (data: CompletionRequestBean) => {
       if (!this.aiBackService.requestCompletion) {
@@ -102,28 +93,28 @@ export class AICompletionsService extends Disposable {
     this.aiBackService.reportCompletion(data);
     this.reporterEnd(relationId, { success: true, isReceive: accept, renderingTime: data.renderingTime });
 
-    this._isVisibleCompletion = false;
+    this.isVisibleCompletion = false;
   }
 
   public async reporterEnd(relationId: string, data: CompletionRT) {
-    this.aiReporter.end(relationId, {
+    const reportData = {
       ...data,
       isValid: typeof data.renderingTime === 'number' ? data.renderingTime > 750 : false,
-    });
+    };
+    this.aiReporter.end(relationId, reportData);
   }
 
   public setVisibleCompletion(visible: boolean) {
     // 如果之前是 true，现在是 false，说明并没有进行采纳
-    if (this._isVisibleCompletion === true && visible === false) {
+    if (this.isVisibleCompletion === true && visible === false) {
       this.report({ sessionId: this.lastSessionId, accept: false, relationId: this.lastRelationId });
     }
 
-    this._isVisibleCompletion = visible;
-
-    this._onVisibleCompletion.fire(visible);
-
     if (visible === true) {
+      this.isVisibleCompletion = visible;
       this.recordRenderTime();
+    } else {
+      this.isVisibleCompletion = false;
     }
   }
 

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

@@ -10,7 +10,7 @@ export const AILayout = () => {
 
   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 || 35 : 0} slot='top' z-index={2} />
       <SplitPanel
         id='main-horizontal-ai'
         flex={1}

package/src/browser/layout/tabbar.view.tsx

@@ -89,7 +89,7 @@ const AILeftTabbarRenderer: React.FC = () => {
 
       return (
         <>
-          {visibleContainers.length > 0 && <HorizontalVertical margin={'8px auto 0px'} width={'60%'} />}
+          <HorizontalVertical margin={'8px auto 0px'} width={'60%'} />
           {visibleContainers.map((component) => renderContainers(component, handleTabClick, currentContainerId))}
         </>
       );
@@ -107,7 +107,6 @@ const AILeftTabbarRenderer: React.FC = () => {
             ? navMenu.map((menu) => (
                 <EnhanceIconWithCtxMenu
                   key={menu.id}
-                  id={menu.id}
                   wrapperClassName={styles.extra_bottom_icon}
                   iconClass={menu.icon}
                   menuNodes={menu.children}

package/src/browser/types.ts

@@ -29,10 +29,6 @@ interface IBaseInlineChatHandler<T extends any[]> {
    * 提供 diff editor 的预览策略
    */
   providerDiffPreviewStrategy?: (...args: T) => MaybePromise<ChatResponse | InlineChatController>;
-  /**
-   * 在 editor 里直接预览输出的结果
-   */
-  providerPreviewStrategy?: (...args: T) => MaybePromise<ChatResponse | InlineChatController>;
 }
 
 export type IEditorInlineChatHandler = IBaseInlineChatHandler<[editor: ICodeEditor, token: CancellationToken]>;
@@ -46,13 +42,9 @@ export enum ERunStrategy {
    */
   EXECUTE = 'EXECUTE',
   /**
-   * 预览 diff，执行后 input 保留，显示 inline diff editor
+   * 预览 diff，执行后 input 保留，显示 diff editor
    */
   DIFF_PREVIEW = 'DIFF_PREVIEW',
-  /**
-   * 预览输出结果，执行后 input 保留，并在 editor 里直接展示输出结果
-   */
-  PREVIEW = 'PREVIEW',
 }
 
 /**
@@ -60,7 +52,7 @@ export enum ERunStrategy {
  */
 export interface IInteractiveInputRunStrategy {
   strategy?: ERunStrategy;
-  handleStrategy?: (editor: ICodeEditor, value: string) => MaybePromise<ERunStrategy>;
+  handleStrategy?: (value: string) => MaybePromise<ERunStrategy>;
 }
 
 export interface ITerminalInlineChatHandler {
@@ -69,24 +61,10 @@ export interface ITerminalInlineChatHandler {
 }
 
 export interface IInlineChatFeatureRegistry {
-  /**
-   * 注册 editor 内联聊天能力
-   */
   registerEditorInlineChat(operational: AIActionItem, handler: IEditorInlineChatHandler): IDisposable;
-  /**
-   * 注销 editor 内联聊天能力
-   */
-  unregisterEditorInlineChat(operational: AIActionItem): void;
-  /**
-   * 注册 terminal 内联功能
-   */
   registerTerminalInlineChat(operational: AIActionItem, handler: ITerminalInlineChatHandler): IDisposable;
   /**
-   * 注销 terminal 内联功能
-   */
-  unregisterTerminalInlineChat(operational: AIActionItem): void;
-  /**
-   * proposed api，可能随时都会有变化
+   * proposed api
    */
   registerInteractiveInput(
     strategyOptions: IInteractiveInputRunStrategy,