foliko 1.0.63 → 1.0.65

package/src/capabilities/workflow-engine.js

@@ -20,6 +20,7 @@ const StepType = {
   SEQUENTIAL: 'sequential',
   LOOP: 'loop',
   DELAY: 'delay',
+  TOOL: 'tool',
   INPUT: 'input',
   OUTPUT: 'output'
 }
@@ -244,6 +245,112 @@ class DelayStep extends WorkflowStep {
   }
 }
 
+/**
+ * 工具步骤
+ */
+class ToolStep extends WorkflowStep {
+  constructor(config) {
+    super({ ...config, type: StepType.TOOL })
+    this.tool = config.tool
+    this.args = config.args || {}
+    this.outputVariable = config.outputVariable || null
+  }
+
+  async execute(context, engine) {
+    if (!this.tool) {
+      throw new Error('Tool step requires a tool name')
+    }
+
+    console.log(`[Workflow] Executing tool: ${this.tool}`)
+
+    // 解析工具参数，支持变量引用
+    const resolvedArgs = this._resolveArgs(this.args, context)
+
+    // 获取当前 sessionId（从上下文变量或执行上下文）
+    let sessionId = context.variables._sessionId
+    if (!sessionId && engine.framework.getExecutionContext) {
+      const ctx = engine.framework.getExecutionContext()
+      sessionId = ctx?.sessionId
+    }
+
+    // 使用 sessionId 上下文执行工具
+    let result
+    if (sessionId && engine.framework.runWithContext) {
+      result = await engine.framework.runWithContext(
+        { sessionId },
+        async () => await engine.framework.executeTool(this.tool, resolvedArgs)
+      )
+    } else {
+      result = await engine.framework.executeTool(this.tool, resolvedArgs)
+    }
+
+    // 保存结果到变量
+    if (this.outputVariable) {
+      context.variables[this.outputVariable] = result
+    }
+    context.lastResult = result
+
+    // 检查工具执行结果
+    if (result && result.error) {
+      console.warn(`[Workflow] Tool ${this.tool} returned error: ${result.error}`)
+    }
+
+    return result
+  }
+
+  /**
+   * 解析参数中的变量引用
+   * 支持 {{variableName}} 语法
+   */
+  _resolveArgs(args, context) {
+    const resolved = {}
+    for (const [key, value] of Object.entries(args)) {
+      resolved[key] = this._resolveValue(value, context)
+    }
+    return resolved
+  }
+
+  _resolveValue(value, context) {
+    if (typeof value === 'string') {
+      // 替换 {{variable}} 或 {{variables.name}} 语法
+      return value.replace(/\{\{(\w+(?:\.\w+)*)\}\}/g, (match, path) => {
+        // 支持 variables.xxx 或直接 xxx 格式
+        if (path.startsWith('variables.')) {
+          return this._getNestedValue(context, path) ?? match
+        } else if (path.startsWith('context.')) {
+          return this._getNestedValue(context, path) ?? match
+        } else {
+          // 尝试从 context.variables 获取
+          const val = this._getNestedValue(context.variables, path)
+          if (val !== undefined) return val
+          // 尝试从 context 直接获取
+          return this._getNestedValue(context, path) ?? match
+        }
+      })
+    } else if (Array.isArray(value)) {
+      return value.map(v => this._resolveValue(v, context))
+    } else if (typeof value === 'object' && value !== null) {
+      const resolved = {}
+      for (const [k, v] of Object.entries(value)) {
+        resolved[k] = this._resolveValue(v, context)
+      }
+      return resolved
+    }
+    return value
+  }
+
+  _getNestedValue(obj, path) {
+    if (!obj) return undefined
+    const parts = path.split('.')
+    let current = obj
+    for (const part of parts) {
+      if (current === null || current === undefined) return undefined
+      current = current[part]
+    }
+    return current
+  }
+}
+
 /**
  * 工作流引擎
  */
