foliko 1.1.12 → 1.1.13

package/.agent/sessions/test.json

@@ -0,0 +1,16 @@
+{
+  "sessionId": "test",
+  "messages": [
+    {
+      "role": "user",
+      "content": "hello"
+    }
+  ],
+  "variables": {},
+  "metadata": {
+    "createdAt": 1776011640311,
+    "lastActive": 1776011640311,
+    "messageCount": 0,
+    "compressionCount": 0
+  }
+}

package/.claude/settings.local.json

@@ -179,7 +179,8 @@
       "Bash(cd \"D:/Code/foliko\" && node test-python-ext.js 2>&1 | grep -v \"^\\\\[2m\")",
       "Bash(cd \"D:/Code/foliko\" && node -e \"require\\('./plugins/extension-executor-plugin'\\); console.log\\('OK'\\)\")",
       "Bash(cd D:/Code/foliko && timeout 8s node cli/bin/foliko.js chat 2>&1 || true)",
-      "Bash(cd /d/Code/foliko-plugins/poster-plugin && node -e \"\nconst LayoutManager = require\\('./src/layout-manager'\\);\nconsole.log\\('LayoutManager loaded successfully'\\);\nconsole.log\\('Methods:', Object.getOwnPropertyNames\\(LayoutManager.prototype\\).join\\(', '\\)\\);\n\")"
+      "Bash(cd /d/Code/foliko-plugins/poster-plugin && node -e \"\nconst LayoutManager = require\\('./src/layout-manager'\\);\nconsole.log\\('LayoutManager loaded successfully'\\);\nconsole.log\\('Methods:', Object.getOwnPropertyNames\\(LayoutManager.prototype\\).join\\(', '\\)\\);\n\")",
+      "Bash(node test-ctx-push.js 2>&1 | head -50)"
     ]
   }
 }

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

