galaxy-opc 0.5.3 → 0.5.6

package/bin/cli.mjs

@@ -55,6 +55,14 @@ async function askYesNo(question, defaultYes = true) {
   return ans.toLowerCase().startsWith("y");
 }
 
+function printQwenCodingPlanGuide() {
+  console.log(dim("\n  推荐路径：阿里通义千问（Coding Plan）"));
+  console.log(dim("  1) 注册/登录阿里云账号：https://www.aliyun.com"));
+  console.log(dim("  2) 开通 DashScope（百炼）服务：https://dashscope.aliyun.com"));
+  console.log(dim("  3) 完成实名认证与套餐购买（按量或套餐包）"));
+  console.log(dim("  4) 回到安装向导，选择「Qwen OAuth 扫码登录」即可使用\n"));
+}
+
 function separator(char = "─", len = 60) { console.log(gray(char.repeat(len))); }
 
 // ─── 工具函数 ───────────────────────────────────────────────────────────────
@@ -111,6 +119,42 @@ function runCommand(cmd, args, options = {}) {
   });
 }
 
+function buildOpenclawInstallEnv() {
+  // On some Windows machines node-llama-cpp postinstall fails while cloning llama.cpp.
+  // OpenClaw works with hosted providers; skip local llama.cpp download to improve install success.
+  if (process.platform === "win32") {
+    return { ...process.env, NODE_LLAMA_CPP_SKIP_DOWNLOAD: "true" };
+  }
+  return process.env;
+}
+
+async function installOpenclawWithFallback() {
+  const env = buildOpenclawInstallEnv();
+  const attempts = [
+    {
+      label: "官方源（原生）",
+      args: ["install", "-g", "openclaw@latest"],
+    },
+    {
+      label: "国内镜像（fallback）",
+      args: ["install", "-g", "openclaw@latest", "--registry", "https://registry.npmmirror.com"],
+    },
+  ];
+
+  let lastErr = null;
+  for (const attempt of attempts) {
+    console.log(dim(`  尝试 ${attempt.label} 安装 OpenClaw...\n`));
+    try {
+      await runCommand("npm", attempt.args, { env });
+      return;
+    } catch (e) {
+      lastErr = e;
+      console.log(yellow(`  ! ${attempt.label} 失败: ${e.message}\n`));
+    }
+  }
+  throw lastErr || new Error("OpenClaw 安装失败");
+}
+
 function checkTool(cmd) {
   try { execSync(`${cmd} --version`, { stdio: "ignore" }); return true; } catch { return false; }
 }
