foliko 1.1.70 → 1.1.71

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

@@ -90,28 +90,25 @@ class ChatUI {
     this.sessionId = options.sessionId || 'cli_default';
     this.sessionPlugin = null;
 
-    // 获取 skill 命令列表
-    const skillCommands = [];
-    if (agent.framework) {
-      const extExecutor = agent.framework.pluginManager?.get('extension-executor');
-      if (extExecutor && typeof extExecutor.getSkillCommands === 'function') {
-        skillCommands.push(...extExecutor.getSkillCommands());
-      }
-    }
+    // 获取 skill 命令列表（保存到 this，供后续刷新）
+    this.skillCommands = [];
+    this._refreshSkillCommands(agent.framework);
 
-    const baseCommands = [
+    const baseCommands = this.baseCommands = [
       { name: "compress", description: "压缩记录" },
       { name: "clear", description: "清除记录" },
       { name: "exit", description: "退出" },
+      { name: "help", description: "显示帮助信息" },
+      { name: "reload", description: "重载技能" },
     ];
 
-    const autocompleteProvider = new CombinedAutocompleteProvider(
-      [...baseCommands, ...skillCommands],
+    this.autocompleteProvider = new CombinedAutocompleteProvider(
+      [...baseCommands, ...this.skillCommands],
       process.cwd(),
     );
-    
+
     const editor=this.editor = new Editor(this.tui, editorTheme,{paddingX:1});
-    editor.setAutocompleteProvider(autocompleteProvider);
+    this.editor.setAutocompleteProvider(this.autocompleteProvider);
     this.editor.onSubmit=this.handleOnSubmit.bind(this)
     this.tui.addChild(this.editor);
     this.tui.setFocus(this.editor);
@@ -230,6 +227,13 @@ class ChatUI {
         }
       };
       agent.framework.on('agent:usage', this._usageHandler);
+
+      // 监听 skill 热重载事件，刷新 autocomplete
+      this._skillReloadedHandler = () => {
+        this._refreshSkillCommands(agent.framework);
+        this._refreshAutocomplete();
+      };
+      agent.framework.on('skill:reloaded', this._skillReloadedHandler);
     }
   }
 
@@ -254,6 +258,10 @@ class ChatUI {
       this.agent.framework.off('agent:usage', this._usageHandler);
       this._usageHandler = null;
     }
