galaxy-opc 0.3.8 → 0.3.9

package/bin/cli.mjs

@@ -165,6 +165,31 @@ ${bold(cyan("  ╚════════════════════
   }
   console.log(green(`  ✓ Node.js v${process.versions.node}`));
 
+  // 检查 git 是否可用（macOS 没装 Xcode CLT 时 git 会失败）
+  const hasGit = checkTool("git");
+  if (!hasGit) {
+    if (process.platform === "darwin") {
+      console.log(yellow("\n  ! git 未安装 — macOS 需要先安装 Xcode Command Line Tools"));
+      console.log(dim("  正在尝试自动安装（弹窗后点击「安装」，等待完成）...\n"));
+      try {
+        execSync("xcode-select --install 2>/dev/null", { stdio: "inherit" });
+      } catch { /* 已安装时会报错，忽略 */ }
+      // 再次检测
+      if (!checkTool("git")) {
+        console.error(red("\n  ✗ git 仍不可用，请手动执行后重试:"));
+        console.error(gray("    xcode-select --install\n"));
+        process.exit(1);
+      }
+      console.log(green("  ✓ git 已就绪"));
+    } else {
+      console.error(red("\n  ✗ git 未安装，请先安装 git:"));
+      console.error(gray("    https://git-scm.com/downloads\n"));
+      process.exit(1);
+    }
+  } else {
+    console.log(green("  ✓ git 已安装"));
+  }
+
   // ── 步骤 2：安装 openclaw ────────────────────────────────────────────────
   separator();
   console.log(bold("  步骤 2 / 4  安装 OpenClaw 核心"));
@@ -175,18 +200,23 @@ ${bold(cyan("  ╚════════════════════
     console.log(green(`  ✓ OpenClaw 已安装 (${ocVersion})`));
   } else {
     console.log(dim("  正在安装 OpenClaw（首次安装约 80MB+，使用国内镜像加速）...\n"));
-    // 临时覆盖 git url rewrite（有些机器把 https://github.com 重写到 ssh）
-    let gitRewriteSet = false;
-    try {
-      execSync("git config --global url.https://github.com/.insteadOf git@github.com:", { stdio: "ignore" });
-      gitRewriteSet = true;
-    } catch { /* ignore */ }
+    // 临时覆盖 git url rewrite（强制 SSH 协议转 HTTPS，覆盖两种格式）
+    const gitRewrites = [
+      ["url.https://github.com/.insteadOf", "git@github.com:"],
+      ["url.https://github.com/.insteadOf", "ssh://git@github.com/"],
+    ];
+    const gitRewritesSet = [];
+    for (const [key, val] of gitRewrites) {
+      try {
+        execSync(`git config --global ${key} "${val}"`, { stdio: "ignore" });
+        gitRewritesSet.push(key);
+      } catch { /* ignore */ }
+    }
 
     try {
       await runCommand("npm", [
         "install", "-g", "openclaw@latest",
         "--registry", "https://registry.npmmirror.com",
-        "--git-protocol", "https",
       ]);
       console.log(green("\n  ✓ OpenClaw 安装完成"));
     } catch {
@@ -195,8 +225,8 @@ ${bold(cyan("  ╚════════════════════
       process.exit(1);
     } finally {
       // 还原 git 配置
-      if (gitRewriteSet) {
-        try { execSync("git config --global --unset url.https://github.com/.insteadOf", { stdio: "ignore" }); } catch { /* ignore */ }
+      for (const key of gitRewritesSet) {
+        try { execSync(`git config --global --unset-all ${key}`, { stdio: "ignore" }); } catch { /* ignore */ }
       }
     }
   }

package/package.json

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