foliko 1.0.7 → 1.0.9

package/plugins/default-plugins.js

@@ -182,8 +182,29 @@ async function bootstrapDefaults(framework, config = {}) {
   // 合并 AI 配置
   const aiConfig = { ...agentConfig.ai, ...config.aiConfig }
 
+  // 核心插件列表（不能禁用，必须加载）
+  const CORE_PLUGINS = new Set([
+    'install', 'ai', 'storage', 'tools', 'workflow', 'skill-manager',
+    'mcp-executor', 'shell-executor', 'python-executor', 'session',
+    'audit', 'rules', 'scheduler', 'file-system', 'think',
+    'python-plugin-loader', 'telegram'
+  ])
+
+  // 辅助函数：检查插件是否应该加载（核心插件不能禁用）
+  const shouldLoad = (name) => {
+    if (framework.pluginManager.has(name)) {
+      console.log(`[Bootstrap] ${name} Plugin already loaded, skipping`)
+      return false
+    }
+    // 核心插件不能禁用
+    if (CORE_PLUGINS.has(name) && framework.pluginManager.isEnabled(name) === false) {
+      console.log(`[Bootstrap] ${name} is a core plugin, cannot be disabled`)
+    }
+    return true
+  }
+
   // 0. Install 工具插件（最先加载，让其他插件能用到它的 node_modules）
-  if (!framework.pluginManager.has('install')) {
+  if (shouldLoad('install')) {
     const { InstallPlugin } = require('./install-plugin')
     await framework.loadPlugin(new InstallPlugin({ agentDir: agentConfig.agentDir }))
     console.log('[Bootstrap] Install Plugin loaded')
@@ -197,10 +218,10 @@ async function bootstrapDefaults(framework, config = {}) {
 
   console.log('[Bootstrap] Loading default plugins...')
 
-  // 检查是否已经加载
-  if (framework.pluginManager.has('ai')) {
-    console.log('[Bootstrap] AI Plugin already loaded, skipping')
-  } else if (aiConfig.provider || aiConfig.model || aiConfig.apiKey) {
+  // AI 插件（如果已禁用则跳过）
+  if (!shouldLoad('ai') || !(aiConfig.provider || aiConfig.model || aiConfig.apiKey)) {
+    // 跳过或已禁用
+  } else {
     const { AIPlugin } = require('./ai-plugin')
     const aiPlugin = new AIPlugin({
       provider: aiConfig.provider || 'deepseek',
@@ -232,46 +253,38 @@ async function bootstrapDefaults(framework, config = {}) {
   }
 
   // 2. Storage 存储插件
-  if (!framework.pluginManager.has('storage')) {
+  if (shouldLoad('storage')) {
     const { StoragePlugin } = require('./storage-plugin')
     await framework.loadPlugin(new StoragePlugin())
     console.log('[Bootstrap] Storage Plugin loaded')
-  } else {
-    console.log('[Bootstrap] Storage Plugin already loaded, skipping')
   }
 
   // 3. 内置工具插件
-  if (!framework.pluginManager.has('tools')) {
+  if (shouldLoad('tools')) {
     const { ToolsPlugin } = require('./tools-plugin')
     await framework.loadPlugin(new ToolsPlugin())
     console.log('[Bootstrap] Tools Plugin loaded')
-  } else {
-    console.log('[Bootstrap] Tools Plugin already loaded, skipping')
   }
 
   // 4. 工作流插件
-  if (!framework.pluginManager.has('workflow')) {
+  if (shouldLoad('workflow')) {
     const { WorkflowPlugin } = require('../src/capabilities/workflow-engine')
     await framework.loadPlugin(new WorkflowPlugin())
     console.log('[Bootstrap] Workflow Plugin loaded')
-  } else {
-    console.log('[Bootstrap] Workflow Plugin already loaded, skipping')
   }
 
   // 5. Skill 管理器插件
-  if (!framework.pluginManager.has('skill-manager')) {
+  if (shouldLoad('skill-manager')) {
     if (skillsDirs.length > 0) {
       const { SkillManagerPlugin } = require('../src/capabilities/skill-manager')
       // 传递所有 skills 目录
       await framework.loadPlugin(new SkillManagerPlugin({ skillsDirs }))
       console.log('[Bootstrap] Skill Manager loaded')
     }
-  } else {
-    console.log('[Bootstrap] Skill Manager already loaded, skipping')
   }
 
   // 6. MCP 执行器插件（始终加载，确保 mcp_reload 工具可用）
-  if (!framework.pluginManager.has('mcp-executor')) {
+  if (shouldLoad('mcp-executor')) {
     const mcpServers = Object.entries(agentConfig.mcpServers || {})
     const servers = mcpServers.map(([name, cfg]) => ({
       ...cfg,
@@ -285,93 +298,73 @@ async function bootstrapDefaults(framework, config = {}) {
     const { MCPExecutorPlugin } = require('../src/executors/mcp-executor')
     await framework.loadPlugin(new MCPExecutorPlugin({ servers }))
     console.log(`[Bootstrap] MCP Executor loaded${servers.length > 0 ? ` (${servers.length} servers)` : ' (no servers)'}`)
-  } else {
-    console.log('[Bootstrap] MCP Executor already loaded, skipping')
   }
 
   // 7. Shell 执行器插件
-  if (!framework.pluginManager.has('shell-executor')) {
+  if (shouldLoad('shell-executor')) {
     const { ShellExecutorPlugin } = require('./shell-executor-plugin')
     await framework.loadPlugin(new ShellExecutorPlugin())
     console.log('[Bootstrap] Shell Executor loaded')
-  } else {
-    console.log('[Bootstrap] Shell Executor already loaded, skipping')
   }
 
   // 8. Python 执行器插件
-  if (!framework.pluginManager.has('python-executor')) {
+  if (shouldLoad('python-executor')) {
     const { PythonExecutorPlugin } = require('./python-executor-plugin')
     await framework.loadPlugin(new PythonExecutorPlugin())
     console.log('[Bootstrap] Python Executor loaded')
-  } else {
-    console.log('[Bootstrap] Python Executor already loaded, skipping')
   }
 
   // 9. Session 会话管理插件
-  if (!framework.pluginManager.has('session')) {
+  if (shouldLoad('session')) {
     const { SessionPlugin } = require('./session-plugin')
     await framework.loadPlugin(new SessionPlugin())
     console.log('[Bootstrap] Session Plugin loaded')
-  } else {
-    console.log('[Bootstrap] Session Plugin already loaded, skipping')
   }
 
   // 10. Audit 审计日志插件
-  if (!framework.pluginManager.has('audit')) {
+  if (shouldLoad('audit')) {
     const { AuditPlugin } = require('./audit-plugin')
     await framework.loadPlugin(new AuditPlugin())
     console.log('[Bootstrap] Audit Plugin loaded')
-  } else {
-    console.log('[Bootstrap] Audit Plugin already loaded, skipping')
   }
 
   // 10. Rules 规则引擎插件
-  if (!framework.pluginManager.has('rules')) {
+  if (shouldLoad('rules')) {
     const { RulesPlugin } = require('./rules-plugin')
     await framework.loadPlugin(new RulesPlugin())
     console.log('[Bootstrap] Rules Plugin loaded')
-  } else {
-    console.log('[Bootstrap] Rules Plugin already loaded, skipping')
   }
 
   // 11. Scheduler 定时任务插件
-  if (!framework.pluginManager.has('scheduler')) {
+  if (shouldLoad('scheduler')) {
     const { SchedulerPlugin } = require('./scheduler-plugin')
     await framework.loadPlugin(new SchedulerPlugin())
     console.log('[Bootstrap] Scheduler Plugin loaded')
-  } else {
-    console.log('[Bootstrap] Scheduler Plugin already loaded, skipping')
   }
 
   // 11. FileSystem 文件系统插件
-  if (!framework.pluginManager.has('file-system')) {
+  if (shouldLoad('file-system')) {
     const { FileSystemPlugin } = require('./file-system-plugin')
     await framework.loadPlugin(new FileSystemPlugin())
     console.log('[Bootstrap] FileSystem Plugin loaded')
-  } else {
-    console.log('[Bootstrap] FileSystem Plugin already loaded, skipping')
   }
 
   // 12. Think 主动思考插件
-  if (!framework.pluginManager.has('think')) {
+  if (shouldLoad('think')) {
     const { ThinkPlugin } = require('./think-plugin')
     await framework.loadPlugin(new ThinkPlugin())
     console.log('[Bootstrap] Think Plugin loaded')
-  } else {
-    console.log('[Bootstrap] Think Plugin already loaded, skipping')
   }
 
   // 12.5 Python 插件加载器
-  if (!framework.pluginManager.has('python-plugin-loader')) {
+  if (shouldLoad('python-plugin-loader')) {
     const { PythonPluginLoader } = require('./python-plugin-loader')
     await framework.loadPlugin(new PythonPluginLoader({ agentDir: agentConfig.agentDir }))
     console.log('[Bootstrap] Python Plugin Loader loaded')
-  } else {
-    console.log('[Bootstrap] Python Plugin Loader already loaded, skipping')
   }
 
   // 12.6 Telegram 插件（如果配置了Token）
-  if (!framework.pluginManager.has('telegram')) {
+  if (shouldLoad('telegram')) {
     const telegramToken = process.env.TELEGRAM_BOT_TOKEN || agentConfig.telegram?.botToken
     if (telegramToken) {
       const { Plugin } = require('../src/core/plugin-base')
@@ -380,8 +373,6 @@ async function bootstrapDefaults(framework, config = {}) {
       await framework.loadPlugin(new TelegramPlugin({ botToken: telegramToken }))
       console.log('[Bootstrap] Telegram Plugin loaded')
     }
-  } else {
-    console.log('[Bootstrap] Telegram Plugin already loaded, skipping')
   }
 
   // 13. 加载自定义插件
@@ -399,6 +390,80 @@ async function bootstrapDefaults(framework, config = {}) {
   console.log('[Bootstrap] Tools:', framework.getTools().map(t => t.name))
 }
 
+/**
+ * 解析插件路径
+ * 支持两种结构：
+ * 1. 文件夹结构: .agent/plugins/my-plugin/index.js
+ * 2. 单文件结构: .agent/plugins/my-plugin.js
+ * @param {string} pluginsDir - 插件目录
+ * @param {string} name - 插件名称
+ * @returns {{path: string, type: 'folder'|'file'}|null} 插件路径和类型
+ */
+function resolvePluginPath(pluginsDir, name) {
+  const folderPath = path.join(pluginsDir, name)
+  const filePath = path.join(pluginsDir, `${name}.js`)
+
+  // 文件夹优先
+  if (fs.existsSync(folderPath) && fs.statSync(folderPath).isDirectory()) {
+    const pkgPath = path.join(folderPath, 'package.json')
+    if (fs.existsSync(pkgPath)) {
+      try {
+        const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'))
+        const main = pkg.main || 'index.js'
+        const mainPath = path.join(folderPath, main)
+        if (fs.existsSync(mainPath)) {
+          return { path: mainPath, type: 'folder' }
+        }
+      } catch (err) {
+        console.warn(`[resolvePluginPath] Failed to parse package.json for ${name}:`, err.message)
+      }
+    }
+    // 默认加载 index.js
+    const indexPath = path.join(folderPath, 'index.js')
+    if (fs.existsSync(indexPath)) {
+      return { path: indexPath, type: 'folder' }
+    }
+    console.warn(`[resolvePluginPath] No entry point found for plugin folder: ${name}`)
+    return null
+  }
+
+  // 单文件回退
+  if (fs.existsSync(filePath)) {
+    return { path: filePath, type: 'file' }
+  }
+
+  return null
+}
+
+/**
+ * 扫描插件目录，返回所有插件名称
+ * @param {string} pluginsDir - 插件目录
+ * @returns {string[]} 插件名称列表
+ */
+function scanPluginNames(pluginsDir) {
+  if (!fs.existsSync(pluginsDir)) {
+    return []
+  }
+
+  const names = new Set()
+  const entries = fs.readdirSync(pluginsDir, { withFileTypes: true })
+
+  for (const entry of entries) {
+    if (entry.isDirectory()) {
+      // 文件夹插件
+      names.add(entry.name)
+    } else if (entry.isFile() && entry.name.endsWith('.js')) {
+      // 单文件插件（排除与文件夹同名的）
+      const baseName = entry.name.replace(/\.js$/, '')
+      if (!names.has(baseName)) {
+        names.add(baseName)
+      }
+    }
+  }
+
+  return Array.from(names)
+}
+
 async function loadCustomPlugins(framework, agentConfig) {
   // 加载 .agent/plugins 目录下的自定义插件
   const pluginsDir = path.resolve(process.cwd(), '.agent', 'plugins')
@@ -407,11 +472,18 @@ async function loadCustomPlugins(framework, agentConfig) {
     return
   }
 
-  const files = fs.readdirSync(pluginsDir).filter(f => f.endsWith('.js'))
+  // 扫描所有插件名称（支持文件夹和单文件）
+  const pluginNames = scanPluginNames(pluginsDir)
 
-  for (const file of files) {
+  for (const pluginName of pluginNames) {
     try {
-      const pluginPath = path.join(pluginsDir, file)
+      const resolved = resolvePluginPath(pluginsDir, pluginName)
+      if (!resolved) {
+        console.warn(`[Bootstrap] Cannot resolve plugin: ${pluginName}`)
+        continue
+      }
+
+      const { path: pluginPath, type } = resolved
 
       // 清除缓存
       delete require.cache[require.resolve(pluginPath)]
@@ -430,18 +502,24 @@ async function loadCustomPlugins(framework, agentConfig) {
       // 获取插件名称
       const tempPlugin = typeof plugin === 'function' && plugin.prototype?.name
         ? new plugin() : plugin
-      const pluginName = tempPlugin.name || file.replace('.js', '')
+      const resolvedPluginName = tempPlugin.name || pluginName
 
       // 如果插件已加载且已启动，跳过
-      if (framework.pluginManager.has(pluginName) &&
-          framework.pluginManager.get(pluginName)?._started) {
+      if (framework.pluginManager.has(resolvedPluginName) &&
+          framework.pluginManager.get(resolvedPluginName)?._started) {
+        continue
+      }
+
+      // 如果插件被禁用（在 state 文件中 enabled: false），跳过
+      if (framework.pluginManager.isEnabled(resolvedPluginName) === false) {
+        console.log(`[Bootstrap] Custom plugin '${resolvedPluginName}' is disabled, skipping`)
         continue
       }
 
-      console.log(`[Bootstrap] Loading custom plugin: ${file}`)
+      console.log(`[Bootstrap] Loading custom plugin: ${pluginName} (${type})`)
       await framework.loadPlugin(plugin)
     } catch (err) {
-      console.error(`[Bootstrap] Failed to load plugin ${file}:`, err.message)
+      console.error(`[Bootstrap] Failed to load plugin ${pluginName}:`, err.message)
     }
   }
 }
@@ -450,5 +528,7 @@ module.exports = {
   DefaultPlugins,
   loadAgentConfig,
   bootstrapDefaults,
-  loadCustomPlugins
+  loadCustomPlugins,
+  resolvePluginPath,
+  scanPluginNames
 }