@opensumi/ide-ai-native 3.9.1-next-1749181695.0 → 3.9.1-next-1749196667.0

package/src/browser/context/llm-context.service.ts

@@ -1,10 +1,10 @@
+import { DataContent } from 'ai';
+
 import { Autowired, Injectable } from '@opensumi/di';
-import { PreferenceService } from '@opensumi/ide-core-browser';
 import { AppConfig } from '@opensumi/ide-core-browser/lib/react-providers/config-provider';
-import { AINativeSettingSectionsId, IApplicationService, RulesServiceToken } from '@opensumi/ide-core-common';
 import { WithEventBus } from '@opensumi/ide-core-common/lib/event-bus/event-decorator';
 import { MarkerSeverity } from '@opensumi/ide-core-common/lib/types/markers/markers';
-import { Emitter, OperatingSystem, URI, parseGlob } from '@opensumi/ide-core-common/lib/utils';
+import { Emitter, URI } from '@opensumi/ide-core-common/lib/utils';
 import {
   EditorDocumentModelCreationEvent,
   EditorDocumentModelRemovalEvent,
@@ -15,12 +15,8 @@ import { EditorSelectionChangeEvent } from '@opensumi/ide-editor/lib/browser/typ
 import { FileType, IFileServiceClient } from '@opensumi/ide-file-service';
 import { IMarkerService } from '@opensumi/ide-markers/lib/common/types';
 import { Range } from '@opensumi/ide-monaco';
-import { ITerminalApiService } from '@opensumi/ide-terminal-next';
-import { isString, match } from '@opensumi/ide-utils';
 
 import { AttachFileContext, FileContext, LLMContextService, SerializedContext } from '../../common/llm-context';
-import { ProjectRule } from '../../common/types';
-import { RulesService } from '../rules/rules.service';
 
 @Injectable()
 export class LLMContextServiceImpl extends WithEventBus implements LLMContextService {
@@ -36,18 +32,6 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
   @Autowired(IFileServiceClient)
   protected readonly fileService: IFileServiceClient;
 
-  @Autowired(RulesServiceToken)
-  protected readonly rulesService: RulesService;
-
-  @Autowired(PreferenceService)
-  protected readonly preferenceService: PreferenceService;
-
-  @Autowired(ITerminalApiService)
-  protected readonly terminalService: ITerminalApiService;
-
-  @Autowired(IApplicationService)
-  protected readonly applicationService: IApplicationService;
-
   private isAutoCollecting = false;
 
   private contextVersion = 0;
@@ -57,13 +41,11 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
   private readonly maxViewFilesLimit = 20;
   private attachedFiles: FileContext[] = [];
   private attachedFolders: FileContext[] = [];
-  private attachedRules: ProjectRule[] = [];
   private readonly recentlyViewFiles: FileContext[] = [];
   private readonly onDidContextFilesChangeEmitter = new Emitter<{
     viewed: FileContext[];
     attached: FileContext[];
     attachedFolders: FileContext[];
-    attachedRules: ProjectRule[];
     version: number;
   }>();
   private hasUserManualReference = false;
@@ -98,24 +80,6 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
     }
   }
 
-  addRuleToContext(uri: URI): void {
-    if (!uri) {
-      return;
-    }
-
-    if (this.attachedRules.some((rule) => rule.path === uri.toString())) {
-      return;
-    }
-
-    const rule = this.rulesService.projectRules.find((rule) => rule.path === uri.toString());
-    if (!rule) {
-      return;
-    }
-
-    this.attachedRules.push(rule);
-    this.notifyContextChange();
-  }
-
   addFileToContext(uri: URI, selection?: [number, number], isManual = false): void {
     if (!uri) {
       return;
@@ -153,7 +117,6 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
     this.attachedFiles = [];
     this.attachedFolders = [];
     this.hasUserManualReference = false;
-    this.attachedRules = [];
     this.notifyContextChange();
   }
 
@@ -162,7 +125,6 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
       viewed: this.recentlyViewFiles,
       attached: this.attachedFiles,
       attachedFolders: this.attachedFolders,
-      attachedRules: this.attachedRules,
       version: this.contextVersion++,
     };
   }
@@ -181,24 +143,6 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
     this.notifyContextChange();
   }
 
