@opensumi/ide-ai-native 3.7.1-next-1738824147.0 → 3.7.1-next-1738917599.0

package/lib/browser/widget/inline-input/model.d.ts

@@ -1,5 +1,5 @@
 import { MaybePromise } from '@opensumi/ide-core-common';
-import { ICodeEditor } from '@opensumi/ide-monaco';
+import { ICodeEditor, IPosition, Selection } from '@opensumi/ide-monaco';
 import { ERunStrategy, IInteractiveInputHandler } from '../../types';
 type TRunStrategyFn = (editor: ICodeEditor, value: string) => MaybePromise<ERunStrategy>;
 export declare class InteractiveInputModel {
@@ -12,5 +12,23 @@ export declare class InteractiveInputModel {
     strategyHandler(): TRunStrategyFn;
     dispose(): void;
 }
+export declare class InlineInputWidgetStoreInEmptyLine {
+    private position;
+    private value?;
+    constructor(position: IPosition, value?: string | undefined);
+    getPosition(): IPosition;
+    setPosition(position: IPosition): void;
+    getValue(): string | undefined;
+    setValue(value: string): void;
+}
+export declare class InlineInputWidgetStoreInSelection {
+    private selection;
+    private value?;
+    constructor(selection: Selection, value?: string | undefined);
+    getSelection(): Selection;
+    setSelection(selection: Selection): void;
+    getValue(): string | undefined;
+    setValue(value: string): void;
+}
 export {};
 //# sourceMappingURL=model.d.ts.map

package/lib/browser/widget/inline-input/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../../src/browser/widget/inline-input/model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAQ,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,YAAY,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAErE,KAAK,cAAc,GAAG,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,KAAK,YAAY,CAAC,YAAY,CAAC,CAAC;AAEzF,qBAAa,qBAAqB;IAChC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAgD;IAEjE,OAAO,CAAC,QAAQ,CAAuC;IACvD,OAAO,CAAC,gBAAgB,CAAiB;IAElC,UAAU,CAAC,CAAC,EAAE,wBAAwB,GAAG,IAAI;IAI7C,OAAO,IAAI,wBAAwB,GAAG,SAAS;IAI/C,kBAAkB,CAAC,EAAE,EAAE,cAAc,GAAG,IAAI;IAI5C,eAAe,IAAI,cAAc;IAIjC,OAAO,IAAI,IAAI;CAGvB"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../../src/browser/widget/inline-input/model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAQ,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEzE,OAAO,EAAE,YAAY,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAErE,KAAK,cAAc,GAAG,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,KAAK,YAAY,CAAC,YAAY,CAAC,CAAC;AAEzF,qBAAa,qBAAqB;IAChC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAgD;IAEjE,OAAO,CAAC,QAAQ,CAAuC;IACvD,OAAO,CAAC,gBAAgB,CAAiB;IAElC,UAAU,CAAC,CAAC,EAAE,wBAAwB,GAAG,IAAI;IAI7C,OAAO,IAAI,wBAAwB,GAAG,SAAS;IAI/C,kBAAkB,CAAC,EAAE,EAAE,cAAc,GAAG,IAAI;IAI5C,eAAe,IAAI,cAAc;IAIjC,OAAO,IAAI,IAAI;CAGvB;AAED,qBAAa,iCAAiC;IAChC,OAAO,CAAC,QAAQ;IAAa,OAAO,CAAC,KAAK,CAAC;gBAAnC,QAAQ,EAAE,SAAS,EAAU,KAAK,CAAC,EAAE,MAAM,YAAA;IAExD,WAAW,IAAI,SAAS;IAIxB,WAAW,CAAC,QAAQ,EAAE,SAAS,GAAG,IAAI;IAItC,QAAQ,IAAI,MAAM,GAAG,SAAS;IAI9B,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;CAGrC;AAED,qBAAa,iCAAiC;IAChC,OAAO,CAAC,SAAS;IAAa,OAAO,CAAC,KAAK,CAAC;gBAApC,SAAS,EAAE,SAAS,EAAU,KAAK,CAAC,EAAE,MAAM,YAAA;IAEzD,YAAY,IAAI,SAAS;IAIzB,YAAY,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAIxC,QAAQ,IAAI,MAAM,GAAG,SAAS;IAI9B,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;CAGrC"}

