foliko 1.1.1 → 1.1.2

package/.claude/settings.local.json

@@ -185,7 +185,12 @@
       "Bash(node -e \"\nrequire\\('dotenv'\\).config\\(\\);\nconsole.log\\('FOLIKO_BASE_URL:', process.env.FOLIKO_BASE_URL\\);\nconsole.log\\('FOLIKO_PROVIDER:', process.env.FOLIKO_PROVIDER\\);\nconsole.log\\('FOLIKO_MODEL:', process.env.FOLIKO_MODEL\\);\n\")",
       "Bash(node -e \"\nrequire\\('dotenv'\\).config\\(\\);\nconsole.log\\('FOLIKO_BASE_URL:', process.env.FOLIKO_BASE_URL\\);\nconsole.log\\('FOLIKO_MODEL:', process.env.FOLIKO_MODEL\\);\n\")",
       "Bash(node -e \"\nconst fs = require\\('fs'\\);\nconst data = JSON.parse\\(fs.readFileSync\\('D:/code/vb-agent/.agent/sessions/cli_default.json', 'utf8'\\)\\);\nconsole.log\\('Messages:', data.messages?.length || 0\\);\nconsole.log\\('File size:', fs.statSync\\('D:/code/vb-agent/.agent/sessions/cli_default.json'\\).size, 'bytes'\\);\n\")",
-      "Bash(node D:/code/vb-agent/calc_tokens_weixin.js)"
+      "Bash(node D:/code/vb-agent/calc_tokens_weixin.js)",
+      "Bash(node -e \"const {WeixinBot} = require\\('@chnak/weixin-bot'\\); console.log\\(Object.keys\\(WeixinBot.prototype || {}\\)\\)\" 2>/dev/null || echo \"Cannot access prototype\")",
+      "Bash(find D:/code/vb-agent -name \"*poster*\" -type f 2>/dev/null | head -20)",
+      "Bash(cd \"D:/code/vb-agent/.agent/plugins/poster-plugin\" && node test-components.js 2>&1)",
+      "Bash(cd \"D:/code/vb-agent/.agent/plugins/poster-plugin\" && node test-image.js 2>&1)",
+      "Bash(cd \"D:/code/vb-agent/.agent/plugins/poster-plugin\" && node save-test.js 2>&1)"
     ]
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foliko",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "简约的插件化 Agent 框架",
   "main": "src/index.js",
   "type": "commonjs",
@@ -59,6 +59,7 @@
     "@larksuiteoapi/node-sdk": "^1.59.0",
     "@modelcontextprotocol/sdk": "^1.27.1",
     "ai": "^6.0.146",
+    "dayjs": "^1.11.20",
     "dotenv": "^17.3.1",
     "gate-api": "^7.2.57",
     "hono": "^4.12.9",

package/plugins/extension-executor-plugin.js

