@opensumi/ide-ai-native 3.8.1-next-1741164072.0 → 3.8.1-next-1741180711.0

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

@@ -69,17 +69,7 @@ export abstract class BaseApplyService extends WithEventBus {
     super();
     this.addDispose(
       this.chatInternalService.onCancelRequest(() => {
-        const currentMessageId = this.chatInternalService.sessionModel.history.lastMessageId;
-        if (!currentMessageId) {
-          return;
-        }
-        const codeBlockMap = this.getMessageCodeBlocks(currentMessageId);
-        if (!codeBlockMap) {
-          return;
-        }
-        Object.values(codeBlockMap).forEach((blockData) => {
-          this.cancelApply(blockData);
-        });
+        this.cancelAllApply();
       }),
     );
     this.currentSessionId = this.chatInternalService.sessionModel.sessionId;
@@ -104,11 +94,6 @@ export abstract class BaseApplyService extends WithEventBus {
         });
       }),
     );
-    this.addDispose(
-      this.chatInternalService.onWillClearSession((sessionId) => {
-        this.cancelAllApply(sessionId);
-      }),
-    );
   }
 
   private getMessageCodeBlocks(
@@ -124,6 +109,27 @@ export abstract class BaseApplyService extends WithEventBus {
     return message?.codeBlockMap;
   }
 
+  private getSessionCodeBlocksForPath(relativePath: string, sessionId?: string) {
+    sessionId = sessionId || this.chatInternalService.sessionModel.sessionId;
+    const sessionModel = this.chatInternalService.getSession(sessionId);
+    if (!sessionModel) {
+      throw new Error(`Session ${sessionId} not found`);
+    }
+    const sessionAdditionals = sessionModel.history.sessionAdditionals;
+    const codeBlocks: CodeBlockData[] = Array.from(sessionAdditionals.values())
+      .map((additional) => additional.codeBlockMap as { [toolCallId: string]: CodeBlockData })
+      .reduce((acc, cur) => {
+        Object.values(cur).forEach((block) => {
+          if (block.relativePath === relativePath) {
+            acc.push(block);
+          }
+        });
+        return acc;
+      }, [] as CodeBlockData[])
+      .sort((a, b) => b.version - a.version);
+    return codeBlocks;
+  }
+
   private activePreviewerMap = this.registerDispose(
     new DisposableMap<string, BaseInlineDiffPreviewer<BaseInlineStreamDiffHandler>>(),
   );
@@ -150,9 +156,10 @@ export abstract class BaseApplyService extends WithEventBus {
     ) {
       return;
     }
-    const filePendingApplies =
-      this.getUriCodeBlocks(event.payload.resource.uri)?.filter((block) => block.status === 'pending') || [];
-    // 使用最后一个版本内容渲染 apply 内容
+    const filePendingApplies = Object.values(
+      this.getMessageCodeBlocks(this.chatInternalService.sessionModel.history.lastMessageId!) || {},
+    ).filter((block) => block.relativePath === relativePath && block.status === 'pending');
+    // TODO: 刷新后重新应用，事件无法恢复 & 恢复继续请求，需要改造成批量apply形式
     if (filePendingApplies.length > 0 && filePendingApplies[0].updatedCode) {
       const editor = event.payload.group.codeEditor.monacoEditor;
       this.renderApplyResult(editor, filePendingApplies[0], filePendingApplies[0].updatedCode);
@@ -167,23 +174,23 @@ export abstract class BaseApplyService extends WithEventBus {
     return this.activePreviewerMap.get(path.relative(this.appConfig.workspaceDir, currentUri.path.toString()));
   }
 
-  /**
-   * 获取指定uri的 code block，按version降序排序
-   */
-  getUriCodeBlocks(uri: URI): CodeBlockData[] | undefined {
-    const sessionCodeBlocks = this.getSessionCodeBlocks();
-    const relativePath = path.relative(this.appConfig.workspaceDir, uri.path.toString());
-    return sessionCodeBlocks
-      .filter((block) => block.relativePath === relativePath)
-      .sort((a, b) => b.version - a.version);
+  getUriPendingCodeBlock(uri: URI): CodeBlockData | undefined {
+    const messageId = this.chatInternalService.sessionModel.history.lastMessageId;
+    if (!messageId) {
+      return undefined;
+    }
+    const codeBlockMap = this.getMessageCodeBlocks(messageId);
+    if (!codeBlockMap) {
+      return undefined;
+    }
+    return Object.values(codeBlockMap).find(
+      (block) =>
+        block.relativePath === path.relative(this.appConfig.workspaceDir, uri.path.toString()) &&
+        block.status === 'pending',
+    );
   }
 
   getPendingPaths(sessionId?: string): string[] {
-    const sessionCodeBlocks = this.getSessionCodeBlocks(sessionId);
-    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);
     if (!sessionModel) {
@@ -191,13 +198,15 @@ export abstract class BaseApplyService extends WithEventBus {
     }
     const sessionAdditionals = sessionModel.history.sessionAdditionals;
     return Array.from(sessionAdditionals.values())
-      .map((additional) => (additional.codeBlockMap || {}) as { [toolCallId: string]: CodeBlockData })
+      .map((additional) => additional.codeBlockMap as { [toolCallId: string]: CodeBlockData })
       .reduce((acc, cur) => {
         Object.values(cur).forEach((block) => {
-          acc.push(block);
+          if (block.status === 'pending' && !acc.includes(block.relativePath)) {
+            acc.push(block.relativePath);
+          }
         });
         return acc;
-      }, [] as CodeBlockData[]);
+      }, [] as string[]);
   }
 
   getCodeBlock(toolCallId: string, messageId?: string): CodeBlockData | undefined {
@@ -212,8 +221,11 @@ export abstract class BaseApplyService extends WithEventBus {
     return codeBlockMap[toolCallId];
   }
 
-  protected updateCodeBlock(codeBlock: CodeBlockData) {
-    const messageId = codeBlock.messageId;
+  protected updateCodeBlock(codeBlock: CodeBlockData, messageId?: string) {
+    messageId = messageId || this.chatInternalService.sessionModel.history.lastMessageId;
+    if (!messageId) {
+      throw new Error('Message ID is required');
+    }
     const codeBlockMap = this.getMessageCodeBlocks(messageId);
     if (!codeBlockMap) {
       throw new Error('Code block not found');
@@ -227,7 +239,7 @@ export abstract class BaseApplyService extends WithEventBus {
 
   async registerCodeBlock(relativePath: string, content: string, toolCallId: string): Promise<CodeBlockData> {
     const lastMessageId = this.chatInternalService.sessionModel.history.lastMessageId!;
-    const uriCodeBlocks = this.getUriCodeBlocks(URI.file(path.join(this.appConfig.workspaceDir, relativePath)));
+    const savedCodeBlockMap = this.getMessageCodeBlocks(lastMessageId) || {};
     const originalModelRef = await this.editorDocumentModelService.createModelReference(
       URI.file(path.join(this.appConfig.workspaceDir, relativePath)),
     );
@@ -239,13 +251,13 @@ export abstract class BaseApplyService extends WithEventBus {
       version: 1,
       createdAt: Date.now(),
       toolCallId,
-      messageId: lastMessageId,
       // TODO: 支持range
       originalCode: originalModelRef.instance.getText(),
     };
-    if (uriCodeBlocks?.length) {
-      newBlock.version = uriCodeBlocks.length;
-      for (const block of uriCodeBlocks) {
+    const samePathCodeBlocks = Object.values(savedCodeBlockMap).filter((block) => block.relativePath === relativePath);
+    if (samePathCodeBlocks.length > 0) {
+      newBlock.version = samePathCodeBlocks.length;
+      for (const block of samePathCodeBlocks.sort((a, b) => a.version - b.version)) {
         // 如果连续的上一个同文件apply结果存在LintError，则iterationCount++
         if (block.relativePath === relativePath && block.applyResult?.diagnosticInfos?.length) {
           newBlock.iterationCount++;
@@ -254,7 +266,6 @@ export abstract class BaseApplyService extends WithEventBus {
         }
       }
     }
-    const savedCodeBlockMap = this.getMessageCodeBlocks(lastMessageId) || {};
     savedCodeBlockMap[toolCallId] = newBlock;
     this.chatInternalService.sessionModel.history.setMessageAdditional(lastMessageId, {
       codeBlockMap: savedCodeBlockMap,
@@ -285,9 +296,9 @@ export abstract class BaseApplyService extends WithEventBus {
       }
 
       if (this.activePreviewerMap.has(codeBlock.relativePath)) {
-        // 有正在进行的 apply，则取消（但不更新block状态，只清理副作用）
-        this.cancelApply(codeBlock, true);
+        this.activePreviewerMap.disposeKey(codeBlock.relativePath);
       }
+      // FIXME: 同一个bubble单个文件多次写入（如迭代）兼容
       // trigger diffPreivewer & return expected diff result directly
       const result = await this.editorService.open(
         URI.file(path.join(this.appConfig.workspaceDir, codeBlock.relativePath)),
@@ -295,11 +306,6 @@ 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(
         result.group.codeEditor.monacoEditor,
         codeBlock,
@@ -334,14 +340,16 @@ export abstract class BaseApplyService extends WithEventBus {
 
     if (typeof updatedContentOrStream === 'string') {
       const editorCurrentContent = editor.getModel()!.getValue();
-      const uri = URI.file(path.join(this.appConfig.workspaceDir, codeBlock.relativePath));
-      const document = this.editorDocumentModelService.getModelReference(uri);
+      const document = this.editorDocumentModelService.getModelReference(
+        URI.file(path.join(this.appConfig.workspaceDir, codeBlock.relativePath)),
+      );
       if (editorCurrentContent !== updatedContentOrStream || document?.instance.dirty) {
         editor.getModel()?.pushEditOperations([], [EditOperation.replace(range, updatedContentOrStream)], () => null);
-        await this.editorService.save(uri);
+        await this.editorService.save(URI.file(path.join(this.appConfig.workspaceDir, codeBlock.relativePath)));
       }
-      const uriPendingCodeBlocks = this.getUriCodeBlocks(uri)?.filter((block) => block.status === 'pending');
-      const earlistPendingCodeBlock = uriPendingCodeBlocks?.[uriPendingCodeBlocks.length - 1];
+      const earlistPendingCodeBlock = this.getSessionCodeBlocksForPath(codeBlock.relativePath).find(
+        (block) => block.status === 'pending',
+      );
       if ((earlistPendingCodeBlock?.originalCode || codeBlock.originalCode) === updatedContentOrStream) {
         codeBlock.status = 'cancelled';
         this.updateCodeBlock(codeBlock);
@@ -359,6 +367,9 @@ export abstract class BaseApplyService extends WithEventBus {
         },
       ) as LiveInlineDiffPreviewer;
       this.activePreviewerMap.set(codeBlock.relativePath, previewer);
+      codeBlock.updatedCode = updatedContentOrStream;
+      codeBlock.status = 'pending';
+      this.updateCodeBlock(codeBlock);
       // 新建文件场景，为避免model为空，加一个空行
       previewer.setValue(earlistPendingCodeBlock?.originalCode || codeBlock.originalCode || '\n');
       // 强刷展示 manager 视图
@@ -374,7 +385,7 @@ export abstract class BaseApplyService extends WithEventBus {
 
       const { diff, rangesFromDiffHunk } = this.getDiffResult(
         codeBlock.originalCode,
-        codeBlock.updatedCode || updatedContentOrStream,
+        codeBlock.updatedCode,
         codeBlock.relativePath,
       );
       const diagnosticInfos = this.getDiagnosticInfos(editor.getModel()!.uri.toString(), rangesFromDiffHunk);
@@ -394,17 +405,6 @@ export abstract class BaseApplyService extends WithEventBus {
           renderRemovedWidgetImmediately: false,
         },
       }) as LiveInlineDiffPreviewer;
-
-      this.addDispose(
-        controller.onError((err) => {
-          deferred.reject(err);
-        }),
-      );
-      this.addDispose(
-        controller.onAbort(() => {
-          deferred.reject(new Error('Apply aborted'));
-        }),
-      );
       this.addDispose(
         // 流式输出结束后，转为直接输出逻辑
         previewer.getNode()!.onDiffFinished(async (diffModel) => {
@@ -418,7 +418,6 @@ export abstract class BaseApplyService extends WithEventBus {
             deferred.resolve();
             return;
           }
-          codeBlock.status = 'pending';
           this.updateCodeBlock(codeBlock);
           previewer.dispose();
           const result = await this.renderApplyResult(editor, codeBlock, codeBlock.updatedCode);
@@ -433,12 +432,8 @@ export abstract class BaseApplyService extends WithEventBus {
   /**
    * Cancel an ongoing apply operation
    */
-  cancelApply(blockData: CodeBlockData, keepStatus?: boolean): void {
+  cancelApply(blockData: CodeBlockData): void {
     if (blockData.status === 'generating' || blockData.status === 'pending') {
-      // 先取消掉相关的监听器
-      this.editorListenerMap.disposeKey(
-        URI.file(path.join(this.appConfig.workspaceDir, blockData.relativePath)).toString(),
-      );
       if (this.activePreviewerMap.has(blockData.relativePath)) {
         this.activePreviewerMap
           .get(blockData.relativePath)
@@ -446,16 +441,19 @@ export abstract class BaseApplyService extends WithEventBus {
           ?.livePreviewDiffDecorationModel.discardUnProcessed();
         this.activePreviewerMap.disposeKey(blockData.relativePath);
       }
-      if (!keepStatus) {
-        blockData.status = 'cancelled';
-        this.updateCodeBlock(blockData);
-      }
+      blockData.status = 'cancelled';
+      this.updateCodeBlock(blockData);
     }
   }
 
-  cancelAllApply(sessionId?: string): void {
-    const sessionCodeBlocks = this.getSessionCodeBlocks(sessionId);
-    sessionCodeBlocks.forEach((blockData) => {
+  // TODO: 目前的设计下，有一个工具 apply 没返回，是不会触发下一个的(cursor 是会全部自动 apply 的），所以这个方法目前还没有必要
+  cancelAllApply(): void {
+    const messageId = this.chatInternalService.sessionModel.history.lastMessageId!;
+    const codeBlockMap = this.getMessageCodeBlocks(messageId);
+    if (!codeBlockMap) {
+      return;
+    }
+    Object.values(codeBlockMap).forEach((blockData) => {
       this.cancelApply(blockData);
     });
   }
@@ -478,12 +476,12 @@ export abstract class BaseApplyService extends WithEventBus {
   }
 
   processAll(uri: URI, type: 'accept' | 'reject'): void {
-    const codeBlocks = this.getUriCodeBlocks(uri)?.filter((block) => block.status === 'pending');
-    if (!codeBlocks?.length) {
+    const codeBlock = this.getUriPendingCodeBlock(uri);
+    if (!codeBlock) {
       throw new Error('No pending code block found');
     }
     const decorationModel = this.activePreviewerMap
-      .get(codeBlocks[0].relativePath)
+      .get(codeBlock.relativePath)
       ?.getNode()?.livePreviewDiffDecorationModel;
     if (!decorationModel) {
       throw new Error('No active previewer found');
@@ -494,11 +492,8 @@ export abstract class BaseApplyService extends WithEventBus {
       decorationModel.discardUnProcessed();
     }
     this.editorService.save(uri);
-    codeBlocks.forEach((codeBlock) => {
-      codeBlock.status = type === 'accept' ? 'success' : 'cancelled';
-      // TODO: 批量更新
-      this.updateCodeBlock(codeBlock);
-    });
+    codeBlock.status = type === 'accept' ? 'success' : 'cancelled';
+    this.updateCodeBlock(codeBlock);
   }
 
   protected listenPartialEdit(model: ITextModel, codeBlock: CodeBlockData) {

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

@@ -57,11 +57,6 @@ export class MsgHistoryManager extends Disposable {
 
   private startIndex = 0;
 
-  private get totalTokens(): number {
-    const list = this.messageList.slice(this.startIndex);
-    return list.reduce((acc, msg) => acc + (msg.content.length || 0), 0) / 3;
-  }
-
   public get slicedMessageCount(): number {
     return this.startIndex;
   }
@@ -71,12 +66,7 @@ export class MsgHistoryManager extends Disposable {
     return list[list.length - 1]?.id;
   }
 
-  public getMessages(maxTokens?: number): IHistoryChatMessage[] {
-    if (maxTokens && this.totalTokens > maxTokens) {
-      while (this.totalTokens > maxTokens) {
-        this.startIndex++;
-      }
-    }
+  public getMessages(): IHistoryChatMessage[] {
     return this.messageList.slice(this.startIndex);
   }
 

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

@@ -83,11 +83,7 @@ export class InlineChatController {
         this._onData.fire(reply);
       },
       onEnd: () => {
-        if (!wholeContent) {
-          this._onError.fire(new ErrorResponse(new Error('No content')));
-        } else {
-          this._onEnd.fire();
-        }
+        this._onEnd.fire();
       },
       onError: (error) => {
         if (AbortError.is(error)) {

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

@@ -29,7 +29,7 @@ export const InlineDiffManager: React.FC<{ resource: IResource }> = (props) => {
   const [show, setShow] = useState(true);
   const [changesCount, setChangesCount] = useState(0);
   const [currentChangeIndex, setCurrentChangeIndex] = useState(0);
-  const [filePaths, setFilePaths] = useState<string[]>(applyService.getPendingPaths());
+  const [filePaths, setFilePaths] = useState<string[]>([]);
 
   const currentFilePath = useMemo(
     () => path.relative(appConfig.workspaceDir, resource.uri.path.toString()),

package/src/browser/widget/inline-diff/inline-diff-widget.module.less

@@ -22,7 +22,7 @@
 
 .inlineDiffManager {
   display: flex;
-  border-radius: 14px;
+  border-radius: 13px;
   align-items: center;
   position: absolute;
   bottom: 18px;
@@ -38,7 +38,7 @@
     border-right: 1px solid var(--design-borderColor);
   }
   :global(.codicon) {
-    font-size: 16px;
+    font-size: 20px;
     padding: 6px;
     color: var(--kt-primaryButton-foreground);
     background-color: var(--kt-primaryButton-hoverBackground);
@@ -48,7 +48,7 @@
   }
 }
 .disabled {
-  color: var(--kt-button-disableForeground) !important;
+  // color: var(--kt-button-disableForeground) !important;
   background-color: var(--kt-button-disableBackground) !important;
   cursor: not-allowed;
 }

package/src/common/index.ts

@@ -12,13 +12,16 @@ import {
   IMarkdownString,
   Uri,
 } from '@opensumi/ide-core-common';
-import { IChatMessage } from '@opensumi/ide-core-common/lib/types/ai-native';
 import { DESIGN_MENUBAR_CONTAINER_VIEW_ID } from '@opensumi/ide-design/lib/common/constants';
 import { IPosition, ITextModel, InlineCompletionContext } from '@opensumi/ide-monaco/lib/common';
 
 import { MCPServerDescription } from './mcp-server-manager';
 import { MCPTool } from './types';
 
+import type { CoreMessage } from 'ai';
+
+export type { CoreMessage };
+
 export * from './model';
 
 export const IAINativeService = Symbol('IAINativeService');
@@ -146,7 +149,7 @@ export interface IChatAgentService {
     id: string,
     request: IChatAgentRequest,
     progress: (part: IChatProgress) => void,
-    history: IChatMessage[],
+    history: CoreMessage[],
     token: CancellationToken,
   ): Promise<IChatAgentResult>;
   getAgents(): Array<IChatAgent>;
@@ -167,7 +170,7 @@ export interface IChatAgent extends IChatAgentData {
   invoke(
     request: IChatAgentRequest,
     progress: (part: IChatProgress) => void,
-    history: IChatMessage[],
+    history: CoreMessage[],
     token: CancellationToken,
   ): Promise<IChatAgentResult>;
   provideFollowups?(sessionId: string, token: CancellationToken): Promise<IChatFollowup[]>;

package/src/common/types.ts

@@ -50,7 +50,6 @@ export interface MCPTool {
 }
 
 export interface CodeBlockData {
-  messageId: string;
   toolCallId: string;
   codeEdit: string;
   originalCode: string;

package/src/node/base-language-model.ts

@@ -1,7 +1,7 @@
 import { CoreMessage, ToolExecutionOptions, jsonSchema, streamText, tool } from 'ai';
 
 import { Autowired, Injectable } from '@opensumi/di';
-import { ChatMessageRole, IAIBackServiceOption, IChatMessage } from '@opensumi/ide-core-common';
+import { IAIBackServiceOption } from '@opensumi/ide-core-common';
 import { ChatReadableStream } from '@opensumi/ide-core-node';
 import { CancellationToken } from '@opensumi/ide-utils';
 
@@ -21,21 +21,6 @@ export abstract class BaseLanguageModel {
 
   protected abstract initializeProvider(options: IAIBackServiceOption): any;
 
-  private convertChatMessageRole(role: ChatMessageRole) {
-    switch (role) {
-      case ChatMessageRole.System:
-        return 'system';
-      case ChatMessageRole.User:
-        return 'user';
-      case ChatMessageRole.Assistant:
-        return 'assistant';
-      case ChatMessageRole.Function:
-        return 'tool';
-      default:
-        return 'user';
-    }
-  }
-
   async request(
     request: string,
     chatReadableStream: ChatReadableStream,
@@ -86,7 +71,7 @@ export abstract class BaseLanguageModel {
     request: string,
     tools: ToolRequest[],
     chatReadableStream: ChatReadableStream,
-    history: IChatMessage[] = [],
+    history: CoreMessage[] = [],
     modelId?: string,
     providerOptions?: Record<string, any>,
     trimTexts?: [string, string],
@@ -104,13 +89,7 @@ export abstract class BaseLanguageModel {
         });
       }
 
-      const messages: CoreMessage[] = [
-        ...history.map((msg) => ({
-          role: this.convertChatMessageRole(msg.role) as any, // 这个 SDK 包里的类型不太好完全对应，
-          content: msg.content,
-        })),
-        { role: 'user', content: request },
-      ];
+      const messages: CoreMessage[] = [...history, { role: 'user', content: request }];
       const modelInfo = modelId ? this.getModelInfo(modelId) : undefined;
       const stream = streamText({
         model: this.getModelIdentifier(provider, modelId),