@opensumi/ide-ai-native 3.9.1-next-1749115679.0 → 3.9.1-next-1749175927.0

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

@@ -63,21 +63,18 @@ export class ListDirTool implements MCPServerContribution {
 
     // 设置消息的附加数据
     const messages = this.chatInternalService.sessionModel.history.getMessages();
-    const messageId = messages[messages.length - 1]?.id;
-    if (messageId) {
-      this.chatInternalService.sessionModel.history.setMessageAdditional(messageId, {
-        [args.toolCallId]: {
-          files: fileUris,
-          title: `Listed directory "${args.relativeWorkspacePath}"`,
-          details: result.files.map((file) => ({
-            type: file.isDirectory ? 'dir' : 'file',
-            name: file.name,
-            info: file.isDirectory ? `${file.numChildren ?? '?'} items` : `${file.size}KB, ${file.numLines} lines`,
-            lastModified: file.lastModified,
-          })),
-        },
-      });
-    }
+    this.chatInternalService.sessionModel.history.setMessageAdditional(messages[messages.length - 1].id, {
+      [args.toolCallId]: {
+        files: fileUris,
+        title: `Listed directory "${args.relativeWorkspacePath}"`,
+        details: result.files.map((file) => ({
+          type: file.isDirectory ? 'dir' : 'file',
+          name: file.name,
+          info: file.isDirectory ? `${file.numChildren ?? '?'} items` : `${file.size}KB, ${file.numLines} lines`,
+          lastModified: file.lastModified,
+        })),
+      },
+    });
 
     logger.appendLine(`Listed ${fileUris.length} files in directory "${args.relativeWorkspacePath}"`);
 

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

@@ -1,11 +1,61 @@
 import { Disposable, Emitter, Event, uuid } from '@opensumi/ide-core-common';
 import { ChatMessageRole, IHistoryChatMessage } from '@opensumi/ide-core-common/lib/types/ai-native';
 
+import { ChatFeatureRegistry } from '../chat/chat.feature.registry';
+
 type IExcludeMessage = Omit<IHistoryChatMessage, 'id' | 'order'>;
 
+interface IMemoryConfig {
+  shortTermSize: number; // 最近消息窗口大小（10条）
+  bufferSize: number; // 缓冲区大小（5条）
+}
+
+interface IMemorySummary {
+  content: string;
+  timestamp: number;
+  messageIds: string[];
+}
+
+interface IToolCallInfo {
+  id: string;
+  name: string;
+  args: Record<string, any>;
+  result: any;
+}
+
+export interface MessageBufferManager {
+  messages: IHistoryChatMessage[];
+  add(message: IHistoryChatMessage): void;
+  clear(): void;
+  size(): number;
+}
+
+class SimpleMessageBuffer implements MessageBufferManager {
+  private _messages: IHistoryChatMessage[] = [];
+
+  get messages(): IHistoryChatMessage[] {
+    return this._messages;
+  }
+
+  add(message: IHistoryChatMessage): void {
+    this._messages.push(message);
+  }
+
+  clear(): void {
+    this._messages = [];
+  }
+
+  size(): number {
+    return this._messages.length;
+  }
+}
+
 export class MsgHistoryManager extends Disposable {
   private messageMap: Map<string, IHistoryChatMessage> = new Map();
   private messageAdditionalMap: Map<string, Record<string, any>> = new Map();
+  private memorySummaries: IMemorySummary[] = [];
+  private toolCallMap: Map<string, IToolCallInfo> = new Map();
+  private isCompressing = false; // 添加压缩锁，防止重复压缩
 
   private readonly _onMessageChange = new Emitter<IHistoryChatMessage[]>();
   public readonly onMessageChange: Event<IHistoryChatMessage[]> = this._onMessageChange.event;
@@ -13,11 +63,33 @@ export class MsgHistoryManager extends Disposable {
   private readonly _onMessageAdditionalChange = new Emitter<Record<string, any>>();
   public readonly onMessageAdditionalChange: Event<Record<string, any>> = this._onMessageAdditionalChange.event;
 
-  constructor(data?: { additional: Record<string, any>; messages: IHistoryChatMessage[] }) {
+  private messageBuffer: MessageBufferManager;
+
+  memoryConfig: IMemoryConfig = {
+    shortTermSize: 10,
+    bufferSize: 5,
+  };
+
+  constructor(
+    private chatFeatureRegistry: ChatFeatureRegistry,
+    data?: {
+      additional: Record<string, any>;
+      messages: IHistoryChatMessage[];
+      toolCalls?: Record<string, IToolCallInfo>;
+      memorySummaries?: IMemorySummary[];
+    },
+  ) {
     super();
+    this.messageBuffer = new SimpleMessageBuffer();
     if (data) {
       this.messageMap = new Map(data.messages.map((item) => [item.id, item]));
       this.messageAdditionalMap = new Map(Object.entries(data.additional));
+      if (data.toolCalls) {
+        this.toolCallMap = new Map(Object.entries(data.toolCalls));
+      }
+      if (data.memorySummaries) {
+        this.memorySummaries = data.memorySummaries;
+      }
     }
   }
 
@@ -33,6 +105,91 @@ export class MsgHistoryManager extends Disposable {
   public clearMessages() {
     this.messageMap.clear();
     this.messageAdditionalMap.clear();
+    this.memorySummaries = [];
+    this.toolCallMap.clear();
+  }
+
+  /**
+   * 压缩历史消息的方法：
+   * 1. 保持最新的10条消息不变
+   * 2. 当累积了5条超出限制的消息时，对这5条（最早的消息）进行总结
+   * 3. 总结完成后删除这5条消息
+   * 4. 重复这个过程，确保消息数量始终在可控范围内
+   */
+  private async compressMemory() {
+    // 如果正在压缩中，直接返回
+    if (this.isCompressing) {
+      return;
+    }
+
+    const messages = this.messageList;
+    // 只有当消息总数超过短期记忆限制时才进行压缩
+    if (messages.length <= this.memoryConfig.shortTermSize) {
+      return;
+    }
+
+    try {
+      this.isCompressing = true;
+
+      // 1. 获取超出短期记忆限制的最新一条消息
+      const latestExcessMessage = messages[messages.length - this.memoryConfig.shortTermSize - 1];
+
+      // 如果这条消息已经被总结过，就不需要再处理
+      if (latestExcessMessage.isSummarized) {
+        return;
+      }
+
+      // 2. 将这条消息添加到缓冲区
+      this.messageBuffer.add(latestExcessMessage);
+
+      // 3. 当缓冲区达到指定大小时，进行总结
+      if (this.messageBuffer.size() >= this.memoryConfig.bufferSize) {
+        const messagesToSummarize = this.messageBuffer.messages;
+
+        const summaryProvider = this.chatFeatureRegistry.getMessageSummaryProvider?.();
+        if (summaryProvider) {
+          const messageContents = messagesToSummarize.map((msg) => ({
+            role: msg.role,
+            content: msg.content,
+          }));
+
+          const memorize = await summaryProvider.generateMemorizedMessage(messageContents);
+          if (memorize) {
+            // 添加新的记忆总结
+            this.memorySummaries.push({
+              content: memorize,
+              timestamp: Date.now(),
+              messageIds: messagesToSummarize.map((msg) => msg.id),
+            });
+
+            // 标记消息为已总结
+            for (const msg of messagesToSummarize) {
+              const existingMsg = this.messageMap.get(msg.id);
+              if (existingMsg) {
+                this.messageMap.set(msg.id, {
+                  ...existingMsg,
+                  isSummarized: true,
+                });
+              }
+            }
+
+            // 清空缓冲区
+            this.messageBuffer.clear();
+          }
+        }
+      }
+    } finally {
+      this.isCompressing = false;
+    }
+  }
+
+  public addToolCall(toolCall: IToolCallInfo): void {
+    this.toolCallMap.set(toolCall.id, toolCall);
+  }
+
+  public getToolCall(id: string): IToolCallInfo | undefined {
+    const toolCall = this.toolCallMap.get(id);
+    return toolCall;
   }
 
   private doAddMessage(message: IExcludeMessage): string {
@@ -48,11 +205,19 @@ export class MsgHistoryManager extends Disposable {
 
     this.messageMap.set(id, msg);
 
+    // 在添加新消息后尝试压缩记忆
+    this.compressMemory().catch((error) => {
+      // eslint-disable-next-line no-console
+      console.error('[MsgHistoryManager] Error compressing memory', error);
+    });
+
+    // 无论压缩是否完成，都触发消息变更事件
     this._onMessageChange.fire(this.getMessages());
     return id;
   }
 
   private get messageList(): IHistoryChatMessage[] {
+    // 按 order 升序排序，保持消息的原始顺序
     return Array.from(this.messageMap.values()).sort((a, b) => a.order - b.order);
   }
 
@@ -65,6 +230,17 @@ export class MsgHistoryManager extends Disposable {
     return this.messageList;
   }
 
+  public getMemorySummaries(): IMemorySummary[] {
+    return this.memorySummaries;
+  }
+
+  public setMemoryConfig(config: Partial<IMemoryConfig>) {
+    this.memoryConfig = {
+      ...this.memoryConfig,
+      ...config,
+    };
+  }
+
   public addUserMessage(
     message: Required<Pick<IExcludeMessage, 'agentId' | 'agentCommand' | 'content' | 'relationId' | 'images'>>,
   ): string {
@@ -118,9 +294,12 @@ export class MsgHistoryManager extends Disposable {
   }
 
   toJSON() {
-    return {
+    const data = {
       messages: this.getMessages(),
       additional: Object.fromEntries(this.messageAdditionalMap.entries()),
+      memorySummaries: this.memorySummaries,
+      toolCalls: Object.fromEntries(this.toolCallMap.entries()),
     };
+    return data;
   }
 }

package/src/browser/types.ts

@@ -308,6 +308,12 @@ export interface IMessageSummaryProvider {
       content: string;
     }>,
   ): Promise<string | undefined>;
+  generateMemorizedMessage(
+    messages: Array<{
+      role: ChatMessageRole;
+      content: string;
+    }>,
+  ): Promise<string | undefined>;
 }
 
 export const AINativeCoreContribution = Symbol('AINativeCoreContribution');

package/src/node/mcp-server.sse.ts

@@ -1,6 +1,5 @@
 // have to import with extension since the exports map is ./* -> ./dist/cjs/*
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
 import { EventSource } from 'eventsource';
 
 import { ILogger } from '@opensumi/ide-core-common';
@@ -48,6 +47,8 @@ export class SSEMCPServer implements IMCPServer {
     }
     this.logger?.log(`Starting server "${this.name}" with url: ${this.url}`);
 
+    const SSEClientTransport = (await import('@modelcontextprotocol/sdk/client/sse.js')).SSEClientTransport;
+
     const transport = new SSEClientTransport(new URL(this.url), this.transportOptions);
 
     transport.onerror = (error) => {

package/lib/browser/mcp/tools/handlers/CreateNewFileWithText.d.ts

@@ -1,15 +0,0 @@
-import { CodeBlockData } from '../../../../common/types';
-/**
- * 创建新文件处理器
- * 用于处理创建新文件并写入内容的操作
- */
-export declare class CreateNewFileWithTextHandler {
-    private readonly workspaceService;
-    private readonly fileService;
-    private applyService;
-    handler(params: {
-        targetFile: string;
-        codeEdit: string;
-    }, toolCallId: string): Promise<CodeBlockData>;
-}
-//# sourceMappingURL=CreateNewFileWithText.d.ts.map

package/lib/browser/mcp/tools/handlers/CreateNewFileWithText.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"CreateNewFileWithText.d.ts","sourceRoot":"","sources":["../../../../../src/browser/mcp/tools/handlers/CreateNewFileWithText.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGzD;;;GAGG;AACH,qBACa,4BAA4B;IAEvC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAoB;IAGrD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;IAGjD,OAAO,CAAC,YAAY,CAAmB;IAEjC,OAAO,CAAC,MAAM,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;CAyB5G"}

package/lib/browser/mcp/tools/handlers/CreateNewFileWithText.js

@@ -1,53 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CreateNewFileWithTextHandler = void 0;
-const tslib_1 = require("tslib");
-const di_1 = require("@opensumi/di");
-const ide_core_common_1 = require("@opensumi/ide-core-common");
-const ide_file_service_1 = require("@opensumi/ide-file-service");
-const ide_workspace_1 = require("@opensumi/ide-workspace");
-const base_apply_service_1 = require("../../base-apply.service");
-/**
- * 创建新文件处理器
- * 用于处理创建新文件并写入内容的操作
- */
-let CreateNewFileWithTextHandler = class CreateNewFileWithTextHandler {
-    async handler(params, toolCallId) {
-        // 获取工作区根目录
-        const workspaceRoots = this.workspaceService.tryGetRoots();
-        if (!workspaceRoots || workspaceRoots.length === 0) {
-            throw new Error("can't find project dir");
-        }
-        // 构建完整的文件路径
-        const rootUri = ide_core_common_1.URI.parse(workspaceRoots[0].uri);
-        const fullPath = ide_core_common_1.path.join(rootUri.codeUri.fsPath, params.targetFile);
-        const fileUri = ide_core_common_1.URI.file(fullPath);
-        // 创建父目录
-        const parentDir = ide_core_common_1.path.dirname(fullPath);
-        const parentUri = ide_core_common_1.URI.file(parentDir);
-        await this.fileService.createFolder(parentUri.toString());
-        // 创建文件
-        await this.fileService.createFile(fileUri.toString());
-        // 使用 applyService 写入文件内容
-        const codeBlock = await this.applyService.registerCodeBlock(params.targetFile, params.codeEdit, toolCallId);
-        await this.applyService.apply(codeBlock);
-        return codeBlock;
-    }
-};
-exports.CreateNewFileWithTextHandler = CreateNewFileWithTextHandler;
-tslib_1.__decorate([
-    (0, di_1.Autowired)(ide_workspace_1.IWorkspaceService),
-    tslib_1.__metadata("design:type", Object)
-], CreateNewFileWithTextHandler.prototype, "workspaceService", void 0);
-tslib_1.__decorate([
-    (0, di_1.Autowired)(ide_file_service_1.IFileServiceClient),
-    tslib_1.__metadata("design:type", Object)
-], CreateNewFileWithTextHandler.prototype, "fileService", void 0);
-tslib_1.__decorate([
-    (0, di_1.Autowired)(base_apply_service_1.BaseApplyService),
-    tslib_1.__metadata("design:type", base_apply_service_1.BaseApplyService)
-], CreateNewFileWithTextHandler.prototype, "applyService", void 0);
-exports.CreateNewFileWithTextHandler = CreateNewFileWithTextHandler = tslib_1.__decorate([
-    (0, di_1.Injectable)()
-], CreateNewFileWithTextHandler);
-//# sourceMappingURL=CreateNewFileWithText.js.map

package/lib/browser/mcp/tools/handlers/CreateNewFileWithText.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"CreateNewFileWithText.js","sourceRoot":"","sources":["../../../../../src/browser/mcp/tools/handlers/CreateNewFileWithText.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,+DAAsD;AACtD,iEAAgE;AAChE,2DAA4D;AAG5D,iEAA4D;AAE5D;;;GAGG;AAEI,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IAUvC,KAAK,CAAC,OAAO,CAAC,MAAgD,EAAE,UAAkB;QAChF,WAAW;QACX,MAAM,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC;QAC3D,IAAI,CAAC,cAAc,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnD,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC5C,CAAC;QAED,YAAY;QACZ,MAAM,OAAO,GAAG,qBAAG,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACjD,MAAM,QAAQ,GAAG,sBAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QACtE,MAAM,OAAO,GAAG,qBAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEnC,QAAQ;QACR,MAAM,SAAS,GAAG,sBAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACzC,MAAM,SAAS,GAAG,qBAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACtC,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QAE1D,OAAO;QACP,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAEtD,yBAAyB;QACzB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QAC5G,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACzC,OAAO,SAAS,CAAC;IACnB,CAAC;CACF,CAAA;AAnCY,oEAA4B;AAEtB;IADhB,IAAA,cAAS,EAAC,iCAAiB,CAAC;;sEACwB;AAGpC;IADhB,IAAA,cAAS,EAAC,qCAAkB,CAAC;;iEACmB;AAGzC;IADP,IAAA,cAAS,EAAC,qCAAgB,CAAC;sCACN,qCAAgB;kEAAC;uCAR5B,4BAA4B;IADxC,IAAA,eAAU,GAAE;GACA,4BAA4B,CAmCxC"}

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

@@ -1,49 +0,0 @@
-import { Autowired, Injectable } from '@opensumi/di';
-import { URI, path } from '@opensumi/ide-core-common';
-import { IFileServiceClient } from '@opensumi/ide-file-service';
-import { IWorkspaceService } from '@opensumi/ide-workspace';
-
-import { CodeBlockData } from '../../../../common/types';
-import { BaseApplyService } from '../../base-apply.service';
-
-/**
- * 创建新文件处理器
- * 用于处理创建新文件并写入内容的操作
- */
-@Injectable()
-export class CreateNewFileWithTextHandler {
-  @Autowired(IWorkspaceService)
-  private readonly workspaceService: IWorkspaceService;
-
-  @Autowired(IFileServiceClient)
-  private readonly fileService: IFileServiceClient;
-
-  @Autowired(BaseApplyService)
-  private applyService: BaseApplyService;
-
-  async handler(params: { targetFile: string; codeEdit: string }, toolCallId: string): Promise<CodeBlockData> {
-    // 获取工作区根目录
-    const workspaceRoots = this.workspaceService.tryGetRoots();
-    if (!workspaceRoots || workspaceRoots.length === 0) {
-      throw new Error("can't find project dir");
-    }
-
-    // 构建完整的文件路径
-    const rootUri = URI.parse(workspaceRoots[0].uri);
-    const fullPath = path.join(rootUri.codeUri.fsPath, params.targetFile);
-    const fileUri = URI.file(fullPath);
-
-    // 创建父目录
-    const parentDir = path.dirname(fullPath);
-    const parentUri = URI.file(parentDir);
-    await this.fileService.createFolder(parentUri.toString());
-
-    // 创建文件
-    await this.fileService.createFile(fileUri.toString());
-
-    // 使用 applyService 写入文件内容
-    const codeBlock = await this.applyService.registerCodeBlock(params.targetFile, params.codeEdit, toolCallId);
-    await this.applyService.apply(codeBlock);
-    return codeBlock;
-  }
-}