foliko 2.0.3 → 2.0.5

package/plugins/core/skill-manager/index.js

@@ -1006,6 +1006,164 @@ class SkillManagerPlugin extends Plugin {
     return this._skills.has(name);
   }
 
+  /**
+   * 注册一个新 skill（程序化注册，不依赖文件）
+   * @param {string} name - 技能名称
+   * @param {string} content - 技能内容（markdown）
+   * @param {Object} [metadata] - 技能元数据
+   * @param {Object} [options] - 选项
+   * @param {Function[]} [options.commands] - 命令定义数组 [{ name, description, options, execute }]
+   * @param {string} [options.path] - 技能路径（用于 references/scripts 解析）
+   * @returns {Object} 注册的 skill 对象
+   */
+  register(name, content, metadata = {}, options = {}) {
+    const skillMetadata = new SkillMetadata({
+      name: name,
+      description: metadata.description || '',
+      license: metadata.license || null,
+      compatibility: metadata.compatibility || null,
+      metadata: metadata.metadata || {},
+      allowedTools: metadata['allowed-tools'] || metadata.allowedTools || [],
+    });
+
+    const skill = new Skill(skillMetadata, content);
+    skill._skillPath = options.path || null;
+    skill.install(this._framework);
+
+    // 注册命令
+    if (Array.isArray(options.commands) && options.commands.length > 0) {
+      for (const cmd of options.commands) {
+        if (!cmd || !cmd.name) continue;
+
+        const handler = typeof cmd.execute === 'function' ? cmd.execute : null;
+        if (!handler) continue;
+
+        const fullName = `${name}:${cmd.name}`;
+
+        // 获取参数解析器
+        let argumentParser = cmd.argumentParser;
+        if (!argumentParser && Array.isArray(cmd.options) && cmd.options.length > 0) {
+          argumentParser = (rawArgs) => {
+            try {
+              const program = new Command();
+              program.exitOverride();
+              program.configureOutput({ writeErr: () => {} });
+              for (const opt of cmd.options) {
+                program.option(opt.flags, opt.description, opt.defaultValue);
+              }
+              program.arguments('[args...]');
+              program.parse(['node', 'cmd', ...parseShellArgs(rawArgs)]);
+              return { ...program.opts(), args: program.args };
+            } catch (err) {
+              return { args: rawArgs };
+            }
+          };
+        }
+
+        // 构建命令描述
+        let commandHint = '';
+        if (cmd.options && cmd.options.length > 0) {
+          const optDescs = cmd.options.map(formatOptionForHelp);
+          commandHint = `\n  可用选项:\n  ${optDescs.join('\n  ')}`;
+        }
+
+        const toolDef = {
+          name: fullName,
+          description: `${cmd.description || 'Skill command'}\n\n**重要**: args.command 是**字符串**，不是对象！\n${commandHint}`,
+          inputSchema: z.object({
+            command: z.string().optional().describe(
+              cmd.options && cmd.options.length > 0
+                ? `**字符串**，空格分隔，如: ${cmd.options.map(formatOptionForExample).join(' ')}`
+                : `**字符串**，命令行参数`
+            ),
+          }),
+          _options: cmd.options || null,
+          execute: async (toolArgs, framework) => {
+            const ctx = {
+              sessionId: framework?._currentSessionId || 'unknown',
+              agent: null,
+              framework: framework,
+              cwd: framework?.getCwd?.() ?? process.cwd(),
+            };
+            let parsedArgs = toolArgs.command || '';
+            if (typeof argumentParser === 'function') {
+              parsedArgs = argumentParser(toolArgs.command || '');
+            }
+            return await handler(parsedArgs, ctx);
+          },
+        };
+
+        const extExecutor = this._framework?.pluginManager?.get('extension-executor');
+        if (extExecutor) {
+          extExecutor.registerTool('skill', {
+            name: name,
+            description: skillMetadata.description || `Skill: ${name}`,
+            version: skillMetadata.compatibility || '1.0.0',
+          }, toolDef);
+        }
+
+        skill.tools[fullName] = toolDef;
+        skill._commands.push(fullName);
+      }
+    }
+
+    // 扫描 references 和 scripts
+    const references = skill._skillPath ? this._scanReferences(skill._skillPath) : new Map();
+    const scripts = skill._skillPath ? this._scanScripts(skill._skillPath) : new Map();
+
+    const skillData = {
+      name: name,
+      metadata: skillMetadata,
+      content: content,
+      instance: skill,
+      path: skill._skillPath,
+      references,
+      scripts,
+      fromPlugin: false,
+      registered: true, // 标记为程序化注册
+    };
+
+    this._skills.set(name, skillData);
+
+    // 更新 SkillManagerPlugin.tools
+    Object.assign(this.tools, skill.tools);
+
+    return skillData;
+  }
+
+  /**
+   * 移除 skill
+   * @param {string} name 技能名称
+   * @returns {boolean} 是否成功移除
+   */
+  remove(name) {
+    if (!this._skills.has(name)) {
+      return false;
+    }
+
+    const skill = this._skills.get(name);
+
+    // 清理命令（从 extension-executor 移除）
+    if (skill.instance?._commands) {
+      const extExecutor = this._framework?.pluginManager?.get('extension-executor');
+      if (extExecutor) {
+        for (const cmd of skill.instance._commands) {
+          extExecutor._extensions.delete(`${name}:${cmd}`);
+        }
+      }
+    }
+
+    // 从 SkillManagerPlugin.tools 中移除
+    if (skill.instance?.tools) {
+      for (const toolName of Object.keys(skill.instance.tools)) {
+        delete this.tools[toolName];
+      }
+    }
+
+    this._skills.delete(name);
+    return true;
+  }
+
   /**
    * 获取 skill 数量
    */

