foliko 2.0.4 → 2.0.5

package/install.ps1

@@ -1,129 +1,129 @@
-# Foliko Installer
-
-# Fix execution policy first
-Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser -Force -ErrorAction SilentlyContinue
-
-Write-Host "Foliko Installer"
-Write-Host "================="
-Write-Host ""
-
-# Refresh PATH
-$env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
-
-# ============ Check/Install Node.js ============
-Write-Host "Checking Node.js..."
-if (Get-Command node -ErrorAction SilentlyContinue) {
-    Write-Host "Node.js installed: $(node --version)" -ForegroundColor Green
-} else {
-    Write-Host "Node.js not found, installing..." -ForegroundColor Yellow
-
-    $nodeUrl = "https://nodejs.org/dist/v20.11.0/node-v20.11.0-x64.msi"
-    $nodeInstaller = "$env:TEMP\node-installer.msi"
-
-    Write-Host "Downloading Node.js..." -ForegroundColor Cyan
-    Invoke-WebRequest -Uri $nodeUrl -OutFile $nodeInstaller -UseBasicParsing
-
-    Write-Host "Installing Node.js (may require admin)..." -ForegroundColor Cyan
-    Start-Process msiexec.exe -ArgumentList "/i", $nodeInstaller, "/quiet", "/norestart" -Wait
-
-    $env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
-    Start-Sleep -Seconds 3
-
-    if (Get-Command node -ErrorAction SilentlyContinue) {
-        Write-Host "Node.js installed: $(node --version)" -ForegroundColor Green
-        Remove-Item $nodeInstaller -Force -ErrorAction SilentlyContinue
-    } else {
-        Write-Host "Node.js installation failed" -ForegroundColor Red
-        Write-Host "Download manually: https://nodejs.org/" -ForegroundColor Yellow
-    }
-}
-Write-Host ""
-
-# ============ Check/Install Python ============
-Write-Host "Checking Python..."
-if (Get-Command python -ErrorAction SilentlyContinue) {
-    Write-Host "Python installed: $(python --version)" -ForegroundColor Green
-} else {
-    Write-Host "Python not found, installing..." -ForegroundColor Yellow
-
-    $pythonUrl = "https://www.python.org/ftp/python/3.12.1/python-3.12.1-amd64.exe"
-    $pythonInstaller = "$env:TEMP\python-installer.exe"
-
-    Write-Host "Downloading Python..." -ForegroundColor Cyan
-    Invoke-WebRequest -Uri $pythonUrl -OutFile $pythonInstaller -UseBasicParsing
-
-    Write-Host "Installing Python (may require admin)..." -ForegroundColor Cyan
-    Start-Process $pythonInstaller -ArgumentList "/quiet", "InstallAllUsers=1", "PrependPath=1", "Include_pip=1" -Wait
-
-    $env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
-    Start-Sleep -Seconds 3
-
-    if (Get-Command python -ErrorAction SilentlyContinue) {
-        Write-Host "Python installed: $(python --version)" -ForegroundColor Green
-        Remove-Item $pythonInstaller -Force -ErrorAction SilentlyContinue
-    } else {
-        Write-Host "Python installation failed" -ForegroundColor Red
-        Write-Host "Download manually: https://www.python.org/downloads/" -ForegroundColor Yellow
-    }
-}
-Write-Host ""
-
-# ============ Check/Install uv ============
-Write-Host "Checking uv..."
-if (Get-Command uv -ErrorAction SilentlyContinue) {
-    Write-Host "uv installed: $(uv --version)" -ForegroundColor Green
-} else {
-    Write-Host "uv not found, installing..." -ForegroundColor Yellow
-
-    try {
-        Write-Host "Downloading uv..." -ForegroundColor Cyan
-        Invoke-WebRequest -Uri "https://astral.sh/uv/install.ps1" -OutFile "$env:TEMP\install-uv.ps1" -UseBasicParsing
-        powershell -ExecutionPolicy Bypass -File "$env:TEMP\install-uv.ps1" -Version "0.4.0" -PowerShell -Admin
-        Remove-Item "$env:TEMP\install-uv.ps1" -Force -ErrorAction SilentlyContinue
-
-        $env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
-
-        if (Get-Command uv -ErrorAction SilentlyContinue) {
-            Write-Host "uv installed: $(uv --version)" -ForegroundColor Green
-        }
-    } catch {
-        Write-Host "uv installation failed (optional, can be skipped)" -ForegroundColor Yellow
-    }
-}
-Write-Host ""
-
-# ============ Clean npm cache and install Foliko ============
-Write-Host "Cleaning npm cache..." -ForegroundColor Cyan
-npm cache clean --force 2>$null | Out-Null
-
-Write-Host "Installing Foliko..." -ForegroundColor Cyan
-npm install -g foliko --ignore-scripts 2>&1 | Out-Null
-
-# Get npm global bin path
-$npmPrefix = npm config get prefix 2>$null
-$npmBinPath = $npmPrefix -replace "\\$", ""
-
-# Add to PATH permanently for current user
-$userPath = [Environment]::GetEnvironmentVariable("Path", "User")
-if ($userPath -notlike "*$npmBinPath*") {
-    [Environment]::SetEnvironmentVariable("Path", "$userPath;$npmBinPath", "User")
-}
-
-# Also add to current session PATH
-$env:Path = "$npmBinPath;$env:Path"
-Start-Sleep -Seconds 2
-
-# Check if installation succeeded
-if (Test-Path "$npmBinPath\foliko.cmd") {
-    Write-Host ""
-    Write-Host "Installation complete!" -ForegroundColor Green
-    Write-Host ""
-    Write-Host "Please restart your terminal or run:" -ForegroundColor Cyan
-    Write-Host '  $env:Path = "C:\Users\Administrator\AppData\Roaming\npm;' + '$env:Path"' -ForegroundColor White
-    Write-Host ""
-    Write-Host "Then run: foliko chat" -ForegroundColor Yellow
-} else {
-    Write-Host ""
-    Write-Host "Installation may have failed." -ForegroundColor Yellow
-    Write-Host "Run: npm install -g foliko"
-}
+# Foliko Installer
+
+# Fix execution policy first
+Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser -Force -ErrorAction SilentlyContinue
+
+Write-Host "Foliko Installer"
+Write-Host "================="
+Write-Host ""
+
+# Refresh PATH
+$env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
+
+# ============ Check/Install Node.js ============
+Write-Host "Checking Node.js..."
+if (Get-Command node -ErrorAction SilentlyContinue) {
+    Write-Host "Node.js installed: $(node --version)" -ForegroundColor Green
+} else {
+    Write-Host "Node.js not found, installing..." -ForegroundColor Yellow
+
+    $nodeUrl = "https://nodejs.org/dist/v20.11.0/node-v20.11.0-x64.msi"
+    $nodeInstaller = "$env:TEMP\node-installer.msi"
+
+    Write-Host "Downloading Node.js..." -ForegroundColor Cyan
+    Invoke-WebRequest -Uri $nodeUrl -OutFile $nodeInstaller -UseBasicParsing
+
+    Write-Host "Installing Node.js (may require admin)..." -ForegroundColor Cyan
+    Start-Process msiexec.exe -ArgumentList "/i", $nodeInstaller, "/quiet", "/norestart" -Wait
+
+    $env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
+    Start-Sleep -Seconds 3
+
+    if (Get-Command node -ErrorAction SilentlyContinue) {
+        Write-Host "Node.js installed: $(node --version)" -ForegroundColor Green
+        Remove-Item $nodeInstaller -Force -ErrorAction SilentlyContinue
+    } else {
+        Write-Host "Node.js installation failed" -ForegroundColor Red
+        Write-Host "Download manually: https://nodejs.org/" -ForegroundColor Yellow
+    }
+}
+Write-Host ""
+
+# ============ Check/Install Python ============
+Write-Host "Checking Python..."
+if (Get-Command python -ErrorAction SilentlyContinue) {
+    Write-Host "Python installed: $(python --version)" -ForegroundColor Green
+} else {
+    Write-Host "Python not found, installing..." -ForegroundColor Yellow
+
+    $pythonUrl = "https://www.python.org/ftp/python/3.12.1/python-3.12.1-amd64.exe"
+    $pythonInstaller = "$env:TEMP\python-installer.exe"
+
+    Write-Host "Downloading Python..." -ForegroundColor Cyan
+    Invoke-WebRequest -Uri $pythonUrl -OutFile $pythonInstaller -UseBasicParsing
+
+    Write-Host "Installing Python (may require admin)..." -ForegroundColor Cyan
+    Start-Process $pythonInstaller -ArgumentList "/quiet", "InstallAllUsers=1", "PrependPath=1", "Include_pip=1" -Wait
+
+    $env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
+    Start-Sleep -Seconds 3
+
+    if (Get-Command python -ErrorAction SilentlyContinue) {
+        Write-Host "Python installed: $(python --version)" -ForegroundColor Green
+        Remove-Item $pythonInstaller -Force -ErrorAction SilentlyContinue
+    } else {
+        Write-Host "Python installation failed" -ForegroundColor Red
+        Write-Host "Download manually: https://www.python.org/downloads/" -ForegroundColor Yellow
+    }
+}
+Write-Host ""
+
+# ============ Check/Install uv ============
+Write-Host "Checking uv..."
+if (Get-Command uv -ErrorAction SilentlyContinue) {
+    Write-Host "uv installed: $(uv --version)" -ForegroundColor Green
+} else {
+    Write-Host "uv not found, installing..." -ForegroundColor Yellow
+
+    try {
+        Write-Host "Downloading uv..." -ForegroundColor Cyan
+        Invoke-WebRequest -Uri "https://astral.sh/uv/install.ps1" -OutFile "$env:TEMP\install-uv.ps1" -UseBasicParsing
+        powershell -ExecutionPolicy Bypass -File "$env:TEMP\install-uv.ps1" -Version "0.4.0" -PowerShell -Admin
+        Remove-Item "$env:TEMP\install-uv.ps1" -Force -ErrorAction SilentlyContinue
+
+        $env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
+
+        if (Get-Command uv -ErrorAction SilentlyContinue) {
+            Write-Host "uv installed: $(uv --version)" -ForegroundColor Green
+        }
+    } catch {
+        Write-Host "uv installation failed (optional, can be skipped)" -ForegroundColor Yellow
+    }
+}
+Write-Host ""
+
+# ============ Clean npm cache and install Foliko ============
+Write-Host "Cleaning npm cache..." -ForegroundColor Cyan
+npm cache clean --force 2>$null | Out-Null
+
+Write-Host "Installing Foliko..." -ForegroundColor Cyan
+npm install -g foliko --ignore-scripts 2>&1 | Out-Null
+
+# Get npm global bin path
+$npmPrefix = npm config get prefix 2>$null
+$npmBinPath = $npmPrefix -replace "\\$", ""
+
+# Add to PATH permanently for current user
+$userPath = [Environment]::GetEnvironmentVariable("Path", "User")
+if ($userPath -notlike "*$npmBinPath*") {
+    [Environment]::SetEnvironmentVariable("Path", "$userPath;$npmBinPath", "User")
+}
+
+# Also add to current session PATH
+$env:Path = "$npmBinPath;$env:Path"
+Start-Sleep -Seconds 2
+
+# Check if installation succeeded
+if (Test-Path "$npmBinPath\foliko.cmd") {
+    Write-Host ""
+    Write-Host "Installation complete!" -ForegroundColor Green
+    Write-Host ""
+    Write-Host "Please restart your terminal or run:" -ForegroundColor Cyan
+    Write-Host '  $env:Path = "C:\Users\Administrator\AppData\Roaming\npm;' + '$env:Path"' -ForegroundColor White
+    Write-Host ""
+    Write-Host "Then run: foliko chat" -ForegroundColor Yellow
+} else {
+    Write-Host ""
+    Write-Host "Installation may have failed." -ForegroundColor Yellow
+    Write-Host "Run: npm install -g foliko"
+}

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.4",
+  "version": "2.0.5",
   "description": "简约的插件化 Agent 框架",
   "main": "src/index.js",
   "type": "commonjs",

