myagent-ai 1.15.57 → 1.15.58

package/README.md

@@ -10,7 +10,6 @@
 
 ### 🚀 执行引擎
 - **多语言执行**: Python / Shell (Bash) / PowerShell / CMD
-- **自动修复**: ImportError 自动安装、编码修复、缩进修复
 - **安全控制**: 危险命令拦截、超时控制、输出截断
 - **结构化结果**: 执行结果标准化，LLM 稳定理解
 
@@ -123,27 +122,18 @@ powershell -c "irm https://raw.githubusercontent.com/ctz168/myagent/main/install
 curl -fsSL https://raw.githubusercontent.com/ctz168/myagent/main/install/install.sh | bash
 ```
 
-### 一键重装（跳过依赖检查）
+### 快速升级
 
-> 已安装过 MyAgent 的环境下，快速升级/重装，安装和启动时均不检查 pip 依赖。
+> 已安装过 MyAgent 的环境下，重新安装最新版：
 
-**npm 方式（推荐，最简单）：**
 ```bash
-npx myagent-ai --skip-deps
+npm install -g myagent-ai@latest
+myagent-ai reinstall
 ```
 
-> `npx` 会自动安装/升级最新版 `myagent-ai`，`--skip-deps` 跳过安装和启动时的所有依赖检查。
-
-**脚本方式：**
-
-**Windows（PowerShell）：**
-```powershell
-powershell -c "& ([scriptblock]::Create((irm https://raw.githubusercontent.com/ctz168/myagent/main/install/install.ps1))) -NoDeps"
-```
-
-**macOS / Linux：**
+或使用脚本重新安装：
 ```bash
-curl -fsSL https://raw.githubusercontent.com/ctz168/myagent/main/install/install.sh | bash -s -- --no-deps
+curl -fsSL https://raw.githubusercontent.com/ctz168/myagent/main/install/install.sh | bash
 ```
 
 ---
@@ -200,19 +190,21 @@ export MYAGENT_ANTHROPIC_API_KEY="sk-ant-..."
 ### 2. 运行
 
 ```bash
-# 交互式命令行
-myagent-ai
+# Web 管理后台（推荐）
+myagent-ai web
 
-# 系统托盘后台运行
-myagent-ai --tray
+# CLI 交互模式
+myagent-ai cli
 
-# 调试模式
-myagent-ai --debug
+# 系统托盘后台运行
+myagent-ai tray
 
