foliko 2.0.30 → 2.0.32

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

@@ -116,6 +116,11 @@ class AgentChatHandler extends EventEmitter {
     this._messageTokenCache = new Map();
     this._messageTokenCacheMaxSize = 200;
 
+    // ★ 每 session 串行锁：非流式 chat() 不走 queueManager，
+    //   同一 session 并发调用会并发 mutate/save 消息数组 → 交错/丢失。
+    //   用 promise 链把同 session 的调用串行化；不同 session 仍并行。
+    this._sessionLocks = new Map();
+
     // ChatQueueManager: 队列管理
     this.queueManager = new ChatQueueManager({
       maxConcurrent: config.maxConcurrent || DEFAULT_MAX_CONCURRENT,
@@ -711,10 +716,29 @@ class AgentChatHandler extends EventEmitter {
    */
   async chat(message, options = {}) {
     const sessionId = options.sessionId || this.getDefaultSessionId();
-    const result = await this._processMessage(sessionId, message, options);
+    const result = await this._withSessionLock(sessionId, () => this._processMessage(sessionId, message, options));
     return { message: result.text, ...result };
   }
 
+  /**
+   * 按 sessionId 串行执行 fn：同一 session 的调用排队，不同 session 并行。
+   * 无论前一个成功或失败都继续（不因一次失败卡死队列）。
+   * @private
+   */
+  _withSessionLock(sessionId, fn) {
+    const key = sessionId || '__default__';
+    const prev = this._sessionLocks.get(key) || Promise.resolve();
+    const run = prev.then(fn, fn); // 前一个 settle（成功/失败）后都执行本次
+    // gate 只用于排队，吞掉 run 的结果/异常，避免影响下一个
+    const gate = run.then(() => {}, () => {});
+    this._sessionLocks.set(key, gate);
+    gate.finally(() => {
+      // 队尾清理，避免 Map 无限增长
+      if (this._sessionLocks.get(key) === gate) this._sessionLocks.delete(key);
+    });
+    return run;
+  }
+
   /**
    * 流式聊天
    */
@@ -795,8 +819,9 @@ class AgentChatHandler extends EventEmitter {
       // yield usage 数据，让 UI 层能直接获取
       // （usage 已在 stream 循环中 yield，无需重复）
 
-      const userMsg = messages.length > 0 ? messages[messages.length - 1] : null;
-      this.emit('message', { content: fullText, sessionId: sessionId, userMessage: userMsg });
+      // ★ 用 _prepareSession 返回的 userMessage，而非 messages 末尾——
+      //   末尾现在是刚追加的 assistant 最终答复，不再是 user 消息。
+      this.emit('message', { content: fullText, sessionId: sessionId, userMessage });
 
       // ★ 修复：成功路径才持久化。AI 失败时若 finally 也 save，
       //   会把刚 push 的 userMessage 写盘 → 下次请求 loadHistory 再次
@@ -939,12 +964,9 @@ class AgentChatHandler extends EventEmitter {
         messageStore.usage = { promptTokens: inputTokens, completionTokens: outputTokens };
       }
 
-      // ToolLoop 已经直接在 messages 末尾添加了新消息，不需要再 push
-      // 计算 original 的 user message
-      const userMsg = result.text
-        ? messages.slice(-1)[0]
-        : messages[messages.length - 1];
-      this.emit('message', { content: result.text, sessionId: sessionId, userMessage: userMsg });
+      // ToolLoop 已经直接在 messages 末尾添加了新消息（含最终 assistant 答复）
+      // ★ userMessage 用 _prepareSession 返回值，不能再取 messages 末尾（已是 assistant）
+      this.emit('message', { content: result.text, sessionId: sessionId, userMessage });
 
       // ★ 修复：AI 调用成功后才持久化（之前 finally 总是 save，
       //   会把刚 push 的 userMessage 写盘；下次请求 loadHistory 再次 load 到，

package/src/agent/sub.js

@@ -9,6 +9,7 @@
 const { BaseAgent } = require('./base');
 const { cleanResponse } = require('../utils');
 const { ToolLoop } = require('./tool-loop');
+const { isThinkingModel } = require('../llm/provider');
 const { z } = require('zod');
 const { logger } = require('../common/logger');
 const { validateAll } = require('../utils/message-validator');
@@ -150,13 +151,26 @@ class SubAgent extends BaseAgent {
           tools,
           maxSteps,
           prepareStep: this._prepareStep ? this._prepareStep.bind(this) : undefined,
+          // ★ 子 Agent 同样要感知 thinking 模式，否则缺 reasoning_content 时会 400。
+          //   白名单命中或 providerOptions 显式开启即视为思考模式；
+          //   即便都没命中，tool-loop 内部还有 _forceReasoning 自愈兜底。
+          thinkingMode: isThinkingModel(this.model) || !!this.providerOptions?.deepseek?.thinking,
         });
 
         const result = await loop.generate({ messages, systemPrompt, model: this.model, client, ...this.providerOptions });
-        messages.push(...result.response.messages);
+        // ★ 不要再 push：ToolLoop.generate 就地 mutate 并返回同一个 messages 引用，
+        //   messages.push(...result.response.messages) 等于 push(...messages)，会让整段历史翻倍。
         const full_text = cleanResponse(result.text);
-        this.emit('complete', { message: full_text, steps: result.steps?.length || 0 });
-        return { success: true, message: full_text, steps: result.steps?.length || 0, messages };
+        // ★ maxSteps 耗尽（最后一步仍是工具调用、无最终答复）不能当成功，
+        //   否则调用方拿到空/半截结果却以为完成。
+        if (result.stopReason === 'max_steps') {
+          const msg = `子Agent「${this.name}」达到最大步数(${maxSteps})仍未给出最终答复`;
+          logger.warn(`[SubAgent:${this.name}] ${msg}`);
+          this.emit('error', { error: msg });
+          return { success: false, message: full_text, error: msg, stopReason: 'max_steps', steps: result.steps || 0, messages };
+        }
+        this.emit('complete', { message: full_text, steps: result.steps || 0 });
+        return { success: true, message: full_text, steps: result.steps || 0, messages };
       } catch (err) {
         lastError = err;
         if (isNetworkError(err) && attempt < maxRetries) {