foliko 1.1.92 → 2.0.0

package/plugins/{python-executor-plugin.js → executors/python/index.js}

@@ -3,8 +3,8 @@
  * 使用 child_process 执行 Python 代码和脚本
  */
 
-const { Plugin } = require('../src/core/plugin-base')
-const { logger } = require('../src/utils/logger')
+const { Plugin } = require('../../../src/plugin/base')
+const { logger } = require('../../../src/common/logger')
 const log = logger.child('PythonExecutor')
 const { spawn } = require('child_process')
 const fs = require('fs')
@@ -21,13 +21,13 @@ class PythonExecutorPlugin extends Plugin {
     this.priority = 15
 
     this.config = {
-      pythonPath: config.pythonPath || 'python',  // python 或 python3
-      timeout: config.timeout || 120000,         // 2分钟超时
+      pythonPath: config.pythonPath || 'python',
+      timeout: config.timeout || 120000,
       baseDir: config.baseDir || '.foliko/python-scripts',
-      pipPath: config.pipPath || null             // 可选，自定义 pip 路径
+      pipPath: config.pipPath || null
     }
 
-    this.system = true 
+    this.system = true
 
     this._framework = null
     this._tempDir = null
@@ -36,7 +36,6 @@ class PythonExecutorPlugin extends Plugin {
   install(framework) {
     this._framework = framework
 
-    // 确保临时目录存在
     this._tempDir = path.join(os.tmpdir(), `vb-python-${process.pid}`)
     if (!fs.existsSync(this._tempDir)) {
       fs.mkdirSync(this._tempDir, { recursive: true })
@@ -46,7 +45,6 @@ class PythonExecutorPlugin extends Plugin {
   }
 
   start(framework) {
-    // 注册 python-execute 工具
     framework.registerTool({
       name: 'python-execute',
       description: '执行 Python 代码，禁止传入无用的emoji',
@@ -60,7 +58,6 @@ class PythonExecutorPlugin extends Plugin {
       }
     })
 
-    // 注册 python_script 工具
     framework.registerTool({
       name: 'python_script',
       description: '执行 Python 脚本文件',
@@ -74,7 +71,6 @@ class PythonExecutorPlugin extends Plugin {
       }
     })
 
-    // 注册 pip_install 工具
     framework.registerTool({
       name: 'pip_install',
       description: '安装 Python 包',
@@ -91,20 +87,14 @@ class PythonExecutorPlugin extends Plugin {
     return this
   }
 
-  /**
-   * 执行 Python 代码
-   * @private
-   */
   _executePython(code, timeout, inputData) {
     return new Promise((resolve) => {
       const startTime = Date.now()
       let output = ''
       let errorOutput = ''
 
-      // 创建临时脚本文件
       const tempFile = path.join(this._tempDir, `temp_${Date.now()}.py`)
 
-      // 注入 input_data 变量
       let inputDataSetup = ''
       if (inputData) {
         const inputDataJson = JSON.stringify(inputData).replace(/'/g, "\\'")
@@ -113,7 +103,6 @@ class PythonExecutorPlugin extends Plugin {
         inputDataSetup = `input_data = {}\n`
       }
 
-      // 包装代码，添加错误处理
       const wrappedCode = `
 import sys
 import traceback
@@ -143,14 +132,12 @@ except Exception:
       })
 
       proc.on('close', (code) => {
-        // 清理临时文件
         try {
           fs.unlinkSync(tempFile)
         } catch (e) { }
 
         const elapsed = Date.now() - startTime
 
-        // 限制返回数据大小，避免上下文超限（限制为 5000 字符）
         const MAX_OUTPUT_LENGTH = 5000
         let truncatedOutput = output
         let truncated = false
@@ -173,7 +160,6 @@ except Exception:
       })
 
       proc.on('error', (err) => {
-        // 清理临时文件
         try {
           fs.unlinkSync(tempFile)
         } catch (e) { }
@@ -191,7 +177,6 @@ except Exception:
             fs.unlinkSync(tempFile)
           } catch (e) { }
 
-          // 限制返回数据大小
           const MAX_OUTPUT_LENGTH = 5000
           const truncatedOutput = output.length > MAX_OUTPUT_LENGTH
             ? output.substring(0, MAX_OUTPUT_LENGTH) + `\n... [输出已截断，总长度 ${output.length} 字符]`
@@ -211,17 +196,12 @@ except Exception:
     })
   }
 
-  /**
-   * 执行 Python 脚本文件
-   * @private
-   */
   _executeScript(scriptPath, args, timeout) {
     return new Promise((resolve) => {
       const startTime = Date.now()
       let output = ''
       let errorOutput = ''
 
-      // 检查文件是否存在
       if (!fs.existsSync(scriptPath)) {
         resolve({
           success: false,
@@ -282,10 +262,6 @@ except Exception:
     })
   }
 
-  /**
-   * 安装 Python 包
-   * @private
-   */
   _pipInstall(packageName, upgrade, timeout) {
     return new Promise((resolve) => {
       const startTime = Date.now()
@@ -352,7 +328,6 @@ except Exception:
   }
 
   uninstall(framework) {
-    // 清理临时目录
     if (this._tempDir && fs.existsSync(this._tempDir)) {
       try {
         fs.rmSync(this._tempDir, { recursive: true, force: true })

package/plugins/{shell-executor-plugin.js → executors/shell/index.js}

@@ -3,7 +3,7 @@
  * 使用 child_process 执行终端命令
  */
 
-const { Plugin } = require('../src/core/plugin-base')
+const { Plugin } = require('../../../src/plugin/base')
 const { spawn } = require('child_process')
 const { z } = require('zod')
 
@@ -15,7 +15,7 @@ class ShellExecutorPlugin extends Plugin {
     this.description = 'Shell 执行器，用于运行终端命令和脚本'
     this.priority = 15
 
-    this.system = true 
+    this.system = true
 
     this.config = {
       timeout: config.timeout || 60000,
@@ -52,7 +52,6 @@ class ShellExecutorPlugin extends Plugin {
           let output = ''
           let errorOutput = ''
 
-          // 检测命令类型
           const isWindows = process.platform === 'win32'
           const shell = isWindows ? 'cmd.exe' : '/bin/sh'
           const shellArg = isWindows ? '/c' : '-c'
@@ -93,7 +92,6 @@ class ShellExecutorPlugin extends Plugin {
             })
           })
 
-          // 超时处理
           setTimeout(() => {
             if (!proc.killed) {
               proc.kill('SIGTERM')
@@ -112,7 +110,6 @@ class ShellExecutorPlugin extends Plugin {
       }
     })
 
-    // 注册 PowerShell 工具 (Windows)
     if (process.platform === 'win32') {
       framework.registerTool({
         name: 'powershell',

package/plugins/install/README.md

@@ -0,0 +1,9 @@
+# Install Plugin
+
+npm 包自动安装器。在插件加载时自动检测并安装缺失的依赖。
+
+## 行为
+
+- 插件安装 `install(framework)` 时扫描 `package.json` 中的依赖
+- 自动执行 `npm install` 安装缺失包
+- 失败时记录警告，不阻塞框架启动

package/plugins/{install-plugin.js → install/index.js}

@@ -6,8 +6,8 @@
 const { execSync } = require('child_process')
 const fs = require('fs')
 const path = require('path')
-const { Plugin } = require('../src/core/plugin-base')
-const { logger } = require('../src/utils/logger')
+const { Plugin } = require('../../src/plugin/base')
+const { logger } = require('../../src/common/logger')
 const log = logger.child('InstallPlugin')
 const { z } = require('zod')
 
@@ -20,7 +20,7 @@ class InstallPlugin extends Plugin {
 
     this._agentDir = config.agentDir || '.foliko' // 默认安装到 .foliko 目录
     this._nodeModulesDir = null
-    this.system = true 
+    this.system = true
   }
 
   install(framework) {