foliko 1.0.77 → 1.0.78

package/plugins/install-plugin.js

@@ -196,4 +196,4 @@ class InstallPlugin extends Plugin {
   }
 }
 
-module.exports = { InstallPlugin }
+module.exports = InstallPlugin

package/plugins/python-executor-plugin.js

@@ -365,4 +365,4 @@ except Exception:
   }
 }
 
-module.exports = { PythonExecutorPlugin }
+module.exports = PythonExecutorPlugin

package/plugins/python-plugin-loader.js

@@ -73,24 +73,9 @@ class PythonPluginLoader extends Plugin {
     // 先设置 framework 引用（供 _loadPythonPlugins 使用）
     this._framework = framework
 
-    // 加载所有 Python 插件（会注册工具）
+    // 加载所有 Python 插件（会注册工具到 ExtensionExecutor）
     this._loadPythonPlugins()
 
-    // 注册 python_plugin 工具
-    framework.registerTool({
-      name: 'python_plugin',
-      description: '执行 Python 插件工具（当工具未注册时使用）',
-      inputSchema: z.object({
-        plugin: z.string().describe('插件名称（不含 .py）'),
-        tool: z.string().describe('工具名称'),
-        params: z.record(z.any()).describe('工具参数')
-      }),
-      execute: async (args) => {
-        const { plugin, tool, params } = args
-        return this._executePythonTool(plugin, tool, params)
-      }
-    })
-
     // 监听 agent 创建事件，附加 Python 插件信息到系统提示词
     framework.on('agent:created', (agent) => {
       this._refreshAgentPythonPluginsPrompt(agent)
@@ -116,11 +101,11 @@ class PythonPluginLoader extends Plugin {
       return ''
     }
 
-    let desc = '【Python 插件工具】\n'
-    desc += '可以直接调用以下 Python 插件工具：\n\n'
+    let desc = '【Python 插件】\n'
+    desc += 'Python 插件通过 ext_call 调用：\n\n'
 
     for (const [name, plugin] of this._pythonPlugins) {
-      desc += `[${plugin.info.name}] ${plugin.info.description || ''}\n`
+      desc += `插件: ${plugin.info.name} - ${plugin.info.description || ''}\n`
       if (plugin.info.tools && Array.isArray(plugin.info.tools)) {
         for (const tool of plugin.info.tools) {
           const paramsStr = Object.keys(tool.params || {}).join(', ') || '无参数'
@@ -130,7 +115,7 @@ class PythonPluginLoader extends Plugin {
       desc += '\n'
     }
 
-    desc += '调用格式：python_plugin({ plugin: "插件名", tool: "工具名", params: {...} })\n'
+    desc += '调用格式: ext_call({ plugin: "插件名", tool: "工具名", args: {...} })\n'
     return desc.trim()
   }
 
@@ -139,7 +124,7 @@ class PythonPluginLoader extends Plugin {
    */
   _refreshAgentPythonPluginsPrompt(agent) {
     const existingPrompt = agent._originalPrompt || ''
-    if (existingPrompt.includes('[Python 插件工具]')) {
+    if (existingPrompt.includes('【Python 插件】')) {
       return
     }
 
@@ -216,21 +201,21 @@ class PythonPluginLoader extends Plugin {
   }
 
   /**
-   * 注册 Python 插件的工具到框架
+   * 注册 Python 插件的工具
    */
   _registerPythonTool(pluginName, tool) {
     if (!tool.name) return
 
     try {
-      this._framework.registerTool({
+      this.registerTool({
         name: tool.name,
-        description: tool.description || `${tool.name} (from ${pluginName})`,
+        description: tool.description || '',
+        pluginName: pluginName,
         inputSchema: this._parseToolParams(tool.params || {}),
         execute: async (args) => {
           return this._executePythonTool(pluginName, tool.name, args)
         }
       })
-      //log.info(` Registered tool: ${tool.name}`)
     } catch (err) {
       log.error(` Failed to register tool ${tool.name}:`, err.message)
     }
@@ -270,22 +255,59 @@ class PythonPluginLoader extends Plugin {
 
   /**
    * 加载单个 Python 插件的元信息
+   * 支持 PLUGIN 和 TOOLS 格式
    */
   _loadPythonPluginMeta(pluginPath) {
     const code = fs.readFileSync(pluginPath, 'utf-8')
 
-    // 找到 plugin_info = {
-    const startIdx = code.indexOf('plugin_info')
-    if (startIdx === -1) {
-      log.warn(` ${path.basename(pluginPath)}: no plugin_info found`)
+    const pluginIdx = code.indexOf('PLUGIN')
+    const toolsIdx = code.indexOf('TOOLS')
+
+    if (pluginIdx === -1 && toolsIdx === -1) {
+      console.warn(`[PythonPluginLoader] ${path.basename(pluginPath)}: no PLUGIN or TOOLS found`)
+      return null
+    }
+
+    try {
+      const info = {}
+
+      // 解析 PLUGIN
+      if (pluginIdx !== -1) {
+        const pluginData = this._extractPythonDict(code, pluginIdx)
+        if (pluginData && pluginData.name) {
+          info.name = pluginData.name
+          info.version = pluginData.version || '1.0.0'
+          info.description = pluginData.description || ''
+        }
+      }
+
+      // 解析 TOOLS
+      if (toolsIdx !== -1) {
+        const toolsData = this._extractPythonList(code, toolsIdx)
+        if (toolsData && Array.isArray(toolsData)) {
+          info.tools = toolsData
+        }
+      }
+
+      if (!info.name || !info.tools) {
+        console.warn(`[PythonPluginLoader] ${path.basename(pluginPath)}: invalid format - name: ${info.name}, tools: ${info.tools ? info.tools.length : 0}`)
+        return null
+      }
+
+      return info
+    } catch (err) {
+      console.warn(`[PythonPluginLoader] Failed to parse ${path.basename(pluginPath)}:`, err.message)
       return null
     }
+  }
 
-    // 从 plugin_info 后开始，找到第一个 { 的位置
+  /**
+   * 从指定位置提取 Python 字典
+   */
+  _extractPythonDict(code, startIdx) {
     const braceStart = code.indexOf('{', startIdx)
     if (braceStart === -1) return null
 
-    // 使用栈匹配找到对应的 }
     let braceCount = 0
     let endIdx = -1
     for (let i = braceStart; i < code.length; i++) {
@@ -299,110 +321,234 @@ class PythonPluginLoader extends Plugin {
       }
     }
 
-    if (endIdx === -1) {
-      log.warn(` ${path.basename(pluginPath)}: unclosed brace`)
-      return null
-    }
-
-    try {
-      // 提取并清理 plugin_info 内容
-      let infoStr = code.substring(braceStart, endIdx + 1)
-
-      // 移除 Python 注释
-      infoStr = infoStr.replace(/#.*$/gm, '')
+    if (endIdx === -1) return null
+    return this._parsePythonDict(code.substring(braceStart, endIdx + 1))
+  }
 
-      // 转换为 JS 兼容的格式
-      infoStr = infoStr
-        .replace(/True/g, 'true')
-        .replace(/False/g, 'false')
-        .replace(/None/g, 'null')
-        .replace(/'/g, '"')
+  /**
+   * 从指定位置提取 Python 列表
+   */
+  _extractPythonList(code, startIdx) {
+    const bracketStart = code.indexOf('[', startIdx)
+    if (bracketStart === -1) return null
 
-      const info = JSON.parse(infoStr)
-      return info
-    } catch (err) {
-      log.warn(` Failed to parse ${path.basename(pluginPath)}:`, err.message)
-      return null
+    let bracketCount = 0
+    let endIdx = -1
+    for (let i = bracketStart; i < code.length; i++) {
+      if (code[i] === '[') bracketCount++
+      else if (code[i] === ']') {
+        bracketCount--
+        if (bracketCount === 0) {
+          endIdx = i
+          break
+        }
+      }
     }
+
+    if (endIdx === -1) return null
+    return this._parsePythonList(code.substring(bracketStart, endIdx + 1))
   }
 
   /**
-   * 解析单个值
+   * 解析 Python 字典为 JS 对象
    */
-  _parseValue(str) {
-    str = str.trim()
-    if (!str) return null
+  _parsePythonDict(str) {
+    str = str.replace(/#.*$/gm, '').trim()
+    if (!str || str === '{}') return {}
 
-    // 字典
-    if (str.startsWith('{')) {
-      return this._parseDict(str)
+    // 直接尝试 JSON.parse（PLUGIN 字典是有效的 JSON 格式）
+    try {
+      return JSON.parse(str)
+    } catch {
+      // 如果失败，使用手动解析
     }
 
-    // 字符串
-    if (str.startsWith('"') || str.startsWith("'")) {
-      return str.slice(1, -1)
-    }
+    const result = {}
+    let i = 0
+    let key = null
+    let valueStart = -1
+    let depth = 0
+    let inString = false
+    let stringChar = null
+    let escaped = false
 
-    // 布尔值
-    if (str === 'True') return true
-    if (str === 'False') return false
-    if (str === 'None') return null
+    while (i < str.length) {
+      const char = str[i]
 
-    // 数字
-    if (!isNaN(str)) return Number(str)
+      if (escaped) {
+        escaped = false
+        i++
+        continue
+      }
 
-    return str
+      if (char === '\\' && inString) {
+        escaped = true
+        i++
+        continue
+      }
+
+      if ((char === '"' || char === "'") && !inString) {
+        inString = true
+        stringChar = char
+        i++
+        continue
+      }
+
+      if (inString && char === stringChar) {
+        inString = false
+        i++
+        continue
+      }
+
+      if (inString) {
+        i++
+        continue
+      }
+
+      if (char === '{' || char === '[') {
+        if (depth === 0 && char === '{') {
+          valueStart = i + 1
+        }
+        depth++
+        i++
+        continue
+      }
+      if (char === '}' || char === ']') {
+        if (depth > 0) {
+          depth--
+          if (depth === 0 && char === '}') {
+            if (key !== null && valueStart !== -1) {
+              const valueStr = str.substring(valueStart, i).trim()
+              if (valueStr) result[key] = this._parseValue(valueStr)
+            }
+          }
+        }
+        i++
+        continue
+      }
+      if (depth > 0) {
+        i++
+        continue
+      }
+
+      if (char === ':') {
+        key = str.substring(valueStart, i).trim().replace(/["']/g, '')
+        valueStart = i + 1
+        i++
+        continue
+      }
+
+      if (char === ',') {
+        if (key !== null && valueStart !== -1) {
+          const valueStr = str.substring(valueStart, i).trim()
+          if (valueStr) result[key] = this._parseValue(valueStr)
+        }
+        key = null
+        valueStart = i + 1
+        i++
+        continue
+      }
+
+      i++
+    }
+
+    return result
   }
 
   /**
-   * 简单解析 Python 字典为 JS 对象
+   * 解析 Python 列表为 JS 数组
    */
-  _parseDict(str) {
-    // 移除注释并清理
+  _parsePythonList(str) {
     str = str.replace(/#.*$/gm, '').trim()
-    if (!str) return {}
+    if (!str || str === '[]') return []
 
-    const result = {}
+    // 直接尝试 JSON.parse（TOOLS 列表是有效的 JSON 格式）
+    try {
+      return JSON.parse(str)
+    } catch {
+      // 如果失败，使用手动解析
+    }
+
+    const result = []
     let i = 0
-    let currentKey = null
-    let currentValue = ''
+    let itemStart = 1
+    let depth = 0
     let inString = false
     let stringChar = null
+    let escaped = false
 
     while (i < str.length) {
       const char = str[i]
 
-      // 处理字符串
-      if ((char === '"' || char === "'") && str[i-1] !== '\\') {
-        if (!inString) {
-          inString = true
-          stringChar = char
-        } else if (char === stringChar) {
-          inString = false
-          stringChar = null
-        }
+      if (escaped) {
+        escaped = false
+        i++
+        continue
+      }
+
+      if (char === '\\' && inString) {
+        escaped = true
+        i++
+        continue
+      }
+
+      if ((char === '"' || char === "'") && !inString) {
+        inString = true
+        stringChar = char
+        i++
+        continue
+      }
+
+      if (inString && char === stringChar) {
+        inString = false
+        i++
+        continue
       }
 
-      // 如果不在字符串内
-      if (!inString) {
-        // 找到键
-        if (currentKey === null && char === ':') {
-          currentKey = currentValue.trim().replace(/^["']|["']$/g, '')
-          currentValue = ''
+      if (inString) {
+        i++
+        continue
+      }
+
+      if (char === '{' || char === '[') {
+        if (depth === 0) itemStart = i
+        depth++
+        i++
+        continue
+      }
+      if (char === '}' || char === ']') {
+        if (depth > 0) {
+          depth--
+          if (depth === 0) {
+            const itemStr = str.substring(itemStart, i + 1).trim()
+            if (itemStr && itemStr !== ',') {
+              if (itemStr.startsWith('{')) {
+                result.push(this._parsePythonDict(itemStr))
+              } else {
+                result.push(this._parseValue(itemStr))
+              }
+            }
+            itemStart = i + 1
+          }
         }
-        // 找到值的结尾（逗号或右括号）
-        else if (char === ',' || char === '}') {
-          if (currentKey !== null) {
-            const value = currentValue.trim().replace(/,$/, '')
-            result[currentKey] = this._parseValue(value)
+        i++
+        continue
+      }
+      if (depth > 0) {
+        i++
+        continue
+      }
+
+      if (char === ',') {
+        const itemStr = str.substring(itemStart, i).trim()
+        if (itemStr) {
+          if (itemStr.startsWith('{')) {
+            result.push(this._parsePythonDict(itemStr))
+          } else {
+            result.push(this._parseValue(itemStr))
           }
-          currentKey = null
-          currentValue = ''
-        } else {
-          currentValue += char
         }
-      } else {
-        currentValue += char
+        itemStart = i + 1
       }
 
       i++
@@ -411,6 +557,30 @@ class PythonPluginLoader extends Plugin {
     return result
   }
 
+  /**
+   * 解析单个值
+   */
+  _parseValue(str) {
+    str = str.trim()
+    if (!str) return null
+
+    if (str.startsWith('{')) {
+      return this._parsePythonDict(str)
+    }
+
+    if (str.startsWith('"') || str.startsWith("'")) {
+      return str.slice(1, -1)
+    }
+
+    if (str === 'True') return true
+    if (str === 'False') return false
+    if (str === 'None') return null
+
+    if (!isNaN(str)) return Number(str)
+
+    return str
+  }
+
   /**
    * 执行 Python 插件工具
    */
@@ -478,4 +648,4 @@ print(result)
   }
 }
 
-module.exports = { PythonPluginLoader }
+module.exports = PythonPluginLoader

package/plugins/rules-plugin.js

@@ -292,4 +292,4 @@ class RulesPlugin extends Plugin {
   }
 }
 
-module.exports = { RulesPlugin }
+module.exports = RulesPlugin

package/plugins/scheduler-plugin.js

@@ -688,4 +688,4 @@ class SchedulerPlugin extends Plugin {
   }
 }
 
-module.exports = { SchedulerPlugin }
+module.exports = SchedulerPlugin