foliko 2.0.2 → 2.0.3

package/src/agent/sub.js

@@ -27,10 +27,10 @@ class SubAgent extends BaseAgent {
     this.baseURL = config.baseURL;
     this.providerOptions = config.providerOptions || {};
 
-    this.defaulTools = ['ext_skill', 'loadSkill', 'ext_call', 'subagent_call', 'mcp_call', 'mcp_tool_schema'];
+    this.defaulTools = ['ext_skill', 'skill_load', 'ext_call', 'subagent_call', 'mcp_call', 'mcp_tool_schema'];
     this.bindTools = {
       read: 'read_file', write: 'write_file', edit: 'modify_file',
-      glob: 'read_directory', grep: 'search_file', bash: 'bash',
+      glob: 'read_directory', grep: 'search_file', bash: 'shell_exec',
     };
 
     this._customSystemPrompt = config.systemPrompt || null;
@@ -39,24 +39,13 @@ class SubAgent extends BaseAgent {
     this.maxRetries = config.maxRetries ?? 2;
     this.retryDelay = config.retryDelay ?? 5000;
     this.disableTools = config.disableTools ?? false;
-    this._promptParts = [];
+    this.hidden = config.hidden || false;  // 隐藏子Agent，不在指令系统中显示
     this._isSubagent = true;
 
     this.providerOptions.deepseek = this.providerOptions.deepseek || {};
     this.providerOptions.deepseek.thinking = { type: 'disabled' };
 
-    if (this.framework) {
-      this.framework.once('framework:ready', () => {
-        const extExecutor = this.framework?.pluginManager?.get('extension-executor');
-        extExecutor?._refreshAllAgentsExtPrompt?.(this.framework);
-      });
-    }
-  }
-
-  registerPromptPart(name, priority = 100, provider) {
-    this._promptParts.push({ name, priority, provider });
-    this._promptParts.sort((a, b) => a.priority - b.priority);
-    return this;
+    // 扩展工具 prompt 由 _syncPromptParts 同步到 promptRegistry，无需显式刷新
   }
 
   _validateMessagesPairing(messages) { return validateAll(messages); }
@@ -74,7 +63,15 @@ class SubAgent extends BaseAgent {
 
   _getAIProvider() {
     const { createAI } = require('../llm/provider');
-    return createAI({ provider: this.provider, model: this.model, apiKey: this.apiKey, baseURL: this.baseURL });
+    // 优先从 framework 的 ai 插件拿最新配置（避免构造时拿到 stale apiKey）
+    const aiPlugin = this.framework?.pluginManager?.get('ai');
+    const aiConfig = aiPlugin ? aiPlugin.getConfig() : {};
+    return createAI({
+      provider: aiConfig.provider || this.provider,
+      model: aiConfig.model || this.model,
+      apiKey: aiConfig.apiKey || this.apiKey,
+      baseURL: aiConfig.baseURL || this.baseURL,
+    });
   }
 
   _buildAITools() {
@@ -111,15 +108,13 @@ class SubAgent extends BaseAgent {
       const mainPrompt = mainAgent.getOriginalPrompt();
       if (mainPrompt) { lines.push('## 主Agent的系统提示词'); lines.push(mainPrompt); lines.push(''); }
     }
-    const subagentManager = this.framework?.pluginManager?.get('subagent-manager');
-    if (subagentManager?._buildDescription) lines.push(subagentManager._buildDescription());
     lines.push('');
-    const extExecutor = this.framework?.pluginManager?.get('extension-executor');
-    const extDesc = extExecutor?._buildExtensionsDescription?.();
-    if (extDesc) { lines.push(extDesc); lines.push(''); }
-    for (const part of this._promptParts) {
+    // 渲染通过 promptRegistry 注册的 prompt part（按 slot/order 排序）
+    // 扩展工具描述、子Agent 描述等都由 _syncPromptParts 同步到 promptRegistry，
+    // 无需再单独硬编码调用 _buildExtensionsDescription / _buildDescription
+    for (const part of (this.promptRegistry?.list() || [])) {
       try {
-        const content = typeof part.provider === 'function' ? part.provider() : '';
+        const content = part.get();
         if (content?.trim()) lines.push('', content.trim());
       } catch (err) {
         logger.warn(`[SubAgent:${this.name}] Prompt part '${part.name}' failed:`, err.message);
@@ -127,7 +122,7 @@ class SubAgent extends BaseAgent {
     }
     lines.push('', '## 核心职责', `- **专注本职**：只完成与 ${this.role} 相关的任务`, '- **不越界**：不要代替其他子Agent完成任务', '- **返回结果**：返回简洁明确的操作结果', '');
     lines.push('当你被调用时，你应该：', '1. 仔细理解任务要求', '2. 如果任务不在职责范围内，返回"此任务不在我的职责范围内"', '3. 使用你的工具集完成任务', '4. 返回完整结果');
-    lines.push('', '## 禁止事项', '- 处理本职外的任务', '- 代替其他子Agent执行操作', '- 在回复中透露内部实现细节', '- 不先调用 ext_skill/loadSkill 就直接使用 ext_call');
+    lines.push('', '## 禁止事项', '- 处理本职外的任务', '- 代替其他子Agent执行操作', '- 在回复中透露内部实现细节', '- 不先调用 ext_skill/skill_load 就直接使用 ext_call');
     return lines.join('\n');
   }
 

package/src/cli/commands/plugin.js

@@ -5,70 +5,11 @@
 
 const fs = require('fs');
 const path = require('path');
-const { execSync } = require('child_process');
 const https = require('https');
 const http = require('http');
-const { DEFAULT_REPO, shouldIgnore } = require('../utils/plugin-config');
+const { DEFAULT_REPO, shouldIgnore, copyDirRecursive, parseGitUrl, gitCommand } = require('../../utils');
 const { AGENT_DIR_NAME } = require('../utils/config');
 
-/**
- * 递归复制目录（带过滤）
- */
-function copyDirRecursive(src, dest, ignorePatterns = []) {
-  if (!fs.existsSync(src)) return;
-
-  fs.mkdirSync(dest, { recursive: true });
-
-  const entries = fs.readdirSync(src, { withFileTypes: true });
-
-  for (const entry of entries) {
-    const srcPath = path.join(src, entry.name);
-    const destPath = path.join(dest, entry.name);
-
-    // 检查是否忽略
-    if (shouldIgnore(entry.name)) {
-      console.log(`  Ignoring: ${entry.name}`);
-      continue;
-    }
-
-    if (entry.isDirectory()) {
-      copyDirRecursive(srcPath, destPath, ignorePatterns);
-    } else {
-      fs.copyFileSync(srcPath, destPath);
-    }
-  }
-}
-
-/**
- * 解析 Git URL 获取信息
- */
-function parseGitUrl(url) {
-  // 支持多种格式
-  const patterns = [
-    /^https:\/\/github\.com\/([^/]+)\/([^/]+?)(?:\.git)?$/,
-    /^git@github\.com:([^/]+)\/([^/]+?)(?:\.git)?$/,
-  ];
-
-  for (const pattern of patterns) {
-    const match = url.match(pattern);
-    if (match) {
-      return { owner: match[1], repo: match[2] };
-    }
-  }
-  return null;
-}
-
-/**
- * 执行 Git 命令
- */
-function gitCommand(args, cwd) {
-  try {
-    return execSync(`git ${args}`, { cwd, encoding: 'utf-8', stdio: 'pipe' });
-  } catch (err) {
-    return err.stdout || err.stderr || '';
-  }
-}
-
 /**
  * 下载文件
  */

package/src/cli/ui/chat-ui-old.js

@@ -168,7 +168,7 @@ class ChatUIOld {
 
   async _reloadSkills() {
     try {
-      const result = await this.agent.framework.executeTool('reloadSkills', {});
+      const result = await this.agent.framework.executeTool('skill_reload', {});
       if (result.success !== false) {
         console.log(colored('[提示] 技能已重载', CYAN));
       } else {

package/src/cli/ui/chat-ui.js

@@ -321,7 +321,7 @@ class ChatUI {
 
     if (cmd === '/reload') {
       try {
-        const result = await this.agent.framework.executeTool('reloadSkills', {});
+        const result = await this.agent.framework.executeTool('skill_reload', {});
         if (result.success !== false) {
           this.create_message(`${colored('[提示]', CYAN)} 技能已重载\n`,chalk.dim('● '))
         } else {

package/src/cli/ui/components/agent-mention-provider.js

@@ -78,7 +78,7 @@ class AgentMentionProvider {
 
         const mainAgent = this.framework._mainAgent;
         return this.framework._agents
-            .filter(agent => agent !== mainAgent && agent.name)
+            .filter(agent => agent !== mainAgent && agent.name && !agent.hidden)
             .map(agent => ({
                 name: agent.name.replace(/^subagent_/, '').replace(/^session_/, ''),
                 description: agent._role || agent.description || agent.name,

package/src/common/constants.js

@@ -79,6 +79,7 @@ const DEFAULT_RETRY_DELAY_MS = 2000;
 // System Prompt 优先级
 // ============================================================================
 
+// 旧的数字优先级（保留以兼容旧代码）
 const PROMPT_PRIORITY = {
   DATETIME: 50,
   ORIGINAL_PROMPT: 80,
@@ -93,6 +94,45 @@ const PROMPT_PRIORITY = {
   TOOL_CORE_RULES: 150,
 };
 
+/**
+ * 新的语义槽位（推荐使用）
+ * order 越小越靠前；同 slot 内可用 PromptPart.order 进一步排序
+ */
+const PROMPT_SLOT = {
+  /** 角色身份：用户/系统设定的 systemPrompt */
+  IDENTITY:    { order: 10, label: '角色身份' },
+  /** 运行环境：时间、cwd、平台等 */
+  ENVIRONMENT: { order: 20, label: '运行环境' },
+  /** 用户指令：sharedPrompt、运行时 metadata */
+  USER:        { order: 30, label: '用户指令' },
+  /** 可用能力：tools、skills、subagents、extensions */
+  CAPABILITY:  { order: 40, label: '可用能力' },
+  /** 行为规则：tool-core-rules、data-splitter、memory-context */
+  BEHAVIOR:    { order: 50, label: '行为规则' },
+  /** 上下文摘要：自动压缩、消息历史 */
+  CONTEXT:     { order: 60, label: '上下文摘要' },
+  /** 自定义兜底 */
+  CUSTOM:      { order: 999, label: '自定义' },
+};
+
+/**
+ * 旧 PROMPT_PRIORITY 名字 → 新 PROMPT_SLOT 的映射
+ * 仅用于过渡期，旧代码迁移时按此映射
+ */
+const PROMPT_PRIORITY_TO_SLOT = {
+  DATETIME: 'ENVIRONMENT',
+  ORIGINAL_PROMPT: 'IDENTITY',
+  SHARED_PROMPT: 'USER',
+  METADATA: 'USER',
+  CAPABILITIES: 'CAPABILITY',
+  TOOLS: 'CAPABILITY',
+  SKILLS: 'CAPABILITY',
+  SUB_AGENTS: 'CAPABILITY',
+  MCP_TOOLS: 'CAPABILITY',
+  EXTENSION_TOOLS: 'CAPABILITY',
+  TOOL_CORE_RULES: 'BEHAVIOR',
+};
+
 // ============================================================================
 // 熔断器
 // ============================================================================
@@ -182,6 +222,8 @@ module.exports = {
 
   // Priority
   PROMPT_PRIORITY,
+  PROMPT_SLOT,
+  PROMPT_PRIORITY_TO_SLOT,
 
   // Circuit Breaker
   DEFAULT_CIRCUIT_FAILURE_THRESHOLD,

package/src/common/id.js

@@ -135,4 +135,17 @@ module.exports = {
     const random = crypto.randomBytes(8).toString('base64url');
     return `id_${Date.now()}_${random}`;
   },
+  /**
+   * 生成唯一的 entry ID (8位 UUID 片段，避免冲突)
+   * @param {Set|string[]} existingIds - 已存在的 ID 集合
+   * @returns {string}
+   */
+  generateEntryId: (existingIds) => {
+    const byId = existingIds instanceof Set ? existingIds : new Set(existingIds);
+    for (let i = 0; i < 100; i++) {
+      const id = uuid().slice(0, 8);
+      if (!byId.has(id)) return id;
+    }
+    return uuid();
+  },
 };

package/src/common/queue.js

@@ -122,12 +122,12 @@ class ChatQueueManager extends EventEmitter {
             await this.sleep(calculateDelay(attempt, { baseDelay: this.retryDelay }));
             continue;
           }
-          throw lastError;
+          // 不 throw — 直接跳出循环，由后面的 friendlyError 统一处理
+          break;
         }
 
         return result;
       } catch (error) {
-       
         lastError = error;
         if (attempt < this.retryAttempts && this.isRetryableError(error)) {
           await this.sleep(calculateDelay(attempt, { baseDelay: this.retryDelay }));

package/src/context/compressor.js

@@ -326,15 +326,23 @@ class ContextCompressor {
     let removedItems = 0;
     let removedMsgs = 0;
     for (const msg of messages) {
-      if (msg.role !== 'tool' || !Array.isArray(msg.content)) continue;
-      const originalLength = msg.content.length;
-      msg.content = msg.content.filter((item) => {
-        if (item && (item.type === 'tool-result' || item.type === 'tool_result') && item.toolCallId && !validToolCallIds.has(item.toolCallId)) {
-          removedItems++; return false;
-        }
-        return true;
-      });
-      if (msg.content.length === 0 && originalLength > 0) msg._orphaned = true;
+      if (msg.role !== 'tool') continue;
+
+      if (Array.isArray(msg.content)) {
+        // AI SDK 数组格式：按 toolCallId 过滤
+        const originalLength = msg.content.length;
+        msg.content = msg.content.filter((item) => {
+          if (item && (item.type === 'tool-result' || item.type === 'tool_result') && item.toolCallId && !validToolCallIds.has(item.toolCallId)) {
+            removedItems++; return false;
+          }
+          return true;
+        });
+        if (msg.content.length === 0 && originalLength > 0) msg._orphaned = true;
+      } else if (msg.tool_call_id && !validToolCallIds.has(msg.tool_call_id)) {
+        // OpenAI 兼容格式：整条消息是 tool result，无对应 tool_calls 时标记为 orphaned
+        msg._orphaned = true;
+        removedMsgs++;
+      }
     }
 
     for (let i = messages.length - 1; i >= 0; i--) {

package/src/framework/framework.js

@@ -12,10 +12,13 @@ const { AsyncLocalStorage } = require('async_hooks');
 const { EventEmitter } = require('../common/events');
 const { PluginManager } = require('../plugin/manager');
 const { ToolRegistry } = require('../tool/registry');
+const { PromptRegistry } = require('../agent/prompt-registry');
 const { ContextManager } = require('../context/manager');
 const { createFrameworkLogger } = require('../common/logger');
 const { AGENT_DIR, HOME_AGENT_DIR_NAME } = require('../common/constants');
 const { SessionTTL } = require('../session/ttl');
+const { Plugin } = require('../plugin/base');
+const { z } = require('zod');
 
 // Add framework node_modules to search path
 const frameworkNodeModules = path.join(__dirname, '..', '..', 'node_modules');
@@ -28,6 +31,53 @@ const asyncLocalStorage = new AsyncLocalStorage();
 const requestStorage = new AsyncLocalStorage();
 const sessionStorage = new AsyncLocalStorage();
 
+/**
+ * 将各种形式的插件定义转换为 Plugin 实例
+ * 支持：
+ *  - Plugin 实例：原样返回
+ *  - Plugin 子类（class extends Plugin）：实例化
+ *  - function(foliko) 风格：包装为 install
+ *  - 普通对象 { name, install, start, ... }：拷贝字段并绑定生命周期方法
+ * @param {Plugin|Function|Object} pluginDef
+ * @returns {Plugin}
+ */
+function createPluginInstance(pluginDef) {
+  if (pluginDef instanceof Plugin) return pluginDef;
+
+  if (typeof pluginDef === 'function') {
+    if (pluginDef.prototype instanceof Plugin) {
+      return new pluginDef();
+    }
+    // function(foliko) 风格
+    const instance = new Plugin();
+    instance.name = pluginDef.name || 'function-plugin';
+    const fn = pluginDef;
+    instance.install = function (framework) {
+      this._framework = framework;
+      return fn(framework);
+    };
+    return instance;
+  }
+
+  if (!pluginDef || typeof pluginDef !== 'object') {
+    throw new Error('Plugin definition must be a Plugin instance, subclass, function, or plain object');
+  }
+
+  const instance = new Plugin();
+  // 显式拷贝已知字段，避免复制任意属性
+  const fields = ['name', 'version', 'description', 'priority', 'enabled', 'system', 'tools', 'config', 'agents'];
+  for (const field of fields) {
+    if (pluginDef[field] !== undefined) instance[field] = pluginDef[field];
+  }
+  // 绑定生命周期方法（覆盖原型默认值）
+  for (const method of ['install', 'start', 'reload', 'uninstall']) {
+    if (typeof pluginDef[method] === 'function') {
+      instance[method] = pluginDef[method];
+    }
+  }
+  return instance;
+}
+
 class Framework extends EventEmitter {
   constructor(config = {}) {
     super();
@@ -41,6 +91,7 @@ class Framework extends EventEmitter {
     // Subsystems
     this.toolRegistry = new ToolRegistry();
     this.pluginManager = new PluginManager(this);
+    this.promptRegistry = new PromptRegistry();
 
     // Agent management
     this._agents = [];
@@ -75,6 +126,7 @@ class Framework extends EventEmitter {
     // Event forwarding
     this._setupToolEventForwarding();
     this._setupAgentEventForwarding();
+    this._setupPromptRegistryAutoRefresh();
     this._registerBuiltinTools();
   }
 
@@ -107,6 +159,24 @@ class Framework extends EventEmitter {
     });
   }
 
+  /**
+   * promptRegistry 变更时自动失效所有 Agent 的提示词缓存
+   * 插件重载、skill 重载、扩展工具变更等都会触发刷新
+   * 系统提示词在下次 chat 时自动重建（懒刷新，不浪费性能）
+   */
+  _setupPromptRegistryAutoRefresh() {
+    // 仅标记脏缓存（不调 invalidateAll，避免与 promptRegistry 事件循环）
+    const invalidate = () => {
+      for (const agent of this._agents) {
+        agent._systemPromptDirty = true;
+      }
+    };
+    const REFRESH_EVENTS = ['register', 'unregister', 'clear-owner'];
+    for (const event of REFRESH_EVENTS) {
+      this.promptRegistry.on(event, invalidate);
+    }
+  }
+
   registerPlugin(plugin) { this.pluginManager.register(plugin); return this; }
   registerProvider(name, config) { const { registerProvider } = require('../llm/provider'); registerProvider(name, config); return this; }
   getProviderRegistry() { const { getProviderRegistry } = require('../llm/provider'); return getProviderRegistry(); }
@@ -143,6 +213,121 @@ class Framework extends EventEmitter {
   }
   getTools() { return this.toolRegistry.getAll(); }
 
+  // tools 对象别名
+  get tools() {
+    const self = this;
+    return {
+      register: (toolDef) => self.registerTool(toolDef),
+      tool: (toolDef) => self.tool(toolDef),
+      execute: (name, args) => self.executeTool(name, args),
+      list: () => self.toolRegistry.getNames(),
+      get: (name) => self.toolRegistry.get(name),
+      has: (name) => self.toolRegistry.has(name),
+    };
+  }
+
+  // Extension 工具注册
+  registerExtensionTools(pluginName, tools) {
+    const extExecutor = this.pluginManager.get('extension-executor');
+    if (!extExecutor) {
+      this.logger.warn(`[Framework] extension-executor not found, cannot register extension tools for "${pluginName}"`);
+      return this;
+    }
+    for (const [toolName, toolDef] of Object.entries(tools)) {
+      if (!toolDef || typeof toolDef !== 'object') continue;
+      extExecutor.registerTool(pluginName, {
+        name: pluginName,
+        description: toolDef.description || '',
+        version: toolDef.version || '1.0.0',
+      }, {
+        name: toolName,
+        description: toolDef.description || '',
+        inputSchema: toolDef.inputSchema,
+        execute: toolDef.execute,
+      });
+    }
+    return this;
+  }
+
+  // 常用类型和工具（方便 function(foliko) 插件使用）
+  get Plugin() { return Plugin; }
+  get z() { return z; }
+
+  // prompts 对象别名（系统提示词注册表）
+  get prompts() {
+    return this.promptRegistry;
+  }
+
+  // plugins 对象别名
+  get plugins() {
+    const self = this;
+    return {
+      get: (name) => self.pluginManager.get(name) || null,
+      list: () => self.pluginManager.getAll().map(p => p.instance?.name || p.name),
+      has: (name) => self.pluginManager.has(name),
+      /**
+       * 从插件定义创建 Plugin 实例
+       * 支持 Plugin 实例 / class / function(foliko) / 普通对象
+       */
+      create: (pluginDef) => createPluginInstance(pluginDef),
+      /**
+       * 注册新插件（默认会自动安装 + 启动）
+       * @param {Plugin|Function|Object} pluginDef 插件定义
+       * @param {Object} [options] 传给 PluginManager
+       * @param {boolean} [options.autoLoad=true] 是否自动调用 install + start
+       * @returns {Promise<Plugin>}
+       */
+      register: async (pluginDef, options = {}) => {
+        const autoLoad = options.autoLoad !== false;
+        const plugin = createPluginInstance(pluginDef);
+        self.pluginManager.register(plugin, options);
+        if (autoLoad) {
+          await self.pluginManager.load(plugin, options);
+        }
+        return plugin;
+      },
+    };
+  }
+
+  // 快捷获取插件实例
+  plugin(name) {
+    return this.pluginManager.get(name) || null;
+  }
+
+  // Extension 对象别名
+  get extension() {
+    const self = this;
+    return {
+      tool: (pluginName, tools) => self.registerExtensionTools(pluginName, tools),
+      execute: (plugin, tool, args) => self.executeExtension(plugin, tool, args),
+      list: () => {
+        const extExecutor = self.pluginManager.get('extension-executor');
+        if (!extExecutor) return [];
+        return extExecutor.getExtensions?.() || [];
+      },
+      listPlugins: () => {
+        const extExecutor = self.pluginManager.get('extension-executor');
+        if (!extExecutor) return [];
+        return extExecutor.getExtensionNames?.() || [];
+      },
+      listTools: (pluginName) => {
+        const extExecutor = self.pluginManager.get('extension-executor');
+        if (!extExecutor) return [];
+        return extExecutor.getExtensionTools?.(pluginName) || [];
+      },
+      getTool: (pluginName, toolName) => {
+        const extExecutor = self.pluginManager.get('extension-executor');
+        if (!extExecutor) return null;
+        return extExecutor.getExtensionTool?.(pluginName, toolName) || null;
+      },
+    };
+  }
+
+  // 执行 extension 工具
+  async executeExtension(plugin, tool, args = {}) {
+    return this.executeTool('ext_call', { plugin, tool, args });
+  }
+
   getMainAgent() { return this._mainAgent; }
   getSystemPrompt() { return this._mainAgent?._buildSystemPrompt?.() || ''; }
   getPluginInstance(name) { return this.pluginManager.get(name) || null; }

package/src/framework/index.js

@@ -3,7 +3,7 @@
 const { Framework } = require('./framework');
 const { bootstrap, ready, destroy, setCwd, rescanProject } = require('./lifecycle');
 const { FrameworkRegistry } = require('./registry');
-const { loadAgentConfig, loadDefaultPlugins } = require('./loader');
+const { loadDefaultPlugins } = require('./loader');
 
 module.exports = {
   Framework,
@@ -13,6 +13,5 @@ module.exports = {
   destroy,
   setCwd,
   rescanProject,
-  loadAgentConfig,
   loadDefaultPlugins,
 };

package/src/framework/lifecycle.js

@@ -114,6 +114,15 @@ async function setCwd(framework, newCwd, options = {}) {
 
     framework.pluginManager._setStateFile(resolved);
 
+    // 加载新目录配置，更新 skillsDirs 确保 skill-manager 能扫描到新项目技能
+    const { loadAgentConfig } = require('../../plugins/core/default');
+    const agentConfig = loadAgentConfig(framework, framework._agentDir || '.foliko');
+    const skillManager = framework.pluginManager.get('skill-manager');
+    if (skillManager && Array.isArray(agentConfig.skillsDirs)) {
+      skillManager.setSearchDirs(agentConfig.skillsDirs);
+    } else {
+    }
+
     const count = framework._sessionContexts.size;
     for (const sid of Array.from(framework._sessionContexts.keys())) {
       framework.destroySessionContext(sid);
@@ -200,4 +209,96 @@ async function rescanProject(framework, options = {}) {
   return result;
 }
 
-module.exports = { bootstrap, ready, destroy, setCwd, rescanProject };
+/**
+ * Reload all - 完全重新加载所有插件和 skill
+ *
+ * 与 rescanProject 的区别：rescanProject 保留 SYSTEM_PLUGINS（ext-exec、skill-manager）
+ * 的旧实例，可能残留旧 state。reloadAll 显式按顺序：
+ *   1. 重载 ext-exec（先清空 _extensions）
+ *   2. 卸载非系统插件
+ *   3. 重载 defaults plugin
+ *   4. bootstrapDefaults（加载所有 default 插件，包括新的 ext-exec 和 skill-manager）
+ *   5. 重载 skill-manager（最后一步，让新 skill 的 commands 注册到新 ext-exec）
+ *
+ * 推荐用法：切换 WORK_DIR 后调用
+ *   await foliko.setCwd(fw, newCwd);
+ *   await foliko.reloadAll(fw);
+ *
+ * @param {Framework} framework
+ * @param {Object} options
+ * @param {boolean} [options.reloadExtExec=true] 是否重载 ext-exec（默认 true，彻底清空旧 state）
+ * @param {boolean} [options.reloadSkillManager=true] 是否重载 skill-manager（默认 true，扫描新 skill）
+ * @param {Set<string>} [options.keepLoaded] 额外保留的插件名集合
+ */
+async function reloadAll(framework, options = {}) {
+  const { bootstrapDefaults, DefaultPlugins, loadAgentConfig } = require('../../plugins/core/default');
+  const { SYSTEM_PLUGINS } = require('../common/constants');
+  const keepSet = new Set(options.keepLoaded || Array.from(SYSTEM_PLUGINS));
+
+  console.log('[foliko] reloadAll: starting full reload');
+
+  // 1. 重载 ext-exec（先清空 _extensions）
+  if (options.reloadExtExec !== false && framework.pluginManager.has('extension-executor')) {
+    try {
+      await framework.pluginManager.reload('extension-executor');
+      console.log('[foliko] reloadAll: ext-executor reloaded (state cleared)');
+    } catch (err) {
+      console.log('[foliko] reloadAll: ext-executor reload failed:', err.message);
+    }
+  }
+
+  // 2. 卸载非系统插件
+  try {
+    const unloadList = await framework.pluginManager.unloadExcept(keepSet);
+    console.log(`[foliko] reloadAll: unloaded ${unloadList.length} non-system plugins`);
+  } catch (err) {
+    console.log('[foliko] reloadAll: unloadExcept failed:', err.message);
+  }
+
+  // 3. 重载 defaults plugin
+  let defaultsPlugin = framework.pluginManager.get('defaults');
+  if (!defaultsPlugin) {
+    const dp = new DefaultPlugins({ agentDir: framework._agentDir });
+    try { await framework.loadPlugin(dp); defaultsPlugin = dp; }
+    catch (err) { console.log('[foliko] reloadAll: load defaults failed:', err.message); }
+  } else {
+    try { await defaultsPlugin.reload(framework); }
+    catch (err) { console.log('[foliko] reloadAll: reload defaults failed:', err.message); }
+  }
+
+  const agentConfig = defaultsPlugin
+    ? (defaultsPlugin.getConfig() || loadAgentConfig(framework, framework._agentDir))
+    : loadAgentConfig(framework, framework._agentDir);
+
+  // 4. bootstrapDefaults（加载所有 default 插件）
+  try {
+    await bootstrapDefaults(framework, { _config: agentConfig, _skipConfigLoad: true });
+    console.log('[foliko] reloadAll: bootstrapDefaults done');
+  } catch (err) {
+    console.log('[foliko] reloadAll: bootstrapDefaults failed:', err.message);
+  }
+
+  // 5. 重载 skill-manager（最后一步，让新 skill 的 commands 注册到新 ext-exec）
+  if (options.reloadSkillManager !== false) {
+    const skillManager = framework.pluginManager.get('skill-manager');
+    if (skillManager) {
+      if (Array.isArray(agentConfig.skillsDirs)) skillManager.setSearchDirs(agentConfig.skillsDirs);
+      try {
+        await skillManager.reload(framework);
+        const sm = skillManager;
+        const extExec = framework.pluginManager.get('extension-executor');
+        const skillTools = extExec?._extensions?.get('skill')?.tools || [];
+        console.log(
+          `[foliko] reloadAll: skill-manager reloaded, ${sm._skills.size} skills, ${Object.keys(sm.tools).length} tools in sm, ${skillTools.length} tools in ext-exec`
+        );
+      } catch (err) {
+        console.log('[foliko] reloadAll: skill-manager reload failed:', err.message);
+      }
+    }
+  }
+
+  framework.emit('reload:complete', { framework });
+  return framework;
+}
+
+module.exports = { bootstrap, ready, destroy, setCwd, rescanProject, reloadAll };