foliko 1.1.21 → 1.1.23

package/.claude/settings.local.json

@@ -204,7 +204,19 @@
       "Bash(node -e \"require\\('./src/core/agent-chat.js'\\); console.log\\('OK'\\)\" 2>&1)",
       "Bash(node -e \"const ai = require\\('ai'\\); console.log\\('tool type:', typeof ai.tool\\)\")",
       "Bash(taskkill //PID 26152 //F)",
-      "Bash(netstat -ano | grep 3000)"
+      "Bash(netstat -ano | grep 3000)",
+      "Bash(node test-error.js 2>&1)",
+      "Bash(node -c src/core/agent-chat.js && node -c src/utils/chat-queue.js && node -c cli/src/ui/chat-ui.js && node -c plugins/weixin-plugin.js && node -c plugins/telegram-plugin.js)",
+      "Bash(node -c plugins/weixin-plugin.js && node -c plugins/telegram-plugin.js && node -c cli/src/ui/chat-ui.js)",
+      "Bash(node -c src/utils/chat-queue.js)",
+      "Bash(node -c src/utils/logger.js)",
+      "WebFetch(domain:github.com)",
+      "mcp__MiniMax__web_search",
+      "WebFetch(domain:www.npmjs.com)",
+      "Bash(cd D:/code/vb-agent && npm show @anthropic-ai/tokenizer 2>&1 | head -30)",
+      "Bash(cd D:/code/vb-agent && node -e \"const t = require\\('@anthropic-ai/tokenizer'\\); console.log\\(typeof t.countTokens\\)\" 2>&1)",
+      "Bash(cd D:/code/vb-agent && node -e \"const { countTokens } = require\\('@anthropic-ai/tokenizer'\\); console.log\\('hello:', countTokens\\('hello'\\)\\); console.log\\('你好:', countTokens\\('你好'\\)\\);\")",
+      "Bash(node -c src/core/subagent.js)"
     ]
   }
 }

package/cli/src/commands/chat.js

@@ -126,7 +126,7 @@ async function runContinuousTest(agent, options) {
         } else if (chunk.type === 'tool-call') {
           console.log(`\n[工具调用] ${chunk.toolName}  ${JSON.stringify(chunk.input)}`);
         } else if (chunk.type === 'error') {
-          console.error(`\n[错误] ${chunk.error}`);
+          //console.error(`\n[错误] ${chunk.error}`);
         }
       }
       console.log('\n' + '-'.repeat(50));

package/cli/src/ui/chat-ui.js

