foliko 2.0.6 → 2.0.8

package/src/agent/chat.js

@@ -907,7 +907,14 @@ class AgentChatHandler extends EventEmitter {
    */
   _computeToolsCacheKey() {
     const allTools = this.agent.framework.getTools();
-    return allTools.map((t) => `${t.name}:${t.description ? t.description.length : 0}`).join('|');
+    // Use name + inputSchema hash for stable cache key
+    // description.length is unstable across calls (changes affect cache incorrectly)
+    const { createHash } = require('crypto');
+    const toolDescriptors = allTools
+      .map((t) => `${t.name}::${t.inputSchema ? JSON.stringify(t.inputSchema) : ''}`)
+      .sort()
+      .join('|');
+    return createHash('sha256').update(toolDescriptors).digest('hex').slice(0, 32);
   }
 
   /**

package/src/agent/main.js

@@ -215,6 +215,10 @@ class MainAgent extends BaseAgent {
 
   _initChatHandler() {
     const { AgentChatHandler } = require('./chat');
+    // Remove listeners from previous chatHandler to prevent accumulation
+    if (this._chatHandler) {
+      this._chatHandler.removeAllListeners();
+    }
     let aiClient = null;
     const aiPlugin = this.framework.pluginManager?.get('ai');
     if (aiPlugin) aiClient = aiPlugin.getAIClient();
@@ -410,7 +414,7 @@ class MainAgent extends BaseAgent {
       const { generateEntryId, EntryTypes } = require('../session/entry');
       sessionManager._appendEntry({
         id: generateEntryId(sessionManager.byId), type: EntryTypes.COMPACTION,
-        summary: messages.find(m => m.role === 'assistant' && m.content?.startsWith('['))?.content || '',
+        summary: messages.find(m => m.role === 'assistant' && typeof m.content === 'string' && m.content.startsWith('['))?.content || '',
         firstKeptEntryId: null, tokensBefore: before, timestamp: Date.now(),
       });
     }

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

@@ -8,6 +8,7 @@ const { CLEAR_LINE, CYAN, DIM, GREEN, RED, YELLOW, colored } = require('../utils
 const { TUI, ProcessTerminal, Editor, Text, CombinedAutocompleteProvider, matchesKey, Container } = require('@earendil-works/pi-tui');
 const { cleanResponse, logger } = require('../../../src/utils');
 const { logEmitter } = require('../../../src/common/logger');
+const { safeStringify } = require('../../../src/common/json-safe');
 const { renderLine } = require('../utils/markdown');
 const { MessageBubble } = require('./components/message-bubble');
 const Queue=require('js-queue');
@@ -596,11 +597,11 @@ class ChatUI {
           this._streamBufferTimer = setTimeout(() => this._flushStreamBuffer(), 0);
         }
       } else if (chunk.type === 'tool-call') {
-        const args = chunk.input ? JSON.stringify(chunk.input).slice(0, 30) : '';
+        const args = chunk.input ? safeStringify(chunk.input).slice(0, 30) : '';
         this.statusBar.tooler.show(`${folikoGold(chunk.toolName.toLocaleUpperCase())} ${chalk.gray(args+'...')}`)
       } else if(chunk.type==='tool-result'){
         const result = chunk.result;
-        const shortResult = typeof result === 'string' ? result.slice(0, 30) : JSON.stringify(result).slice(0, 30);
+        const shortResult = typeof result === 'string' ? result.slice(0, 30) : safeStringify(result).slice(0, 30);
         this.statusBar.tooler.show(`${folikoGold(chunk.toolName.toLocaleUpperCase())} ${chalk.gray(shortResult+'...')}`)
 
         // 如果是 edit/edit_file 的结果并且包含 diff，渲染彩色 diff
@@ -613,7 +614,7 @@ class ChatUI {
           if (resultObj && resultObj.diff) {
             const diffContent = renderDiffWithHeader(resultObj.diff, resultObj.filePath);
             const bgColor = chalk.bgHex('#1a1a2e');
-            this._currentBotMessage.appendContent(['\n',diffContent,'\n\n'].join(''));
+            this._currentBotMessage&&this._currentBotMessage.appendContent(['\n',diffContent,'\n\n'].join(''));
             // this.create_message(diffContent, chalk.yellow('▸ '), true, (line) => bgColor(line));
             this.statusBar.tooler.show(`${chalk.green('[差异]')} ${folikoGold(resultObj.filePath)}`);
           }

package/src/common/json-safe.js

@@ -0,0 +1,20 @@
+'use strict';
+
+/**
+ * Safely stringify objects that may contain circular references.
+ * Replaces circular values with '[Circular]' string.
+ */
+function safeStringify(obj, space) {
+  const seen = new WeakSet();
+  return JSON.stringify(obj, (key, value) => {
+    if (typeof value === 'object' && value !== null) {
+      if (seen.has(value)) {
+        return '[Circular]';
+      }
+      seen.add(value);
+    }
+    return value;
+  }, space);
+}
+
+module.exports = { safeStringify };

package/src/framework/framework.js

@@ -174,7 +174,9 @@ class Framework extends EventEmitter {
         agent._systemPromptDirty = true;
       }
     };
