myagent-ai 1.15.56 → 1.15.57

package/main.py

@@ -39,7 +39,7 @@ from core.config_broadcast import ConfigBroadcaster, ReloadType
 from core.update_manager import UpdateManager, UpdateType
 from core.version import get_version
 from core.permissions import PermissionManager
-from core.deps_checker import check_and_install_deps
+from core.deps_checker import check_and_install_deps  # 保留导入供其他模块使用
 
 
 def _get_screen_resolution() -> tuple[int, int]:
@@ -154,21 +154,8 @@ class MyAgentApp:
         self.logger.info(f"数据目录: {self.config_mgr.data_dir}")
         self.logger.info("=" * 60)
 
-        # 1.5 自动检测并安装缺失依赖（开箱即用）
-        # 可通过 --skip-deps 参数或 MYAGENT_SKIP_DEPS=1 环境变量跳过
-        if os.environ.get("MYAGENT_SKIP_DEPS") == "1":
-            self.logger.info("跳过依赖检查（--skip-deps）")
-        else:
-            self.logger.info("检查依赖...")
-            deps_result = check_and_install_deps(auto_fix=True, silent=False)
-            if deps_result["installed"] > 0:
-                self.logger.info(
-                    f"自动安装了 {deps_result['installed']} 个依赖"
-                )
-            if deps_result["failed"] > 0:
-                self.logger.warning(
-                    f"{deps_result['failed']} 个依赖安装失败，相关功能可能不可用"
-                )
+        # 1.5 依赖检查已移至 start.js (install/reinstall 命令)
+        # 启动时不再检查依赖，确保启动速度干净利落
 
         # 2. LLM 客户端
         llm_cfg = self.config.llm
@@ -692,26 +679,8 @@ def create_tray_icon(app: MyAgentApp, web_port: int = 8767):
         from PIL import Image, ImageDraw, ImageFont
     except Exception:
         # pystray 可能因缺少 GUI 环境 (X11/Wayland) 或未安装而失败
-        if os.environ.get('MYAGENT_SKIP_DEPS') == '1':
-            logger.info("pystray/PIL 未安装，跳过自动安装（--skip-deps）")
-            return None
-        try:
-            from core.deps_checker import _pip_install
-            logger.info("pystray/PIL 未安装，正在自动安装...")
-            success, msg = _pip_install(["pystray>=0.19.5", "Pillow>=10.0.0"])
-            if success:
-                logger.info(f"pystray/PIL 自动安装成功: {msg}")
-                import importlib
-                import pystray as _pystray
-                importlib.reload(_pystray)
-                import pystray
-                from PIL import Image, ImageDraw, ImageFont
-            else:
-                logger.warning(f"pystray/PIL 自动安装失败: {msg}")
-                return None
-        except Exception as e:
-            logger.warning(f"pystray 初始化失败 (可能缺少 GUI 环境): {e}")
-            return None
+        logger.info("pystray 不可用（未安装或缺少 GUI 环境），跳过系统托盘")
+        return None
 
     # ── 图标颜色主题 ──
     _COLOR_NORMAL = "#4A90D9"     # 蓝色 = 运行中

package/package.json

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

package/start.js

@@ -2,22 +2,10 @@
 /**
  * start.js - 跨平台入口脚本 (Windows/macOS/Linux)
  * ================================================
- * npm bin 入口，自动管理独立虚拟环境:
- *   - 虚拟环境位置: ~/.myagent/venv (与其他项目完全隔离)
- *   - 首次运行自动创建 venv 并安装所有依赖
- *   - 后续运行直接使用 venv，无需重复安装
- *   - pip 升级/重装: myagent-ai reinstall
- *
- * 用法:
- *   myagent-ai            # 交互式选择运行模式
- *   myagent-ai web        # Web 管理后台
- *   myagent-ai cli        # CLI 模式
- *   myagent-ai tray       # 系统托盘模式
- *   myagent-ai server     # API 服务模式
- *   myagent-ai setup      # 配置向导
- *   myagent-ai reinstall  # 重新安装依赖到 venv
- *   myagent-ai uninstall  # 卸载 MyAgent（删除npm包+数据）
- *   myagent-ai --skip-deps  # 跳过依赖检查，直接启动
+ * 职责分明:
+ *   - install/reinstall: 创建 venv + 安装所有依赖
+ *   - web/cli/tray/server: 直接启动，不检查依赖
+ *   - uninstall: 卸载
  */
 "use strict";
 
@@ -26,35 +14,19 @@ const path = require("path");
 const fs = require("fs");
 const os = require("os");
 
-// ── 常量 ──────────────────────────────────────────────────
 const IS_WIN = process.platform === "win32";
+const PKG_NAME = "myagent-ai";
 
-// 虚拟环境目录
-function getVenvDir() {
-  const homeDir = os.homedir();
-  return path.join(homeDir, ".myagent", "venv");
-}
-
-// venv 中 Python 可执行文件的路径
-function getVenvPython(venvDir) {
-  return IS_WIN
-    ? path.join(venvDir, "Scripts", "python.exe")
-    : path.join(venvDir, "bin", "python");
-}
+// ── 路径工具 ──────────────────────────────────────────────
 
