foliko 2.0.10 → 2.0.12

package/plugins/core/workflow/engine.js

@@ -1,66 +1,66 @@
-/**
- * FlowEngine v2 - Main entry point for v2 workflow system
- * Supports JSON and JS workflow formats
- */
-
-const { JsonRunner } = require('./json-runner');
-const { JsRunner } = require('./js-runner');
-
-class FlowEngine {
-  constructor(framework) {
-    this.framework = framework;
-    this._jsonRunner = new JsonRunner(framework);
-    this._jsRunner = new JsRunner(framework);
-    this._log = require('../../../src/common/logger').logger.child('FlowEngine');
-  }
-
-  /**
-   * Execute a workflow
-   * @param {Object|string} workflow - Workflow definition
-   * @param {Object} input - Input data
-   * @param {string} sessionId - Session ID
-   * @returns {Promise<Object>} execution result
-   */
-  async execute(workflow, input = {}, sessionId = null) {
-    // Parse workflow if string
-    if (typeof workflow === 'string') {
-      try {
-        workflow = JSON.parse(workflow);
-        // It's JSON, use JsonRunner
-        return await this._jsonRunner.execute(workflow, input, sessionId);
-      } catch {
-        // Not JSON, treat as JS workflow
-        return await this._jsRunner.execute(workflow, input, sessionId);
-      }
-    }
-
-    // Object format detection
-    // v2 JSON: has flow + stages
-    if (workflow.flow && Array.isArray(workflow.stages)) {
-      return await this._jsonRunner.execute(workflow, input, sessionId);
-    }
-
-    // Assume JS format if it's a function (exported)
-    if (typeof workflow === 'function') {
-      return await this._jsRunner.execute(workflow, input, sessionId);
-    }
-
-    throw new Error(`Invalid workflow format. Expected { flow, stages } or JS function.`);
-  }
-
-  /**
-   * Get the JSON runner for direct access
-   */
-  getJsonRunner() {
-    return this._jsonRunner;
-  }
-
-  /**
-   * Get the JS runner for direct access
-   */
-  getJsRunner() {
-    return this._jsRunner;
-  }
-}
-
-module.exports = { FlowEngine };
+/**
+ * FlowEngine v2 - Main entry point for v2 workflow system
+ * Supports JSON and JS workflow formats
+ */
+
+const { JsonRunner } = require('./json-runner');
+const { JsRunner } = require('./js-runner');
+
+class FlowEngine {
+  constructor(framework) {
+    this.framework = framework;
+    this._jsonRunner = new JsonRunner(framework);
+    this._jsRunner = new JsRunner(framework);
+    this._log = require('../../../src/common/logger').logger.child('FlowEngine');
+  }
+
+  /**
+   * Execute a workflow
+   * @param {Object|string} workflow - Workflow definition
+   * @param {Object} input - Input data
+   * @param {string} sessionId - Session ID
+   * @returns {Promise<Object>} execution result
+   */
+  async execute(workflow, input = {}, sessionId = null) {
+    // Parse workflow if string
+    if (typeof workflow === 'string') {
+      try {
+        workflow = JSON.parse(workflow);
+        // It's JSON, use JsonRunner
+        return await this._jsonRunner.execute(workflow, input, sessionId);
+      } catch {
+        // Not JSON, treat as JS workflow
+        return await this._jsRunner.execute(workflow, input, sessionId);
+      }
+    }
+
+    // Object format detection
+    // v2 JSON: has flow + stages
+    if (workflow.flow && Array.isArray(workflow.stages)) {
+      return await this._jsonRunner.execute(workflow, input, sessionId);
+    }
+
+    // Assume JS format if it's a function (exported)
+    if (typeof workflow === 'function') {
+      return await this._jsRunner.execute(workflow, input, sessionId);
+    }
+
+    throw new Error(`Invalid workflow format. Expected { flow, stages } or JS function.`);
+  }
+
+  /**
+   * Get the JSON runner for direct access
+   */
+  getJsonRunner() {
+    return this._jsonRunner;
+  }
+
+  /**
+   * Get the JS runner for direct access
+   */
+  getJsRunner() {
+    return this._jsRunner;
+  }
+}
+
+module.exports = { FlowEngine };

package/plugins/core/workflow/index.js

@@ -999,7 +999,12 @@ class WorkflowPlugin extends Plugin {
         for (const file of files) {
           if (!file.endsWith('.json') && !file.endsWith('.js')) continue;
           const filePath = path.join(dir, file);
-          const workflowName = path.basename(file, path.extname(file));
+          let workflowName = path.basename(file, path.extname(file));
+          // 兼容 .flow.js / .flow.json 命名约定：去掉 .flow 后缀
+          // （如 weather_card.flow.js → workflow_weather_card 而不是 workflow_weather_card.flow）
+          if (workflowName.endsWith('.flow')) {
+            workflowName = workflowName.slice(0, -'.flow'.length);
+          }
           // 跳过已存在的工作流（先加载的优先）
           if (this._workflows.has(workflowName)) continue;
           try {
@@ -1064,7 +1069,10 @@ class WorkflowPlugin extends Plugin {
    */
   _registerWorkflowTools() {
     for (const [name, workflow] of this._workflows) {
-      const toolName = `workflow_${name}`;
+      // 工具名 sanitize：把文件名里的 . - 空格等替换为 _，避免 LLM 把名字当成
+      // "module.method" 调用语法（如 weather_card.flow.js → workflow_weather_card_flow）
+      const safeName = name.replace(/[^a-zA-Z0-9_]/g, '_');
+      const toolName = `workflow_${safeName}`;
       const description = workflow.description || `执行工作流: ${name}`;
       // 注意：framework.registerTool 不做去重，导致 reload 后会有两个同名
       // `workflow_<name>` 工具。getTool 返回第一个（旧的）。每次注册前先清掉。