foliko 1.0.83 → 1.0.85

package/src/core/agent-chat.js

@@ -5,7 +5,8 @@
 
 const { EventEmitter } = require('../utils/event-emitter');
 const { logger } = require('../utils/logger');
-const { generateText, pruneMessages, stepCountIs, convertToModelMessages } = require('ai');
+const { generateText, stepCountIs } = require('ai');
+const { prepareMessagesForAPI } = require('../utils');
 
 // 模型上下文限制表（留 15-20% 余量给 system prompt 和输出）
 const MODEL_CONTEXT_LIMITS = {
@@ -336,6 +337,25 @@ class AgentChatHandler extends EventEmitter {
     });
   }
 
+  async compressToolResults(messages) {
+    try {
+      const recentMessages = prepareMessagesForAPI(messages.slice(-10));
+      const messagesToSummarize = messages.slice(0, -10);
+      let summaryContent = '';
+      const summaryText = await this._summarizeMessages(messagesToSummarize);
+      summaryContent = `[早期对话摘要]: ${summaryText}`;
+      const summary = {
+        role: 'assistant',
+        content: summaryContent,
+      };
+      logger.info(`AI summary generated (${summaryText.length} chars)`);
+      return [summary, ...recentMessages];
+    } catch (err) {
+      logger.warn('Tool result compression failed:', err.message);
+      return prepareMessagesForAPI(messages);
+    }
+  }
+
   /**
    * 执行实际压缩逻辑
    * @private
@@ -393,11 +413,13 @@ class AgentChatHandler extends EventEmitter {
     const summaryContent = `[上下文已压缩: 省略了 ${compressedCount} 条早期消息。保留了最近 ${this._keepRecentMessages} 条对话记录。]`;
 
     const summary = {
-      role: 'system',
+      role: 'assistant',
       content: summaryContent,
     };
 
-    this._messages = [...systemMessages, summary, ...recentMessages];
+    this._messages = [...systemMessages, summary, ...recentMessages].filter(
+      (item) => item.role !== 'tool'
+    );
     this._compressionCount++;
 
     logger.info(
@@ -512,7 +534,7 @@ ${truncatedContent}${truncatedNote}
 2. 关键信息点（不超过 5 个）
 3. 重要数据或结论
 
-用简洁的中文总结，不超过 400 字：`;
+用简洁的中文总结，不超过 1000 字：`;
 
       // 使用 AI SDK 6.x 的 generateText
       const { text } = await generateText({
@@ -640,6 +662,7 @@ ${truncatedContent}${truncatedNote}
     const context = { sessionId, isStream: false };
     const framework = this.agent.framework;
     const self = this; // 保存引用用于回调
+
     try {
       // 从 session 加载聊天历史
       if (sessionId) {
@@ -684,25 +707,15 @@ ${truncatedContent}${truncatedNote}
       if (!this._aiClient) {
         throw new Error('AI client not configured.');
       }
-      // const prunedMessages = pruneMessages({
-      //   messages: this._messages,
-      //   reasoning: 'all', // Remove all reasoning parts
-      //   toolCalls: 'before-last-6-messages', // Remove tool calls except those in the last message
-      // });
+
+      // 准备传给 agent 的消息
+      // ToolLoopAgent 会自动处理消息格式，不需要手动 prune
       const agent = new ToolLoopAgent({
         model: this._aiClient,
         instructions: this._systemPrompt,
         tools: tools,
-        stopWhen: stepCountIs(maxSteps),
-        prepareStep: async ({ stepNumber, steps, messages }) => {
-          if (messages.length > 20) {
-            return {
-              messages: messages.slice(-10),
-            };
-          }
-
-          return {};
-        },
+        prepareStep: async ({ stepNumber, messages }) =>
+          this._prepareStepForPruning(stepNumber, messages),
       });
 
       // 使用 runWithContext 让工具执行时能获取 sessionId
@@ -744,6 +757,7 @@ ${truncatedContent}${truncatedNote}
     const sessionId = options.sessionId || null;
     const context = { sessionId, isStream: true };
     const framework = this.agent.framework;
+
     try {
       //从 session 加载聊天历史
       if (sessionId) {
@@ -782,31 +796,18 @@ ${truncatedContent}${truncatedNote}
 
       const maxSteps = options.maxSteps || this._maxSteps;
       const tools = this._getAITools(tool);
-      const self = this; // 保存引用用于回调
       if (!this._aiClient) {
         throw new Error('AI client not configured.');
       }
-      // console.log(JSON.stringify(this._messages, null, 2));
-      // const prunedMessages = pruneMessages({
-      //   messages: this._messages,
-      //   reasoning: 'all', // Remove all reasoning parts
-      //   toolCalls: 'before-last-6-messages', // Remove tool calls except those in the last message
-      // });
 
+      // 准备传给 agent 的消息
+      // ToolLoopAgent 会自动处理消息格式，不需要手动 prune
       const agent = new ToolLoopAgent({
         model: this._aiClient,
         instructions: this._systemPrompt,
         tools: tools,
-        stopWhen: stepCountIs(maxSteps),
-        prepareStep: async ({ stepNumber, steps, messages }) => {
-          if (messages.length > 20) {
-            return {
-              messages: messages.slice(-10),
-            };
-          }
-
-          return {};
-        },
+        prepareStep: async ({ stepNumber, messages }) =>
+          this._prepareStepForPruning(stepNumber, messages),
       });
 
       // 使用 runWithContext 让工具执行时能获取 sessionId（支持并行）
@@ -839,16 +840,10 @@ ${truncatedContent}${truncatedNote}
         }
       }
 
-      const finish_messages = (await result.response).messages;
-      this._messages.push(...finish_messages);
-      // console.log(JSON.stringify(this._messages, null, 2));
-      // 生成后检查：如果消息太长，下次需要压缩
-      const afterTokens = this._countMessagesTokens(this._messages);
-      if (afterTokens > this._maxContextTokens * 0.8) {
-        logger.info(`After generation: ${afterTokens} tokens, will compress on next turn`);
-      }
+      const finishMessages = (await result.response).messages;
+      this._messages.push(...finishMessages);
 
-      // 保存聊天历史到 session
+      // 保存聊天历史到 session（使用实际传给 agent 的消息一致）
       if (sessionId) {
         this._saveHistoryToSession(sessionId, this._messages);
       }
@@ -858,6 +853,69 @@ ${truncatedContent}${truncatedNote}
     }
   }
 
+  /**
+   * 修剪消息确保配对的 tool call/result 不被拆分
+   * @param {number} stepNumber - 当前步骤号
+   * @param {Array} messages - 消息列表
+   * @returns {Object} { messages } 或空对象
+   * @private
+   */
+  _prepareStepForPruning(stepNumber, messages) {
+    if (messages.length <= 20) {
+      return {};
+    }
+
+    // 构建配对索引集合：确保 assistant 的 tool call 和 tool result 不会被单独裁剪
+    const assistantIndices = new Map(); // toolCallId -> assistant index
+    const toolResultIndices = new Map(); // toolCallId -> tool result indices
+
+    for (let i = 0; i < messages.length; i++) {
+      const msg = messages[i];
+      if (msg.role === 'assistant' && msg.content) {
+        const content = Array.isArray(msg.content) ? msg.content : [msg.content];
+        for (const item of content) {
+          if (item.type === 'tool-call' && item.toolCallId) {
+            assistantIndices.set(item.toolCallId, i);
+          }
+        }
+      }
+      if (msg.role === 'tool' && msg.toolCallId) {
+        if (!toolResultIndices.has(msg.toolCallId)) {
+          toolResultIndices.set(msg.toolCallId, []);
+        }
+        toolResultIndices.get(msg.toolCallId).push(i);
+      }
+    }
+
+    const recentCount = Math.max(10, messages.length - 10);
+    let minIndexToKeep = messages.length - recentCount;
+
+    // 情况1：保留被裁剪范围内的 assistant 消息及其 tool result
+    for (const [toolCallId, assistantIdx] of assistantIndices) {
+      if (assistantIdx < minIndexToKeep) {
+        minIndexToKeep = Math.min(minIndexToKeep, assistantIdx);
+      }
+    }
+
+    // 情况2：保留被裁剪范围内的 tool result 及其 assistant 消息
+    for (const [toolCallId, resultIndices] of toolResultIndices) {
+      for (const resultIdx of resultIndices) {
+        if (resultIdx >= minIndexToKeep) {
+          const assistantIdx = assistantIndices.get(toolCallId);
+          if (assistantIdx !== undefined && assistantIdx < minIndexToKeep) {
+            minIndexToKeep = Math.min(minIndexToKeep, assistantIdx);
+          }
+        }
+      }
+    }
+
+    const pruned = messages.slice(minIndexToKeep);
+    // logger.info(
+    //   `prepareStep pruned: ${messages.length} -> ${pruned.length} (step ${stepNumber}, kept from index ${minIndexToKeep})`
+    // );
+    return { messages: pruned };
+  }
+
   /**
    * 获取 AI SDK 格式的工具
    * AI SDK 6.x 需要对象形式 { toolName: tool }

package/src/core/framework.js

@@ -48,14 +48,55 @@ class Framework extends EventEmitter {
     // 执行上下文（工具调用时可用）
     this._executionContext = null;
 
-    // 事件转发
+    // 事件转发 - ToolRegistry 事件
     this.toolRegistry.on('tool:registered', (tool) => {
       this.emit('tool:registered', tool);
     });
 
+    this.toolRegistry.on('tool:call', (data) => {
+      this.emit('tool:call', data);
+      // 兼容连字符格式
+      this.emit('tool-call', data);
+    });
+
+    this.toolRegistry.on('tool:result', (data) => {
+      this.emit('tool:result', data);
+    });
+
+    this.toolRegistry.on('tool:error', (data) => {
+      this.emit('tool:error', data);
+    });
+
+    // 事件转发 - Agent 事件
+    this._setupAgentEventForwarding();
+
     this._registerBuiltinTools();
   }
 
+  /**
+   * 设置 Agent 事件转发
+   * @private
+   */
+  _setupAgentEventForwarding() {
+    // 监听 agent:created 事件，为新创建的 Agent 设置事件转发
+    this.on('agent:created', (agent) => {
+      // 转发 Agent 的 tool-call/result/error 事件
+      agent.on('tool-call', (data) => {
+        this.emit('tool:call', data);
+      });
+      agent.on('tool-result', (data) => {
+        this.emit('tool:result', data);
+      });
+      agent.on('tool-error', (data) => {
+        this.emit('tool:error', data);
+      });
+      // 转发 Agent 的 message 事件作为 agent:message
+      agent.on('message', (msg) => {
+        this.emit('agent:message', msg);
+      });
+    });
+  }
+
   /**
    * 从 AI 插件合并配置到目标配置对象
    * @param {Object} target - 目标配置对象

package/src/executors/mcp-executor.js

@@ -357,10 +357,43 @@ class MCPExecutorPlugin extends Plugin {
           if (!mcpTool) {
             return { success: false, error: `Tool '${tool}' not found on server '${server}'` };
           }
+
+          // 触发 MCP 工具开始事件
+          const mcpToolName = `${server}:${tool}`;
+          framework.emit('tool:call', {
+            name: mcpToolName,
+            args: finalArgs,
+            source: 'mcp',
+          });
+          framework.emit('tool-call', {
+            name: mcpToolName,
+            args: finalArgs,
+            source: 'mcp',
+          });
+
           const execResult = await mcpTool.execute(finalArgs);
+
+          // 触发 MCP 工具完成事件
+          framework.emit('tool:result', {
+            name: mcpToolName,
+            args: finalArgs,
+            result: execResult,
+            source: 'mcp',
+          });
+
           return { success: true, result: execResult };
         } catch (err) {
           log.error(` Tool '${tool}' failed:`, err.message);
+
+          // 触发 MCP 工具错误事件
+          const mcpToolName = `${server}:${tool}`;
+          framework.emit('tool:error', {
+            name: mcpToolName,
+            args: finalArgs,
+            error: err.message,
+            source: 'mcp',
+          });
+
           return { success: false, error: err.message };
         }
       },

package/src/utils/index.js

@@ -161,6 +161,158 @@ async function retry(fn, options = {}) {
   throw lastError;
 }
 
+function filterAndCleanMessages(messages) {
+  // 先配对
+  const pairedIds = new Set();
+  const toolCallToAssistant = new Map(); // toolCallId -> assistant index
+
+  // 收集所有 assistant 的 tool-call
+  for (let i = 0; i < messages.length; i++) {
+    const msg = messages[i];
+    if (msg.role === 'assistant' && msg.content) {
+      const content = Array.isArray(msg.content) ? msg.content : [msg.content];
+      for (const item of content) {
+        if (item.type === 'tool-call' && item.toolCallId) {
+          toolCallToAssistant.set(item.toolCallId, i);
+        }
+      }
+    }
+  }
+
+  // 找出配对的 tool result
+  for (const msg of messages) {
+    if (msg.role === 'tool' && msg.toolCallId) {
+      if (toolCallToAssistant.has(msg.toolCallId)) {
+        pairedIds.add(msg.toolCallId);
+      }
+    }
+  }
+
+  // 过滤并清理消息
+  const cleaned = [];
+  for (const msg of messages) {
+    let shouldKeep = true;
+    let cleanedMsg = { ...msg };
+
+    if (msg.role === 'assistant' && msg.content) {
+      let content = Array.isArray(msg.content) ? msg.content : [msg.content];
+
+      // 过滤掉未配对的 tool-call
+      const filteredContent = content.filter((item) => {
+        if (item.type === 'tool-call') {
+          return pairedIds.has(item.toolCallId);
+        }
+        return true; // 保留 text 类型
+      });
+
+      // 检查过滤后是否还有有效内容
+      if (filteredContent.length === 0) {
+        shouldKeep = false; // 丢弃空消息
+      } else {
+        cleanedMsg.content = filteredContent;
+      }
+    }
+
+    if (msg.role === 'tool') {
+      shouldKeep = pairedIds.has(msg.toolCallId);
+    }
+
+    if (shouldKeep && cleanedMsg.content) {
+      // 确保 content 不为空
+      if (Array.isArray(cleanedMsg.content) && cleanedMsg.content.length > 0) {
+        cleaned.push(cleanedMsg);
+      } else if (typeof cleanedMsg.content === 'string' && cleanedMsg.content.trim()) {
+        cleaned.push(cleanedMsg);
+      } else if (
+        cleanedMsg.content &&
+        typeof cleanedMsg.content !== 'string' &&
+        !Array.isArray(cleanedMsg.content)
+      ) {
+        // 处理其他类型的 content
+        cleaned.push(cleanedMsg);
+      }
+      // 否则跳过空消息
+    }
+  }
+
+  return cleaned;
+}
+
+// 更激进的方法：确保所有消息都有有效的 content
+function validateAndFixMessages(messages) {
+  return messages.filter((msg) => {
+    // 检查 content 是否存在且非空
+    if (!msg.content) {
+      console.log(`丢弃消息: role=${msg.role}, 无 content`);
+      return false;
+    }
+
+    // 处理数组类型的 content
+    if (Array.isArray(msg.content)) {
+      if (msg.content.length === 0) {
+        console.log(`丢弃消息: role=${msg.role}, content 为空数组`);
+        return false;
+      }
+
+      // 检查数组中是否有有效内容
+      const hasValidContent = msg.content.some((item) => {
+        if (item.type === 'text' && item.text && item.text.trim()) {
+          return true;
+        }
+        if (item.type === 'tool-call' && item.toolCallId) {
+          return true;
+        }
+        if (item.type === 'tool-result' && item.toolCallId) {
+          return true;
+        }
+        return false;
+      });
+
+      if (!hasValidContent) {
+        console.log(`丢弃消息: role=${msg.role}, content 数组无有效内容`);
+        return false;
+      }
+    }
+
+    // 处理字符串类型的 content
+    if (typeof msg.content === 'string' && !msg.content.trim()) {
+      console.log(`丢弃消息: role=${msg.role}, content 为空字符串`);
+      return false;
+    }
+
+    return true;
+  });
+}
+
+// 完整处理流程
+function prepareMessagesForAPI(rawMessages) {
+  // 1. 先配对
+  const paired = filterAndCleanMessages(rawMessages);
+
+  // 2. 验证并清理空消息
+  const cleaned = validateAndFixMessages(paired);
+
+  // 3. 确保消息交替顺序正确（user/assistant/tool）
+  const finalMessages = [];
+  let lastRole = null;
+
+  for (const msg of cleaned) {
+    // 跳过连续的相同角色消息（除了 tool）
+    if (msg.role === lastRole && msg.role !== 'tool') {
+      console.log(`跳过连续的 ${msg.role} 消息`);
+      continue;
+    }
+
+    finalMessages.push(msg);
+    lastRole = msg.role;
+  }
+
+  return finalMessages;
+}
+
+// 发送给 API
+// await yourAPI.call({ messages: cleanMessages });
+
 module.exports = {
   // 日志
   Logger,
@@ -214,4 +366,5 @@ module.exports = {
   throttle,
   sleep,
   retry,
+  prepareMessagesForAPI,
 };