@@ -136,6 +136,8 @@ class ChatUI {
 
     process.on('SIGINT', interruptHandler);
 
+    let hasError = false;
+
     try {
       const renderState = { inThink: false, inCodeBlock: false };
       const { sessionId } = this;
@@ -150,7 +152,6 @@ class ChatUI {
         // 创建 session scope 过滤事件
         const sessionScope = this.agent.createSessionScope(sessionId);
 
-        // 监听流式数据
         sessionScope.on('stream:chunk', ({ chunk }) => {
           if (interrupted) return;
 
@@ -167,11 +168,15 @@ class ChatUI {
                 console.log(renderLine(line, renderState));
               }
             }
-          } else if (chunk.type === 'error') {
-            console.error(`\n${colored('[错误]', RED)} ${chunk.error}`);
           }
         });
 
+        // 监听 queue:failed 事件（处理队列级别的最终错误）
+        sessionScope.on('queue:failed', ({ error }) => {
+          hasError = true;
+          console.error(`\n${colored('[错误]', RED)} ${error}`);
+        });
+
         // 调用 sendMessage 触发事件
         const res = await this.agent.sendMessage(message, { sessionId });
         // 清理
@@ -199,13 +204,14 @@ class ChatUI {
       }
     } catch (err) {
       // 只打印简洁错误消息，不打印堆栈
-      const errName = err?.name || '';
-      const isRetryError = errName === 'AI_RetryError' || errName === 'RetryError';
-      const friendlyMessage = isRetryError
-        ? 'AI 服务暂时不可用，请稍后重试'
-        : (err.message || '未知错误').split('\n')[0];
+      // 避免与 message:error 事件重复打印
+      if (!hasError && !interrupted) {
+        const errName = err?.name || '';
+        const isRetryError = errName === 'AI_RetryError' || errName === 'RetryError';
+        const friendlyMessage = isRetryError
+          ? 'AI 服务暂时不可用，请稍后重试'
+          : (err.message || '未知错误').split('\n')[0];
 
-      if (!interrupted) {
         console.error(`\n${colored('[错误]', RED)} ${friendlyMessage}\n`);
       }
     } finally {

package/examples/test-chat.js

@@ -89,7 +89,9 @@ async function main() {
         } else if (chunk.type === 'tool-result') {
           console.log('\n[工具结果]', JSON.stringify(chunk.result).substring(0, 100));
         } else if (chunk.type === 'error') {
-          console.error('\n[错误]', chunk.error);
+          throw new Error('sdfsdf');
+          
+          //console.error('\n[错误]', chunk.error);
         }
       }
 
@@ -110,6 +112,10 @@ async function main() {
     '请帮我注册一个 GET 路由：\n- 路径：/test\n- 处理函数：return "1232432"\n\n注册完成后，用 web_request 工具测试访问这个路由，确认返回 "1232432"'
   );
 
+   await ask(
+    '关闭服务'
+  );
+
   console.log('\n--- 测试完成，现在你可以继续对话 ---\n');
 
   // 主循环

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foliko",
-  "version": "1.1.21",
+  "version": "1.1.23",
   "description": "简约的插件化 Agent 框架",
   "main": "src/index.js",
   "type": "commonjs",
@@ -53,6 +53,7 @@
     "@ai-sdk/openai": "^3.0.41",
     "@ai-sdk/openai-compatible": "^2.0.35",
     "@anthropic-ai/sdk": "^0.39.0",
+    "@anthropic-ai/tokenizer": "^0.0.4",
     "@chnak/weixin-bot": "^1.2.9",
     "@chnak/zod-to-markdown": "1.0.7",
     "@hono/node-server": "^1.19.11",

package/plugins/telegram-plugin.js

@@ -329,6 +329,14 @@ class TelegramPlugin extends Plugin {
         }
       })
 
+      // 监听错误事件
+      sessionScope.on('queue:failed', async ({ error }) => {
+        await this._bot.editMessageText(escapeMarkdown(`❌ ${error}`), {
+          chat_id: chatId,
+          message_id: thinkingMsg.message_id
+        })
+      })
+
       await agent.sendMessage(text, { sessionId })
 
       sessionScope.removeAllListeners()

package/plugins/weixin-plugin.js

@@ -537,8 +537,6 @@ class WeixinPlugin extends Plugin {
           message+=colored(`[工具开始](${chunk.toolName})`,YELLOW)
         }else if(chunk.type==='tool-result'){
           message+=colored(`[工具结束](${chunk.toolName})`,YELLOW)
-        }else if(chunk.type==='error'){
-          message+=colored(`[错误](${chunk.error})`,RED)
         }
         while (message.includes('\n')) {
             const nlIndex = message.indexOf('\n');
@@ -564,7 +562,7 @@ class WeixinPlugin extends Plugin {
         lineBuffer = ''
         message=''
       })