+    if (this._skillReloadedHandler && this.agent.framework) {
+      this.agent.framework.off('skill:reloaded', this._skillReloadedHandler);
+      this._skillReloadedHandler = null;
+    }
   }
 
   clear_message_done(){
@@ -305,6 +313,20 @@ class ChatUI {
       return true;
     }
 
+    if (cmd === '/reload') {
+      try {
+        const result = await this.agent.framework.executeTool('reloadSkills', {});
+        if (result.success !== false) {
+          this.create_message(`${colored('[提示]', CYAN)} 技能已重载\n`,chalk.dim('● '))
+        } else {
+          this.create_message(`${colored('[错误]', RED)} 重载失败: ${result.error}\n`,chalk.dim('● '))
+        }
+      } catch (err) {
+        this.create_message(`${colored('[错误]', RED)} 重载失败: ${err.message}\n`,chalk.dim('● '))
+      }
+      return true;
+    }
+
     // /help 命令显示所有注册的命令
     if (cmd === '/help') {
       const { getCommandRegistry } = require('../../../src/core/command-registry');
@@ -312,17 +334,18 @@ class ChatUI {
       const commands = registry.getAllCommands();
 
       let helpText = `${colored('[帮助]', CYAN)} 可用命令:\n`;
-      helpText += `  ${colored('/clear', CYAN)} - 清除对话上下文\n`;
-      helpText += `  ${colored('/compress', CYAN)} - 压缩上下文\n`;
-      helpText += `  ${colored('/exit', CYAN)} - 退出\n`;
+      this.baseCommands.forEach(c => {
+        helpText += `  ${colored('/' + c.name, CYAN)} - ${c.description}\n`;
+      })
+
 
       // 添加 skill 命令
       const extExecutor = this.agent.framework?.pluginManager?.get('extension-executor');
-      if (extExecutor && typeof extExecutor.getSkillCommandsHelp === 'function') {
-        const skillHelp = extExecutor.getSkillCommandsHelp();
-        if (skillHelp) {
+      if (extExecutor && typeof extExecutor.getSkillCommands === 'function') {
+        const skillCommands = extExecutor.getSkillCommands();
+        if (skillCommands.length > 0) {
           helpText += `\n${colored('[技能命令]', CYAN)}\n`;
-          helpText += skillHelp.split('\n').map(line => `  ${line}`).join('\n') + '\n';
+          helpText += skillCommands.map(cmd => `  ${colored('/' + cmd.name, CYAN)} - ${cmd.description || '无描述'}`).join('\n') + '\n';
         }
       }
 
@@ -350,7 +373,10 @@ class ChatUI {
             args: { args: cmdArgs }
           });
           if (result.success !== false) {
-            this.create_message(`${colored('[结果]', CYAN)} ${result.data || result}\n`, chalk.dim('● '));
+            this.create_message(`${colored('[指令] '+cmdName, CYAN)}\n\n ${result.data || result}\n`, chalk.green('● '));
+            return true;
+          }else{
+            this.create_message(`${colored('[指令] '+cmdName, RED)}\n\n ${result.error || '未知错误'}\n`, chalk.red('● '));
             return true;
           }
         } catch (err) {
@@ -371,10 +397,10 @@ class ChatUI {
             framework: this.agent.framework,
           };
           registry.execute(cmdName, cmdArgs, context).catch(err => {
-            this.create_message(`${colored('[命令错误]', 'red')} ${err.message}\n`, chalk.dim('● '));
+            this.create_message(`${colored('[命令错误]', 'red')} ${err.message}\n`, chalk.red('● '));
           });
         } catch (err) {
-          this.create_message(`${colored('[命令错误]', 'red')} ${err.message}\n`, chalk.dim('● '));
+          this.create_message(`${colored('[命令错误]', 'red')} ${err.message}\n`, chalk.red('● '));
         }
         return true;
       }
@@ -557,6 +583,32 @@ class ChatUI {
       this.statusBar.tooler.setText(`${colored('[错误]', RED)} 无 AgentChatHandler`);
     }
   }
+  /**
+   * 刷新 skill 命令列表（用于热重载）
+   */
+  _refreshSkillCommands(framework) {
+    this.skillCommands = [];
+    if (!framework) return;
+    const extExecutor = framework.pluginManager?.get('extension-executor');
+    if (extExecutor && typeof extExecutor.getSkillCommands === 'function') {
+      this.skillCommands.push(...extExecutor.getSkillCommands());
+    }
+  }
+
+  /**
+   * 刷新自动补全提供者（skill 命令热重载时调用）
+   */
+  _refreshAutocomplete() {
+    if (!this.editor) return;
+;
+    // 重新构建 CombinedAutocompleteProvider 并更新引用
+    const { CombinedAutocompleteProvider } = require('@earendil-works/pi-tui');
+    this.autocompleteProvider = new CombinedAutocompleteProvider(
+      [...this.baseCommands, ...this.skillCommands],
+      process.cwd()
+    );
+    this.editor.setAutocompleteProvider(this.autocompleteProvider);
+  }
   /**
    * 刷新流式输出缓冲区：合并高频 chunk 后统一渲染，减少 Markdown 重复解析
    */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foliko",
-  "version": "1.1.70",
+  "version": "1.1.71",
   "description": "简约的插件化 Agent 框架",
   "main": "src/index.js",
   "type": "commonjs",

package/plugins/extension-executor-plugin.js

@@ -42,6 +42,11 @@ class ExtensionExecutorPlugin extends Plugin {
       log.debug('Framework ready, rescanning all plugin tools...');
       const plugins = framework.pluginManager.getAll();
       for (const { instance: plugin } of plugins) {
+        // skill-manager 插件的工具已通过 Skill.registerCommands 直接注册，
+        // 不需要再通过 _scanPluginTools 扫描，避免重复注册
+        if (plugin.name === 'skill-manager') {
+          continue;
+        }
         this._scanPluginTools(plugin);
       }
       // 刷新所有 Agent 的扩展提示词
@@ -53,8 +58,10 @@ class ExtensionExecutorPlugin extends Plugin {
 
   /**
    * 扫描插件的 this.tools 并注册到扩展系统
+   * @param {Object} plugin - 插件实例
+   * @param {string} [extName] - 可选的扩展名（用于统一命名）
    */
-  _scanPluginTools(plugin) {
+  _scanPluginTools(plugin, extName) {
     if (!plugin || !plugin.tools || typeof plugin.tools !== 'object') {
       return;
     }
@@ -62,9 +69,12 @@ class ExtensionExecutorPlugin extends Plugin {
     const pluginName = plugin.name;
     if (!pluginName) return;
 
+    // 确定扩展名：优先使用 extName，否则使用 pluginName
+    const useExtName = extName || pluginName;
+
     // 获取插件信息
     const pluginInfo = {
-      name: plugin.name,
+      name: useExtName,
       description: plugin.description || '',
       version: plugin.version || '1.0.0',
     };
@@ -73,7 +83,7 @@ class ExtensionExecutorPlugin extends Plugin {
     for (const [toolName, toolDef] of Object.entries(plugin.tools)) {
       if (!toolDef || typeof toolDef !== 'object') continue;
 
-      this.registerTool(pluginName, pluginInfo, {
+      this.registerTool(useExtName, pluginInfo, {
         name: toolName,
         description: toolDef.description || '',
         inputSchema: toolDef.inputSchema,
@@ -81,7 +91,7 @@ class ExtensionExecutorPlugin extends Plugin {
       });
     }
 
-    log.debug(` Scanned ${Object.keys(plugin.tools).length} tools from plugin '${pluginName}'`);
+    log.debug(` Scanned ${Object.keys(plugin.tools).length} tools from plugin '${pluginName}' (as '${useExtName}')`);
 
     // 刷新所有 Agent 的扩展提示词
     if (this._framework && this._framework._ready) {
@@ -100,21 +110,27 @@ class ExtensionExecutorPlugin extends Plugin {
     const pluginName = plugin.name;
     if (!pluginName) return;
 
-    // 先移除旧工具
-    if (this._extensions.has(pluginName)) {
-      const ext = this._extensions.get(pluginName);
-      for (const tool of ext.tools || []) {
-        // 从 toolRouter 移除
-        if (this._framework?.toolRouter) {
-          this._framework.toolRouter.unregister(`ext_${tool.name}`);
+    // skill-manager 插件使用 'skill' 作为扩展名（保持与 Skill.registerCommands 一致）
+    const extName = pluginName === 'skill-manager' ? 'skill' : pluginName;
+
+    // 先移除旧工具（同时检查 'skill' 和 'skill-manager' 两个扩展名）
+    const keysToRemove = [extName, pluginName];
+    for (const key of keysToRemove) {
+      if (this._extensions.has(key)) {
+        const ext = this._extensions.get(key);
+        for (const tool of ext.tools || []) {
+          // 从 toolRouter 移除
+          if (this._framework?.toolRouter) {
+            this._framework.toolRouter.unregister(`ext_${tool.name}`);
+          }
         }
+        this._extensions.delete(key);
       }
-      this._extensions.delete(pluginName);
     }
 
-    // 重新扫描工具
-    this._scanPluginTools(plugin);
-    log.info(` Rescanned tools from plugin '${pluginName}'`);
+    // 重新扫描工具，使用正确的扩展名
+    this._scanPluginTools(plugin, extName);
+    log.info(` Rescanned tools from plugin '${pluginName}' (as '${extName}')`);
   }
 
   async start(framework) {
@@ -237,7 +253,7 @@ class ExtensionExecutorPlugin extends Plugin {
             name,
             description: ext.description,
             version: ext.version,
-            tools: ext.tools.map((t) => ({ name: t.name, description: t.description })),
+            tools: ext.tools.filter(t => t && t.name).map((t) => ({ name: t.name, description: t.description })),
           });
         }
         return { success: true, data: extensions };
@@ -275,6 +291,11 @@ class ExtensionExecutorPlugin extends Plugin {
   }
 
   registerTool(pluginName, pluginInfo, toolDef) {
+    if (!toolDef || !toolDef.name) {
+      log.warn(`[ExtensionExecutor] Invalid tool definition for '${pluginName}'`);
+      return;
+    }
+
     if (!this._extensions.has(pluginName)) {
       this._extensions.set(pluginName, {
         name: pluginInfo.name || pluginName,
@@ -401,6 +422,8 @@ class ExtensionExecutorPlugin extends Plugin {
           // Skill 命令按技能名分组显示
           const toolsBySkill = {};
           for (const tool of ext.tools) {
+            // 跳过无效工具
+            if (!tool || !tool.name) continue;
             // 命令格式: skillname:cmdname
             const parts = tool.name.split(':');
             const skillName = parts[0];
@@ -425,7 +448,8 @@ class ExtensionExecutorPlugin extends Plugin {
         } else {
           desc += `### ${ext.name || name}\n`;
           desc += `${ext.description || '无描述'}\n`;
-          desc += `**工具:** ${ext.tools.map(t => `\`${t.name}\``).join(', ')}\n\n`;
+          const validTools = ext.tools.filter(t => t && t.name);
+          desc += `**工具:** ${validTools.map(t => `\`${t.name}\``).join(', ')}\n\n`;
         }
       }
 
@@ -568,10 +592,12 @@ class ExtensionExecutorPlugin extends Plugin {
   getSkillCommands() {
     const ext = this._extensions.get('skill');
     if (!ext) return [];
-    return ext.tools.map(t => ({
-      name: t.name.replace(/^([^:]+):(.*)$/, '$1:$2'),
-      description: t.description || t.name,
-    }));
+    return ext.tools
+      .filter(t => t && t.name)
+      .map(t => ({
+        name: t.name.replace(/^([^:]+):(.*)$/, '$1:$2'),
+        description: t.description || t.name,
+      }));
   }
 
   /**
@@ -583,6 +609,7 @@ class ExtensionExecutorPlugin extends Plugin {
 
     const lines = [];
     for (const tool of ext.tools) {
+      if (!tool || !tool.name) continue;
       const parts = tool.name.split(':');
       if (parts.length === 2) {
         lines.push(`/${parts[0]}:${parts[1]} - ${tool.description || '无描述'}`);

package/plugins/feishu-plugin.js

@@ -210,6 +210,14 @@ class FeishuPlugin extends Plugin {
       case 'compress':
         await this._compressSessionContext(openId)
         break
+      case 'reload':
+        try {
+          await this._framework.executeTool('reloadSkills', {})
+          await this._sendMessage(openId, '✅ 技能已重载', originalMsg)
+        } catch (err) {
+          await this._sendMessage(openId, '❌ 重载失败: ' + err.message, originalMsg)
+        }
+        break
       case 'history':
         if (this._sessionPlugin) {
           const session = this._sessionPlugin.getSession(`feishu_${openId}`)
@@ -512,7 +520,7 @@ class FeishuPlugin extends Plugin {
     const extExecutor = this._framework?.pluginManager?.get('extension-executor')
     const skillHelp = extExecutor?.getSkillCommandsHelp?.() || ''
 
-    let helpText = '👋 欢迎使用 AI 助手！\n\n直接发送消息即可与我对话。\n\n可用命令：\n/start - 显示帮助\n/clean - 清除对话上下文\n/compress - 压缩上下文\n/history - 查看历史消息数'
+    let helpText = '👋 欢迎使用 AI 助手！\n\n直接发送消息即可与我对话。\n\n可用命令：\n/start - 显示帮助\n/clean - 清除对话上下文\n/compress - 压缩上下文\n/reload - 重载技能\n/history - 查看历史消息数'
 
     if (skillHelp) {
       helpText += '\n\n【技能命令】\n' + skillHelp.split('\n').map(line => line.replace(/^\//, '/')).join('\n')

package/plugins/qq-plugin.js

@@ -701,6 +701,14 @@ class QQPlugin extends Plugin {
       case 'compress':
         await this._compressSessionContext(openid)
         break
+      case 'reload':
+        try {
+          await this._framework.executeTool('reloadSkills', {})
+          await this._sendMessage(openid, '✅ 技能已重载')
+        } catch (err) {
+          await this._sendMessage(openid, '❌ 重载失败: ' + err.message)
+        }
+        break
       case 'history':
         const sessionInfo = this._getSessionAgent(openid)
         if (sessionInfo && this._framework) {
@@ -752,7 +760,7 @@ class QQPlugin extends Plugin {
     const extExecutor = this._framework?.pluginManager?.get('extension-executor')
     const skillHelp = extExecutor?.getSkillCommandsHelp?.() || ''
 
-    let helpText = '👋 欢迎使用 AI 助手！\n\n直接发送消息即可与我对话。\n\n可用命令：\n/clean - 清除对话上下文\n/compress - 压缩上下文\n/history - 查看历史消息数'
+    let helpText = '👋 欢迎使用 AI 助手！\n\n直接发送消息即可与我对话。\n\n\n可用命令：\n/clean - 清除对话上下文\n/compress - 压缩上下文\n/reload - 重载技能\n/history - 查看历史消息数'
 
     if (skillHelp) {
       helpText += '\n\n【技能命令】\n' + skillHelp.split('\n').map(line => line.replace(/^\//, '/')).join('\n')

package/plugins/telegram-plugin.js

@@ -322,6 +322,14 @@ class TelegramPlugin extends Plugin {
       case 'compress':
         await this._compressSessionContext(chatId, msg.message_id)
         break
+      case 'reload':
+        try {
+          await this._framework.executeTool('reloadSkills', {})
+          await this._sendMessage(chatId, '✅ 技能已重载', msg.message_id)
+        } catch (err) {
+          await this._sendMessage(chatId, '❌ 重载失败: ' + err.message, msg.message_id)
+        }
+        break
       case 'history':
         const sessionInfo = this._getSessionAgent(chatId)
         if (sessionInfo && this._framework) {
@@ -525,7 +533,7 @@ class TelegramPlugin extends Plugin {
     const extExecutor = this._framework?.pluginManager?.get('extension-executor')
     const skillHelp = extExecutor?.getSkillCommandsHelp?.() || ''
 
-    let helpText = '👋 欢迎使用 AI 助手！\n\n直接发送消息即可与我对话。\n\n可用命令：\n/clean - 清除对话上下文\n/compress - 压缩上下文\n/history - 查看历史消息数'
+    let helpText = '👋 欢迎使用 AI 助手！\n\n直接发送消息即可与我对话。\n\n可用命令：\n/clean - 清除对话上下文\n/compress - 压缩上下文\n/reload - 重载技能\n/history - 查看历史消息数'
 
     if (skillHelp) {
       helpText += '\n\n【技能命令】\n' + skillHelp.split('\n').map(line => line.replace(/^\//, '/')).join('\n')

package/plugins/weixin-plugin.js

@@ -601,6 +601,14 @@ class WeixinPlugin extends Plugin {
       case 'compress':
         await this._compressSessionContext(userId)
         break
+      case 'reload':
+        try {
+          await this._framework.executeTool('reloadSkills', {})
+          await this._sendMessageBatch(originalMsg, userId, '✅ 技能已重载', true)
+        } catch (err) {
+          await this._sendMessageBatch(originalMsg, userId, '❌ 重载失败: ' + err.message, true)
+        }
+        break
       case 'history':
         const sessionInfo = this._getSessionAgent(userId)
         if (sessionInfo && this._framework) {
@@ -634,7 +642,7 @@ class WeixinPlugin extends Plugin {
     const extExecutor = this._framework?.pluginManager?.get('extension-executor')
     const skillHelp = extExecutor?.getSkillCommandsHelp?.() || ''
 
-    let helpText = '👋 欢迎使用 AI 助手！\n\n直接发送消息即可与我对话。\n\n可用命令：\n/clean - 清除对话上下文\n/compress - 压缩上下文\n/history - 查看历史消息数'
+    let helpText = '👋 欢迎使用 AI 助手！\n\n直接发送消息即可与我对话。\n\n可用命令：\n/clean - 清除对话上下文\n/compress - 压缩上下文\n/reload - 重载技能\n/history - 查看历史消息数'
 
     if (skillHelp) {
       helpText += '\n\n【技能命令】\n' + skillHelp.split('\n').map(line => line.replace(/^\//, '/')).join('\n')

package/src/capabilities/skill-manager.js

@@ -197,6 +197,7 @@ class Skill {
         }
 
         const toolDef = {
+          name: fullName,
           description: cmd.description || `Skill command: ${fullName}`,
           inputSchema: z.object({
             args: z.string().optional().describe('命令参数'),
@@ -832,14 +833,12 @@ class SkillManagerPlugin extends Plugin {
     this._framework = framework;
     this._loadAllSkills();
 
-    // 通知 extension-executor 重载 skill 命令
-    const extExecutor = framework.pluginManager?.get('extension-executor');
-    if (extExecutor && typeof extExecutor._rescanPluginTools === 'function') {
-      const skillPlugin = framework.pluginManager?.get('skill-manager');
-      if (skillPlugin) {
-        extExecutor._rescanPluginTools(skillPlugin);
-      }
-    }
+    // 通知 extension-executor 重载 skill 命令（通过监听器自动处理）
+    // 注意：skill 命令已经在 registerCommands() 中直接注册到 extension-executor，
+    // 不需要再调用 _rescanPluginTools
+
+    // 通知 UI 刷新 skill 命令（用于 autocomplete 热重载）
+    framework.emit('skill:reloaded', { skills: Array.from(this._skills.keys()) });
   }
 
   uninstall(framework) {