-// venv 中 pip 可执行文件的路径
-function getVenvPip(venvDir) {
-  return IS_WIN
-    ? path.join(venvDir, "Scripts", "pip.exe")
-    : path.join(venvDir, "bin", "pip");
+function getHome() { return os.homedir(); }
+function getDataDir() { return path.join(getHome(), ".myagent"); }
+function getVenvDir() { return path.join(getDataDir(), "venv"); }
+function getSentinelFile() { return path.join(getDataDir(), ".deps_installed"); }
+function getVenvPython(d) {
+  return IS_WIN ? path.join(d, "Scripts", "python.exe") : path.join(d, "bin", "python");
 }
 
-// MyAgent 数据目录
-function getDataDir() {
-  return path.join(os.homedir(), ".myagent");
-}
-
-// ── 解析包目录 ────────────────────────────────────────────
 function resolvePackageDir() {
   let dir = __dirname;
   if (!fs.existsSync(path.join(dir, "main.py"))) {
@@ -62,8 +34,8 @@ function resolvePackageDir() {
       const npmRoot = execSync("npm root -g", {
         encoding: "utf8", stdio: ["pipe", "pipe", "pipe"],
       }).trim();
-      const candidate = path.join(npmRoot, "myagent-ai");
-      if (fs.existsSync(path.join(candidate, "main.py"))) dir = candidate;
+      const c = path.join(npmRoot, PKG_NAME);
+      if (fs.existsSync(path.join(c, "main.py"))) dir = c;
     } catch (_) {}
   }
   if (!fs.existsSync(path.join(dir, "main.py"))) {
@@ -76,651 +48,356 @@ function resolvePackageDir() {
   return dir;
 }
 
-// ── 查找系统 Python（用于创建 venv） ─────────────────────
 function findSystemPython() {
   const candidates = IS_WIN
     ? ["python", "python3", "python3.14", "python3.13"]
     : ["python3", "python3.14", "python3.13", "python"];
-
   for (const cmd of candidates) {
     try {
-      const result = execFileSync(
-        IS_WIN ? `${cmd}.exe` : cmd,
-        ["--version"],
+      const r = execFileSync(
+        IS_WIN ? `${cmd}.exe` : cmd, ["--version"],
         { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 5000 }
       );
-      const match = result.match(/Python (\d+)\.(\d+)/);
-      if (match) {
-        const major = parseInt(match[1], 10);
-        const minor = parseInt(match[2], 10);
-        if (major >= 3 && minor >= 13) return cmd;
-      }
+      const m = r.match(/Python (\d+)\.(\d+)/);
+      if (m && parseInt(m[1]) >= 3 && parseInt(m[2]) >= 13) return cmd;
     } catch (_) {}
   }
-
-  // Windows: 搜索常见安装路径
   if (IS_WIN) {
     const localAppData = process.env.LOCALAPPDATA || "";
     const programFiles = process.env.ProgramFiles || "";
-    const programFilesX86 = process.env["ProgramFiles(x86)"] || "";
-    const searchPaths = [
+    for (const p of [
       path.join(localAppData, "Programs", "Python", "Python314", "python.exe"),
       path.join(localAppData, "Programs", "Python", "Python313", "python.exe"),
       path.join(programFiles, "Python314", "python.exe"),
       path.join(programFiles, "Python313", "python.exe"),
       "C:\\Python314\\python.exe", "C:\\Python313\\python.exe",
-    ];
-    for (const pyPath of searchPaths) {
-      if (fs.existsSync(pyPath)) return pyPath;
+    ]) {
+      if (fs.existsSync(p)) return p;
     }
   }
-
   return null;
 }
 
-// ── 虚拟环境管理 ─────────────────────────────────────────
-
-/**
- * 尝试自动安装 python3.xx-venv 模块 (Debian/Ubuntu)
- * Returns: true if successfully installed
- */
-function tryAutoInstallVenvModule(systemPython) {
-  try {
-    // 先检测是否是 apt 系统
-    execFileSync("which", ["apt-get"], {
-      encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 5000,
-    });
-  } catch (_) {
-    // 不是 apt 系统
-    return false;
+function getPipMirrorArgs() {
+  const envMirror = process.env.MYAGENT_PIP_MIRROR || "";
+  if (envMirror === "1" || envMirror === "true" || envMirror === "cn") {
+    return ["-i", "https://pypi.tuna.tsinghua.edu.cn/simple", "--trusted-host", "pypi.tuna.tsinghua.edu.cn"];
   }
-
-  try {
-    // 获取 Python 版本号
-    const ver = execFileSync(systemPython, ["-c", "import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}')"], {
-      encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 5000,
-    }).trim();
-
-    console.log(`  \x1b[90m[i]\x1b[0m 正在安装 python${ver}-venv (需要 sudo 权限)...`);
-    
-    execFileSync("sudo", ["apt-get", "install", "-y", `python${ver}-venv`], {
-      encoding: "utf8", stdio: "inherit", timeout: 120000,
-    });
-    
-    console.log(`  \x1b[32m[✓]\x1b[0m python${ver}-venv 已安装`);
-    return true;
-  } catch (err) {
-    console.log(`  \x1b[33m[!]\x1b[0m 自动安装 venv 模块失败: ${err.message}`);
-    console.log(`  \x1b[90m[i]\x1b[0m 请手动运行: sudo apt install python3-venv`);
-    return false;
+  const lang = (process.env.LANG || process.env.LC_ALL || "").toLowerCase();
+  if (lang.includes("zh_cn") || lang.includes("chinese")) {
+    return ["-i", "https://pypi.tuna.tsinghua.edu.cn/simple", "--trusted-host", "pypi.tuna.tsinghua.edu.cn"];
   }
+  return [];
 }
 
-/**
- * 确保 venv 存在且可用
- * Returns: { venvDir, venvPython, venvPip }
- */
+// ── 虚拟环境 ──────────────────────────────────────────────
+
 function ensureVenv() {
   const venvDir = getVenvDir();
   const venvPython = getVenvPython(venvDir);
-  const venvPip = getVenvPip(venvDir);
-
-  // 检查现有 venv 是否完整
   if (fs.existsSync(venvPython)) {
     try {
       execFileSync(venvPython, ["--version"], {
         encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 5000,
       });
-      return { venvDir, venvPython, venvPip, isNew: false };
+      return venvPython;
     } catch (_) {
-      // venv 损坏，需要重建
-      console.log("  \x1b[33m[!]\x1b[0m 虚拟环境已损坏，正在重建...");
       fs.rmSync(venvDir, { recursive: true, force: true });
     }
   }
-
-  // 创建 venv
-  const systemPython = findSystemPython();
-  if (!systemPython) {
-    console.error("\x1b[31m[✗]\x1b[0m 未找到 Python 3.13+");
-    console.error("  请先安装 Python: https://www.python.org/downloads/");
-    console.error("  安装时请勾选 'Add Python to PATH'");
-    console.error("");
-    console.error("  或一键安装:");
-    if (IS_WIN) {
-      console.error("    powershell -c \"irm https://raw.githubusercontent.com/ctz168/myagent/main/install/install.ps1 | iex\"");
-    } else {
-      console.error("    curl -fsSL https://raw.githubusercontent.com/ctz168/myagent/main/install/install.sh | bash");
-    }
+  const sysPy = findSystemPython();
+  if (!sysPy) {
+    console.error("\x1b[31m未找到 Python 3.13+\x1b[0m");
+    console.error("请先安装 Python: https://www.python.org/downloads/");
     process.exit(1);
   }
-
-  // 确保 ~/.myagent 目录存在
   const dataDir = getDataDir();
-  if (!fs.existsSync(dataDir)) {
-    fs.mkdirSync(dataDir, { recursive: true });
-  }
-
-  console.log("  \x1b[36m[*]\x1b[0m 创建独立虚拟环境...");
-  console.log(`  \x1b[90m[i]\x1b[0m 位置: ${venvDir}`);
-  console.log(`  \x1b[90m[i]\x1b[0m 系统Python: ${systemPython}`);
+  if (!fs.existsSync(dataDir)) fs.mkdirSync(dataDir, { recursive: true });
 
+  console.log("  创建虚拟环境...");
   try {
-    execFileSync(systemPython, ["-m", "venv", venvDir], {
+    execFileSync(sysPy, ["-m", "venv", venvDir], {
       encoding: "utf8", stdio: "inherit", timeout: 60000,
     });
-  } catch (err) {
-    // Debian/Ubuntu 上 python3.xx-venv 需要单独安装
-    console.log(`\x1b[33m[!]\x1b[0m 虚拟环境创建失败，尝试自动安装 venv 模块...`);
-    
-    const autoInstalled = !IS_WIN && tryAutoInstallVenvModule(systemPython);
-    
-    if (autoInstalled) {
-      // 重试创建 venv
+  } catch (_) {
+    // Debian/Ubuntu: 尝试安装 venv 模块
+    if (!IS_WIN) {
       try {
-        execFileSync(systemPython, ["-m", "venv", venvDir], {
+        execFileSync("sudo", ["apt-get", "install", "-y", "python3-venv"], {
+          encoding: "utf8", stdio: "inherit", timeout: 120000,
+        });
+        execFileSync(sysPy, ["-m", "venv", venvDir], {
           encoding: "utf8", stdio: "inherit", timeout: 60000,
         });
-      } catch (retryErr) {
-        console.error(`\x1b[31m[✗]\x1b[0m 重试创建虚拟环境仍然失败: ${retryErr.message}`);
+      } catch (_) {
+        console.error("\x1b[31m创建虚拟环境失败\x1b[0m");
+        console.error("请手动运行: sudo apt install python3-venv");
         process.exit(1);
       }
     } else {
-      console.error(`\x1b[31m[✗]\x1b[0m 创建虚拟环境失败: ${err.message}`);
-      if (!IS_WIN) {
-        console.error("");
-        console.error("  在 Debian/Ubuntu 上，python3.xx-venv 需要单独安装:");
-        console.error("    sudo apt install python3-venv");
-        console.error("    然后运行: myagent-ai reinstall");
-        console.error("");
-      }
+      console.error("\x1b[31m创建虚拟环境失败\x1b[0m");
       process.exit(1);
     }
   }
-
-  // 验证创建成功
-  if (!fs.existsSync(venvPython)) {
-    console.error("\x1b[31m[✗]\x1b[0m 虚拟环境创建后未找到 Python，请检查系统 Python 安装");
+  if (!fs.existsSync(getVenvPython(venvDir))) {
+    console.error("\x1b[31m虚拟环境创建失败\x1b[0m");
     process.exit(1);
   }
-
-  console.log("  \x1b[32m[✓]\x1b[0m 虚拟环境已创建");
-  return { venvDir, venvPython, venvPip, isNew: true };
-}
-
-// ── 依赖安装 ─────────────────────────────────────────────
-
-// 从 requirements.txt 解析出 Python 模块名（用于 import 检查）
-function parseRequirements(reqFile) {
-  const modules = [];
-  try {
-    const lines = fs.readFileSync(reqFile, "utf8").split("\n");
-    for (const raw of lines) {
-      const line = raw.trim();
-      if (!line || line.startsWith("#")) continue;
-      // 解析: openai>=1.12.0 → openai, python-telegram-bot>=21.0 → telegram
-      const match = line.match(/^([a-zA-Z0-9_-]+)/);
-      if (match) {
-        const pkg = match[1].toLowerCase().replace(/-/g, "_");
-        // 特殊映射: pip 包名和 import 名不一致的
-        const importMap = {
-          "beautifulsoup4": "bs4",
-          "py_getwindow": "pygetwindow",
-          "python_telegram_bot": "telegram",
-          "pillow": "PIL",
-          "psutil": "psutil",
-          "edge_tts": "edge_tts",
-        };
-        modules.push(importMap[pkg] || pkg);
-      }
-    }
-  } catch (_) {
-    // 解析失败，回退到核心包列表
-    modules.push("openai", "aiohttp", "requests");
-  }
-  return modules;
+  console.log("  \x1b[32m✓\x1b[0m 虚拟环境已创建");
+  return getVenvPython(venvDir);
 }
 
-// 核心依赖包（fallback 用，不依赖文件解析）
-// 包含 tray (pystray/Pillow) 等关键依赖，确保回退安装时也能装上
-const CORE_PACKAGES = [
-  "openai>=1.12.0",
-  "aiohttp>=3.9.0",
-  "requests>=2.31.0",
-  "duckduckgo-search>=6.0.0",
-  "beautifulsoup4>=4.12.0",
-  "lxml>=5.0.0",
-  "psutil>=5.9.0",
-  "pystray>=0.19.5",
-  "Pillow>=10.0.0",
-  "edge-tts>=6.1.0",
-  "faster-whisper>=1.0.0",
-  "anthropic>=0.18.0",
-];
-
-// 获取 pip 镜像源参数（国内用户自动使用清华镜像）
-function getPipMirrorArgs() {
-  const envMirror = process.env.MYAGENT_PIP_MIRROR || "";
-  if (envMirror === "1" || envMirror === "true" || envMirror === "cn") {
-    return ["-i", "https://pypi.tuna.tsinghua.edu.cn/simple",
-            "--trusted-host", "pypi.tuna.tsinghua.edu.cn"];
-  }
-  // 通过语言环境判断是否在国内（Windows 通过环境变量，其他通过 LANG）
-  const lang = (process.env.LANG || process.env.LC_ALL || "").toLowerCase();
-  if (lang.includes("zh_cn") || lang.includes("chinese")) {
-    return ["-i", "https://pypi.tuna.tsinghua.edu.cn/simple",
-            "--trusted-host", "pypi.tuna.tsinghua.edu.cn"];
-  }
-  return [];
-}
+// ── 依赖安装（仅在 install/reinstall/首次运行时调用） ───
 
-function installDeps(venvPython, venvPip, pkgDir) {
+function installAllDeps(venvPython, pkgDir) {
   const reqFile = path.join(pkgDir, "requirements.txt");
-  const allModules = parseRequirements(reqFile);
-
-  // 快速检查关键模块是否都存在
-  let missing = [];
-  console.log("  \x1b[36m[*]\x1b[0m 检查依赖...");
-
-  // 检查所有模块（不超过 30 个），托盘和 GUI 依赖也必须检测
-  const checkLimit = Math.min(allModules.length, 30);
-  for (let i = 0; i < checkLimit; i++) {
-    const mod = allModules[i];
-    try {
-      execFileSync(venvPython, ["-c", `import ${mod}`], {
-        encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 5000,
-      });
-    } catch (_) {
-      missing.push(mod);
-    }
-  }
-
-  if (missing.length === 0) {
-    console.log(`  \x1b[32m[✓]\x1b[0m 全部 ${checkLimit} 个依赖检查通过`);
-    return;
-  }
-
-  console.log(`  \x1b[33m[!]\x1b[0m 缺失 ${missing.length} 个包: ${missing.join(", ")}`);
+  const mirrorArgs = getPipMirrorArgs();
+  if (mirrorArgs.length) console.log("  使用国内镜像源 (清华)");
 
-  // 策略1: 升级 pip
+  // 升级 pip
   try {
-    console.log("  \x1b[90m[i]\x1b[0m 升级 pip...");
-    execFileSync(venvPython, ["-m", "pip", "install", "--upgrade", "pip", "--quiet"], {
+    execFileSync(venvPython, ["-m", "pip", "install", "--upgrade", "pip", "-q"], {
       encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 120000,
     });
   } catch (_) {}
 
-  // pip 镜像源参数
-  const mirrorArgs = getPipMirrorArgs();
-
-  // Linux: 预装 evdev 预编译包，避免 pynput 安装时编译失败
+  // Linux: 预装 evdev
   if (!IS_WIN) {
     try {
-      execFileSync(venvPython, ["-m", "pip", "install", "evdev-binary", "--quiet", "--disable-pip-version-check"], {
+      execFileSync(venvPython, ["-m", "pip", "install", "evdev-binary", "-q", "--disable-pip-version-check"], {
         encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 60000,
       });
     } catch (_) {}
   }
 
-  // 策略2: pip install -r requirements.txt（venv 内无 PEP668 限制）
-  let installed = false;
+  // 安装全部依赖
   if (fs.existsSync(reqFile)) {
-    console.log(`\x1b[33m[!]\x1b[0m 正在安装 ${missing.length} 个缺失依赖到虚拟环境...`);
-    if (mirrorArgs.length > 0) {
-      console.log("  \x1b[90m[i]\x1b[0m 使用国内镜像源 (清华)");
-    }
+    console.log("  安装依赖 (可能需要几分钟)...");
     try {
       execFileSync(venvPython, ["-m", "pip", "install", "-r", reqFile, "--disable-pip-version-check", ...mirrorArgs], {
-        encoding: "utf8", stdio: "inherit", timeout: 300000,
+        encoding: "utf8", stdio: "inherit", timeout: 600000,
       });
-      console.log("  \x1b[32m[✓]\x1b[0m 依赖安装完成");
-      installed = true;
+      console.log("  \x1b[32m✓\x1b[0m 全部依赖安装完成");
+      return true;
     } catch (err) {
-      console.log("  \x1b[33m[!]\x1b[0m requirements.txt 整体安装失败，逐个安装缺失依赖...");
-      console.log(`  \x1b[90m[i]\x1b[0m 错误: ${err.message}`);
+      console.log(`  \x1b[33m安装失败: ${err.message.split("\n").pop().trim()}\x1b[0m`);
     }
   }
 
-  // 策略2.5: 逐个安装缺失的包（当整体安装失败时）
-  if (!installed && missing.length > 0) {
-    console.log(`  \x1b[90m[i]\x1b[0m 逐个安装 ${missing.length} 个缺失包...`);
-    // 构建反向映射: import名 → pip包名(含版本)
-    const importToPip = {};
+  // 回退: 核心依赖
+  const CORE = [
+    "openai>=1.12.0", "aiohttp>=3.9.0", "requests>=2.31.0",
+    "duckduckgo-search>=6.0.0", "beautifulsoup4>=4.12.0", "lxml>=5.0.0",
+    "psutil>=5.9.0", "Pillow>=10.0.0", "edge-tts>=6.1.0",
+    "anthropic>=0.18.0",
+  ];
+  for (const mirrors of [mirrorArgs, ["-i", "https://mirrors.aliyun.com/pypi/simple/", "--trusted-host", "mirrors.aliyun.com"]]) {
     try {
-      const lines = fs.readFileSync(reqFile, "utf8").split("\n");
-      for (const raw of lines) {
-        const line = raw.trim();
-        if (!line || line.startsWith("#")) continue;
-        const m = line.match(/^([a-zA-Z0-9_-]+)/);
-        if (m) {
-          const pipName = m[1].toLowerCase().replace(/-/g, "_");
-          const pipSpec = line.split(/[;#]/)[0].trim();
-          importToPip[pipName] = pipSpec;
-          // 特殊映射 (和 parseRequirements 中的 importMap 一致)
-          const specialMap = {
-            "beautifulsoup4": "bs4",
-            "py_getwindow": "pygetwindow",
-            "python_telegram_bot": "telegram",
-            "pillow": "PIL",
-            "psutil": "psutil",
-            "edge_tts": "edge_tts",
-          };
-          const importName = specialMap[pipName] || pipName;
-          importToPip[importName] = pipSpec;
-        }
-      }
+      console.log("  尝试安装核心依赖...");
+      execFileSync(venvPython, ["-m", "pip", "install", "-q", "--disable-pip-version-check", ...mirrors, ...CORE], {
+        encoding: "utf8", stdio: "inherit", timeout: 300000,
+      });
+      console.log("  \x1b[32m✓\x1b[0m 核心依赖安装完成");
+      return true;
     } catch (_) {}
-
-    let failCount = 0;
-    for (const mod of missing) {
-      try {
-        const pkgSpec = importToPip[mod] || mod;
-        execFileSync(venvPython, ["-m", "pip", "install", "--disable-pip-version-check", ...mirrorArgs, pkgSpec], {
-          encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 120000,
-        });
-        console.log(`  \x1b[32m[✓]\x1b[0m ${mod} 安装成功`);
-      } catch (_) {
-        failCount++;
-        console.log(`  \x1b[31m[✗]\x1b[0m ${mod} 安装失败`);
-      }
-    }
-    if (failCount === 0) {
-      console.log("  \x1b[32m[✓]\x1b[0m 所有缺失依赖安装成功");
-      installed = true;
-    } else if (failCount < missing.length) {
-      console.log(`  \x1b[33m[!]\x1b[0m ${missing.length - failCount}/${missing.length} 个依赖安装成功，${failCount} 个失败`);
-      installed = true; // 部分成功也算，核心依赖优先
-    }
   }
+  return false;
+}
 
-  // 策略3: 直接按包名安装核心依赖（最终兜底）
-  if (!installed) {
-    try {
-      execFileSync(venvPython, ["-m", "pip", "install", "--quiet", "--disable-pip-version-check", ...mirrorArgs, ...CORE_PACKAGES], {
-        encoding: "utf8", stdio: "inherit", timeout: 180000,
-      });
-      console.log("  \x1b[32m[✓]\x1b[0m 核心依赖安装完成");
-      console.log("  \x1b[90m[i]\x1b[0m 其他依赖将在启动时自动安装");
-    } catch (_) {
-      // 策略4: 尝试阿里云镜像
-      console.log("  \x1b[33m[!]\x1b[0m 核心依赖安装失败，尝试阿里云镜像...");
-      try {
-        const aliyunArgs = ["-i", "https://mirrors.aliyun.com/pypi/simple/", "--trusted-host", "mirrors.aliyun.com"];
-        execFileSync(venvPython, ["-m", "pip", "install", "--quiet", "--disable-pip-version-check", ...aliyunArgs, ...CORE_PACKAGES], {
-          encoding: "utf8", stdio: "inherit", timeout: 180000,
-        });
-        console.log("  \x1b[32m[✓]\x1b[0m 核心依赖安装完成（阿里云镜像）");
-      } catch (_) {
-        console.error("  \x1b[31m[✗]\x1b[0m 依赖安装失败，请手动运行:");
-        console.error(`    ${venvPython} -m pip install -r "${reqFile}"`);
-        console.error("");
-        console.error("  或使用重新安装命令: myagent-ai reinstall");
-        console.error("");
-      }
-    }
-  }
+// 标记依赖已安装
+function markDepsInstalled(version) {
+  try {
+    const dir = getDataDir();
+    if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
+    fs.writeFileSync(getSentinelFile(), version);
+  } catch (_) {}
 }
 
-// ── 构建 main.py 参数 ────────────────────────────────────
-function buildArgs(userArgs) {
-  const mode = userArgs[0] || "";
-  switch (mode) {
-    case "cli":     return ["main.py"];
-    case "web":     return ["main.py", "--web"];
-    case "tray":    return ["main.py", "--tray"];
-    case "server":  return ["main.py", "--server"];
-    case "setup":   return ["main.py", "--setup"];
-    case "reinstall":
-      return []; // 特殊处理
-    case "uninstall":
-      return []; // 特殊处理
-    default:
-      return ["main.py", ...userArgs];
+function isDepsInstalled(pkgVersion) {
+  try {
+    if (!fs.existsSync(getSentinelFile())) return false;
+    return fs.readFileSync(getSentinelFile(), "utf8").trim() === pkgVersion;
+  } catch (_) {
+    return false;
   }
 }
 
-// ── 主入口 ─────────────────────────────────────────────────
-function main() {
-  const userArgs = process.argv.slice(2);
-  const pkgDir = resolvePackageDir();
-
-  if (!fs.existsSync(path.join(pkgDir, "main.py"))) {
-    console.error("\x1b[31m[✗]\x1b[0m 错误: 找不到 main.py");
-    console.error(`  搜索路径: ${pkgDir}`);
-    console.error('  请重新安装: npm install -g myagent-ai');
-    process.exit(1);
-  }
+// ── 命令处理 ──────────────────────────────────────────────
 
-  // 特殊命令: uninstall
-  if (userArgs[0] === "uninstall") {
-    const venvDir = getVenvDir();
-    const purgeArg = userArgs.includes("--purge") || userArgs.includes("-p");
-    const dataDir = getDataDir();
+function cmdInstall(pkgDir) {
+  console.log("");
+  console.log("  \x1b[36mMyAgent 安装依赖\x1b[0m");
+  console.log("");
+  const venvPython = ensureVenv();
+  installAllDeps(venvPython, pkgDir);
+  let ver = "";
+  try { ver = JSON.parse(fs.readFileSync(path.join(pkgDir, "package.json"), "utf8")).version || ""; } catch (_) {}
+  markDepsInstalled(ver);
+  console.log("");
+  console.log("  \x1b[32m✓ 安装完成，可以启动了: myagent-ai web\x1b[0m");
+  console.log("");
+}
 
-    // Step 1: 停止服务
-    console.log("  \x1b[36m[*]\x1b[0m 停止 MyAgent 服务...");
-    try {
-      const http = require("http");
-      const req = http.request({ hostname: "127.0.0.1", port: 8767, path: "/api/shutdown", method: "POST", timeout: 5000 }, () => {
-        // 忽略响应
-      });
-      req.on("error", () => {});
-      req.end();
-      console.log("  \x1b[32m[✓]\x1b[0m 已发送关闭请求");
-      setTimeout(() => {}, 2000);
-    } catch (_) {
-      console.log("  \x1b[90m[i]\x1b[0m 服务未运行");
-    }
+function cmdReinstall(pkgDir) {
+  console.log("");
+  console.log("  \x1b[36mMyAgent 重装依赖\x1b[0m");
+  console.log("");
+  const venvDir = getVenvDir();
+  if (fs.existsSync(venvDir)) {
+    console.log("  删除旧虚拟环境...");
+    fs.rmSync(venvDir, { recursive: true, force: true });
+  }
+  const venvPython = ensureVenv();
+  installAllDeps(venvPython, pkgDir);
+  let ver = "";
+  try { ver = JSON.parse(fs.readFileSync(path.join(pkgDir, "package.json"), "utf8")).version || ""; } catch (_) {}
+  markDepsInstalled(ver);
+  console.log("");
+  console.log("  \x1b[32m✓ 重装完成\x1b[0m");
+  console.log("");
+}
 
-    // Step 2: 终止 Python/Node 进程
-    try {
-      if (IS_WIN) {
-        execSync("taskkill /F /IM python.exe /FI \"WINDOWTITLE eq myagent*\"", { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 5000 });
-      } else {
-        execSync("pkill -f 'myagent|main.py' 2>/dev/null; sleep 1", { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 10000 });
-      }
-    } catch (_) {}
-    console.log("  \x1b[32m[✓]\x1b[0m 进程已停止");
+function cmdUninstall() {
+  const venvDir = getVenvDir();
+  const dataDir = getDataDir();
+  const purgeArg = process.argv.includes("--purge") || process.argv.includes("-p");
 
-    // Step 3: npm uninstall
-    console.log("  \x1b[36m[*]\x1b[0m 卸载 npm 全局包...");
-    try {
-      execFileSync("npm", ["uninstall", "-g", PKG_NAME], {
-        encoding: "utf8", stdio: "inherit", timeout: 60000,
-      });
-      console.log("  \x1b[32m[✓]\x1b[0m npm 全局包已卸载");
-    } catch (_) {
-      console.log("  \x1b[90m[i]\x1b[0m npm 全局包未找到");
-    }
+  console.log("");
+  console.log("  \x1b[36mMyAgent 卸载\x1b[0m");
+  console.log("");
 
-    // Step 4: 清理数据（--purge）
-    if (purgeArg) {
-      console.log("");
-      console.log("  \x1b[36m[*]\x1b[0m 清除所有数据...");
-      if (fs.existsSync(dataDir)) {
-        fs.rmSync(dataDir, { recursive: true, force: true });
-        console.log("  \x1b[32m[✓]\x1b[0m 数据目录已删除: " + dataDir);
-      } else {
-        console.log("  \x1b[90m[i]\x1b[0m 数据目录不存在");
-      }
+  // 停止服务
+  try {
+    const http = require("http");
+    const req = http.request({ hostname: "127.0.0.1", port: 8767, path: "/api/shutdown", method: "POST", timeout: 5000 }, () => {});
+    req.on("error", () => {});
+    req.end();
+  } catch (_) {}
+  try {
+    if (IS_WIN) {
+      execSync('taskkill /F /IM python.exe /FI "WINDOWTITLE eq myagent*" 2>nul', { encoding: "utf8", timeout: 5000 });
     } else {
-      console.log("");
-      console.log("  \x1b[90m[i]\x1b[0m 保留数据目录: " + dataDir);
-      console.log("  \x1b[90m[i]\x1b[0m 如需彻底清除: myagent-ai uninstall --purge");
-    }
-
-    console.log("");
-    console.log("  \x1b[32m[✓]\x1b[0m 卸载完成！");
-    console.log("  \x1b[90m[i]\x1b[0m 重新安装: npm install -g myagent-ai");
-    console.log("");
-    return;
-  }
-
-  // 特殊命令: reinstall
-  if (userArgs[0] === "reinstall") {
-    const venvDir = getVenvDir();
-    if (fs.existsSync(venvDir)) {
-      console.log("  \x1b[36m[*]\x1b[0m 删除旧虚拟环境...");
-      fs.rmSync(venvDir, { recursive: true, force: true });
+      execSync("pkill -f 'myagent|main.py' 2>/dev/null", { encoding: "utf8", timeout: 10000 });
     }
-    const { venvPython, venvPip } = ensureVenv();
-    installDeps(venvPython, venvPip, pkgDir);
-    console.log("");
-    console.log("  \x1b[32m[✓]\x1b[0m 依赖已全部重新安装到虚拟环境");
-    console.log(`  \x1b[90m[i]\x1b[0m 虚拟环境: ${venvDir}`);
-    console.log("");
-    return;
-  }
+  } catch (_) {}
 
-  // 打印 Banner（显示版本号）
-  let pkgVersion = "";
   try {
-    const pkgJson = path.join(pkgDir, "package.json");
-    const pkg = JSON.parse(fs.readFileSync(pkgJson, "utf8"));
-    pkgVersion = pkg.version || "";
+    execFileSync("npm", ["uninstall", "-g", PKG_NAME], {
+      encoding: "utf8", stdio: "inherit", timeout: 60000,
+    });
   } catch (_) {}
-  console.log("");
-  if (pkgVersion) {
-    console.log(`  \x1b[1m\x1b[36mMyAgent\x1b[0m v${pkgVersion} - 本地桌面端执行型 AI 助手`);
-  } else {
-    console.log("  \x1b[1m\x1b[36mMyAgent\x1b[0m - 本地桌面端执行型 AI 助手");
+
+  if (purgeArg && fs.existsSync(dataDir)) {
+    fs.rmSync(dataDir, { recursive: true, force: true });
+    console.log("  数据已清除");
   }
   console.log("");
+  console.log("  \x1b[32m✓ 卸载完成\x1b[0m");
+  console.log("");
+}
 
-  // 是否跳过依赖检查
-  const skipDeps = userArgs.includes("--skip-deps") || userArgs.includes("--no-deps");
-  // 从参数中移除 --skip-deps/--no-deps，避免传入 main.py
-  const filteredArgs = userArgs.filter(a => a !== "--skip-deps" && a !== "--no-deps");
-
-  // 确保 venv 存在
-  const { venvDir, venvPython, isNew } = ensureVenv();
-
-  // 检查并安装依赖（--skip-deps 时跳过）
-  if (skipDeps) {
-    console.log("  \x1b[90m[i]\x1b[0m 跳过依赖检查（--skip-deps）");
-  } else if (isNew) {
-    installDeps(venvPython, getVenvPip(venvDir), pkgDir);
-  } else {
-    // 即使 venv 已存在，也快速检查核心依赖
-    const venvPip = getVenvPip(venvDir);
-    installDeps(venvPython, venvPip, pkgDir);
+function cmdRun(pkgDir, userArgs) {
+  const venvPython = getVenvPython(getVenvDir());
+  if (!fs.existsSync(venvPython)) {
+    console.error("\x1b[31m虚拟环境不存在，请先运行: myagent-ai install\x1b[0m");
+    process.exit(1);
   }
 
-  // 首次运行检测
-  const configFile = path.join(getDataDir(), "config.json");
-  const isFirstRun = !fs.existsSync(configFile);
-  if (isFirstRun) {
+  let ver = "";
+  try { ver = JSON.parse(fs.readFileSync(path.join(pkgDir, "package.json"), "utf8")).version || ""; } catch (_) {}
+
+  // 首次运行自动安装
+  if (!isDepsInstalled(ver)) {
+    console.log("");
+    console.log("  \x1b[36m首次运行，正在安装依赖...\x1b[0m");
     console.log("");
-    console.log("  \x1b[90m[i]\x1b[0m 检测到首次运行，MyAgent 将引导你完成 LLM 配置。");
+    installAllDeps(venvPython, pkgDir);
+    markDepsInstalled(ver);
     console.log("");
   }
 
-  // 显示环境信息
-  console.log(`  \x1b[90m[i]\x1b[0m 虚拟环境: ${venvDir}`);
-  console.log(`  \x1b[90m[i]\x1b[0m Python: ${venvPython}`);
+  // 显示版本
   console.log("");
+  if (ver) {
+    console.log(`  MyAgent v${ver}`);
+  }
 
-  // 构建 Python 参数（使用过滤后的参数）
-  let mode = filteredArgs[0] || "";
-  let pyArgs = buildArgs(filteredArgs);
+  // 首次运行检测
+  const configFile = path.join(getDataDir(), "config.json");
+  const isFirstRun = !fs.existsSync(configFile);
+
+  // 构建参数
+  let mode = userArgs[0] || "";
+  let pyArgs;
+  switch (mode) {
+    case "cli":     pyArgs = ["main.py"]; break;
+    case "web":     pyArgs = ["main.py", "--web"]; break;
+    case "tray":    pyArgs = ["main.py", "--tray"]; break;
+    case "server":  pyArgs = ["main.py", "--server"]; break;
+    case "setup":   pyArgs = ["main.py", "--setup"]; break;
+    default:        pyArgs = ["main.py", ...userArgs]; mode = "";
+  }
 
-  // 首次运行且未指定模式 → 自动选择 web 模式
   if (isFirstRun && !mode) {
     mode = "web";
     pyArgs = ["main.py", "--web"];
-    console.log("  \x1b[90m[i]\x1b[0m 首次运行，自动启动 Web 模式进行配置...");
-    console.log("");
-  }
-
-  if (mode) {
-    const modeNames = {
-      web: "Web 管理后台 (http://localhost:8767)",
-      cli: "CLI 交互模式",
-      tray: "系统托盘模式",
-      server: "API 服务模式",
-      setup: "配置向导",
-    };
-    console.log(`\x1b[36m启动 ${modeNames[mode] || mode}...\x1b[0m`);
-  } else {
-    console.log(`\x1b[36m启动...\x1b[0m`);
   }
 
-  // 使用 venv 的 Python 启动
+  const venvDir = getVenvDir();
   const spawnEnv = {
     ...process.env,
-    // 设置 VIRTUAL_ENV 环境变量，让 Python 程序知道自己运行在 venv 中
     VIRTUAL_ENV: venvDir,
     PATH: IS_WIN
       ? `${path.join(venvDir, "Scripts")};${process.env.PATH}`
       : `${path.join(venvDir, "bin")}:${process.env.PATH}`,
   };
-  // 将 --skip-deps 信号传递给 Python，让 main.py 也跳过依赖检查
-  if (skipDeps) {
-    spawnEnv.MYAGENT_SKIP_DEPS = "1";
-  }
-  const child = spawn(venvPython, pyArgs, {
-    cwd: pkgDir,
-    stdio: "inherit",
-    env: spawnEnv,
-  });
-
-  child.on("error", (err) => {
-    console.error(`\x1b[31m[✗]\x1b[0m 启动失败: ${err.message}`);
-    process.exit(1);
-  });
 
-  child.on("exit", (code) => {
-    process.exit(code || 0);
-  });
+  const child = spawn(venvPython, pyArgs, { cwd: pkgDir, stdio: "inherit", env: spawnEnv });
+  child.on("error", (err) => { console.error(`\x1b[31m启动失败: ${err.message}\x1b[0m`); process.exit(1); });
+  child.on("exit", (code) => { process.exit(code || 0); });
 
-  // Web 模式：等服务启动后自动打开浏览器
+  // Web 模式自动打开浏览器
   if (mode === "web") {
-    const port = 8767;
-    const url = `http://127.0.0.1:${port}`;
+    const url = "http://127.0.0.1:8767";
     let opened = false;
-
-    // 轮询等待服务就绪
-    const pollInterval = setInterval(() => {
+    const poll = setInterval(() => {
       const http = require("http");
       const req = http.get(`${url}/api/status`, (res) => {
-        clearInterval(pollInterval);
+        clearInterval(poll);
         if (!opened) {
           opened = true;
-          console.log(`  \x1b[32m[✓]\x1b[0m 管理后台已就绪: ${url}`);
-          console.log("  \x1b[90m[i]\x1b[0m 正在打开浏览器...");
-          console.log("");
-          // 跨平台打开浏览器
           try {
-            const { exec } = require("child_process");
-            if (IS_WIN) {
-              // Windows: start "" "url" — 空字符串防止 URL 被当作标题
-              exec(`start "" "${url}"`);
-            } else if (process.platform === "darwin") {
-              exec(`open "${url}"`);
-            } else {
-              exec(`xdg-open "${url}"`);
-            }
-          } catch (_) {
-            console.log(`  \x1b[90m[i]\x1b[0m 请手动打开浏览器访问: ${url}`);
-          }
+            if (IS_WIN) execSync(`start "" "${url}"`);
+            else if (process.platform === "darwin") execSync(`open "${url}"`);
+            else execSync(`xdg-open "${url}"`);
+          } catch (_) {}
         }
       });
-      req.on("error", () => {
-        // 服务尚未就绪，继续等待
-      });
-      req.setTimeout(2000, () => {
-        req.destroy();
-      });
+      req.on("error", () => {});
+      req.setTimeout(2000, () => { req.destroy(); });
     }, 1500);
+    setTimeout(() => { clearInterval(poll); }, 120000);
+  }
+}
 
-    // 最多等待 120 秒（首次安装 venv + 依赖可能需要较长时间）
-    setTimeout(() => {
-      clearInterval(pollInterval);
-      if (!opened) {
-        console.log(`  \x1b[33m[!]\x1b[0m 等待超时，请手动打开浏览器访问: ${url}`);
-      }
-    }, 120000);
+// ── 主入口 ──────────────────────────────────────────────
+
+function main() {
+  const args = process.argv.slice(2);
+  const cmd = args[0];
+  const pkgDir = resolvePackageDir();
+
+  if (!fs.existsSync(path.join(pkgDir, "main.py"))) {
+    console.error("\x1b[31m找不到 main.py，请重新安装: npm install -g myagent-ai\x1b[0m");
+    process.exit(1);
   }
+
+  if (cmd === "uninstall") { cmdUninstall(); return; }
+  if (cmd === "reinstall") { cmdReinstall(pkgDir); return; }
+  if (cmd === "install")   { cmdInstall(pkgDir); return; }
+
+  // 默认: 直接启动
+  cmdRun(pkgDir, args);
 }
 
 main();