foliko 1.1.19 → 1.1.21

package/src/core/subagent.js

@@ -6,8 +6,9 @@
 
 const { EventEmitter } = require('../utils/event-emitter');
 const { cleanResponse } = require('../utils');
-const { generateText, tool, stepCountIs, isLoopFinished } = require('ai');
+const { generateText, tool, stepCountIs, isLoopFinished, RetryError } = require('ai');
 const { z } = require('zod');
+const { logger } = require('../utils/logger');
 
 class Subagent extends EventEmitter {
   /**
@@ -49,7 +50,7 @@ class Subagent extends EventEmitter {
     };
     // 如果提供了 systemPrompt 则使用，否则标记为需要动态构建
     this._customSystemPrompt = config.systemPrompt || null;
-    this.parentTools = config?.parentTools || [];
+    this.parentTools = config?.parentTools;
     // 工具管理
     this._tools = new Map();
     this._registerTools(config.tools || []);
@@ -120,20 +121,31 @@ class Subagent extends EventEmitter {
     const tools = {};
     // 从父Agent继承工具
     const all_tools = this.framework.getTools();
-    this.parentTools = this.parentTools.map((key) => {
-      return this.bindTools[key.toLocaleLowerCase()] || key;
-    });
-    for (const toolName of this.parentTools) {
-      const toolDef = all_tools.find((t) => t.name === toolName);
-      if (toolDef) {
-        tools[toolDef.name] = toolDef;
+    let parentTools = [];
+    if (Array.isArray(this.parentTools)) {
+      parentTools = this.parentTools.map((key) => {
+        return this.bindTools[key.toLocaleLowerCase()] || key;
+      });
+      for (const toolName of parentTools) {
+        const toolDef = all_tools.find((t) => t.name === toolName);
+        if (toolDef) {
+          tools[toolDef.name] = toolDef;
+        }
+      }
+      const defaulTools = all_tools.filter((a) => this.defaulTools.includes(a.name));
+
+      defaulTools.map((tool) => {
+        tools[tool.name] = tool;
+      });
+    } else {
+      for (const toolName of all_tools) {
+        const toolDef = all_tools.find((t) => t.name === toolName);
+        if (toolDef) {
+          tools[toolDef.name] = toolDef;
+        }
       }
     }
-    const defaulTools = all_tools.filter((a) => this.defaulTools.includes(a.name));
 
-    defaulTools.map((tool) => {
-      tools[tool.name] = tool;
-    });
     return { ...tools, ...this._tools };
   }
 
@@ -217,47 +229,90 @@ class Subagent extends EventEmitter {
    * @param {Object} [options] - 选项
    * @param {number} [options.maxSteps] - 最大步数
    * @param {AbortSignal} [options.signal] - 中止信号
+   * @param {number} [options.maxRetries] - 最大重试次数
    * @returns {Promise<{success: boolean, message: string, steps: number}>}
    */
   async chat(task, options = {}) {
     const maxSteps = options?.maxSteps || 30;
+    const maxRetries = options?.maxRetries ?? 2;
     const aiProvider = this._getAIProvider();
     const messages = [];
     messages.push({ role: 'user', content: task });
-    try {
-      const tools = this._buildAITools();
-      const systemPrompt = this._buildSystemPrompt();
-      const result = await generateText({
-        model: aiProvider(this.model),
-        system: systemPrompt,
-        messages: messages,
-        tools: tools,
-        stopWhen: stepCountIs(maxSteps),
-        ...this.providerOptions,
-        abortSignal: options.signal,
-        onChunk: (chunk) => {
-          this.emit('chunk', chunk);
-        },
-      });
-      messages.push(...result.response.messages);
-      const full_text = cleanResponse(result.text);
-      this.emit('complete', { message: full_text, steps: result.steps?.length || 0 });
-      return {
-        success: true,
-        message: full_text,
-        steps: result.steps?.length || 0,
-      };
-    } catch (err) {
-      this.emit('error', { error: err.message });
-      return {
-        success: false,
-        message: '',
-        error: err.message,
-        steps: 0,
-      };
+
+    let lastError;
+    for (let attempt = 0; attempt <= maxRetries; attempt++) {
+      try {
+        const tools = this._buildAITools();
+        const systemPrompt = this._buildSystemPrompt();
+        const result = await generateText({
+          model: aiProvider(this.model),
+          system: systemPrompt,
+          messages: messages,
+          tools: tools,
+          stopWhen: stepCountIs(maxSteps),
+          ...this.providerOptions,
+          abortSignal: options.signal,
+          onChunk: (chunk) => {
+            this.emit('chunk', chunk);
+          },
+        });
+        messages.push(...result.response.messages);
+        const full_text = cleanResponse(result.text);
+        this.emit('complete', { message: full_text, steps: result.steps?.length || 0 });
+        return {
+          success: true,
+          message: full_text,
+          steps: result.steps?.length || 0,
+        };
+      } catch (err) {
+        lastError = err;
+        const errName = err?.name || '';
+
+        // 判断是否是重试错误
+        const isRetryError =
+          RetryError.isInstance?.(err) ||
+          errName === 'AI_RetryError' ||
+          errName === 'RetryError' ||
+          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)));
+          continue;
+        }
+
+        // 最终失败，转换为友好消息
+        const friendlyMessage = this._getFriendlyError(err);
+        this.emit('error', { error: friendlyMessage });
+        return {
+          success: false,
+          message: '',
+          error: friendlyMessage,
+          steps: 0,
+        };
+      }
     }
   }
 