-# 设置开机自启
-myagent-ai --autostart
+# API 服务模式
+myagent-ai server
 ```
 
+> 首次运行会自动安装所有依赖，后续启动秒开。
+
 ### 3. 配置聊天平台 (可选)
 
 编辑 `~/.myagent/config.json`:

package/install/install.ps1

@@ -11,7 +11,6 @@ $ErrorActionPreference = "Stop"
 $PKG_NAME = "myagent-ai"
 $PKG_VERSION = ""
 
-# 动态获取 npm 最新版本号
 function Get-NpmVersion {
     try {
         $ver = (npm view $PKG_NAME version 2>$null)
@@ -19,12 +18,10 @@ function Get-NpmVersion {
     } catch {}
 }
 
-# Allow running scripts for the current process
 if ($PSVersionTable.PSVersion.Major -ge 5) {
     Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope Process -Force
 }
 
-# 尝试获取最新版本
 Get-NpmVersion
 
 $verDisplay = if ($PKG_VERSION) { " v$PKG_VERSION" } else { "" }
@@ -40,16 +37,13 @@ if ($PSVersionTable.PSVersion.Major -lt 5) {
 Write-Host "[OK] Windows detected" -ForegroundColor Green
 
 # ── Python ───────────────────────────────────────────────
-# 记录已找到的 Python 路径
 $Script:PythonCmd = ""
 
 function Refresh-Path {
-    # 刷新 PATH（安装后需要刷新才能找到新安装的程序）
     $env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
 }
 
 function Check-Python {
-    # 刷新 PATH（安装后可能需要刷新）
     Refresh-Path
     try {
         $pyVer = (python --version 2>$null)
@@ -59,119 +53,44 @@ function Check-Python {
                 $Script:PythonCmd = "python"
                 Write-Host "[OK] Python $verNum found" -ForegroundColor Green
                 return $true
-            } else {
-                Write-Host "[!] Python $verNum found, upgrading to 3.13+ ..." -ForegroundColor Yellow
-                # 仍然记录当前可用的 Python（即使版本低，也总比没有好）
-                $Script:PythonCmd = "python"
-                return $false
             }
         }
-    } catch {
-        Write-Host "[!] Python not found" -ForegroundColor Yellow
-    }
-    # 尝试在常见安装路径查找
-    $commonPaths = @(
+    } catch {}
+    foreach ($pyPath in @(
         "$env:LOCALAPPDATA\Programs\Python\Python314\python.exe",
         "$env:LOCALAPPDATA\Programs\Python\Python313\python.exe",
-        "C:\Python314\python.exe",
-        "C:\Python313\python.exe",
-        "C:\Program Files\Python314\python.exe",
-        "C:\Program Files\Python313\python.exe"
-    )
-    foreach ($pyPath in $commonPaths) {
+        "C:\Python314\python.exe", "C:\Python313\python.exe"
+    )) {
         if (Test-Path $pyPath) {
-            $verNum = (& $pyPath --version 2>$null) -replace 'Python\s+(\S+)', '$1'
-            if ($verNum -and [version]$verNum -ge [version]"3.13") {
-                $Script:PythonCmd = $pyPath
-                Write-Host "[OK] Python $verNum found at $pyPath" -ForegroundColor Green
-                return $true
-            }
+            $Script:PythonCmd = $pyPath
+            Write-Host "[OK] Python found at $pyPath" -ForegroundColor Green
+            return $true
         }
     }
     return $false
 }
 
 function Install-Python {
-    Write-Host "[*] Installing Python 3.13 ..." -ForegroundColor Yellow
-    $installAttempted = $false
-
-    # Try winget first (try 3.14, then 3.13)
+    Write-Host "[*] Installing Python 3.13+ ..." -ForegroundColor Yellow
     try {
         $null = (winget --version 2>$null)
-        Write-Host "  Using winget ..." -ForegroundColor Gray
         foreach ($pyVer in @("3.14", "3.13")) {
-            Write-Host "  尝试 Python $pyVer ..." -ForegroundColor Gray
             winget install "Python.Python.$pyVer" --accept-package-agreements --accept-source-agreements 2>$null
-            $installAttempted = $true
-            # 等待安装完成后刷新 PATH（重试多次）
             for ($i = 1; $i -le 5; $i++) {
                 Start-Sleep -Seconds 2
                 if (Check-Python) { return }
             }
-            # winget 已完成安装，即使 Check-Python 失败也不再重复安装
-            Refresh-Path
-            $pyPaths = @(
-                "$env:LOCALAPPDATA\Programs\Python\Python$pyVer\python.exe",
-                "C:\Python$pyVer\python.exe",
-                "C:\Program Files\Python$pyVer\python.exe"
-            )
-            foreach ($pyPath in $pyPaths) {
-                if (Test-Path $pyPath) {
-                    $verNum = (& $pyPath --version 2>$null) -replace 'Python\s+(\S+)', '$1'
-                    if ($verNum) {
-                        $Script:PythonCmd = $pyPath
-                        Write-Host "[OK] Python $verNum installed via winget at $pyPath" -ForegroundColor Green
-                        Write-Host "[i] PATH will be updated after restart. Using direct path for now." -ForegroundColor Gray
-                        return
-                    }
-                }
-            }
         }
-        Write-Host "[i] Python was installed via winget but PATH not yet updated." -ForegroundColor Yellow
-        Write-Host "    Please restart your terminal and run: myagent-ai" -ForegroundColor Yellow
+        Write-Host "[i] Python installed but PATH not updated. Restart terminal and run: myagent-ai" -ForegroundColor Yellow
         exit 0
-    } catch {
-        Write-Host "  winget not available, downloading ..." -ForegroundColor Gray
-    }
-
-    # 仅在 winget 未尝试时才从 python.org 下载（避免双重安装）
-    if (-not $installAttempted) {
-        # Fallback: download from python.org (try 3.13 first)
-        $pyVersions = @(
-            @{ Url = "https://www.python.org/ftp/python/3.13.3/python-3.13.3-amd64.exe"; Ver = "3.13.3" },
-            @{ Url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0-amd64.exe"; Ver = "3.14.0" }
-        )
-        foreach ($pyInfo in $pyVersions) {
-            $pyExe = Join-Path $env:TEMP "python-installer.exe"
-            try {
-                Write-Host "  Downloading Python $($pyInfo.Ver) ..." -ForegroundColor Gray
-                Invoke-WebRequest -Uri $pyInfo.Url -OutFile $pyExe -UseBasicParsing -ErrorAction Stop
-
-                Write-Host "  Installing (Add to PATH) ..." -ForegroundColor Gray
-                Start-Process -FilePath $pyExe -ArgumentList "/quiet InstallAllUsers=1 PrependPath=1" -Wait
-
-                # 刷新 PATH 并验证（重试多次）
-                for ($i = 1; $i -le 5; $i++) {
-                    Start-Sleep -Seconds 2
-                    if (Check-Python) { return }
-                }
-            } catch {
-                Write-Host "  Python $($pyInfo.Ver) download failed, trying next..." -ForegroundColor Yellow
-            } finally {
-                if (Test-Path $pyExe) { Remove-Item -Force $pyExe -ErrorAction SilentlyContinue }
-            }
-        }
-    }
-
-    Write-Host "[x] Failed to install Python." -ForegroundColor Red
-    Write-Host "  Please install Python 3.13+ manually: https://www.python.org/downloads/" -ForegroundColor Gray
+    } catch {}
+    Write-Host "[x] Failed to install Python. Please install manually: https://www.python.org/downloads/" -ForegroundColor Red
     exit 1
 }
 
 # ── Node.js ──────────────────────────────────────────────
 function Check-Node {
-    # 刷新 PATH
-    $env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
+    Refresh-Path
     try {
         $nodeVer = (node -v 2>$null)
         if ($nodeVer) {
@@ -179,204 +98,74 @@ function Check-Node {
             if ($major -ge 18) {
                 Write-Host "[OK] Node.js $nodeVer found" -ForegroundColor Green
                 return $true
-            } else {
-                Write-Host "[!] Node.js $nodeVer found, but v18+ required" -ForegroundColor Yellow
-                return $false
             }
         }
-    } catch {
-        Write-Host "[!] Node.js not found" -ForegroundColor Yellow
-    }
+    } catch {}
     return $false
 }
 
 function Install-Node {
     Write-Host "[*] Installing Node.js 20 LTS ..." -ForegroundColor Yellow
-
     try {
         $null = (winget --version 2>$null)
-        Write-Host "  Using winget ..." -ForegroundColor Gray
         winget install OpenJS.NodeJS.LTS --accept-package-agreements --accept-source-agreements
         if (Check-Node) { return }
-    } catch {
-        Write-Host "  winget not available, downloading ..." -ForegroundColor Gray
-    }
-
-    # Fallback: download Node.js LTS
-    $nodeUrl = "https://nodejs.org/dist/v20.18.0/node-v20.18.0-x64.msi"
-    $nodeMsi = Join-Path $env:TEMP "node-installer.msi"
-
-    try {
-        Write-Host "  Downloading Node.js 20 LTS ..." -ForegroundColor Gray
-        Invoke-WebRequest -Uri $nodeUrl -OutFile $nodeMsi -UseBasicParsing
-
-        Write-Host "  Installing ..." -ForegroundColor Gray
-        Start-Process -FilePath msiexec.exe -ArgumentList "/i `"$nodeMsi`" /quiet /norestart" -Wait
-
-        if (Check-Node) { return }
-    } finally {
-        if (Test-Path $nodeMsi) { Remove-Item -Force $nodeMsi -ErrorAction SilentlyContinue }
-    }
-
-    Write-Host "[x] Failed to install Node.js." -ForegroundColor Red
-    Write-Host "  Please install Node.js 18+ manually: https://nodejs.org/" -ForegroundColor Gray
+    } catch {}
+    Write-Host "[x] Failed to install Node.js. Please install manually: https://nodejs.org/" -ForegroundColor Red
     exit 1
 }
 
