@opensumi/ide-ai-native 3.7.1 → 3.7.2-next-1739848467.0

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

@@ -7,7 +7,6 @@ import {
   Disposable,
   IAIReporter,
   IDisposable,
-  MaybePromise,
   uuid,
 } from '@opensumi/ide-core-common';
 import { CancellationTokenSource, ICodeEditor } from '@opensumi/ide-monaco';
@@ -37,14 +36,26 @@ export class CodeEditsContextBean extends Disposable {
     return this.raw;
   }
 
+  public get typing() {
+    return this.raw.typing;
+  }
+
   public get position() {
     return this.raw.position;
   }
 
+  public get data() {
+    return this.raw.data;
+  }
+
   public get token() {
     return this.source.token;
   }
 
+  public joinData(data: ICodeEditsContextBean['data']) {
+    this.raw.data = { ...this.data, ...data };
+  }
+
   public reporterStart() {
     return this.source.reporterStart();
   }
@@ -69,8 +80,6 @@ export abstract class BaseCodeEditsSource extends Disposable {
   private cancellationTokenSource = new CancellationTokenSource();
   private readonly relationID = observableValue<string | undefined>(this, undefined);
 
-  protected abstract doTrigger(...args: any[]): MaybePromise<void>;
-
   public readonly codeEditsContextBean = disposableObservableValue<CodeEditsContextBean | undefined>(this, undefined);
   public abstract priority: number;
   public abstract mount(): IDisposable;
@@ -100,9 +109,9 @@ export abstract class BaseCodeEditsSource extends Disposable {
     });
   }
 