package/plugins/core/workflow/index.js

@@ -981,6 +981,30 @@ class WorkflowPlugin extends Plugin {
       // log.info(` Registered tool: ${toolName}`);
     }
   }
+
+  /**
+   * 移除工作流
+   * @param {string} name 工作流名称
+   * @returns {boolean} 是否成功移除
+   */
+  remove(name) {
+    if (!this._workflows.has(name)) {
+      return false;
+    }
+
+    // 从工作流定义中删除
+    this._workflows.delete(name);
+
+    // 清除已注册的工具
+    const toolName = this._workflowTools.get(name);
+    if (toolName) {
+      // 工具注销需要框架支持，这里只清理内部状态
+      this._workflowTools.delete(name);
+    }
+
+    return true;
+  }
+
   /**
    * 重载工作流
    */

package/plugins/executors/extension/index.js

@@ -302,7 +302,7 @@ class ExtensionExecutorPlugin extends Plugin {
       ext.tools.push(toolEntry);
     }
 
-    log.debug(` Registered tool '${toolDef.name}' for extension '${pluginName}'`);
+    //log.debug(` Registered tool '${toolDef.name}' for extension '${pluginName}'`);
 
     if (this._framework && this._framework._ready) {
       this._invalidatePromptCaches(this._framework);

package/skills/find-skills/SKILL.md

@@ -1,133 +1,133 @@
----
-name: find-skills
-description: Helps users discover and install agent skills when they ask questions like "how do I do X", "find a skill for X", "is there a skill that can...", or express interest in extending capabilities. This skill should be used when the user is looking for functionality that might exist as an installable skill.
----
-
-# Find Skills
-
-This skill helps you discover and install skills from the open agent skills ecosystem.
-
-## When to Use This Skill
-
-Use this skill when the user:
-
-- Asks "how do I do X" where X might be a common task with an existing skill
-- Says "find a skill for X" or "is there a skill for X"
-- Asks "can you do X" where X is a specialized capability
-- Expresses interest in extending agent capabilities
-- Wants to search for tools, templates, or workflows
-- Mentions they wish they had help with a specific domain (design, testing, deployment, etc.)
-
-## What is the Skills CLI?
-
-The Skills CLI (`npx skills`) is the package manager for the open agent skills ecosystem. Skills are modular packages that extend agent capabilities with specialized knowledge, workflows, and tools.
-
-**Key commands:**
-
-- `npx skills find [query]` - Search for skills interactively or by keyword
-- `npx skills add <package>` - Install a skill from GitHub or other sources
-- `npx skills check` - Check for skill updates
-- `npx skills update` - Update all installed skills
-
-**Browse skills at:** https://skills.sh/
-
-## How to Help Users Find Skills
-
-### Step 1: Understand What They Need
-
-When a user asks for help with something, identify:
-
-1. The domain (e.g., React, testing, design, deployment)
-2. The specific task (e.g., writing tests, creating animations, reviewing PRs)
-3. Whether this is a common enough task that a skill likely exists
-
-### Step 2: Search for Skills
-
-Run the find command with a relevant query:
-
-```bash
-npx skills find [query]
-```
-
-For example:
-
-- User asks "how do I make my React app faster?" → `npx skills find react performance`
-- User asks "can you help me with PR reviews?" → `npx skills find pr review`
-- User asks "I need to create a changelog" → `npx skills find changelog`
-
-The command will return results like:
-
-```
-Install with npx skills add <owner/repo@skill>
-
-vercel-labs/agent-skills@vercel-react-best-practices
-└ https://skills.sh/vercel-labs/agent-skills/vercel-react-best-practices
-```
-
-### Step 3: Present Options to the User
-
-When you find relevant skills, present them to the user with:
-
-1. The skill name and what it does
-2. The install command they can run
-3. A link to learn more at skills.sh
-
-Example response:
-
-```
-I found a skill that might help! The "vercel-react-best-practices" skill provides
-React and Next.js performance optimization guidelines from Vercel Engineering.
-
-To install it:
-npx skills add vercel-labs/agent-skills@vercel-react-best-practices
-
-Learn more: https://skills.sh/vercel-labs/agent-skills/vercel-react-best-practices
-```
-
-### Step 4: Offer to Install
-
-If the user wants to proceed, you can install the skill for them:
-
-```bash
-npx skills add <owner/repo@skill> -g -y
-```
-
-The `-g` flag installs globally (user-level) and `-y` skips confirmation prompts.
-
-## Common Skill Categories
-
-When searching, consider these common categories:
-
-| Category        | Example Queries                          |
-| --------------- | ---------------------------------------- |
-| Web Development | react, nextjs, typescript, css, tailwind |
-| Testing         | testing, jest, playwright, e2e           |
-| DevOps          | deploy, docker, kubernetes, ci-cd        |
-| Documentation   | docs, readme, changelog, api-docs        |
-| Code Quality    | review, lint, refactor, best-practices   |
-| Design          | ui, ux, design-system, accessibility     |
-| Productivity    | workflow, automation, git                |
-
-## Tips for Effective Searches
-
-1. **Use specific keywords**: "react testing" is better than just "testing"
-2. **Try alternative terms**: If "deploy" doesn't work, try "deployment" or "ci-cd"
-3. **Check popular sources**: Many skills come from `vercel-labs/agent-skills` or `ComposioHQ/awesome-claude-skills`
-
-## When No Skills Are Found
-
-If no relevant skills exist:
-
-1. Acknowledge that no existing skill was found
-2. Offer to help with the task directly using your general capabilities
-3. Suggest the user could create their own skill with `npx skills init`
-
-Example:
-
-```
-I searched for skills related to "xyz" but didn't find any matches.
-I can still help you with this task directly! Would you like me to proceed?
-
-If this is something you do often, you could create your own skill:
-npx skills init my-xyz-skill
-```
+---
+name: find-skills
+description: Helps users discover and install agent skills when they ask questions like "how do I do X", "find a skill for X", "is there a skill that can...", or express interest in extending capabilities. This skill should be used when the user is looking for functionality that might exist as an installable skill.
+---
+
+# Find Skills
+
+This skill helps you discover and install skills from the open agent skills ecosystem.
+
+## When to Use This Skill
+
+Use this skill when the user:
+
+- Asks "how do I do X" where X might be a common task with an existing skill
+- Says "find a skill for X" or "is there a skill for X"
+- Asks "can you do X" where X is a specialized capability
+- Expresses interest in extending agent capabilities
+- Wants to search for tools, templates, or workflows
+- Mentions they wish they had help with a specific domain (design, testing, deployment, etc.)
+
+## What is the Skills CLI?
+
+The Skills CLI (`npx skills`) is the package manager for the open agent skills ecosystem. Skills are modular packages that extend agent capabilities with specialized knowledge, workflows, and tools.
+
+**Key commands:**
+
+- `npx skills find [query]` - Search for skills interactively or by keyword
+- `npx skills add <package>` - Install a skill from GitHub or other sources
+- `npx skills check` - Check for skill updates
+- `npx skills update` - Update all installed skills
+
+**Browse skills at:** https://skills.sh/
+
+## How to Help Users Find Skills
+
+### Step 1: Understand What They Need
+
+When a user asks for help with something, identify:
+
+1. The domain (e.g., React, testing, design, deployment)
+2. The specific task (e.g., writing tests, creating animations, reviewing PRs)
+3. Whether this is a common enough task that a skill likely exists
+
+### Step 2: Search for Skills
+
+Run the find command with a relevant query:
+
+```bash
+npx skills find [query]
+```
+
+For example:
+
+- User asks "how do I make my React app faster?" → `npx skills find react performance`
+- User asks "can you help me with PR reviews?" → `npx skills find pr review`
+- User asks "I need to create a changelog" → `npx skills find changelog`
+
+The command will return results like:
+
+```
+Install with npx skills add <owner/repo@skill>
+
+vercel-labs/agent-skills@vercel-react-best-practices
+└ https://skills.sh/vercel-labs/agent-skills/vercel-react-best-practices
+```
+
+### Step 3: Present Options to the User
+
+When you find relevant skills, present them to the user with:
+
+1. The skill name and what it does
+2. The install command they can run
+3. A link to learn more at skills.sh
+
+Example response:
+
+```
+I found a skill that might help! The "vercel-react-best-practices" skill provides
+React and Next.js performance optimization guidelines from Vercel Engineering.
+
+To install it:
+npx skills add vercel-labs/agent-skills@vercel-react-best-practices
+
+Learn more: https://skills.sh/vercel-labs/agent-skills/vercel-react-best-practices
+```
+
+### Step 4: Offer to Install
+
+If the user wants to proceed, you can install the skill for them:
+
+```bash
+npx skills add <owner/repo@skill> -g -y
+```
+
+The `-g` flag installs globally (user-level) and `-y` skips confirmation prompts.
+
+## Common Skill Categories
+
+When searching, consider these common categories:
+
+| Category        | Example Queries                          |
+| --------------- | ---------------------------------------- |
+| Web Development | react, nextjs, typescript, css, tailwind |
+| Testing         | testing, jest, playwright, e2e           |
+| DevOps          | deploy, docker, kubernetes, ci-cd        |
+| Documentation   | docs, readme, changelog, api-docs        |
+| Code Quality    | review, lint, refactor, best-practices   |
+| Design          | ui, ux, design-system, accessibility     |
+| Productivity    | workflow, automation, git                |
+
+## Tips for Effective Searches
+
+1. **Use specific keywords**: "react testing" is better than just "testing"
+2. **Try alternative terms**: If "deploy" doesn't work, try "deployment" or "ci-cd"
+3. **Check popular sources**: Many skills come from `vercel-labs/agent-skills` or `ComposioHQ/awesome-claude-skills`
+
+## When No Skills Are Found
+
+If no relevant skills exist:
+
+1. Acknowledge that no existing skill was found
+2. Offer to help with the task directly using your general capabilities
+3. Suggest the user could create their own skill with `npx skills init`
+
+Example:
+
+```
+I searched for skills related to "xyz" but didn't find any matches.
+I can still help you with this task directly! Would you like me to proceed?
+
+If this is something you do often, you could create your own skill:
+npx skills init my-xyz-skill
+```

package/src/agent/chat.js

@@ -473,7 +473,7 @@ class AgentChatHandler extends EventEmitter {
       const { messageStore, messages } = await this._prepareSession(message, sessionId);
 
       if (!this._aiClient) {
-        throw new Error('AI client not configured.');
+        throw new Error('AI 客户端未配置');
       }
       this._validateToolCalls(messages);
       const systemPrompt = framework.getSystemPrompt();
@@ -497,7 +497,12 @@ class AgentChatHandler extends EventEmitter {
       let reasoningContent = '';
 
       const result = await framework.runInSession(sessionId, {}, async () => {
-        return agent.stream({ messages, ...this.providerOptions, onError: handleSDKError });
+        return agent.stream({
+          messages,
+          ...this.providerOptions,
+          onError: handleSDKError,
+          abortSignal: framework.getAbortSignal?.(),
+        });
       });
 
       const stream = result.fullStream;
@@ -595,7 +600,10 @@ class AgentChatHandler extends EventEmitter {
       // 统一错误处理：提取简洁消息并通过 yield 传递
       const friendlyMessage = err?.message?.split('\n')[0] || '未知错误';
 
-      this.emit('message:error', { sessionId, error: friendlyMessage, originalError: err });
+      // 用户主动中断（framework.stop()）不上报 message:error，避免与上游重复
+      if (err.name !== 'AbortError') {
+        this.emit('message:error', { sessionId, error: friendlyMessage, originalError: err });
+      }
       yield { type: 'error', error: friendlyMessage };
     } finally {
       const messageStore = this._getSessionMessageStore(sessionId);
@@ -648,7 +656,7 @@ class AgentChatHandler extends EventEmitter {
       const { messageStore, messages } = await this._prepareSession(message, sessionId);
 
       if (!this._aiClient) {
-        throw new Error('AI client not configured.');
+        throw new Error('AI 客户端未配置');
       }
       this._validateToolCalls(messages);
       const systemPrompt = framework.getSystemPrompt();
@@ -669,7 +677,7 @@ class AgentChatHandler extends EventEmitter {
       });
 
       const result = await framework.runInSession(sessionId, {}, async () => {
-        return agent.generate({ messages, ...apiOptions });
+        return agent.generate({ messages, ...apiOptions, abortSignal: framework.getAbortSignal?.() });
       });
 
       if (result.usage && (result.usage.promptTokens > 0 || result.usage.completionTokens > 0)) {
@@ -780,6 +788,9 @@ class AgentChatHandler extends EventEmitter {
     messages.push(userMessage);
     this._validateToolCalls(messages);
 
+    // 最终兜底：暴力清理所有 orphaned tool 消息，确保 AI SDK 不报错
+    this._stripOrphanedToolMessages(messages);
+
     return { messageStore, messages };
   }
 
@@ -832,6 +843,57 @@ class AgentChatHandler extends EventEmitter {
     messageStore._cacheMessageCount = messageStore.messages.length;
   }
 
+  /**
+   * 最终兜底：暴力清理所有 orphaned tool 消息
+   * 遍历所有 tool 角色消息，删除没有对应 tool-call 的
+   * 处理数组格式（AI SDK）、字符串格式（OpenAI 兼容）、tool_call_id 格式
+   */
+  _stripOrphanedToolMessages(messages) {
+    const validIds = new Set();
+    for (const msg of messages) {
+      if (msg.role !== 'assistant') continue;
+      if (Array.isArray(msg.content)) {
+        for (const item of msg.content) {
+          if ((item.type === 'tool-call' || item.type === 'tool-use') && item.toolCallId) validIds.add(item.toolCallId);
+        }
+      }
+      if (Array.isArray(msg.tool_calls)) {
+        for (const tc of msg.tool_calls) { if (tc.id) validIds.add(tc.id); }
+      }
+    }
+
+    let removed = 0;
+    for (let i = messages.length - 1; i >= 0; i--) {
+      const msg = messages[i];
+      if (msg.role !== 'tool') continue;
+
+      let isOrphaned = false;
+      if (Array.isArray(msg.content)) {
+        msg.content = msg.content.filter(item => {
+          if (item && (item.type === 'tool-result' || item.type === 'tool_result') && item.toolCallId && !validIds.has(item.toolCallId)) {
+            return false;
+          }
+          return true;
+        });
+        if (msg.content.length === 0) isOrphaned = true;
+      } else if (msg.tool_call_id && !validIds.has(msg.tool_call_id)) {
+        isOrphaned = true;
+      } else if (!msg.tool_call_id && validIds.size === 0) {
+        // 没有任何 tool-call，所有 tool 消息都是 orphaned
+        isOrphaned = true;
+      }
+
+      if (isOrphaned) {
+        messages.splice(i, 1);
+        removed++;
+      }
+    }
+
+    if (removed > 0) {
+      logger.debug(`[_stripOrphanedToolMessages] removed ${removed} orphaned tool message(s)`);
+    }
+  }
+
   /**
    * 计算工具列表缓存 key
    * @private