foliko 1.0.86 → 1.0.87

package/examples/test-chat-stream-diff.js

@@ -0,0 +1,63 @@
+/**
+ * 测试 chat 和 chatStream 的差异
+ */
+
+const { Framework } = require('../src');
+const AIPlugin = require('../plugins/ai-plugin');
+const SessionPlugin = require('../plugins/session-plugin');
+require('dotenv').config();
+
+async function main() {
+  console.log('=== 测试 chat vs chatStream 差异 ===\n');
+
+  const framework = new Framework({ debug: false });
+
+  await framework.loadPlugin(
+    new AIPlugin({
+      provider: 'minimax',
+      model: 'MiniMax-M2.7',
+      apiKey: process.env.MINIMAX_API_KEY || 'your-api-key',
+    })
+  );
+  await framework.loadPlugin(new SessionPlugin());
+
+  const systemPrompt = `你是一个有帮助的助手。`;
+
+  const agent = framework.createAgent({
+    name: 'TestAgent',
+    systemPrompt: systemPrompt,
+  });
+
+  const sessionId = 'test_session';
+  const sessionPlugin = framework.pluginManager.get('session');
+  sessionPlugin.getOrCreateSession(sessionId, { metadata: {} });
+
+  // 测试 chat
+  console.log('--- Test 1: chat() ---');
+  const result1 = await agent.chat('你好，介绍一下自己', { sessionId });
+  console.log('chat result.message length:', result1.message?.length);
+  console.log('chat result.message:', result1.message?.substring(0, 100));
+
+  // 测试 chatStream
+  console.log('\n--- Test 2: chatStream() ---');
+  let streamText = '';
+  for await (const chunk of agent.chatStream('今天天气怎么样？', { sessionId })) {
+    if (chunk.type === 'text') {
+      streamText += chunk.text;
+    }
+  }
+  console.log('chatStream full text length:', streamText.length);
+  console.log('chatStream full text:', streamText.substring(0, 100));
+
+  // 测试更多轮对话后的 chat
+  console.log('\n--- Test 3: 多轮后 chat() ---');
+  await agent.chat('再说一次你的名字', { sessionId });
+  const result3 = await agent.chat('我叫什么？', { sessionId });
+  console.log('chat result.message length:', result3.message?.length);
+  console.log('chat result.message:', result3.message?.substring(0, 100));
+
+  await framework.destroy();
+  console.log('\n[Done]');
+}
+
+main().catch(console.error);

package/examples/test-concurrent-chat.js

@@ -0,0 +1,60 @@
+/**
+ * 测试并发 chat 调用
+ */
+
+const { Framework } = require('../src');
+const AIPlugin = require('../plugins/ai-plugin');
+const SessionPlugin = require('../plugins/session-plugin');
+require('dotenv').config();
+
+async function main() {
+  console.log('=== 测试并发 chat 调用 ===\n');
+
+  const framework = new Framework({ debug: false });
+
+  await framework.loadPlugin(
+    new AIPlugin({
+      provider: 'minimax',
+      model: 'MiniMax-M2.7',
+      apiKey: process.env.MINIMAX_API_KEY || 'your-api-key',
+    })
+  );
+  await framework.loadPlugin(new SessionPlugin());
+
+  const systemPrompt = `你是一个微信助手。`;
+
+  // 创建一个 agent（模拟单个用户）
+  const agent = framework.createAgent({
+    name: 'WeixinAgent',
+    systemPrompt: systemPrompt,
+  });
+
+  const sessionId = 'weixin_test_user';
+  const sessionPlugin = framework.pluginManager.get('session');
+  sessionPlugin.getOrCreateSession(sessionId, { metadata: { platform: 'weixin' } });
+
+  // 模拟 3 个并发 chat 调用
+  console.log('\n--- 并发发送 3 条消息 ---');
+
+  const results = await Promise.all([
+    agent.chat('你好', { sessionId }),
+    agent.chat('今天天气怎么样？', { sessionId }),
+    agent.chat('帮我查一下天气', { sessionId }),
+  ]);
+
+  console.log('\n--- 结果 ---');
+  for (let i = 0; i < results.length; i++) {
+    const r = results[i];
+    console.log(`[${i}] message length: ${r.message?.length || 'EMPTY'}`);
+    console.log(`[${i}] message: ${r.message?.substring(0, 50) || 'EMPTY'}...`);
+  }
+
+  // 检查 _messages 状态
+  const chatHandler = agent._chatHandler;
+  console.log(`\n[DEBUG] _messages count: ${chatHandler?._messages.length}`);
+
+  await framework.destroy();
+  console.log('\n[Done]');
+}
+
+main().catch(console.error);

