@opensumi/ide-ai-native 3.8.2-next-1741622293.0 → 3.8.2

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

@@ -26,17 +26,13 @@ import { Deferred, DisposableMap, Emitter, IDisposable, URI, path } from '@opens
 import { SumiReadableStream } from '@opensumi/ide-utils/lib/stream';
 import { EditOperation } from '@opensumi/monaco-editor-core/esm/vs/editor/common/core/editOperation';
 
-import { IChatInternalService } from '../../common';
+import { IChatInternalService, IInlineDiffService, InlineDiffServiceToken } from '../../common';
 import { CodeBlockData, CodeBlockStatus } from '../../common/types';
 import { ChatInternalService } from '../chat/chat.internal.service';
 import { InlineChatController } from '../widget/inline-chat/inline-chat-controller';
-import {
-  BaseInlineDiffPreviewer,
-  InlineDiffController,
-  InlineDiffService,
-  LiveInlineDiffPreviewer,
-} from '../widget/inline-diff';
-import { BaseInlineStreamDiffHandler } from '../widget/inline-stream-diff/inline-stream-diff.handler';
+import { BaseInlineDiffPreviewer, InlineDiffController, LiveInlineDiffPreviewer } from '../widget/inline-diff';
+
+import type { BaseInlineStreamDiffHandler } from '../widget/inline-stream-diff/inline-stream-diff.handler';
 
 export abstract class BaseApplyService extends WithEventBus {
   @Autowired(IChatInternalService)
@@ -48,8 +44,8 @@ export abstract class BaseApplyService extends WithEventBus {
   @Autowired(WorkbenchEditorService)
   protected readonly editorService: WorkbenchEditorService;
 
-  @Autowired(InlineDiffService)
-  private readonly inlineDiffService: InlineDiffService;
+  @Autowired(InlineDiffServiceToken)
+  private readonly inlineDiffService: IInlineDiffService;
 
   @Autowired(IMarkerService)
   private readonly markerService: IMarkerService;
@@ -155,7 +151,7 @@ export abstract class BaseApplyService extends WithEventBus {
     // 使用最后一个版本内容渲染 apply 内容
     if (filePendingApplies.length > 0 && filePendingApplies[0].updatedCode) {
       const editor = event.payload.group.codeEditor.monacoEditor;
-      this.renderApplyResult(editor, filePendingApplies[0], filePendingApplies[0].updatedCode);
+      await this.renderApplyResult(editor, filePendingApplies[0], filePendingApplies[0].updatedCode);
     }
   }
 
@@ -183,9 +179,10 @@ export abstract class BaseApplyService extends WithEventBus {
     return sessionCodeBlocks.filter((block) => block.status === 'pending').map((block) => block.relativePath);
   }
 
-  protected getSessionCodeBlocks(sessionId?: string) {
-    sessionId = sessionId || this.chatInternalService.sessionModel.sessionId;
-    const sessionModel = this.chatInternalService.getSession(sessionId);
+  getSessionCodeBlocks(sessionId?: string) {
+    const sessionModel = sessionId
+      ? this.chatInternalService.getSession(sessionId)
+      : this.chatInternalService.sessionModel;
     if (!sessionModel) {
       throw new Error(`Session ${sessionId} not found`);
     }
@@ -301,22 +298,17 @@ export abstract class BaseApplyService extends WithEventBus {
       if (!result) {
         throw new Error('Failed to open file');
       }
-      if (typeof fastApplyFileResult.result === 'string') {
-        codeBlock.updatedCode = fastApplyFileResult.result;
-        codeBlock.status = 'pending';
-        this.updateCodeBlock(codeBlock);
-      }
-      const applyResult = await this.renderApplyResult(
+      const res = await this.renderApplyResult(
         result.group.codeEditor.monacoEditor,
         codeBlock,
         (fastApplyFileResult.result || fastApplyFileResult.stream)!,
         fastApplyFileResult.range,
       );
-      if (applyResult) {
-        // 用户实际接受的 apply 结果
-        codeBlock.applyResult = applyResult;
-        this.updateCodeBlock(codeBlock);
-      }
+      codeBlock.updatedCode = res.updatedCode;
+      codeBlock.status = 'pending';
+      // 用户实际接受的 apply 结果
+      codeBlock.applyResult = res.result;
+      this.updateCodeBlock(codeBlock);
 
       return codeBlock;
     } catch (err) {
@@ -328,31 +320,33 @@ export abstract class BaseApplyService extends WithEventBus {
     }
   }
 
+  /**
+   * 渲染apply结果（支持流式和直接输出结果）
+   * 副作用：渲染时会添加accept、reject操作监听器，监听到结果时会自动更新codeBlock的result
+   */
   async renderApplyResult(
     editor: ICodeEditor,
     codeBlock: CodeBlockData,
     updatedContentOrStream: string | SumiReadableStream<IChatProgress>,
     range?: Range,
-  ): Promise<{ diff: string; diagnosticInfos: IMarker[] } | undefined> {
-    const deferred = new Deferred<{ diff: string; diagnosticInfos: IMarker[] }>();
+  ): 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();
 
     if (typeof updatedContentOrStream === 'string') {
+      const updatedContent = updatedContentOrStream;
       const editorCurrentContent = editor.getModel()!.getValue();
       const uri = URI.file(path.join(this.appConfig.workspaceDir, codeBlock.relativePath));
       const document = this.editorDocumentModelService.getModelReference(uri);
-      if (editorCurrentContent !== updatedContentOrStream || document?.instance.dirty) {
-        editor.getModel()?.pushEditOperations([], [EditOperation.replace(range, updatedContentOrStream)], () => null);
+      if (editorCurrentContent !== updatedContent || document?.instance.dirty) {
+        editor.getModel()?.pushEditOperations([], [EditOperation.replace(range, updatedContent)], () => null);
         await this.editorService.save(uri);
       }
       const uriPendingCodeBlocks = this.getUriCodeBlocks(uri)?.filter((block) => block.status === 'pending');
       const earlistPendingCodeBlock = uriPendingCodeBlocks?.[uriPendingCodeBlocks.length - 1];
-      if ((earlistPendingCodeBlock?.originalCode || codeBlock.originalCode) === updatedContentOrStream) {
-        codeBlock.status = 'cancelled';
-        this.updateCodeBlock(codeBlock);
-        deferred.resolve();
-        return;
+      if ((earlistPendingCodeBlock || codeBlock)?.originalCode === updatedContent) {
+        throw new Error('No changes applied');
       }
       // Create diff previewer
       const previewer = inlineDiffController.createDiffPreviewer(
@@ -380,13 +374,16 @@ export abstract class BaseApplyService extends WithEventBus {
 
       const { diff, rangesFromDiffHunk } = this.getDiffResult(
         codeBlock.originalCode,
-        codeBlock.updatedCode || updatedContentOrStream,
+        updatedContent,
         codeBlock.relativePath,
       );
       const diagnosticInfos = this.getDiagnosticInfos(editor.getModel()!.uri.toString(), rangesFromDiffHunk);
       deferred.resolve({
-        diff,
-        diagnosticInfos,
+        result: {
+          diff,
+          diagnosticInfos,
+        },
+        updatedCode: updatedContent,
       });
     } else {
       const controller = new InlineChatController();
@@ -414,21 +411,21 @@ export abstract class BaseApplyService extends WithEventBus {
       this.addDispose(
         // 流式输出结束后，转为直接输出逻辑
         previewer.getNode()!.onDiffFinished(async (diffModel) => {
-          codeBlock.updatedCode = diffModel.newFullRangeTextLines.join('\n');
           // TODO: 添加 reapply
+          const updatedCode = diffModel.newFullRangeTextLines.join('\n');
           // 实际应用结果为空，则取消
-          if (codeBlock.updatedCode === codeBlock.originalCode) {
-            codeBlock.status = 'failed';
-            this.updateCodeBlock(codeBlock);
+          if (codeBlock.originalCode === updatedCode) {
             previewer.dispose();
             deferred.reject(new Error('no changes applied'));
             return;
           }
-          codeBlock.status = 'pending';
-          this.updateCodeBlock(codeBlock);
           previewer.dispose();
-          const result = await this.renderApplyResult(editor, codeBlock, codeBlock.updatedCode);
-          deferred.resolve(result);
+          try {
+            const res = await this.renderApplyResult(editor, codeBlock, updatedCode);
+            deferred.resolve(res);
+          } catch (err) {
+            deferred.reject(err);
+          }
         }),
       );
       this.activePreviewerMap.set(codeBlock.relativePath, previewer);
@@ -483,14 +480,36 @@ export abstract class BaseApplyService extends WithEventBus {
     }
   }
 
-  processAll(uri: URI, type: 'accept' | 'reject'): void {
-    const codeBlocks = this.getUriCodeBlocks(uri)?.filter((block) => block.status === 'pending');
+  processAll(type: 'accept' | 'reject', uri?: URI): void {
+    const codeBlocks = uri
+      ? this.getUriCodeBlocks(uri)?.filter((block) => block.status === 'pending')
+      : this.getSessionCodeBlocks().filter((block) => block.status === 'pending');
     if (!codeBlocks?.length) {
       throw new Error('No pending code block found');
     }
-    const decorationModel = this.activePreviewerMap
-      .get(codeBlocks[0].relativePath)
-      ?.getNode()?.livePreviewDiffDecorationModel;
+    const relativePaths = uri
+      ? [codeBlocks[0].relativePath]
+      : codeBlocks
+          .map((block) => block.relativePath)
+          .reduce((acc, cur) => {
+            if (acc.includes(cur)) {
+              return acc;
+            }
+            acc.push(cur);
+            return acc;
+          }, [] as string[]);
+    relativePaths.forEach((relativePath) => {
+      this.doProcess(type, relativePath);
+    });
+    codeBlocks.forEach((codeBlock) => {
+      codeBlock.status = type === 'accept' ? 'success' : 'cancelled';
+      // TODO: 批量更新
+      this.updateCodeBlock(codeBlock);
+    });
+  }
+
+  protected doProcess(type: 'accept' | 'reject', relativePath: string) {
+    const decorationModel = this.activePreviewerMap.get(relativePath)?.getNode()?.livePreviewDiffDecorationModel;
     if (!decorationModel) {
       throw new Error('No active previewer found');
     }
@@ -499,19 +518,13 @@ export abstract class BaseApplyService extends WithEventBus {
     } else {
       decorationModel.discardUnProcessed();
     }
-    this.editorService.save(uri);
-    codeBlocks.forEach((codeBlock) => {
-      codeBlock.status = type === 'accept' ? 'success' : 'cancelled';
-      // TODO: 批量更新
-      this.updateCodeBlock(codeBlock);
-    });
+    this.editorService.save(URI.file(path.join(this.appConfig.workspaceDir, relativePath)));
   }
 
   protected listenPartialEdit(model: ITextModel, codeBlock: CodeBlockData) {
     const deferred = new Deferred<{ diff: string; diagnosticInfos: IMarker[] }>();
     const uriString = model.uri.toString();
     const toDispose = this.inlineDiffService.onPartialEdit((event) => {
-      // TODO 支持自动保存
       if (
         event.totalPartialEditCount === event.resolvedPartialEditCount &&
         event.uri.path === model.uri.path.toString()
@@ -532,11 +545,19 @@ export abstract class BaseApplyService extends WithEventBus {
             actionSource: ActionSourceEnum.Chat,
             sessionId: this.chatInternalService.sessionModel.sessionId,
             isReceive: true,
-            isDrop: false,
-            code: codeBlock.codeEdit,
+            // 是否有丢弃部分代码
+            isDrop: event.acceptPartialEditCount !== event.totalPartialEditCount,
+            code: appliedResult,
+            originCode: codeBlock.originalCode,
             message: JSON.stringify({
               diff,
               diagnosticInfos,
+              instructions: codeBlock.instructions,
+              codeEdit: codeBlock.codeEdit,
+              partialEditCount: event.totalPartialEditCount,
+              acceptPartialEditCount: event.acceptPartialEditCount,
+              addedLinesCount: event.totalAddedLinesCount,
+              deletedLinesCount: event.totalDeletedLinesCount,
             }),
           });
           deferred.resolve({
@@ -554,8 +575,11 @@ export abstract class BaseApplyService extends WithEventBus {
             sessionId: this.chatInternalService.sessionModel.sessionId,
             isReceive: false,
             isDrop: true,
-            code: codeBlock.codeEdit,
             originCode: codeBlock.originalCode,
+            message: JSON.stringify({
+              instructions: codeBlock.instructions,
+              codeEdit: codeBlock.codeEdit,
+            }),
           });
         }
         this.editorListenerMap.disposeKey(uriString);
@@ -593,8 +617,6 @@ export abstract class BaseApplyService extends WithEventBus {
     result?: string;
   }>;
 
-  // FIXME: 貌似筛选逻辑不太对，需要重构
-  // TODO: 支持使用内存中的document获取诊断信息，实现并行apply accept
   protected getDiagnosticInfos(uri: string, ranges: Range[]) {
     const markers = this.markerService.getManager().getMarkers({ resource: uri });
     return markers.filter(

package/src/browser/mcp/config/components/mcp-config.view.tsx

@@ -5,6 +5,7 @@ import { Badge } from '@opensumi/ide-components';
 import { AINativeSettingSectionsId, ILogger, useInjectable } from '@opensumi/ide-core-browser';
 import { PreferenceService } from '@opensumi/ide-core-browser/lib/preferences';
 import { localize } from '@opensumi/ide-core-common';
+import { IMessageService } from '@opensumi/ide-overlay/lib/common';
 
 import { BUILTIN_MCP_SERVER_NAME, ISumiMCPServerBackend, SumiMCPServerProxyServicePath } from '../../../../common';
 import { MCPServerDescription } from '../../../../common/mcp-server-manager';
@@ -19,6 +20,7 @@ export const MCPConfigView: React.FC = () => {
   const preferenceService = useInjectable<PreferenceService>(PreferenceService);
   const sumiMCPServerBackendProxy = useInjectable<ISumiMCPServerBackend>(SumiMCPServerProxyServicePath);
   const logger = useInjectable<ILogger>(ILogger);
+  const messageService = useInjectable<IMessageService>(IMessageService);
   const [servers, setServers] = React.useState<MCPServer[]>([]);
   const [formVisible, setFormVisible] = React.useState(false);
   const [editingServer, setEditingServer] = React.useState<MCPServerFormData | undefined>();
@@ -88,7 +90,9 @@ export const MCPConfigView: React.FC = () => {
         await preferenceService.set(AINativeSettingSectionsId.MCPServers, updatedServers);
         await loadServers();
       } catch (error) {
+        const msg = error.message || error;
         logger.error(`Failed to ${start ? 'start' : 'stop'} server ${serverName}:`, error);
+        messageService.error(`Failed to ${start ? 'start' : 'stop'} server ${serverName}:` + msg);
       }
     },
     [mcpServerProxyService, preferenceService, sumiMCPServerBackendProxy, loadServers],

package/src/browser/mcp/config/mcp-config.contribution.ts

@@ -1,6 +1,6 @@
 import { Autowired } from '@opensumi/di';
 import { LabelService } from '@opensumi/ide-core-browser/lib/services';
-import { Domain, Schemes, URI } from '@opensumi/ide-core-common';
+import { Domain, URI } from '@opensumi/ide-core-common';
 import {
   BrowserEditorContribution,
   EditorComponentRegistry,

package/src/browser/mcp/tools/components/EditFile.tsx

@@ -12,13 +12,13 @@ import {
   path,
   useInjectable,
 } from '@opensumi/ide-core-browser';
-import { Loading } from '@opensumi/ide-core-browser/lib/components/ai-native';
 import { WorkbenchEditorService } from '@opensumi/ide-editor';
 import { ILanguageService } from '@opensumi/monaco-editor-core/esm/vs/editor/common/languages/language';
 import { IModelService } from '@opensumi/monaco-editor-core/esm/vs/editor/common/services/model';
 import { StandaloneServices } from '@opensumi/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
 
 import { CodeBlockData } from '../../../../common/types';
+import { ApplyStatus } from '../../../components/ApplyStatus';
 import { ChatMarkdown } from '../../../components/ChatMarkdown';
 import { IMCPServerToolComponentProps } from '../../../types';
 import { BaseApplyService } from '../../base-apply.service';
@@ -76,7 +76,7 @@ export const EditFileToolComponent = (props: IMCPServerToolComponentProps) => {
   }
 
   return [
-    instructions && <p>{instructions}</p>,
+    instructions && <p key={'edit-file-tool-instructions'}>{instructions}</p>,
     <div className={styles['edit-file-tool']} key={'edit-file-tool'}>
       <div
         className={cls(styles['edit-file-tool-header'], {
@@ -96,7 +96,7 @@ export const EditFileToolComponent = (props: IMCPServerToolComponentProps) => {
           {codeBlockData.iterationCount > 1 && (
             <span className={styles['edit-file-tool-iteration-count']}>{codeBlockData.iterationCount}/3</span>
           )}
-          {renderStatus(codeBlockData, props.result)}
+          <ApplyStatus status={codeBlockData.status} error={props.result} />
         </div>
         <div className={styles.right}>
           <Popover title={'Show Code'} id={'edit-file-tool-show-code'}>
@@ -137,37 +137,3 @@ export const EditFileToolComponent = (props: IMCPServerToolComponentProps) => {
     ),
   ];
 };
-
-const renderStatus = (codeBlockData: CodeBlockData, error?: string) => {
-  const status = codeBlockData.status;
-  switch (status) {
-    case 'generating':
-      return <Loading />;
-    case 'pending':
-      return (
-        <Popover title='Pending' id={'edit-file-tool-status-pending'}>
-          <Icon iconClass='codicon codicon-circle-large' />
-        </Popover>
-      );
-    case 'success':
-      return (
-        <Popover title='Success' id={'edit-file-tool-status-success'}>
-          <Icon iconClass='codicon codicon-check-all' />
-        </Popover>
-      );
-    case 'failed':
-      return (
-        <Popover title={`Failed (${error})`} id={'edit-file-tool-status-failed'}>
-          <Icon iconClass='codicon codicon-error' style={{ color: 'var(--debugConsole-errorForeground)' }} />
-        </Popover>
-      );
-    case 'cancelled':
-      return (
-        <Popover title='Cancelled' id={'edit-file-tool-status-cancelled'}>
-          <Icon iconClass='codicon codicon-close' style={{ color: 'var(--input-placeholderForeground)' }} />
-        </Popover>
-      );
-    default:
-      return null;
-  }
-};

package/src/browser/mcp/tools/components/ExpandableFileList.tsx

@@ -71,7 +71,9 @@ const ExpandableFileList: React.FC<ExpandableFileListProps> = ({
 
   useEffect(() => {
     const toDispose = chatService.sessionModel.history.onMessageAdditionalChange((additional) => {
-      setFileList(additional[toolCallId]?.files || []);
+      if (additional[toolCallId]) {
+        setFileList(additional[toolCallId].files || []);
+      }
     });
     return () => {
       toDispose.dispose();

package/src/browser/model/msg-history-manager.ts

@@ -29,7 +29,6 @@ export class MsgHistoryManager extends Disposable {
   public clearMessages() {
     this.messageMap.clear();
     this.messageAdditionalMap.clear();
-    this.startIndex = 0;
   }
 
   private doAddMessage(message: IExcludeMessage): string {
@@ -53,19 +52,13 @@ export class MsgHistoryManager extends Disposable {
     return Array.from(this.messageMap.values()).sort((a, b) => a.order - b.order);
   }
 
-  private startIndex = 0;
-
-  public get slicedMessageCount(): number {
-    return this.startIndex;
-  }
-
   public get lastMessageId(): string | undefined {
     const list = this.messageList;
     return list[list.length - 1]?.id;
   }
 
   public getMessages(): IHistoryChatMessage[] {
-    return this.messageList.slice(this.startIndex);
+    return this.messageList;
   }
 
   public addUserMessage(

package/src/browser/preferences/schema.ts

@@ -97,6 +97,14 @@ export const aiNativePreferenceSchema: PreferenceSchema = {
       default: '',
       description: localize('preference.ai.native.openai.baseURL.description'),
     },
+    [AINativeSettingSectionsId.ContextWindow]: {
+      type: 'number',
+      description: localize('preference.ai.native.contextWindow.description'),
+    },
+    [AINativeSettingSectionsId.MaxTokens]: {
+      type: 'number',
+      description: localize('preference.ai.native.maxTokens.description'),
+    },
     [AINativeSettingSectionsId.MCPServers]: {
       type: 'array',
       default: [],

package/src/browser/widget/inline-diff/inline-diff-manager.tsx

@@ -3,6 +3,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { Icon, Popover } from '@opensumi/ide-components';
 import { AppConfig, IDisposable, URI, localize, path, useInjectable } from '@opensumi/ide-core-browser';
 import { IResource, WorkbenchEditorService } from '@opensumi/ide-editor';
+import { Path } from '@opensumi/ide-utils/lib/path';
 
 import { BaseApplyService } from '../../mcp/base-apply.service';
 
@@ -113,13 +114,13 @@ export const InlineDiffManager: React.FC<{ resource: IResource }> = (props) => {
       <div className={styles.mid}>
         <IconWithPopover
           icon='codicon codicon-check'
-          onClick={() => applyService.processAll(props.resource.uri, 'accept')}
+          onClick={() => applyService.processAll('accept', props.resource.uri)}
           content={localize('aiNative.inlineDiff.acceptAll')}
           id='inline-diff-manager-accept-all'
         />
         <IconWithPopover
           icon='codicon codicon-close'
-          onClick={() => applyService.processAll(props.resource.uri, 'reject')}
+          onClick={() => applyService.processAll('reject', props.resource.uri)}
           content={localize('aiNative.inlineDiff.rejectAll')}
           id='inline-diff-manager-reject-all'
         />

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

@@ -23,7 +23,6 @@ import {
 import { BaseAIMonacoEditorController } from '../../contrib/base';
 import { EInlineDiffPreviewMode } from '../../preferences/schema';
 import { InlineChatController } from '../inline-chat/inline-chat-controller';
-import { EResultKind } from '../inline-chat/inline-chat.service';
 import { BaseInlineStreamDiffHandler } from '../inline-stream-diff/inline-stream-diff.handler';
 
 import {
@@ -34,6 +33,8 @@ import {
 } from './inline-diff-previewer';
 import { InlineDiffWidget } from './inline-diff-widget';
 
+import type { EResultKind } from '../inline-chat/inline-chat.service';
+
 type IInlineDiffPreviewer = BaseInlineDiffPreviewer<InlineDiffWidget | BaseInlineStreamDiffHandler>;
 
 export class InlineDiffController extends BaseAIMonacoEditorController {

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

@@ -1,10 +1,11 @@
 import { Injectable } from '@opensumi/di';
 import { Emitter } from '@opensumi/ide-utils';
 
-import { IPartialEditEvent } from '../inline-stream-diff/live-preview.component';
+import type { IInlineDiffService } from '../../../common/index';
+import type { IPartialEditEvent } from '../../../common/types';
 
 @Injectable()
-export class InlineDiffService {
+export class InlineDiffService implements IInlineDiffService {
   /**
    * Used in `codeblitz`, do not remove it.
    */

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

@@ -11,13 +11,13 @@ import { IModelService } from '@opensumi/monaco-editor-core/esm/vs/editor/common
 import { LineTokens } from '@opensumi/monaco-editor-core/esm/vs/editor/common/tokens/lineTokens';
 import { UndoRedoGroup } from '@opensumi/monaco-editor-core/esm/vs/platform/undoRedo/common/undoRedo';
 
-import { IDecorationSerializableState } from '../../model/enhanceDecorationsCollection';
-import { IDiffPreviewerOptions, IInlineDiffPreviewerNode } from '../inline-diff/inline-diff-previewer';
-
 import { InlineStreamDiffComputer } from './inline-stream-diff-computer';
-import { IRemovedWidgetState } from './live-preview.component';
 import { LivePreviewDiffDecorationModel } from './live-preview.decoration';
 
+import type { IRemovedWidgetState } from './live-preview.component';
+import type { IDecorationSerializableState } from '../../model/enhanceDecorationsCollection';
+import type { IDiffPreviewerOptions, IInlineDiffPreviewerNode } from '../inline-diff/inline-diff-previewer';
+
 interface IRangeChangeData {
   removedTextLines: string[];
   removedLinesOriginalRange: LineRange;

package/src/browser/widget/inline-stream-diff/live-preview.component.tsx

@@ -46,40 +46,6 @@ export interface IRemovedWidgetState {
   position: IPosition;
 }
 
-export enum EPartialEdit {
-  accept = 'accept',
-  discard = 'discard',
-}
-
-export interface IPartialEditEvent {
-  uri: URI;
-  /**
-   * 总 diff 数
-   */
-  totalPartialEditCount: number;
-  /**
-   * 已处理的个数
-   */
-  resolvedPartialEditCount: number;
-  /**
-   * 已添加行数
-   */
-  totalAddedLinesCount: number;
-  /**
-   * 已采纳的个数
-   */
-  acceptPartialEditCount: number;
-  /**
-   * 已删除行数
-   */
-  totalDeletedLinesCount: number;
-  currentPartialEdit: {
-    type: EPartialEdit;
-    addedLinesCount: number;
-    deletedLinesCount: number;
-  };
-}
-
 export interface ITextLinesTokens {
   text: string;
   lineTokens: LineTokens;

package/src/browser/widget/inline-stream-diff/live-preview.decoration.tsx

@@ -19,9 +19,10 @@ import { LineRange } from '@opensumi/monaco-editor-core/esm/vs/editor/common/cor
 import { ModelDecorationOptions } from '@opensumi/monaco-editor-core/esm/vs/editor/common/model/textModel';
 import { IUndoRedoService, UndoRedoGroup } from '@opensumi/monaco-editor-core/esm/vs/platform/undoRedo/common/undoRedo';
 
+import { IInlineDiffService, InlineDiffServiceToken } from '../../../common';
+import { EPartialEdit, IPartialEditEvent } from '../../../common/types';
 import { AINativeContextKey } from '../../ai-core.contextkeys';
 import { IDecorationSerializableState, IEnhanceModelDeltaDecoration } from '../../model/enhanceDecorationsCollection';
-import { InlineDiffService } from '../inline-diff';
 
 import styles from './inline-stream-diff.module.less';
 import { InlineStreamDiffService } from './inline-stream-diff.service';
@@ -31,8 +32,6 @@ import {
   ActiveLineDecoration,
   AddedRangeDecoration,
   AddedRangeDecorationsCollection,
-  EPartialEdit,
-  IPartialEditEvent,
   IPartialEditWidgetOptions,
   IRemovedWidgetState,
   IRemovedZoneWidgetOptions,
@@ -66,8 +65,8 @@ export class LivePreviewDiffDecorationModel extends Disposable {
   @Autowired(InlineStreamDiffService)
   private readonly inlineStreamDiffService: InlineStreamDiffService;
 
-  @Autowired(InlineDiffService)
-  private readonly inlineDiffService: InlineDiffService;
+  @Autowired(InlineDiffServiceToken)
+  private readonly inlineDiffService: IInlineDiffService;
 
   @Autowired(IMessageService)
   private readonly messageService: IMessageService;
@@ -537,15 +536,15 @@ export class LivePreviewDiffDecorationModel extends Disposable {
   }
 
   public acceptUnProcessed(): void {
-    const showingWidgets = this.partialEditWidgetList.filter((widget) => !widget.isHidden);
-    showingWidgets.forEach((widget) => {
+    const pendingWidgets = this.partialEditWidgetList.filter((widget) => widget.isPending);
+    pendingWidgets.forEach((widget) => {
       this.handlePartialEditAction(EPartialEdit.accept, widget, false);
     });
   }
 
   public discardUnProcessed(): void {
-    const showingWidgets = this.partialEditWidgetList.filter((widget) => !widget.isHidden);
-    showingWidgets.forEach((widget) => {
+    const pendingWidgets = this.partialEditWidgetList.filter((widget) => widget.isPending);
+    pendingWidgets.forEach((widget) => {
       this.handlePartialEditAction(EPartialEdit.discard, widget, false);
     });
   }

package/src/common/index.ts

@@ -16,7 +16,7 @@ import { DESIGN_MENUBAR_CONTAINER_VIEW_ID } from '@opensumi/ide-design/lib/commo
 import { IPosition, ITextModel, InlineCompletionContext } from '@opensumi/ide-monaco/lib/common';
 
 import { MCPServerDescription } from './mcp-server-manager';
-import { MCPTool } from './types';
+import { IPartialEditEvent, MCPTool } from './types';
 
 import type { CoreMessage } from 'ai';
 
@@ -37,7 +37,7 @@ export const AI_CHAT_LOGO_AVATAR_ID = 'AI-Chat-Logo-Avatar';
 export const AI_MENU_BAR_DEBUG_TOOLBAR = 'AI_MENU_BAR_DEBUG_TOOLBAR';
 
 // 内置 MCP 服务器名称
-export const BUILTIN_MCP_SERVER_NAME = 'sumi-builtin';
+export const BUILTIN_MCP_SERVER_NAME = 'builtin';
 
 /**
  * @deprecated Use {@link DESIGN_MENUBAR_CONTAINER_VIEW_ID} instead
@@ -309,3 +309,10 @@ export interface IAIInlineCompletionsProvider {
   ): Promise<T>;
   setVisibleCompletion(arg0: boolean): void;
 }
+
+export interface IInlineDiffService {
+  onPartialEdit: Event<IPartialEditEvent>;
+  firePartialEdit(event: IPartialEditEvent): void;
+}
+
+export const InlineDiffServiceToken = Symbol('InlineDiffService');

package/src/common/prompts/context-prompt-provider.ts

@@ -42,15 +42,11 @@ ${context.recentlyViewFiles.map((file, idx) => `    ${idx + 1}: ${file}`).join('
               `,
     )}
   </attached_files>
-${
-  currentModel
-    ? `<current_opened_file>
+${currentModel ? `<current_opened_file>
   \`\`\`${currentModel.languageId} ${currentModel.uri.toString()}
 ${currentModel.getText()}
   \`\`\`
-  </current_opened_file>`
-    : ''
-}
+  </current_opened_file>` : ''}
 </additional_data>
 <user_query>
 ${userMessage}