foliko 1.0.77 → 1.0.78

package/plugins/session-plugin.js

@@ -31,20 +31,22 @@ class SessionPlugin extends Plugin {
     this.description = '会话管理插件，支持多会话隔离、历史记录、会话超时清理'
     this.priority = 5
 
-    this.system = true 
+    this.system = true
 
     this.config = {
       sessionTTL: config.sessionTTL || 30 * 60 * 1000,  // 30分钟
       maxSessions: config.maxSessions || 100,
       maxHistoryLength: config.maxHistoryLength || 150,  // 放宽到 150，Agent 已有智能压缩
-      autoCleanup: config.autoCleanup !== false,
-      cleanupInterval: config.cleanupInterval || 5 * 60 * 1000  // 5分钟
+      autoCleanup: config.autoCleanup||false,  // 默认不开启自动清理，避免误删会话
+      cleanupInterval: config.cleanupInterval || 5 * 60 * 1000,  // 5分钟
+      persistToStorage: config.persistToStorage !== false  // 默认持久化到 storage
     }
-
+    // console.log('SessionPlugin config:', this.config)
     this._framework = null
     this._sessions = new Map()
     this._cleanupTimer = null
     this._events = new EventEmitter()
+    this._storageKeyPrefix = 'session:'
   }
 
   install(framework) {
@@ -52,7 +54,108 @@ class SessionPlugin extends Plugin {
     return this
   }
 
+  /**
+   * 获取存储实例
+   * @private
+   */
+  _getStorage() {
+    if (!this._framework) return null;
+    return this._framework.pluginManager.get('storage');
+  }
+
+  /**
+   * 从 storage 加载会话数据
+   * @private
+   */
+  _loadFromStorage(sessionId) {
+    const storage = this._getStorage();
+    if (!storage) return null;
+
+    try {
+      const store = storage.getStore();
+      const data = store.get(this._storageKeyPrefix + sessionId);
+      if (data && data.messages) {
+        return data;
+      }
+    } catch (err) {
+      // 忽略加载错误
+    }
+    return null;
+  }
+
+  /**
+   * 保存会话数据到 storage
+   * @private
+   */
+  _saveToStorage(session) {
+    const storage = this._getStorage();
+    if (!storage || !this.config.persistToStorage) return;
+
+    try {
+      storage.setDirect(this._storageKeyPrefix + session.id, {
+        messages: session.messages,
+        variables: session.variables,
+        metadata: session.metadata,
+        createdAt: session.createdAt,
+        lastActive: session.lastActive
+      });
+    } catch (err) {
+      // 忽略保存错误
+    }
+  }
+
+  /**
+   * 从 storage 删除会话数据
+   * @private
+   */
+  _deleteFromStorage(sessionId) {
+    const storage = this._getStorage();
+    if (!storage) return;
+
+    try {
+      storage.deleteDirect(this._storageKeyPrefix + sessionId);
+    } catch (err) {
+      // 忽略删除错误
+    }
+  }
+
+  /**
+   * 从 storage 加载所有会话
+   * @private
+   */
+  _loadAllFromStorage() {
+    const storage = this._getStorage();
+    if (!storage) return;
+
+    try {
+      const store = storage.getStore();
+      // 遍历 storage 找出所有 session: 开头的键
+      for (const [key, value] of store.entries()) {
+        if (key.startsWith(this._storageKeyPrefix)) {
+          const sessionId = key.substring(this._storageKeyPrefix.length);
+          const sessionData = value;
+          if (sessionId && sessionData && sessionData.messages) {
+            // 恢复会话到内存
+            this._sessions.set(sessionId, {
+              id: sessionId,
+              messages: sessionData.messages || [],
+              variables: sessionData.variables || {},
+              metadata: sessionData.metadata || {},
+              createdAt: sessionData.createdAt ? new Date(sessionData.createdAt) : new Date(),
+              lastActive: sessionData.lastActive ? new Date(sessionData.lastActive) : new Date()
+            });
+          }
+        }
+      }
+      log.info(`Loaded ${this._sessions.size} sessions from storage`);
+    } catch (err) {
+      log.warn('Failed to load sessions from storage:', err.message);
+    }
+  }
+
   start(framework) {
+    // 从 storage 加载所有会话
+    this._loadAllFromStorage();
     // 注册会话管理工具
     framework.registerTool({
       name: 'session_create',
@@ -183,6 +286,7 @@ class SessionPlugin extends Plugin {
     }
 
     this._sessions.set(id, session)
+    this._saveToStorage(session)
     return session
   }
 
@@ -190,11 +294,28 @@ class SessionPlugin extends Plugin {
    * 获取会话
    */
   getSession(sessionId) {
-    const session = this._sessions.get(sessionId)
+    let session = this._sessions.get(sessionId)
     if (session) {
       session.lastActive = new Date()
+      return session
     }
-    return session
+
+    // 尝试从 storage 加载
+    const storageData = this._loadFromStorage(sessionId)
+    if (storageData) {
+      session = {
+        id: sessionId,
+        messages: storageData.messages || [],
+        variables: storageData.variables || {},
+        metadata: storageData.metadata || {},
+        createdAt: storageData.createdAt ? new Date(storageData.createdAt) : new Date(),
+        lastActive: new Date()
+      }
+      this._sessions.set(sessionId, session)
+      return session
+    }
+
+    return null
   }
 
   /**
@@ -221,6 +342,9 @@ class SessionPlugin extends Plugin {
       if (session.messages.length > this.config.maxHistoryLength) {
         session.messages = session.messages.slice(-this.config.maxHistoryLength)
       }
+
+      // 持久化到 storage
+      this._saveToStorage(session)
     }
     return session
   }
@@ -245,6 +369,7 @@ class SessionPlugin extends Plugin {
   deleteSession(sessionId) {
     const deleted = this._sessions.delete(sessionId)
     if (deleted) {
+      this._deleteFromStorage(sessionId)
       this._events.emit('session:deleted', sessionId)
     }
     return deleted
@@ -367,4 +492,4 @@ class SessionPlugin extends Plugin {
   }
 }
 
-module.exports = { SessionPlugin }
+module.exports = SessionPlugin

package/plugins/shell-executor-plugin.js

@@ -195,4 +195,4 @@ class ShellExecutorPlugin extends Plugin {
   }
 }
 
-module.exports = { ShellExecutorPlugin }
+module.exports = ShellExecutorPlugin

package/plugins/storage-plugin.js

@@ -223,6 +223,29 @@ class StoragePlugin extends Plugin {
     return this._store
   }
 
+  /**
+   * 直接设置值并自动持久化（供其他插件使用）
+   * @param {string} key - 键
+   * @param {any} value - 值
+   */
+  setDirect(key, value) {
+    this._store.set(key, value)
+    if (this.config.type === 'json') {
+      this._persistToFile()
+    }
+  }
+
+  /**
+   * 删除键并自动持久化（供其他插件使用）
+   * @param {string} key - 键
+   */
+  deleteDirect(key) {
+    this._store.delete(key)
+    if (this.config.type === 'json') {
+      this._persistToFile()
+    }
+  }
+
   reload(framework) {
     this._framework = framework
     this._store.clear()
@@ -238,4 +261,4 @@ class StoragePlugin extends Plugin {
   }
 }
 
-module.exports = { StoragePlugin }
+module.exports = StoragePlugin

package/plugins/subagent-plugin.js

@@ -841,6 +841,6 @@ class SubAgentManagerPlugin extends Plugin {
 }
 
 module.exports = {
-  SubAgentPlugin,
-  SubAgentManagerPlugin
+  SubAgentManagerPlugin,
+  SubAgentPlugin
 }

package/plugins/telegram-plugin.js

@@ -479,4 +479,4 @@ class TelegramPlugin extends Plugin {
   }
 }
 
-module.exports = { TelegramPlugin }
+module.exports = TelegramPlugin

package/plugins/think-plugin.js

@@ -22,7 +22,7 @@ class ThinkPlugin extends Plugin {
       maxReflectDepth: config.maxReflectDepth || 3,  // 最大反思深度
       enableContinuous: config.enableContinuous || false  // 是否启用持续思考
     }
-
+    this.tools = {}  // 存储注册的工具函数
     this._framework = null
     this._thoughts = []  // 思考记录
     this._reflectionChain = []  // 反思链
@@ -38,7 +38,7 @@ class ThinkPlugin extends Plugin {
 
   start(framework) {
     // 注册思考工具
-    framework.registerTool({
+    this.tools.think_now =  {
       name: 'think_now',
       description: '立即触发 LLM 主动思考（用于反思、自我检视、生成想法）',
       inputSchema: z.object({
@@ -49,9 +49,9 @@ class ThinkPlugin extends Plugin {
       execute: async (args) => {
         return await this._triggerThinking(args)
       }
-    })
+    }
 
-    framework.registerTool({
+    this.tools.think_continue = {
       name: 'think_continue',
       description: '让 LLM 持续思考模式（后台自动思考，定期输出结果）',
       inputSchema: z.object({
@@ -61,18 +61,18 @@ class ThinkPlugin extends Plugin {
       execute: async (args) => {
         return await this._startContinuousThinking(args)
       }
-    })
+    }
 
-    framework.registerTool({
+    this.tools.think_stop = {
       name: 'think_stop',
       description: '停止持续思考模式',
       inputSchema: z.object({}),
       execute: async () => {
         return this._stopContinuousThinking()
       }
-    })
+    }
 
-    framework.registerTool({
+    this.tools.think_get_thoughts = {
       name: 'think_get_thoughts',
       description: '获取思考历史记录',
       inputSchema: z.object({
@@ -86,7 +86,7 @@ class ThinkPlugin extends Plugin {
           total: this._thoughts.length
         }
       }
-    })
+    }
 
     return this
   }
@@ -342,4 +342,4 @@ ${topic || '接下来的行动'}
   }
 }
 
-module.exports = { ThinkPlugin }
+module.exports = ThinkPlugin

package/plugins/tools-plugin.js

@@ -193,4 +193,4 @@ class ToolsPlugin extends Plugin {
   }
 }
 
-module.exports = { ToolsPlugin }
+module.exports = ToolsPlugin

package/plugins/web-plugin.js

@@ -5,6 +5,7 @@
 
 const { Plugin } = require('../src/core/plugin-base')
 const { logger } = require('../src/utils/logger')
+const { runInSandbox } = require('../src/utils/sandbox')
 const log = logger.child('Web')
 const { z } = require('zod')
 const { serve } = require('@hono/node-server')
@@ -32,6 +33,8 @@ class WebPlugin extends Plugin {
     this._app = null
     this._framework = null
 
+    this.tools = {}
+
     // 数据存储（始终保持原始类型）
     this._routes = []           // 路由列表
     this._webhooks = new Map()  // webhook Map: id -> {id, path, prompt, sessionId}
@@ -73,7 +76,7 @@ class WebPlugin extends Plugin {
 
   _registerTools() {
     // 启动 Web 服务
-    this._framework.registerTool({
+    this.tools.web_start = {
       name: 'web_start',
       description: '启动 Web 服务',
       inputSchema: z.object({
@@ -81,18 +84,18 @@ class WebPlugin extends Plugin {
         host: z.string().optional().describe('主机地址，默认 0.0.0.0')
       }),
       execute: async (args) => this._startServer(args.port, args.host)
-    })
+    }
 
     // 停止 Web 服务
-    this._framework.registerTool({
+    this.tools.web_stop = {
       name: 'web_stop',
       description: '停止 Web 服务',
       inputSchema: z.object({}),
       execute: async () => this._stopServer()
-    })
+    }
 
     // 注册 HTTP 路由
-    this._framework.registerTool({
+    this.tools.web_register_route = {
       name: 'web_register_route',
       description: '注册 HTTP 路由',
       inputSchema: z.object({
@@ -107,10 +110,10 @@ class WebPlugin extends Plugin {
         description: z.string().optional().describe('路由描述')
       }),
       execute: async (args) => this._registerRoute(args.method, args.path, args.handler, args.description)
-    })
+    }
 
     // 注册 Webhook（自动生成 /webhook/{id} 链接）
-    this._framework.registerTool({
+    this.tools.web_register_webhook = {
       name: 'web_register_webhook',
       description: '注册 Webhook，接收的数据会交给 LLM 处理。自动生成唯一 URL',
       inputSchema: z.object({
@@ -118,10 +121,10 @@ class WebPlugin extends Plugin {
         awaitResponse: z.boolean().optional().describe('是否等待 LLM 处理完成再返回响应，默认 false')
       }),
       execute: async (args) => this._registerWebhook(args.prompt, args.awaitResponse)
-    })
+    }
 
     // 注册静态资源
-    this._framework.registerTool({
+    this.tools.web_register_static = {
       name: 'web_register_static',
       description: '注册静态资源文件夹',
       inputSchema: z.object({
@@ -133,18 +136,18 @@ class WebPlugin extends Plugin {
         }).optional()
       }),
       execute: async (args) => this._registerStatic(args.urlPath, args.folder, args.options)
-    })
+    }
 
     // 列出所有路由
-    this._framework.registerTool({
+    this.tools.web_list_routes = {
       name: 'web_list_routes',
       description: '列出所有已注册的路由和 Webhook',
       inputSchema: z.object({}),
       execute: async () => this._listRoutes()
-    })
+    }
 
     // 发送 HTTP 请求
-    this._framework.registerTool({
+    this.tools.web_request = {
       name: 'web_request',
       description: '发送 HTTP 请求',
       inputSchema: z.object({
@@ -154,7 +157,7 @@ class WebPlugin extends Plugin {
         headers: z.record(z.string()).optional().describe('请求头')
       }),
       execute: async (args) => this._sendRequest(args.method, args.path, args.body, args.headers)
-    })
+    }
   }
 
   // ==================== 服务器控制 ====================
@@ -241,9 +244,12 @@ class WebPlugin extends Plugin {
         }
       }
 
-      // 2. Webhook（精确匹配）
+      // 2. Webhook（仅接受 POST）
       const webhook = this._webhooks.get(pathname)
       if (webhook) {
+        if (c.req.method !== 'POST') {
+          return c.json({ success: false, error: 'Method Not Allowed. Webhook only accepts POST.' }, 405)
+        }
         const result = await this._handleWebhook(c, webhook)
         return c.json(result)
       }
@@ -336,7 +342,7 @@ class WebPlugin extends Plugin {
         }
 
         // 触发 webhook 处理完成事件
-        this._framework.emit('webhook:received', { webhook, data: webhookData, response: responseText, sessionId: finalSessionId })
+        this._framework.emit('webhook:processed', { webhook, data: webhookData, response: responseText, sessionId: finalSessionId })
       }).catch(err => {
         log.error(' Webhook error:', err.message)
       })
@@ -535,8 +541,33 @@ class WebPlugin extends Plugin {
 
   async _executeHandler(handlerCode, context, tools) {
     try {
+      // 辅助函数
+      const helpers = {
+        // 基础工具
+        echo: (val) => val,
+        json: (val) => JSON.stringify(val),
+        JSON: JSON,
+        // 日期时间
+        Date: Date,
+        now: () => Date.now(),
+        // 字符串
+        Str: String,
+        // 编码
+        btoa: (str) => Buffer.from(str).toString('base64'),
+        atob: (str) => Buffer.from(str, 'base64').toString(),
+        // 格式化
+        template: (str, vars) => str.replace(/\{\{(\w+)\}\}/g, (_, k) => vars[k] ?? `{{${k}}}`),
+        // 随机
+        uuid: () => Math.random().toString(36).substring(2) + Date.now().toString(36),
+        // HTTP 请求（通过 fetch）
+        fetch: async (url, options = {}) => {
+          const { method = 'GET', headers = {}, body } = options
+          const res = await fetch(url, { method, headers, body })
+          return { status: res.status, headers: Object.fromEntries(res.headers), body: await res.text() }
+        }
+      }
       // 使用沙箱执行用户代码，防止恶意代码执行
-      return await runInSandbox(handlerCode, { context, tools }, { timeout: 10000 })
+      return await runInSandbox(handlerCode, { context, tools, ...helpers }, { timeout: 10000 })
     } catch (err) {
       return { success: false, error: `Handler error: ${err.message}` }
     }
@@ -603,4 +634,4 @@ class WebPlugin extends Plugin {
   }
 }
 
-module.exports = { WebPlugin }
+module.exports = WebPlugin

package/plugins/weixin-plugin.js

@@ -543,4 +543,4 @@ class WeixinPlugin extends Plugin {
   }
 }
 
-module.exports = { WeixinPlugin }
+module.exports = WeixinPlugin