package/lib/browser/widget/inline-input/model.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InteractiveInputModel = void 0;
+exports.InlineInputWidgetStoreInSelection = exports.InlineInputWidgetStoreInEmptyLine = exports.InteractiveInputModel = void 0;
 const ai_native_1 = require("@opensumi/ide-core-browser/lib/components/ai-native");
 const ide_core_common_1 = require("@opensumi/ide-core-common");
 class InteractiveInputModel {
@@ -22,4 +22,42 @@ class InteractiveInputModel {
 }
 exports.InteractiveInputModel = InteractiveInputModel;
 InteractiveInputModel.ID = `${ai_native_1.InteractiveInput.displayName}:${(0, ide_core_common_1.uuid)(4)}`;
+class InlineInputWidgetStoreInEmptyLine {
+    constructor(position, value) {
+        this.position = position;
+        this.value = value;
+    }
+    getPosition() {
+        return this.position;
+    }
+    setPosition(position) {
+        this.position = position;
+    }
+    getValue() {
+        return this.value;
+    }
+    setValue(value) {
+        this.value = value;
+    }
+}
+exports.InlineInputWidgetStoreInEmptyLine = InlineInputWidgetStoreInEmptyLine;
+class InlineInputWidgetStoreInSelection {
+    constructor(selection, value) {
+        this.selection = selection;
+        this.value = value;
+    }
+    getSelection() {
+        return this.selection;
+    }
+    setSelection(selection) {
+        this.selection = selection;
+    }
+    getValue() {
+        return this.value;
+    }
+    setValue(value) {
+        this.value = value;
+    }
+}
+exports.InlineInputWidgetStoreInSelection = InlineInputWidgetStoreInSelection;
 //# sourceMappingURL=model.js.map

package/lib/browser/widget/inline-input/model.js.map

@@ -1 +1 @@
-{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../src/browser/widget/inline-input/model.ts"],"names":[],"mappings":";;;AAAA,mFAAuF;AACvF,+DAA+D;AAO/D,MAAa,qBAAqB;IAMzB,UAAU,CAAC,CAA2B;QAC3C,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;IACpB,CAAC;IAEM,OAAO;QACZ,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAEM,kBAAkB,CAAC,EAAkB;QAC1C,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;IAC7B,CAAC;IAEM,eAAe;QACpB,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAEM,OAAO;QACZ,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;IAC5B,CAAC;;AAxBH,sDAyBC;AAxBQ,wBAAE,GAAW,GAAG,4BAAgB,CAAC,WAAW,IAAI,IAAA,sBAAI,EAAC,CAAC,CAAC,EAAE,CAAC"}
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../src/browser/widget/inline-input/model.ts"],"names":[],"mappings":";;;AAAA,mFAAuF;AACvF,+DAA+D;AAO/D,MAAa,qBAAqB;IAMzB,UAAU,CAAC,CAA2B;QAC3C,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;IACpB,CAAC;IAEM,OAAO;QACZ,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAEM,kBAAkB,CAAC,EAAkB;QAC1C,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;IAC7B,CAAC;IAEM,eAAe;QACpB,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAEM,OAAO;QACZ,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;IAC5B,CAAC;;AAxBH,sDAyBC;AAxBQ,wBAAE,GAAW,GAAG,4BAAgB,CAAC,WAAW,IAAI,IAAA,sBAAI,EAAC,CAAC,CAAC,EAAE,CAAC;AA0BnE,MAAa,iCAAiC;IAC5C,YAAoB,QAAmB,EAAU,KAAc;QAA3C,aAAQ,GAAR,QAAQ,CAAW;QAAU,UAAK,GAAL,KAAK,CAAS;IAAG,CAAC;IAE5D,WAAW;QAChB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAEM,WAAW,CAAC,QAAmB;QACpC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEM,QAAQ;QACb,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAEM,QAAQ,CAAC,KAAa;QAC3B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;CACF;AAlBD,8EAkBC;AAED,MAAa,iCAAiC;IAC5C,YAAoB,SAAoB,EAAU,KAAc;QAA5C,cAAS,GAAT,SAAS,CAAW;QAAU,UAAK,GAAL,KAAK,CAAS;IAAG,CAAC;IAE7D,YAAY;QACjB,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAEM,YAAY,CAAC,SAAoB;QACtC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAEM,QAAQ;QACb,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAEM,QAAQ,CAAC,KAAa;QAC3B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;CACF;AAlBD,8EAkBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-ai-native",
-  "version": "3.7.1-next-1738824147.0",
+  "version": "3.7.1-next-1738917599.0",
   "files": [
     "lib",
     "src"
@@ -19,24 +19,24 @@
     "url": "git@github.com:opensumi/core.git"
   },
   "dependencies": {
-    "@opensumi/ide-components": "3.7.1-next-1738824147.0",
-    "@opensumi/ide-core-common": "3.7.1-next-1738824147.0",
-    "@opensumi/ide-core-node": "3.7.1-next-1738824147.0",
-    "@opensumi/ide-debug": "3.7.1-next-1738824147.0",
-    "@opensumi/ide-design": "3.7.1-next-1738824147.0",
-    "@opensumi/ide-editor": "3.7.1-next-1738824147.0",
-    "@opensumi/ide-file-service": "3.7.1-next-1738824147.0",
-    "@opensumi/ide-file-tree-next": "3.7.1-next-1738824147.0",
-    "@opensumi/ide-main-layout": "3.7.1-next-1738824147.0",
-    "@opensumi/ide-markers": "3.7.1-next-1738824147.0",
-    "@opensumi/ide-menu-bar": "3.7.1-next-1738824147.0",
-    "@opensumi/ide-monaco": "3.7.1-next-1738824147.0",
-    "@opensumi/ide-overlay": "3.7.1-next-1738824147.0",
-    "@opensumi/ide-preferences": "3.7.1-next-1738824147.0",
-    "@opensumi/ide-terminal-next": "3.7.1-next-1738824147.0",
-    "@opensumi/ide-theme": "3.7.1-next-1738824147.0",
-    "@opensumi/ide-utils": "3.7.1-next-1738824147.0",
-    "@opensumi/ide-workspace": "3.7.1-next-1738824147.0",
+    "@opensumi/ide-components": "3.7.1-next-1738917599.0",
+    "@opensumi/ide-core-common": "3.7.1-next-1738917599.0",
+    "@opensumi/ide-core-node": "3.7.1-next-1738917599.0",
+    "@opensumi/ide-debug": "3.7.1-next-1738917599.0",
+    "@opensumi/ide-design": "3.7.1-next-1738917599.0",
+    "@opensumi/ide-editor": "3.7.1-next-1738917599.0",
+    "@opensumi/ide-file-service": "3.7.1-next-1738917599.0",
+    "@opensumi/ide-file-tree-next": "3.7.1-next-1738917599.0",
+    "@opensumi/ide-main-layout": "3.7.1-next-1738917599.0",
+    "@opensumi/ide-markers": "3.7.1-next-1738917599.0",
+    "@opensumi/ide-menu-bar": "3.7.1-next-1738917599.0",
+    "@opensumi/ide-monaco": "3.7.1-next-1738917599.0",
+    "@opensumi/ide-overlay": "3.7.1-next-1738917599.0",
+    "@opensumi/ide-preferences": "3.7.1-next-1738917599.0",
+    "@opensumi/ide-terminal-next": "3.7.1-next-1738917599.0",
+    "@opensumi/ide-theme": "3.7.1-next-1738917599.0",
+    "@opensumi/ide-utils": "3.7.1-next-1738917599.0",
+    "@opensumi/ide-workspace": "3.7.1-next-1738917599.0",
     "@xterm/xterm": "5.5.0",
     "ansi-regex": "^2.0.0",
     "dom-align": "^1.7.0",
@@ -46,7 +46,7 @@
     "web-tree-sitter": "0.22.6"
   },
   "devDependencies": {
-    "@opensumi/ide-core-browser": "3.7.1-next-1738824147.0"
+    "@opensumi/ide-core-browser": "3.7.1-next-1738917599.0"
   },
-  "gitHead": "02602f682849bbc5a11335109cfbe6501c268990"
+  "gitHead": "888e545820c021e6148e4ff7ef72dfc8dbd9527e"
 }

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

@@ -151,13 +151,6 @@ export class AIInlineContentWidget extends ReactInlineContentWidget {
     super(editor);
 
     this.aiNativeContextKey = this.injector.get(AINativeContextKey, [this.editor.contextKeyService]);
-    this.addDispose(
-      this.editor.onDidLayoutChange(() => {
-        if (this.isOutOfArea()) {
-          this.dispose();
-        }
-      }),
-    );
   }
 
   public launchChatStatus(status: EInlineChatStatus) {

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

@@ -21,10 +21,12 @@ interface IInlineInputWidgetRenderProps {
   onInteractiveInputSend?: (value: string) => void;
   onChatStatus: Event<EInlineChatStatus>;
   onResultClick: (k: EResultKind) => void;
+  onValueChange?: (value: string) => void;
 }
 
 const InlineInputWidgetRender = (props: IInlineInputWidgetRenderProps) => {
-  const { defaultValue, onClose, onInteractiveInputSend, onLayoutChange, onChatStatus, onResultClick } = props;
+  const { defaultValue, onClose, onInteractiveInputSend, onLayoutChange, onChatStatus, onResultClick, onValueChange } =
+    props;
   const [status, setStatus] = useState<EInlineChatStatus>(EInlineChatStatus.READY);
   const aiNativeConfigService = useInjectable<AINativeConfigService>(AINativeConfigService);
 
@@ -69,6 +71,7 @@ const InlineInputWidgetRender = (props: IInlineInputWidgetRenderProps) => {
         <InteractiveInput
           autoFocus
           defaultValue={defaultValue}
+          onValueChange={onValueChange}
           onHeightChange={(height) => onLayoutChange(height)}
           size='small'
           placeholder={localize('aiNative.inline.chat.input.placeholder.default')}
@@ -82,16 +85,19 @@ const InlineInputWidgetRender = (props: IInlineInputWidgetRenderProps) => {
 };
 
 @Injectable({ multiple: true })
-export class InlineInputChatWidget extends AIInlineContentWidget {
+export class InlineInputWidget extends AIInlineContentWidget {
   allowEditorOverflow = true;
   positionPreference = [ContentWidgetPositionPreference.ABOVE];
 
-  protected readonly _onInteractiveInputValue = new Emitter<string>();
-  public readonly onInteractiveInputValue = this._onInteractiveInputValue.event;
+  protected readonly _onSend = new Emitter<string>();
+  public readonly onSend = this._onSend.event;
 
   protected readonly _onClose = new Emitter<void>();
   public readonly onClose = this._onClose.event;
 
+  protected readonly _onValueChange = new Emitter<string>();
+  public readonly onValueChange = this._onValueChange.event;
+
   constructor(protected readonly editor: IMonacoCodeEditor, protected readonly defaultValue?: string) {
     super(editor);
   }
@@ -115,9 +121,12 @@ export class InlineInputChatWidget extends AIInlineContentWidget {
           onLayoutChange={() => {
             this.editor.layoutContentWidget(this);
           }}
+          onValueChange={(value) => {
+            this._onValueChange.fire(value);
+          }}
           onInteractiveInputSend={(value) => {
             this.launchChatStatus(EInlineChatStatus.THINKING);
-            this._onInteractiveInputValue.fire(value);
+            this._onSend.fire(value);
           }}
           onResultClick={(k: EResultKind) => {
             this._onResultClick.fire(k);

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

@@ -15,6 +15,13 @@ import {
 import { EditorGroupCloseEvent } from '@opensumi/ide-editor/lib/browser';
 import * as monaco from '@opensumi/ide-monaco';
 import { ICodeEditor } from '@opensumi/ide-monaco';
+import {
+  IObservable,
+  ISettableObservable,
+  autorun,
+  observableFromEvent,
+  observableValue,
+} from '@opensumi/ide-monaco/lib/common/observable';
 import { MessageService } from '@opensumi/ide-overlay/lib/browser/message.service';
 import { EditOperation } from '@opensumi/monaco-editor-core/esm/vs/editor/common/core/editOperation';
 import { LineRange } from '@opensumi/monaco-editor-core/esm/vs/editor/common/core/lineRange';
@@ -28,11 +35,10 @@ import { EInlineChatStatus, EResultKind } from '../inline-chat/inline-chat.servi
 import { InlineDiffController } from '../inline-diff';
 import { InlineInputPreviewDecorationID } from '../internal.type';
 
-
-import { InlineInputChatWidget } from './inline-input-widget';
+import { InlineInputWidget } from './inline-input-widget';
 import styles from './inline-input.module.less';
 import { InlineInputService } from './inline-input.service';
-
+import { InlineInputWidgetStoreInEmptyLine, InlineInputWidgetStoreInSelection } from './model';
 @Injectable()
 export class InlineInputController extends BaseAIMonacoEditorController {
   public static readonly ID = 'editor.contrib.ai.inline.input';
@@ -61,11 +67,25 @@ export class InlineInputController extends BaseAIMonacoEditorController {
   private inputDisposable: Disposable;
   private aiNativeContextKey: AINativeContextKey;
 
+  private inputValue: ISettableObservable<string>;
+  private modelChangeObs: IObservable<monaco.editor.ITextModel, unknown>;
+  private inlineInputWidgetStore = new Map<
+    string,
+    InlineInputWidgetStoreInEmptyLine | InlineInputWidgetStoreInSelection | null
+  >();
+
   mount(): IDisposable {
     this.inputDisposable = new Disposable();
     this.aiNativeContextKey = this.injector.get(AINativeContextKey, [this.monacoEditor.contextKeyService]);
     this.inlineDiffController = InlineDiffController.get(this.monacoEditor)!;
 
+    this.inputValue = observableValue(this, '');
+    this.modelChangeObs = observableFromEvent<monaco.editor.ITextModel>(
+      this,
+      this.monacoEditor.onDidChangeModel,
+      () => this.monacoEditor.getModel()!,
+    );
+
     this.featureDisposable.addDispose(
       /**
        * 如果在流式过程中，直接关闭了当前文件，则需要销毁 diff previewer 并隐藏 input，恢复原始代码
@@ -92,10 +112,7 @@ export class InlineInputController extends BaseAIMonacoEditorController {
     );
 
     this.featureDisposable.addDispose(
-      Event.any<any>(
-        this.inlineInputService.onHidden,
-        this.monacoEditor.onWillChangeModel,
-      )(() => {
+      this.inlineInputService.onHidden(() => {
         this.hideInput();
       }),
     );
@@ -120,6 +137,27 @@ export class InlineInputController extends BaseAIMonacoEditorController {
       }),
     );
 
+    this.featureDisposable.addDispose(
+      autorun((reader) => {
+        const model = this.modelChangeObs.read(reader);
+        if (!model) {
+          return;
+        }
+
+        const storeData = this.inlineInputWidgetStore.get(model.id);
+        if (!storeData) {
+          this.hideInput();
+          return;
+        }
+
+        if (storeData instanceof InlineInputWidgetStoreInEmptyLine) {
+          this.showInputInEmptyLine(storeData.getPosition(), this.monacoEditor, storeData.getValue());
+        } else if (storeData instanceof InlineInputWidgetStoreInSelection) {
+          this.showInputInSelection(storeData.getSelection(), this.monacoEditor, storeData.getValue());
+        }
+      }),
+    );
+
     this.featureDisposable.addDispose(this.inputDisposable);
 
     return this.featureDisposable;
@@ -131,6 +169,7 @@ export class InlineInputController extends BaseAIMonacoEditorController {
   }
 
   private hideInput() {
+    this.inlineInputWidgetStore.delete(this.monacoEditor.getModel()!.id);
     this.inputDisposable.dispose();
   }
 
@@ -146,15 +185,16 @@ export class InlineInputController extends BaseAIMonacoEditorController {
       return;
     }
 
+    this.inputValue.set(defaultValue || '', undefined);
+    this.inlineInputWidgetStore.set(model.id, new InlineInputWidgetStoreInEmptyLine(position, defaultValue));
+
     if (this.inputDisposable) {
       this.inputDisposable.dispose();
       this.inputDisposable = new Disposable();
     }
 
     const collection = monacoEditor.createDecorationsCollection();
-    const inlineInputChatWidget = this.injector.get(InlineInputChatWidget, [monacoEditor, defaultValue]);
-
-    let inputValue = defaultValue;
+    const inlineInputWidget = this.injector.get(InlineInputWidget, [monacoEditor, this.inputValue.get()]);
 
     // 仅在空行情况下增加装饰逻辑
     collection.append([
@@ -173,12 +213,12 @@ export class InlineInputController extends BaseAIMonacoEditorController {
     let preLineRange: LineRange;
     if (decorationRange) {
       preLineRange = LineRange.fromRange(decorationRange);
-      inlineInputChatWidget.show({ position: decorationRange.getStartPosition() });
+      inlineInputWidget.show({ position: decorationRange.getStartPosition() });
       this.aiNativeContextKey.inlineInputWidgetIsVisible.set(true);
     }
 
     this.inputDisposable.addDispose(
-      inlineInputChatWidget.onDispose(() => {
+      inlineInputWidget.onDispose(() => {
         this.cancelToken();
         collection.clear();
         this.aiNativeContextKey.inlineInputWidgetIsVisible.set(false);
@@ -186,7 +226,18 @@ export class InlineInputController extends BaseAIMonacoEditorController {
     );
 
     this.inputDisposable.addDispose(
-      inlineInputChatWidget.onResultClick(async (kind: EResultKind) => {
+      inlineInputWidget.onValueChange((value) => {
+        this.inputValue.set(value, undefined);
+
+        const storeData = this.inlineInputWidgetStore.get(model.id);
+        if (storeData instanceof InlineInputWidgetStoreInEmptyLine) {
+          storeData.setValue(value);
+        }
+      }),
+    );
+
+    this.inputDisposable.addDispose(
+      inlineInputWidget.onResultClick(async (kind: EResultKind) => {
         const clear = () => {
           const curPosi = collection.getRange(0)!;
 
@@ -211,7 +262,7 @@ export class InlineInputController extends BaseAIMonacoEditorController {
                */
               const curPosi = collection.getRange(0)!;
               const curPosition = curPosi.getStartPosition();
-              this.showInputInEmptyLine(curPosition, monacoEditor, inputValue);
+              this.showInputInEmptyLine(curPosition, monacoEditor, this.inputValue.get());
             });
             break;
 
@@ -234,18 +285,18 @@ export class InlineInputController extends BaseAIMonacoEditorController {
         const range = collection.getRange(0)!;
         const curLineRange = LineRange.fromRange(range);
         if (!preLineRange.equals(curLineRange)) {
-          inlineInputChatWidget.setOptions({
+          inlineInputWidget.setOptions({
             position: range.getStartPosition(),
           });
 
-          inlineInputChatWidget.layoutContentWidget();
+          inlineInputWidget.layoutContentWidget();
         }
         preLineRange = curLineRange;
       }),
     );
 
     this.inputDisposable.addDispose(
-      inlineInputChatWidget.onClose(() => {
+      inlineInputWidget.onClose(() => {
         const isStreaming = this.aiNativeContextKey.inlineInputWidgetIsStreaming.get();
         if (isStreaming) {
           this.cancelToken();
@@ -256,8 +307,7 @@ export class InlineInputController extends BaseAIMonacoEditorController {
     );
 
     this.inputDisposable.addDispose(
-      inlineInputChatWidget.onInteractiveInputValue(async (value) => {
-        inputValue = value;
+      inlineInputWidget.onSend(async (value) => {
         monacoEditor.focus();
 
         const handler = this.inlineInputService.getInteractiveInputHandler();
@@ -267,13 +317,13 @@ export class InlineInputController extends BaseAIMonacoEditorController {
           return;
         }
 
-        inlineInputChatWidget.launchChatStatus(EInlineChatStatus.THINKING);
+        inlineInputWidget.launchChatStatus(EInlineChatStatus.THINKING);
 
         const strategy = await this.inlineInputService.getInteractiveInputStrategyHandler()(monacoEditor, value);
 
         if (strategy === ERunStrategy.EXECUTE && handler.execute) {
           handler.execute(monacoEditor, value, this.token);
-          inlineInputChatWidget.launchChatStatus(EInlineChatStatus.DONE);
+          inlineInputWidget.launchChatStatus(EInlineChatStatus.DONE);
           this.hideInput();
           return;
         }
@@ -282,7 +332,7 @@ export class InlineInputController extends BaseAIMonacoEditorController {
           const previewResponse = await handler.providePreviewStrategy(monacoEditor, value, this.token);
 
           if (CancelResponse.is(previewResponse)) {
-            inlineInputChatWidget.launchChatStatus(EInlineChatStatus.READY);
+            inlineInputWidget.launchChatStatus(EInlineChatStatus.READY);
             this.hideInput();
             return;
           }
@@ -315,17 +365,17 @@ export class InlineInputController extends BaseAIMonacoEditorController {
               }),
               controller.onError((error) => {
                 this.aiNativeContextKey.inlineInputWidgetIsStreaming.set(false);
-                inlineInputChatWidget.launchChatStatus(EInlineChatStatus.ERROR);
+                inlineInputWidget.launchChatStatus(EInlineChatStatus.ERROR);
               }),
               controller.onAbort(() => {
                 this.aiNativeContextKey.inlineInputWidgetIsStreaming.set(false);
                 model.pushStackElement();
-                inlineInputChatWidget.launchChatStatus(EInlineChatStatus.DONE);
+                inlineInputWidget.launchChatStatus(EInlineChatStatus.DONE);
               }),
               controller.onEnd(() => {
                 this.aiNativeContextKey.inlineInputWidgetIsStreaming.set(false);
                 model.pushStackElement();
-                inlineInputChatWidget.launchChatStatus(EInlineChatStatus.DONE);
+                inlineInputWidget.launchChatStatus(EInlineChatStatus.DONE);
               }),
             ]);
 
@@ -335,7 +385,7 @@ export class InlineInputController extends BaseAIMonacoEditorController {
       }),
     );
 
-    this.inputDisposable.addDispose(inlineInputChatWidget);
+    this.inputDisposable.addDispose(inlineInputWidget);
   }
 
   private async showInputInSelection(selection: monaco.Selection, monacoEditor: ICodeEditor, defaultValue?: string) {
@@ -344,24 +394,59 @@ export class InlineInputController extends BaseAIMonacoEditorController {
       this.inputDisposable = new Disposable();
     }
 
-    monacoEditor.setSelection(selection);
+    const model = monacoEditor.getModel();
+    if (!model) {
+      return;
+    }
 
-    const inlineInputChatWidget = this.injector.get(InlineInputChatWidget, [monacoEditor, defaultValue]);
-    inlineInputChatWidget.show({ selection });
+    this.inputValue.set(defaultValue || '', undefined);
+    this.inlineInputWidgetStore.set(model.id, new InlineInputWidgetStoreInSelection(selection, defaultValue));
+
+    const decorationsCollection = monacoEditor.createDecorationsCollection();
+    decorationsCollection.set([
+      {
+        range: monaco.Range.fromPositions(
+          { lineNumber: selection.startLineNumber, column: 1 },
+          {
+            lineNumber: selection.endLineNumber,
+            column: monacoEditor.getModel()!.getLineMaxColumn(selection.endLineNumber),
+          },
+        ),
+        options: ModelDecorationOptions.register({
+          description: InlineInputPreviewDecorationID,
+          isWholeLine: true,
+          className: styles.input_decoration_pending_container,
+        }),
+      },
+    ]);
+
+    const inlineInputWidget = this.injector.get(InlineInputWidget, [monacoEditor, this.inputValue.get()]);
+    inlineInputWidget.show({ selection });
 
     this.aiNativeContextKey.inlineInputWidgetIsVisible.set(true);
     this.inlineDiffController.destroyPreviewer(monacoEditor.getModel()?.uri.toString());
-    let inputValue = defaultValue;
 
     this.inputDisposable.addDispose(
-      inlineInputChatWidget.onDispose(() => {
+      inlineInputWidget.onDispose(() => {
         this.cancelToken();
+        decorationsCollection.clear();
         this.aiNativeContextKey.inlineInputWidgetIsVisible.set(false);
       }),
     );
 
     this.inputDisposable.addDispose(
-      inlineInputChatWidget.onClose(() => {
+      inlineInputWidget.onValueChange((value) => {
+        this.inputValue.set(value, undefined);
+
+        const storeData = this.inlineInputWidgetStore.get(model.id);
+        if (storeData instanceof InlineInputWidgetStoreInSelection) {
+          storeData.setValue(value);
+        }
+      }),
+    );
+
+    this.inputDisposable.addDispose(
+      inlineInputWidget.onClose(() => {
         const isStreaming = this.aiNativeContextKey.inlineInputWidgetIsStreaming.get();
         if (isStreaming) {
           this.cancelToken();
@@ -372,9 +457,9 @@ export class InlineInputController extends BaseAIMonacoEditorController {
     );
 
     this.inputDisposable.addDispose(
-      inlineInputChatWidget.onInteractiveInputValue(async (value) => {
-        inputValue = value;
+      inlineInputWidget.onSend(async (value) => {
         monacoEditor.focus();
+        decorationsCollection.clear();
 
         const handler = this.inlineInputService.getInteractiveInputHandler();
 
@@ -382,7 +467,7 @@ export class InlineInputController extends BaseAIMonacoEditorController {
           return;
         }
 
-        inlineInputChatWidget.launchChatStatus(EInlineChatStatus.THINKING);
+        inlineInputWidget.launchChatStatus(EInlineChatStatus.THINKING);
 
         const strategy = await this.inlineInputService.getInteractiveInputStrategyHandler()(monacoEditor, value);
 
@@ -394,7 +479,7 @@ export class InlineInputController extends BaseAIMonacoEditorController {
           const previewResponse = await handler.providePreviewStrategy(monacoEditor, value, this.token);
 
           if (CancelResponse.is(previewResponse)) {
-            inlineInputChatWidget.launchChatStatus(EInlineChatStatus.READY);
+            inlineInputWidget.launchChatStatus(EInlineChatStatus.READY);
             this.hideInput();
             return;
           }
@@ -410,15 +495,15 @@ export class InlineInputController extends BaseAIMonacoEditorController {
               }),
               chatResponse.onError((error) => {
                 this.aiNativeContextKey.inlineInputWidgetIsStreaming.set(false);
-                inlineInputChatWidget.launchChatStatus(EInlineChatStatus.ERROR);
+                inlineInputWidget.launchChatStatus(EInlineChatStatus.ERROR);
               }),
               chatResponse.onAbort(() => {
                 this.aiNativeContextKey.inlineInputWidgetIsStreaming.set(false);
-                inlineInputChatWidget.launchChatStatus(EInlineChatStatus.DONE);
+                inlineInputWidget.launchChatStatus(EInlineChatStatus.DONE);
               }),
               chatResponse.onEnd(() => {
                 this.aiNativeContextKey.inlineInputWidgetIsStreaming.set(false);
-                inlineInputChatWidget.launchChatStatus(EInlineChatStatus.DONE);
+                inlineInputWidget.launchChatStatus(EInlineChatStatus.DONE);
               }),
             ]);
 
@@ -428,28 +513,28 @@ export class InlineInputController extends BaseAIMonacoEditorController {
               crossSelection,
               chatResponse,
             });
-            diffPreviewer.mount(inlineInputChatWidget);
+            diffPreviewer.mount(inlineInputWidget);
           }
         } else {
-          inlineInputChatWidget.launchChatStatus(EInlineChatStatus.READY);
+          inlineInputWidget.launchChatStatus(EInlineChatStatus.READY);
           this.hideInput();
         }
       }),
     );
 
     this.inputDisposable.addDispose(
-      inlineInputChatWidget.onResultClick((kind: EResultKind) => {
+      inlineInputWidget.onResultClick((kind: EResultKind) => {
         this.inlineDiffController.handleAction(kind);
         this.hideInput();
 
         if (kind === EResultKind.REGENERATE) {
           requestAnimationFrame(() => {
-            this.showInputInSelection(selection, monacoEditor, inputValue);
+            this.showInputInSelection(selection, monacoEditor, this.inputValue.get());
           });
         }
       }),
     );
 
-    this.inputDisposable.addDispose(inlineInputChatWidget);
+    this.inputDisposable.addDispose(inlineInputWidget);
   }
 }

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

@@ -5,3 +5,7 @@
 .input_wrapper {
   transform: translateY(-4px);
 }
+
+.input_decoration_pending_container {
+  background-color: var(--vscode-diffEditor-unchangedCodeBackground);
+}