foliko 2.0.21 → 2.0.23

package/install.sh

@@ -1,121 +1,121 @@
-#!/bin/bash
-# Foliko Installer
-
-set -e
-
-echo -e "\033[36mFoliko Installer\033[0m"
-echo -e "\033[36m=================\033[0m"
-echo ""
-
-# Detect OS
-detect_os() {
-    if [[ "$OSTYPE" == "darwin"* ]]; then
-        echo "macOS"
-    elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
-        echo "Linux"
-    else
-        echo "unknown"
-    fi
-}
-
-OS=$(detect_os)
-
-# ============ Check/Install Node.js ============
-echo -e "\033[36mChecking Node.js...\033[0m"
-if command -v node &> /dev/null; then
-    echo -e "\033[32mNode.js installed: $(node --version)\033[0m"
-else
-    echo -e "\033[33mNode.js not found, installing...\033[0m"
-
-    if [[ "$OS" == "macOS" ]]; then
-        if command -v brew &> /dev/null; then
-            brew install node
-        else
-            echo -e "\033[31mHomebrew not found. Install it first:\033[0m"
-            echo "/bin/bash -c \"\$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)\""
-            exit 1
-        fi
-    elif [[ "$OS" == "Linux" ]]; then
-        if command -v apt-get &> /dev/null; then
-            sudo apt-get update && sudo apt-get install -y nodejs npm
-        elif command -v yum &> /dev/null; then
-            sudo yum install -y nodejs npm
-        elif command -v pacman &> /dev/null; then
-            sudo pacman -S nodejs npm
-        else
-            echo -e "\033[31mNo package manager found. Install Node.js manually: https://nodejs.org/\033[0m"
-            exit 1
-        fi
-    fi
-
-    if command -v node &> /dev/null; then
-        echo -e "\033[32mNode.js installed: $(node --version)\033[0m"
-    else
-        echo -e "\033[31mNode.js installation failed\033[0m"
-        exit 1
-    fi
-fi
-echo ""
-
-# ============ Check/Install Python ============
-echo -e "\033[36mChecking Python...\033[0m"
-if command -v python3 &> /dev/null; then
-    echo -e "\033[32mPython installed: $(python3 --version)\033[0m"
-else
-    echo -e "\033[33mPython not found, installing...\033[0m"
-
-    if [[ "$OS" == "macOS" ]]; then
-        if command -v brew &> /dev/null; then
-            brew install python3
-        fi
-    elif [[ "$OS" == "Linux" ]]; then
-        if command -v apt-get &> /dev/null; then
-            sudo apt-get update && sudo apt-get install -y python3 python3-venv python3-pip
-        elif command -v yum &> /dev/null; then
-            sudo yum install -y python3
-        elif command -v pacman &> /dev/null; then
-            sudo pacman -S python python-pip
-        fi
-    fi
-
-    if command -v python3 &> /dev/null; then
-        echo -e "\033[32mPython installed: $(python3 --version)\033[0m"
-    else
-        echo -e "\033[33mPython installation failed (optional)\033[0m"
-    fi
-fi
-echo ""
-
-# ============ Check/Install uv ============
-echo -e "\033[36mChecking uv...\033[0m"
-if command -v uv &> /dev/null; then
-    echo -e "\033[32muv installed: $(uv --version)\033[0m"
-else
-    echo -e "\033[33muv not found, installing...\033[0m"
-
-    if [[ "$OS" == "macOS" ]] || [[ "$OS" == "Linux" ]]; then
-        curl -LsSf https://astral.sh/uv/install.sh | sh
-        source $HOME/.local/bin/env 2>/dev/null || true
-
-        if command -v uv &> /dev/null; then
-            echo -e "\033[32muv installed: $(uv --version)\033[0m"
-        else
-            echo -e "\033[33muv installation failed (optional)\033[0m"
-        fi
-    fi
-fi
-echo ""
-
-# ============ Install Foliko ============
-echo -e "\033[36mInstalling Foliko...\033[0m"
-npm install -g foliko
-
-if command -v foliko &> /dev/null; then
-    echo ""
-    echo -e "\033[32mInstallation complete!\033[0m"
-    echo "Run: foliko chat"
-else
-    echo ""
-    echo -e "\033[31mInstallation failed. Try manually: npm install -g foliko\033[0m"
-    exit 1
-fi
+#!/bin/bash
+# Foliko Installer
+
+set -e
+
+echo -e "\033[36mFoliko Installer\033[0m"
+echo -e "\033[36m=================\033[0m"
+echo ""
+
+# Detect OS
+detect_os() {
+    if [[ "$OSTYPE" == "darwin"* ]]; then
+        echo "macOS"
+    elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
+        echo "Linux"
+    else
+        echo "unknown"
+    fi
+}
+
+OS=$(detect_os)
+
+# ============ Check/Install Node.js ============
+echo -e "\033[36mChecking Node.js...\033[0m"
+if command -v node &> /dev/null; then
+    echo -e "\033[32mNode.js installed: $(node --version)\033[0m"
+else
+    echo -e "\033[33mNode.js not found, installing...\033[0m"
+
+    if [[ "$OS" == "macOS" ]]; then
+        if command -v brew &> /dev/null; then
+            brew install node
+        else
+            echo -e "\033[31mHomebrew not found. Install it first:\033[0m"
+            echo "/bin/bash -c \"\$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)\""
+            exit 1
+        fi
+    elif [[ "$OS" == "Linux" ]]; then
+        if command -v apt-get &> /dev/null; then
+            sudo apt-get update && sudo apt-get install -y nodejs npm
+        elif command -v yum &> /dev/null; then
+            sudo yum install -y nodejs npm
+        elif command -v pacman &> /dev/null; then
+            sudo pacman -S nodejs npm
+        else
+            echo -e "\033[31mNo package manager found. Install Node.js manually: https://nodejs.org/\033[0m"
+            exit 1
+        fi
+    fi
+
+    if command -v node &> /dev/null; then
+        echo -e "\033[32mNode.js installed: $(node --version)\033[0m"
+    else
+        echo -e "\033[31mNode.js installation failed\033[0m"
+        exit 1
+    fi
+fi
+echo ""
+
+# ============ Check/Install Python ============
+echo -e "\033[36mChecking Python...\033[0m"
+if command -v python3 &> /dev/null; then
+    echo -e "\033[32mPython installed: $(python3 --version)\033[0m"
+else
+    echo -e "\033[33mPython not found, installing...\033[0m"
+
+    if [[ "$OS" == "macOS" ]]; then
+        if command -v brew &> /dev/null; then
+            brew install python3
+        fi
+    elif [[ "$OS" == "Linux" ]]; then
+        if command -v apt-get &> /dev/null; then
+            sudo apt-get update && sudo apt-get install -y python3 python3-venv python3-pip
+        elif command -v yum &> /dev/null; then
+            sudo yum install -y python3
+        elif command -v pacman &> /dev/null; then
+            sudo pacman -S python python-pip
+        fi
+    fi
+
+    if command -v python3 &> /dev/null; then
+        echo -e "\033[32mPython installed: $(python3 --version)\033[0m"
+    else
+        echo -e "\033[33mPython installation failed (optional)\033[0m"
+    fi
+fi
+echo ""
+
+# ============ Check/Install uv ============
+echo -e "\033[36mChecking uv...\033[0m"
+if command -v uv &> /dev/null; then
+    echo -e "\033[32muv installed: $(uv --version)\033[0m"
+else
+    echo -e "\033[33muv not found, installing...\033[0m"
+
+    if [[ "$OS" == "macOS" ]] || [[ "$OS" == "Linux" ]]; then
+        curl -LsSf https://astral.sh/uv/install.sh | sh
+        source $HOME/.local/bin/env 2>/dev/null || true
+
+        if command -v uv &> /dev/null; then
+            echo -e "\033[32muv installed: $(uv --version)\033[0m"
+        else
+            echo -e "\033[33muv installation failed (optional)\033[0m"
+        fi
+    fi
+fi
+echo ""
+
+# ============ Install Foliko ============
+echo -e "\033[36mInstalling Foliko...\033[0m"
+npm install -g foliko
+
+if command -v foliko &> /dev/null; then
+    echo ""
+    echo -e "\033[32mInstallation complete!\033[0m"
+    echo "Run: foliko chat"
+else
+    echo ""
+    echo -e "\033[31mInstallation failed. Try manually: npm install -g foliko\033[0m"
+    exit 1
+fi

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foliko",
-  "version": "2.0.21",
+  "version": "2.0.23",
   "description": "简约的插件化 Agent 框架",
   "main": "src/index.js",
   "type": "commonjs",
