@opensumi/ide-ai-native 3.7.2-next-1740450374.0 → 3.7.2-next-1741226843.0

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

@@ -1,15 +1,6 @@
 import { Injectable } from '@opensumi/di';
 import { AINativeSettingSectionsId, ECodeEditsSourceTyping, IDisposable } from '@opensumi/ide-core-common';
-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 { ICursorPositionChangedEvent, Position } from '@opensumi/ide-monaco';
 
 import { BaseCodeEditsSource } from './base';
 
@@ -18,137 +9,39 @@ 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 = 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);
+  public priority = 2;
 
-    /**
-     * 配置开关
-     */
-    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;
-  });
+  private prePosition = this.monacoEditor.getPosition();
 
   public mount(): IDisposable {
     this.addDispose(
-      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,
-              },
-            },
-          });
+      this.monacoEditor.onDidChangeCursorPosition((event: ICursorPositionChangedEvent) => {
+        const currentPosition = event.position;
+        if (this.prePosition && this.prePosition.lineNumber !== currentPosition.lineNumber) {
+          this.doTrigger(currentPosition);
+          this.prePosition = currentPosition;
         }
       }),
     );
+    return this;
+  }
 
-    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;
-          }
+  protected doTrigger(position: Position) {
+    const isLineChangeEnabled = this.preferenceService.getValid(AINativeSettingSectionsId.CodeEditsLineChange, false);
 
-          this.deprecatedStore.delete(modelId);
-        }),
-      );
+    if (!isLineChangeEnabled || !position) {
+      return;
     }
 
-    return this;
+    this.setBean({
+      typing: ECodeEditsSourceTyping.LineChange,
+      position,
+      data: {
+        preLineNumber: this.prePosition?.lineNumber,
+        currentLineNumber: position.lineNumber,
+      },
+    });
   }
 }

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

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

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

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

package/src/browser/index.ts

@@ -19,18 +19,8 @@ import {
   TerminalRegistryToken,
 } from '@opensumi/ide-core-common';
 
-import {
-  ChatProxyServiceToken,
-  IAIInlineCompletionsProvider,
-  IChatAgentService,
-  IChatInternalService,
-  IChatManagerService,
-  SumiMCPServerProxyServicePath,
-  TokenMCPServerProxyService,
-} from '../common';
-import { LLMContextServiceToken } from '../common/llm-context';
-import { MCPServerManager, MCPServerManagerPath } from '../common/mcp-server-manager';
-import { ChatAgentPromptProvider, DefaultChatAgentPromptProvider } from '../common/prompts/context-prompt-provider';
+import { ChatProxyServiceToken, IChatAgentService, IChatInternalService, IChatManagerService } from '../common';
+import { IAIInlineCompletionsProvider } from '../common';
 
 import { AINativeBrowserContribution } from './ai-core.contribution';
 import { ChatAgentService } from './chat/chat-agent.service';
@@ -41,8 +31,6 @@ import { ChatService } from './chat/chat.api.service';
 import { ChatFeatureRegistry } from './chat/chat.feature.registry';
 import { ChatInternalService } from './chat/chat.internal.service';
 import { ChatRenderRegistry } from './chat/chat.render.registry';
-import { LlmContextContribution } from './context/llm-context.contribution';
-import { LLMContextServiceImpl } from './context/llm-context.service';
 import { AICodeActionContribution } from './contrib/code-action/code-action.contribution';
 import { AIInlineCompletionsProvider } from './contrib/inline-completions/completeProvider';
 import { IntelligentCompletionsContribution } from './contrib/intelligent-completions/intelligent-completions.contribution';
@@ -55,21 +43,10 @@ import { RenameCandidatesProviderRegistry } from './contrib/rename/rename.featur
 import { TerminalAIContribution } from './contrib/terminal/terminal-ai.contributon';
 import { TerminalFeatureRegistry } from './contrib/terminal/terminal.feature.registry';
 import { LanguageParserService } from './languages/service';
