myagent-ai 1.15.59 → 1.15.60

package/install/install.sh

@@ -171,6 +171,23 @@ install_node() {
   exit 1
 }
 
+# ── 找到 myagent-ai 命令路径 ──────────────────────────────
+find_myagent_cmd() {
+  if command -v myagent-ai &>/dev/null; then
+    echo "myagent-ai"
+    return 0
+  fi
+  # npm bin -g 在新版 npm 中已废弃，使用 npm prefix -g
+  local npm_prefix
+  npm_prefix="$(npm prefix -g 2>/dev/null)" || return 1
+  local cmd_path="${npm_prefix}/bin/myagent-ai"
+  if [ -x "$cmd_path" ]; then
+    echo "$cmd_path"
+    return 0
+  fi
+  return 1
+}
+
 # ── Main ─────────────────────────────────────────────────
 if ! $NO_DEPS; then
   check_python || install_python
@@ -188,18 +205,12 @@ success "$PKG_NAME installed"
 
 # 用 start.js 的 install 命令创建 venv 并安装全部 Python 依赖
 step "Installing Python dependencies ..."
-if command -v myagent-ai &>/dev/null; then
-  myagent-ai install
+myagent_cmd="$(find_myagent_cmd)"
+if [ -n "$myagent_cmd" ]; then
+  "$myagent_cmd" 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
+  err "myagent-ai 命令未找到，请重新打开终端后运行: myagent-ai install"
+  exit 1
 fi
 
 echo ""
@@ -207,16 +218,10 @@ echo -e "  ${BOLD}${SUCCESS}安装完成！${NC}"
 echo ""
 
 # 启动 Web 模式
-if command -v myagent-ai &>/dev/null; then
-  info "启动中: myagent-ai web"
-  myagent-ai web
+myagent_cmd="$(find_myagent_cmd)"
+if [ -n "$myagent_cmd" ]; then
+  info "启动中: $myagent_cmd web"
+  "$myagent_cmd" 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
+  echo -e "  请重新打开终端后运行: ${ACCENT}myagent-ai web${NC}"
 fi

package/package.json

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

package/start.js

@@ -6,6 +6,11 @@
  *   - install/reinstall: 创建 venv + 安装所有依赖
  *   - web/cli/tray/server: 直接启动，不检查依赖
  *   - uninstall: 卸载
+ *
+ * 安装策略:
+ *   - 先尝试 pip install -r requirements.txt (批量安装)
+ *   - 如果失败，逐包安装: 核心包失败=报错，可选包失败=跳过
+ *   - 确保即使部分可选包编译失败，核心功能也能正常运行
  */
 "use strict";
 
@@ -17,6 +22,9 @@ const os = require("os");
 const IS_WIN = process.platform === "win32";
 const PKG_NAME = "myagent-ai";
 
+// 核心依赖: 缺少任何一个就无法启动
+const CORE_DEPS = ["openai", "aiohttp", "requests"];
+
 // ── 路径工具 ──────────────────────────────────────────────
 
 function getHome() { return os.homedir(); }
@@ -90,6 +98,12 @@ function getPipMirrorArgs() {
   return [];
 }
 