@@ -316,6 +423,7 @@ class WorkflowPlugin extends Plugin {
     this._engine.registerStepType(StepType.SEQUENTIAL, SequentialStep)
     this._engine.registerStepType(StepType.LOOP, LoopStep)
     this._engine.registerStepType(StepType.DELAY, DelayStep)
+    this._engine.registerStepType(StepType.TOOL, ToolStep)
 
     // 注册工作流执行工具
     framework.registerTool({
@@ -325,8 +433,14 @@ class WorkflowPlugin extends Plugin {
         workflow: z.string().describe('工作流定义（JSON 或 JavaScript 代码）'),
         input: z.object({}).optional().describe('工作流输入参数')
       }),
-      execute: async (args) => {
-        return await this.executeWorkflow(args.workflow, args.input || {})
+      execute: async (args, framework) => {
+        // 获取当前 sessionId
+        let sessionId = null
+        const ctx = framework.getExecutionContext()
+        if (ctx?.sessionId) {
+          sessionId = ctx.sessionId
+        }
+        return await this.executeWorkflow(args.workflow, args.input || {}, sessionId)
       }
     })
 
@@ -455,18 +569,24 @@ class WorkflowPlugin extends Plugin {
   /**
    * 执行工作流
    */
-  async executeWorkflow(workflowDef, input = {}) {
+  async executeWorkflow(workflowDef, input = {}, sessionId = null) {
     try {
       let workflow
 
       if (typeof workflowDef === 'string') {
-        // 尝试解析 JSON 或执行代码
-        try {
-          workflow = JSON.parse(workflowDef)
-        } catch {
-          // eslint-disable-next-line no-new-func
-          const fn = new Function('engine', 'return (' + workflowDef + ')')
-          workflow = fn(this._engine)
+        // 尝试作为工作流名称加载（先检查是否已加载的工作流）
+        const workflowName = workflowDef.trim()
+        if (this._workflows.has(workflowName)) {
+          workflow = this._workflows.get(workflowName)
+        } else {
+          // 尝试解析 JSON 或执行代码
+          try {
+            workflow = JSON.parse(workflowDef)
+          } catch {
+            // eslint-disable-next-line no-new-func
+            const fn = new Function('engine', 'return (' + workflowDef + ')')
+            workflow = fn(this._engine)
+          }
         }
       } else {
         workflow = workflowDef
@@ -474,6 +594,11 @@ class WorkflowPlugin extends Plugin {
 
       const context = this._engine.createContext(input, {})
 
+      // 将 sessionId 存储到上下文变量，供工具步骤使用
+      if (sessionId) {
+        context.variables._sessionId = sessionId
+      }
+
       // 执行工作流步骤
       if (workflow.steps && Array.isArray(workflow.steps)) {
         const results = []
@@ -513,5 +638,6 @@ module.exports = {
   ConditionStep,
   SequentialStep,
   LoopStep,
-  DelayStep
+  DelayStep,
+  ToolStep
 }

package/src/executors/executor-base.js

@@ -1,58 +1,58 @@
-/**
- * Executor 基类
- * 执行器的基类，定义执行器接口
- */
-
-const { EventEmitter } = require('../utils/event-emitter')
-
-class ExecutorBase extends EventEmitter {
-  /**
-   * @param {string} name - 执行器名称
-   */
-  constructor(name) {
-    super()
-    this.name = name
-    this._enabled = true
-  }
-
-  /**
-   * 执行
-   * @param {Object} params - 执行参数
-   * @returns {Promise<any>}
-   */
-  async execute(params) {
-    throw new Error('execute() must be implemented')
-  }
-
-  /**
-   * 启用执行器
-   */
-  enable() {
-    this._enabled = true
-    return this
-  }
-
-  /**
-   * 禁用执行器
-   */
-  disable() {
-    this._enabled = false
-    return this
-  }
-
-  /**
-   * 是否启用
-   */
-  isEnabled() {
-    return this._enabled
-  }
-
-  /**
-   * 销毁
-   */
-  destroy() {
-    this.removeAllListeners()
-  }
-}
-
-module.exports = { ExecutorBase }
+/**
+ * Executor 基类
+ * 执行器的基类，定义执行器接口
+ */
+
+const { EventEmitter } = require('../utils/event-emitter')
+
+class ExecutorBase extends EventEmitter {
+  /**
+   * @param {string} name - 执行器名称
+   */
+  constructor(name) {
+    super()
+    this.name = name
+    this._enabled = true
+  }
+
+  /**
+   * 执行
+   * @param {Object} params - 执行参数
+   * @returns {Promise<any>}
+   */
+  async execute(params) {
+    throw new Error('execute() must be implemented')
+  }
+
+  /**
+   * 启用执行器
+   */
+  enable() {
+    this._enabled = true
+    return this
+  }
+
+  /**
+   * 禁用执行器
+   */
+  disable() {
+    this._enabled = false
+    return this
+  }
+
+  /**
+   * 是否启用
+   */
+  isEnabled() {
+    return this._enabled
+  }
+
+  /**
+   * 销毁
+   */
+  destroy() {
+    this.removeAllListeners()
+  }
+}
+
+module.exports = { ExecutorBase }

package/test-server.js

@@ -1,25 +1,25 @@
-const { serve } = require('@hono/node-server');
-const { Hono } = require('hono');
-
-const app = new Hono();
-
-// 简单路由
-app.get('/test', (c) => {
-  console.log('Handler called');
-  return c.json({ message: 'Hello World' });
-});
-
-const server = serve({
-  fetch: app.fetch,
-  port: 3001
-});
-
-server.on('request', (req) => {
-  console.log('Request:', req.method, req.url);
-});
-
-server.on('error', (err) => {
-  console.error('Server error:', err);
-});
-
-console.log('Server started on port 3001');
+const { serve } = require('@hono/node-server');
+const { Hono } = require('hono');
+
+const app = new Hono();
+
+// 简单路由
+app.get('/test', (c) => {
+  console.log('Handler called');
+  return c.json({ message: 'Hello World' });
+});
+
+const server = serve({
+  fetch: app.fetch,
+  port: 3001
+});
+
+server.on('request', (req) => {
+  console.log('Request:', req.method, req.url);
+});
+
+server.on('error', (err) => {
+  console.error('Server error:', err);
+});
+
+console.log('Server started on port 3001');

package/test.txt

@@ -1,3 +1,3 @@
-Hello from static resource test!
-This is a test file for verifying static resource serving.
-Timestamp: 2026-03-24
+Hello from static resource test!
+This is a test file for verifying static resource serving.
+Timestamp: 2026-03-24