@@ -232,7 +276,7 @@ ${bold(cyan("  ╚════════════════════
   if (ocVersion) {
     console.log(green(`  ✓ OpenClaw 已安装 (${ocVersion})`));
   } else {
-    console.log(dim("  正在安装 OpenClaw（首次安装约 80MB+，使用国内镜像加速）...\n"));
+    console.log(dim("  正在安装 OpenClaw（优先官方源，失败自动切换镜像）...\n"));
     // 临时覆盖 git url rewrite（强制 SSH 协议转 HTTPS，覆盖两种格式）
     const gitRewrites = [
       ["url.https://github.com/.insteadOf", "git@github.com:"],
@@ -247,14 +291,12 @@ ${bold(cyan("  ╚════════════════════
     }
 
     try {
-      await runCommand("npm", [
-        "install", "-g", "openclaw@latest",
-        "--registry", "https://registry.npmmirror.com",
-      ]);
+      await installOpenclawWithFallback();
       console.log(green("\n  ✓ OpenClaw 安装完成"));
     } catch {
       console.error(red("\n  ✗ OpenClaw 安装失败，请手动运行:"));
-      console.error(gray("    npm install -g openclaw@latest --registry https://registry.npmmirror.com\n"));
+      console.error(gray("    npm install -g openclaw@latest"));
+      console.error(gray("    或 npm install -g openclaw@latest --registry https://registry.npmmirror.com\n"));
       process.exit(1);
     } finally {
       // 还原 git 配置
@@ -382,8 +424,9 @@ async function cmdSetup() {
   let defaultModel = null;
 
   if (regionIdx === 0) {
+    printQwenCodingPlanGuide();
     const cnIdx = await askChoice("选择国产模型", [
-      { label: "通义千问 Qwen",          desc: "qwen-max — 免费额度多，支持 OAuth 扫码", recommended: true },
+      { label: "通义千问 Qwen（推荐）",  desc: "最稳妥：阿里 Coding Plan 路径，支持 OAuth 扫码", recommended: true },
       { label: "MiniMax",               desc: "MiniMax-M2.1 — 200K 上下文，支持 OAuth 扫码" },
       { label: "豆包 Doubao（火山引擎）", desc: "doubao-seed-1-8 / GLM-4.7 / Kimi-K2.5" },
       { label: "Kimi（Moonshot AI）",    desc: "kimi-k2.5 — 256K 上下文" },
@@ -397,18 +440,34 @@ async function cmdSetup() {
         { label: "DashScope API Key", desc: "从 dashscope.aliyun.com 获取" },
       ]);
       if (m === 0) {
-        console.log(gray("\n  浏览器即将打开，扫码登录通义千问...\n"));
+        console.log(gray("\n  浏览器即将打开，扫码登录通义千问（qwen-portal）...\n"));
         const doLogin = await askYesNo("  现在执行登录？", true);
         if (doLogin) {
           try {
             await runCommand("openclaw", ["models", "auth", "login", "--provider", "qwen-portal"]);
             console.log(green("\n  ✓ Qwen OAuth 登录成功"));
+            defaultModel = "qwen-portal/qwen-max";
+            newConfig = deepMerge(newConfig, { agents: { defaults: { model: { primary: "qwen-portal/qwen-max" } } } });
           } catch {
-            console.log(yellow("\n  ! 稍后可手动运行: openclaw models auth login --provider qwen-portal"));
+            console.log(yellow("\n  ! Qwen OAuth 登录失败"));
+            console.log(gray("  你可以稍后手动运行: openclaw models auth login --provider qwen-portal"));
+            const useKey = await askYesNo("  改用 DashScope API Key 方式继续配置？", true);
+            if (useKey) {
+              const key = await ask("\n  请输入 DashScope API Key (sk-...): ");
+              if (key) {
+                newEnv["DASHSCOPE_API_KEY"] = key;
+                defaultModel = "dashscope/qwen-plus";
+                newConfig = deepMerge(newConfig, {
+                  models: { providers: { dashscope: { baseUrl: "https://dashscope.aliyuncs.com/compatible-mode/v1", apiKey: key, api: "openai-completions", models: [{ id: "qwen-plus", name: "Qwen Plus", contextWindow: 128000, maxTokens: 8192 }] } } },
+                  agents: { defaults: { model: { primary: "dashscope/qwen-plus" } } },
+                });
+                console.log(green("  ✓ 已保存"));
+              }
+            }
           }
+        } else {
+          console.log(dim("  已跳过 OAuth 登录，可稍后执行：openclaw models auth login --provider qwen-portal"));
         }
-        defaultModel = "qwen-portal/qwen-max";
-        newConfig = deepMerge(newConfig, { agents: { defaults: { model: { primary: "qwen-portal/qwen-max" } } } });
       } else {
         const key = await ask("\n  请输入 DashScope API Key (sk-...): ");
         if (key) {
@@ -433,12 +492,37 @@ async function cmdSetup() {
           try {
             await runCommand("openclaw", ["models", "auth", "login", "--provider", "minimax"]);
             console.log(green("\n  ✓ MiniMax OAuth 登录成功"));
+            defaultModel = "minimax/MiniMax-M2.5";
+            newConfig = deepMerge(newConfig, { agents: { defaults: { model: { primary: "minimax/MiniMax-M2.5" } } } });
           } catch {
-            console.log(yellow("\n  ! 稍后可手动运行: openclaw models auth login --provider minimax"));
+            console.log(yellow("\n  ! MiniMax OAuth 登录失败"));
+            const fallbackIdx = await askChoice("请选择后续处理", [
+              { label: "切换到 Qwen（推荐）", desc: "按阿里 Coding Plan 路径继续，成功率更高", recommended: true },
+              { label: "改用 MiniMax API Key", desc: "手动填写 API Key 继续配置" },
+              { label: "稍后手动处理", desc: "先完成安装，后续再配置模型" },
+            ]);
+            if (fallbackIdx === 0) {
+              printQwenCodingPlanGuide();
+              defaultModel = "qwen-portal/qwen-max";
+              newConfig = deepMerge(newConfig, { agents: { defaults: { model: { primary: "qwen-portal/qwen-max" } } } });
+            } else if (fallbackIdx === 1) {
+              const key = await ask("\n  请输入 MiniMax API Key: ");
+              if (key) {
+                newEnv["MINIMAX_API_KEY"] = key;
+                defaultModel = "minimax/MiniMax-M2.5";
+                newConfig = deepMerge(newConfig, {
+                  models: { providers: { minimax: { baseUrl: "https://api.minimax.chat/v1", apiKey: key, api: "openai-completions", models: [{ id: "MiniMax-M2.5", name: "MiniMax M2.5", contextWindow: 200000, maxTokens: 16384 }] } } },
+                  agents: { defaults: { model: { primary: "minimax/MiniMax-M2.5" } } },
+                });
+                console.log(green("  ✓ 已保存"));
+              }
+            } else {
+              console.log(dim("  已跳过模型配置，可稍后执行：openclaw models auth login --provider minimax"));
+            }
           }
+        } else {
+          console.log(dim("  已跳过 MiniMax 登录，可稍后执行：openclaw models auth login --provider minimax"));
         }
-        defaultModel = "minimax/MiniMax-M2.5";
-        newConfig = deepMerge(newConfig, { agents: { defaults: { model: { primary: "minimax/MiniMax-M2.5" } } } });
       } else {
         const key = await ask("\n  请输入 MiniMax API Key: ");
         if (key) {

package/package.json

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