package/plugins/core/default/bootstrap.js

@@ -40,15 +40,36 @@ async function loadCustomPlugins(framework, agentConfig) {
         delete require.cache[require.resolve(resolved.path)];
         const mod = require(resolved.path);
         let pluginClass = mod.default || mod;
+
+        // 如果默认导出不是 Plugin 子类，查找模块中的 Plugin 子类
         if (typeof pluginClass === 'function' && !(pluginClass.prototype instanceof Plugin)) {
           const keys = Object.keys(mod).filter(k => mod[k] && mod[k].prototype instanceof Plugin);
           if (keys.length > 0) pluginClass = mod[keys[0]];
         }
+
+        // 如果 pluginClass 是对象（模块直接导出对象而非类），查找其中的 Plugin 子类
+        if (typeof pluginClass !== 'function' && pluginClass.prototype === undefined) {
+          const keys = Object.keys(mod).filter(k => mod[k] && mod[k].prototype instanceof Plugin);
+          if (keys.length > 0) pluginClass = mod[keys[0]];
+        }
+
+        // 检查 pluginClass 是否是 Plugin 实例
+        if (pluginClass instanceof Plugin) {
+          pluginClass = pluginClass.constructor;
+        }
+
         let resolvedName = pluginName;
         if (typeof pluginClass === 'function' && pluginClass.prototype instanceof Plugin) {
           resolvedName = new pluginClass().name || pluginName;
         }
         if (framework.pluginManager.has(resolvedName) && framework.pluginManager.get(resolvedName)?._started) continue;
+
+        // 跳过无法识别的模块（不是 Plugin 类也不是 Plugin 实例）
+        if (typeof pluginClass !== 'function' && !(pluginClass instanceof Plugin)) {
+          log.debug(`Skipping ${pluginName}: not a Plugin class or instance`);
+          continue;
+        }
+
         const pluginConfig = agentConfig[resolvedName] || {};
         let instance;
         if (typeof pluginClass === 'function') {