foliko 1.1.71 → 1.1.73

package/src/capabilities/skill-manager.js

@@ -10,6 +10,39 @@ const { logger } = require('../utils/logger');
 const log = logger.child('SkillManager');
 const { z } = require('zod');
 const { Command } = require('commander');
+
+/**
+ * 简单的 shell 参数解析器（处理带引号的参数）
+ * @param {string} str - 参数字符串
+ * @returns {string[]} 参数数组
+ */
+function parseShellArgs(str) {
+  if (!str || !str.trim()) return [];
+  const args = [];
+  let current = '';
+  let inQuote = false;
+  let quoteChar = '';
+
+  for (let i = 0; i < str.length; i++) {
+    const char = str[i];
+    if (!inQuote && (char === '"' || char === "'")) {
+      inQuote = true;
+      quoteChar = char;
+    } else if (inQuote && char === quoteChar) {
+      inQuote = false;
+    } else if (!inQuote && char === ' ') {
+      if (current.trim()) {
+        args.push(current.trim());
+        current = '';
+      }
+    } else {
+      current += char;
+    }
+  }
+  if (current.trim()) args.push(current.trim());
+  return args;
+}
+
 /**
  * 验证 skill 名称
  * 1-64字符，字母数字、下划线和连字符，不能以连字符或下划线开头或结尾
@@ -185,14 +218,20 @@ class Skill {
         let argumentParser = cmd.argumentParser;
         if (!argumentParser && Array.isArray(cmd.options) && cmd.options.length > 0) {
           argumentParser = (rawArgs) => {
-
-            const program = new Command();
-            for (const opt of cmd.options) {
-              program.option(opt.flags, opt.description, opt.defaultValue);
+            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) {
+              log.warn(`[SkillManager] Command parse error: ${err.message}`);
+              return { args: rawArgs };
             }
-            program.arguments('[args...]');
-            program.parse(['node', 'cmd', ...(rawArgs || '').split(' ').filter(Boolean)]);
-            return { ...program.opts(), args: program.args };
           };
         }
 
@@ -202,6 +241,7 @@ class Skill {
           inputSchema: z.object({
             args: z.string().optional().describe('命令参数'),
           }),
+          _options: cmd.options || null,  // 保存 options 信息用于提示词生成
           execute: async (toolArgs, framework) => {
             const ctx = {
               sessionId: framework?._currentSessionId || 'unknown',
@@ -403,13 +443,67 @@ class SkillManagerPlugin extends Plugin {
     }
 
     const lines = ['## 可用技能', ''];
+
+    // 获取 skill 的命令（通过 extension-executor 插件获取已注册的工具）
+    const extExecutor = this._framework?.pluginManager?.get('extension-executor');
+    const skillCommands = extExecutor?.getSkillCommands?.() || [];
+
+    // 按技能名分组
+    const toolsBySkill = {};
+    for (const tool of skillCommands) {
+      if (!tool || !tool.name) continue;
+      const parts = tool.name.split(':');
+      if (parts.length < 2) continue;
+      const skillName = parts[0];
+      const cmdName = parts.slice(1).join(':');
+      if (!toolsBySkill[skillName]) {
+        toolsBySkill[skillName] = [];
+      }
+      toolsBySkill[skillName].push({ name: cmdName, description: tool.description || '', options: tool.options || null });
+    }
+
     for (const skill of skills) {
       const name = skill.metadata?.name || skill.name || 'unknown';
       const descText = skill.metadata?.description || '';
-      lines.push(`- ${name}: ${descText}`);
+
+      lines.push(`### ${name}`);
+      lines.push(`**描述**: ${descText}`);
+
+      // 如果该技能有命令，添加调用方式
+      if (toolsBySkill[name]) {
+        lines.push('');
+        lines.push('**调用方式:**');
+        lines.push('```');
+        lines.push(`ext_call({`);
+        lines.push(`  plugin: "skill",`);
+        lines.push(`  tool: "${name}:<命令名>",`);
+        lines.push(`  args: { args: "参数" }  // 注意：args 必须是对象，不能是字符串`);
+        lines.push(`})`);
+        lines.push('```');
+        lines.push('');
+        lines.push('**可用命令:**');
+        for (const c of toolsBySkill[name]) {
+          lines.push(`- \`${c.name}\`: ${c.description}`);
+          // 如果有 options，显示参数格式
+          if (c.options && c.options.length > 0) {
+            const optStr = c.options.map(o => {
+              const flag = o.flags?.split(' ')[0] || o.flags || '';
+              const def = o.defaultValue !== undefined ? ` (默认: ${JSON.stringify(o.defaultValue)})` : '';
+              return `${flag}${def}`;
+            }).join(' ');
+            lines.push(`  - 选项: ${optStr}`);
+          }
+        }
+        lines.push('');
+        lines.push('**示例:**');
+        for (const c of toolsBySkill[name]) {
+          lines.push(`- 调用 \`ext_call({ plugin: "skill", tool: "${name}:${c.name}", args: { args: "参数" } })\``);
+        }
+      }
+      lines.push('');
     }
+
     lines.push(
-      '',
       '> **重要提示**：当需要开发插件、执行专业任务时，必须先使用 `loadSkill` 工具加载对应技能，获取专业指导。'
     );
 

package/src/core/agent-chat.js

@@ -500,6 +500,8 @@ class AgentChatHandler extends EventEmitter {
       const stream = result.fullStream;
       let fullText = '';
       const iterator = stream[Symbol.asyncIterator] ? stream : stream.fullStream;
+      // 追踪发送的 tool-call ID，过滤 API 返回的不匹配 tool-result
+      const sentToolCallIds = new Set();
 
       for await (const part of iterator || stream) {
         if (part.type === 'text-delta') {
@@ -510,8 +512,16 @@ class AgentChatHandler extends EventEmitter {
           reasoningContent += part.text || '';
           yield { type: 'thinking', text: part.text };
         } else if (part.type === 'tool-call') {
+          const toolCallId = part.toolCallId;
+          if (toolCallId) sentToolCallIds.add(toolCallId);
           yield { type: 'tool-call', toolName: part.toolName, input: part.input };
         } else if (part.type === 'tool-result') {
+          // 过滤 toolCallId 不匹配的 tool-result（API bug）
+          const resultToolCallId = part.toolCallId;
+          if (resultToolCallId && !sentToolCallIds.has(resultToolCallId)) {
+            logger.debug(`[stream]过滤不匹配的 tool-result: ${resultToolCallId}`);
+            continue;
+          }
           yield { type: 'tool-result', toolName: part.toolName, result: part.output };
         } else if (part.type === 'error') {
           // 统一错误消息

package/website_v2/styles/animations.css

@@ -1,8 +1,8 @@
-/* Foliko v2 - Animations */
-    @keyframes fadeInUp { from { opacity: 0; transform: translateY(30px); } to { opacity: 1; transform: translateY(0); } }
-    @keyframes fadeIn { from { opacity: 0; } to { opacity: 1; } }
-    @keyframes glow { 0%, 100% { opacity: 0.4; transform: translateX(-50%) scale(1); } 50% { opacity: 0.7; transform: translateX(-50%) scale(1.1); } }
-    @keyframes pulse { 0%, 100% { opacity: 1; transform: scale(1); } 50% { opacity: 0.5; transform: scale(1.2); } }
-    .reveal { opacity: 0; transform: translateY(30px); transition: all 0.6s cubic-bezier(0.4, 0, 0.2, 1); }
-    .reveal.visible { opacity: 1; transform: translateY(0); }
+/* Foliko v2 - Animations */
+    @keyframes fadeInUp { from { opacity: 0; transform: translateY(30px); } to { opacity: 1; transform: translateY(0); } }
+    @keyframes fadeIn { from { opacity: 0; } to { opacity: 1; } }
+    @keyframes glow { 0%, 100% { opacity: 0.4; transform: translateX(-50%) scale(1); } 50% { opacity: 0.7; transform: translateX(-50%) scale(1.1); } }
+    @keyframes pulse { 0%, 100% { opacity: 1; transform: scale(1); } 50% { opacity: 0.5; transform: scale(1.2); } }
+    .reveal { opacity: 0; transform: translateY(30px); transition: all 0.6s cubic-bezier(0.4, 0, 0.2, 1); }
+    .reveal.visible { opacity: 1; transform: translateY(0); }