-# ── Install MyAgent via npm ──────────────────────────────
-function Install-MyAgent {
-    Write-Host "[*] Installing $PKG_NAME ..." -ForegroundColor Yellow
-    npm install -g $PKG_NAME
-    if ($LASTEXITCODE -ne 0) {
-        Write-Host "[!] npm install failed, trying with admin..." -ForegroundColor Yellow
-        Start-Process npm -ArgumentList "install", "-g", $PKG_NAME -Verb RunAs -Wait
-        if ($LASTEXITCODE -ne 0) {
-            Write-Host "[x] npm install failed" -ForegroundColor Red
-            exit 1
-        }
-    }
-    Write-Host "[OK] $PKG_NAME installed" -ForegroundColor Green
+# ── Main ─────────────────────────────────────────────────
+if ($DryRun) {
+    Write-Host "[OK] Dry run" -ForegroundColor Green
+    exit 0
 }
 
-# ── Install Python dependencies (使用独立虚拟环境) ──
-function Install-PythonDeps {
-    $pyCmd = if ($Script:PythonCmd) { $Script:PythonCmd } else { "python" }
-    $npmRoot = (npm root -g 2>$null)
-    $pkgDir = Join-Path $npmRoot $PKG_NAME
-    $reqFile = Join-Path $pkgDir "requirements.txt"
-
-    if (-not (Test-Path $reqFile)) {
-        if (Test-Path ".\requirements.txt") {
-            $reqFile = ".\requirements.txt"
-        } else {
-            Write-Host "[!] requirements.txt not found, skipping pip install" -ForegroundColor Yellow
-            return
-        }
-    }
-
-    $venvDir = "$env:USERPROFILE\.myagent\venv"
-    $venvPython = Join-Path $venvDir "Scripts\python.exe"
-
-    Write-Host "[*] Creating virtual environment at $venvDir ..." -ForegroundColor Yellow
-    New-Item -ItemType Directory -Path "$env:USERPROFILE\.myagent" -Force | Out-Null
-
-    # 如果旧 venv 存在且损坏，先删除重建
-    if ((Test-Path $venvPython)) {
-        try {
-            $null = (& $venvPython --version 2>$null)
-        } catch {
-            Write-Host "[!] 旧虚拟环境损坏，正在重建..." -ForegroundColor Yellow
-            Remove-Item -Recurse -Force $venvDir -ErrorAction SilentlyContinue
-        }
-    }
-
-    & $pyCmd -m venv $venvDir
-    if (-not (Test-Path $venvPython)) {
-        Write-Host "[x] 虚拟环境创建失败！Python: $pyCmd" -ForegroundColor Red
-        Write-Host "  请手动安装: python -m venv $venvDir" -ForegroundColor Gray
-        return
-    }
-    Write-Host "[OK] Virtual environment created" -ForegroundColor Green
-
-    Write-Host "[*] Installing Python dependencies into venv ..." -ForegroundColor Yellow
-    & $venvPython -m pip install --upgrade pip --quiet 2>$null
+if (-not $NoDeps) {
+    if (-not (Check-Python)) { Install-Python }
+    if (-not (Check-Node))   { Install-Node }
+}
 
-    # 尝试使用清华镜像安装（国内用户更快）
-    $mirrorArgs = @("-i", "https://pypi.tuna.tsinghua.edu.cn/simple", "--trusted-host", "pypi.tuna.tsinghua.edu.cn")
-    $pipResult = & $venvPython -m pip install -r $reqFile --disable-pip-version-check @mirrorArgs 2>&1
+Write-Host "[*] Installing $PKG_NAME via npm ..." -ForegroundColor Yellow
+npm install -g $PKG_NAME
+if ($LASTEXITCODE -ne 0) {
+    Write-Host "[!] npm install failed, trying with admin..." -ForegroundColor Yellow
+    Start-Process npm -ArgumentList "install", "-g", $PKG_NAME -Verb RunAs -Wait
     if ($LASTEXITCODE -ne 0) {
-        Write-Host "[!] 清华镜像安装失败，尝试默认源..." -ForegroundColor Yellow
-        $pipResult = & $venvPython -m pip install -r $reqFile --disable-pip-version-check 2>&1
+        Write-Host "[x] npm install failed" -ForegroundColor Red
+        exit 1
     }
-    if ($LASTEXITCODE -ne 0) {
-        Write-Host "[!] 默认源安装失败，尝试阿里云镜像..." -ForegroundColor Yellow
-        $aliyunArgs = @("-i", "https://mirrors.aliyun.com/pypi/simple/", "--trusted-host", "mirrors.aliyun.com")
-        $pipResult = & $venvPython -m pip install -r $reqFile --disable-pip-version-check @aliyunArgs 2>&1
-    }
-    if ($LASTEXITCODE -ne 0) {
-        Write-Host "[!] 部分依赖安装失败，但核心功能可在启动时自动安装" -ForegroundColor Yellow
-        Write-Host "  请运行 'myagent-ai reinstall' 重新安装" -ForegroundColor Gray
-    } else {
-        Write-Host "[OK] Dependencies installed into venv" -ForegroundColor Green
-    }
-    Write-Host "[i] Virtual env: $venvDir" -ForegroundColor Gray
-    Write-Host "[i] venv will be used automatically on startup" -ForegroundColor Gray
 }
-
-# ── Post-install: 直接启动 ──────────────────────────
-function Show-Guide {
-    Write-Host ""
-    Write-Host "  安装完成！正在启动 MyAgent..." -ForegroundColor Green
-    Write-Host ""
-
-    # 刷新 PATH（刚安装的 npm 全局命令可能在新的 PATH 中）
-    Refresh-Path
-
-    # npm 全局命令实际是 .cmd 文件，必须通过 cmd /c 执行
+Write-Host "[OK] $PKG_NAME installed" -ForegroundColor Green
+
+# 用 start.js 的 install 命令创建 venv 并安装全部 Python 依赖
+Write-Host "[*] Installing Python dependencies ..." -ForegroundColor Yellow
+try {
+    & myagent-ai install
+} catch {
+    # myagent-ai 不在 PATH 中，尝试直接调用
     $npmBinDir = ""
-    try {
-        $npmBinDir = (npm bin -g 2>$null).Trim()
-    } catch {}
-
+    try { $npmBinDir = (npm bin -g 2>$null).Trim() } catch {}
     $cmdPath = ""
     if ($npmBinDir -and (Test-Path "$npmBinDir\myagent-ai.cmd")) {
         $cmdPath = "$npmBinDir\myagent-ai.cmd"
     }
-
     if ($cmdPath) {
-        Write-Host "  [i] 启动路径: $cmdPath" -ForegroundColor Gray
-        Start-Process cmd -ArgumentList "/c", "`"$cmdPath`" web" -WindowStyle Minimized
+        & $cmdPath install
     } else {
-        Write-Host "  [i] 回退到 PATH 搜索..." -ForegroundColor Gray
-        Start-Process cmd -ArgumentList "/c", "myagent-ai web" -WindowStyle Minimized
-    }
-    Write-Host "  [OK] MyAgent 已在后台启动" -ForegroundColor Green
-
-    # 由安装脚本自身轮询服务并打开浏览器（比 start.js 更可靠）
-    Write-Host "  [i] 等待服务启动..." -ForegroundColor Gray
-    $url = "http://127.0.0.1:8767"
-    $maxWait = 120  # 最多等 120 秒
-    $waited = 0
-    while ($waited -lt $maxWait) {
-        Start-Sleep -Seconds 2
-        $waited += 2
-        try {
-            $null = Invoke-WebRequest -Uri "$url/api/status" -UseBasicParsing -TimeoutSec 3 -ErrorAction Stop
-            Write-Host "  [OK] 服务已就绪，正在打开浏览器..." -ForegroundColor Green
-            Start-Process $url
-            Write-Host "  [i] 如果没有自动打开，请访问: $url" -ForegroundColor Cyan
-            Write-Host ""
-            return
-        } catch {
-            # 服务还没启动，继续等待
-            if ($waited % 10 -eq 0) {
-                Write-Host "  [i] 等待中... ($waited 秒)" -ForegroundColor Gray
-            }
-        }
+        Write-Host "[i] Please restart terminal and run: myagent-ai install" -ForegroundColor Yellow
     }
-    Write-Host "  [!] 等待超时" -ForegroundColor Yellow
-    Write-Host "  [i] 服务可能仍在启动中，请稍等片刻后访问: $url" -ForegroundColor Cyan
-    Write-Host ""
-}
-
-# ── Main ─────────────────────────────────────────────────
-if ($DryRun) {
-    Write-Host "[OK] Dry run" -ForegroundColor Green
-    exit 0
-}
-
-# Step 1: Dependencies
-if (-not $NoDeps) {
-    if (-not (Check-Python))   { Install-Python }
-    if (-not (Check-Node))     { Install-Node }
 }
 
-# Step 2: npm install
-Install-MyAgent
+Write-Host ""
+Write-Host "  安装完成！" -ForegroundColor Green
+Write-Host ""
 
-# Step 3: Python deps
-if (-not $NoDeps) {
-    Install-PythonDeps
+# 启动 Web 模式
+Write-Host "[i] Starting myagent-ai web ..." -ForegroundColor Gray
+Refresh-Path
+try {
+    Start-Process cmd -ArgumentList "/c", "myagent-ai web" -WindowStyle Minimized
+} catch {
+    Write-Host "  Please restart terminal and run: myagent-ai web" -ForegroundColor Cyan
 }
-
-Show-Guide

package/install/install.sh

@@ -6,8 +6,7 @@ set -euo pipefail
 #
 # 用法:
 #   curl -fsSL https://raw.githubusercontent.com/ctz168/myagent/main/install/install.sh | bash
-#   curl -fsSL ... | bash -s -- --no-deps     # 跳过依赖检查
-#   curl -fsSL ... | bash -s -- --dry-run     # 预览模式
+#   curl -fsSL ... | bash -s -- --no-deps     # 跳过系统依赖检查（仅 npm install）
 
 BOLD='\033[1m'
 ACCENT='\033[36m'
@@ -18,34 +17,27 @@ ERROR='\033[31m'
 NC='\033[0m'
 
 NO_DEPS=false
-DRY_RUN=false
-SCRIPT_URL="https://raw.githubusercontent.com/ctz168/myagent/main/install/install.sh"
 PKG_NAME="myagent-ai"
 PKG_VERSION=""
 
-# 动态获取 npm 最新版本号
 fetch_version() {
   PKG_VERSION=""
   local npm_ver
   npm_ver="$(npm view "$PKG_NAME" version 2>/dev/null)" || true
-  if [ -n "$npm_ver" ]; then
-    PKG_VERSION="$npm_ver"
-  fi
+  if [ -n "$npm_ver" ]; then PKG_VERSION="$npm_ver"; fi
 }
 
 for arg in "$@"; do
   case "$arg" in
     --no-deps) NO_DEPS=true ;;
-    --dry-run) DRY_RUN=true ;;
     --help|-h)
       fetch_version
       echo "MyAgent Installer${PKG_VERSION:+ v$PKG_VERSION}"
       echo ""
-      echo "Usage: curl -fsSL $SCRIPT_URL | bash [-s -- OPTIONS]"
+      echo "Usage: curl -fsSL <script-url> | bash [-s -- OPTIONS]"
       echo ""
       echo "Options:"
       echo "  --no-deps    跳过 Python/Node.js 依赖检查"
-      echo "  --dry-run    预览安装过程，不实际执行"
       echo ""
       echo "安装完成后运行 myagent-ai 启动"
       exit 0
@@ -71,176 +63,77 @@ detect_os() {
   esac
 }
 
-# 尝试获取最新版本（获取失败则不显示版本号）
 fetch_version
-
 OS="$(detect_os)"
 echo ""
 echo -e "  ${BOLD}${ACCENT}MyAgent${NC} Installer${PKG_VERSION:+ v$PKG_VERSION}"
 echo ""
 success "$OS detected"
 
-if $DRY_RUN; then
-  success "Dry run mode"
-  info "Will: check deps -> npm install -g $PKG_NAME -> pip install requirements"
-  exit 0
-fi
-
 # ── Python ────────────────────────────────────────────────
-# 记录已找到的 Python 命令，供后续步骤使用
-_PYTHON_CMD=""
-
 check_python() {
-  # 刷新命令缓存（关键：安装新软件后 bash 会缓存旧的查找结果）
   hash -r 2>/dev/null || true
-
-  # 按优先级尝试多个 Python 命令（包括版本号后缀的）
   local py_cmd=""
   for cmd in python3 python3.14 python3.13 python; do
-    if command -v "$cmd" &>/dev/null; then
-      py_cmd="$cmd"
-      break
-    fi
+    if command -v "$cmd" &>/dev/null; then py_cmd="$cmd"; break; fi
   done
-
-  if [ -z "$py_cmd" ]; then
-    return 1
-  fi
-
-  # 检查版本
+  if [ -z "$py_cmd" ]; then return 1; fi
   local ver
   ver="$($py_cmd -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")' 2>/dev/null)" || return 1
   local major minor
   major="$(echo "$ver" | cut -d. -f1)"
   minor="$(echo "$ver" | cut -d. -f2)"
   if [ "$major" -ge 3 ] && [ "$minor" -ge 13 ]; then
-    _PYTHON_CMD="$py_cmd"
     success "Python $ver ($py_cmd)"
     return 0
   fi
-  warn "Python $ver found, upgrading to 3.13+ ..."
-  # 仍然记录当前可用的 Python（即使版本低，也总比没有好）
-  _PYTHON_CMD="$py_cmd"
-  return 1
-}
-
-# 获取可用的 Python 命令（安装后也会重新查找）
-get_python_cmd() {
-  if [ -n "$_PYTHON_CMD" ] && command -v "$_PYTHON_CMD" &>/dev/null; then
-    echo "$_PYTHON_CMD"
-    return 0
-  fi
-  hash -r 2>/dev/null || true
-  for cmd in python3 python3.14 python3.13 python; do
-    if command -v "$cmd" &>/dev/null; then
-      _PYTHON_CMD="$cmd"
-      echo "$cmd"
-      return 0
-    fi
-  done
-  echo ""
   return 1
 }
 
 install_python() {
   step "Installing Python 3.13+ ..."
-  local installed=false
-
   if [ "$OS" = "macos" ]; then
     if command -v brew &>/dev/null; then
-      info "Using Homebrew ..."
-      # 尝试多个版本，优先 3.13+
       for py_ver in 3.13 3.14; do
-        brew install "python@${py_ver}" 2>/dev/null && installed=true && break
-      done
-      if $installed; then
-        local brew_prefix
-        brew_prefix="$(brew --prefix "python@${py_ver}")"
-        export PATH="${brew_prefix}/bin:$PATH"
-        hash -r
-        sleep 1
-        if check_python; then return 0; fi
-        # brew 已安装但 python3 软链接可能不存在
-        local brew_py="${brew_prefix}/bin/python3"
-        if [ -x "$brew_py" ]; then
-          _PYTHON_CMD="$brew_py"
-          success "Python found at $brew_py"
-          return 0
+        if brew install "python@${py_ver}" 2>/dev/null; then
+          export PATH="$(brew --prefix "python@${py_ver}")/bin:$PATH"
+          hash -r
+          check_python && return 0
         fi
-        # 尝试查找版本化的 python 二进制
-        for ver in 3.14 3.13; do
-          brew_py="${brew_prefix}/bin/python${ver}"
-          if [ -x "$brew_py" ]; then
-            _PYTHON_CMD="$brew_py"
-            success "Python found at $brew_py"
-            return 0
-          fi
-        done
-        _PYTHON_CMD="${brew_prefix}/bin/python3"
-        warn "Python 已通过 Homebrew 安装，但 python3 命令暂不可用"
-        info "请重启终端或运行: export PATH=\"${brew_prefix}/bin:\$PATH\""
-        return 0
-      fi
-    fi
-    # 仅在 brew 未安装时才从 python.org 下载
-    if ! $installed; then
-      info "Downloading Python 3.13 ..."
-      curl -fsSL -o /tmp/python.pkg "https://www.python.org/ftp/python/3.13.3/python-3.13.3-macos11.pkg" 2>/dev/null || \
-      curl -fsSL -o /tmp/python.pkg "https://www.python.org/ftp/python/3.14.0/python-3.14.0-macos11.pkg"
-      sudo installer -pkg /tmp/python.pkg -target /
-      rm -f /tmp/python.pkg
-      export PATH="/Library/Frameworks/Python.framework/Versions/3.13/bin:$PATH"
-      hash -r
-      if check_python; then return 0; fi
+      done
     fi
+    curl -fsSL -o /tmp/python.pkg "https://www.python.org/ftp/python/3.13.3/python-3.13.3-macos11.pkg" 2>/dev/null || \
+    curl -fsSL -o /tmp/python.pkg "https://www.python.org/ftp/python/3.14.0/python-3.14.0-macos11.pkg"
+    sudo installer -pkg /tmp/python.pkg -target /
+    rm -f /tmp/python.pkg
+    export PATH="/Library/Frameworks/Python.framework/Versions/3.13/bin:$PATH"
+    hash -r
+    check_python && return 0
     return 1
   fi
-
   if [ "$OS" = "linux" ]; then
     if command -v apt-get &>/dev/null; then
-      info "Using apt ..."
       sudo apt-get update -qq
-      # 尝试安装 3.13+，回退到默认 python3
       sudo apt-get install -y python3.13 python3.13-venv python3-pip 2>/dev/null || \
       sudo apt-get install -y python3.14 python3.14-venv python3-pip 2>/dev/null || \
       sudo apt-get install -y python3 python3-venv python3-pip
       hash -r
-      if check_python; then return 0; fi
-      for ver in 3.14 3.13; do
-        if command -v "python${ver}" &>/dev/null; then
-          _PYTHON_CMD="python${ver}"
-          success "Python found as python${ver}"
-          return 0
-        fi
-      done
-      return 1
+      check_python && return 0
     fi
     if command -v dnf &>/dev/null; then
-      info "Using dnf ..."
       sudo dnf install -y python3.13 2>/dev/null || sudo dnf install -y python3
-      hash -r
-      if check_python; then return 0; fi
-      return 1
+      hash -r; check_python && return 0
     fi
     if command -v pacman &>/dev/null; then
-      info "Using pacman ..."
       sudo pacman -S --noconfirm python python-pip
-      hash -r
-      if check_python; then return 0; fi
-      return 1
+      hash -r; check_python && return 0
     fi
     if command -v apk &>/dev/null; then
-      info "Using apk ..."
       sudo apk add python3 py3-pip
-      hash -r
-      if check_python; then return 0; fi
-      return 1
+      hash -r; check_python && return 0
     fi
   fi
-
   err "Failed to install Python. Please install Python 3.13+ manually."
-  info "  macOS:  https://www.python.org/downloads/"
-  info "  Linux:   https://wiki.python.org/moin/BeginnersGuide/Download"
   exit 1
 }
 
@@ -254,325 +147,76 @@ check_node() {
     success "Node.js $(node -v)"
     return 0
   fi
-  warn "Node.js $(node -v) found, but v18+ required"
   return 1
 }
 
 install_node() {
   step "Installing Node.js 20 LTS ..."
-
-  if [ "$OS" = "macos" ]; then
-    if command -v brew &>/dev/null; then
-      info "Using Homebrew ..."
-      brew install node@20 || brew install node
-      export PATH="$(brew --prefix node)/bin:$PATH"
-      hash -r
-      if check_node; then return 0; fi
-    fi
+  if [ "$OS" = "macos" ] && command -v brew &>/dev/null; then
+    brew install node@20 || brew install node
+    hash -r; check_node && return 0
   fi
-
-  # Try fnm
   if command -v fnm &>/dev/null; then
-    info "Using fnm ..."
-    fnm install 20
-    eval "$(fnm env)"
-    hash -r
-    if check_node; then return 0; fi
+    fnm install 20; eval "$(fnm env)"; hash -r; check_node && return 0
   fi
-
-  # Try nvm
   if [ -s "$HOME/.nvm/nvm.sh" ]; then
-    info "Using nvm ..."
-    . "$HOME/.nvm/nvm.sh"
-    nvm install 20
-    hash -r
-    if check_node; then return 0; fi
-  fi
-
-  # Fallback: NodeSource
-  if [ "$OS" = "linux" ]; then
-    if command -v apt-get &>/dev/null; then
-      info "Using NodeSource ..."
-      curl -fsSL https://deb.nodesource.com/setup_20.x | sudo -E bash -
-      sudo apt-get install -y nodejs
-      hash -r
-      if check_node; then return 0; fi
-      return 1
-    fi
-    if command -v dnf &>/dev/null; then
-      info "Using dnf ..."
-      sudo dnf install -y nodejs npm
-      hash -r
-      if check_node; then return 0; fi
-      return 1
-    fi
+    . "$HOME/.nvm/nvm.sh"; nvm install 20; hash -r; check_node && return 0
   fi
-
-  # Final fallback: install fnm
-  if ! command -v fnm &>/dev/null; then
-    info "Installing fnm ..."
-    curl -fsSL https://fnm.vercel.app/install | bash
-    export PATH="$HOME/.local/share/fnm:$PATH"
-    eval "$(fnm env)"
+  if [ "$OS" = "linux" ] && command -v apt-get &>/dev/null; then
+    curl -fsSL https://deb.nodesource.com/setup_20.x | sudo -E bash -
+    sudo apt-get install -y nodejs
+    hash -r; check_node && return 0
   fi
-  fnm install 20
-  hash -r
-  if check_node; then return 0; fi
-
   err "Failed to install Node.js. Please install Node.js 18+ manually."
-  info "  https://nodejs.org/"
   exit 1
 }
 
-# ── pip install (处理 PEP668) ──────────────────────
-pip_install() {
-  local req_file="$1"
-  # 尝试多种方式安装，兼容 PEP668 限制
-  pip3 install -r "$req_file" --break-system-packages 2>/dev/null || \
-  pip3 install -r "$req_file" 2>/dev/null || \
-  pip install -r "$req_file" --break-system-packages 2>/dev/null || \
-  pip install -r "$req_file" 2>/dev/null || \
-  {
-    warn "pip install 失败 (可能受 PEP668 限制)"
-    info "尝试使用 venv 安装..."
-    local venv_dir="$HOME/.myagent/venv"
-    python3 -m venv "$venv_dir" 2>/dev/null
-    if [ -f "$venv_dir/bin/pip" ]; then
-      "$venv_dir/bin/pip" install -r "$req_file"
-      success "已安装到虚拟环境 $venv_dir"
-      info "启动时请使用: $venv_dir/bin/python main.py --web"
-      return 0
-    fi
-    err "所有安装方式均失败"
-    info "请手动安装: pip3 install -r $req_file --break-system-packages"
-    info "或使用虚拟环境: python3 -m venv venv && source venv/bin/activate && pip install -r $req_file"
-    return 1
-  }
-}
-
-# ── Install MyAgent via npm ──────────────────────────────
-install_myagent() {
-  step "Installing $PKG_NAME ..."
-  npm install -g "$PKG_NAME"
-  if [ $? -ne 0 ]; then
-    err "npm install failed"
-    info "可能需要 sudo: sudo npm install -g $PKG_NAME"
-    exit 1
-  fi
-  success "$PKG_NAME installed"
-}
-
-# ── 确保 venv 模块可用 ──────────────────────────────────
-# 在 Debian/Ubuntu 上，python3.xx-venv 需要单独安装
-ensure_venv_module() {
-  local py_cmd="$1"
-  # 先测试 venv 是否可用
-  if "$py_cmd" -c "import venv" 2>/dev/null; then
-    return 0
-  fi
-
-  warn "venv 模块不可用，正在自动安装..."
-
-  if [ "$OS" = "linux" ]; then
-    if command -v apt-get &>/dev/null; then
-      # 获取 Python 版本号，安装对应的 -venv 包
-      local py_ver
-      py_ver="$($py_cmd -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")' 2>/dev/null)" || ""
-      if [ -n "$py_ver" ]; then
-        step "安装 python${py_ver}-venv ..."
-        # root 用户不需要 sudo
-        if [ "$(id -u)" -eq 0 ]; then
-          apt-get install -y "python${py_ver}-venv" && {
-            success "python${py_ver}-venv 已安装"
-            return 0
-          }
-        else
-          sudo apt-get install -y "python${py_ver}-venv" && {
-            success "python${py_ver}-venv 已安装"
-            return 0
-          }
-        fi
-      fi
-      # 回退：尝试常见版本
-      for ver in 3.13 3.14 3; do
-        step "尝试安装 python${ver}-venv ..."
-        if [ "$(id -u)" -eq 0 ]; then
-          apt-get install -y "python${ver}-venv" && {
-            success "python${ver}-venv 已安装"
-            return 0
-          }
-        else
-          sudo apt-get install -y "python${ver}-venv" && {
-            success "python${ver}-venv 已安装"
-            return 0
-          }
-        fi
-      done
-    fi
-    if command -v dnf &>/dev/null; then
-      if [ "$(id -u)" -eq 0 ]; then
-        dnf install -y python3-venv 2>/dev/null
-      else
-        sudo dnf install -y python3-venv 2>/dev/null
-      fi
-      return 0
-    fi
-    if command -v apk &>/dev/null; then
-      if [ "$(id -u)" -eq 0 ]; then
-        apk add py3-virtualenv
-      else
-        sudo apk add py3-virtualenv
-      fi
-      return 0
-    fi
-  fi
-
-  if [ "$OS" = "macos" ]; then
-    warn "macOS 上 venv 不可用，请重新安装 Python"
-    return 1
-  fi
-
-  err "无法自动安装 venv 模块"
-  info "请手动运行: sudo apt install python3-venv"
-  return 1
-}
-
-# ── Install Python dependencies (使用独立虚拟环境) ──
-install_python_deps() {
-  local pkg_dir
-  pkg_dir="$(npm root -g)/$PKG_NAME"
-  local req_file="$pkg_dir/requirements.txt"
-
-  if [ ! -f "$req_file" ]; then
-    if [ -f "./requirements.txt" ]; then
-      req_file="./requirements.txt"
-    else
-      warn "requirements.txt not found, skipping pip install"
-      return
-    fi
-  fi
-
-  local py_cmd
-  py_cmd="$(get_python_cmd)"
-  if [ -z "$py_cmd" ]; then
-    err "Python not found, cannot install dependencies"
-    return 1
-  fi
-
-  local venv_dir="$HOME/.myagent/venv"
-
-  step "Creating virtual environment at $venv_dir ..."
-  mkdir -p "$HOME/.myagent"
-  
-  # 确保 venv 模块可用（自动安装 python3.xx-venv）
-  ensure_venv_module "$py_cmd" || {
-    err "无法创建虚拟环境，venv 模块不可用"
-    info "请手动运行: sudo apt install python3-venv"
-    info "然后重新运行: myagent-ai reinstall"
-    return 1
-  }
-  
-  "$py_cmd" -m venv "$venv_dir"
-  success "Virtual environment created"}
-
-  step "Installing Python dependencies into venv ..."
-  "$venv_dir/bin/pip" install --upgrade pip --quiet 2>/dev/null || true
-
-  # Linux: 预装 evdev 预编译包，避免 pynput 安装时编译失败（需要 linux-headers）
-  # evdev-binary 是预编译版本，无需编译；如果安装失败也不影响核心功能
-  if [ "$OS" = "linux" ]; then
-    "$venv_dir/bin/pip" install evdev-binary --disable-pip-version-check --quiet 2>/dev/null || true
-  fi
-
-  # 尝试使用清华镜像安装（国内用户更快）
-  if "$venv_dir/bin/pip" install -r "$req_file" --disable-pip-version-check \
-    -i https://pypi.tuna.tsinghua.edu.cn/simple \
-    --trusted-host pypi.tuna.tsinghua.edu.cn 2>/dev/null; then
-    success "Dependencies installed into venv (清华镜像)"
-  elif "$venv_dir/bin/pip" install -r "$req_file" --disable-pip-version-check 2>/dev/null; then
-    success "Dependencies installed into venv"
-  elif "$venv_dir/bin/pip" install -r "$req_file" --disable-pip-version-check \
-    -i https://mirrors.aliyun.com/pypi/simple/ \
-    --trusted-host mirrors.aliyun.com 2>/dev/null; then
-    success "Dependencies installed into venv (阿里云镜像)"
-  else
-    warn "部分依赖安装失败，但核心功能可在启动时自动安装"
-    info "请运行 'myagent-ai reinstall' 重新安装"
-  fi
-  info "虚拟环境: $venv_dir"
-  info "启动时自动使用 venv，无需手动激活"
-}
-
-# ── 安装完成：直接启动 ───────────────────────────────
-post_install() {
-  echo ""
-  echo -e "  ${BOLD}${SUCCESS}安装完成！正在启动 MyAgent...${NC}"
-  echo ""
-
-  # 直接启动 Web 模式，浏览器会自动打开配置向导
-  # 使用 nohup 在后台运行，不阻塞终端
-  if command -v myagent-ai &>/dev/null; then
-    nohup myagent-ai web > /dev/null 2>&1 &
-    echo -e "  ${SUCCESS}[✓]${NC} MyAgent 已在后台启动"
-  else
-    # myagent-ai 不在 PATH 中，尝试通过 npm 全局目录启动
-    local npm_bin
-    npm_bin="$(npm bin -g 2>/dev/null)/myagent-ai"
-    if [ -x "$npm_bin" ]; then
-      nohup "$npm_bin" web > /dev/null 2>&1 &
-      echo -e "  ${SUCCESS}[✓]${NC} MyAgent 已在后台启动"
-    else
-      echo -e "  ${WARN}[!]${NC} 启动命令未找到，请重新打开终端后运行:"
-      echo -e "    ${ACCENT}myagent-ai web${NC}"
-      echo ""
-      return
-    fi
-  fi
-
-  # 由安装脚本自身轮询服务并打开浏览器（比 start.js 更可靠）
-  local url="http://127.0.0.1:8767"
-  local max_wait=120
-  local waited=0
-
-  echo -e "  ${INFO}[i]${NC} 等待服务启动..."
-  while [ $waited -lt $max_wait ]; do
-    sleep 2
-    waited=$((waited + 2))
-    if curl -sf "$url/api/status" > /dev/null 2>&1; then
-      echo -e "  ${SUCCESS}[✓]${NC} 服务已就绪，正在打开浏览器..."
-      # 跨平台打开浏览器
-      if [ "$OS" = "macos" ]; then
-        open "$url" 2>/dev/null || true
-      elif [ "$OS" = "linux" ]; then
-        xdg-open "$url" 2>/dev/null || sensible-browser "$url" 2>/dev/null || true
-      fi
-      echo -e "  ${INFO}[i]${NC} 如果没有自动打开，请访问: ${ACCENT}$url${NC}"
-      echo ""
-      return
-    fi
-    if [ $((waited % 10)) -eq 0 ]; then
-      echo -e "  ${INFO}[i]${NC} 等待中... ($waited 秒)"
-    fi
-  done
-  echo -e "  ${WARN}[!]${NC} 等待超时"
-  echo -e "  ${INFO}[i]${NC} 服务可能仍在启动中，请稍等片刻后访问: ${ACCENT}$url${NC}"
-  echo ""
-}
-
 # ── Main ─────────────────────────────────────────────────
 if ! $NO_DEPS; then
   check_python || install_python
   check_node   || install_node
-  # Python 已找到但 venv 模块可能缺失（Debian/Ubuntu 常见）
-  if [ -n "$_PYTHON_CMD" ]; then
-    ensure_venv_module "$_PYTHON_CMD"
+fi
+
+step "Installing $PKG_NAME via npm ..."
+npm install -g "$PKG_NAME"
+if [ $? -ne 0 ]; then
+  err "npm install failed"
+  info "可能需要 sudo: sudo npm install -g $PKG_NAME"
+  exit 1
+fi
+success "$PKG_NAME installed"
+
+# 用 start.js 的 install 命令创建 venv 并安装全部 Python 依赖
+step "Installing Python dependencies ..."
+if command -v myagent-ai &>/dev/null; then
+  myagent-ai install
+else
+  # myagent-ai 不在 PATH 中，尝试直接调用
+  local npm_bin
+  npm_bin="$(npm bin -g 2>/dev/null)/myagent-ai"
+  if [ -x "$npm_bin" ]; then
+    "$npm_bin" install
+  else
+    err "myagent-ai 命令未找到，请重新打开终端后运行: myagent-ai install"
+    exit 1
   fi
 fi
 
-install_myagent
+echo ""
+echo -e "  ${BOLD}${SUCCESS}安装完成！${NC}"
+echo ""
 
-if ! $NO_DEPS; then
-  install_python_deps
+# 启动 Web 模式
+if command -v myagent-ai &>/dev/null; then
+  info "启动中: myagent-ai web"
+  myagent-ai web
+else
+  local npm_bin
+  npm_bin="$(npm bin -g 2>/dev/null)/myagent-ai"
+  if [ -x "$npm_bin" ]; then
+    info "启动中: $npm_bin web"
+    "$npm_bin" web
+  else
+    echo -e "  请重新打开终端后运行: ${ACCENT}myagent-ai web${NC}"
+  fi
 fi
-
-post_install

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myagent-ai",
-  "version": "1.15.57",
+  "version": "1.15.58",
   "description": "本地桌面端执行型AI助手 - Open Interpreter 风格 | Local Desktop Execution-Oriented AI Assistant",
   "main": "main.py",
   "bin": {