claude360 0.1.0 → 0.1.1

package/README.md

@@ -98,6 +98,9 @@ claude360
 
 关键约束：
 
+- 首次运行（无 `cliToken`）会先做环境检查（Node≥18 / npm / 全局 npm 权限），缺失或版本过低则给出修复指引并中止；不自动安装系统运行时。
+- 环境检查通过后进入工具安装引导（Claude Code / Codex / 两者 / 跳过），已安装的工具会标注，安装失败不阻断后续授权。
+- 授权服务不可用（接口返回 404 或网络不可达）时给出友好提示并退出，已安装工具不受影响，可稍后运行 `claude360 setup` 重新完成授权与 Key 配置。
 - 授权码短期有效；CLI 仅在浏览器无法自动打开时把 `verification_url` 与 `user_code` 输出到终端。
 - 多个 Key 时展示：名称 / 脱敏 Key / 分组 / 状态 / 剩余额度（或无限额度）/ 过期时间。
 - 无 Key 时，CLI 通过 `/api/cli/groups` 拉取分组并按 `display_name（倍率 1.0x）` 风格展示，由用户选择后调用 `POST /api/cli/tokens` 创建。
@@ -296,7 +299,7 @@ claude360-cli/
 │   ├── config-store.js       # 本地配置读写（0600）
 │   ├── diagnostics.js        # 诊断报告
 │   ├── group-manager.js      # 分组与倍率展示（无本地映射）
-│   ├── index.js              # 顶层编排：授权 → Key → 主菜单
+│   ├── index.js              # 顶层编排：环境检查 → 工具引导 → 授权 → Key → 主菜单
 │   ├── menu.js               # 主菜单
 │   ├── platform.js           # 平台路径与能力探测
 │   ├── token-manager.js      # Key 选择 / 创建 / reveal

package/bin/claude360.js

@@ -2,8 +2,10 @@
 
 import { runCli } from "../src/index.js";
 