@@ -140,24 +140,29 @@ class ChatUI {
     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 () => {
-          await this.agent.continue(message, sessionId, {
-            onChunk: (chunk) => {
+          // 使用 sessionScope 监听事件，自动只接收当前 session 的事件
+          if (sessionScope) {
+            sessionScope.on('stream:chunk', (data) => {
+              const { chunk } = data;
               if (interrupted) return;
 
               if (chunk.type === 'text') {
-                fullResponse += chunk.text;
                 lineBuffer += chunk.text;
 
                 while (lineBuffer.includes('\n')) {
@@ -173,25 +178,37 @@ class ChatUI {
               } 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}`);
               }
-            },
-            onComplete: async (full, ctx) => {
-              const response = cleanResponse(full);
-              if (!response) {
-                console.log(colored('● 继续下一步...', DIM));
-                ctx.push('继续进行下一步', { sessionId });
+            });
+
+            sessionScope.on('message:complete', ({ sessionId, content }) => {
+              const message = '继续下一步';
+              if (!content) {
+                console.log(colored(`● ${message}...`, DIM));
+                this.agent.sendMessage(message, {
+                  sessionId: sessionId,
+                  priority: 1,
+                });
               }
-            },
-            onError: async (err) => {
-              console.error(`\n${colored('[错误]', RED)} ${err.message}`);
-            },
+            });
+          }
+
+          const result = await this.agent.sendMessage(message, {
+            sessionId: sessionId,
+            priority: 1,
           });
         });
 
+        // 清除 session scope 的监听器
+        if (sessionScope) {
+          sessionScope.removeAllListeners();
+        }
+
         if (lineBuffer.trim() && !interrupted) {
           console.log(renderLine(lineBuffer, renderState));
         }
@@ -218,10 +235,15 @@ class ChatUI {
         }
       }
     } catch (err) {
+      console.log(err);
       if (!interrupted) {
         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.12",
+  "version": "1.1.13",
   "description": "简约的插件化 Agent 框架",
   "main": "src/index.js",
   "type": "commonjs",

package/plugins/extension-executor-plugin.js

@@ -354,7 +354,7 @@ class ExtensionExecutorPlugin extends Plugin {
     existingPrompt = existingPrompt.replace(extRegex, '').trim();
 
     // 添加新的 Extensions 部分
-    agent.setSystemPrompt(existingPrompt + '\n\n' + extDesc);
+    //agent.setSystemPrompt(existingPrompt + '\n\n' + extDesc);
   }
 
   _buildExtensionsDescription() {

package/plugins/python-plugin-loader.js

@@ -81,18 +81,18 @@ class PythonPluginLoader extends Plugin {
     this._loadPythonPlugins()
 
     // 监听 agent 创建事件，附加 Python 插件信息到系统提示词
-    framework.on('agent:created', (agent) => {
-      this._refreshAgentPythonPluginsPrompt(agent)
-    })
+    // framework.on('agent:created', (agent) => {
+    //   this._refreshAgentPythonPluginsPrompt(agent)
+    // })
 
     // 等待框架就绪后，刷新所有已有 agent 的 Python 插件提示词
-    if (framework._ready) {
-      this._refreshAllAgentsPythonPluginsPrompt(framework)
-    } else {
-      framework.once('framework:ready', () => {
-        this._refreshAllAgentsPythonPluginsPrompt(framework)
-      })
-    }
+    // if (framework._ready) {
+    //   this._refreshAllAgentsPythonPluginsPrompt(framework)
+    // } else {
+    //   framework.once('framework:ready', () => {
+    //     this._refreshAllAgentsPythonPluginsPrompt(framework)
+    //   })
+    // }
 
     return this
   }
@@ -275,7 +275,7 @@ class PythonPluginLoader extends Plugin {
     if (!pyDesc) return
 
     // 将 Python 插件描述追加到系统提示词
-    agent.setSystemPrompt(existingPrompt + '\n\n' + pyDesc)
+    //agent.setSystemPrompt(existingPrompt + '\n\n' + pyDesc)
   }
 
   /**

package/plugins/subagent-plugin.js

@@ -87,13 +87,18 @@ class SubAgentPlugin extends Plugin {
     }
 
     // 获取从父Agent继承的工具
-    const parentTools = this._getParentTools(parentAgent)
+    // const parentTools = this._getParentTools(parentAgent)
 
     // 确定LLM配置
     const aiPlugin = this._framework.pluginManager.get('ai')
     const llmConfig = this.llmConfig || (aiPlugin ? aiPlugin.getConfig() : {})
-
-
+    const all_tools=['ext_call']
+    if(Array.isArray(this.tools)){
+      all_tools.push(...this.tools)
+    }else if(typeof this.tools==='string'){
+      const list=this.tools.split(',').map(a=>a.trim())
+      all_tools.push(...list)
+    }
     // 创建子Agent，使用完整的 md 文件内容作为系统提示词
     this._agent = this._framework.createSubAgent({
       name: this.name,
@@ -102,9 +107,10 @@ class SubAgentPlugin extends Plugin {
       provider: llmConfig.provider,
       apiKey: llmConfig.apiKey,
       baseURL: llmConfig.baseURL,
-      tools: this.tools||{},  // 自定义工具
-      parentTools: parentTools
+      tools:{},  // 自定义工具
+      parentTools: all_tools
     })
+    
 
     // 注册从父Agent继承的工具
     // for (const tool of parentTools) {
@@ -157,19 +163,20 @@ class SubAgentPlugin extends Plugin {
     const toolMap = new Map(allTools.map(t => [t.name, t]))
 
     // 如果没有指定 parentTools，返回全部
-    if (!this.parentTools || this.parentTools.length === 0) {
+    if (this.parentTools === undefined) {
       return allTools
     }
+    // 如果是空数组，明确返回空（不要任何工具）
+    if (this.parentTools.length === 0) {
+      return []
+    }
     // 过滤指定工具
     const filtered = []
     for (const toolName of this.parentTools) {
       const tool = toolMap.get(toolName)
       if (tool) {
         filtered.push(tool)
-      } 
-      // else {
-      //   console.warn(`[SubAgent:${this.config.name}] Parent tool not found: ${toolName}`)
-      // }
+      }
     }
 
     return filtered
@@ -257,12 +264,12 @@ class SubAgentPlugin extends Plugin {
     }
 
     // 注册到框架（供后续创建的 Agent 同步）
-    // framework.registerTool(toolDef)
+    framework.registerTool(toolDef)
 
     // // 如果主 Agent 已存在，直接注册到它
-    // if (framework._mainAgent) {
-    //   framework._mainAgent.registerTool(toolDef)
-    // }
+    if (framework._mainAgent) {
+      framework._mainAgent.registerTool(toolDef)
+    }
 
     //console.log(`[SubAgent:${this.config.name}] Delegate tool registered`)
   }
@@ -458,10 +465,14 @@ class SubAgentManagerPlugin extends Plugin {
 
         try {
           const result = await plugin.chat(args.task)
+          if(!result.success){
+            throw new Error(result.error||result.message)
+          }
+          
           return {
             success: true,
             agent: args.agentName,
-            result: result.message || result,
+            result: result?.message || result?.content||result,
             success: result.success !== false
           }
         } catch (err) {

package/plugins/weixin-plugin.js

@@ -365,11 +365,12 @@ class WeixinPlugin extends Plugin {
    * 使用 SessionPlugin 统一管理会话历史
    */
   _getSessionAgent(userId) {
+    const sessionId=`weixin_${userId}`
     // 检查缓存
     if (this._sessionAgents.has(userId)) {
       const agent = this._sessionAgents.get(userId)
       // log.info(' Reusing cached session agent for userId:', userId)
-      return { agent, sessionId: `weixin_${userId}` }
+      return { agent, sessionId }
     }
 
     // 创建新 agent - 和 CLI 一样使用 createAgent
@@ -379,19 +380,24 @@ class WeixinPlugin extends Plugin {
       sharedPrompt: `工作目录: {{WORK_DIR}}`,
       metadata: { WORK_DIR: process.cwd() }
     })
+    
     this._sessionAgents.set(userId, agent)
     // log.info(' Created new session agent for userId:', userId)
 
     // 使用 SessionPlugin 管理会话历史
     if (this._sessionPlugin) {
-      const sessionId = `weixin_${userId}`
       this._sessionPlugin.getOrCreateSession(sessionId, {
         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: `weixin_${userId}` }
+    return { agent, sessionId }
   }
 
   /**
@@ -468,28 +474,21 @@ class WeixinPlugin extends Plugin {
 
     try {
       // 使用 continue 获取流式响应
-      let fullResponse = '';
-
-      await agent.continue(text, sessionId, {
-        onChunk: (text, full) => {
-          if (text) fullResponse += text;
-        },
-        onComplete: async (full, ctx) => {
-          const response = cleanResponse(full);
-          if (response) {
-            await this._sendMessageBatch(originalMsg, userId, response, true)
-          } else {
-            // 响应为空，压入继续消息
-            const msg=`继续进行下一步`
-            await this._sendMessageBatch(originalMsg, userId, msg, true)
-            ctx.push(msg, { sessionId });
-          }
-        },
-        onError: async (err) => {
-          log.error(' Media chat error:', err.message);
-          await this._sendMessageBatch(originalMsg, userId, `发生错误：${err.message}`, true)
-        }
+      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=`继续进行下一步`
+        await this._sendMessageBatch(originalMsg, userId, msg, true)
+        agent.sendMessage(msg,{sessionId,priority: 1})
+      }
     } catch (err) {
       log.error(' Media chat error:', err)
       await this._sendMessageBatch(originalMsg, userId, `发生错误：${err.message}`, true)
@@ -516,29 +515,21 @@ class WeixinPlugin extends Plugin {
     await new Promise((resolve) => setTimeout(resolve, 1000))
 
     try {
-      // 使用 continue 获取流式响应
-      let fullResponse = '';
-
-      await agent.continue(text, sessionId, {
-        onChunk: (text, full) => {
-          if (text) fullResponse += text;
-        },
-        onComplete: async (full, ctx) => {
-          const response = cleanResponse(full);
-          if (response) {
-            await this._sendMessageBatch(originalMsg, userId, response, true)
-          } else {
-            // 响应为空，压入继续消息
-            const msg=`继续进行下一步`
-            await this._sendMessageBatch(originalMsg, userId, msg, true)
-            ctx.push(msg, { sessionId });
-          }
-        },
-        onError: async (err) => {
-          log.error(' Chat error:', err.message);
-          await this._sendMessageBatch(originalMsg, userId, `发生错误：${err.message}`, true)
-        }
+      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=`继续进行下一步`
+        await this._sendMessageBatch(originalMsg, userId, msg, true)
+        agent.sendMessage(msg,{sessionId,priority: 1})
+      }
 
     } catch (err) {
       log.error(' Chat error:', err.message)