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

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

@@ -15,13 +15,6 @@ 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';
@@ -35,10 +28,10 @@ import { EInlineChatStatus, EResultKind } from '../inline-chat/inline-chat.servi
 import { InlineDiffController } from '../inline-diff';
 import { InlineInputPreviewDecorationID } from '../internal.type';
 
-import { InlineInputWidget } from './inline-input-widget';
+import { InlineInputChatWidget } 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';
@@ -67,25 +60,11 @@ 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，恢复原始代码
@@ -112,7 +91,10 @@ export class InlineInputController extends BaseAIMonacoEditorController {
     );
 
     this.featureDisposable.addDispose(
-      this.inlineInputService.onHidden(() => {
+      Event.any<any>(
+        this.inlineInputService.onHidden,
+        this.monacoEditor.onWillChangeModel,
+      )(() => {
         this.hideInput();
       }),
     );
@@ -137,27 +119,6 @@ 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;
@@ -169,7 +130,6 @@ export class InlineInputController extends BaseAIMonacoEditorController {
   }
 
   private hideInput() {
-    this.inlineInputWidgetStore.delete(this.monacoEditor.getModel()!.id);
     this.inputDisposable.dispose();
   }
 
@@ -185,16 +145,15 @@ 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 inlineInputWidget = this.injector.get(InlineInputWidget, [monacoEditor, this.inputValue.get()]);
+    const inlineInputChatWidget = this.injector.get(InlineInputChatWidget, [monacoEditor, defaultValue]);
+
+    let inputValue = defaultValue;
 
     // 仅在空行情况下增加装饰逻辑
     collection.append([
@@ -213,12 +172,12 @@ export class InlineInputController extends BaseAIMonacoEditorController {
     let preLineRange: LineRange;
     if (decorationRange) {
       preLineRange = LineRange.fromRange(decorationRange);
-      inlineInputWidget.show({ position: decorationRange.getStartPosition() });
+      inlineInputChatWidget.show({ position: decorationRange.getStartPosition() });
       this.aiNativeContextKey.inlineInputWidgetIsVisible.set(true);
     }
 
     this.inputDisposable.addDispose(
-      inlineInputWidget.onDispose(() => {
+      inlineInputChatWidget.onDispose(() => {
         this.cancelToken();
         collection.clear();
         this.aiNativeContextKey.inlineInputWidgetIsVisible.set(false);
@@ -226,18 +185,7 @@ export class InlineInputController extends BaseAIMonacoEditorController {
     );
 
     this.inputDisposable.addDispose(
-      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) => {
+      inlineInputChatWidget.onResultClick(async (kind: EResultKind) => {
         const clear = () => {
           const curPosi = collection.getRange(0)!;
 
@@ -262,7 +210,7 @@ export class InlineInputController extends BaseAIMonacoEditorController {
                */
               const curPosi = collection.getRange(0)!;
               const curPosition = curPosi.getStartPosition();
-              this.showInputInEmptyLine(curPosition, monacoEditor, this.inputValue.get());
+              this.showInputInEmptyLine(curPosition, monacoEditor, inputValue);
             });
             break;
 
@@ -285,18 +233,18 @@ export class InlineInputController extends BaseAIMonacoEditorController {
         const range = collection.getRange(0)!;
         const curLineRange = LineRange.fromRange(range);
         if (!preLineRange.equals(curLineRange)) {
-          inlineInputWidget.setOptions({
+          inlineInputChatWidget.setOptions({
             position: range.getStartPosition(),
           });
 
-          inlineInputWidget.layoutContentWidget();
+          inlineInputChatWidget.layoutContentWidget();
         }
         preLineRange = curLineRange;
       }),
     );
 
     this.inputDisposable.addDispose(
-      inlineInputWidget.onClose(() => {
+      inlineInputChatWidget.onClose(() => {
         const isStreaming = this.aiNativeContextKey.inlineInputWidgetIsStreaming.get();
         if (isStreaming) {
           this.cancelToken();
@@ -307,7 +255,8 @@ export class InlineInputController extends BaseAIMonacoEditorController {
     );
 
     this.inputDisposable.addDispose(
-      inlineInputWidget.onSend(async (value) => {
+      inlineInputChatWidget.onInteractiveInputValue(async (value) => {
+        inputValue = value;
         monacoEditor.focus();
 
         const handler = this.inlineInputService.getInteractiveInputHandler();
@@ -317,13 +266,13 @@ export class InlineInputController extends BaseAIMonacoEditorController {
           return;
         }
 
-        inlineInputWidget.launchChatStatus(EInlineChatStatus.THINKING);
+        inlineInputChatWidget.launchChatStatus(EInlineChatStatus.THINKING);
 
         const strategy = await this.inlineInputService.getInteractiveInputStrategyHandler()(monacoEditor, value);
 
         if (strategy === ERunStrategy.EXECUTE && handler.execute) {
           handler.execute(monacoEditor, value, this.token);
-          inlineInputWidget.launchChatStatus(EInlineChatStatus.DONE);
+          inlineInputChatWidget.launchChatStatus(EInlineChatStatus.DONE);
           this.hideInput();
           return;
         }
@@ -332,7 +281,7 @@ export class InlineInputController extends BaseAIMonacoEditorController {
           const previewResponse = await handler.providePreviewStrategy(monacoEditor, value, this.token);
 
           if (CancelResponse.is(previewResponse)) {
-            inlineInputWidget.launchChatStatus(EInlineChatStatus.READY);
+            inlineInputChatWidget.launchChatStatus(EInlineChatStatus.READY);
             this.hideInput();
             return;
           }
@@ -365,17 +314,17 @@ export class InlineInputController extends BaseAIMonacoEditorController {
               }),
               controller.onError((error) => {
                 this.aiNativeContextKey.inlineInputWidgetIsStreaming.set(false);
-                inlineInputWidget.launchChatStatus(EInlineChatStatus.ERROR);
+                inlineInputChatWidget.launchChatStatus(EInlineChatStatus.ERROR);
               }),
               controller.onAbort(() => {
                 this.aiNativeContextKey.inlineInputWidgetIsStreaming.set(false);
                 model.pushStackElement();
-                inlineInputWidget.launchChatStatus(EInlineChatStatus.DONE);
+                inlineInputChatWidget.launchChatStatus(EInlineChatStatus.DONE);
               }),
               controller.onEnd(() => {
                 this.aiNativeContextKey.inlineInputWidgetIsStreaming.set(false);
                 model.pushStackElement();
-                inlineInputWidget.launchChatStatus(EInlineChatStatus.DONE);
+                inlineInputChatWidget.launchChatStatus(EInlineChatStatus.DONE);
               }),
             ]);
 
@@ -385,7 +334,7 @@ export class InlineInputController extends BaseAIMonacoEditorController {
       }),
     );
 
-    this.inputDisposable.addDispose(inlineInputWidget);
+    this.inputDisposable.addDispose(inlineInputChatWidget);
   }
 
   private async showInputInSelection(selection: monaco.Selection, monacoEditor: ICodeEditor, defaultValue?: string) {
@@ -394,14 +343,6 @@ export class InlineInputController extends BaseAIMonacoEditorController {
       this.inputDisposable = new Disposable();
     }
 
-    const model = monacoEditor.getModel();
-    if (!model) {
-      return;
-    }
-
-    this.inputValue.set(defaultValue || '', undefined);
-    this.inlineInputWidgetStore.set(model.id, new InlineInputWidgetStoreInSelection(selection, defaultValue));
-
     const decorationsCollection = monacoEditor.createDecorationsCollection();
     decorationsCollection.set([
       {
@@ -420,14 +361,15 @@ export class InlineInputController extends BaseAIMonacoEditorController {
       },
     ]);
 
-    const inlineInputWidget = this.injector.get(InlineInputWidget, [monacoEditor, this.inputValue.get()]);
-    inlineInputWidget.show({ selection });
+    const inlineInputChatWidget = this.injector.get(InlineInputChatWidget, [monacoEditor, defaultValue]);
+    inlineInputChatWidget.show({ selection });
 
     this.aiNativeContextKey.inlineInputWidgetIsVisible.set(true);
     this.inlineDiffController.destroyPreviewer(monacoEditor.getModel()?.uri.toString());
+    let inputValue = defaultValue;
 
     this.inputDisposable.addDispose(
-      inlineInputWidget.onDispose(() => {
+      inlineInputChatWidget.onDispose(() => {
         this.cancelToken();
         decorationsCollection.clear();
         this.aiNativeContextKey.inlineInputWidgetIsVisible.set(false);
@@ -435,18 +377,7 @@ export class InlineInputController extends BaseAIMonacoEditorController {
     );
 
     this.inputDisposable.addDispose(
-      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(() => {
+      inlineInputChatWidget.onClose(() => {
         const isStreaming = this.aiNativeContextKey.inlineInputWidgetIsStreaming.get();
         if (isStreaming) {
           this.cancelToken();
@@ -457,7 +388,8 @@ export class InlineInputController extends BaseAIMonacoEditorController {
     );
 
     this.inputDisposable.addDispose(
-      inlineInputWidget.onSend(async (value) => {
+      inlineInputChatWidget.onInteractiveInputValue(async (value) => {
+        inputValue = value;
         monacoEditor.focus();
         decorationsCollection.clear();
 
@@ -467,7 +399,7 @@ export class InlineInputController extends BaseAIMonacoEditorController {
           return;
         }
 
-        inlineInputWidget.launchChatStatus(EInlineChatStatus.THINKING);
+        inlineInputChatWidget.launchChatStatus(EInlineChatStatus.THINKING);
 
         const strategy = await this.inlineInputService.getInteractiveInputStrategyHandler()(monacoEditor, value);
 
@@ -479,7 +411,7 @@ export class InlineInputController extends BaseAIMonacoEditorController {
           const previewResponse = await handler.providePreviewStrategy(monacoEditor, value, this.token);
 
           if (CancelResponse.is(previewResponse)) {
-            inlineInputWidget.launchChatStatus(EInlineChatStatus.READY);
+            inlineInputChatWidget.launchChatStatus(EInlineChatStatus.READY);
             this.hideInput();
             return;
           }
@@ -495,15 +427,15 @@ export class InlineInputController extends BaseAIMonacoEditorController {
               }),
               chatResponse.onError((error) => {
                 this.aiNativeContextKey.inlineInputWidgetIsStreaming.set(false);
-                inlineInputWidget.launchChatStatus(EInlineChatStatus.ERROR);
+                inlineInputChatWidget.launchChatStatus(EInlineChatStatus.ERROR);
               }),
               chatResponse.onAbort(() => {
                 this.aiNativeContextKey.inlineInputWidgetIsStreaming.set(false);
-                inlineInputWidget.launchChatStatus(EInlineChatStatus.DONE);
+                inlineInputChatWidget.launchChatStatus(EInlineChatStatus.DONE);
               }),
               chatResponse.onEnd(() => {
                 this.aiNativeContextKey.inlineInputWidgetIsStreaming.set(false);
-                inlineInputWidget.launchChatStatus(EInlineChatStatus.DONE);
+                inlineInputChatWidget.launchChatStatus(EInlineChatStatus.DONE);
               }),
             ]);
 
@@ -513,28 +445,28 @@ export class InlineInputController extends BaseAIMonacoEditorController {
               crossSelection,
               chatResponse,
             });
-            diffPreviewer.mount(inlineInputWidget);
+            diffPreviewer.mount(inlineInputChatWidget);
           }
         } else {
-          inlineInputWidget.launchChatStatus(EInlineChatStatus.READY);
+          inlineInputChatWidget.launchChatStatus(EInlineChatStatus.READY);
           this.hideInput();
         }
       }),
     );
 
     this.inputDisposable.addDispose(
-      inlineInputWidget.onResultClick((kind: EResultKind) => {
+      inlineInputChatWidget.onResultClick((kind: EResultKind) => {
         this.inlineDiffController.handleAction(kind);
         this.hideInput();
 
         if (kind === EResultKind.REGENERATE) {
           requestAnimationFrame(() => {
-            this.showInputInSelection(selection, monacoEditor, this.inputValue.get());
+            this.showInputInSelection(selection, monacoEditor, inputValue);
           });
         }
       }),
     );
 
-    this.inputDisposable.addDispose(inlineInputWidget);
+    this.inputDisposable.addDispose(inlineInputChatWidget);
   }
 }

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

@@ -1,6 +1,6 @@
 import { InteractiveInput } from '@opensumi/ide-core-browser/lib/components/ai-native';
 import { MaybePromise, uuid } from '@opensumi/ide-core-common';
-import { ICodeEditor, IPosition, Selection } from '@opensumi/ide-monaco';
+import { ICodeEditor } from '@opensumi/ide-monaco';
 
 import { ERunStrategy, IInteractiveInputHandler } from '../../types';
 
@@ -32,43 +32,3 @@ export class InteractiveInputModel {
     this._handler = undefined;
   }
 }
-
-export class InlineInputWidgetStoreInEmptyLine {
-  constructor(private position: IPosition, private value?: string) {}
-
-  public getPosition(): IPosition {
-    return this.position;
-  }
-
-  public setPosition(position: IPosition): void {
-    this.position = position;
-  }
-
-  public getValue(): string | undefined {
-    return this.value;
-  }
-
-  public setValue(value: string): void {
-    this.value = value;
-  }
-}
-
-export class InlineInputWidgetStoreInSelection {
-  constructor(private selection: Selection, private value?: string) {}
-
-  public getSelection(): Selection {
-    return this.selection;
-  }
-
-  public setSelection(selection: Selection): void {
-    this.selection = selection;
-  }
-
-  public getValue(): string | undefined {
-    return this.value;
-  }
-
-  public setValue(value: string): void {
-    this.value = value;
-  }
-}