foliko 2.0.28 → 2.0.29

package/package.json

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

package/src/agent/chat.js

@@ -718,31 +718,44 @@ class AgentChatHandler extends EventEmitter {
   async *chatStream(message, options = {}) {
     const sessionId = options.sessionId || this.getDefaultSessionId();
     const framework = this.agent.framework;
+    // ★ 提到外层作用域，catch 中要回滚 userMessage 时需要访问
     let messageStore = null;
     let messages = null;
     let userMessage = null;
-    let didRetryWithCompression = false;
 
-    // 内部异步函数执行真正的流式处理，便于压缩重试时重启
-    const doStream = async function* (self, sessionId, message, messageStore, messages, userMessage) {
-      const tools = self._getToolMap();
+    try {
+      const prepared = await this._prepareSession(message, sessionId);
+      messageStore = prepared.messageStore;
+      messages = prepared.messages;
+      userMessage = prepared.userMessage;
+
+      if (!this._aiClient) {
+        throw new Error('AI 客户端未配置');
+      }
+      const systemPrompt = framework.prompts.build();
+      //await fs.promises.writeFile(`.${sessionId}_systemPrompt.md`, systemPrompt); // 调试用：保存系统提示词
+      const tools = this._getToolMap();
       const toolLoop = new ToolLoop({
         tools,
-        maxSteps: self._maxSteps || 1000,
-        prepareStep: self._createPrepareStep(),
-        repairToolCall: self._repairToolCall.bind(self),
+        maxSteps: this._maxSteps || 1000,
+        prepareStep: this._createPrepareStep(),
+        repairToolCall: this._repairToolCall.bind(this),
         abortSignal: framework.getAbortSignal?.(),
-        thinkingMode: self._thinkingMode,
+        thinkingMode: this._thinkingMode,
       });
 
+      // DeepSeek thinking mode: 收集 reasoning_content
+      const isThinking = this._thinkingMode;
       let reasoningContent = '';
+
       const stream = toolLoop.stream({
         messages,
-        systemPrompt: framework.prompts.build(),
-        model: self.model,
-        client: self._aiClient,
-        ...self.providerOptions,
+        systemPrompt,
+        model: this.model,
+        client: this._aiClient,
+        ...this.providerOptions,
       });
+      // 遍历流式响应
       let fullText = '';
       let usageRecv = {};
 
@@ -765,94 +778,67 @@ class AgentChatHandler extends EventEmitter {
           yield { type: 'usage', inputTokens: usageRecv.inputTokens, outputTokens: usageRecv.outputTokens };
         }
       }
-
       // 持久化用量
       messageStore.usage = usageRecv;
-      if (self.agent && self.agent.framework) {
-        self.agent.framework.emit('agent:usage', { sessionId, usage: usageRecv });
+
+      // 同时通过 framework 事件广播（绕开 queue 事件链路）
+      if (this.agent && this.agent.framework) {
+        this.agent.framework.emit('agent:usage', {
+          sessionId,
+          usage: usageRecv,
+        });
       }
 
+      // yield usage 数据，让 UI 层能直接获取
+      // （usage 已在 stream 循环中 yield，无需重复）
+
       const userMsg = messages.length > 0 ? messages[messages.length - 1] : null;
-      self.emit('message', { content: fullText, sessionId, userMessage: userMsg });
+      this.emit('message', { content: fullText, sessionId: sessionId, userMessage: userMsg });
 
+      // ★ 修复：成功路径才持久化。AI 失败时若 finally 也 save，
+      //   会把刚 push 的 userMessage 写盘 → 下次请求 loadHistory 再次
+      //   load 到，_prepareSession 再 push 一份 → 连续两条相同 user
+      //   → AI SDK 抛 "Invalid prompt: ModelMessage[] schema"
       try {
         await messageStore.save();
       } catch (err) {
         logger.error(`[${sessionId}] Failed to save message store: ${err.message}`);
       }
-    }.bind(null, this);
-
-    // 压缩重试循环
-    for (let attempt = 0; attempt <= 1; attempt++) {
-      try {
-        // 首次尝试前做 prepareSession；压缩重试时跳过
-        if (attempt === 0) {
-          const prepared = await this._prepareSession(message, sessionId);
-          messageStore = prepared.messageStore;
-          messages = prepared.messages;
-          userMessage = prepared.userMessage;
-        } else {
-          // 重试前重新 build 系统提示词
-          this._systemPrompt = this.agent._buildSystemPrompt();
-          this._invalidateMessageTokensCache(messageStore);
-        }
-
-        if (!this._aiClient) {
-          throw new Error('AI 客户端未配置');
-        }
-
-        // 执行流式生成
-        for await (const chunk of doStream(this, sessionId, message, messageStore, messages, userMessage)) {
-          yield chunk;
-        }
-        return; // 成功完成
-      } catch (err) {
-        // ★ 上下文超限：压缩后重试一次
-        if (!didRetryWithCompression && this._isContextOverflowError(err)) {
-          logger.warn(`[AgentChat] chatStream context overflow (attempt ${attempt + 1}), compressing and retrying...`);
-          try {
-            await this._compressContext(sessionId, messages, messageStore);
-            this._invalidateMessageTokensCache(messageStore);
-            logger.info(`[AgentChat] Compression done, retrying stream...`);
-            didRetryWithCompression = true;
-            continue; // 重试
-          } catch (compressErr) {
-            logger.error(`[AgentChat] Compression failed: ${compressErr.message}`);
+    } catch (err) {
+      // ★ 修复：失败时打印 InvalidPromptError 的 cause（含 Zod issue 路径），
+      //   方便定位是哪条消息、哪个字段不匹配 ModelMessage[] schema
+      logger.error('[AgentChat] chatStream error:', err.message);
+      if (err.cause) {
+        const cause = err.cause;
+        if (cause.issues) {
+          for (const issue of cause.issues.slice(0, 5)) {
+            logger.error(
+              `[AgentChat] schema issue: path=${JSON.stringify(issue.path)} code=${issue.code} message=${issue.message}`
+            );
           }
+        } else {
+          logger.error(`[AgentChat] error cause: ${cause.message || String(cause)}`);
         }
+      }
 
-        // 打印错误
-        logger.error('[AgentChat] chatStream error:', err.message);
-        if (err.cause) {
-          const cause = err.cause;
-          if (cause.issues) {
-            for (const issue of cause.issues.slice(0, 5)) {
-              logger.error(
-                `[AgentChat] schema issue: path=${JSON.stringify(issue.path)} code=${issue.code} message=${issue.message}`
-              );
-            }
-          } else {
-            logger.error(`[AgentChat] error cause: ${cause.message || String(cause)}`);
+      // ★ 修复：失败时 ROLLBACK 掉本轮 push 的 userMessage
+      try {
+        if (messages && userMessage) {
+          const last = messages[messages.length - 1];
+          if (last && last.role === 'user' && last === userMessage) {
+            messages.pop();
           }
         }
+      } catch { /* ignore */ }
 
-        // 回滚 userMessage
-        try {
-          if (messages && userMessage) {
-            const last = messages[messages.length - 1];
-            if (last && last.role === 'user' && last === userMessage) {
-              messages.pop();
-            }
-          }
-        } catch { /* ignore */ }
+      // 统一错误处理：提取简洁消息并通过 yield 传递
+      const friendlyMessage = err?.message?.split('\n')[0] || '未知错误';
 
-        const friendlyMessage = err?.message?.split('\n')[0] || '未知错误';
-        if (err.name !== 'AbortError') {
-          this.emit('message:error', { sessionId, error: friendlyMessage, originalError: err });
-        }
-        yield { type: 'error', error: friendlyMessage };
-        return; // 失败返回
+      // 用户主动中断（framework.stop()）不上报 message:error，避免与上游重复
+      if (err.name !== 'AbortError') {
+        this.emit('message:error', { sessionId, error: friendlyMessage, originalError: err });
       }
+      yield { type: 'error', error: friendlyMessage };
     }
   }
 
@@ -905,132 +891,109 @@ class AgentChatHandler extends EventEmitter {
     let messageStore = null;
     let messages = null;
     let userMessage = null;
-    let didRetryWithCompression = false;
-
-    // 最多压缩重试 1 次
-    const maxCompressionRetries = 1;
-
-    for (let attempt = 0; attempt <= maxCompressionRetries; attempt++) {
-      try {
-        // 首次尝试前做 prepareSession；压缩重试时跳过（已压缩过）
-        if (attempt === 0) {
-          const prepared = await this._prepareSession(message, sessionId);
-          messageStore = prepared.messageStore;
-          messages = prepared.messages;
-          userMessage = prepared.userMessage;
-        } else {
-          // 压缩重试前重新 build 系统提示词（压缩后 messages 变了）
-          this._systemPrompt = this.agent._buildSystemPrompt();
-          this._invalidateMessageTokensCache(messageStore);
-        }
 
-        if (!this._aiClient) {
-          throw new Error('AI 客户端未配置');
-        }
-        const systemPrompt = framework.prompts.build();
-        const tools = this._getToolMap();
-
-        // DeepSeek thinking mode: 处理参数
-        const apiOptions = { ...this.providerOptions };
-        if (this._thinkingMode) {
-          delete apiOptions.temperature;
-        }
+    try {
+      const prepared = await this._prepareSession(message, sessionId);
+      messageStore = prepared.messageStore;
+      messages = prepared.messages;
+      userMessage = prepared.userMessage;
 
-        const toolLoop = new ToolLoop({
-          tools,
-          maxSteps: this._maxSteps || 1000,
-          prepareStep: this._createPrepareStep(),
-          repairToolCall: this._repairToolCall.bind(this),
-          abortSignal: framework.getAbortSignal?.(),
-          thinkingMode: this._thinkingMode,
-        });
+      if (!this._aiClient) {
+        throw new Error('AI 客户端未配置');
+      }
+      const systemPrompt = framework.prompts.build();
+      const tools = this._getToolMap();
 
-        const result = await toolLoop.generate({
-          messages,
-          systemPrompt,
-          model: this.model,
-          client: this._aiClient,
-          ...apiOptions,
-        });
-        // result = { text, response: { messages }, steps, usage, reasoningText }
+      // DeepSeek thinking mode: 处理参数
+      const apiOptions = { ...this.providerOptions };
+      if (this._thinkingMode) {
+        delete apiOptions.temperature;
+      }
 
-        if (result.usage && (result.usage.promptTokens > 0 || result.usage.completionTokens > 0)) {
-          this._updateMessageStoreUsage(messageStore, result.usage);
-        } else {
-          const inputTokens = this._tokenCounter.countMessages(messages);
-          const outputTokens = this._tokenCounter.countText(result.text || '');
-          messageStore.usage = { promptTokens: inputTokens, completionTokens: outputTokens };
-        }
+      const toolLoop = new ToolLoop({
+        tools,
+        maxSteps: this._maxSteps || 1000,
+        prepareStep: this._createPrepareStep(),
+        repairToolCall: this._repairToolCall.bind(this),
+        abortSignal: framework.getAbortSignal?.(),
+        thinkingMode: this._thinkingMode,
+      });
 
-        // ToolLoop 已经直接在 messages 末尾添加了新消息，不需要再 push
-        // 计算 original 的 user message
-        const userMsg = result.text
-          ? messages.slice(-1)[0]
-          : messages[messages.length - 1];
-        this.emit('message', { content: result.text, sessionId: sessionId, userMessage: userMsg });
+      const result = await toolLoop.generate({
+        messages,
+        systemPrompt,
+        model: this.model,
+        client: this._aiClient,
+        ...apiOptions,
+      });
+      // result = { text, response: { messages }, steps, usage, reasoningText }
 
-        // ★ 修复：AI 调用成功后才持久化
-        try {
-          await messageStore.save();
-        } catch (err) {
-          logger.error(`[${sessionId}] Failed to save message store: ${err.message}`);
-        }
+      if (result.usage && (result.usage.promptTokens > 0 || result.usage.completionTokens > 0)) {
+        this._updateMessageStoreUsage(messageStore, result.usage);
+      } else {
+        const inputTokens = this._tokenCounter.countMessages(messages);
+        const outputTokens = this._tokenCounter.countText(result.text || '');
+        messageStore.usage = { promptTokens: inputTokens, completionTokens: outputTokens };
+      }
 
-        return {
-          success: true,
-          message: cleanResponse(result.text || ''),
-          stepCount: result.stepCount || 1,
-        };
+      // ToolLoop 已经直接在 messages 末尾添加了新消息，不需要再 push
+      // 计算 original 的 user message
+      const userMsg = result.text
+        ? messages.slice(-1)[0]
+        : messages[messages.length - 1];
+      this.emit('message', { content: result.text, sessionId: sessionId, userMessage: userMsg });
+
+      // ★ 修复：AI 调用成功后才持久化（之前 finally 总是 save，
+      //   会把刚 push 的 userMessage 写盘；下次请求 loadHistory 再次 load 到，
+      //   _prepareSession 又 push 一份 → 连续两条相同 user 消息 →
+      //   AI SDK 抛 "Invalid prompt: ModelMessage[] schema"）
+      try {
+        await messageStore.save();
       } catch (err) {
-        // ★ 上下文超限：压缩后重试一次
-        if (!didRetryWithCompression && this._isContextOverflowError(err)) {
-          logger.warn(`[AgentChat] Context overflow (attempt ${attempt + 1}), compressing and retrying...`);
-          try {
-            // 强制压缩（忽略阈值检查）
-            await this._compressContext(sessionId, messages, messageStore);
-            this._invalidateMessageTokensCache(messageStore);
-            logger.info(`[AgentChat] Compression done, retrying...`);
-            didRetryWithCompression = true;
-            continue; // 重试
-          } catch (compressErr) {
-            logger.error(`[AgentChat] Compression failed: ${compressErr.message}`);
-            // 压缩失败，继续走下方错误处理
+        logger.error(`[${sessionId}] Failed to save message store: ${err.message}`);
+      }
+
+      return {
+        success: true,
+        message: cleanResponse(result.text || ''),
+        stepCount: result.stepCount || 1,
+      };
+    } catch (err) {
+      // ★ 修复：失败时打印 InvalidPromptError 的 cause（含 Zod issue 路径），
+      //   方便定位是哪条消息、哪个字段不匹配 ModelMessage[] schema
+      logger.error('[AgentChat] _processMessage error:', err.message);
+      if (err.cause) {
+        const cause = err.cause;
+        if (cause.issues) {
+          // ZodError：逐条打印
+          for (const issue of cause.issues.slice(0, 5)) {
+            logger.error(
+              `[AgentChat] schema issue: path=${JSON.stringify(issue.path)} code=${issue.code} message=${issue.message}`
+            );
           }
+        } else {
+          logger.error(`[AgentChat] error cause: ${cause.message || String(cause)}`);
         }
+      }
+      const errorMsg = err.message || String(err);
 
-        // 打印错误信息
-        logger.error('[AgentChat] _processMessage error:', err.message);
-        if (err.cause) {
-          const cause = err.cause;
-          if (cause.issues) {
-            for (const issue of cause.issues.slice(0, 5)) {
-              logger.error(
-                `[AgentChat] schema issue: path=${JSON.stringify(issue.path)} code=${issue.code} message=${issue.message}`
-              );
-            }
-          } else {
-            logger.error(`[AgentChat] error cause: ${cause.message || String(cause)}`);
+      // ★ 修复：失败时 ROLLBACK 掉本轮 push 的 userMessage，
+      //   避免下次请求把它从 jsonl load 出来再 push 一遍
+      try {
+        if (messages && userMessage) {
+          const last = messages[messages.length - 1];
+          if (last && last.role === 'user' && last === userMessage) {
+            messages.pop();
           }
         }
-        const errorMsg = err.message || String(err);
+      } catch { /* ignore */ }
 
-        // ★ 失败时 ROLLBACK 掉本轮 push 的 userMessage
-        try {
-          if (messages && userMessage) {
-            const last = messages[messages.length - 1];
-            if (last && last.role === 'user' && last === userMessage) {
-              messages.pop();
-            }
-          }
-        } catch { /* ignore */ }
-
-        return {
-          success: false,
-          message: 'AI 服务暂时不可用，请稍后重试。',
-          error: errorMsg,
-          stepCount: 0,
-        };
-      }
+      return {
+        success: false,
+        message: 'AI 服务暂时不可用，请稍后重试。',
+        error: errorMsg,
+        stepCount: 0,
+      };
     }
   }
 
@@ -1154,6 +1117,8 @@ class AgentChatHandler extends EventEmitter {
 
     for (let msgIdx = 0; msgIdx < messages.length; msgIdx++) {
       const msg = messages[msgIdx];
+
+      // ★ assistant 消息：content 数组格式的 tool-call
       if (msg.role === 'assistant' && Array.isArray(msg.content)) {
         for (let itemIdx = 0; itemIdx < msg.content.length; itemIdx++) {
           const item = msg.content[itemIdx];
@@ -1161,31 +1126,58 @@ class AgentChatHandler extends EventEmitter {
           if ((item.type === 'tool-call' || item.type === 'tool-use') && item.toolCallId) {
             const id = item.toolCallId;
             if (firstSeen.has(id)) {
-              // 冲突：生成唯一新 ID（不依赖全局计数器，避免跨调用泄露）
               const newId = `${id}_dup${msgIdx}_${itemIdx}`;
               item.toolCallId = newId;
-              // 同步修改紧随其后的 tool-result
               const renamed = this._renameFollowingToolResult(messages, msgIdx, id, newId);
               fixedCount += 1 + (renamed ? 1 : 0);
-              // 不更新 firstSeen（原始 ID 已被第一次声明占用）
             } else {
               firstSeen.set(id, { msgIdx, itemIdx, kind: 'call' });
             }
           }
         }
-      } else if (msg.role === 'tool' && Array.isArray(msg.content)) {
+      }
+
+      // ★ assistant 消息：tool_calls 数组格式（OpenAI 格式）
+      if (msg.role === 'assistant' && Array.isArray(msg.tool_calls)) {
+        for (let itemIdx = 0; itemIdx < msg.tool_calls.length; itemIdx++) {
+          const tc = msg.tool_calls[itemIdx];
+          if (!tc || !tc.id) continue;
+          const id = tc.id;
+          if (firstSeen.has(id)) {
+            const newId = `${id}_dup${msgIdx}_${itemIdx}`;
+            tc.id = newId;
+            const renamed = this._renameFollowingToolResult(messages, msgIdx, id, newId);
+            fixedCount += 1 + (renamed ? 1 : 0);
+          } else {
+            firstSeen.set(id, { msgIdx, itemIdx, kind: 'call' });
+          }
+        }
+      }
+
+      // ★ tool 消息：content 数组格式（AI SDK 格式）
+      // 注意：tool-result 与 assistant tool-call 配对使用同一 ID 是正常的，
+      // 此处只记录第一次出现的 ID，不做重命名（重命名由 _renameFollowingToolResult 在上面的 assistant 分支处理）
+      if (msg.role === 'tool' && Array.isArray(msg.content)) {
         for (let itemIdx = 0; itemIdx < msg.content.length; itemIdx++) {
           const item = msg.content[itemIdx];
           if (!item) continue;
           if ((item.type === 'tool-result' || item.type === 'tool_result') && item.toolCallId) {
             const id = item.toolCallId;
-            // 记录 tool-result 第一次出现（不与 call 比较，因为可能已被上面的分支处理过）
             if (!firstSeen.has(id)) {
               firstSeen.set(id, { msgIdx, itemIdx, kind: 'result' });
             }
           }
         }
       }
+
+      // ★ tool 消息：tool_call_id 字符串格式（OpenAI 格式）
+      // 同样只记录第一次出现，不做重命名
+      if (msg.role === 'tool' && msg.tool_call_id && !Array.isArray(msg.content)) {
+        const id = msg.tool_call_id;
+        if (!firstSeen.has(id)) {
+          firstSeen.set(id, { msgIdx, itemIdx: -1, kind: 'result' });
+        }
+      }
     }
     return fixedCount;
   }
@@ -1199,14 +1191,22 @@ class AgentChatHandler extends EventEmitter {
     for (let i = afterMsgIdx + 1; i < messages.length; i++) {
       const m = messages[i];
       if (m.role === 'assistant') return false;
-      if (m.role === 'tool' && Array.isArray(m.content)) {
-        for (const item of m.content) {
-          if (!item) continue;
-          if ((item.type === 'tool-result' || item.type === 'tool_result') && item.toolCallId === oldId) {
-            item.toolCallId = newId;
-            return true;
+      if (m.role === 'tool') {
+        // AI SDK 数组格式
+        if (Array.isArray(m.content)) {
+          for (const item of m.content) {
+            if (!item) continue;
+            if ((item.type === 'tool-result' || item.type === 'tool_result') && item.toolCallId === oldId) {
+              item.toolCallId = newId;
+              return true;
+            }
           }
         }
+        // OpenAI 字符串格式
+        if (m.tool_call_id === oldId) {
+          m.tool_call_id = newId;
+          return true;
+        }
       }
     }
     return false;
@@ -1397,10 +1397,11 @@ class AgentChatHandler extends EventEmitter {
    * @private
    */
   _createPrepareStep() {
+    const self = this;
     return async ({ stepNumber, messages: inputMessages }) => {
       try {
-        const tokenCount = this._countMessagesTokens(inputMessages);
-        const tokenLimit = this._maxContextTokens * SMART_COMPRESS_TOKEN_RATIO;
+        const tokenCount = self._countMessagesTokens(inputMessages);
+        const tokenLimit = self._maxContextTokens * SMART_COMPRESS_TOKEN_RATIO;
 
         // 超过限制时，保留三分之一的消息
         if (tokenCount > tokenLimit) {
@@ -1418,8 +1419,8 @@ class AgentChatHandler extends EventEmitter {
         //   所以不再需要 _stripStaleToolCalls 提前清理
 
         // 单次遍历完成：修复 invalid tool-call + 修复错误 text + 重映射历史 ID
-        const repairedCount = this._repairInvalidToolCallsInMessages(inputMessages);
-        this._repairAndPrefixHistoricalIds(inputMessages);
+        const repairedCount = self._repairInvalidToolCallsInMessages(inputMessages);
+        self._repairAndPrefixHistoricalIds(inputMessages);
 
         // ★ 防御性 sanitize：确保所有 message 符合 AI SDK ModelMessage[] schema
         // 每次 LLM step 前都跑一次（messages 数组里可能有 AI SDK 上一步加进来的）
@@ -1537,33 +1538,6 @@ class AgentChatHandler extends EventEmitter {
     return this._tokenCounter.countTools(this._toolExecutor.getAllTools());
   }
 
-  /**
-   * 判断是否为上下文超限错误
-   * @param {Error} err
-   * @returns {boolean}
-   * @private
-   */
-  _isContextOverflowError(err) {
-    if (!err) return false;
-    const msg = err.message || '';
-    const lowerMsg = msg.toLowerCase();
-    // DeepSeek / OpenAI 兼容的上下文超限错误关键词
-    const keywords = [
-      'context_length',
-      'context length',
-      'maximum context',
-      'max context',
-      'too many tokens',
-      'token limit',
-      'tokens exceed',
-      'exceed maximum',
-      'maximum tokens',
-      'context_exceeded',
-      'context overflow',
-    ];
-    return keywords.some(k => lowerMsg.includes(k));
-  }
-
   /**
    * 获取缓存的工具 token 数（工具列表不变时复用）
    * @private

package/src/agent/tool-loop.js

@@ -183,6 +183,13 @@ class ToolLoop extends EventEmitter {
     const api = [];
     if (systemPrompt) api.push({ role: 'system', content: systemPrompt });
 
+    // ★ 单遍扫描：跟踪"已遇到过的 assistant 中的 tool_call_id"，
+    //    tool-result 只能匹配其之前的 assistant，不能匹配其之后的。
+    //    防止历史会话中的 orphaned tool-result 被错误地保留。
+    const seenAssistantToolCallIds = new Set();
+    // ★ 追踪已输出的 tool_call_id，防止重复
+    const seenOutputToolCallIds = new Set();
+
     for (const msg of messages) {
       if (msg.role === 'system') {
         api.push({ role: 'system', content: typeof msg.content === 'string' ? msg.content : '' });
@@ -194,6 +201,25 @@ class ToolLoop extends EventEmitter {
           api.push({ role: 'user', content: text || '' });
         }
       } else if (msg.role === 'assistant') {
+        // ★ 先收集此 assistant 消息中的 tool_call_id（推入 api 前更新 seen 集合）
+        const currentToolCallIds = new Set();
+        if (msg.tool_calls && Array.isArray(msg.tool_calls)) {
+          for (const tc of msg.tool_calls) {
+            if (tc.id) currentToolCallIds.add(tc.id);
+          }
+        }
+        if (Array.isArray(msg.content)) {
+          for (const part of msg.content) {
+            if (part && (part.type === 'tool-call' || part.type === 'tool-use') && part.toolCallId) {
+              currentToolCallIds.add(part.toolCallId);
+            }
+          }
+        }
+        // ★ 将这些 ID 加入 seenAssistantToolCallIds，之后的 tool-result 才能匹配
+        for (const id of currentToolCallIds) {
+          seenAssistantToolCallIds.add(id);
+        }
+
         // ★ 检测是否有 reasoning 内容（thinking mode 必须携带）
         const hasReasoningInContent = Array.isArray(msg.content) && msg.content.some(p => p && p.type === 'reasoning');
         const hasReasoningTopLevel = msg.reasoning_content || msg.reasoning;
@@ -237,16 +263,36 @@ class ToolLoop extends EventEmitter {
         if (Array.isArray(msg.content)) {
           for (const part of msg.content) {
             if (!part || (part.type !== 'tool-result' && part.type !== 'tool_result')) continue;
+            const id = part.toolCallId;
+            // ★ 过滤：tool-result 必须匹配已出现过的 assistant 中的 tool_call_id
+            if (!seenAssistantToolCallIds.has(id)) {
+              log.warn(`[ToolLoop] 过滤无效 tool-result(顺序/无匹配): toolCallId=${id}`);
+              continue;
+            }
+            // ★ 过滤重复的 tool_call_id（同一 ID 多次出现）
+            if (seenOutputToolCallIds.has(id)) {
+              log.warn(`[ToolLoop] 跳过重复 tool-result: toolCallId=${id}`);
+              continue;
+            }
+            seenOutputToolCallIds.add(id);
             const output = part.output;
             let content;
             if (output?.type === 'text') content = output.value;
             else if (output?.type === 'json') content = JSON.stringify(output.value);
             else content = typeof output === 'string' ? output : JSON.stringify(output);
-            api.push({ role: 'tool', tool_call_id: part.toolCallId, content });
+            api.push({ role: 'tool', tool_call_id: id, content });
           }
         } else if (msg.tool_call_id && typeof msg.content === 'string') {
-          // 已经是 OpenAI 格式（streaming 完成后的消息）
-          api.push(msg);
+          const id = msg.tool_call_id;
+          // ★ 过滤：tool-result 必须匹配已出现过的 assistant 中的 tool_call_id
+          if (!seenAssistantToolCallIds.has(id)) {
+            log.warn(`[ToolLoop] 过滤无效 tool-result(顺序/无匹配): tool_call_id=${id}`);
+          } else if (seenOutputToolCallIds.has(id)) {
+            log.warn(`[ToolLoop] 跳过重复 tool-result: tool_call_id=${id}`);
+          } else {
+            seenOutputToolCallIds.add(id);
+            api.push(msg);
+          }
         }
       }
     }
@@ -448,6 +494,12 @@ class ToolLoop extends EventEmitter {
 
       let response;
       try {
+        // ★ DEBUG: 记录所有 tool 消息的 ID
+        for (const m of apiMessages) {
+          if (m.role === 'tool') {
+            log.warn(`[ToolLoop] [DEBUG] 发送 tool-result: tool_call_id=${m.tool_call_id}, content_len=${(m.content||'').length}`);
+          }
+        }
         response = await client.chat.completions.create({
           model,
           messages: apiMessages,
@@ -545,6 +597,13 @@ class ToolLoop extends EventEmitter {
 
       let stream;
       try {
+        // ★ DEBUG: 记录所有 tool 消息的 ID
+        for (const m of apiMessages) {
+          if (m.role === 'tool') {
+            log.warn(`[ToolLoop] [DEBUG] 发送 tool-result: tool_call_id=${m.tool_call_id}, content_len=${(m.content||'').length}`);
+          }
+        }
+
         stream = await client.chat.completions.create({
           model,
           messages: apiMessages,

package/src/common/constants.js

@@ -24,7 +24,7 @@ const DEFAULT_MAX_OUTPUT_TOKENS = 8192;
 const DEFAULT_TEMPERATURE = 0.3;
 
 /** 默认 Max Steps（工具调用最大轮数） */
-const DEFAULT_MAX_STEPS = 20;
+const DEFAULT_MAX_STEPS = 1000;
 
 /** 需要禁用 temperature 的 thinking mode 模型列表 */
 const THINKING_MODELS = [
@@ -54,7 +54,7 @@ const DEFAULT_MAX_MESSAGES_PER_SESSION = 1000;
 const KEEP_RECENT_MESSAGES = 20;
 
 /** 压缩消息数量阈值 */
-const COMPRESSION_MESSAGE_THRESHOLD = 80;
+const COMPRESSION_MESSAGE_THRESHOLD = 120;
 
 /** 智能压缩启用 */
 const ENABLE_SMART_COMPRESS = true;

package/src/llm/tokens.js

@@ -5,70 +5,7 @@
  * Ported from pi's compaction/compaction.ts with enhancements
  */
 
-// CJK 字符 Unicode 范围
-const CJK_RANGES = [
-  [0x4e00, 0x9fff],   // CJK Unified Ideographs (中文简体/繁体)
-  [0x3400, 0x4dbf],   // CJK Unified Ideographs Extension A
-  [0x20000, 0x2a6df], // CJK Unified Ideographs Extension B
-  [0x3040, 0x309f],   // Hiragana (日文平假名)
-  [0x30a0, 0x30ff],   // Katakana (日文片假名)
-  [0xac00, 0xd7af],   // Hangul Syllables (韩文)
-  [0x1100, 0x11ff],   // Hangul Jamo
-  [0x3000, 0x303f],   // CJK Symbols and Punctuation
-  [0xff00, 0xffef],   // Halfwidth and Fullwidth Forms
-];
-
-function isCJKChar(char) {
-  const code = char.codePointAt(0);
-  if (!code) return false;
-  for (const [start, end] of CJK_RANGES) {
-    if (code >= start && code <= end) return true;
-  }
-  return false;
-}
-
-/**
- * 改进的 Token 估算
- * 根据文本语言类型采用不同估算系数
- *
- * @param {string} text - 输入文本
- * @returns {number} 估算的 token 数
- */
-function encode(text) {
-  if (!text || typeof text !== 'string') return 0;
-
-  let cjkChars = 0;
-  let asciiChars = 0;
-  let otherChars = 0;
-
-  // 逐字符统计
-  for (const char of text) {
-    if (isCJKChar(char)) {
-      cjkChars++;
-    } else if (char.charCodeAt(0) < 128) {
-      // ASCII 字符 (英文、数字、标点)
-      asciiChars++;
-    } else {
-      otherChars++;
-    }
-  }
-
-  // 更精确的估算系数 (基于 tiktoken 统计数据):
-  // - ASCII/英文: ~0.25 tokens/char (4 chars per token)
-  // - 中文: ~0.5 tokens/char (2 chars per token, 中文字符是 3 字节 UTF-8 但 tokenizer 输出约 0.5)
-  // - 其他 (emoji, 特殊符号): ~0.25 tokens/char
-  const asciiTokens = asciiChars * 0.25;
-  const cjkTokens = cjkChars * 0.5;
-  const otherTokens = otherChars * 0.25;
-
-  return Math.ceil(asciiTokens + cjkTokens + otherTokens);
-}
-
-/**
- * 旧版 encode（兼容）
- * @deprecated 使用新版 encode 替代
- */
-function encodeOld(text, bytesPerToken = 4) {
+function encode(text, bytesPerToken = 4) {
   if (!text) return 0;
   const bytes = Buffer.byteLength(String(text), 'utf8');
   return Math.ceil(bytes / bytesPerToken);
@@ -88,66 +25,64 @@ function safeJsonStringify(value) {
   }
 }
 
-/**
- * 估算单条消息的 token 数（使用改进的编码方法）
- */
 function estimateTokens(message) {
-  if (!message) return 0;
-
-  let total = 4; // message overhead
+  let chars = 0;
 
   switch (message.role) {
-    case 'user':
-    case 'assistant':
-    case 'custom':
-    case 'toolResult': {
+    case 'user': {
       const content = message.content;
       if (typeof content === 'string') {
-        total += encode(content);
+        chars = content.length;
       } else if (Array.isArray(content)) {
         for (const block of content) {
           if (block.type === 'text' && block.text) {
-            total += encode(block.text);
-          } else if (block.type === 'tool-call' || block.type === 'toolCall') {
-            total += encode(block.name || '') + encode(safeJsonStringify(block.arguments || {}));
-          } else if (block.type === 'tool-result' || block.type === 'toolResult') {
-            total += encode(typeof block.content === 'string' ? block.content : safeJsonStringify(block.content));
-          } else if (block.type === 'image') {
-            total += 85;
-          } else if (block.type === 'thinking') {
-            total += encode(block.thinking || '');
+            chars += block.text.length;
           }
         }
       }
-      break;
+      return Math.ceil(chars / 4);
+    }
+    case 'assistant': {
+      const assistant = message;
+      for (const block of assistant.content || []) {
+        if (block.type === 'text') {
+          chars += block.text.length;
+        } else if (block.type === 'thinking') {
+          chars += block.thinking.length;
+        } else if (block.type === 'toolCall') {
+          chars += block.name.length + safeJsonStringify(block.arguments).length;
+        }
+      }
+      return Math.ceil(chars / 4);
+    }
+    case 'custom':
+    case 'toolResult': {
+      if (typeof message.content === 'string') {
+        chars = message.content.length;
+      } else {
+        for (const block of message.content || []) {
+          if (block.type === 'text' && block.text) {
+            chars += block.text.length;
+          }
+          if (block.type === 'image') {
+            chars += 4800;
+          }
+        }
+      }
+      return Math.ceil(chars / 4);
     }
     case 'bashExecution': {
-      total += encode(message.command || '');
-      total += encode(message.output || '');
-      break;
+      chars = message.command.length + (message.output?.length || 0);
+      return Math.ceil(chars / 4);
     }
     case 'branchSummary':
     case 'compactionSummary': {
-      total += encode(message.summary || '');
-      break;
-    }
-  }
-
-  // tool_calls overhead
-  if (message.tool_calls && Array.isArray(message.tool_calls)) {
-    total += 15; // tool_calls overhead
-    for (const tc of message.tool_calls) {
-      if (tc.function) {
-        total += encode(tc.function.name || '') + encode(safeJsonStringify(tc.function.arguments || {}));
-      }
+      chars = message.summary.length;
+      return Math.ceil(chars / 4);
     }
   }
 
-  if (message.tool_call_id) {
-    total += 15;
-  }
-
-  return total;
+  return 0;
 }
 
 function calculateContextTokens(usage) {
@@ -222,8 +157,8 @@ class TokenCounter {
     this.toolSchema = config.toolSchema || null;
   }
 
-  countText(text) {
-    return encode(text);
+  countText(text, bytesPerToken = 4) {
+    return encode(text, bytesPerToken);
   }
 
   countMessages(messages) {

package/tests/core/tool-loop.test.js

@@ -59,14 +59,13 @@ describe('ToolLoop._buildApiMessages 格式转换', () => {
     expect(api[3].content).toBe('{"data":"ok"}');
   });
 
-  it('tool 消息已经用 OpenAI 格式时保持', () => {
+  it('tool 消息无对应 assistant 时被过滤（防止 orphaned tool-result）', () => {
     const api = loop._buildApiMessages([
       { role: 'tool', tool_call_id: 'c1', content: 'done' },
     ], 'system prompt');
-    // 已经符合 OpenAI 格式的直接保留
+    // orphaned tool-result 被过滤，只有 system 消息
+    expect(api).toHaveLength(1);
     expect(api[0].role).toBe('system');
-    expect(api[1].role).toBe('tool');
-    expect(api[1].tool_call_id).toBe('c1');
   });
 
   it('systemPrompt 为空时不加 system 消息', () => {