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

package/src/browser/widget/inline-chat/inline-chat-controller.ts

@@ -86,7 +86,7 @@ export class InlineChatController {
     listenReadable<IChatProgress>(stream, {
       onData: (data) => {
         reply.updateMessage(this.fencedCodeBlocks((data as IChatContent).content));
-        this._onData.fireAndAwait(reply);
+        this._onData.fire(reply);
       },
       onEnd: () => {
         this.isInCodeBlock = false;

package/src/browser/widget/inline-chat/inline-chat.feature.registry.ts

@@ -1,10 +1,8 @@
 import { Autowired, Injectable } from '@opensumi/di';
-import { KeybindingRegistry, Logger } from '@opensumi/ide-core-browser';
-import { AI_INLINE_CHAT_INTERACTIVE_INPUT_VISIBLE } from '@opensumi/ide-core-browser/lib/ai-native/command';
+import { Logger, SpecialCases } from '@opensumi/ide-core-browser';
 import { AIActionItem } from '@opensumi/ide-core-browser/lib/components/ai-native';
 import { InteractiveInput } from '@opensumi/ide-core-browser/lib/components/ai-native/interactive-input/index';
 import { Disposable, Emitter, Event, IDisposable, MaybePromise, isUndefined, uuid } from '@opensumi/ide-core-common';
-import { ICodeEditor } from '@opensumi/ide-monaco';
 
 import { CodeActionService } from '../../contrib/code-action/code-action.service';
 import {
@@ -16,7 +14,7 @@ import {
   ITerminalInlineChatHandler,
 } from '../../types';
 
-type TRunStrategyFn = (editor: ICodeEditor, value: string) => MaybePromise<ERunStrategy>;
+type TRunStrategyFn = (value: string) => MaybePromise<ERunStrategy>;
 
 class InteractiveInputModel {
   static ID: string = `${InteractiveInput.displayName}:${uuid(4)}`;
@@ -53,9 +51,6 @@ export class InlineChatFeatureRegistry extends Disposable implements IInlineChat
   @Autowired(CodeActionService)
   private readonly codeActionService: CodeActionService;
 
-  @Autowired(KeybindingRegistry)
-  private readonly keybindingRegistry: KeybindingRegistry;
-
   private actionsMap: Map<string, AIActionItem> = new Map();
   private editorHandlerMap: Map<string, IEditorInlineChatHandler> = new Map();
   private terminalHandlerMap: Map<string, ITerminalInlineChatHandler> = new Map();
@@ -117,10 +112,6 @@ export class InlineChatFeatureRegistry extends Disposable implements IInlineChat
     };
   }
 
-  public unregisterEditorInlineChat(operational: AIActionItem) {
-    return this.removeCollectedActions(operational);
-  }
-
   public registerTerminalInlineChat(operational: AIActionItem, handler: ITerminalInlineChatHandler): IDisposable {
     const isCollect = this.collectActions(operational);
 
@@ -139,10 +130,6 @@ export class InlineChatFeatureRegistry extends Disposable implements IInlineChat
     };
   }
 
-  public unregisterTerminalInlineChat(operational: AIActionItem) {
-    return this.removeCollectedActions(operational);
-  }
-
   public registerInteractiveInput(
     runStrategy: IInteractiveInputRunStrategy,
     handler: IInteractiveInputHandler,
@@ -155,16 +142,12 @@ export class InlineChatFeatureRegistry extends Disposable implements IInlineChat
       this.interactiveInputModel.setStrategyHandler(() => runStrategy.strategy || ERunStrategy.EXECUTE);
     }
 
-    const keybindingStr = String(this.getSequenceKeyString());
-
-    if (keybindingStr) {
-      this.collectActions({
-        id: InteractiveInputModel.ID,
-        name: `Chat(${keybindingStr.toLocaleUpperCase()})`,
-        renderType: 'button',
-        order: Number.MAX_SAFE_INTEGER,
-      });
-    }
+    this.collectActions({
+      id: InteractiveInputModel.ID,
+      name: `Chat(${SpecialCases.MACMETA}+K)`,
+      renderType: 'button',
+      order: Number.MAX_SAFE_INTEGER,
+    });
 
     return {
       dispose: () => {
@@ -173,15 +156,6 @@ export class InlineChatFeatureRegistry extends Disposable implements IInlineChat
     };
   }
 
-  private getSequenceKeyString() {
-    const keybindings = this.keybindingRegistry.getKeybindingsForCommand(AI_INLINE_CHAT_INTERACTIVE_INPUT_VISIBLE.id);
-    const resolved = keybindings[0]?.resolved;
-    if (!resolved) {
-      return '';
-    }
-    return this.keybindingRegistry.acceleratorForSequence(resolved, '+');
-  }
-
   public getInteractiveInputHandler(): IInteractiveInputHandler | undefined {
     return this.interactiveInputModel.handler();
   }

package/src/browser/widget/inline-chat/inline-chat.handler.ts

@@ -33,7 +33,7 @@ import { InlineDiffWidget } from '../inline-diff/inline-diff-widget';
 
 import { InlineChatController } from './inline-chat-controller';
 import { InlineChatFeatureRegistry } from './inline-chat.feature.registry';
-import { AIInlineChatService, EInlineChatStatus, EResultKind } from './inline-chat.service';
+import { AIInlineChatService, EInlineChatStatus } from './inline-chat.service';
 import { AIInlineContentWidget } from './inline-content-widget';
 
 @Injectable()
@@ -79,6 +79,11 @@ export class InlineChatHandler extends Disposable {
     this.logger = this.loggerManagerClient.getLogger(SupportLogNamespace.Browser);
   }
 
+  contribute(editor: IEditor): IDisposable {
+    this.registerInlineChatFeature(editor);
+    return this;
+  }
+
   private cancelToken() {
     this.cancelIndicator.cancel();
     this.cancelIndicator = new CancellationTokenSource();
@@ -169,9 +174,8 @@ export class InlineChatHandler extends Disposable {
         }
 
         if (
-          this.aiInlineContentWidget &&
-          this.aiInlineContentWidget.status !== EInlineChatStatus.READY &&
-          this.aiInlineContentWidget.status !== EInlineChatStatus.ERROR
+          this.aiInlineChatService.status !== EInlineChatStatus.READY &&
+          this.aiInlineChatService.status !== EInlineChatStatus.ERROR
         ) {
           return;
         }
@@ -204,9 +208,13 @@ export class InlineChatHandler extends Disposable {
       return;
     }
 
+    this.aiInlineChatDisposed.addDispose(this.aiInlineChatService.launchChatStatus(EInlineChatStatus.READY));
+
     this.aiInlineContentWidget = this.injector.get(AIInlineContentWidget, [monacoEditor]);
 
-    this.aiInlineContentWidget.show({ selection });
+    this.aiInlineContentWidget.show({
+      selection,
+    });
 
     this.aiInlineChatDisposed.addDispose(
       this.inlineChatFeatureRegistry.onChatClick(() => {
@@ -249,7 +257,7 @@ export class InlineChatHandler extends Disposable {
           return;
         }
 
-        const strategy = await this.inlineChatFeatureRegistry.getInteractiveInputStrategyHandler()(monacoEditor, value);
+        const strategy = await this.inlineChatFeatureRegistry.getInteractiveInputStrategyHandler()(value);
 
         this.runInlineChatAction(
           monacoEditor,
@@ -293,7 +301,7 @@ export class InlineChatHandler extends Disposable {
   ): void {
     const { relationId, message, startTime, isRetry, isStop } = reportInfo;
 
-    this.aiInlineChatDisposed.addDispose(this.aiInlineContentWidget.launchChatStatus(status));
+    this.aiInlineChatDisposed.addDispose(this.aiInlineChatService.launchChatStatus(status));
     this.aiReporter.end(relationId, {
       message,
       success: status !== EInlineChatStatus.ERROR,
@@ -455,15 +463,11 @@ export class InlineChatHandler extends Disposable {
     relationId: string,
     isRetry: boolean,
   ) {
-    if (!this.aiInlineContentWidget) {
-      return;
-    }
-
     const model = monacoEditor.getModel();
 
     this.aiDiffWidget?.dispose();
     this.aiInlineChatOperationDisposed.dispose();
-    this.aiInlineChatDisposed.addDispose(this.aiInlineContentWidget.launchChatStatus(EInlineChatStatus.THINKING));
+    this.aiInlineChatDisposed.addDispose(this.aiInlineChatService.launchChatStatus(EInlineChatStatus.THINKING));
 
     const startTime = Date.now();
 
@@ -499,16 +503,14 @@ export class InlineChatHandler extends Disposable {
     );
 
     this.aiInlineChatOperationDisposed.addDispose([
-      this.aiInlineContentWidget.onResultClick((kind: EResultKind) => {
-        if (kind === EResultKind.ACCEPT) {
-          this.aiReporter.end(relationId, { message: 'accept', success: true, isReceive: true });
-          const newValue = this.aiDiffWidget?.getModifiedModel()?.getValue() || '';
-
-          monacoEditor.getModel()?.pushEditOperations(null, [{ range: crossSelection, text: newValue }], () => null);
-          runWhenIdle(() => {
-            this.disposeAllWidget();
-          });
-        }
+      this.aiInlineChatService.onAccept(() => {
+        this.aiReporter.end(relationId, { message: 'accept', success: true, isReceive: true });
+        const newValue = this.aiDiffWidget?.getModifiedModel()?.getValue() || '';
+
+        monacoEditor.getModel()?.pushEditOperations(null, [{ range: crossSelection, text: newValue }], () => null);
+        runWhenIdle(() => {
+          this.disposeAllWidget();
+        });
       }),
       this.aiInlineChatService.onThumbs((isLike: boolean) => {
         this.aiReporter.end(relationId, { isLike });
@@ -558,19 +560,18 @@ export class InlineChatHandler extends Disposable {
       );
 
       this.aiInlineChatDisposed.addDispose([
-        this.aiInlineContentWidget.onResultClick(async (kind: EResultKind) => {
-          if (kind === EResultKind.DISCARD) {
-            this.aiReporter.end(relationId, { message: 'discard', success: true, isDrop: true });
-            this.disposeAllWidget();
-          } else if (kind === EResultKind.REGENERATE) {
-            await this.handleDiffPreviewStrategy(
-              monacoEditor,
-              providerDiffPreviewStrategy,
-              crossSelection,
-              relationId,
-              true,
-            );
-          }
+        this.aiInlineChatService.onDiscard(() => {
+          this.aiReporter.end(relationId, { message: 'discard', success: true, isDrop: true });
+          this.disposeAllWidget();
+        }),
+        this.aiInlineChatService.onRegenerate(async () => {
+          await this.handleDiffPreviewStrategy(
+            monacoEditor,
+            providerDiffPreviewStrategy,
+            crossSelection,
+            relationId,
+            true,
+          );
         }),
       ]);
     }

package/src/browser/widget/inline-chat/inline-chat.module.less

@@ -2,6 +2,6 @@
   min-width: initial !important;
 }
 
-.inline_chat_controller_box {
-  padding: 6px;
+.ai_inline_error_result_panel {
+  padding: 8px;
 }

package/src/browser/widget/inline-chat/inline-chat.service.ts

@@ -1,6 +1,6 @@
-import { Injectable } from '@opensumi/di';
+import { Autowired, Injectable } from '@opensumi/di';
 import { IAIInlineChatService } from '@opensumi/ide-core-browser';
-import { Emitter, Event, runWhenIdle } from '@opensumi/ide-core-common';
+import { AIBackSerivcePath, Emitter, Event, IAIBackService, runWhenIdle } from '@opensumi/ide-core-common';
 
 export const enum EInlineChatStatus {
   READY,
@@ -9,14 +9,16 @@ export const enum EInlineChatStatus {
   ERROR,
 }
 
-export const enum EResultKind {
-  ACCEPT = 'ACCEPT',
-  DISCARD = 'DISCARD',
-  REGENERATE = 'REGENERATE',
-}
-
 @Injectable({ multiple: false })
 export class AIInlineChatService implements IAIInlineChatService {
+  @Autowired(AIBackSerivcePath)
+  aiBackService: IAIBackService;
+
+  private _status: EInlineChatStatus = EInlineChatStatus.READY;
+  public get status(): EInlineChatStatus {
+    return this._status;
+  }
+
   private _interactiveInputVisible: boolean = false;
   public get interactiveInputVisible(): boolean {
     return this._interactiveInputVisible;
@@ -28,6 +30,18 @@ export class AIInlineChatService implements IAIInlineChatService {
   public readonly _onInlineChatVisible = new Emitter<boolean>();
   public readonly onInlineChatVisible: Event<boolean> = this._onInlineChatVisible.event;
 
+  private readonly _onChatStatus = new Emitter<EInlineChatStatus>();
+  public readonly onChatStatus: Event<EInlineChatStatus> = this._onChatStatus.event;
+
+  public readonly _onAccept = new Emitter<void>();
+  public readonly onAccept: Event<void> = this._onAccept.event;
+
+  public readonly _onDiscard = new Emitter<void>();
+  public readonly onDiscard: Event<void> = this._onDiscard.event;
+
+  public readonly _onRegenerate = new Emitter<void>();
+  public readonly onRegenerate: Event<void> = this._onRegenerate.event;
+
   private readonly _onThumbs = new Emitter<boolean>();
   public readonly onThumbs: Event<boolean> = this._onThumbs.event;
 
@@ -35,6 +49,17 @@ export class AIInlineChatService implements IAIInlineChatService {
     this._onThumbs.fire(isThumbsUp);
   }
 
+  public isLoading(): boolean {
+    return this._status === EInlineChatStatus.THINKING;
+  }
+
+  public launchChatStatus(status: EInlineChatStatus) {
+    return runWhenIdle(() => {
+      this._status = status;
+      this._onChatStatus.fire(status);
+    });
+  }
+
   public launchInputVisible(v: boolean) {
     return runWhenIdle(() => {
       this._interactiveInputVisible = v;

package/src/browser/widget/inline-chat/inline-content-widget.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
 import { Autowired, INJECTOR_TOKEN, Injectable, Injector } from '@opensumi/di';
 import { IAIInlineChatService, StackingLevelStr, useInjectable } from '@opensumi/ide-core-browser';
@@ -10,10 +10,8 @@ import {
   AIInlineChatContentWidgetId,
   Disposable,
   Emitter,
-  Event,
   InlineChatFeatureRegistryToken,
   localize,
-  runWhenIdle,
 } from '@opensumi/ide-core-common';
 import * as monaco from '@opensumi/ide-monaco';
 import { monacoBrowser } from '@opensumi/ide-monaco/lib/browser';
@@ -23,40 +21,42 @@ import {
 } from '@opensumi/ide-monaco/lib/browser/ai-native/BaseInlineContentWidget';
 
 import { AINativeContextKey } from '../../contextkey/ai-native.contextkey.service';
-import { InlineResultAction } from '../inline-actions/result-items/index';
 
 import { InlineChatFeatureRegistry } from './inline-chat.feature.registry';
 import styles from './inline-chat.module.less';
-import { AIInlineChatService, EInlineChatStatus, EResultKind } from './inline-chat.service';
+import { AIInlineChatService, EInlineChatStatus } from './inline-chat.service';
 
 import type { ICodeEditor as IMonacoCodeEditor } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
 
-interface IAIInlineOperationProps {
+export interface IAIInlineOperationProps {
   handleActions: (id: string) => void;
   status: EInlineChatStatus;
   onClose?: () => void;
 }
 
-interface IAIInlineChatControllerProps {
+export interface IAIInlineChatControllerProps {
   onClickActions: (id: string) => void;
   onLayoutChange: (height: number) => void;
   onClose?: () => void;
   onInteractiveInputSend?: (value: string) => void;
-  onChatStatus: Event<EInlineChatStatus>;
-  onResultClick: (k: EResultKind) => void;
 }
 
-const AIInlineChatController = (props: IAIInlineChatControllerProps) => {
-  const { onClickActions, onClose, onInteractiveInputSend, onLayoutChange, onChatStatus, onResultClick } = props;
+export const AIInlineChatController = (props: IAIInlineChatControllerProps) => {
+  const { onClickActions, onClose, onInteractiveInputSend, onLayoutChange } = props;
   const aiInlineChatService: AIInlineChatService = useInjectable(IAIInlineChatService);
   const inlineChatFeatureRegistry: InlineChatFeatureRegistry = useInjectable(InlineChatFeatureRegistryToken);
   const [status, setStatus] = useState<EInlineChatStatus>(EInlineChatStatus.READY);
-  const [inputValue, setInputValue] = useState<string>('');
   const [interactiveInputVisible, setInteractiveInputVisible] = useState<boolean>(false);
 
+  const interactiveInputRef = useRef<HTMLTextAreaElement | null>(null);
+
   useEffect(() => {
     const dis = new Disposable();
-    dis.addDispose(onChatStatus((s) => setStatus(s)));
+    dis.addDispose(
+      aiInlineChatService.onChatStatus((status) => {
+        setStatus(status);
+      }),
+    );
 
     dis.addDispose(
       aiInlineChatService.onInteractiveInputVisible((v) => {
@@ -67,19 +67,52 @@ const AIInlineChatController = (props: IAIInlineChatControllerProps) => {
     return () => {
       dis.dispose();
     };
-  }, [onChatStatus, aiInlineChatService]);
+  }, []);
+
+  useEffect(() => {
+    if (interactiveInputVisible === true && interactiveInputRef.current) {
+      interactiveInputRef.current.focus();
+    }
+  }, [interactiveInputVisible, interactiveInputRef]);
 
   useEffect(() => {
     if (status === EInlineChatStatus.ERROR) {
       onClose?.();
     }
-  }, [onClose]);
+  }, [status, onClose]);
 
   const isLoading = useMemo(() => status === EInlineChatStatus.THINKING, [status]);
   const isDone = useMemo(() => status === EInlineChatStatus.DONE, [status]);
   const isError = useMemo(() => status === EInlineChatStatus.ERROR, [status]);
   const operationList = useMemo(() => inlineChatFeatureRegistry.getEditorActionButtons(), [inlineChatFeatureRegistry]);
 
+  const iconResultItems = useMemo(
+    () => [
+      {
+        icon: 'check',
+        text: localize('aiNative.inline.chat.operate.check.title'),
+        onClick: () => {
+          aiInlineChatService._onAccept.fire();
+        },
+      },
+      {
+        icon: 'discard',
+        text: localize('aiNative.operate.discard.title'),
+        onClick: () => {
+          aiInlineChatService._onDiscard.fire();
+        },
+      },
+      {
+        icon: 'afresh',
+        text: localize('aiNative.operate.afresh.title'),
+        onClick: () => {
+          aiInlineChatService._onRegenerate.fire();
+        },
+      },
+    ],
+    [],
+  );
+
   const handleClickActions = useCallback(
     (id: string) => {
       onClickActions?.(id);
@@ -94,6 +127,7 @@ const AIInlineChatController = (props: IAIInlineChatControllerProps) => {
   const handleInteractiveInputSend = useCallback(
     (value: string) => {
       onInteractiveInputSend?.(value);
+      aiInlineChatService.launchChatStatus(EInlineChatStatus.THINKING);
     },
     [onInteractiveInputSend],
   );
@@ -114,10 +148,6 @@ const AIInlineChatController = (props: IAIInlineChatControllerProps) => {
     [inlineChatFeatureRegistry],
   );
 
-  const handleValueChange = useCallback((value) => {
-    setInputValue(value);
-  }, []);
-
   const customOperationRender = useMemo(() => {
     if (!interactiveInputVisible) {
       return null;
@@ -125,18 +155,16 @@ const AIInlineChatController = (props: IAIInlineChatControllerProps) => {
 
     return (
       <InteractiveInput
-        autoFocus
+        ref={interactiveInputRef}
         onHeightChange={(height) => onLayoutChange(height)}
         size='small'
         placeholder={localize('aiNative.inline.chat.input.placeholder.default')}
         width={320}
         disabled={isLoading}
-        value={inputValue}
-        onValueChange={handleValueChange}
         onSend={handleInteractiveInputSend}
       />
     );
-  }, [isLoading, interactiveInputVisible, inputValue]);
+  }, [isLoading, interactiveInputVisible]);
 
   const renderContent = useCallback(() => {
     if (operationList.length === 0 && moreOperation.length === 0) {
@@ -148,7 +176,11 @@ const AIInlineChatController = (props: IAIInlineChatControllerProps) => {
     }
 
     if (isDone) {
-      return <InlineResultAction onResultClick={onResultClick} />;
+      return (
+        <ContentWidgetContainerPanel style={{ transform: 'translateY(4px)' }}>
+          <AIInlineResult iconItems={iconResultItems} />
+        </ContentWidgetContainerPanel>
+      );
     }
 
     return (
@@ -162,13 +194,9 @@ const AIInlineChatController = (props: IAIInlineChatControllerProps) => {
         customOperationRender={customOperationRender}
       />
     );
-  }, [operationList, moreOperation, customOperationRender, onResultClick, status, interactiveInputVisible]);
+  }, [operationList, moreOperation, customOperationRender, iconResultItems, status, interactiveInputVisible]);
 
-  return (
-    <div className={styles.inline_chat_controller_box} style={isDone ? { transform: 'translateY(-15px)' } : {}}>
-      {renderContent()}
-    </div>
-  );
+  return <div style={isDone ? { transform: 'translateY(-15px)' } : {}}>{renderContent()}</div>;
 };
 
 @Injectable({ multiple: true })
@@ -176,6 +204,9 @@ export class AIInlineContentWidget extends ReactInlineContentWidget {
   @Autowired(INJECTOR_TOKEN)
   private readonly injector: Injector;
 
+  @Autowired(IAIInlineChatService)
+  private aiInlineChatService: AIInlineChatService;
+
   @Autowired(InlineChatFeatureRegistryToken)
   private readonly inlineChatFeatureRegistry: InlineChatFeatureRegistry;
 
@@ -186,25 +217,9 @@ export class AIInlineContentWidget extends ReactInlineContentWidget {
   private readonly _onActionClickEmitter = new Emitter<{ actionId: string; source: string }>();
   public readonly onActionClick = this._onActionClickEmitter.event;
 
-  protected readonly _onInteractiveInputValue = new Emitter<string>();
+  private readonly _onInteractiveInputValue = new Emitter<string>();
   public readonly onInteractiveInputValue = this._onInteractiveInputValue.event;
 
-  protected readonly _onStatusChange = new Emitter<EInlineChatStatus>();
-  public readonly onStatusChange: Event<EInlineChatStatus> = this._onStatusChange.event;
-
-  protected readonly _onResultClick = new Emitter<EResultKind>();
-  public readonly onResultClick: Event<EResultKind> = this._onResultClick.event;
-
-  protected _interactiveInputValue: string;
-  public get interactiveInputValue(): string {
-    return this._interactiveInputValue;
-  }
-
-  protected _status: EInlineChatStatus = EInlineChatStatus.READY;
-  public get status(): EInlineChatStatus {
-    return this._status;
-  }
-
   constructor(protected readonly editor: IMonacoCodeEditor) {
     super(editor);
 
@@ -218,15 +233,8 @@ export class AIInlineContentWidget extends ReactInlineContentWidget {
     );
   }
 
-  public launchChatStatus(status: EInlineChatStatus) {
-    return runWhenIdle(() => {
-      this._status = status;
-      this._onStatusChange.fire(status);
-    });
-  }
-
   override dispose(): void {
-    this.launchChatStatus(EInlineChatStatus.READY);
+    this.aiInlineChatService.launchChatStatus(EInlineChatStatus.READY);
     super.dispose();
   }
 
@@ -244,18 +252,10 @@ export class AIInlineContentWidget extends ReactInlineContentWidget {
       <AIInlineChatController
         onClickActions={(id) => this.clickActionId(id, 'widget')}
         onClose={() => this.dispose()}
-        onChatStatus={this.onStatusChange.bind(this)}
         onLayoutChange={() => {
           this.editor.layoutContentWidget(this);
         }}
-        onInteractiveInputSend={(value) => {
-          this.launchChatStatus(EInlineChatStatus.THINKING);
-          this._interactiveInputValue = value;
-          this._onInteractiveInputValue.fire(value);
-        }}
-        onResultClick={(kind: EResultKind) => {
-          this._onResultClick.fire(kind);
-        }}
+        onInteractiveInputSend={(value) => this._onInteractiveInputValue.fire(value)}
       />
     );
   }
@@ -268,6 +268,7 @@ export class AIInlineContentWidget extends ReactInlineContentWidget {
   override getDomNode(): HTMLElement {
     const domNode = super.getDomNode();
     requestAnimationFrame(() => {
+      domNode.style.padding = '6px';
       domNode.style.zIndex = StackingLevelStr.OverlayTop;
     });
     return domNode;
@@ -411,7 +412,7 @@ export class AIInlineContentWidget extends ReactInlineContentWidget {
    * 2. 靠近光标处周围没有字符的空白区域作为要显示的区域
    * 3. 显示的区域方向在右侧，左侧不考虑
    */
-  protected computePosition(selection: monaco.Selection): monaco.editor.IContentWidgetPosition | null {
+  private computePosition(selection: monaco.Selection): monaco.editor.IContentWidgetPosition | null {
     const startPosition = selection.getStartPosition();
     const endPosition = selection.getEndPosition();
     const model = this.editor.getModel();

package/src/browser/widget/inline-diff/inline-diff-widget.tsx

@@ -4,8 +4,9 @@ import ReactDOMClient from 'react-dom/client';
 
 import { Autowired, Injectable } from '@opensumi/di';
 import { AppConfig, ConfigProvider, Emitter, Event, MonacoService, useInjectable } from '@opensumi/ide-core-browser';
-import * as monaco from '@opensumi/ide-monaco';
 import { ICodeEditor } from '@opensumi/ide-monaco';
+import * as monaco from '@opensumi/ide-monaco';
+import { monaco as monacoApi } from '@opensumi/ide-monaco/lib/browser/monaco-api';
 import { IDiffEditorOptions } from '@opensumi/ide-monaco/lib/browser/monaco-api/editor';
 import { ILanguageSelection } from '@opensumi/monaco-editor-core/esm/vs/editor/common/languages/language';
 import { ITextModel } from '@opensumi/monaco-editor-core/esm/vs/editor/common/model';

package/src/browser/widget/light-bulb/index.ts

@@ -1,5 +1,6 @@
 import { asClassNameArrayWrapper } from '@opensumi/ide-core-browser';
-import { Codicon, Sumicon } from '@opensumi/ide-core-common/lib/codicons';
+import { Sumicon } from '@opensumi/ide-core-common/lib/codicons';
+import { Codicon } from '@opensumi/monaco-editor-core/esm/vs/base/common/codicons';
 import { ThemeIcon } from '@opensumi/monaco-editor-core/esm/vs/base/common/themables';
 import {
   LightBulbState,

package/lib/browser/widget/inline-actions/result-items/index.d.ts

@@ -1,7 +0,0 @@
-import React from 'react';
-import { EResultKind } from '../../inline-chat/inline-chat.service';
-export interface IInlineResultActionProps {
-    onResultClick: (k: EResultKind) => void;
-}
-export declare const InlineResultAction: ({ onResultClick }: IInlineResultActionProps) => React.JSX.Element;
-//# sourceMappingURL=index.d.ts.map

package/lib/browser/widget/inline-actions/result-items/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/browser/widget/inline-actions/result-items/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAC;AAMvC,OAAO,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAEpE,MAAM,WAAW,wBAAwB;IACvC,aAAa,EAAE,CAAC,CAAC,EAAE,WAAW,KAAK,IAAI,CAAC;CACzC;AAED,eAAO,MAAM,kBAAkB,sBAAuB,wBAAwB,sBA2B7E,CAAC"}

package/lib/browser/widget/inline-actions/result-items/index.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.InlineResultAction = void 0;
-const tslib_1 = require("tslib");
-const react_1 = tslib_1.__importStar(require("react"));
-const containerPanel_1 = require("@opensumi/ide-core-browser/lib/components/ai-native/content-widget/containerPanel");
-const index_1 = require("@opensumi/ide-core-browser/lib/components/ai-native/index");
-const ide_core_common_1 = require("@opensumi/ide-core-common");
-const InlineResultAction = ({ onResultClick }) => {
-    const iconResultItems = (0, react_1.useMemo)(() => [
-        {
-            icon: 'check',
-            text: (0, ide_core_common_1.localize)('aiNative.inline.chat.operate.check.title'),
-            onClick: () => onResultClick("ACCEPT" /* EResultKind.ACCEPT */),
-        },
-        {
-            icon: 'discard',
-            text: (0, ide_core_common_1.localize)('aiNative.operate.discard.title'),
-            onClick: () => onResultClick("DISCARD" /* EResultKind.DISCARD */),
-        },
-        {
-            icon: 'afresh',
-            text: (0, ide_core_common_1.localize)('aiNative.operate.afresh.title'),
-            onClick: () => onResultClick("REGENERATE" /* EResultKind.REGENERATE */),
-        },
-    ], [onResultClick]);
-    return (react_1.default.createElement(containerPanel_1.ContentWidgetContainerPanel, { style: { transform: 'translateY(4px)' } },
-        react_1.default.createElement(index_1.AIInlineResult, { iconItems: iconResultItems })));
-};
-exports.InlineResultAction = InlineResultAction;
-//# sourceMappingURL=index.js.map

package/lib/browser/widget/inline-actions/result-items/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/browser/widget/inline-actions/result-items/index.tsx"],"names":[],"mappings":";;;;AAAA,uDAAuC;AAEvC,sHAAgI;AAChI,qFAA2F;AAC3F,+DAAqD;AAQ9C,MAAM,kBAAkB,GAAG,CAAC,EAAE,aAAa,EAA4B,EAAE,EAAE;IAChF,MAAM,eAAe,GAAG,IAAA,eAAO,EAC7B,GAAG,EAAE,CAAC;QACJ;YACE,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,IAAA,0BAAQ,EAAC,0CAA0C,CAAC;YAC1D,OAAO,EAAE,GAAG,EAAE,CAAC,aAAa,mCAAoB;SACjD;QACD;YACE,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,IAAA,0BAAQ,EAAC,gCAAgC,CAAC;YAChD,OAAO,EAAE,GAAG,EAAE,CAAC,aAAa,qCAAqB;SAClD;QACD;YACE,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,IAAA,0BAAQ,EAAC,+BAA+B,CAAC;YAC/C,OAAO,EAAE,GAAG,EAAE,CAAC,aAAa,2CAAwB;SACrD;KACF,EACD,CAAC,aAAa,CAAC,CAChB,CAAC;IAEF,OAAO,CACL,8BAAC,4CAA2B,IAAC,KAAK,EAAE,EAAE,SAAS,EAAE,iBAAiB,EAAE;QAClE,8BAAC,sBAAc,IAAC,SAAS,EAAE,eAAe,GAAI,CAClB,CAC/B,CAAC;AACJ,CAAC,CAAC;AA3BW,QAAA,kBAAkB,sBA2B7B"}