+  /**
+   * 获取友好错误消息
+   * @private
+   */
+  _getFriendlyError(err) {
+    const errName = err?.name || '';
+    const errorMessages = {
+      AI_RetryError: 'AI 服务暂时不可用，请稍后重试',
+      AI_APICallError: err?.isRetryable
+        ? 'AI 服务暂时不可用，请稍后重试'
+        : err.message?.split('\n')[0] || 'AI 请求失败',
+      AI_NoContentGeneratedError: 'AI 未生成有效内容，请重试',
+      AI_NoSuchModelError: '指定的 AI 模型不存在',
+      AI_NoSuchProviderError: 'AI 提供商配置错误',
+      AI_LoadAPIKeyError: 'AI API 密钥配置错误',
+    };
+    return errorMessages[errName] || err.message?.split('\n')[0] || '未知错误';
+  }
+
   /**
    * 设置角色（会清除自定义 systemPrompt）
    * @param {string} role - 角色描述

package/src/utils/chat-queue.js

@@ -70,13 +70,25 @@ class ChatQueueManager extends EventEmitter {
 
     try {
       const result = await this.executeWithRetry(item);
-      item.resolve(result);
-      this.emit('queue:completed', {
-        requestId: item.id,
-        sessionId: item.sessionId,
-        duration: Date.now() - item.timestamp,
-      });
+      // 检查 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,
+        });
+      } else {
+        item.resolve(result);
+        this.emit('queue:completed', {
+          requestId: item.id,
+          sessionId: item.sessionId,
+          duration: Date.now() - item.timestamp,
+        });
+      }
     } catch (error) {
+      console.log('[ChatQueue] Rejecting with thrown error:', error.message);
       item.reject(error);
       this.emit('queue:failed', {
         requestId: item.id,
@@ -103,8 +115,34 @@ class ChatQueueManager extends EventEmitter {
           maxRetries: this.retryAttempts,
         });
 
-        return await this.executeStream(item);
+        const result = await this.executeStream(item);
+
+        // 检查是否有错误（通过返回的 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;
+        }
+
+        return result;
       } catch (error) {
+        console.log(
+          '[ChatQueue] executeWithRetry: attempt',
+          attempt,
+          'threw error:',
+          error.message
+        );
         lastError = error;
         if (attempt < this.retryAttempts && this.isRetryableError(error)) {
           await this.sleep(this.retryDelay * Math.pow(2, attempt - 1));
@@ -113,7 +151,18 @@ class ChatQueueManager extends EventEmitter {
         break;
       }
     }
-    throw lastError;
+
+    // 将最后的错误转换为友好消息
+    const errName = lastError?.name || '';
+    const isRetryError = errName === 'AI_RetryError' || errName === 'RetryError';
+    const friendlyMessage = isRetryError
+      ? 'AI 服务暂时不可用，请稍后重试'
+      : (lastError?.message || String(lastError)).split('\n')[0];
+
+    const friendlyError = new Error(friendlyMessage);
+    friendlyError.originalError = lastError;
+    console.log('[ChatQueue] executeWithRetry: throwing friendly error:', friendlyMessage);
+    throw friendlyError;
   }
 
   /**
@@ -128,12 +177,34 @@ class ChatQueueManager extends EventEmitter {
 
     const stream = item.executeFunction(item.message, item.options);
 
-    for await (const chunk of stream) {
-      chunks.push(chunk);
+    try {
+      for await (const chunk of stream) {
+        chunks.push(chunk);
+        this.emit('stream:chunk', {
+          requestId: item.id,
+          sessionId: item.sessionId,
+          chunk,
+          accumulated: chunks.length,
+        });
+      }
+    } catch (err) {
+      // SDK 直接抛出错误（没有通过 chunk 传递）
+      // 转换为友好错误消息
+      const errName = err?.name || '';
+      const isRetryError = errName === 'AI_RetryError' || errName === 'RetryError';
+      const friendlyMessage = isRetryError
+        ? 'AI 服务暂时不可用，请稍后重试'
+        : (err.message || err.toString()).split('\n')[0];
+
+      console.log(
+        '[ChatQueue] executeStream caught error, converting to friendly:',
+        friendlyMessage
+      );
+      chunks.push({ type: 'error', error: friendlyMessage });
       this.emit('stream:chunk', {
         requestId: item.id,
         sessionId: item.sessionId,
-        chunk,
+        chunk: chunks[chunks.length - 1],
         accumulated: chunks.length,
       });
     }
@@ -141,9 +212,19 @@ class ChatQueueManager extends EventEmitter {
     // 检查是否有错误 chunk
     const errorChunk = chunks.find((c) => c.type === 'error');
     if (errorChunk) {
+      // 不再抛出错误，而是返回包含错误的 result
+      // 让调用者通过 result 判断是否有错误
       const error = new Error(errorChunk.error || 'Stream error');
       error.chunks = chunks;
-      throw error;
+      error.isStreamError = true;
+      console.log('[ChatQueue] executeStream returning result with error:', error.message);
+      return {
+        chunks,
+        content: cleanResponse(''),
+        sessionId: item.sessionId,
+        requestId: item.id,
+        error,
+      };
     }
 
     const fullText = chunks

package/system.md

@@ -5,6 +5,85 @@
 【元数据】
 - WORK_DIR: D:\code\vb-agent
 
+## 【Ambient Agent 监控任务指南】
+
+当用户请求创建条件监控任务（如"价格高于X时通知我"、"收到某邮件时自动回复"）时，使用以下模式：
+
+### 标准条件监控配置
+
+```javascript
+{
+  "title": "监控任务标题",
+  "description": "监控条件描述（包含阈值等信息）",
+  "conditions": { "events": ["scheduler:reminder"] },
+  "persistent": true,
+  "actions": [
+    {
+      "id": "get_data",
+      "type": "tool",
+      "plugin": "gate-trading",  // 或 email, web 等
+      "name": "gate_get_market_info",
+      "args": { "currency_pair": "BTC_USDT", "info_type": "tickers" }
+    },
+    {
+      "id": "judge",
+      "type": "message",
+      "content": "你是一个条件判断助手。\n\n上一步获取到了数据：${result.last}\n\n判断规则：\n- 如果数据满足条件，调用 notification_send 发送通知\n- 如果不满足条件，静默结束（不要发送任何通知）\n\n你的任务是分析数据，判断是否需要通知用户。"
+    }
+  ]
+}
+```
+
+### 关键要点
+
+1. **actions 必须包含两个步骤**：
+   - 第一步：用 `type: "tool"` 获取数据
+   - 第二步：用 `type: "message"` 让 LLM 判断是否发送通知
+
+2. **message content 中的判断提示词**：
+   - 明确告诉 LLM 阈值是多少
+   - 说明满足条件时应该做什么
+   - 说明不满足条件时应该静默
+
+3. **使用 ${result.xxx} 引用上一步结果**：
+   - `${result.last}` - 获取价格数据
+   - `${result.from}` - 获取发件人
+   - `${result.subject}` - 获取邮件主题
+
+### 示例：比特币价格监控
+
+```javascript
+{
+  "title": "比特币价格监控 (BTC > $73000)",
+  "description": "每2分钟检查BTC价格，高于73000美元时通知",
+  "conditions": { "events": ["scheduler:reminder"] },
+  "persistent": true,
+  "actions": [
+    {
+      "type": "tool",
+      "plugin": "gate-trading",
+      "name": "gate_get_market_info",
+      "args": { "currency_pair": "BTC_USDT", "info_type": "tickers" }
+    },
+    {
+      "type": "message",
+      "content": "你是条件判断助手。\n\n上一步获取到 BTC 价格数据：${result.last} USDT\n\n监控条件：价格 > 73000 USDT\n\n判断规则：\n- 如果 ${result.last} > 73000，调用 notification_send 发送通知\n- 通知内容：当前 BTC 价格 ${result.last} USDT，已超过 $73000 阈值\n- 如果价格 <= 73000，静默结束，不要发送任何通知"
+    }
+  ]
+}
+```
+
+### 常见监控场景配置
+
+| 场景 | 工具 | 判断逻辑 |
+|------|------|----------|
+| 价格监控 | gate_get_market_info | 价格 > 阈值 |
+| 邮件监控 | email_read | 主题/发件人匹配 |
+| 余额监控 | gate_get_account_balance | 余额变化 |
+| 网页监控 | web_request | 内容包含某字符串 |
+
+---
+
 ## 【记忆上下文】
 ### 【用户偏好】
 - 用户海报风格偏好: ## 用户海报设计风格偏好