package/examples/test-long-chat.js

@@ -0,0 +1,77 @@
+/**
+ * 测试长对话压缩场景
+ */
+
+const { Framework } = require('../src');
+const AIPlugin = require('../plugins/ai-plugin');
+const SessionPlugin = require('../plugins/session-plugin');
+require('dotenv').config();
+
+async function main() {
+  console.log('=== 测试长对话压缩场景 ===\n');
+
+  const framework = new Framework({ debug: false });
+
+  await framework.loadPlugin(
+    new AIPlugin({
+      provider: 'minimax',
+      model: 'MiniMax-M2.7',
+      apiKey: process.env.MINIMAX_API_KEY || 'your-api-key',
+    })
+  );
+  await framework.loadPlugin(new SessionPlugin());
+
+  const systemPrompt = `你是一个有帮助的助手。`;
+
+  const agent = framework.createAgent({
+    name: 'TestAgent',
+    systemPrompt: systemPrompt,
+  });
+
+  const sessionId = 'test_session';
+  const sessionPlugin = framework.pluginManager.get('session');
+  sessionPlugin.getOrCreateSession(sessionId, { metadata: {} });
+
+  // 发送多条长消息来触发压缩
+  const longContent = `请详细描述以下内容：人工智能的发展历史、现状和未来趋势。包括机器学习、深度学习、自然语言处理等核心技术的发展历程，以及在各个行业中的应用场景。同时分析当前面临的挑战，如数据隐私、算法偏见、能源消耗等问题。`;
+
+  console.log('--- 发送 15 条长消息 ---');
+  for (let i = 1; i <= 15; i++) {
+    try {
+      const result = await agent.chat(`${longContent}\n\n[消息 ${i}]`, { sessionId });
+      const msgLen = result.message?.length || 0;
+      console.log(`[${i}] message length: ${msgLen}, success: ${result.success}`);
+
+      if (!result.message) {
+        console.log(`[ERROR] message is empty!`);
+        console.log(`[DEBUG] result:`, JSON.stringify(result, null, 2));
+        break;
+      }
+    } catch (err) {
+      console.error(`[${i}] Error:`, err.message);
+    }
+  }
+
+  // 检查压缩统计
+  const chatHandler = agent._chatHandler;
+  console.log(`\n[DEBUG] compression count: ${chatHandler?._compressionCount}`);
+  console.log(`[DEBUG] _messages count: ${chatHandler?._messages.length}`);
+
+  // 压缩后再发一条
+  console.log('\n--- 压缩后发送测试 ---');
+  try {
+    const result = await agent.chat('你好，压缩后你还认识我吗？', { sessionId });
+    console.log(`message length: ${result.message?.length || 0}`);
+    console.log(`message: ${result.message?.substring(0, 100)}`);
+    if (!result.message) {
+      console.log(`[ERROR] message is empty after compression!`);
+    }
+  } catch (err) {
+    console.error(`Error:`, err.message);
+  }
+
+  await framework.destroy();
+  console.log('\n[Done]');
+}
+
+main().catch(console.error);

package/examples/test-session-chat.js