-      sessionScope.on('message:error', async ({error}) => {
+      sessionScope.on('queue:failed', async ({error}) => {
         this.stopTypingInterval()
         await this._sendMessageBatch(originalMsg, userId, error, true)
         lineBuffer = ''

package/poster_sanhuali.svg

@@ -0,0 +1 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1080" height="1920" viewBox="0,0,1080,1920"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="none" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,1920v-1920h1080v1920z" fill="#f5f5f0" stroke="none" stroke-width="1"></path><text x="540" y="120" fill="#c41e3a" stroke="none" stroke-width="1" font-family="Microsoft YaHei, SimHei, KaiTi, seguiemj, sans-serif" font-weight="bold" font-size="48" text-anchor="middle">广东信宜特产</text><text x="540" y="200" fill="#2c1810" stroke="none" stroke-width="1" font-family="Microsoft YaHei, SimHei, KaiTi, seguiemj, sans-serif" font-weight="bold" font-size="72" text-anchor="middle">钱排银妃三华李</text><text x="540" y="300" fill="#8b4513" stroke="none" stroke-width="1" font-family="Microsoft YaHei, SimHei, KaiTi, seguiemj, sans-serif" font-weight="normal" font-size="36" text-anchor="middle">果中爱马仕 | 酸甜脆爽</text><text x="540" y="480" fill="#c41e3a" stroke="none" stroke-width="1" font-family="Microsoft YaHei, SimHei, KaiTi, seguiemj, sans-serif" font-weight="bold" font-size="32" text-anchor="middle">核心卖点</text><g><rect x="140" y="520" width="300" height="100" rx="12" fill="#c41e3a" stroke="none"/><text x="290" y="570" fill="#ffffff" stroke="none" font-size="28" text-anchor="middle" font-family="Microsoft YaHei">📍 产地直发</text><text x="290" y="600" fill="#ffe4e1" stroke="none" font-size="18" text-anchor="middle" font-family="Microsoft YaHei">广东信宜钱排镇</text></g><g><rect x="640" y="520" width="300" height="100" rx="12" fill="#c41e3a" stroke="none"/><text x="790" y="570" fill="#ffffff" stroke="none" font-size="28" text-anchor="middle" font-family="Microsoft YaHei">⭐ 精选大果</text><text x="790" y="600" fill="#ffe4e1" stroke="none" font-size="18" text-anchor="middle" font-family="Microsoft YaHei">单果30g以上</text></g><g><rect x="140" y="650" width="300" height="100" rx="12" fill="#228b22" stroke="none"/><text x="290" y="700" fill="#ffffff" stroke="none" font-size="28" text-anchor="middle" font-family="Microsoft YaHei">🌿 新鲜采摘</text><text x="290" y="730" fill="#90ee90" stroke="none" font-size="18" text-anchor="middle" font-family="Microsoft YaHei">当季现摘 冷链配送</text></g><g><rect x="640" y="650" width="300" height="100" rx="12" fill="#228b22" stroke="none"/><text x="790" y="700" fill="#ffffff" stroke="none" font-size="28" text-anchor="middle" font-family="Microsoft YaHei">💚 酸甜脆爽</text><text x="790" y="730" fill="#90ee90" stroke="none" font-size="18" text-anchor="middle" font-family="Microsoft YaHei">自然成熟 口感极佳</text></g><g><rect x="240" y="800" width="600" height="180" rx="20" fill="#ffffff" stroke="#c41e3a" stroke-width="4"/><text x="540" y="870" fill="#c41e3a" stroke="none" font-size="24" text-anchor="middle" font-family="Microsoft YaHei">活动价格</text><text x="540" y="940" fill="#c41e3a" stroke="none" font-size="72" font-weight="bold" text-anchor="middle" font-family="Microsoft YaHei">¥19.8</text><text x="540" y="980" fill="#666666" stroke="none" font-size="20" text-anchor="middle" font-family="Microsoft YaHei">5斤装 顺丰包邮</text></g><g><rect x="340" y="1100" width="400" height="400" rx="20" fill="#fff5ee" stroke="#deb887" stroke-width="2"/><text x="540" y="1300" fill="#ff6b6b" stroke="none" font-size="120" text-anchor="middle">🍑</text><text x="540" y="1450" fill="#8b4513" stroke="none" font-size="28" text-anchor="middle" font-family="Microsoft YaHei">钱排三华李</text><text x="540" y="1480" fill="#d2691e" stroke="none" font-size="20" text-anchor="middle" font-family="Microsoft YaHei">新鲜水果 产地直发</text></g><g><rect x="340" y="1550" width="400" height="250" rx="16" fill="#ffffff" stroke="#e0e0e0" stroke-width="2"/><text x="540" y="1600" fill="#333333" stroke="none" font-size="24" text-anchor="middle" font-family="Microsoft YaHei">[ 扫码下单 ]</text><text x="540" y="1640" fill="#666666" stroke="none" font-size="18" text-anchor="middle" font-family="Microsoft YaHei">手机淘宝/京东 扫码购买</text><text x="540" y="1700" fill="#c41e3a" stroke="none" font-size="20" text-anchor="middle" font-family="Microsoft YaHei">长按识别二维码</text></g><text x="540" y="1850" fill="#666666" stroke="none" font-size="24" text-anchor="middle" font-family="Microsoft YaHei">长按识别 立即购买</text><text x="540" y="1880" fill="#999999" stroke="none" font-size="18" text-anchor="middle" font-family="Microsoft YaHei">正宗钱排三华李 假一赔十</text></g></svg>

package/src/core/agent-chat.js

@@ -21,6 +21,7 @@ const {
 } = require('ai');
 const { prepareMessagesForAPI, cleanResponse } = require('../utils');
 const { ChatQueueManager } = require('../utils/chat-queue');
+const { countTokens } = require('@anthropic-ai/tokenizer');
 const fs = require('fs/promises');
 // 新模块
 const { ChatSession } = require('./chat-session');
@@ -56,7 +57,7 @@ class AgentChatHandler extends EventEmitter {
       agent,
       maxConcurrent: config.maxConcurrent || 1,
       retryAttempts: config.retryAttempts || 3,
-      retryDelay: config.retryDelay || 1000,
+      retryDelay: config.retryDelay || 10000,
     });
 
     // ToolExecutor: 工具管理
@@ -438,8 +439,13 @@ class AgentChatHandler extends EventEmitter {
         prepareStep: this._createPrepareStep(),
       });
 
+      // AI SDK 错误回调：仅记录日志，不在这里处理（统一由 catch/yield 处理）
+      const handleSDKError = ({ error }) => {
+        logger.debug(`[AgentChat] SDK onError: ${error?.message}`);
+      };
+
       const result = await framework.runInSession(sessionId, {}, async () => {
-        return agent.stream({ messages, ...this.providerOptions });
+        return agent.stream({ messages, ...this.providerOptions, onError: handleSDKError });
       });
 
       const stream = result.fullStream;
@@ -458,7 +464,9 @@ class AgentChatHandler extends EventEmitter {
         } else if (part.type === 'tool-result') {
           yield { type: 'tool-result', toolName: part.toolName, result: part.output };
         } else if (part.type === 'error') {
-          yield { type: 'error', error: part.error };
+          // 统一错误消息
+          const errMsg = part.error?.message || 'AI 服务错误';
+          yield { type: 'error', error: errMsg.split('\n')[0] };
         }
       }
 
@@ -472,35 +480,10 @@ class AgentChatHandler extends EventEmitter {
       const userMsg = messages[messages.length - finishMessages.length - 1];
       this.emit('message', { content: fullText, sessionId: sessionId, userMessage: userMsg });
     } catch (err) {
-      // 提取简洁的错误消息（不包含堆栈）
-      const simpleMessage = err?.message?.split('\n')[0] || '未知错误';
-      const errName = err?.name || '';
-
-      // 使用 AI SDK 的错误类型判断
-      const isRetryError =
-        RetryError.isInstance?.(err) ||
-        errName === 'AI_RetryError' ||
-        errName === 'RetryError' ||
-        err?.reason === 'maxRetriesExceeded';
-
-      // AI SDK 的错误 map
-      const errorMessages = {
-        AI_RetryError: 'AI 服务暂时不可用，请稍后重试',
-        AI_APICallError: err?.isRetryable ? 'AI 服务暂时不可用，请稍后重试' : simpleMessage,
-        AI_NoContentGeneratedError: 'AI 未生成有效内容，请重试',
-        AI_NoOutputGeneratedError: 'AI 未生成有效内容，请重试',
-        AI_NoSuchModelError: '指定的 AI 模型不存在',
-        AI_NoSuchProviderError: 'AI 提供商配置错误',
-        AI_LoadAPIKeyError: 'AI API 密钥配置错误',
-        AI_InvalidPromptError: '输入内容格式错误',
-        AI_ToolCallRepairError: '工具调用处理失败，请重试',
-      };
-
-      const friendlyMessage =
-        errorMessages[errName] || (isRetryError ? 'AI 服务暂时不可用，请稍后重试' : simpleMessage);
+      // 统一错误处理：提取简洁消息并通过 yield 传递
+      const friendlyMessage = err?.message?.split('\n')[0] || '未知错误';
 
-      //logger.error(`[AgentChat] Error [${errName}]: ${simpleMessage}`);
-      this.emit('message:error', { sessionId, error: friendlyMessage });
+      this.emit('message:error', { sessionId, error: friendlyMessage, originalError: err });
       yield { type: 'error', error: friendlyMessage };
     } finally {
       const messageStore = this._getSessionMessageStore(sessionId);
@@ -623,12 +606,9 @@ class AgentChatHandler extends EventEmitter {
     const totalTokens = messagesTokens + toolsTokens + systemPromptTokens;
     const limit = this._maxContextTokens * 0.5;
 
-    console.log(
-      `[_prepareSession] BEFORE: messages=${messages.length}, tokens=${totalTokens}/${limit}`
-    );
+    logger.info(`BEFORE: messages=${messages.length}, tokens=${totalTokens}/${limit}`);
 
     if (totalTokens > limit) {
-      console.log(`[_prepareSession] Compressing context...`);
       logger.info(
         `Context large (${totalTokens}/${this._maxContextTokens} tokens), compressing...`
       );
@@ -946,9 +926,9 @@ class AgentChatHandler extends EventEmitter {
    * 计算 token
    * @private
    */
-  _countTokens(text, bytesPerToken = 4) {
+  _countTokens(text) {
     if (!text) return 0;
-    return Math.ceil(Buffer.byteLength(String(text), 'utf8') / bytesPerToken);
+    return countTokens(String(text));
   }
 
   /**

package/src/core/context-compressor.js

@@ -9,25 +9,26 @@
 
 const { logger } = require('../utils/logger');
 const { zodSchemaToMarkdown, zodSchemaToTable } = require('@chnak/zod-to-markdown');
+const { Subagent } = require('./subagent');
 
 // 模型上下文限制表
 const MODEL_CONTEXT_LIMITS = {
-  'deepseek-chat': 128000,
-  'deepseek-coder': 128000,
-  'deepseek-reasoner': 128000,
-  'MiniMax-M2.7': 128000,
+  'deepseek-chat': 110000,
+  'deepseek-coder': 110000,
+  'deepseek-reasoner': 110000,
+  'MiniMax-M2.7': 110000,
   'gpt-4': 100000,
   'gpt-4o': 100000,
   'gpt-4o-mini': 100000,
   'gpt-4-turbo': 100000,
-  'claude-3-5-sonnet': 150000,
-  'claude-3-opus': 150000,
-  'claude-3-sonnet': 150000,
-  'glm-5.1': 200000,
+  'claude-3-5-sonnet': 110000,
+  'claude-3-opus': 110000,
+  'claude-3-sonnet': 110000,
+  'glm-5.1': 110000,
 };
 
 // 压缩超时
-const COMPRESSION_TIMEOUT = 120000;
+const COMPRESSION_TIMEOUT = 1200000;
 
 class ContextCompressor {
   /**
@@ -409,38 +410,53 @@ class ContextCompressor {
    * @private
    */
   async _summarizeMessages(messages) {
-    const chatHandler = this.agent?._chatHandler;
-    if (!chatHandler?._aiClient) {
-      throw new Error('AI client not available');
+    if (!this.framework) {
+      throw new Error('Framework not available');
     }
 
-    const { generateText } = await import('ai');
-
-    // 使用 AI SDK 消息格式
-    const chatMessages = [
-      {
-        role: 'user',
-        content:
-          '请简要总结以下对话的主要内容，用1000字以内描述：\n' +
-          messages
-            .map((m) => {
-              const content =
-                typeof m.content === 'string' ? m.content : JSON.stringify(m.content || '');
-              return `${m.role}: ${content}`;
-            })
-            .join('\n'),
-      },
-    ];
+    // 提取消息文本内容，忽略工具调用等
+    const msg_str = messages
+      .map((m) => {
+        let text = '';
+        if (typeof m.content === 'string') {
+          text = m.content;
+        } else if (Array.isArray(m.content)) {
+          // 只提取 text 类型，忽略 tool-call、tool-result 等
+          text = m.content
+            .filter((c) => c.type === 'text')
+            .map((c) => c.text)
+            .join(' ');
+        }
+        // 跳过 tool 角色的结果（太长且无意义）
+        if (m.role === 'tool') {
+          return '';
+        }
+        return `${m.role}: ${text}`;
+      })
+      .filter((line) => line.length > 0)
+      .join('\n');
+
+    const task = `请总结以下对话，只保留有意义的信息（如任务需求、决策结论、重要上下文），忽略无意义的闲聊和重复内容。用1000字以内描述：\n
+
+      ${msg_str}`;
 
     try {
-      // _aiClient 已经是 model 对象，直接使用
-      const model = chatHandler._aiClient;
-      const result = await generateText({
-        model: model,
-        messages: chatMessages,
-        maxTokens: 1000,
+      // 使用 framework.createSubAgent 创建 Subagent 进行摘要
+      // maxRetries: 0 禁用重试，避免长时间等待
+      const subagent = this.framework.createSubAgent({
+        name: 'context-compressor',
+        role: '信息提取专家',
+        systemPrompt:
+          '你是一个对话摘要助手。只提取和保留有意义的信息（如任务需求、决策结论、重要上下文），忽略无意义的闲聊、重复内容和中间过程。输出要简洁。',
+        maxRetries: 0,
+        disableTools: true,
       });
-      return result.text || '';
+
+      const result = await subagent.chat(task);
+      if (result.success) {
+        return result.message;
+      }
+      throw new Error(result.error || '摘要生成失败');
     } catch (err) {
       logger.warn('Summarize failed:', err.message);
       throw err;

package/src/core/framework.js

@@ -586,6 +586,8 @@ class Framework extends EventEmitter {
       tools = {},
       parentTools = [], // 如果不传，默认继承主agent所有工具
       llmConfig = null,
+      maxRetries,
+      disableTools,
     } = config;
 
     // 获取 AI 配置
@@ -626,6 +628,8 @@ class Framework extends EventEmitter {
       tools: toolList,
       parentTools: parentTools,
       framework: this, // 传递 framework 引用用于动态构建系统提示词
+      maxRetries,
+      disableTools,
     });
 
     this._agents.push(subagent);

package/src/core/subagent.js

@@ -55,6 +55,12 @@ class Subagent extends EventEmitter {
     this._tools = new Map();
     this._registerTools(config.tools || []);
 
+    // 重试配置
+    this.maxRetries = config.maxRetries ?? 2;
+    this.retryDelay = config.retryDelay ?? 5000;
+    // 禁用工具
+    this.disableTools = config.disableTools ?? false;
+
     this.framework.once('framework:ready', () => {
       const extExecutor = this.framework?.pluginManager?.get('extension-executor');
       extExecutor._refreshAllAgentsExtPrompt(this.framework);
@@ -118,6 +124,8 @@ class Subagent extends EventEmitter {
    * 构建 AI 工具格式
    */
   _buildAITools() {
+    // 禁用工具时返回空
+
     const tools = {};
     // 从父Agent继承工具
     const all_tools = this.framework.getTools();
@@ -165,9 +173,9 @@ class Subagent extends EventEmitter {
     }
     lines.push('');
 
-    // if(this._customSystemPrompt){
-    //   lines.push(this._customSystemPrompt)
-    // }
+    if (this._customSystemPrompt) {
+      lines.push(this._customSystemPrompt);
+    }
 
     // 2. 主Agent的系统提示词
     if (this.framework && this.framework._mainAgent) {
@@ -234,28 +242,42 @@ class Subagent extends EventEmitter {
    */
   async chat(task, options = {}) {
     const maxSteps = options?.maxSteps || 30;
-    const maxRetries = options?.maxRetries ?? 2;
+    const maxRetries = options?.maxRetries ?? this.maxRetries;
+    const retryDelay = options?.retryDelay ?? this.retryDelay;
     const aiProvider = this._getAIProvider();
     const messages = [];
     messages.push({ role: 'user', content: task });
 
+    logger.info(
+      `[Subagent:${this.name}] chat called, maxRetries=${maxRetries}, disableTools=${this.disableTools}`
+    );
+
     let lastError;
     for (let attempt = 0; attempt <= maxRetries; attempt++) {
+      logger.info(
+        `[Subagent:${this.name}] attempt ${attempt + 1}, model=${this.model}, provider=${this.provider}`
+      );
       try {
-        const tools = this._buildAITools();
-        const systemPrompt = this._buildSystemPrompt();
+        const tools = this.disableTools ? {} : this._buildAITools();
+        const systemPrompt = this.disableTools
+          ? this._customSystemPrompt
+          : this._buildSystemPrompt();
+        // logger.info(`[Subagent:${this.name}] calling generateText...`);
         const result = await generateText({
+          ...this.providerOptions,
           model: aiProvider(this.model),
           system: systemPrompt,
           messages: messages,
           tools: tools,
           stopWhen: stepCountIs(maxSteps),
-          ...this.providerOptions,
           abortSignal: options.signal,
           onChunk: (chunk) => {
             this.emit('chunk', chunk);
           },
         });
+        logger.info(
+          `[Subagent:${this.name}] generateText completed, text length=${result.text.length}`
+        );
         messages.push(...result.response.messages);
         const full_text = cleanResponse(result.text);
         this.emit('complete', { message: full_text, steps: result.steps?.length || 0 });
@@ -265,6 +287,7 @@ class Subagent extends EventEmitter {
           steps: result.steps?.length || 0,
         };
       } catch (err) {
+        logger.warn(`[Subagent:${this.name}] generateText error: ${err.message}`);
         lastError = err;
         const errName = err?.name || '';
 
@@ -276,8 +299,10 @@ class Subagent extends EventEmitter {
           err?.reason === 'maxRetriesExceeded';
 
         if (isRetryError && attempt < maxRetries) {
-          logger.warn(`[Subagent:${this.name}] AI 服务不可用，${attempt + 1}/${maxRetries} 次重试`);
-          await new Promise((resolve) => setTimeout(resolve, 1000 * Math.pow(2, attempt)));
+          logger.warn(
+            `[Subagent:${this.name}] AI 服务不可用，正在重试 (${attempt + 1}/${maxRetries})`
+          );
+          await new Promise((resolve) => setTimeout(resolve, retryDelay * Math.pow(2, attempt)));
           continue;
         }
 

package/src/utils/chat-queue.js

@@ -1,5 +1,7 @@
 const { EventEmitter } = require('./event-emitter');
 const { cleanResponse } = require('./index');
+const { logger } = require('./logger');
+const log = logger.child('ChatQueue');
 // ChatQueueManager.js
 class ChatQueueManager extends EventEmitter {
   constructor(options = {}) {
@@ -8,7 +10,7 @@ class ChatQueueManager extends EventEmitter {
     this.isProcessing = false;
     this.maxConcurrent = options.maxConcurrent || 1;
     this.activeCount = 0;
-    this.retryAttempts = options.retryAttempts || 5;
+    this.retryAttempts = options.retryAttempts || 3;
     this.retryDelay = options.retryDelay || 10000;
   }
 
@@ -72,13 +74,8 @@ class ChatQueueManager extends EventEmitter {
       const result = await this.executeWithRetry(item);
       // 检查 result 是否有错误（而不是通过 try/catch）
       if (result.error) {
-        console.log('[ChatQueue] Rejecting with error from result:', result.error.message);
-        item.reject(result.error);
-        this.emit('queue:failed', {
-          requestId: item.id,
-          sessionId: item.sessionId,
-          error: result.error.message,
-        });
+        //console.log('[ChatQueue] Rejecting with error from result:', result.error.message);
+        throw result.error;
       } else {
         item.resolve(result);
         this.emit('queue:completed', {
@@ -88,7 +85,7 @@ class ChatQueueManager extends EventEmitter {
         });
       }
     } catch (error) {
-      console.log('[ChatQueue] Rejecting with thrown error:', error.message);
+      log.info('[ChatQueue] Rejecting Error:', error.message);
       item.reject(error);
       this.emit('queue:failed', {
         requestId: item.id,
@@ -119,30 +116,18 @@ class ChatQueueManager extends EventEmitter {
 
         // 检查是否有错误（通过返回的 result.error）
         if (result.error) {
-          console.log(
-            '[ChatQueue] executeWithRetry: attempt',
-            attempt,
-            'got error:',
-            result.error.message
-          );
           lastError = result.error;
           if (attempt < this.retryAttempts && this.isRetryableError(lastError)) {
             await this.sleep(this.retryDelay * Math.pow(2, attempt - 1));
             continue;
           }
-          // 返回 result，让 processQueue 处理错误
-          console.log('[ChatQueue] executeWithRetry: returning result with error, no more retries');
-          return result;
+          // 重试耗尽，直接抛出 result.error
+          throw lastError;
         }
 
         return result;
       } catch (error) {
-        console.log(
-          '[ChatQueue] executeWithRetry: attempt',
-          attempt,
-          'threw error:',
-          error.message
-        );
+        log.info('[ChatQueue] executeWithRetry: ', attempt, 'error:', error.message);
         lastError = error;
         if (attempt < this.retryAttempts && this.isRetryableError(error)) {
           await this.sleep(this.retryDelay * Math.pow(2, attempt - 1));
@@ -161,7 +146,7 @@ class ChatQueueManager extends EventEmitter {
 
     const friendlyError = new Error(friendlyMessage);
     friendlyError.originalError = lastError;
-    console.log('[ChatQueue] executeWithRetry: throwing friendly error:', friendlyMessage);
+    //log.info('[ChatQueue] executeWithRetry: throwing friendly error:', friendlyMessage);
     throw friendlyError;
   }
 
@@ -196,10 +181,7 @@ class ChatQueueManager extends EventEmitter {
         ? 'AI 服务暂时不可用，请稍后重试'
         : (err.message || err.toString()).split('\n')[0];
 
-      console.log(
-        '[ChatQueue] executeStream caught error, converting to friendly:',
-        friendlyMessage
-      );
+      log.info('[ChatQueue] executeStream Error:', friendlyMessage);
       chunks.push({ type: 'error', error: friendlyMessage });
       this.emit('stream:chunk', {
         requestId: item.id,
@@ -217,7 +199,7 @@ class ChatQueueManager extends EventEmitter {
       const error = new Error(errorChunk.error || 'Stream error');
       error.chunks = chunks;
       error.isStreamError = true;
-      console.log('[ChatQueue] executeStream returning result with error:', error.message);
+      log.info('[ChatQueue] executeStream Error:', error.message);
       return {
         chunks,
         content: cleanResponse(''),