foliko 1.1.21 → 1.1.22

package/.claude/settings.local.json

@@ -204,7 +204,12 @@
       "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)"
     ]
   }
 }

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.22",
   "description": "简约的插件化 Agent 框架",
   "main": "src/index.js",
   "type": "commonjs",

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/src/core/agent-chat.js

@@ -56,7 +56,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 +438,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 +463,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 +479,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);

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,8 +10,9 @@ 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 +75,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 +86,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,28 +117,21 @@ 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',
+        log.info(
+          '[ChatQueue] executeWithRetry: ',
           attempt,
-          'threw error:',
+          'error:',
           error.message
         );
         lastError = error;
@@ -161,7 +152,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,8 +187,8 @@ class ChatQueueManager extends EventEmitter {
         ? 'AI 服务暂时不可用，请稍后重试'
         : (err.message || err.toString()).split('\n')[0];
 
-      console.log(
-        '[ChatQueue] executeStream caught error, converting to friendly:',
+      log.info(
+        '[ChatQueue] executeStream Error:',
         friendlyMessage
       );
       chunks.push({ type: 'error', error: friendlyMessage });
@@ -217,7 +208,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(''),

package/src/utils/logger.js

@@ -33,8 +33,9 @@ class Logger {
       info: '\x1b[32m', // 绿色
       warn: '\x1b[33m', // 黄色
       error: '\x1b[31m', // 红色
+      grey: '\x1b[90m', // 暗灰色
       reset: '\x1b[0m',
-      dim: '\x1b[2m', // 灰色
+      dim: '\x1b[2m', // 暗灰色
     };
   }
 
@@ -72,6 +73,7 @@ class Logger {
     const color = this.colors[levelName.toLowerCase()] || '';
     const reset = this.colors.reset;
     const dim = this.colors.dim;
+    const grey=this.colors.grey;
 
     const parts = [];
 
@@ -91,7 +93,8 @@ class Logger {
       parts.push(levelName.padEnd(5));
     }
 
-    // 消息
+    // 消息（根据级别着色）
+    const msgColor = this.enableColors ? color : '';
     const message = args
       .map((arg) => {
         if (arg instanceof Error) {
@@ -108,7 +111,7 @@ class Logger {
       })
       .join(' ');
 
-    parts.push(message);
+    parts.push(`${grey}${message}${reset}`);
     return parts.join(' ');
   }
 

package/nul

@@ -1,3 +0,0 @@
-dir: cannot access '/s': No such file or directory
-dir: cannot access '/b': No such file or directory
-dir: cannot access '*.png': No such file or directory

package/undefined.svg

@@ -1,8 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="802" height="NaN" viewBox="-1,NaN,802,NaN"><defs><linearGradient x1="400" y1="600" x2="1000" y2="600" gradientUnits="userSpaceOnUse" id="color-1"><stop offset="0" stop-color="#f5f0e6"></stop><stop offset="1" stop-color="#ede8dc"></stop></linearGradient></defs><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,1200v-1200h800v1200z" fill="url(#color-1)" stroke="none" stroke-width="1"></path><path d="M0,1200v-1200h800v1200z" fill="none" stroke="#000000" stroke-width="2"></path><path d="M40,1140v-1100h720v1100z" fill-opacity="0" fill="#000000" stroke="none" stroke-width="1"></path><text x="400" y="55" fill="#6b6459" stroke="none" stroke-width="1" font-family="Microsoft YaHei, SimHei, KaiTi, seguiemj, sans-serif" font-weight="normal" font-size="14" text-anchor="middle">━━━━━━━━━━━━━━━ VOL.01 ━━━━━━━━━━━━━━━</text><text x="400" y="130" fill="#b85450" stroke="none" stroke-width="1" font-family="Microsoft YaHei, SimHei, KaiTi, seguiemj, sans-serif" font-weight="normal" font-size="52" text-anchor="middle">微信 iLink 机器人</text><text x="400" y="195" fill="#6b6459" stroke="none" stroke-width="1" font-family="Microsoft YaHei, SimHei, KaiTi, seguiemj, sans-serif" font-weight="normal" font-size="18" text-anchor="middle">零依赖 · 极简接入 · 高效稳定</text><text x="400" y="235" fill="#1a1a1a" stroke="none" stroke-width="1" font-family="Microsoft YaHei, SimHei, KaiTi, seguiemj, sans-serif" font-weight="normal" font-size="16" text-anchor="middle">WEIXIN iLINK BOT SDK FOR NODE.JS</text><path d="M100,270h600" fill="none" stroke="#ffffff" stroke-width="2"></path><path d="M100,NaNc0,NaN 0,NaN 0,NaNh290c0,0 0,NaN 0,NaNc0,NaN -290,NaN -290,NaNz" fill="#ffffff" stroke="none" stroke-width="1"></path><text x="110" y="454" fill="#000000" stroke="none" stroke-width="1" font-family="Microsoft YaHei, msyh, PatuaOne-Regular, seguiemj, seguisym, SegUIVar, wryh, Segoe UI Emoji, sans-serif" font-weight="normal" font-size="24" text-anchor="start">[object Object]</text><text x="110" y="480" fill="#666666" stroke="none" stroke-width="1" font-family="Microsoft YaHei, msyh, PatuaOne-Regular, seguiemj, seguisym, SegUIVar, wryh, Segoe UI Emoji, sans-serif" font-weight="normal" font-size="16" text-anchor="start">[object Object]</text><path d="M105,480c-2.76142,0 -5,-2.23858 -5,-5v-50c0,-2.76142 2.23858,-5 5,-5h280c2.76142,0 5,2.23858 5,5v50c0,2.76142 -2.23858,5 -5,5z" fill="#ffffff" stroke="none" stroke-width="1"></path><text x="245" y="435" fill="#b85450" stroke="none" stroke-width="1" font-family="Microsoft YaHei, SimHei, KaiTi, seguiemj, sans-serif" font-weight="normal" font-size="20" text-anchor="middle">ZERO DEPENDENCY</text><text x="245" y="460" fill="#6b6459" stroke="none" stroke-width="1" font-family="Microsoft YaHei, SimHei, KaiTi, seguiemj, sans-serif" font-weight="normal" font-size="12" text-anchor="middle">零外部依赖 · 轻量安装</text><path d="M415,480c-2.76142,0 -5,-2.23858 -5,-5v-50c0,-2.76142 2.23858,-5 5,-5h280c2.76142,0 5,2.23858 5,5v50c0,2.76142 -2.23858,5 -5,5z" fill="#ffffff" stroke="none" stroke-width="1"></path><text x="555" y="435" fill="#b85450" stroke="none" stroke-width="1" font-family="Microsoft YaHei, SimHei, KaiTi, seguiemj, sans-serif" font-weight="normal" font-size="20" text-anchor="middle">QR CODE AUTH</text><text x="555" y="460" fill="#6b6459" stroke="none" stroke-width="1" font-family="Microsoft YaHei, SimHei, KaiTi, seguiemj, sans-serif" font-weight="normal" font-size="12" text-anchor="middle">扫码登录 · 安全认证</text><path d="M105,555c-2.76142,0 -5,-2.23858 -5,-5v-50c0,-2.76142 2.23858,-5 5,-5h280c2.76142,0 5,2.23858 5,5v50c0,2.76142 -2.23858,5 -5,5z" fill="#ffffff" stroke="none" stroke-width="1"></path><text x="245" y="510" fill="#b85450" stroke="none" stroke-width="1" font-family="Microsoft YaHei, SimHei, KaiTi, seguiemj, sans-serif" font-weight="normal" font-size="20" text-anchor="middle">EVENT DRIVEN</text><text x="245" y="535" fill="#6b6459" stroke="none" stroke-width="1" font-family="Microsoft YaHei, SimHei, KaiTi, seguiemj, sans-serif" font-weight="normal" font-size="12" text-anchor="middle">事件驱动 · 高效响应</text><path d="M415,555c-2.76142,0 -5,-2.23858 -5,-5v-50c0,-2.76142 2.23858,-5 5,-5h280c2.76142,0 5,2.23858 5,5v50c0,2.76142 -2.23858,5 -5,5z" fill="#ffffff" stroke="none" stroke-width="1"></path><text x="555" y="510" fill="#b85450" stroke="none" stroke-width="1" font-family="Microsoft YaHei, SimHei, KaiTi, seguiemj, sans-serif" font-weight="normal" font-size="20" text-anchor="middle">RICH MEDIA</text><text x="555" y="535" fill="#6b6459" stroke="none" stroke-width="1" font-family="Microsoft YaHei, SimHei, KaiTi, seguiemj, sans-serif" font-weight="normal" font-size="12" text-anchor="middle">多媒体消息 · 丰富交互</text><path d="M100,580h600" fill="none" stroke="#ffffff" stroke-width="2"></path><text x="400" y="600" fill="#1a1a1a" stroke="none" stroke-width="1" font-family="Microsoft YaHei, SimHei, KaiTi, seguiemj, sans-serif" font-weight="normal" font-size="16" text-anchor="middle">QUICK START</text><path d="M108,830c-4.41828,0 -8,-3.58172 -8,-8v-184c0,-4.41828 3.58172,-8 8,-8h584c4.41828,0 8,3.58172 8,8v184c0,4.41828 -3.58172,8 -8,8z" fill="#2d2d2d" stroke="none" stroke-width="1"></path><text x="120" y="645" fill="#f8f8f2" stroke="none" stroke-width="1" font-family="Consolas, Microsoft YaHei, seguiemj, sans-serif" font-weight="normal" font-size="13" text-anchor="start">import { WeixinBot } from '@chnak/weixin-bot';
-
-const bot = new WeixinBot({
-  onQRCode: (qr) =&gt; console.log(qr),
-  onMessage: (msg) =&gt; bot.sendText(msg.from, 'Hello!')
-});
-
-bot.start();</text><path d="M100,850h600" fill="none" stroke="#ffffff" stroke-width="2"></path><path d="M106,920c-3.31371,0 -6,-2.68629 -6,-6v-38c0,-3.31371 2.68629,-6 6,-6h588c3.31371,0 6,2.68629 6,6v38c0,3.31371 -2.68629,6 -6,6z" fill="#2d2d2d" stroke="none" stroke-width="1"></path><text x="400" y="885" fill="#50fa7b" stroke="none" stroke-width="1" font-family="Consolas, Microsoft YaHei, seguiemj, sans-serif" font-weight="normal" font-size="18" text-anchor="middle">$ npm install @chnak/weixin-bot</text><text x="400" y="950" fill="#6b6459" stroke="none" stroke-width="1" font-family="Microsoft YaHei, SimHei, KaiTi, seguiemj, sans-serif" font-weight="normal" font-size="14" text-anchor="middle">v1.2.9  ·  MIT License  ·  Node.js &gt;= 14.0.0</text><text x="400" y="980" fill="#b85450" stroke="none" stroke-width="1" font-family="Microsoft YaHei, SimHei, KaiTi, seguiemj, sans-serif" font-weight="normal" font-size="14" text-anchor="middle">npmjs.com/package/@chnak/weixin-bot</text><text x="400" y="1020" fill="#6b6459" stroke="none" stroke-width="1" font-family="Microsoft YaHei, SimHei, KaiTi, seguiemj, sans-serif" font-weight="normal" font-size="14" text-anchor="middle">━━━━━━━━━━━━━━━ ◆ ━━━━━━━━━━━━━━━</text><text x="400" y="1045" fill="#6b6459" stroke="none" stroke-width="1" font-family="Microsoft YaHei, SimHei, KaiTi, seguiemj, sans-serif" font-weight="normal" font-size="12" text-anchor="middle">❖  ❖</text></g></svg>