-import { MCPServerProxyService } from './mcp/mcp-server-proxy.service';
-import { MCPServerRegistry } from './mcp/mcp-server.feature.registry';
-import { CreateNewFileWithTextTool } from './mcp/tools/createNewFileWithText';
-import { EditFileTool } from './mcp/tools/editFile';
-import { FileSearchTool } from './mcp/tools/fileSearch';
-import { GetDiagnosticsByPathTool } from './mcp/tools/getDiagnosticsByPath';
-import { GetOpenEditorFileDiagnosticsTool } from './mcp/tools/getOpenEditorFileDiagnostics';
-import { GrepSearchTool } from './mcp/tools/grepSearch';
-import { ListDirTool } from './mcp/tools/listDir';
-import { ReadFileTool } from './mcp/tools/readFile';
-import { RunTerminalCommandTool } from './mcp/tools/runTerminalCmd';
 import { AINativePreferencesContribution } from './preferences';
-import { AINativeCoreContribution, MCPServerContribution, TokenMCPServerRegistry } from './types';
+import { AINativeCoreContribution } from './types';
 import { InlineChatFeatureRegistry } from './widget/inline-chat/inline-chat.feature.registry';
-import { InlineChatService } from './widget/inline-chat/inline-chat.service';
+import { AIInlineChatService } from './widget/inline-chat/inline-chat.service';
 import { InlineDiffService } from './widget/inline-diff';
 
 @Injectable()
@@ -82,7 +59,7 @@ export class AINativeModule extends BrowserModule {
     this.aiNativeConfig.setAINativeModuleLoaded(true);
   }
 
-  contributionProvider = [AINativeCoreContribution, MCPServerContribution];
+  contributionProvider = AINativeCoreContribution;
   providers: Provider[] = [
     AINativeBrowserContribution,
     InterfaceNavigationContribution,
@@ -91,34 +68,6 @@ export class AINativeModule extends BrowserModule {
     AICodeActionContribution,
     AINativePreferencesContribution,
     IntelligentCompletionsContribution,
-
-    // MCP Server Contributions START
-    ListDirTool,
-    ReadFileTool,
-    EditFileTool,
-    CreateNewFileWithTextTool,
-    GetOpenEditorFileDiagnosticsTool,
-    FileSearchTool,
-    GrepSearchTool,
-    GetDiagnosticsByPathTool,
-    RunTerminalCommandTool,
-    // MCP Server Contributions END
-
-    // Context Service
-    LlmContextContribution,
-    {
-      token: LLMContextServiceToken,
-      useClass: LLMContextServiceImpl,
-    },
-
-    {
-      token: TokenMCPServerRegistry,
-      useClass: MCPServerRegistry,
-    },
-    {
-      token: TokenMCPServerProxyService,
-      useClass: MCPServerProxyService,
-    },
     {
       token: InlineChatFeatureRegistryToken,
       useClass: InlineChatFeatureRegistry,
@@ -141,7 +90,7 @@ export class AINativeModule extends BrowserModule {
     },
     {
       token: IAIInlineChatService,
-      useClass: InlineChatService,
+      useClass: AIInlineChatService,
     },
     {
       token: IChatManagerService,
@@ -191,10 +140,6 @@ export class AINativeModule extends BrowserModule {
       token: InlineDiffService,
       useClass: InlineDiffService,
     },
-    {
-      token: ChatAgentPromptProvider,
-      useClass: DefaultChatAgentPromptProvider,
-    },
   ];
 
   backServices = [
@@ -203,13 +148,5 @@ export class AINativeModule extends BrowserModule {
       token: AIBackSerivceToken,
       clientToken: ChatProxyServiceToken,
     },
-    {
-      servicePath: MCPServerManagerPath,
-      token: MCPServerManager,
-    },
-    {
-      clientToken: TokenMCPServerProxyService,
-      servicePath: SumiMCPServerProxyServicePath,
-    },
   ];
 }

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

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

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

@@ -10,14 +10,11 @@ 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 || 32 : 32} slot='top' />
+      <SlotRenderer id='top' defaultSize={layout.top?.currentId ? layout.top?.size || 35 : 0} 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,18 +174,16 @@ 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>
         )}