@@ -0,0 +1,93 @@
+/**
+ * 模拟微信持续聊天场景
+ * 测试多轮对话后 result.message 是否为空
+ */
+
+const { Framework } = require('../src');
+const AIPlugin = require('../plugins/ai-plugin');
+const SessionPlugin = require('../plugins/session-plugin');
+require('dotenv').config();
+
+async function main() {
+  console.log('=== 模拟微信持续聊天场景 ===\n');
+
+  const framework = new Framework({ debug: false });
+
+  await framework.loadPlugin(
+    new AIPlugin({
+      provider: 'minimax',
+      model: 'MiniMax-M2.7',
+      apiKey: process.env.MINIMAX_API_KEY || 'your-api-key',
+    })
+  );
+
+  // 加载 session 插件
+  await framework.loadPlugin(new SessionPlugin());
+
+  // 模拟微信的 system prompt
+  const systemPrompt = `你是一个微信助手。`;
+
+  // 创建 Agent（模拟 _getSessionAgent）
+  const agent = framework.createAgent({
+    name: 'WeixinAgent',
+    systemPrompt: systemPrompt,
+  });
+
+  // 模拟 session
+  const sessionPlugin = framework.pluginManager.get('session');
+  const sessionId = 'weixin_test_user';
+
+  // 初始化 session
+  sessionPlugin.getOrCreateSession(sessionId, {
+    metadata: { platform: 'weixin', userId: 'test_user' },
+  });
+
+  // 模拟微信的 _processChat
+  const processChat = async (userId, text) => {
+    console.log(`\n[User] ${text}`);
+
+    try {
+      const result = await agent.chat(text, { sessionId: `weixin_${userId}` });
+      const message = result.message || '';
+
+      if (message) {
+        console.log(`[Agent] ${message.substring(0, 100)}${message.length > 100 ? '...' : ''}`);
+        console.log(`[OK] message length: ${message.length}`);
+      } else {
+        console.log(`[WARNING] result.message is empty!`);
+        console.log(`[DEBUG] result:`, JSON.stringify(result, null, 2).substring(0, 500));
+      }
+
+      // 检查 _messages 状态
+      const chatHandler = agent._chatHandler;
+      if (chatHandler) {
+        console.log(`[DEBUG] _messages count: ${chatHandler._messages.length}`);
+      }
+
+      return message;
+    } catch (err) {
+      console.error(`[Error]`, err.message);
+      return '';
+    }
+  };
+
+  // 模拟多轮对话
+  await processChat('user1', '你好');
+  await processChat('user1', '今天天气怎么样？');
+  await processChat('user1', '帮我查一下北京的人口');
+  await processChat('user1', '再说一次北京的人口');
+
+  console.log('\n--- 测试压缩场景 ---');
+  // 发送更多消息触发压缩
+  for (let i = 0; i < 5; i++) {
+    await processChat('user1', `这是第 ${i + 1} 条测试消息`);
+  }
+
+  // 压缩后再发送一条
+  await processChat('user1', '你好，你还记得我吗？');
+
+  console.log('\n[Done]');
+  await framework.destroy();
+}
+
+main().catch(console.error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foliko",
-  "version": "1.0.86",
+  "version": "1.0.87",
   "description": "简约的插件化 Agent 框架",
   "main": "src/index.js",
   "type": "commonjs",

package/plugins/session-plugin.js

@@ -335,6 +335,11 @@ class SessionPlugin extends Plugin {
   addMessage(sessionId, message) {
     const session = this.getSession(sessionId)
     if (session) {
+      // 基础消息验证
+      if (!message || !message.role || !message.content) {
+        log.warn('Invalid message format, skipping:', { sessionId, message });
+        return session;
+      }
       session.messages.push(message)
       session.lastActive = new Date()
 
@@ -349,6 +354,22 @@ class SessionPlugin extends Plugin {
     return session
   }
 
+  /**
+   * 整体替换会话消息（用于压缩后同步）
+   * @param {string} sessionId - 会话 ID
+   * @param {Array} messages - 新的消息数组
+   */
+  replaceMessages(sessionId, messages) {
+    const session = this.getSession(sessionId)
+    if (session) {
+      session.messages = messages || []
+      session.lastActive = new Date()
+      // 持久化到 storage
+      this._saveToStorage(session)
+    }
+    return session
+  }
+
   /**
    * 获取会话历史
    */

package/src/core/agent-chat.js

@@ -123,6 +123,10 @@ class AgentChatHandler extends EventEmitter {
 
     // Session 历史存储配置
     this._sessionHistoryKey = config.sessionHistoryKey || 'chat_history';
+
+    // Per-Session 队列管理
+    this._sessionQueues = new Map(); // sessionId -> Queue of {message, options, resolve, reject}
+    this._processingSessions = new Set(); // sessionId -> processing flag
   }
 
   /**
@@ -139,6 +143,7 @@ class AgentChatHandler extends EventEmitter {
       if (!sessionPlugin) return [];
 
       const messages = sessionPlugin.getHistory(sessionId);
+      // 直接返回，保存时已清理，数据应该是干净的
       return messages || [];
     } catch (err) {
       // 忽略加载错误
@@ -153,28 +158,78 @@ class AgentChatHandler extends EventEmitter {
    * @private
    */
   _saveHistoryToSession(sessionId, messages) {
-    if (!sessionId || !this.agent?.framework || !messages || messages.length === 0) return;
+    if (!sessionId || !this.agent?.framework || !messages) return;
 
     try {
       const sessionPlugin = this.agent.framework.pluginManager.get('session');
       if (!sessionPlugin) return;
 
-      // 获取 session 中已有消息数量，避免重复添加
-      const existingHistory = sessionPlugin.getHistory(sessionId);
-      const existingCount = existingHistory.length;
-
-      // 只添加新消息（避免重复添加已加载的历史）
-      const simpleMessages = messages;
-
-      const newMessages = simpleMessages.slice(existingCount);
-      for (const msg of newMessages) {
-        sessionPlugin.addMessage(sessionId, msg);
-      }
+      // 清理消息格式后整体替换
+      const cleanedMessages = prepareMessagesForAPI(messages);
+      sessionPlugin.replaceMessages(sessionId, cleanedMessages);
     } catch (err) {
       // 忽略保存错误
     }
   }
 
+  /**
+   * 将消息加入队列（Per-Session）
+   * @param {string} sessionId - 会话 ID
+   * @param {string|Object} message - 消息
+   * @param {Object} options - 选项
+   * @returns {Promise}
+   */
+  enqueue(sessionId, message, options = {}) {
+    if (!this._sessionQueues.has(sessionId)) {
+      this._sessionQueues.set(sessionId, []);
+    }
+    const queue = this._sessionQueues.get(sessionId);
+
+    if (this._processingSessions.has(sessionId)) {
+      // 已在处理中，加入队列
+      return new Promise((resolve, reject) => {
+        queue.push({ message, options, resolve, reject });
+      });
+    }
+
+    // 直接处理
+    return this._processWithSession(sessionId, message, options);
+  }
+
+  /**
+   * 处理单个 session 的消息
+   * @param {string} sessionId - 会话 ID
+   * @param {string|Object} message - 消息
+   * @param {Object} options - 选项
+   * @returns {Promise}
+   * @private
+   */
+  async _processWithSession(sessionId, message, options) {
+    this._processingSessions.add(sessionId);
+    try {
+      return await this._doChat(message, options);
+    } finally {
+      this._processingSessions.delete(sessionId);
+      // 处理队列中的下一条
+      setImmediate(() => this._drainQueue(sessionId));
+    }
+  }
+
+  /**
+   * 消费队列中的下一条消息
+   * @param {string} sessionId - 会话 ID
+   * @private
+   */
+  _drainQueue(sessionId) {
+    const queue = this._sessionQueues.get(sessionId);
+    if (!queue || queue.length === 0) return;
+
+    const item = queue.shift();
+    this._processWithSession(sessionId, item.message, item.options)
+      .then(item.resolve)
+      .catch(item.reject);
+  }
+
   /**
    * 静态方法：保留接口兼容性（无实际作用）
    */
@@ -287,9 +342,10 @@ class AgentChatHandler extends EventEmitter {
    * 1. 如果启用了智能摘要且有 AI 客户端，对早期消息进行 AI 总结
    * 2. 否则使用简单裁剪 + 标记
    * 3. 支持超时控制，防止压缩阻塞太久
+   * @param {string} sessionId - 会话 ID（用于压缩后同步）
    * @private
    */
-  async _compressContext() {
+  async _compressContext(sessionId) {
     // 如果已经有压缩在进行，返回现有的 Promise
     if (this._compressionInProgress && this._compressionPromise) {
       logger.debug('Compression already in progress, waiting for it...');
@@ -303,7 +359,7 @@ class AgentChatHandler extends EventEmitter {
     this._compressionInProgress = true;
 
     // 创建压缩 Promise，带超时控制
-    this._compressionPromise = this._executeCompressionWithTimeout().finally(() => {
+    this._compressionPromise = this._executeCompressionWithTimeout(sessionId).finally(() => {
       this._compressionInProgress = false;
       this._compressionPromise = null;
     });
@@ -313,15 +369,16 @@ class AgentChatHandler extends EventEmitter {
 
   /**
    * 执行压缩（带超时）
+   * @param {string} sessionId - 会话 ID
    * @private
    */
-  async _executeCompressionWithTimeout() {
+  async _executeCompressionWithTimeout(sessionId) {
     try {
-      return await Promise.race([this._doCompress(), this._createTimeoutPromise()]);
+      return await Promise.race([this._doCompress(sessionId), this._createTimeoutPromise()]);
     } catch (err) {
       logger.warn('Compression failed:', err.message);
       // 压缩失败时使用简单的截断策略
-      this._simpleCompress();
+      this._simpleCompress(sessionId);
     }
   }
 
@@ -358,9 +415,10 @@ class AgentChatHandler extends EventEmitter {
 
   /**
    * 执行实际压缩逻辑
+   * @param {string} sessionId - 会话 ID
    * @private
    */
-  async _doCompress() {
+  async _doCompress(sessionId) {
     const systemMessages = this._messages.filter((m) => m.role === 'system');
     const otherMessages = this._messages.filter((m) => m.role !== 'system');
 
@@ -398,13 +456,19 @@ class AgentChatHandler extends EventEmitter {
     logger.info(
       `Context compressed (${this._compressionCount} times). Messages: ${this._messages.length}, Est. tokens: ${totalTokens}`
     );
+
+    // 压缩后立即同步到 session
+    if (sessionId) {
+      this._saveHistoryToSession(sessionId, this._messages);
+    }
   }
 
   /**
    * 简单压缩（当 AI 压缩失败时使用）
+   * @param {string} sessionId - 会话 ID
    * @private
    */
-  _simpleCompress() {
+  _simpleCompress(sessionId) {
     const systemMessages = this._messages.filter((m) => m.role === 'system');
     const otherMessages = this._messages.filter((m) => m.role !== 'system');
     const recentMessages = otherMessages.slice(-this._keepRecentMessages);
@@ -425,6 +489,11 @@ class AgentChatHandler extends EventEmitter {
     logger.info(
       `Context simple compressed (${this._compressionCount} times). Messages: ${this._messages.length}`
     );
+
+    // 压缩后立即同步到 session
+    if (sessionId) {
+      this._saveHistoryToSession(sessionId, this._messages);
+    }
   }
 
   /**
@@ -653,15 +722,25 @@ ${truncatedContent}${truncatedNote}
   }
 
   /**
-   * 发送消息（非流式）
+   * 发送消息（非流式）- 使用队列机制
    * @param {string|Object} message - 消息
    * @param {Object} options - 选项
    */
   async chat(message, options = {}) {
+    const sessionId = options.sessionId || null;
+    return this.enqueue(sessionId, message, options);
+  }
+
+  /**
+   * 执行实际聊天逻辑
+   * @param {string|Object} message - 消息
+   * @param {Object} options - 选项
+   * @private
+   */
+  async _doChat(message, options = {}) {
     const sessionId = options.sessionId || null;
     const context = { sessionId, isStream: false };
     const framework = this.agent.framework;
-    const self = this; // 保存引用用于回调
 
     try {
       // 从 session 加载聊天历史
@@ -696,7 +775,7 @@ ${truncatedContent}${truncatedNote}
           `Context large (${totalTokens}/${this._maxContextTokens} tokens = msgs:${messagesTokens} + tools:${toolsTokens} + sys:${systemPromptTokens}), compressing...`
         );
         // 使用带超时控制的压缩
-        await this._compressContext();
+        await this._compressContext(sessionId);
       }
 
       const maxSteps = options.maxSteps || this._maxSteps;
@@ -791,7 +870,7 @@ ${truncatedContent}${truncatedNote}
           `Context large (${totalTokens}/${this._maxContextTokens} tokens), compressing...`
         );
         // 流式调用时等待压缩完成（使用带超时控制的压缩）
-        await this._compressContext();
+        await this._compressContext(sessionId);
       }
 
       const maxSteps = options.maxSteps || this._maxSteps;
@@ -1001,38 +1080,6 @@ ${truncatedContent}${truncatedNote}
     return cleaned;
   }
 
-  /**
-   * 清理消息格式
-   * @private
-   */
-  _cleanMessages(messages) {
-    return messages.map((msg) => {
-      if (!msg || typeof msg !== 'object') {
-        return { role: 'user', content: '' };
-      }
-
-      const cleaned = {
-        role: msg.role || 'user',
-      };
-
-      if (Array.isArray(msg.content)) {
-        cleaned.content = msg.content;
-      } else if (typeof msg.content === 'string') {
-        cleaned.content = msg.content;
-      } else if (typeof msg.content === 'object' && msg.content !== null) {
-        // 对象类型的 content（如 tool result），转为字符串
-        cleaned.content =
-          typeof msg.content === 'object' && msg.content.content !== undefined
-            ? String(msg.content.content)
-            : JSON.stringify(msg.content);
-      } else {
-        cleaned.content = msg.text || msg.input || '';
-      }
-
-      return cleaned;
-    });
-  }
-
   /**
    * 销毁
    */