foliko 2.0.22 → 2.0.24

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.22",
+  "version": "2.0.24",
   "description": "简约的插件化 Agent 框架",
   "main": "src/index.js",
   "type": "commonjs",
@@ -51,10 +51,7 @@
   "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",
@@ -65,7 +62,7 @@
     "@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/sub-agent/index.js

@@ -49,6 +49,7 @@ class SubAgentPlugin extends Plugin {
   }
 
   start(framework) {
+    this._framework = framework
     this._createSubAgent()
     this._registerDelegateTool()
     return this
@@ -59,7 +60,7 @@ class SubAgentPlugin extends Plugin {
     if (!parentAgent) {
       if (this._framework) {
         this._framework.on('agent:created', (agent) => {
-          if (this._framework._mainAgent && agent === this._framework._mainAgent) {
+          if (this._framework && this._framework._mainAgent && agent === this._framework._mainAgent) {
             this._parentAgent = agent
             this._doCreateSubAgent(agent)
             this._registerDelegateTool()
@@ -117,9 +118,11 @@ class SubAgentPlugin extends Plugin {
       return this._framework._mainAgent
     }
 
+    // 只有 MainAgent 才能作为 parent，不要返回 SubAgent
     const agents = this._framework._agents || []
-    if (agents.length > 0) {
-      return agents[agents.length - 1]
+    const mainAgent = agents.find(a => a.constructor.name === 'MainAgent')
+    if (mainAgent) {
+      return mainAgent
     }
 
     return null
@@ -515,7 +518,7 @@ class SubAgentManagerPlugin extends Plugin {
 
     framework.registerTool({
       name: 'subagent_call',
-      description: '调用指定的子Agent处理任务',
+      description: '【首选】委托任务给指定的子Agent处理。根据子Agent匹配表选择合适的Agent，用此工具调用。禁止用chat工具代替。',
       inputSchema: z.object({
         agentName: z.string().describe('子Agent名称'),
         task: z.string().describe('任务描述')
@@ -763,6 +766,7 @@ class SubAgentManagerPlugin extends Plugin {
   }
 
   reload(framework) {
+    super.reload(framework);  // 设置 this._framework，清理 prompts
     for (const plugin of this._subAgents.values()) {
       plugin.uninstall(framework)
     }