@opensumi/ide-ai-native 3.7.1-next-1739761524.0 → 3.7.1-next-1739774311.0

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

@@ -3,78 +3,104 @@ import { AINativeSettingSectionsId, ECodeEditsSourceTyping, IDisposable } from '
 import { ICursorPositionChangedEvent, IModelContentChangedEvent } from '@opensumi/ide-monaco';
 import {
   autorunDelta,
+  derived,
   derivedHandleChanges,
   observableFromEvent,
-  recomputeInitiallyAndOnChange,
+  onObservableChange,
 } from '@opensumi/ide-monaco/lib/common/observable';
 
+import { IntelligentCompletionsController } from '../intelligent-completions.controller';
+
 import { BaseCodeEditsSource } from './base';
 
 export interface ILineChangeData {
   currentLineNumber: number;
   preLineNumber?: number;
-  change?: IModelContentChangedEvent;
 }
 
+const DEPRECATED_LIMIT = 5;
+const CONTENT_CHANGE_VALID_TIME = 60 * 1000;
+
 @Injectable({ multiple: true })
 export class LineChangeCodeEditsSource extends BaseCodeEditsSource {
-  public priority = 2;
+  public priority = 1;
 
-  public mount(): IDisposable {
-    const modelContentChangeObs = observableFromEvent<IModelContentChangedEvent>(
-      this,
-      this.monacoEditor.onDidChangeModelContent,
-      (event: IModelContentChangedEvent) => event,
-    );
-    const positionChangeObs = observableFromEvent<ICursorPositionChangedEvent>(
-      this,
-      this.monacoEditor.onDidChangeCursorPosition,
-      (event: ICursorPositionChangedEvent) => event,
-    );
+  /**
+   * 在当前文件，计算弃用上次 edit 时的次数是否超过了阈值 {@link DEPRECATED_LIMIT} 次，超过则不会触发
+   * 1. 直接 esc 弃用
+   * 2. 用户再次移动光标位置致使补全消失也视为弃用
+   */
+  private readonly deprecatedStore = new Map<string, number>();
 
-    const latestModelContentChangeObs = derivedHandleChanges(
-      {
-        owner: this,
-        createEmptyChangeSummary: () => ({ change: undefined }),
-        handleChange: (ctx, changeSummary: { change: IModelContentChangedEvent | undefined }) => {
-          // 如果只是改了光标则设置 change 为空，避免获取到缓存的 change
-          if (ctx.didChange(positionChangeObs)) {
-            changeSummary.change = undefined;
-          } else {
-            changeSummary.change = modelContentChangeObs.get();
-          }
-          return true;
-        },
-      },
-      (reader, changeSummary) => {
-        positionChangeObs.read(reader);
-        modelContentChangeObs.read(reader);
-        return changeSummary.change;
+  private readonly positionChangeObs = observableFromEvent<ICursorPositionChangedEvent>(
+    this,
+    this.monacoEditor.onDidChangeCursorPosition,
+    (event: ICursorPositionChangedEvent) => event,
+  );
+
+  private readonly contentChangeObs = observableFromEvent<IModelContentChangedEvent>(
+    this,
+    this.monacoEditor.onDidChangeModelContent,
+    (event: IModelContentChangedEvent) => event,
+  );
+
+  private readonly latestContentChangeTimeObs = derivedHandleChanges(
+    {
+      owner: this,
+      createEmptyChangeSummary: () => ({ latestContentChangeTime: 0 }),
+      handleChange: (context, changeSummary) => {
+        if (context.didChange(this.contentChangeObs)) {
+          changeSummary.latestContentChangeTime = Date.now();
+        }
+        return true;
       },
-    );
+    },
+    (reader, changeSummary) => {
+      this.contentChangeObs.read(reader);
+      return changeSummary.latestContentChangeTime;
+    },
+  );
 
-    this.addDispose(recomputeInitiallyAndOnChange(latestModelContentChangeObs));
+  private readonly isAllowTriggerObs = derived((reader) => {
+    this.positionChangeObs.read(reader);
+    const latestContentChangeTime = this.latestContentChangeTimeObs.read(reader);
 
-    let lastModelContent: IModelContentChangedEvent | undefined;
-    this.addDispose(
-      /**
-       * 由于 monaco 的 changeModelContent 事件比 changeCursorPosition 事件先触发，所以这里需要拿上一次的值进行消费
-       * 否则永远返回 undefined
-       */
-      autorunDelta(latestModelContentChangeObs, ({ lastValue }) => {
-        lastModelContent = lastValue;
-      }),
-    );
+    const isLineChangeEnabled = this.preferenceService.getValid(AINativeSettingSectionsId.CodeEditsLineChange, false);
+
+    /**
+     * 配置开关
+     */
+    if (!isLineChangeEnabled) {
+      return false;
+    }
+
+    /**
+     * 弃用次数规则的限制
+     */
+    const deprecatedCount = this.deprecatedStore.get(this.model?.id || '');
+    if (deprecatedCount && deprecatedCount >= DEPRECATED_LIMIT) {
+      return false;
+    }
+
+    /**
+     * 1. 未编辑过代码不触发
+     * 2. 编辑过代码后，60 内没有再次编辑也不触发
+     */
+    if (
+      latestContentChangeTime === 0 ||
+      (latestContentChangeTime && Date.now() - latestContentChangeTime > CONTENT_CHANGE_VALID_TIME)
+    ) {
+      return false;
+    }
 
+    return true;
+  });
+
+  public mount(): IDisposable {
     this.addDispose(
-      autorunDelta(positionChangeObs, ({ lastValue, newValue }) => {
-        const contentChange = lastModelContent;
-
-        const isLineChangeEnabled = this.preferenceService.getValid(
-          AINativeSettingSectionsId.CodeEditsLineChange,
-          false,
-        );
-        if (!isLineChangeEnabled) {
+      autorunDelta(this.positionChangeObs, ({ lastValue, newValue }, reader) => {
+        const isAllowTriggerObs = this.isAllowTriggerObs.read(reader);
+        if (!isAllowTriggerObs) {
           return false;
         }
 
@@ -83,20 +109,46 @@ export class LineChangeCodeEditsSource extends BaseCodeEditsSource {
         if (prePosition && prePosition.lineNumber !== currentPosition?.lineNumber) {
           this.setBean({
             typing: ECodeEditsSourceTyping.LineChange,
-            position: currentPosition,
             data: {
-              preLineNumber: prePosition.lineNumber,
-              currentLineNumber: currentPosition.lineNumber,
-              change: contentChange,
+              [ECodeEditsSourceTyping.LineChange]: {
+                preLineNumber: prePosition.lineNumber,
+                currentLineNumber: currentPosition.lineNumber,
+              },
             },
           });
         }
-
-        // 消费完之后设置为 undefined，避免下次获取到缓存的值
-        lastModelContent = undefined;
       }),
     );
 
+    const discard = IntelligentCompletionsController.get(this.monacoEditor)?.discard;
+    const accept = IntelligentCompletionsController.get(this.monacoEditor)?.accept;
+    if (discard) {
+      this.addDispose(
+        onObservableChange(discard, (isValid: boolean) => {
+          const modelId = this.model?.id;
+          if (!modelId || !isValid) {
+            return;
+          }
+
+          const count = this.deprecatedStore.get(modelId) || 0;
+          this.deprecatedStore.set(modelId, count + 1);
+        }),
+      );
+    }
+
+    if (accept) {
+      this.addDispose(
+        onObservableChange(accept, () => {
+          const modelId = this.model?.id;
+          if (!modelId) {
+            return;
+          }
+
+          this.deprecatedStore.delete(modelId);
+        }),
+      );
+    }
+
     return this;
   }
 }

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

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

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

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

package/src/browser/types.ts

@@ -42,7 +42,9 @@ interface IBaseInlineChatHandler<T extends any[]> {
   providerDiffPreviewStrategy?: (...args: T) => MaybePromise<ChatResponse | InlineChatController>;
 }
 
-export type IEditorInlineChatHandler = IBaseInlineChatHandler<[editor: ICodeEditor, token: CancellationToken]>;
+export type IEditorInlineChatHandler = IBaseInlineChatHandler<
+  [editor: ICodeEditor, selection: ISelection, token: CancellationToken]
+>;
 export type IInteractiveInputHandler = IBaseInlineChatHandler<
   [editor: ICodeEditor, selection: ISelection, value: string, token: CancellationToken]
 >;

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

@@ -280,7 +280,7 @@ export class InlineChatEditorController extends BaseAIMonacoEditorController {
             return undefined;
           }
 
-          return strategy.bind(this, monacoEditor, this.token);
+          return strategy.bind(this, monacoEditor, crossSelection, this.token);
         };
 
         this.runAction({
@@ -297,7 +297,7 @@ export class InlineChatEditorController extends BaseAIMonacoEditorController {
             });
             return relationId;
           },
-          execute: handler.execute ? handler.execute!.bind(this, monacoEditor, this.token) : undefined,
+          execute: handler.execute ? handler.execute!.bind(this, monacoEditor, crossSelection, this.token) : undefined,
           providerPreview: previewer(),
           extraData: {
             actionSource: source === 'codeAction' ? ActionSourceEnum.CodeAction : ActionSourceEnum.InlineChat,
@@ -508,12 +508,6 @@ export class InlineChatEditorController extends BaseAIMonacoEditorController {
       return;
     }
 
-    this.visibleDiffWidget({
-      monacoEditor,
-      options: { crossSelection, chatResponse: response },
-      reportInfo: { relationId, startTime, isRetry, actionType, actionSource },
-    });
-
     this.aiInlineChatOperationDisposable.addDispose([
       this.aiInlineContentWidget.onResultClick((kind: EResultKind) => {
         const modifyContent = this.inlineDiffController.getModifyContent();
@@ -579,6 +573,12 @@ export class InlineChatEditorController extends BaseAIMonacoEditorController {
         });
       }),
     ]);
+
+    this.visibleDiffWidget({
+      monacoEditor,
+      options: { crossSelection, chatResponse: response },
+      reportInfo: { relationId, startTime, isRetry, actionType, actionSource },
+    });
   }
 
   public async runAction(params: {

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

@@ -74,7 +74,7 @@ export class InlineDiffController extends BaseAIMonacoEditorController {
          * 保留 previewer 的实例，仅卸载 previewer 的渲染层
          */
         const id = model.id;
-        const previewer = this.currentPreviewer.read(reader);
+        const previewer = this.currentPreviewer.get();
         if (previewer && previewer.modelId !== id && !previewer.disposed) {
           previewer.hide();
         }

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

@@ -467,17 +467,15 @@ export class InlineStreamDiffHandler extends Disposable implements IInlineDiffPr
   }
 
   public pushRateFinallyDiffStack(diffModel: IComputeDiffData): void {
-    transaction((tx) => {
-      this.finallyDiffModel.set(diffModel, tx);
-      // 可能存在 rate editor controller 处理完之后接口层流式才结束
-      if (this.isEditing === false) {
-        this.finallyRender(diffModel);
-      }
-    });
+    // 可能存在 rate editor controller 处理完之后接口层流式才结束
+    if (this.isEditing === false) {
+      this.finallyRender(diffModel);
+    }
   }
 
   public finallyRender(diffModel: IComputeDiffData): void {
     transaction((tx) => {
+      this.finallyDiffModel.set(diffModel, tx);
       this.diffModel.set(diffModel, tx);
     });
 

package/src/common/utils.ts

@@ -32,10 +32,10 @@ export const extractCodeBlocks = (content: string): string => {
   let startLine = 0;
 
   lines.forEach((line, i) => {
-    if (!inBlock && line.startsWith(BACK_QUOTE_3_SYMBOL)) {
+    if (!inBlock && line.trim().startsWith(BACK_QUOTE_3_SYMBOL)) {
       inBlock = true;
       startLine = i + 1;
-    } else if (inBlock && line.startsWith(BACK_QUOTE_3_SYMBOL)) {
+    } else if (inBlock && line.trim().startsWith(BACK_QUOTE_3_SYMBOL)) {
       inBlock = false;
       const endLine = i;
       newContents = lines.slice(startLine, endLine);