-  protected setBean(bean: ICodeEditsContextBean) {
+  protected setBean(bean: Omit<ICodeEditsContextBean, 'position'>) {
     transaction((tx) => {
-      const context = new CodeEditsContextBean(bean, this);
+      const context = new CodeEditsContextBean({ ...bean, position: this.monacoEditor.getPosition()! }, this);
       this.codeEditsContextBean.set(context, tx);
     });
   }
@@ -112,7 +121,7 @@ export abstract class BaseCodeEditsSource extends Disposable {
     if (context) {
       const relationID = this.aiReporter.start(AIServiceType.CodeEdits, {
         type: AIServiceType.CodeEdits,
-        actionSource: context?.bean.typing,
+        actionSource: context?.typing,
       });
 
       transaction((tx) => {
@@ -168,11 +177,23 @@ export class CodeEditsSourceCollection extends Disposable {
 
           for (const source of lastSources) {
             const value = source.codeEditsContextBean.get();
+            if (!value) {
+              return;
+            }
+
+            if (!contextBean) {
+              contextBean = value;
+            }
 
-            if (value && value.priority >= highestPriority) {
+            if (value.priority >= highestPriority) {
               highestPriority = value.priority;
+
+              value.joinData(contextBean.data);
               contextBean = value;
             }
+
+            // 将多个 source 的 data 合并到一起
+            contextBean.joinData(value.data);
           }
 
           transaction((tx) => {

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

@@ -1,6 +1,15 @@
 import { Injectable } from '@opensumi/di';
 import { AINativeSettingSectionsId, ECodeEditsSourceTyping, IDisposable } from '@opensumi/ide-core-common';
-import { ICursorPositionChangedEvent, Position } from '@opensumi/ide-monaco';
+import { ICursorPositionChangedEvent, IModelContentChangedEvent } from '@opensumi/ide-monaco';
+import {
+  autorunDelta,
+  derived,
+  derivedHandleChanges,
+  observableFromEvent,
+  onObservableChange,
+} from '@opensumi/ide-monaco/lib/common/observable';
+
+import { IntelligentCompletionsController } from '../intelligent-completions.controller';
 
 import { BaseCodeEditsSource } from './base';
 
@@ -9,39 +18,137 @@ export interface ILineChangeData {
   preLineNumber?: number;
 }
 
+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;
+
+  /**
+   * 在当前文件，计算弃用上次 edit 时的次数是否超过了阈值 {@link DEPRECATED_LIMIT} 次，超过则不会触发
+   * 1. 直接 esc 弃用
+   * 2. 用户再次移动光标位置致使补全消失也视为弃用
+   */
+  private readonly deprecatedStore = new Map<string, number>();
+
+  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;
+    },
+  );
+
+  private readonly isAllowTriggerObs = derived((reader) => {
+    this.positionChangeObs.read(reader);
+    const latestContentChangeTime = this.latestContentChangeTimeObs.read(reader);
+
+    const isLineChangeEnabled = this.preferenceService.getValid(AINativeSettingSectionsId.CodeEditsLineChange, false);
 
-  private prePosition = this.monacoEditor.getPosition();
+    /**
+     * 配置开关
+     */
+    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(
-      this.monacoEditor.onDidChangeCursorPosition((event: ICursorPositionChangedEvent) => {
-        const currentPosition = event.position;
-        if (this.prePosition && this.prePosition.lineNumber !== currentPosition.lineNumber) {
-          this.doTrigger(currentPosition);
-          this.prePosition = currentPosition;
+      autorunDelta(this.positionChangeObs, ({ lastValue, newValue }, reader) => {
+        const isAllowTriggerObs = this.isAllowTriggerObs.read(reader);
+        if (!isAllowTriggerObs) {
+          return false;
+        }
+
+        const prePosition = lastValue?.position;
+        const currentPosition = newValue?.position;
+        if (prePosition && prePosition.lineNumber !== currentPosition?.lineNumber) {
+          this.setBean({
+            typing: ECodeEditsSourceTyping.LineChange,
+            data: {
+              [ECodeEditsSourceTyping.LineChange]: {
+                preLineNumber: prePosition.lineNumber,
+                currentLineNumber: currentPosition.lineNumber,
+              },
+            },
+          });
         }
       }),
     );
-    return this;
-  }
 
-  protected doTrigger(position: Position) {
-    const isLineChangeEnabled = this.preferenceService.getValid(AINativeSettingSectionsId.CodeEditsLineChange, false);
+    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;
+          }
 
-    if (!isLineChangeEnabled || !position) {
-      return;
+          const count = this.deprecatedStore.get(modelId) || 0;
+          this.deprecatedStore.set(modelId, count + 1);
+        }),
+      );
     }
 
-    this.setBean({
-      typing: ECodeEditsSourceTyping.LineChange,
-      position,
-      data: {
-        preLineNumber: this.prePosition?.lineNumber,
-        currentLineNumber: position.lineNumber,
-      },
-    });
+    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

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

package/src/browser/contrib/terminal/component/terminal-command-suggest-controller.tsx

@@ -1,4 +1,4 @@
-import { debounce } from 'lodash';
+import debounce from 'lodash/debounce';
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 
 import { Emitter, localize } from '@opensumi/ide-core-browser';

package/src/browser/index.ts

@@ -46,7 +46,7 @@ import { LanguageParserService } from './languages/service';
 import { AINativePreferencesContribution } from './preferences';
 import { AINativeCoreContribution } from './types';
 import { InlineChatFeatureRegistry } from './widget/inline-chat/inline-chat.feature.registry';
-import { AIInlineChatService } from './widget/inline-chat/inline-chat.service';
+import { InlineChatService } from './widget/inline-chat/inline-chat.service';
 import { InlineDiffService } from './widget/inline-diff';
 
 @Injectable()
@@ -90,7 +90,7 @@ export class AINativeModule extends BrowserModule {
     },
     {
       token: IAIInlineChatService,
-      useClass: AIInlineChatService,
+      useClass: InlineChatService,
     },
     {
       token: IChatManagerService,

package/src/browser/languages/tree-sitter/wasm-manager.ts

@@ -29,7 +29,12 @@ export class WasmModuleManager {
 
   async initParser() {
     const baseUrl = await this.resolvedResourceUriDeferred.promise;
-    const wasmPath = `${baseUrl}/tree-sitter.wasm`;
+    let wasmPath;
+    if (baseUrl.endsWith('/')) {
+      wasmPath = `${baseUrl}tree-sitter.wasm`;
+    } else {
+      wasmPath = `${baseUrl}/tree-sitter.wasm`;
+    }
     if (!this.parserInitialized) {
       await Parser.init({
         locateFile: () => wasmPath,
@@ -45,7 +50,12 @@ export class WasmModuleManager {
       const deferred = new Deferred<ArrayBuffer>();
       this.cachedRuntime.set(language, deferred);
       const baseUrl = await this.resolvedResourceUriDeferred.promise;
-      const wasmUrl = `${baseUrl}/tree-sitter-${language}.wasm`;
+      let wasmUrl;
+      if (baseUrl.endsWith('/')) {
+        wasmUrl = `${baseUrl}tree-sitter-${language}.wasm`;
+      } else {
+        wasmUrl = `${baseUrl}/tree-sitter-${language}.wasm`;
+      }
       fetch(wasmUrl)
         .then((res) => res.arrayBuffer())
         .then((buffer) => {

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

@@ -10,11 +10,14 @@ export const AILayout = () => {
   const { layout } = getStorageValue();
   const designLayoutConfig = useInjectable(DesignLayoutConfig);
 
-  const defaultRightSize = useMemo(() => designLayoutConfig.useMergeRightWithLeftPanel ? 0 : 49, [designLayoutConfig.useMergeRightWithLeftPanel]);
+  const defaultRightSize = useMemo(
+    () => (designLayoutConfig.useMergeRightWithLeftPanel ? 0 : 49),
+    [designLayoutConfig.useMergeRightWithLeftPanel],
+  );
 
   return (
     <BoxPanel direction='top-to-bottom'>
-      <SlotRenderer id='top' defaultSize={layout.top?.currentId ? layout.top?.size || 35 : 0} slot='top' />
+      <SlotRenderer id='top' defaultSize={layout.top?.currentId ? layout.top?.size || 32 : 32} slot='top' />
       <SplitPanel
         id='main-horizontal-ai'
         flex={1}

package/src/browser/layout/layout.module.less

@@ -119,20 +119,20 @@
   border: none;
 }
 
+.header {
+  height: 36px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 10px;
+  background-color: var(--editorGroupHeader-tabsBackground);
+}
+
 .right_slot_container_wrap {
   height: 100%;
   display: flex;
   flex-direction: column;
 
-  .header {
-    height: 36px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 0 10px;
-    background-color: var(--editorGroupHeader-tabsBackground);
-  }
-
   .container {
     flex: 1;
   }

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

@@ -174,16 +174,18 @@ export const AIRightTabRenderer = ({
     return (
       <ContainerView
         {...props}
+        customTitleBar={
+          <div className={styles.header}>
+            <span className={styles.title}>{options && options.title}</span>
+            <div className={styles.side}>
+              <EnhancePopover id={'ai_right_panel_header_close'} title={localize('editor.title.context.close')}>
+                <EnhanceIcon icon='close' onClick={handleClose} />
+              </EnhancePopover>
+            </div>
+          </div>
+        }
         renderContainerWrap={({ children }) => (
           <div className={styles.right_slot_container_wrap}>
-            <div className={styles.header}>
-              <span className={styles.title}>{options && options.title}</span>
-              <div className={styles.side}>
-                <EnhancePopover id={'ai_right_panel_header_close'} title={localize('editor.title.context.close')}>
-                  <EnhanceIcon icon='close' onClick={handleClose} />
-                </EnhancePopover>
-              </div>
-            </div>
             <div className={styles.container}>{children}</div>
           </div>
         )}