galaxy-opc 0.5.20 → 0.5.22

package/bin/cli.mjs

@@ -110,14 +110,25 @@ function deepMerge(target, source) {
 }
 
 function runCommand(cmd, args, options = {}) {
+  const { timeout: timeoutMs, ...spawnOptions } = options;
   return new Promise((resolve, reject) => {
     const proc = spawn(cmd, args, {
       stdio: "inherit",
       shell: process.platform === "win32",
-      ...options,
+      ...spawnOptions,
     });
-    proc.on("close", (code) => code === 0 ? resolve() : reject(new Error(`exit ${code}`)));
-    proc.on("error", reject);
+    let timer;
+    if (timeoutMs) {
+      timer = setTimeout(() => {
+        proc.kill();
+        reject(new Error(`超时（${timeoutMs / 1000}s）`));
+      }, timeoutMs);
+    }
+    proc.on("close", (code) => {
+      clearTimeout(timer);
+      code === 0 ? resolve() : reject(new Error(`exit ${code}`));
+    });
+    proc.on("error", (err) => { clearTimeout(timer); reject(err); });
   });
 }
 
@@ -165,18 +176,23 @@ async function installOpenclawWithFallback() {
     {
       label: "官方源",
       args: ["install", "-g", "openclaw@latest"],
+      timeout: 120_000,  // 120s 超时
     },
     {
       label: "国内镜像（npmmirror）",
       args: ["install", "-g", "openclaw@latest", "--registry", "https://registry.npmmirror.com"],
+      timeout: 180_000,  // 镜像给 180s
     },
   ];
 
   let lastErr = null;
   for (const attempt of attempts) {
-    console.log(dim(`  尝试 ${attempt.label} 安装 OpenClaw...\n`));
+    // 清理上次失败/中断留下的残留目录，防止 ENOTEMPTY 报错
+    try { execSync("npm uninstall -g openclaw", { stdio: "ignore" }); } catch { /* ignore */ }
+
+    console.log(dim(`  尝试 ${attempt.label} 安装 OpenClaw...（超时 ${attempt.timeout / 1000}s 自动切换）\n`));
     try {
-      await runCommand("npm", attempt.args, { env });
+      await runCommand("npm", attempt.args, { env, timeout: attempt.timeout });
       return;
     } catch (e) {
       lastErr = e;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "galaxy-opc",
-  "version": "0.5.20",
+  "version": "0.5.22",
   "description": "星环 Galaxy OPC — 一人公司孵化与赋能平台 AI 员工系统",
   "keywords": [
     "ai",