foliko 1.1.13 → 1.1.14

package/cli/src/commands/chat.js

@@ -112,8 +112,6 @@ async function runContinuousTest(agent, options) {
   console.log(`命令数量: ${commands.length}`);
   console.log('');
 
-  const runWithContext = agent.framework?.runWithContext.bind(agent.framework);
-
   for (let i = 0; i < commands.length; i++) {
     const cmd = commands[i];
     console.log(`\n[${i + 1}/${commands.length}] >>> ${cmd}`);
@@ -121,26 +119,22 @@ async function runContinuousTest(agent, options) {
 
     try {
       let fullResponse = '';
-      await runWithContext({ sessionId }, async () => {
-        for await (const chunk of agent.chatStream(cmd, { sessionId })) {
-          if (chunk.type === 'text') {
-            fullResponse += chunk.text;
-            process.stdout.write(chunk.text);
-          } 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}`);
-          }
+      for await (const chunk of agent.chatStream(cmd, { sessionId })) {
+        if (chunk.type === 'text') {
+          fullResponse += chunk.text;
+          process.stdout.write(chunk.text);
+        } 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.log('\n' + '-'.repeat(50));
       console.log(`[完成] 回复长度: ${fullResponse.length}`);
     } catch (err) {
       console.error(`\n[执行错误] ${err.message}`);
-      // 继续执行下一条命令
     }
 
-    // 命令间隔 1 秒
     await new Promise((r) => setTimeout(r, 1000));
   }
 

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

@@ -125,10 +125,8 @@ class ChatUI {
    * 发送消息并显示响应
    */
   async sendMessage(message) {
-    // 用于打断的标志
     let interrupted = false;
 
-    // 设置打断处理
     const interruptHandler = () => {
       if (!interrupted) {
         interrupted = true;
@@ -136,78 +134,59 @@ class ChatUI {
       }
     };
 
-    // 监听 Ctrl+C
     process.on('SIGINT', interruptHandler);
 
-    let fullResponse = '';
-    let sessionScope = null;
-
     try {
       const renderState = { inThink: false, inCodeBlock: false };
-      const runWithContext = this.agent.framework?.runWithContext.bind(this.agent.framework);
       const { sessionId } = this;
 
-      // 创建当前 session 的事件作用域，自动过滤其他 session 的事件
-      sessionScope = this.agent.createSessionScope(sessionId);
-
       if (this.stream) {
-        // 流式模式
+        // 流式模式 - 使用事件方式
         console.log(colored('● ', GREEN));
 
         let lineBuffer = '';
-        await runWithContext({ sessionId }, async () => {
-          // 使用 sessionScope 监听事件，自动只接收当前 session 的事件
-          if (sessionScope) {
-            sessionScope.on('stream:chunk', (data) => {
-              const { chunk } = data;
-              if (interrupted) return;
-
-              if (chunk.type === 'text') {
-                lineBuffer += chunk.text;
-
-                while (lineBuffer.includes('\n')) {
-                  if (interrupted) break;
-
-                  const nlIndex = lineBuffer.indexOf('\n');
-                  const line = lineBuffer.substring(0, nlIndex);
-                  lineBuffer = lineBuffer.substring(nlIndex + 1);
-                  if (line.trim()) {
-                    console.log(renderLine(line, renderState));
-                  }
-                }
-              } else if (chunk.type === 'tool-call') {
-                console.log(
-                  `\n${colored('[工具调用]', YELLOW)} ${chunk.toolName}`,
-                  `args=`,
-                  JSON.stringify(chunk.input)
-                );
-              } else if (chunk.type === 'error') {
-                console.error(`\n${colored('[错误]', RED)} ${chunk.error}`);
-              }
-            });
-
-            sessionScope.on('message:complete', ({ sessionId, content }) => {
-              const message = '继续下一步';
-              if (!content) {
-                console.log(colored(`● ${message}...`, DIM));
-                this.agent.sendMessage(message, {
-                  sessionId: sessionId,
-                  priority: 1,
-                });
+        let hasToolCall = false;
+
+        // 创建 session scope 过滤事件
+        const sessionScope = this.agent.createSessionScope(sessionId);
+
+        // 监听流式数据
+        sessionScope.on('stream:chunk', ({ chunk }) => {
+          if (interrupted) return;
+
+          if (chunk.type === 'text') {
+            lineBuffer += chunk.text;
+
+            while (lineBuffer.includes('\n')) {
+              if (interrupted) break;
+
+              const nlIndex = lineBuffer.indexOf('\n');
+              const line = lineBuffer.substring(0, nlIndex);
+              lineBuffer = lineBuffer.substring(nlIndex + 1);
+              if (line.trim()) {
+                console.log(renderLine(line, renderState));
               }
-            });
+            }
+          } else if (chunk.type === 'tool-call') {
+            if (!hasToolCall) {
+              hasToolCall = true;
+              console.log();
+            }
+            console.log(
+              `${colored('[工具调用]', YELLOW)} ${chunk.toolName}`,
+              `args=`,
+              JSON.stringify(chunk.input)
+            );
+          } else if (chunk.type === 'error') {
+            console.error(`\n${colored('[错误]', RED)} ${chunk.error}`);
           }
-
-          const result = await this.agent.sendMessage(message, {
-            sessionId: sessionId,
-            priority: 1,
-          });
         });
 
-        // 清除 session scope 的监听器
-        if (sessionScope) {
-          sessionScope.removeAllListeners();
-        }
+        // 调用 sendMessage 触发事件
+        await this.agent.sendMessage(message, { sessionId });
+
+        // 清理
+        sessionScope.removeAllListeners();
 
         if (lineBuffer.trim() && !interrupted) {
           console.log(renderLine(lineBuffer, renderState));
@@ -216,16 +195,11 @@ class ChatUI {
         // 非流式模式
         console.log(colored('○ ', CYAN) + '处理中...\n');
 
-        const result = await runWithContext({ sessionId }, async () => {
-          return await this.agent.chat(message, { sessionId });
-        });
+        const result = await this.agent.chat(message, { sessionId });
 
         if (interrupted) return;
 
-        fullResponse = result.message;
-
-        // 一次性渲染完整响应
-        const lines = fullResponse.split('\n');
+        const lines = result.message.split('\n');
         for (const line of lines) {
           if (line.trim()) {
             console.log(renderLine(line, renderState));
@@ -240,10 +214,6 @@ class ChatUI {
         console.error(`\n${colored('[错误]', RED)} ${err.message}\n`);
       }
     } finally {
-      // 确保清理 session scope 的监听器
-      if (sessionScope) {
-        sessionScope.removeAllListeners();
-      }
       process.removeListener('SIGINT', interruptHandler);
     }
   }

package/package.json

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

package/plugins/default-plugins.js

@@ -279,13 +279,13 @@ async function bootstrapDefaults(framework, config = {}) {
 
   framework._debug&&bootstrapLog.debug(' Loading default plugins...')
   // AI 插件（如果已禁用则跳过）
-  if (!shouldLoad('ai') || !(aiConfig.provider || aiConfig.model || aiConfig.apiKey)) {
+  // 根据 provider 获取对应的 API key
+  const upperProvider = (aiConfig.provider || 'deepseek').toUpperCase().replace(/-/g, '_')
+  const envApiKey = process.env[`${upperProvider}_API_KEY`] || process.env.FOLIKO_API_KEY
+  if (!shouldLoad('ai') || !(aiConfig.provider || aiConfig.model || aiConfig.apiKey || envApiKey)) {
     // 跳过或已禁用
   } else {
     const AIPlugin = require('./ai-plugin')
-    // 根据 provider 获取对应的 API key
-    const upperProvider = (aiConfig.provider || 'deepseek').toUpperCase().replace(/-/g, '_')
-    const envApiKey = process.env[`${upperProvider}_API_KEY`] || process.env.FOLIKO_API_KEY
     const aiPlugin = new AIPlugin({
       provider: aiConfig.provider || 'deepseek',
       model: aiConfig.model || 'deepseek-chat',
@@ -309,7 +309,7 @@ async function bootstrapDefaults(framework, config = {}) {
       systemPrompt: '你是一个智能助手。当用户提出问题或任务时，你会主动分析需求，选择合适的工具来获取信息或执行操作。你善于将复杂任务拆解为多个步骤，通过工具协作完成。',
       model: aiConfig.model || 'deepseek-chat',
       provider: aiConfig.provider || 'deepseek',
-      apiKey: aiConfig.apiKey,
+      apiKey: aiPlugin ? aiPlugin.config.apiKey : (aiConfig.apiKey || envApiKey),
       baseURL: aiConfig.baseURL
     })
     framework._agents.push(framework._mainAgent)

package/plugins/file-system-plugin.js

@@ -13,7 +13,7 @@ class FileSystemPlugin extends Plugin {
     this.name = 'file-system'
     this.version = '1.0.0'
     this.description = '文件系统工具插件'
-    this.priority = 5
+    this.priority = 12
     this.system = true 
   }
 

package/plugins/memory-plugin.js

@@ -977,18 +977,18 @@ class MemoryPlugin extends Plugin {
       }
 
       // 批量处理错误
-      if (this._pendingErrors.length > 0) {
-        const errors = this._pendingErrors.splice(0, 10) // 每次最多处理 10 条
-        log.debug(`Processing ${errors.length} pending errors`)
-
-        for (const errorData of errors) {
-          try {
-            await this._extractErrorLesson(errorData)
-          } catch (err) {
-            log.warn('Failed to extract error lesson:', err.message)
-          }
-        }
-      }
+      // if (this._pendingErrors.length > 0) {
+      //   const errors = this._pendingErrors.splice(0, 10) // 每次最多处理 10 条
+      //   log.debug(`Processing ${errors.length} pending errors`)
+
+      //   for (const errorData of errors) {
+      //     try {
+      //       await this._extractErrorLesson(errorData)
+      //     } catch (err) {
+      //       log.warn('Failed to extract error lesson:', err.message)
+      //     }
+      //   }
+      // }
     } finally {
       this._isExtracting = false
     }

package/plugins/plugin-manager-plugin.js

@@ -79,6 +79,7 @@ class PluginManagerPlugin extends Plugin {
     this.description = '管理远程插件：列表、发布、安装';
     this._repo = config.repo || process.env.FOLIKO_PLUGIN_REPO || DEFAULT_REPO;
     this.system = true;
+    this.tools = {}; // ext_call 需要通过 this.tools 访问工具
   }
 
   install(framework) {

package/plugins/subagent-plugin.js

@@ -110,7 +110,7 @@ class SubAgentPlugin extends Plugin {
       tools:{},  // 自定义工具
       parentTools: all_tools
     })
-    
+
 
     // 注册从父Agent继承的工具
     // for (const tool of parentTools) {
@@ -662,6 +662,60 @@ class SubAgentManagerPlugin extends Plugin {
     return config
   }
 
+
+  /**
+   * 构建子Agent描述
+   * 使用数组收集 + join 模式优化字符串拼接
+   * 动态从配置文件读取每个子Agent的专业领域
+   */
+  _buildDescription() {
+    const allSubAgents = this.getAllSubAgents();
+    if (!allSubAgents || allSubAgents.length === 0) {
+      return '';
+    }
+
+    // 使用数组收集 + join 模式优化字符串拼接
+    const lines = ['## 子 Agent 匹配表', ''];
+    lines.push('');
+    lines.push('> **提示**：根据任务类型选择最匹配的子 Agent 处理');
+    lines.push('');
+
+    // 动态从配置文件读取每个子Agent的核心能力
+    for (const plugin of allSubAgents) {
+      const name = plugin.name;
+      const role = plugin.role;
+      const goal = plugin.description || '';
+
+      // 优先使用 SubAgentConfigManager 获取详细信息
+      const config = this._framework._subAgentConfigManager?.get(name);
+      if (config) {
+        const agentDesc = config.getDescription();
+        const skills = config.getSkills();
+        let info = agentDesc || role || goal || '子代理';
+        if (skills && skills.length > 0) {
+          info += ` (技能: ${skills.join(', ')})`;
+        }
+        lines.push(`- **${name}**：${info}`);
+      } else {
+        // 回退到旧逻辑
+        lines.push(`- **${name}**：${role || goal || '子代理'}`);
+      }
+    }
+
+    // 通用规则
+    lines.push('');
+    lines.push('### 子 Agent 调用规则');
+    lines.push('');
+    lines.push('> **重要**：必须严格遵守以下规则');
+    lines.push('');
+    lines.push('1. 根据上述「子 Agent 匹配表」，将任务委托给最匹配的子 Agent 处理');
+    lines.push('2. 使用 `subagent_call` 工具并指定 `agentName` 来委托任务');
+    lines.push('3. 只有当没有匹配的子 Agent 时，才直接调用工具');
+    lines.push('4. 子 Agent 是没有记忆的，有需要的时候，有需要的时候，需要传递给上下文给子 Agent');
+
+    return lines.join('\n');
+  }
+
    /**
    * 获取所有 subAgent 的基本信息列表
    */

package/plugins/telegram-plugin.js

@@ -311,24 +311,27 @@ class TelegramPlugin extends Plugin {
     }
 
     try {
+      // 使用事件方式实时处理流式响应
+      const sessionScope = agent.createSessionScope(sessionId)
       let fullResponse = ''
-      for await (const chunk of agent.chatStream(text, { sessionId })) {
+
+      sessionScope.on('stream:chunk', ({ chunk }) => {
         if (chunk.type === 'text' && chunk.text) {
           fullResponse += chunk.text
           if (fullResponse.length % 100 === 0) {
             try {
-              await this._bot.editMessageText(`📝 ${escapeMarkdown(fullResponse)}▌`, {
+              this._bot.editMessageText(`📝 ${escapeMarkdown(fullResponse)}▌`, {
                 chat_id: chatId,
                 message_id: thinkingMsg.message_id
               })
             } catch (e) { /* ignore */ }
           }
         }
-      }
+      })
+
+      await agent.sendMessage(text, { sessionId })
 
-      // if (this._sessionPlugin) {
-      //   this._sessionPlugin.addMessage(sessionId, { role: 'assistant', content: fullResponse })
-      // }
+      sessionScope.removeAllListeners()
 
       const safeResponse = escapeMarkdown(fullResponse) || '抱歉，我没有收到有效的回复。'
       await this._bot.editMessageText(safeResponse, {

package/plugins/weixin-plugin.js

@@ -390,13 +390,6 @@ class WeixinPlugin extends Plugin {
         metadata: { platform: 'weixin', userId }
       })
     }
-    const sessionScope = agent.createSessionScope(sessionId);
-    // sessionScope.on('stream:chunk', ({chunk}) => {
-    //     if (chunk.type === 'text') {
-    //       process.stdout.write(chunk.text);
-    //     }
-    // });
-    // log.info(` Session ready for user: ${userId}`)
     return { agent, sessionId }
   }
 
@@ -473,21 +466,32 @@ class WeixinPlugin extends Plugin {
     await new Promise((resolve) => setTimeout(resolve, 1000))
 
     try {
-      // 使用 continue 获取流式响应
-      const result = await agent.sendMessage(text, {
-        sessionId: sessionId,
-        priority: 1,
-      });
-      const errors=result.chunks.filter(a=>a.type==='error').map(a=>a.error)
-      if(errors.length){
-        throw new Error(errors.join('\n'))
-      }
-      if(result.content){
-        await this._sendMessageBatch(originalMsg, userId, result.content, true)
-      }else{
-        const msg=`继续进行下一步`
+      // 使用事件方式实时处理流式响应
+      const sessionScope = agent.createSessionScope(sessionId)
+      let fullResponse = ''
+      let hasError = false
+
+      sessionScope.on('stream:chunk', ({ chunk }) => {
+        if (chunk.type === 'text') {
+          fullResponse += chunk.text
+        } else if (chunk.type === 'error') {
+          hasError = true
+          log.error(' Stream error:', chunk.error)
+        }
+      })
+
+      await agent.sendMessage(text, { sessionId, priority: 1 })
+
+      sessionScope.removeAllListeners()
+
+      if (hasError) {
+        await this._sendMessageBatch(originalMsg, userId, `发生错误`, true)
+      } else if (fullResponse) {
+        await this._sendMessageBatch(originalMsg, userId, fullResponse, true)
+      } else {
+        const msg = `继续进行下一步`
         await this._sendMessageBatch(originalMsg, userId, msg, true)
-        agent.sendMessage(msg,{sessionId,priority: 1})
+        agent.sendMessage(msg, { sessionId, priority: 1 })
       }
     } catch (err) {
       log.error(' Media chat error:', err)
@@ -515,20 +519,32 @@ class WeixinPlugin extends Plugin {
     await new Promise((resolve) => setTimeout(resolve, 1000))
 
     try {
-      const result = await agent.sendMessage(text, {
-        sessionId: sessionId,
-        priority: 1,
-      });
-      const errors=result.chunks.filter(a=>a.type==='error').map(a=>a.error)
-      if(errors.length){
-        throw new Error(errors.join('\n'))
-      }
-      if(result.content){
-        await this._sendMessageBatch(originalMsg, userId, result.content, true)
-      }else{
-        const msg=`继续进行下一步`
+      // 使用事件方式实时处理流式响应
+      const sessionScope = agent.createSessionScope(sessionId)
+      let fullResponse = ''
+      let hasError = false
+
+      sessionScope.on('stream:chunk', ({ chunk }) => {
+        if (chunk.type === 'text') {
+          fullResponse += chunk.text
+        } else if (chunk.type === 'error') {
+          hasError = true
+          log.error(' Stream error:', chunk.error)
+        }
+      })
+
+      await agent.sendMessage(text, { sessionId, priority: 1 })
+
+      sessionScope.removeAllListeners()
+
+      if (hasError) {
+        await this._sendMessageBatch(originalMsg, userId, `发生错误`, true)
+      } else if (fullResponse) {
+        await this._sendMessageBatch(originalMsg, userId, fullResponse, true)
+      } else {
+        const msg = `继续进行下一步`
         await this._sendMessageBatch(originalMsg, userId, msg, true)
-        agent.sendMessage(msg,{sessionId,priority: 1})
+        agent.sendMessage(msg, { sessionId, priority: 1 })
       }
 
     } catch (err) {