+const MIRRORS = [
+  () => getPipMirrorArgs(),
+  () => ["-i", "https://mirrors.aliyun.com/pypi/simple/", "--trusted-host", "mirrors.aliyun.com"],
+  () => [],
+];
+
 // ── 虚拟环境 ──────────────────────────────────────────────
 
 function ensureVenv() {
@@ -120,7 +134,6 @@ function ensureVenv() {
       encoding: "utf8", stdio: "inherit", timeout: 60000,
     });
   } catch (_) {
-    // Debian/Ubuntu: 尝试安装 venv 模块
     if (!IS_WIN) {
       try {
         execFileSync("sudo", ["apt-get", "install", "-y", "python3-venv"], {
@@ -147,61 +160,123 @@ function ensureVenv() {
   return getVenvPython(venvDir);
 }
 
-// ── 依赖安装（仅在 install/reinstall/首次运行时调用） ───
+// ── 依赖安装 ──────────────────────────────────────────────
 
+/**
+ * pip install 单个包，支持多镜像源重试
+ * @returns {boolean} 是否安装成功
+ */
+function pipInstall(venvPython, pkgSpec, quiet) {
+  for (const getMirror of MIRRORS) {
+    try {
+      const args = ["-m", "pip", "install", "--disable-pip-version-check", ...getMirror()];
+      if (quiet) args.push("-q");
+      args.push(pkgSpec);
+      execFileSync(venvPython, args, {
+        encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 180000,
+      });
+      return true;
+    } catch (_) {}
+  }
+  return false;
+}
+
+/**
+ * 从 requirements.txt 解析包列表
+ * @returns {string[]} 如 ["openai>=1.12.0", "aiohttp>=3.9.0", ...]
+ */
+function parseRequirements(reqFile) {
+  const content = fs.readFileSync(reqFile, "utf8");
+  return content
+    .split("\n")
+    .map(line => line.trim())
+    .filter(line => line && !line.startsWith("#") && !line.startsWith("-"));
+}
+
+/**
+ * 获取包名（去掉版本约束）: "openai>=1.12.0" → "openai"
+ */
+function pkgBaseName(spec) {
+  return spec.replace(/[<>=!~].*/, "").trim().toLowerCase();
+}
+
+/**
+ * 安装全部依赖 - 容错策略
+ *
+ * 1. 先尝试 pip install -r requirements.txt 批量安装
+ * 2. 如果失败，逐包安装:
+ *    - 核心包 (openai/aiohttp/requests): 失败则报错退出
+ *    - 可选包: 失败只 warn，不阻塞
+ * 3. 确保核心功能可用
+ */
 function installAllDeps(venvPython, pkgDir) {
   const reqFile = path.join(pkgDir, "requirements.txt");
   const mirrorArgs = getPipMirrorArgs();
   if (mirrorArgs.length) console.log("  使用国内镜像源 (清华)");
 
   // 升级 pip
-  try {
-    execFileSync(venvPython, ["-m", "pip", "install", "--upgrade", "pip", "-q"], {
-      encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 120000,
-    });
-  } catch (_) {}
+  pipInstall(venvPython, "--upgrade pip", true);
 
-  // Linux: 预装 evdev
-  if (!IS_WIN) {
-    try {
-      execFileSync(venvPython, ["-m", "pip", "install", "evdev-binary", "-q", "--disable-pip-version-check"], {
-        encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 60000,
-      });
-    } catch (_) {}
-  }
+  // Linux: 预装 evdev-binary (pynput 的依赖，避免编译 evdev)
+  if (!IS_WIN) pipInstall(venvPython, "evdev-binary", true);
 
-  // 安装全部依赖
+  // 第一轮: 批量安装 requirements.txt
   if (fs.existsSync(reqFile)) {
-    console.log("  安装依赖 (可能需要几分钟)...");
+    console.log("  安装依赖...");
     try {
       execFileSync(venvPython, ["-m", "pip", "install", "-r", reqFile, "--disable-pip-version-check", ...mirrorArgs], {
-        encoding: "utf8", stdio: "inherit", timeout: 600000,
+        encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 600000,
       });
       console.log("  \x1b[32m✓\x1b[0m 全部依赖安装完成");
-      return true;
-    } catch (err) {
-      console.log(`  \x1b[33m安装失败: ${err.message.split("\n").pop().trim()}\x1b[0m`);
+      return { ok: true, failedOptional: [] };
+    } catch (_) {
+      // 批量安装失败，进入逐包容错模式
+      console.log("  \x1b[33m部分依赖安装遇到问题，切换到逐包安装...\x1b[0m");
     }
   }
 
-  // 回退: 核心依赖
-  const CORE = [
+  // 第二轮: 逐包安装
+  const packages = fs.existsSync(reqFile) ? parseRequirements(reqFile) : [
     "openai>=1.12.0", "aiohttp>=3.9.0", "requests>=2.31.0",
     "duckduckgo-search>=6.0.0", "beautifulsoup4>=4.12.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 {
-      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 (_) {}
+
+  const failedCore = [];
+  const failedOptional = [];
+
+  for (const pkg of packages) {
+    const baseName = pkgBaseName(pkg);
+    const isCore = CORE_DEPS.includes(baseName);
+
+    if (pipInstall(venvPython, pkg, true)) continue;
+
+    // 安装失败
+    if (isCore) {
+      failedCore.push(pkg);
+    } else {
+      failedOptional.push(pkg);
+    }
   }
-  return false;
+
+  // 核心依赖失败 = 无法运行
+  if (failedCore.length > 0) {
+    console.error(`\x1b[31m  ✗ 核心依赖安装失败: ${failedCore.join(", ")}\x1b[0m`);
+    console.error("  请手动安装: " + failedCore.map(p => `pip install ${p}`).join(" && "));
+    process.exit(1);
+  }
+
+  // 可选依赖失败 = 只提示
+  if (failedOptional.length > 0) {
+    console.log(`  \x1b[33m⚠ 以下可选包安装失败（不影响核心功能）:\x1b[0m`);
+    for (const pkg of failedOptional) {
+      console.log(`    \x1b[33m- ${pkg}\x1b[0m`);
+    }
+  }
+
+  console.log("  \x1b[32m✓\x1b[0m 核心依赖已就绪");
+  return { ok: true, failedOptional };
 }
 
 // 标记依赖已安装