@@ -51,20 +51,18 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@ai-sdk/anthropic": "^3.0.58",
     "@ai-sdk/mcp": "^1.0.25",
-    "@ai-sdk/openai": "^3.0.41",
-    "@ai-sdk/openai-compatible": "^2.0.35",
     "@anthropic-ai/sdk": "^0.39.0",
     "@anthropic-ai/tokenizer": "^0.0.4",
     "@chnak/qq-bot": "1.0.7",
     "@chnak/weixin-bot": "^1.2.9",
     "@chnak/zod-to-markdown": "1.0.7",
     "@earendil-works/pi-tui": "^0.75.3",
+    "@frsource/frs-replace": "^5.1.117",
     "@hono/node-server": "^1.19.11",
     "@larksuiteoapi/node-sdk": "^1.59.0",
     "@modelcontextprotocol/sdk": "^1.27.1",
-    "ai": "^6.0.146",
+    "openai": "^6.46.0",
     "chalk": "^5.6.2",
     "cli-highlight": "^2.1.11",
     "croner": "^9.1.0",

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

@@ -272,12 +272,11 @@ function buildSchemaFromType(type, desc, defaultValue) {
  */
 function buildInputSchemaFromOptions(options) {
   if (!Array.isArray(options) || options.length === 0) {
-    return { type: 'object', properties: {}, required: [] };
+    // 返回 zod schema（即使是空的也返回），确保 _doExecute 走校验路径
+    return require('zod').z.object({}).passthrough();
   }
 
-  const properties = {};
-  const required = [];
-
+  const shape = {};
   for (const opt of options) {
     const name = extractOptionName(opt.flags);
     if (!name) continue;
@@ -287,33 +286,45 @@ function buildInputSchemaFromOptions(options) {
     const desc = opt.description || '';
     const defaultVal = opt.defaultValue;
 
-    let jsonType = 'string';
+    // ★ 关键修复：返回 zod schema（不是纯 JSON Schema），
+    //   这样 _doExecute 里的 toolDef.inputSchema.safeParse 才会真的执行校验。
+    //   之前返回 JSON Schema 对象没有 .safeParse 方法，校验被完全跳过。
+    //   导致 LLM 传 args:{} 不会报错，直接到达工具 → args.id undefined。
+    const z = require('zod').z;
+    let zodField;
     if (opt.schema && typeof opt.schema.parse === 'function') {
-      // 从 Zod 实例猜测类型
-      const s = opt.schema;
-      if (s._def.typeName === 'ZodNumber' || s._def.typeName === 'ZodInt') jsonType = 'number';
-      else if (s._def.typeName === 'ZodBoolean') jsonType = 'boolean';
-      else if (s._def.typeName === 'ZodArray') jsonType = 'array';
-      else if (s._def.typeName === 'ZodObject' || s._def.typeName === 'ZodRecord') jsonType = 'object';
-    } else if (opt.type) {
-      const L = opt.type.toLowerCase();
-      if (L === 'number' || L === 'int' || L === 'integer') jsonType = 'number';
-      else if (L === 'boolean' || L === 'bool') jsonType = 'boolean';
-      else if (L === 'array') jsonType = 'array';
-      else if (L === 'object') jsonType = 'object';
+      zodField = opt.schema;
     } else {
-      jsonType = hasValue ? 'string' : 'boolean';
+      const type = (opt.type || (hasValue ? 'string' : 'boolean')).toLowerCase();
+      if (type === 'number' || type === 'int' || type === 'integer') {
+        zodField = z.number();
+      } else if (type === 'boolean' || type === 'bool') {
+        zodField = z.boolean();
+      } else if (type === 'array') {
+        zodField = z.array(z.any());
+      } else if (type === 'object') {
+        zodField = z.object({}).passthrough();
+      } else {
+        zodField = z.string();
+      }
     }
 
-    const prop = { type: jsonType, description: desc };
+    if (!isRequired) {
+      zodField = zodField.optional();
+    }
     if (defaultVal !== undefined && defaultVal !== null) {
-      prop.default = defaultVal;
+      zodField = zodField.default(defaultVal);
     }
-    properties[name] = prop;
-    if (isRequired) required.push(name);
+    // 描述里加 (必填) 标记，方便 LLM 看到
+    zodField = zodField.describe(desc + (isRequired ? '（必填）' : ''));
+
+    shape[name] = zodField;
   }
 
-  return { type: 'object', properties, required };
+  if (Object.keys(shape).length === 0) {
+    return require('zod').z.object({}).passthrough();
+  }
+  return require('zod').z.object(shape).passthrough();
 }
 
 /**

package/plugins/core/sub-agent/index.js

@@ -26,6 +26,16 @@ class SubAgentPlugin extends Plugin {
     this.llmConfig = config.llmConfig || null
     this.hidden = config.hidden || false  // 隐藏子Agent，不在指令系统中显示
 
+    // ★ 新增：frontmatter 之外的配置
+    // systemPrompt: 来自 markdown body（自动提取）
+    // skills: 来自 frontmatter 的 `skills: a, b, c` 字段，技能名数组
+    this.systemPrompt = config.systemPrompt || ''
+    this.skills = Array.isArray(config.skills)
+      ? config.skills
+      : (typeof config.skills === 'string'
+          ? config.skills.split(',').map(s => s.trim()).filter(Boolean)
+          : [])
+
     this.config = {}
 
     this._framework = null
@@ -266,6 +276,24 @@ class SubAgentPlugin extends Plugin {
   }
 
   _getFullSystemPrompt() {
+    // ★ 优先用 markdown body 提取的 systemPrompt（来自 _parseMarkdownConfig）
+    // 然后叠加 skills 列表（自动从 skill-manager 查询命令并注入）
+    const base = this._buildBaseSystemPrompt();
+    const skillsSection = this._buildSkillsSection();
+    if (skillsSection) {
+      return base + '\n\n' + skillsSection;
+    }
+    return base;
+  }
+
+  _buildBaseSystemPrompt() {
+    // 1) 显式配置的 systemPrompt 优先
+    if (this.systemPrompt && this.systemPrompt.trim()) {
+      // 已经是 markdown body（含 "你是..." 这类角色定义）
+      const header = `# ${this.name}\n\n${this.description || ''}`.trim();
+      return `${header}\n\n${this.systemPrompt.trim()}`;
+    }
+    // 2) 回退到 subAgentConfigManager
     const configManager = this._framework._subAgentConfigManager;
     if (configManager) {
       const config = configManager.get(this.name);
@@ -273,10 +301,43 @@ class SubAgentPlugin extends Plugin {
         return config.getSystemPrompt();
       }
     }
-
+    // 3) 最后回退到 _buildSystemPrompt（旧逻辑）
     return this._buildSystemPrompt();
   }
 
+  /**
+   * 根据 this.skills 列表，从 skill-manager 查询每个 skill 的命令，
+   * 生成 "## 可用技能" section 注入 systemPrompt
+   * @private
+   */
+  _buildSkillsSection() {
+    if (!this.skills || this.skills.length === 0) return '';
+    const extExecutor = this._framework?.pluginManager?.get('extension-executor');
+    if (!extExecutor) return '';
+
+    const lines = ['## 🛠️ 可用技能', ''];
+    let hasContent = false;
+    for (const skillName of this.skills) {
+      // 通过 ext_call 拿 skill 下的所有 tool
+      const tools = extExecutor.getExtensionTools(`skill:${skillName}`) || [];
+      if (tools.length === 0) {
+        lines.push(`### ${skillName}`);
+        lines.push('(该技能尚未注册或无可用命令)');
+        lines.push('');
+        continue;
+      }
+      hasContent = true;
+      lines.push(`### ${skillName}`);
+      lines.push('通过 ext_call 调用，格式：`ext_call({plugin: "skill:' + skillName + '", tool: "<命令>", args: {...}})`');
+      lines.push('');
+      for (const tool of tools) {
+        lines.push(`- **${tool.name}**: ${tool.description || '(无描述)'}`);
+      }
+      lines.push('');
+    }
+    return hasContent ? lines.join('\n') : '';
+  }
+
   _updateAgentSystemPrompt() {
     if (!this._agent) return;
     const systemPrompt = this._getFullSystemPrompt();
@@ -545,27 +606,55 @@ class SubAgentManagerPlugin extends Plugin {
   _parseMarkdownConfig(filePath, defaultName) {
     const content = fs.readFileSync(filePath, 'utf-8')
 
-    const jsonMatch = content.match(/```(?:json)?\s*\n([\s\S]*?)\n\s*```/)
-    if (jsonMatch) {
-      try {
-        return JSON.parse(jsonMatch[1].trim())
-      } catch (err) {
-      }
-    }
-
+    // ★ 修复：优先解析 frontmatter（如果文件以 --- 开头）
+    // 之前的 bug：先匹配第一个 ```json 代码块，导致 body 里的示例 JSON 被当作 config。
+    // 例：news-pipeline-agent.md 里有示例 ```json { "news_list": [...] } ```，
+    //     这个示例被当成 config 解析，结果没有 name 字段，注册失败。
+    let config = null
     const frontmatterMatch = content.match(/^---\n([\s\S]*?)\n---/)
     if (frontmatterMatch) {
       const frontmatterContent = frontmatterMatch[1]
       const parsed = this._parseYamlLike(frontmatterContent)
       if (parsed && parsed.name) {
-        return { name: parsed.name || defaultName, ...parsed }
+        config = { name: parsed.name || defaultName, ...parsed }
       }
+      // frontmatter 存在但没有 name，回退到 body JSON 块
     }
 
-    const config = { name: defaultName }
-    const yamlMatch = content.match(/^(name|role|description|parentTools|tools):\s*(.+)$/m)
-    if (yamlMatch) {
-      config[yamlMatch[1]] = yamlMatch[2].trim()
+    // 回退：找第一个 JSON 代码块作为 config（仅当无 frontmatter 时）
+    if (!config) {
+      const jsonMatch = content.match(/```(?:json)?\s*\n([\s\S]*?)\n\s*```/)
+      if (jsonMatch) {
+        try {
+          const parsed = JSON.parse(jsonMatch[1].trim())
+          if (parsed && parsed.name) {
+            config = parsed
+          }
+          // JSON 块没有 name 字段 → 视为示例代码，跳过
+        } catch (err) {
+          // 解析失败也跳过
+        }
+      }
+    }
+
+    // 最后回退：尝试匹配文件首行 key: value（不带 m flag，避免匹配 body 中间的内容）
+    if (!config) {
+      config = { name: defaultName }
+      const yamlMatch = content.match(/^(name|role|description|parentTools|tools):\s*(.+)$/)
+      if (yamlMatch) {
+        config[yamlMatch[1]] = yamlMatch[2].trim()
+      }
+    }
+
+    // ★ 新增：提取 markdown body 作为 systemPrompt
+    // 移除 frontmatter 后剩下的内容（去掉首个 # 标题和首尾空白）
+    let body = content
+    if (frontmatterMatch) {
+      body = content.slice(frontmatterMatch[0].length)
+    }
+    body = body.replace(/^\s*#\s+[^\n]*\n+/, '').trim()
+    if (body && body.length > 20) {
+      config.systemPrompt = body
     }
 
     return config