myagent-ai 1.15.56 → 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