-  removeFolderFromContext(uri: URI): void {
-    const targetList = this.attachedFolders;
-    const index = targetList.findIndex((folder) => folder.uri.toString() === uri.toString());
-    if (index > -1) {
-      targetList.splice(index, 1);
-    }
-    this.notifyContextChange();
-  }
-
-  removeRuleFromContext(uri: URI): void {
-    const targetList = this.attachedRules;
-    const index = targetList.findIndex((rule) => rule.path === uri.toString());
-    if (index > -1) {
-      targetList.splice(index, 1);
-    }
-    this.notifyContextChange();
-  }
-
   startAutoCollection(): void {
     if (this.isAutoCollecting) {
       return;
@@ -273,35 +217,25 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
     return {
       recentlyViewFiles: this.serializeRecentlyViewFiles(files.viewed, workspaceRoot),
       attachedFiles: this.serializeAttachedFiles(files.attached, workspaceRoot),
-      attachedFolders: await this.serializeAttachedFolders(files.attachedFolders),
-      attachedRules: this.serializeAttachedRules(files.attachedRules),
-      globalRules: this.serializeGlobalRules(),
+      attachedFolders: await this.serializeAttachedFolders(files.attachedFolders, workspaceRoot),
     };
   }
 
-  private async serializeAttachedFolders(folders: FileContext[]): Promise<string[]> {
+  private async serializeAttachedFolders(folders: FileContext[], workspaceRoot: URI): Promise<string[]> {
     // 去重
     const folderPath = Array.from(new Set(folders.map((folder) => folder.uri.toString())));
-    const header = 'Here are some folder(s) I manually attached to my message:';
-    const folderSections = await Promise.all(
+    return Promise.all(
       folderPath.map(async (folder) => {
         const folderUri = new URI(folder);
-        const absolutePath = folderUri.codeUri.fsPath;
-        const folderStructure = await this.getFormattedFolderStructure(absolutePath);
-
-        return `Folder: ${absolutePath}
-Contents of directory:
-
-${folderStructure}`;
+        const root = workspaceRoot.relative(folderUri)?.toString() || '/';
+        return `\`\`\`\n${root}\n${(await this.getPartiaFolderStructure(folderUri.codeUri.fsPath))
+          .map((line) => `- ${line}`)
+          .join('\n')}\n\`\`\`\n`;
       }),
     );
-    if (folderSections.length > 0) {
-      return [header, ...folderSections, ''];
-    }
-    return [];
   }
 
-  private async getFormattedFolderStructure(folder: string): Promise<string> {
+  private async getPartiaFolderStructure(folder: string, level = 2): Promise<string[]> {
     const result: string[] = [];
     try {
       const stat = await this.fileService.getFileStat(folder);
@@ -313,27 +247,28 @@ ${folderStructure}`;
           // 处理软链接
           const target = await this.fileService.getFileStat(child.realUri || child.uri);
           if (target) {
-            result.push(`[link] ${relativePath} -> ${target}`);
+            result.push(`${relativePath} -> ${target} (symbolic link)`);
           } else {
-            result.push(`[link] ${relativePath} (broken)`);
+            result.push(`${relativePath} (broken symbolic link)`);
           }
           continue;
         }
 
         if (child.type === FileType.Directory) {
-          // 计算目录下的项目数量
-          const childStat = await this.fileService.getFileStat(child.uri);
-          const itemCount = childStat?.children?.length || 0;
-          result.push(`[dir]  ${relativePath}/ (${itemCount} items)`);
+          result.push(`${relativePath}/`);
+          if (level > 1) {
+            const subDirStructure = await this.getPartiaFolderStructure(child.uri, level - 1);
+            result.push(...subDirStructure.map((subEntry) => `${relativePath}/${subEntry}`));
+          }
         } else if (child.type === FileType.File) {
-          result.push(`[file] ${relativePath}`);
+          result.push(relativePath);
         }
       }
     } catch {
-      return '';
+      return result;
     }
 
-    return result.join('\n');
+    return result;
   }
 
   private serializeRecentlyViewFiles(files: FileContext[], workspaceRoot: URI): string[] {
@@ -360,7 +295,6 @@ ${folderStructure}`;
         lineErrors: this.getFileErrors(file.uri),
         path: workspaceRoot.relative(file.uri)!.toString(),
         language: ref.instance.languageId!,
-        selection: file.selection,
       };
     } catch (e) {
       return null;
@@ -376,99 +310,4 @@ ${folderStructure}`;
       })
       .map((marker) => marker.message);
   }
-
-  private serializeGlobalRules(): string[] {
-    const globalRules = this.preferenceService.get<string>(AINativeSettingSectionsId.GlobalRules);
-    if (!globalRules) {
-      return [];
-    }
-
-    const platform =
-      this.applicationService.backendOS === OperatingSystem.Windows
-        ? 'windows'
-        : this.applicationService.backendOS === OperatingSystem.Linux
-        ? 'linux'
-        : 'darwin';
-    const shell = this.preferenceService.get<string>('terminal.type', 'zsh');
-    let shellName = shell;
-    if (shell === 'default') {
-      shellName = this.applicationService.backendOS === OperatingSystem.Windows ? 'cmd' : 'zsh';
-    }
-    const userInfoSection = `<user_info>
-The user's OS version is ${platform}. The absolute path of the user's workspace is ${this.appConfig.workspaceDir}. The user's shell is /bin/${shellName}.
-</user_info>`;
-
-    const rulesSection = `
-
-<rules>
-The rules section has a number of possible rules/memories/context that you should consider. In each subsection, we provide instructions about what information the subsection contains and how you should consider/follow the contents of the subsection.
-
-
-<user_specific_rule description="This is a rule set by the user that the agent must follow.">
-${globalRules}
-</user_specific_rule>
-
-</rules>`;
-
-    return [userInfoSection, rulesSection];
-  }
-
-  private findApplicableRules(attachedRules: ProjectRule[]): ProjectRule[] {
-    const otherRules = this.rulesService.projectRules.filter(
-      (rule) => !attachedRules.some((attachedRule) => attachedRule.path === rule.path),
-    );
-    const requestedByAgentRules = otherRules.filter((rule) => rule.description);
-    const alwaysApplyRules = otherRules.filter((rule) => rule.alwaysApply);
-    const requestedByFileRules = this.findFileMatchingRules(otherRules);
-
-    return [...requestedByFileRules, ...requestedByAgentRules, ...alwaysApplyRules];
-  }
-  private findFileMatchingRules(otherRules: ProjectRule[]): ProjectRule[] {
-    const requestedByFileRules = otherRules.filter((rule) => rule.globs);
-    const filePaths = this.attachedFiles.map((file) => file.uri.toString());
-    const folderPaths = this.attachedFolders.map((folder) => folder.uri.toString());
-
-    return requestedByFileRules.filter((rule) => {
-      let globs = rule.globs;
-      if (isString(globs)) {
-        globs = this.normalizeGlobs(globs.split(','));
-      } else {
-        globs = this.normalizeGlobs(globs || []);
-      }
-      const patterns = globs.map((pattern) => parseGlob(pattern));
-      return patterns.some((match) => filePaths.some((path) => match(path)) || folderPaths.some((path) => match(path)));
-    });
-  }
-  private normalizeGlobs(globs: string | string[]): string[] {
-    const globArray = isString(globs) ? globs.split(',') : globs || [];
-    return globArray.map((glob) => {
-      const p = glob.trim();
-      return p.startsWith('**') ? p : `**/${p}`;
-    });
-  }
-
-  private serializeAttachedRules(rules: ProjectRule[] = []): string[] {
-    rules = this.findApplicableRules(rules);
-    if (rules.length === 0) {
-      return [];
-    }
-
-    const header =
-      '\n<rules_context>\n\nRules are extra documentation provided by the user to help the AI understand the codebase.\nUse them if they seem useful to the users most recent query, but do not use them if they seem unrelated.\n\n';
-
-    const rulesSections = rules
-      .map((rule) => {
-        const ruleName =
-          rule.path
-            .split('/')
-            .pop()
-            ?.replace(/.md(c)?$/, '') || 'Unnamed Rule';
-        return `Rule Name: ${ruleName}\nDescription: \n${rule.description || rule.content}`;
-      })
-      .join('\n\n');
-
-    const footer = '\n</rules_context>\n';
-
-    return [header, rulesSections, footer];
-  }
 }

package/src/browser/contrib/intelligent-completions/decoration/additions-deletions.decoration.ts

@@ -1,4 +1,4 @@
-import { ICodeEditor, IRange, TrackedRangeStickiness } from '@opensumi/ide-monaco';
+import { ICodeEditor, IModelDeltaDecoration, IRange, TrackedRangeStickiness } from '@opensumi/ide-monaco';
 
 import { EnhanceDecorationsCollection } from '../../../model/enhanceDecorationsCollection';
 import { REWRITE_DECORATION_INLINE_ADD } from '../../../widget/rewrite/rewrite-widget';

package/src/browser/contrib/intelligent-completions/diff-computer.ts

@@ -267,7 +267,7 @@ export const computeMultiLineDiffChanges = (
   lineNumber: number,
   eol: string,
 ) => {
-  const rewriteDiffResult: IMultiLineDiffChangeResult[] =
+  let rewriteDiffResult: IMultiLineDiffChangeResult[] =
     rewriteDiffComputer.diff(originalContent, modifiedContent) || [];
   let multiLineDiffResult: IMultiLineDiffChangeResult[] =
     multiLineDiffComputer.diff(originalContent, modifiedContent) || [];

package/src/browser/contrib/terminal/terminal.feature.registry.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@opensumi/di';
 import { CancellationToken, Disposable } from '@opensumi/ide-core-common';
-import { IReadableStream, isReadableStream, listenGroupReadable } from '@opensumi/ide-utils/lib/stream';
+import { IReadableStream, isReadableStream, listenGroupReadable, listenReadable } from '@opensumi/ide-utils/lib/stream';
 
 import { ITerminalCommandSuggestionDesc } from '../../../common/index';
 import {

package/src/browser/index.ts

@@ -17,7 +17,6 @@ import {
   IntelligentCompletionsRegistryToken,
   MCPConfigServiceToken,
   ProblemFixRegistryToken,
-  RulesServiceToken,
   TerminalRegistryToken,
 } from '@opensumi/ide-core-common';
 import { FolderFilePreferenceProvider } from '@opensumi/ide-preferences/lib/browser/folder-file-preference-provider';
@@ -78,8 +77,6 @@ import { ListDirTool } from './mcp/tools/listDir';
 import { ReadFileTool } from './mcp/tools/readFile';
 import { RunTerminalCommandTool } from './mcp/tools/runTerminalCmd';
 import { AINativePreferencesContribution } from './preferences';
-import { RulesContribution } from './rules/rules.contribution';
-import { RulesService } from './rules/rules.service';
 import { AINativeCoreContribution, MCPServerContribution, TokenMCPServerRegistry } from './types';
 import { InlineChatFeatureRegistry } from './widget/inline-chat/inline-chat.feature.registry';
 import { InlineChatService } from './widget/inline-chat/inline-chat.service';
@@ -122,7 +119,6 @@ export class AINativeModule extends BrowserModule {
 
     // Context Service
     LlmContextContribution,
-    RulesContribution,
     {
       token: LLMContextServiceToken,
       useClass: LLMContextServiceImpl,
@@ -220,10 +216,6 @@ export class AINativeModule extends BrowserModule {
       token: MCPConfigServiceToken,
       useClass: MCPConfigService,
     },
-    {
-      token: RulesServiceToken,
-      useClass: RulesService,
-    },
     {
       token: FolderFilePreferenceProvider,
       useClass: MCPFolderPreferenceProvider,

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

@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react';
 
-import { SlotLocation, SlotRenderer, useInjectable } from '@opensumi/ide-core-browser';
+import { SlotRenderer, useInjectable } from '@opensumi/ide-core-browser';
 import { BoxPanel, SplitPanel, getStorageValue } from '@opensumi/ide-core-browser/lib/components';
 import { DesignLayoutConfig } from '@opensumi/ide-core-browser/lib/layout/constants';
 
@@ -32,9 +32,9 @@ export const AILayout = () => {
           resizeHandleClassName={'design-slot_resize_horizontal'}
         >
           <SlotRenderer
-            slot={SlotLocation.view}
+            slot='left'
             isTabbar={true}
-            defaultSize={layout[SlotLocation.view]?.currentId ? layout[SlotLocation.view]?.size || 310 : 49}
+            defaultSize={layout.left?.currentId ? layout.left?.size || 310 : 49}
             minResize={280}
             minSize={49}
           />
@@ -42,20 +42,16 @@ export const AILayout = () => {
             <SlotRenderer flex={2} flexGrow={1} minResize={200} slot='main' />
             <SlotRenderer
               flex={1}
-              defaultSize={layout[SlotLocation.panel]?.currentId ? layout[SlotLocation.panel]?.size : 24}
+              defaultSize={layout.bottom?.currentId ? layout.bottom?.size : 24}
               minResize={160}
-              slot={SlotLocation.panel}
+              slot='bottom'
               isTabbar={true}
             />
           </SplitPanel>
           <SlotRenderer
-            slot={SlotLocation.extendView}
+            slot='right'
             isTabbar={true}
-            defaultSize={
-              layout[SlotLocation.extendView]?.currentId
-                ? layout[SlotLocation.extendView]?.size || 360
-                : defaultRightSize
-            }
+            defaultSize={layout.right?.currentId ? layout.right?.size || 360 : defaultRightSize}
             minResize={280}
             minSize={defaultRightSize}
           />
@@ -63,7 +59,7 @@ export const AILayout = () => {
         <SlotRenderer
           slot={AI_CHAT_VIEW_ID}
           isTabbar={true}
-          defaultSize={layout['AI-Chat']?.currentId ? layout['AI-Chat']?.size || 360 : 0}
+          defaultSize={layout.AI_Chat?.currentId ? layout.AI_Chat?.size || 360 : 0}
           maxResize={420}
           minResize={280}
           minSize={0}

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

@@ -1,5 +1,5 @@
 import cls from 'classnames';
-import React, { useCallback, useMemo } from 'react';
+import React, { useCallback, useEffect, useMemo } from 'react';
 
 import {
   ComponentRegistryInfo,
@@ -29,18 +29,25 @@ import {
   TabbarViewBase,
 } from '@opensumi/ide-main-layout/lib/browser/tabbar/bar.view';
 import { BaseTabPanelView, ContainerView } from '@opensumi/ide-main-layout/lib/browser/tabbar/panel.view';
-import { TabRendererBase } from '@opensumi/ide-main-layout/lib/browser/tabbar/renderer.view';
+import { TabRendererBase, TabbarConfig } from '@opensumi/ide-main-layout/lib/browser/tabbar/renderer.view';
 import { TabbarService, TabbarServiceFactory } from '@opensumi/ide-main-layout/lib/browser/tabbar/tabbar.service';
 
 import { AI_CHAT_VIEW_ID } from '../../common';
 
 import styles from './layout.module.less';
 
-const ChatTabbarRenderer: React.FC = () => (
-  <div style={{ width: 0 }}>
-    <TabbarViewBase tabSize={0} MoreTabView={IconElipses} TabView={IconTabView} barSize={0} panelBorderSize={0} />
-  </div>
-);
+const ChatTabbarRenderer: React.FC = () => {
+  const { side } = React.useContext(TabbarConfig);
+  const tabbarService: TabbarService = useInjectable(TabbarServiceFactory)(side);
+  useEffect(() => {
+    tabbarService.setIsLatter(true);
+  }, [tabbarService]);
+  return (
+    <div style={{ width: 0 }}>
+      <TabbarViewBase tabSize={0} MoreTabView={IconElipses} TabView={IconTabView} barSize={0} panelBorderSize={1} />
+    </div>
+  );
+};
 
 export const AIChatTabRenderer = ({
   className,
@@ -103,7 +110,7 @@ export const AILeftTabRenderer = ({
 const AILeftTabbarRenderer: React.FC = () => {
   const layoutService = useInjectable<IMainLayoutService>(IMainLayoutService);
 
-  const tabbarService: TabbarService = useInjectable(TabbarServiceFactory)(SlotLocation.extendView);
+  const tabbarService: TabbarService = useInjectable(TabbarServiceFactory)(SlotLocation.right);
   const currentContainerId = useAutorun(tabbarService.currentContainerId);
 
   const extraMenus = React.useMemo(() => layoutService.getExtraMenu(), [layoutService]);
@@ -147,8 +154,14 @@ const AILeftTabbarRenderer: React.FC = () => {
   );
 };
 
-export const AIRightTabRenderer = ({ components }: { className: string; components: ComponentRegistryInfo[] }) => {
-  const tabbarService: TabbarService = useInjectable(TabbarServiceFactory)(SlotLocation.extendView);
+export const AIRightTabRenderer = ({
+  className,
+  components,
+}: {
+  className: string;
+  components: ComponentRegistryInfo[];
+}) => {
+  const tabbarService: TabbarService = useInjectable(TabbarServiceFactory)(SlotLocation.right);
   const designLayoutConfig = useInjectable<DesignLayoutConfig>(DesignLayoutConfig);
 
   const handleClose = useCallback(() => {

package/src/browser/mcp/base-apply.service.ts

@@ -8,6 +8,7 @@ import {
   AppConfig,
   IAIReporter,
   IChatProgress,
+  IMarker,
   MarkerSeverity,
   OnEvent,
   WithEventBus,
@@ -62,8 +63,6 @@ export abstract class BaseApplyService extends WithEventBus {
 
   private currentSessionId?: string;
 
-  protected abstract postApplyHandler(editor: ICodeEditor): Promise<void>;
-
   constructor() {
     super();
     this.addDispose(
@@ -314,26 +313,10 @@ export abstract class BaseApplyService extends WithEventBus {
       );
       codeBlock.updatedCode = res.updatedCode;
       codeBlock.status = 'pending';
-
-      // apply 结果流式输出完成后，自动尝试修复代码中的 lint 错误
-      if (this.postApplyHandler && typeof this.postApplyHandler === 'function') {
-        try {
-          await this.postApplyHandler(result.group.codeEditor.monacoEditor);
-        } catch (error) {}
-      }
-
-      const textModel = result.group.codeEditor.monacoEditor.getModel();
-      const diagnosticInfos = this.getDiagnosticInfos(textModel!.uri.toString(), res.result?.rangesFromDiffHunk || []);
-
       // 用户实际接受的 apply 结果
-      if (res.result) {
-        codeBlock.applyResult = {
-          diff: res.result?.diff,
-          diagnosticInfos,
-        };
-      }
-
+      codeBlock.applyResult = res.result;
       this.updateCodeBlock(codeBlock);
+
       return codeBlock;
     } catch (err) {
       codeBlock.status = 'failed';
@@ -353,8 +336,8 @@ export abstract class BaseApplyService extends WithEventBus {
     codeBlock: CodeBlockData,
     updatedContentOrStream: string | SumiReadableStream<IChatProgress>,
     range?: Range,
-  ): Promise<{ result?: { diff: string; rangesFromDiffHunk: Range[] }; updatedCode: string }> {
-    const deferred = new Deferred<{ result?: { diff: string; rangesFromDiffHunk: Range[] }; updatedCode: string }>();
+  ): Promise<{ result?: { diff: string; diagnosticInfos: IMarker[] }; updatedCode: string }> {
+    const deferred = new Deferred<{ result?: { diff: string; diagnosticInfos: IMarker[] }; updatedCode: string }>();
     const inlineDiffController = InlineDiffController.get(editor)!;
     range = range || editor.getModel()!.getFullModelRange();
 
@@ -390,11 +373,7 @@ export abstract class BaseApplyService extends WithEventBus {
 
       this.listenPartialEdit(editor.getModel()!, codeBlock).then((result) => {
         if (result) {
-          const diagnosticInfos = this.getDiagnosticInfos(editor.getModel()!.uri.toString(), rangesFromDiffHunk);
-          codeBlock.applyResult = {
-            diff: result.diff,
-            diagnosticInfos,
-          };
+          codeBlock.applyResult = result;
         }
         this.updateCodeBlock(codeBlock);
         this.editorService.save(URI.file(path.join(this.appConfig.workspaceDir, codeBlock.relativePath)));
@@ -405,10 +384,11 @@ export abstract class BaseApplyService extends WithEventBus {
         updatedContent,
         codeBlock.relativePath,
       );
+      const diagnosticInfos = this.getDiagnosticInfos(editor.getModel()!.uri.toString(), rangesFromDiffHunk);
       deferred.resolve({
         result: {
           diff,
-          rangesFromDiffHunk,
+          diagnosticInfos,
         },
         updatedCode: updatedContent,
       });
@@ -554,7 +534,7 @@ export abstract class BaseApplyService extends WithEventBus {
   }
 
   protected listenPartialEdit(model: ITextModel, codeBlock: CodeBlockData) {
-    const deferred = new Deferred<{ diff: string; rangesFromDiffHunk: Range[] }>();
+    const deferred = new Deferred<{ diff: string; diagnosticInfos: IMarker[] }>();
     const uriString = model.uri.toString();
     const toDispose = this.inlineDiffService.onPartialEdit((event) => {
       if (
@@ -594,7 +574,7 @@ export abstract class BaseApplyService extends WithEventBus {
           });
           deferred.resolve({
             diff,
-            rangesFromDiffHunk,
+            diagnosticInfos,
           });
         } else {
           // 用户全部取消

package/src/browser/mcp/mcp-server-proxy.service.ts

@@ -5,8 +5,7 @@ import { ILogger } from '@opensumi/ide-core-browser';
 import { Emitter, Event } from '@opensumi/ide-core-common';
 
 import { BUILTIN_MCP_SERVER_NAME, ISumiMCPServerBackend, SumiMCPServerProxyServicePath } from '../../common';
-import { ImageCompressionOptions, compressToolResultSmart } from '../../common/image-compression';
-import { IMCPServerProxyService, IMCPToolResult } from '../../common/types';
+import { IMCPServerProxyService } from '../../common/types';
 import { IMCPServerRegistry, TokenMCPServerRegistry } from '../types';
 
 @Injectable()
@@ -65,8 +64,4 @@ export class MCPServerProxyService implements IMCPServerProxyService {
   async $stopServer(serverName: string) {
     await this.sumiMCPServerProxyService.$stopServer(serverName);
   }
-
-  async $compressToolResult(result: IMCPToolResult, options: ImageCompressionOptions) {
-    return compressToolResultSmart(result, options);
-  }
 }

package/src/browser/mcp/tools/getDiagnosticsByPath.ts

@@ -2,7 +2,7 @@ import * as path from 'path';
 
 import { z } from 'zod';
 
-import { Autowired } from '@opensumi/di';
+import { Autowired, Injectable } from '@opensumi/di';
 import { Domain, URI } from '@opensumi/ide-core-common';
 import { IWorkspaceService } from '@opensumi/ide-workspace';
 import { URI as MonacoURI } from '@opensumi/monaco-editor-core/esm/vs/base/common/uri';

package/src/browser/mcp/tools/getOpenEditorFileDiagnostics.ts

@@ -2,7 +2,7 @@ import * as path from 'path';
 
 import { z } from 'zod';
 
-import { Autowired } from '@opensumi/di';
+import { Autowired, Injectable } from '@opensumi/di';
 import { Domain, URI } from '@opensumi/ide-core-common';
 import { WorkbenchEditorService } from '@opensumi/ide-editor';
 import { IWorkspaceService } from '@opensumi/ide-workspace';

package/src/browser/mcp/tools/handlers/ListDir.ts

@@ -1,5 +1,5 @@
 import { Autowired, Injectable } from '@opensumi/di';
-import { AppConfig, URI } from '@opensumi/ide-core-browser';
+import { AppConfig, Throttler, URI } from '@opensumi/ide-core-browser';
 import { IFileServiceClient } from '@opensumi/ide-file-service';
 
 /**

package/src/browser/mcp/tools/runTerminalCmd.ts

@@ -2,7 +2,7 @@ import { z } from 'zod';
 
 import { Autowired } from '@opensumi/di';
 import { AppConfig } from '@opensumi/ide-core-browser';
-import { Domain } from '@opensumi/ide-core-common';
+import { Deferred, Domain } from '@opensumi/ide-core-common';
 import { ITerminalController, ITerminalGroupViewService } from '@opensumi/ide-terminal-next/lib/common/controller';
 
 import { IMCPServerRegistry, MCPLogger, MCPServerContribution, MCPToolDefinition } from '../../types';

package/src/browser/preferences/schema.ts

@@ -177,10 +177,5 @@ export const aiNativePreferenceSchema: PreferenceSchema = {
       type: 'string',
       description: '%preference.ai.native.chat.system.prompt.description%',
     },
-    [AINativeSettingSectionsId.GlobalRules]: {
-      type: 'string',
-      default: '',
-      description: '%preference.ai.native.globalRules.description%',
-    },
   },
 };