-    const REFRESH_EVENTS = ['register', 'unregister', 'clear-owner'];
+    // 注意：监听 invalidate 不会形成循环，因为回调内只设 dirty，
+    // 不会反过来调用 promptRegistry.invalidate*()
+    const REFRESH_EVENTS = ['register', 'unregister', 'clear-owner', 'invalidate', 'invalidate-all'];
     for (const event of REFRESH_EVENTS) {
       this.promptRegistry.on(event, invalidate);
     }
@@ -206,16 +208,70 @@ class Framework extends EventEmitter {
   async disablePlugin(name) { await this.pluginManager.disable(name); return this; }
   updatePluginConfig(name, config) { return this.pluginManager.updatePluginConfig(name, config); }
 
-  registerTool(tool) { this.toolRegistry.register(tool); return this; }
+  registerTool(tool) {
+    this.toolRegistry.register(tool);
+    // 通知所有 Agent 使 ChatHandler._aiToolsCache 失效。
+    // 🔴 修复：热重载插件时，插件调 framework.registerTool 注册新工具，
+    // 但 ChatHandler 的 _aiToolsCache 只在 agent.registerTool 被调用时清，
+    // 所以 reload 后 LLM 仍使用旧的 execute 闭包。
+    if (Array.isArray(this._agents)) {
+      for (const agent of this._agents) {
+        const ch = agent && agent._chatHandler;
+        if (ch) {
+          ch._aiToolsCache = null;
+          ch._aiToolsCacheKey = '';
+          ch._toolsTokensCacheVersion = 0;
+          if (ch._toolExecutor && ch._toolExecutor._tools) {
+            ch._toolExecutor._tools.set(tool.name, tool);
+          }
+        }
+      }
+    }
+    this.emit('tool:registered-changed', tool);
+    return this;
+  }
   tool(toolDef) {
     const tool = { ...toolDef };
     if (tool.input && !tool.inputSchema) tool.inputSchema = tool.input;
     delete tool.input;
     this.toolRegistry.register(tool);
+    // 同步使所有 Agent 的 ChatHandler 缓存失效并同步工具。
+    if (Array.isArray(this._agents)) {
+      for (const agent of this._agents) {
+        const ch = agent && agent._chatHandler;
+        if (ch) {
+          ch._aiToolsCache = null;
+          ch._aiToolsCacheKey = '';
+          ch._toolsTokensCacheVersion = 0;
+          if (ch._toolExecutor && ch._toolExecutor._tools) {
+            ch._toolExecutor._tools.set(tool.name, tool);
+          }
+        }
+      }
+    }
     return this;
   }
   getTools() { return this.toolRegistry.getAll(); }
 
+  unregisterTool(name) {
+    if (this.toolRegistry.unregister) this.toolRegistry.unregister(name);
+    if (Array.isArray(this._agents)) {
+      for (const agent of this._agents) {
+        const ch = agent && agent._chatHandler;
+        if (ch) {
+          ch._aiToolsCache = null;
+          ch._aiToolsCacheKey = '';
+          ch._toolsTokensCacheVersion = 0;
+          if (ch._toolExecutor && ch._toolExecutor._tools) {
+            ch._toolExecutor._tools.delete(name);
+          }
+        }
+      }
+    }
+    this.emit('tool:unregistered-changed', { name });
+    return this;
+  }
+
   // tools 对象别名
   get tools() {
     const self = this;

package/src/index.js

@@ -143,11 +143,21 @@ exports.Logger = Logger;
 
 const { SkillManagerPlugin, Skill, SkillMetadata } = require('../plugins/core/skill-manager');
 const { WorkflowPlugin, WorkflowEngine, StepExecutor } = require('../plugins/core/workflow');
+// v2 引擎（实际执行路径走这里）。仍同时导出 v1 名字以保持向后兼容。
+const { FlowEngine } = require('../plugins/core/workflow/engine');
+const { JsonRunner, StageExecutor: V2StageExecutor } = require('../plugins/core/workflow/json-runner');
+const { JsRunner } = require('../plugins/core/workflow/js-runner');
+const { FlowContext } = require('../plugins/core/workflow/context');
 exports.SkillManagerPlugin = SkillManagerPlugin;
 exports.Skill = Skill;
 exports.SkillMetadata = SkillMetadata;
 exports.WorkflowPlugin = WorkflowPlugin;
 exports.WorkflowEngine = WorkflowEngine;
 exports.StepExecutor = StepExecutor;
+exports.FlowEngine = FlowEngine;
+exports.JsonRunner = JsonRunner;
+exports.JsRunner = JsRunner;
+exports.FlowContext = FlowContext;
+exports.V2StageExecutor = V2StageExecutor;
 exports.Agent = MainAgent;
 exports.MCPExecutorPlugin = require('./executors/mcp-executor');

package/src/plugin/base.js

@@ -254,13 +254,16 @@ class Plugin {
   }
 
   /**
-   * 注册工作流到 WorkflowEngine
+   * 注册工作流到 FlowEngine (v2)
    * 支持 register/remove/execute 方法
    *
-   * 用法：
+   * 用法（v2 schema：flow + version + stages）：
    *   this.workflow.register('my-workflow', {
-   *     name: 'my-workflow',
-   *     steps: [...]
+   *     flow: 'my-workflow',
+   *     version: '2.0',
+   *     stages: [
+   *       { name: 'step1', action: 'script', script: '...' },
+   *     ],
    *   });
    */
   get workflow() {

package/src/plugin/manager.js

@@ -78,7 +78,7 @@ class PluginManager {
       instance: plugin,
       status: 'registered',
       enabled,
-      sourcePath: plugin.sourcePath || null,
+      sourcePath: this._detectPluginSourcePath(plugin, plugin.sourcePath),
     });
     this._knownPlugins.add(plugin.name);
     this._log.debug(`Plugin registered: ${plugin.name} (enabled: ${enabled})`);
@@ -89,6 +89,71 @@ class PluginManager {
     return this._plugins.has(name);
   }
 
+  /**
+   * Find the source file path for a plugin instance by scanning plugin
+   * class names in candidate directories (used as a fallback when the
+   * plugin was created directly via `new SomePlugin(...)` instead of going
+   * through `loadPluginFromPath`).
+   */
+  _detectPluginSourcePath(plugin, declared) {
+    if (declared) return declared;
+
+    // For system plugins registered in plugins/core/*, the class name often
+    // matches the on-disk filename (e.g. `WorkflowPlugin` => `index.js` of
+    // `plugins/core/workflow`, `SubAgentManagerPlugin` => `.../sub-agent/index.js`).
+    const candidates = [];
+    const fs = require('fs');
+    const path = require('path');
+    try {
+      const projectRoot = path.resolve(__dirname, '..', '..');
+      candidates.push(path.resolve(projectRoot, 'plugins'));
+    } catch (_) {}
+
+    const className =
+      (plugin.constructor && plugin.constructor.name) || plugin.name;
+    if (!className) return null;
+
+    for (const base of candidates) {
+      // exact-match: <base>/<dir>/index.js with class declared inside
+      // heuristic: walk top-level plugin dirs and look for index.js exports
+      // a class named `className`.
+      let dirs = [];
+      try {
+        dirs = fs.readdirSync(base);
+      } catch (_) {
+        continue;
+      }
+      for (const sub of dirs) {
+        const subDir = path.join(base, sub);
+        let files = [];
+        try {
+          files = fs.statSync(subDir).isDirectory()
+            ? fs.readdirSync(subDir)
+            : [path.basename(subDir)];
+          subDir = fs.statSync(subDir).isDirectory()
+            ? subDir
+            : path.dirname(subDir);
+        } catch (_) {
+          continue;
+        }
+        for (const file of files) {
+          if (!file.endsWith('.js')) continue;
+          const full = path.join(subDir, file);
+          try {
+            const src = fs.readFileSync(full, 'utf-8');
+            // Heuristic class declaration
+            if (
+              new RegExp(`class\\s+${className}\\s+extends\\s+Plugin`).test(src)
+            ) {
+              return full;
+            }
+          } catch (_) {}
+        }
+      }
+    }
+    return null;
+  }
+
   get(name) {
     const entry = this._plugins.get(name);
     return entry ? entry.instance : null;
@@ -264,6 +329,35 @@ class PluginManager {
     this._log.info(`Reloading plugin: ${name}`);
     const plugin = entry.instance;
 
+    // Refresh the plugin's prototype with the latest source code BEFORE invoking
+    // its reload hook. Without this, plugin.reload() still runs against the
+    // prototype cached at construction time (and Node.js' require cache means
+    // the same source file is returned on disk), so changes to plugin code
+    // (e.g., workflow/_loadWorkflows) won't take effect until the process
+    // restarts.
+    if (entry.sourcePath) {
+      try {
+        delete require.cache[require.resolve(entry.sourcePath)];
+        const mod = require(entry.sourcePath);
+        // The module may export a single class or an object map.
+        const PluginClass =
+          (mod && (mod.default || mod.WorkflowPlugin || mod)) ||
+          null;
+        if (
+          PluginClass &&
+          PluginClass.prototype &&
+          Object.getPrototypeOf(plugin) !== PluginClass.prototype
+        ) {
+          Object.setPrototypeOf(plugin, PluginClass.prototype);
+        }
+      } catch (err) {
+        this._log.warn(
+          `Failed to refresh prototype for plugin '${name}' from ${entry.sourcePath}:`,
+          err.message
+        );
+      }
+    }
+
     if (typeof plugin.reload === 'function') {
       await plugin.reload(this.framework);
     } else {

package/src/utils/sandbox.js

@@ -29,7 +29,7 @@ function createSandboxContext(customContext = {}, options = {}) {
     Number: { isNaN: Number.isNaN, isFinite: Number.isFinite, parseInt: Number.parseInt, parseFloat: Number.parseFloat },
     Boolean,
     Object: { keys: Object.keys, values: Object.values, entries: Object.entries, assign: Object.assign, create: Object.create, freeze: Object.freeze },
-    Date: { now: Date.now },
+    Date,
     RegExp,
     Error,
     Promise,

package/skills/workflows/workflow-troubleshooting/DEBUGGING.md

@@ -1,197 +0,0 @@
-# 工作流开发调试指南
-
-## 快速测试工作流
-
-### 1. 使用 execute_workflow 直接测试
-
-```javascript
-execute_workflow({
-  workflow: {
-    name: 'test-workflow',
-    description: '测试工作流',
-    steps: [
-      {
-        id: 'step1',
-        type: 'tool',
-        tool: 'py_execute',
-        args: {
-          code: "print('Hello from Python!')",
-        },
-        outputVariable: 'result',
-      },
-    ],
-  },
-});
-```
-
-### 2. JSON 格式注意事项
-
-- ✅ 使用双引号包裹字符串
-- ✅ 确保 JSON 语法正确
-- ❌ 避免在 JSON 中使用未转义的特殊字符
-- ❌ 不要在 code 中混用单引号和双引号
-
-### 3. 常见错误
-
-```
-Unexpected identifier 'xxx'
-```
-
-- 原因：JSON 格式错误，可能是引号或逗号问题
-- 解决：检查 JSON 语法
-
-```
-Unexpected end of JSON input
-```
-
-- 原因：模板字符串 `${}` 在 JSON 中导致解析错误
-- 解决：不要在 JSON 中使用模板变量，改用纯 Python 代码
-
-## 工作流重载问题
-
-### 问题
-
-添加新工作流后，`workflow_reload` 不会重新加载同名工作流。
-
-### 解决
-
-```bash
-# 方法1：使用不同的文件名
-news-dashboard-v3.json  # 不会被 v2 覆盖
-
-# 方法2：重启插件
-reload_plugins()  # 重载所有插件
-```
-
-## Python 执行最佳实践
-
-### 1. 错误处理
-
-```python
-try:
-    req = urllib.request.Request(url, headers={'User-Agent': 'Mozilla/5.0'})
-    with urllib.request.urlopen(req, timeout=10) as resp:
-        data = resp.read().decode('utf-8')
-    print('SUCCESS')
-except Exception as e:
-    print(f'ERROR: {e}')
-    # fallback 逻辑
-```
-
-### 2. 输出格式
-
-```python
-# 简单输出
-print('Status: OK')
-print(f'Count: {len(items)}')
-
-# JSON 输出
-import json
-print('---JSON_START---')
-print(json.dumps(data, ensure_ascii=False))
-print('---JSON_END---')
-```
-
-### 3. 超时设置
-
-```python
-with urllib.request.urlopen(req, timeout=30) as resp:  # 30秒超时
-    ...
-```
-
-## 工作流步骤类型
-
-| 类型        | 用途            | 示例                                  |
-| ----------- | --------------- | ------------------------------------- |
-| `tool`      | 调用工具        | `py_execute`, `shell_exec`, `get_time` |
-| `script`    | 执行 JavaScript | 数据处理、变量操作                    |
-| `condition` | 条件分支        | if/else 逻辑                          |
-| `loop`      | 循环执行        | 遍历列表                              |
-| `delay`     | 延时等待        | 等待指定时间                          |
-| `message`   | 消息通知        | 发送通知                              |
-| `think`     | LLM 思考        | 反思/分析                             |
-
-## 工具输出变量
-
-### 正确用法
-
-```json
-{
-  "id": "step1",
-  "type": "tool",
-  "tool": "get_time",
-  "outputVariable": "current_time"
-}
-```
-
-### 访问输出
-
-```javascript
-// 在 script 步骤中
-context.input.current_time
-
-// 在下一个 tool 步骤中
-${step1.current_time}
-```
-
-## 调试技巧
-
-### 1. 打印中间变量
-
-```python
-print('Debug - data:', data)
-print('Debug - length:', len(data))
-```
-
-### 2. 保存到文件
-
-```python
-with open('debug.log', 'w') as f:
-    f.write(str(data))
-```
-
-### 3. 逐步执行
-
-```javascript
-{
-  "steps": [
-    { "id": "step1", ... },  // 先测试 step1
-    { "id": "step2", ... }   // 确认 step1 成功后添加
-  ]
-}
-```
-
-## 性能优化
-
-### 1. 合并步骤
-
-```javascript
-// ❌ 多个小步骤
-{ "id": "step1", "tool": "py_execute", "code": "a = 1" }
-{ "id": "step2", "tool": "py_execute", "code": "b = 2" }
-
-// ✅ 单个大步骤
-{ "id": "step1", "tool": "py_execute", "code": "a = 1; b = 2; print(a + b)" }
-```
-
-### 2. 减少变量传递
-
-```javascript
-// ❌ 多步骤传递
-{ "outputVariable": "data1" }
-{ "outputVariable": "data2" }
-
-// ✅ 单步骤完成
-{ "outputVariable": "final_result" }
-```
-
-### 3. 超时设置
-
-```json
-{
-  "args": {
-    "code": "...",
-    "timeout": 60000 // 60秒超时
-  }
-}
-```