@@ -178,48 +178,49 @@ class ExtensionExecutorPlugin extends Plugin {
         args: z.record(z.any()).optional().describe('工具参数'),
       }),
       execute: async (args) => {
-        const { plugin, tool, args: toolArgs = {} } = args;
-        log.info(` ext_call: plugin=${plugin}, tool=${tool}`);
+        try {
+          const { plugin, tool, args: toolArgs = {} } = args;
+          log.info(` ext_call: plugin=${plugin}, tool=${tool}`);
 
-        const ext = this._extensions.get(plugin);
-        if (!ext) {
-          return { success: false, error: `扩展插件 '${plugin}' 不存在` };
-        }
+          const ext = this._extensions.get(plugin);
+          if (!ext) {
+            return { success: false, error: `扩展插件 '${plugin}' 不存在` };
+          }
 
-        const toolDef = ext.tools.find((t) => t.name === tool);
-        if (!toolDef) {
-          const availableTools = ext.tools.map((t) => t.name).join(', ');
-          return {
-            success: false,
-            error: `扩展工具 '${tool}' 不存在。可用工具: ${availableTools || '无'}`
-          };
-        }
+          const toolDef = ext.tools.find((t) => t.name === tool);
+          if (!toolDef) {
+            const availableTools = ext.tools.map((t) => t.name).join(', ');
+            return {
+              success: false,
+              error: `扩展工具 '${tool}' 不存在。可用工具: ${availableTools || '无'}`
+            };
+          }
 
-        // 验证参数
-        if (toolDef.inputSchema) {
-          try {
-            const schema = toolDef.inputSchema instanceof z.ZodType
-              ? toolDef.inputSchema
-              : this._buildZodSchema(toolDef.inputSchema);
-            schema.parse(toolArgs);
-          } catch (err) {
-            if (err instanceof z.ZodError) {
-              const fieldErrors = err.errors.map((e) => `${e.path.join('.')}: ${e.message}`).join('; ');
+          // 验证参数
+          if (toolDef.inputSchema) {
+            try {
+              const schema = toolDef.inputSchema instanceof z.ZodType
+                ? toolDef.inputSchema
+                : this._buildZodSchema(toolDef.inputSchema);
+              schema.parse(toolArgs);
+            } catch (err) {
+              if (err instanceof z.ZodError) {
+                const fieldErrors = err.errors.map((e) => `${e.path.join('.')}: ${e.message}`).join('; ');
+                return {
+                  success: false,
+                  error: `参数错误: ${fieldErrors}`,
+                  inputSchema: toolDef.inputSchema,
+                };
+              }
               return {
                 success: false,
-                error: `参数错误: ${fieldErrors}`,
+                error: `参数验证失败: ${err.message}`,
                 inputSchema: toolDef.inputSchema,
               };
             }
-            return {
-              success: false,
-              error: `参数验证失败: ${err.message}`,
-              inputSchema: toolDef.inputSchema,
-            };
           }
-        }
 
-        try {
+        
           // 触发扩展工具开始事件
           framework.emit('tool:call', {
             name: `${plugin}:${tool}`,

package/plugins/file-system-plugin.js

@@ -827,10 +827,9 @@ class FileSystemPlugin extends Plugin {
         timeout: z.number().optional().describe('超时时间(ms)，默认 30000'),
         proxy: z.boolean().optional().describe('是否使用代理，默认 false。访问失败时可自动设为 true 重试'),
         toMarkdown: z.boolean().default(true).describe('是否将 HTML 响应转换为 Markdown 格式，默认 true'),
-        maxLength: z.number().default(50000).describe('最大返回长度（字符数），超过则截断，默认 50000')
       }),
       execute: async (args, framework) => {
-        const { url, method = 'GET', headers = {}, body, timeout = 30000, proxy = false, toMarkdown = true, maxLength = 50000 } = args
+        const { url, method = 'GET', headers = {}, body, timeout = 30000, proxy = false, toMarkdown = true } = args
         try {
           const controller = new AbortController()
           const timeoutId = setTimeout(() => controller.abort(), timeout)
@@ -859,27 +858,18 @@ class FileSystemPlugin extends Plugin {
             const isHtml = /<[a-z][\s\S]*>/i.test(data) || data.trim().startsWith('<')
             if (isHtml) {
               try {
-                
                 const markdown = NodeHtmlMarkdown.translate(data)
-                // 限制返回长度
-                const truncatedMarkdown = maxLength && markdown.length > maxLength 
-                  ? markdown.substring(0, maxLength) + '\n\n...(truncated)' 
-                  : markdown
                 return {
                   success: true,
                   status: response.status,
                   statusText: response.statusText,
                   headers: Object.fromEntries(response.headers.entries()),
                   usedProxy: proxy,
-                  markdown: truncatedMarkdown,
+                  markdown: markdown,
                   originalLength: markdown.length,
-                  truncated: maxLength && markdown.length > maxLength
                 }
               } catch (e) {
                 // 转换失败时返回原始 body
-                const truncatedBody = maxLength && data.length > maxLength
-                  ? data.substring(0, maxLength) + '\n\n...(truncated)'
-                  : data
                 return {
                   success: true,
                   status: response.status,
@@ -887,9 +877,8 @@ class FileSystemPlugin extends Plugin {
                   headers: Object.fromEntries(response.headers.entries()),
                   usedProxy: proxy,
                   markdown: null,
-                  body: truncatedBody,
+                  body: data,
                   originalLength: data.length,
-                  truncated: maxLength && data.length > maxLength,
                   markdownError: e.message
                 }
               }
@@ -897,18 +886,14 @@ class FileSystemPlugin extends Plugin {
           }
 
           // toMarkdown 为 false 或非 HTML 内容时，返回原始内容
-          const truncatedData = maxLength && typeof data === 'string' && data.length > maxLength
-            ? data.substring(0, maxLength) + '\n\n...(truncated)'
-            : data
           return {
             success: true,
             status: response.status,
             statusText: response.statusText,
             headers: Object.fromEntries(response.headers.entries()),
             usedProxy: proxy,
-            body: truncatedData,
+            body: data,
             originalLength: typeof data === 'string' ? data.length : null,
-            truncated: maxLength && typeof data === 'string' && data.length > maxLength
           }
         } catch (error) {
           return {

package/plugins/subagent-plugin.js

@@ -9,6 +9,7 @@ const { Plugin } = require('../src/core/plugin-base')
 const { logger } = require('../src/utils/logger')
 const log = logger.child('SubAgent')
 const { z } = require('zod')
+const { cleanResponse } = require('../src/utils')
 const { Agent } = require('../src/core/agent')
 
 class SubAgentPlugin extends Plugin {
@@ -460,17 +461,28 @@ class SubAgentManagerPlugin extends Plugin {
         if (!plugin) {
           return { success: false, error: `SubAgent ${args.agentName} not found` }
         }
-
         try {
           const result = await plugin.chat(args.task)
-          return {
-            success: true,
-            agent: args.agentName,
-            result: result.message || result,
-            success: result.success !== false
+          // 提取返回内容
+          let output = result.message || result
+          // 处理 { type: "text", value: "..." } 格式
+          if (output && output.type === 'text' && output.value) {
+            output = output.value
           }
+          // 清理 thinking 标签
+          if (typeof output === 'string') {
+            output = cleanResponse(output)
+          }
+          if (result.success !== false) {
+            // 确保返回的是字符串
+            if (typeof output === 'string') {
+              return output
+            }
+            return JSON.stringify(output, null, 2)
+          }
+          return { error: typeof output === 'string' ? output : JSON.stringify(output) }
         } catch (err) {
-          return { success: false, error: err.message }
+          return { error: err.message }
         }
       }
     })
@@ -523,17 +535,28 @@ class SubAgentManagerPlugin extends Plugin {
         if (!plugin) {
           return { success: false, error: `SubAgent ${args.agentName} not found` }
         }
-
         try {
           const result = await plugin.chat(args.task)
-          return {
-            success: true,
-            agent: args.agentName,
-            result: result.message || result,
-            success: result.success !== false
+          // 提取返回内容
+          let output = result.message || result
+          // 处理 { type: "text", value: "..." } 格式
+          if (output && output.type === 'text' && output.value) {
+            output = output.value
           }
+          // 清理 thinking 标签
+          if (typeof output === 'string') {
+            output = cleanResponse(output)
+          }
+          if (result.success !== false) {
+            // 确保返回的是字符串
+            if (typeof output === 'string') {
+              return output
+            }
+            return JSON.stringify(output, null, 2)
+          }
+          return { error: typeof output === 'string' ? output : JSON.stringify(output) }
         } catch (err) {
-          return { success: false, error: err.message }
+          return { error: err.message }
         }
       }
     })

package/plugins/weixin-plugin.js

@@ -10,12 +10,14 @@ const { CLEAR_LINE, CYAN, DIM, GREEN, RED, YELLOW, colored } = require('../cli/s
 const { Plugin } = require('../src/core/plugin-base')
 const { logger } = require('../src/utils/logger')
 const log = logger.child('WeChat')
-const {cleanResponse} =require('../src/utils')
+const { cleanResponse } = require('../src/utils')
+const { renderLine } = require('../cli/src/utils/markdown');
 const removeMarkdown = require('remove-markdown');
 const { z } = require('zod')
 const { WeixinBot } = require('@chnak/weixin-bot')
 const fs = require('fs')
 const path = require('path')
+const dayjs = require('dayjs')
 
 class WeixinPlugin extends Plugin {
   constructor(config = {}) {
@@ -26,7 +28,7 @@ class WeixinPlugin extends Plugin {
     this.priority = 80
     // 默认不启用，需要在 plugins.json 中设置 enabled: true
     this.enabled = false
-    this.path=`.agent/data`
+    this.path = path.resolve(process.cwd(), '.agent/data')
     this.systemPrompt=`你是一个微信助手。
 
 **重要:** 子Agent 匹配规则必须遵守：
@@ -56,6 +58,80 @@ class WeixinPlugin extends Plugin {
     this._initialized = false
   }
 
+  /**
+   * 保存媒体文件到本地
+   * @param {Object} msg - 消息对象，包含 raw.item_list
+   * @param {string} type - 媒体类型: image/video/file/voice
+   * @returns {Promise<string|null>} 保存后的文件路径，失败返回 null
+   */
+  async _saveMediaFile(msg, type) {
+    try {
+      const itemList = msg.raw?.item_list;
+      if (!itemList || !itemList[0]) {
+        return null;
+      }
+
+      const item = itemList[0];
+      const baseDir = path.join(this.path, 'weixin-media', dayjs().format('YYYY-MM-DD'));
+
+      // 确保目录存在
+      if (!fs.existsSync(baseDir)) {
+        fs.mkdirSync(baseDir, { recursive: true });
+      }
+
+      const fileTimestamp = Date.now();
+      let fileName = '';
+      let downloadUrl = '';
+
+      switch (type) {
+        case 'image': {
+          fileName = `img_${fileTimestamp}.jpg`;
+          downloadUrl = item.image_item?.media?.full_url;
+          break;
+        }
+        case 'video': {
+          fileName = `video_${fileTimestamp}.mp4`;
+          downloadUrl = item.video_item?.media?.full_url || item.video_item?.aeskey;
+          break;
+        }
+        case 'file': {
+          fileName = item.file_item?.file_name || `file_${fileTimestamp}`;
+          downloadUrl = item.file_item?.media?.full_url;
+          break;
+        }
+        case 'voice': {
+          fileName = `voice_${fileTimestamp}.silk`;
+          downloadUrl = item.voice_item?.media?.full_url;
+          break;
+        }
+        default:
+          return null;
+      }
+
+      if (!downloadUrl) {
+        log.warn(`No download URL for ${type}`);
+        return null;
+      }
+
+      const filePath = path.join(baseDir, fileName);
+
+      // 使用 fetch 下载文件
+      const response = await fetch(downloadUrl);
+      if (!response.ok) {
+        throw new Error(`Download failed: ${response.status}`);
+      }
+
+      const buffer = Buffer.from(await response.arrayBuffer());
+      fs.writeFileSync(filePath, buffer);
+
+      log.info(`Media saved: ${filePath}`);
+      return filePath;
+    } catch (err) {
+      log.error(`Failed to save ${type}:`, err.message);
+      return null;
+    }
+  }
+
   install(framework) {
     this._framework = framework
     // 注册微信发送工具
@@ -311,6 +387,7 @@ class WeixinPlugin extends Plugin {
     // log.info('', this.config.forceLogin ? '强制重新扫码登录...' : '正在登录（已有凭证则自动跳过扫码）...')
 
     const creds = await this._bot.login(loginOptions)
+    console.log(creds)
     // log.info(' 登录成功 — Bot ID:', creds.accountId)
     // log.info(' 关联用户:', creds.userId)
     // log.info(' API 地址:', creds.baseUrl)
@@ -419,25 +496,34 @@ class WeixinPlugin extends Plugin {
         }
         break
 
-      case 'image':
-        // log.info(` 收到图片消息`)
-        await this._processMediaChat(userId, '[用户发送了图片]', msg)
-        break
+      case 'image': {
+        const imgPath = await this._saveMediaFile(msg, 'image');
+        const imgText = imgPath ? `[用户发送了图片，保存于: ${imgPath}]` : '[用户发送了图片]';
+        await this._processMediaChat(userId, imgText, msg);
+        break;
+      }
 
-      case 'file':
-        // log.info(` 收到文件消息: ${msg.fileName || 'unknown'}`)
-        await this._processMediaChat(userId, `[用户发送了文件: ${msg.fileName || 'unknown'}]`, msg)
-        break
+      case 'file': {
+        const filePath = await this._saveMediaFile(msg, 'file');
+        const fileName = msg.raw?.item_list?.[0]?.file_item?.file_name || 'unknown';
+        const fileText = filePath ? `[用户发送了文件: ${fileName}，保存于: ${filePath}]` : `[用户发送了文件: ${fileName}]`;
+        await this._processMediaChat(userId, fileText, msg);
+        break;
+      }
 
-      case 'video':
-        // log.info(` 收到视频消息`)
-        await this._processMediaChat(userId, '[用户发送了视频]', msg)
-        break
+      case 'video': {
+        const videoPath = await this._saveMediaFile(msg, 'video');
+        const videoText = videoPath ? `[用户发送了视频，保存于: ${videoPath}]` : '[用户发送了视频]';
+        await this._processMediaChat(userId, videoText, msg);
+        break;
+      }
 
-      case 'voice':
-        // log.info(` 收到语音消息`)
-        await this._processMediaChat(userId, '[用户发送了语音消息]', msg)
-        break
+      case 'voice': {
+        const voicePath = await this._saveMediaFile(msg, 'voice');
+        const voiceText = voicePath ? `[用户发送了语音消息，保存于: ${voicePath}]` : '[用户发送了语音消息]';
+        await this._processMediaChat(userId, voiceText, msg);
+        break;
+      }
 
       default:
         // log.info(` 不支持的消息类型: ${msg.type}`)
@@ -447,6 +533,58 @@ class WeixinPlugin extends Plugin {
     }
   }
 
+  /**
+   * 流式处理聊天，返回完整响应
+   * @param {Object} agent - Agent 实例
+   * @param {string} text - 用户消息
+   * @param {string} sessionId - 会话 ID
+   * @returns {Promise<string>} 完整响应文本
+   */
+  async _streamChat(agent, text, sessionId) {
+    const runWithContext = agent.framework?.runWithContext.bind(agent.framework);
+    let fullResponse = '';
+    let lineBuffer = '';
+    const renderState = { inThink: false, inCodeBlock: false };
+
+    const processChunk = (chunk) => {
+      if (chunk.type === 'text') {
+        fullResponse += chunk.text;
+        lineBuffer += chunk.text;
+
+        while (lineBuffer.includes('\n')) {
+          const nlIndex = lineBuffer.indexOf('\n');
+          const line = lineBuffer.substring(0, nlIndex);
+          lineBuffer = lineBuffer.substring(nlIndex + 1);
+          if (line.trim()) {
+            log.info(renderLine(line, renderState));
+          }
+        }
+      } else if (chunk.type === 'tool-call') {
+        log.info(`[工具调用] ${chunk.toolName}`);
+      } else if (chunk.type === 'error') {
+        log.warn(' Chat stream error:', chunk.error);
+      }
+    };
+
+    if (runWithContext) {
+      await runWithContext({ sessionId }, async () => {
+        for await (const chunk of agent.chatStream(text, { sessionId })) {
+          processChunk(chunk);
+        }
+      });
+    } else {
+      for await (const chunk of agent.chatStream(text, { sessionId })) {
+        processChunk(chunk);
+      }
+    }
+
+    if (lineBuffer.trim()) {
+      log.info(renderLine(lineBuffer, renderState));
+    }
+
+    return cleanResponse(fullResponse);
+  }
+
   /**
    * 处理媒体消息（图片/文件/视频/语音）
    */
@@ -456,7 +594,7 @@ class WeixinPlugin extends Plugin {
       log.error(' No session agent available')
       return
     }
-
+    const full_text=`${text} 不需要发送文件给用户，告知路径即可`
     const { agent, sessionId } = sessionInfo
 
     // 发送正在输入状态
@@ -467,19 +605,7 @@ class WeixinPlugin extends Plugin {
     await new Promise((resolve) => setTimeout(resolve, 1000))
 
     try {
-      // 使用 chatStream 保持和 CLI 一致的行为
-      let fullResponse = '';
-      for await (const chunk of agent.chatStream(text, { sessionId })) {
-        if (chunk.type === 'text') {
-          fullResponse += chunk.text;
-        } else if (chunk.type === 'tool-call') {
-          log.info(`[工具调用] ${chunk.toolName}`);
-        } else if (chunk.type === 'error') {
-          log.warn(' Chat stream error:', chunk.error);
-        }
-      }
-      const response = cleanResponse(fullResponse);
-
+      const response = await this._streamChat(agent, full_text, sessionId);
       if (response) {
         await this._sendMessageBatch(originalMsg, userId, response, true)
       }
@@ -514,19 +640,7 @@ class WeixinPlugin extends Plugin {
     await new Promise((resolve) => setTimeout(resolve, 1000))
 
     try {
-      // 使用 chatStream 保持和 CLI 一致的行为
-      let fullResponse = '';
-      for await (const chunk of agent.chatStream(text, { sessionId })) {
-        if (chunk.type === 'text') {
-          fullResponse += chunk.text;
-        } else if (chunk.type === 'tool-call') {
-          // 发送工具调用提示
-          log.info(`[工具调用] ${chunk.toolName}`);
-        } else if (chunk.type === 'error') {
-          log.warn(' Chat stream error:', chunk.error);
-        }
-      }
-      const response = cleanResponse(fullResponse);
+      const response = await this._streamChat(agent, text, sessionId);
 
       // 发送回复（超过500字自动分批）
       if (response) {
@@ -560,8 +674,14 @@ class WeixinPlugin extends Plugin {
    */
   async _sendMessageBatch(originalMsg, userId, text, useReply = true) {
     const MAX_LEN = 500
-    text=removeMarkdown(text)
-    if (!text || text.length <= MAX_LEN) {
+    text = removeMarkdown(text)
+
+    // 检查是否为空
+    if (!text || text.trim().length === 0) {
+      text = '[消息内容为空]'
+    }
+
+    if (text.length <= MAX_LEN) {
       if (useReply && originalMsg) {
         await this._bot.reply(originalMsg, text)
       } else {