+const forceSetup = process.argv[2] === "setup";
+
 try {
-  await runCli();
+  await runCli({ forceSetup });
 } catch (error) {
   console.error(error?.message || String(error));
   process.exitCode = 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude360",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Interactive Claude360 CLI for browser auth, API key setup, balance checks, top-up, Claude Code and Codex launch.",
   "type": "module",
   "bin": {

package/src/diagnostics.js

@@ -121,7 +121,7 @@ function detectTerminalQr(platform) {
   return { ok: true, detail: `TTY ${term || "unknown"}` };
 }
 
-async function commandVersion(execCommand, command, args) {
+export async function commandVersion(execCommand, command, args) {
   const result = await execCommand(command, args);
   if (!result.ok) {
     return { ok: false, detail: result.stderr || result.error || "not found" };
@@ -196,7 +196,7 @@ export function defaultExecCommand(command, args, { timeoutMs = 5000 } = {}) {
   });
 }
 
-async function defaultCheckPathWritable(path) {
+export async function defaultCheckPathWritable(path) {
   try {
     await access(path || os.homedir(), constants.W_OK);
     return true;

package/src/index.js

@@ -7,6 +7,7 @@ import { authenticateWithBrowser } from "./auth.js";
 import { createConfigStore } from "./config-store.js";
 import { formatDiagnosticsSummary, runDiagnostics as collectDiagnostics } from "./diagnostics.js";
 import { runMainMenu } from "./menu.js";
+import { ensureEnvironment, guideToolInstall as runToolInstallGuide } from "./onboarding.js";
 import { installOrUpdateTools as installTools } from "./tool-installer.js";
 import { launchClaudeCode as startClaudeCode, launchCodex as startCodex } from "./tool-launcher.js";
 import { runWechatTopUp } from "./topup.js";
@@ -26,16 +27,34 @@ export async function runCli({
   launchCodex = startCodex,
   sleep,
   writeLine = console.log,
+  forceSetup = false,
+  checkEnvironment = ensureEnvironment,
+  guideToolInstall = runToolInstallGuide,
 } = {}) {
   let config = await configStore.load();
   const baseUrl = config.baseUrl || "https://claude360.xyz";
   let api = createApiClient({ baseUrl, cliToken: config.cliToken || "" });
 
-  if (!config.cliToken) {
-    const cliToken = await authWithBrowser({ api, openBrowser, sleep });
-    config = { ...config, baseUrl, cliToken };
-    await configStore.save(config);
-    api = createApiClient({ baseUrl, cliToken });
+  const needsOnboarding = forceSetup || !config.cliToken;
+  if (needsOnboarding) {
+    await checkEnvironment({ writeLine });
+    await guideToolInstall({ promptSelect, confirm, installOrUpdateTools, writeLine });
+
+    if (!config.cliToken) {
+      let cliToken;
+      try {
+        cliToken = await authWithBrowser({ api, openBrowser, sleep, writeLine });
+      } catch (error) {
+        if (isAuthServiceUnavailable(error)) {
+          writeLine(formatAuthUnavailable());
+          return "auth_unavailable";
+        }
+        throw error;
+      }
+      config = { ...config, baseUrl, cliToken };
+      await configStore.save(config);
+      api = createApiClient({ baseUrl, cliToken });
+    }
   }
 
   if (!config.apiKey) {
@@ -158,3 +177,22 @@ function defaultOpenBrowser(url) {
     child.on("close", () => resolve());
   });
 }
+
+function isAuthServiceUnavailable(error) {
+  if (!error) {
+    return false;
+  }
+  const status = error.status;
+  if (status === 404 || (typeof status === "number" && status >= 500)) {
+    return true;
+  }
+  return /fetch failed|ENOTFOUND|ECONNREFUSED|ECONNRESET|ETIMEDOUT|EAI_AGAIN|getaddrinfo|network/i.test(error.message || "");
+}
+
+function formatAuthUnavailable() {
+  return [
+    "站点 CLI 授权服务暂未就绪（授权接口返回 404 或网络不可达）。",
+    "已安装的工具不受影响；待授权服务可用后，运行 `claude360 setup` 重新完成授权与 API Key 配置。",
+    "可稍后重试，或先检查网络连接与站点状态。",
+  ].join("\n");
+}

package/src/onboarding.js

@@ -0,0 +1,83 @@
+import { commandVersion, defaultCheckPathWritable, defaultExecCommand } from "./diagnostics.js";
+import { installOrUpdateTools as defaultInstallOrUpdateTools } from "./tool-installer.js";
+
+const MIN_NODE_MAJOR = 18;
+
+export async function ensureEnvironment({
+  execCommand = defaultExecCommand,
+  checkPathWritable = defaultCheckPathWritable,
+  writeLine = console.log,
+} = {}) {
+  const node = await commandVersion(execCommand, "node", ["--version"]);
+  if (!node.ok) {
+    throw new Error("未检测到 Node.js。Claude360 CLI 需要 Node.js 18+，请先安装 Node.js LTS 后重新运行。");
+  }
+  const nodeMajor = parseMajorVersion(node.version);
+  if (nodeMajor !== null && nodeMajor < MIN_NODE_MAJOR) {
+    throw new Error(`当前 Node.js 版本为 ${node.version}，低于要求的 18。请升级到 Node.js LTS 后重新运行。`);
+  }
+
+  const npm = await commandVersion(execCommand, "npm", ["--version"]);
+  if (!npm.ok) {
+    throw new Error("未检测到 npm。请安装 npm 或修复 Node.js 安装后重新运行。");
+  }
+
+  const prefix = await execCommand("npm", ["prefix", "-g"]);
+  const globalDir = prefix.ok ? prefix.stdout.trim() : "";
+  const globalNpmWritable = globalDir ? await checkPathWritable(globalDir) : false;
+  if (!globalNpmWritable) {
+    writeLine("警告：npm 全局目录可能不可写，安装工具时可能需要修复目录权限或切换到用户级 npm prefix。");
+  }
+
+  writeLine(`环境检查通过：Node ${node.version}，npm ${npm.version}。`);
+  return { node: node.version, npm: npm.version, globalNpmWritable };
+}
+
+export async function guideToolInstall({
+  execCommand = defaultExecCommand,
+  promptSelect,
+  confirm,
+  installOrUpdateTools = defaultInstallOrUpdateTools,
+  writeLine = console.log,
+} = {}) {
+  if (typeof promptSelect !== "function") {
+    throw new Error("缺少工具选择输入");
+  }
+
+  const claudeInstalled = (await commandVersion(execCommand, "claude", ["--version"])).ok;
+  const codexInstalled = (await commandVersion(execCommand, "codex", ["--version"])).ok;
+
+  const selected = await promptSelect("选择要安装的工具（可跳过，稍后也能在主菜单安装）", [
+    { label: withInstalledTag("仅 Claude Code", claudeInstalled), value: "claude" },
+    { label: withInstalledTag("仅 Codex", codexInstalled), value: "codex" },
+    { label: "Claude Code 和 Codex", value: "all" },
+    { label: "跳过", value: "skip" },
+  ]);
+
+  if (selected === "skip") {
+    writeLine("已跳过工具安装，可稍后在主菜单选择“安装或更新工具”。");
+    return { skipped: true, targets: [] };
+  }
+
+  const targets = selected === "all" ? ["claude", "codex"] : [selected];
+  const results = await installOrUpdateTools({ targets, confirm });
+  for (const result of results || []) {
+    if (result?.skipped) {
+      writeLine(`已跳过 ${result.target} 安装。`);
+      continue;
+    }
+    if (result?.ok === false) {
+      writeLine(`安装 ${result.target} 失败：${result.error || ""}${result.remediation ? `\n建议：${result.remediation}` : ""}`);
+    }
+  }
+  return { skipped: false, targets, results };
+}
+
+function withInstalledTag(label, installed) {
+  return installed ? `${label}（已安装，可更新）` : label;
+}
+
+function parseMajorVersion(version) {
+  const match = String(version || "").match(/(\d+)/);
+  return match ? Number(match[1]) : null;
+}

package/src/tool-installer.js

@@ -1,4 +1,4 @@
-import { defaultExecCommand } from "./diagnostics.js";
+import { spawn } from "node:child_process";
 
 const TOOL_COMMANDS = {
   claude360: {
@@ -34,7 +34,7 @@ export function buildInstallCommand(target) {
 export async function installOrUpdateTools({
   targets,
   confirm,
-  execCommand = defaultExecCommand,
+  execCommand = defaultInstallExec,
 } = {}) {
   if (!Array.isArray(targets) || targets.length === 0) {
     throw new Error("缺少安装或更新目标");
@@ -69,3 +69,13 @@ export async function installOrUpdateTools({
   }
   return results;
 }
+
+// 全局包安装可能耗时较久，使用 inherit-stdio 实时显示 npm 进度，且不设超时，
+// 避免被诊断用的短超时执行器（defaultExecCommand）中途 SIGTERM 杀掉。
+function defaultInstallExec(command, args) {
+  return new Promise((resolve) => {
+    const child = spawn(command, args, { stdio: "inherit" });
+    child.on("error", (error) => resolve({ ok: false, error: error.message }));
+    child.on("close", (code) => resolve({ ok: code === 0 }));
+  });
+}