claude360 0.1.1 → 0.2.0

package/src/cc-switch.js

@@ -0,0 +1,206 @@
+// cc-switch 配置生成：根据当前账号 Key 与 Base URL 生成可复制到 cc-switch
+// 的配置 JSON。本模块不安装、不启动、不写入 cc-switch 自身的配置目录。
+
+import { chmod, mkdir, writeFile } from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+
+function normalizeBaseUrl(baseUrl = "https://claude360.xyz") {
+  return String(baseUrl).replace(/\/+$/, "");
+}
+
+export function buildClaudeCodeCcSwitchConfig({ baseUrl, apiKey } = {}) {
+  const root = normalizeBaseUrl(baseUrl);
+  return {
+    name: "Claude360",
+    type: "claude-code",
+    base_url: root,
+    api_key: apiKey,
+    env: {
+      ANTHROPIC_BASE_URL: root,
+      ANTHROPIC_AUTH_TOKEN: apiKey,
+    },
+  };
+}
+
+export function buildCodexCcSwitchConfig({ baseUrl, apiKey } = {}) {
+  const root = normalizeBaseUrl(baseUrl);
+  return {
+    name: "Claude360",
+    type: "codex",
+    base_url: `${root}/v1`,
+    api_key: apiKey,
+    env: {
+      CLAUDE360_API_KEY: apiKey,
+    },
+    provider: {
+      name: "Claude360",
+      base_url: `${root}/v1`,
+      env_key: "CLAUDE360_API_KEY",
+      wire_api: "responses",
+    },
+    profile: {
+      model_provider: "claude360",
+    },
+  };
+}
+
+export function buildComboCcSwitchConfig({ baseUrl, apiKey } = {}) {
+  const claude = buildClaudeCodeCcSwitchConfig({ baseUrl, apiKey });
+  const codex = buildCodexCcSwitchConfig({ baseUrl, apiKey });
+  return {
+    name: "Claude360",
+    items: [
+      { ...claude, name: "Claude360 Claude Code" },
+      { ...codex, name: "Claude360 Codex" },
+    ],
+  };
+}
+
+export function buildCcSwitchConfig(target, { baseUrl, apiKey } = {}) {
+  switch (target) {
+    case "claude-code":
+      return buildClaudeCodeCcSwitchConfig({ baseUrl, apiKey });
+    case "codex":
+      return buildCodexCcSwitchConfig({ baseUrl, apiKey });
+    case "both":
+      return buildComboCcSwitchConfig({ baseUrl, apiKey });
+    default:
+      throw new Error(`未知 cc-switch 配置目标：${target}`);
+  }
+}
+
+// 脱敏预览：sk-****abcd（仅用于预览，不可用于实际配置）
+export function maskKeyForPreview(key) {
+  if (!key) {
+    return "";
+  }
+  const text = String(key);
+  const last4 = text.slice(-4);
+  return text.startsWith("sk-") ? `sk-****${last4}` : `****${last4}`;
+}
+
+export function maskCcSwitchConfig(config, apiKey) {
+  const masked = maskKeyForPreview(apiKey);
+  const json = JSON.stringify(config);
+  if (!apiKey) {
+    return JSON.parse(json);
+  }
+  return JSON.parse(json.split(JSON.stringify(apiKey)).join(JSON.stringify(masked)));
+}
+
+export function resolveCcSwitchSavePath({
+  platform = process.platform,
+  env = process.env,
+  homedir = os.homedir,
+} = {}) {
+  if (platform === "win32") {
+    const home = env.USERPROFILE || homedir();
+    return path.win32.join(home, ".claude360", "cc-switch-claude360.json");
+  }
+  return path.posix.join(homedir(), ".claude360", "cc-switch-claude360.json");
+}
+
+export async function saveCcSwitchConfig(config, {
+  savePath = resolveCcSwitchSavePath(),
+  mkdirImpl = mkdir,
+  writeFileImpl = writeFile,
+  chmodImpl = chmod,
+  platform = process.platform,
+} = {}) {
+  const dir = path.dirname(savePath);
+  await mkdirImpl(dir, { recursive: true, mode: 0o700 });
+  await writeFileImpl(savePath, `${JSON.stringify(config, null, 2)}\n`, {
+    encoding: "utf8",
+    mode: 0o600,
+  });
+  if (platform !== "win32") {
+    // mkdir 的 mode 对已存在目录不生效，必须显式收紧（与 config-store 一致）
+    await chmodImpl(dir, 0o700);
+    await chmodImpl(savePath, 0o600);
+  }
+  return savePath;
+}
+
+// 交互流程：选择目标 → 完整/脱敏（完整 Key 输出前二次确认）→ 输出 → 可选保存
+export async function runCcSwitchGenerator({
+  config = {},
+  promptSelect,
+  writeLine = console.log,
+  ensureApiKey,
+  save = saveCcSwitchConfig,
+} = {}) {
+  if (typeof promptSelect !== "function") {
+    throw new Error("缺少菜单选择输入");
+  }
+
+  let apiKey = config.apiKey;
+  if (!apiKey) {
+    writeLine("当前没有可用 API Key，需要先创建 Claude360 API Key。");
+    if (typeof ensureApiKey !== "function") {
+      return { done: false, reason: "no_key" };
+    }
+    const action = await promptSelect("生成 cc-switch 配置", [
+      { label: "创建 API Key", value: "create" },
+      { label: "返回", value: "back" },
+    ]);
+    if (action !== "create") {
+      return { done: false, reason: "no_key" };
+    }
+    const token = await ensureApiKey();
+    apiKey = token?.apiKey;
+    if (!apiKey) {
+      writeLine("未获取到可用 API Key，已取消生成。");
+      return { done: false, reason: "no_key" };
+    }
+  }
+
+  const target = await promptSelect("生成 cc-switch 配置\n请选择配置目标：", [
+    { label: "Claude Code", value: "claude-code" },
+    { label: "Codex", value: "codex" },
+    { label: "Claude Code + Codex", value: "both" },
+    { label: "返回", value: "back" },
+  ]);
+  if (target === "back") {
+    return { done: false, reason: "back" };
+  }
+
+  const fullConfig = buildCcSwitchConfig(target, {
+    baseUrl: config.baseUrl,
+    apiKey,
+  });
+
+  const reveal = await promptSelect(
+    "即将显示完整 API Key。\n请确认当前终端环境安全，避免被他人看到。",
+    [
+      { label: "显示完整配置", value: "full" },
+      { label: "显示脱敏配置", value: "masked" },
+      { label: "返回", value: "back" },
+    ],
+  );
+  if (reveal === "back") {
+    return { done: false, reason: "back" };
+  }
+
+  if (reveal === "masked") {
+    const maskedConfig = maskCcSwitchConfig(fullConfig, apiKey);
+    writeLine(JSON.stringify(maskedConfig, null, 2));
+    writeLine("提示：脱敏配置仅用于预览，无法直接使用，也不会保存到文件。");
+    return { done: true, target, masked: true, saved: false };
+  }
+
+  writeLine(JSON.stringify(fullConfig, null, 2));
+  writeLine("请将以上配置复制到 cc-switch 中使用。");
+
+  const saveChoice = await promptSelect("是否保存到本地文件？", [
+    { label: "保存到 ~/.claude360/cc-switch-claude360.json", value: "save" },
+    { label: "仅在终端显示", value: "skip" },
+  ]);
+  if (saveChoice !== "save") {
+    return { done: true, target, masked: false, saved: false };
+  }
+
+  const savedPath = await save(fullConfig);
+  writeLine(`已保存到：${savedPath}（文件权限 0600）`);
+  return { done: true, target, masked: false, saved: true, savedPath };
+}

package/src/diagnostics.js

@@ -1,13 +1,18 @@
 import { spawn } from "node:child_process";
-import { access } from "node:fs/promises";
+import { access, readFile as fsReadFile } from "node:fs/promises";
 import { constants } from "node:fs";
 import os from "node:os";
 
+import { resolveCodexConfigPath } from "./tool-launcher.js";
+import { sanitizeError, sanitizeText } from "./sanitize.js";
+
 export async function runDiagnostics({
   config = {},
   platform = defaultPlatform(),
   execCommand = defaultExecCommand,
   checkPathWritable = defaultCheckPathWritable,
+  readFile = fsReadFile,
+  codexConfigPath = resolveCodexConfigPath(),
   api,
 } = {}) {
   const node = await commandVersion(execCommand, "node", ["--version"]);
@@ -18,13 +23,16 @@ export async function runDiagnostics({
       ok: await checkPathWritable(npmPrefix.stdout.trim()),
       detail: npmPrefix.stdout.trim(),
     }
-    : { ok: false, detail: npmPrefix.stderr || npmPrefix.error || "npm prefix failed" };
+    : { ok: false, detail: sanitizeText(npmPrefix.stderr || npmPrefix.error || "npm prefix failed") };
   const claudeCode = await commandVersion(execCommand, "claude", ["--version"]);
   const codex = await commandVersion(execCommand, "codex", ["--version"]);
 
+  // 连通性用公开端点判断，避免未登录时把鉴权失败误报成网络故障
+  const serviceStatus = await safeApiGet(api, "/api/status");
   const me = await safeApiGet(api, "/api/cli/me");
   const tokens = await safeApiGet(api, "/api/cli/tokens");
   const topUpOptions = await safeApiGet(api, "/api/cli/topup/options");
+  const codexCompat = await safeApiGet(api, "/api/cli/codex/compat");
 
   return {
     platform: {
@@ -43,23 +51,42 @@ export async function runDiagnostics({
     },
     api: {
       connectivity: {
-        ok: me.ok,
-        detail: me.ok ? (config.baseUrl || "connected") : me.detail,
+        ok: serviceStatus.ok,
+        detail: serviceStatus.ok ? (config.baseUrl || "connected") : serviceStatus.detail,
       },
     },
     auth: {
       ok: Boolean(config.cliToken) && me.ok,
       detail: config.cliToken ? "已授权" : "未授权",
     },
-    balance: {
-      ok: me.ok,
-      detail: me.ok ? String(me.data?.quota ?? "-") : me.detail,
-    },
+    balance: buildBalanceStatus({ me }),
+    usage: buildUsageStatus({ me }),
     token: buildTokenStatus({ config, tokens }),
     topUp: buildTopUpStatus({ topUpOptions }),
+    claudeCodeConfig: buildClaudeCodeConfigStatus({ config, claudeCode }),
+    codexConfig: await buildCodexConfigStatus({ readFile, codexConfigPath, codex }),
+    codexCompat: buildCodexCompatStatus({ codexCompat }),
   };
 }
 
+function buildBalanceStatus({ me }) {
+  if (!me.ok) {
+    return { ok: false, detail: me.detail };
+  }
+  const display = me.data?.balance_display ?? String(me.data?.quota ?? "-");
+  if (me.data?.low_balance) {
+    return { ok: false, warn: true, detail: `${display}（余额较低，建议充值）` };
+  }
+  return { ok: true, detail: display };
+}
+
+function buildUsageStatus({ me }) {
+  if (!me.ok) {
+    return { ok: false, detail: me.detail };
+  }
+  return { ok: true, detail: me.data?.today_usage_display || "-" };
+}
+
 function buildTopUpStatus({ topUpOptions }) {
   if (!topUpOptions.ok) {
     return { ok: false, detail: topUpOptions.detail };
@@ -70,35 +97,85 @@ function buildTopUpStatus({ topUpOptions }) {
   return { ok: true, detail: "可用" };
 }
 
-export function formatDiagnosticsSummary(report) {
-  return [
-    `OS: ${report.platform.os} ${report.platform.arch}`,
-    formatLine("Terminal QR", report.platform.terminalQr, "检查终端是否支持 TTY 输出，无法渲染时复制 code_url 支付"),
-    formatLine("Node", report.runtime.node, "安装 Node.js 18+ 后重新运行 claude360", "version"),
-    formatLine("npm", report.runtime.npm, "安装 npm 或修复 Node.js 安装", "version"),
-    formatLine("Global npm permission", report.runtime.globalNpmPermission, "修复 npm 全局目录权限，或切换到用户级 npm prefix"),
-    formatLine("Claude Code", report.tools.claudeCode, "安装或更新 Claude Code", "version"),
-    formatLine("Codex", report.tools.codex, "安装或更新 Codex", "version"),
-    formatLine("Claude360 API", report.api.connectivity, "检查网络连接和 Claude360 站点可用性"),
-    formatLine("Auth", report.auth, "重新执行浏览器授权"),
-    formatLine("Balance", report.balance, "授权后重试，或登录网站检查账户状态"),
-    formatLine("Token", report.token, "在菜单中切换或创建 API Key"),
-    formatLine("WeChat top-up", report.topUp, "检查后端微信支付配置或稍后重试"),
-  ].join("\n");
-}
-
-function formatLine(label, check, fix, valueKey = "detail") {
-  const line = `${label}: ${formatCheck(check, valueKey)}`;
-  if (check.ok) {
-    return line;
+function buildClaudeCodeConfigStatus({ config, claudeCode }) {
+  if (!claudeCode.ok) {
+    return { ok: false, detail: "Claude Code 未安装" };
+  }
+  if (!config.apiKey) {
+    return { ok: false, detail: "缺少 API Key，启动时无法注入 Claude360 配置" };
   }
-  return `${line} | Fix: ${fix}`;
+  return { ok: true, detail: "启动时注入 ANTHROPIC_BASE_URL / ANTHROPIC_AUTH_TOKEN" };
 }
 
-function formatCheck(check, valueKey = "detail") {
-  const status = check.ok ? "OK" : "FAIL";
-  const value = check[valueKey] || check.detail || "";
-  return `${status}${value ? ` ${value}` : ""}`;
+async function buildCodexConfigStatus({ readFile, codexConfigPath, codex }) {
+  if (!codex.ok) {
+    return { ok: false, detail: "Codex 未安装" };
+  }
+  try {
+    const content = await readFile(codexConfigPath, "utf8");
+    if (content.includes("[model_providers.claude360]") && content.includes("[profiles.claude360]")) {
+      return { ok: true, detail: "profile claude360 正常" };
+    }
+    return { ok: false, detail: "未写入 claude360 provider/profile" };
+  } catch (error) {
+    if (error?.code === "ENOENT") {
+      return { ok: false, detail: "未找到 ~/.codex/config.toml" };
+    }
+    return { ok: false, detail: sanitizeError(error) || "读取 config.toml 失败" };
+  }
+}
+
+function buildCodexCompatStatus({ codexCompat }) {
+  if (!codexCompat.ok) {
+    return { ok: false, warn: true, detail: `Codex 协议兼容性待验证（${codexCompat.detail}）` };
+  }
+  if (!codexCompat.data?.supported) {
+    return { ok: false, detail: "Claude360 暂不支持 Codex 所需协议" };
+  }
+  return { ok: true, detail: `已支持（wire_api=${codexCompat.data?.wire_api || "responses"}）` };
+}
+
+export function formatDiagnosticsSummary(report) {
+  const lines = [];
+  lines.push("系统环境");
+  lines.push(check({ ok: true, detail: `${report.platform.os} ${report.platform.arch}` }, "OS"));
+  lines.push(checkFix(report.runtime.node, "Node.js", "安装 Node.js 18+ 后重新运行 claude360", "version"));
+  lines.push(checkFix(report.runtime.npm, "npm", "安装 npm 或修复 Node.js 安装", "version"));
+  lines.push(checkFix(report.runtime.globalNpmPermission, "全局 npm 权限", "修复 npm 全局目录权限，或切换到用户级 npm prefix"));
+  lines.push(checkFix(report.platform.terminalQr, "终端二维码", "终端不支持时可复制支付链接完成支付"));
+  lines.push("");
+  lines.push("Claude360");
+  lines.push(checkFix(report.api.connectivity, "服务连接", "检查网络连接和 Claude360 站点可用性"));
+  lines.push(checkFix(report.auth, "登录状态", "在菜单中选择“重新登录”完成浏览器授权"));
+  lines.push(checkFix(report.balance, "当前余额", "通过“余额与充值”菜单充值"));
+  lines.push(checkFix(report.usage, "今日用量", "登录后可查看今日 Token 用量"));
+  lines.push(checkFix(report.token, "当前 Key", "在菜单中切换或创建 API Key"));
+  lines.push(checkFix(report.topUp, "微信充值", "检查后端微信支付配置或使用网页充值"));
+  lines.push("");
+  lines.push("Claude Code");
+  lines.push(checkFix(report.tools.claudeCode, "安装状态", "通过菜单安装或更新 Claude Code", "version"));
+  lines.push(checkFix(report.claudeCodeConfig, "Claude360 配置", "在“Claude Code 配置”菜单中修复"));
+  lines.push("");
+  lines.push("Codex");
+  lines.push(checkFix(report.tools.codex, "安装状态", "通过菜单安装或更新 Codex", "version"));
+  lines.push(checkFix(report.codexConfig, "claude360 provider", "在“Codex 配置”菜单中写入/修复"));
+  lines.push(checkFix(report.codexCompat, "协议兼容性", "Codex 暂不可用时可先使用 Claude Code"));
+  // 出口兜底：report 由调用方注入，逐项 detail 可能未经脱敏
+  return sanitizeText(lines.join("\n"));
+}
+
+function check(item, label, valueKey = "detail") {
+  const symbol = item.ok ? "✓" : item.warn ? "!" : "×";
+  const value = item[valueKey] || item.detail || "";
+  return `${symbol} ${label}${value ? `：${value}` : ""}`;
+}
+
+function checkFix(item, label, fix, valueKey = "detail") {
+  const line = check(item, label, valueKey);
+  if (item.ok) {
+    return line;
+  }
+  return `${line}\n  建议：${fix}`;
 }
 
 function defaultPlatform() {
@@ -124,7 +201,7 @@ function detectTerminalQr(platform) {
 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" };
+    return { ok: false, detail: sanitizeText(result.stderr || result.error || "not found") };
   }
   return {
     ok: true,
@@ -139,7 +216,7 @@ async function safeApiGet(api, path) {
   try {
     return { ok: true, data: await api.get(path) };
   } catch (error) {
-    return { ok: false, detail: error?.message || String(error) };
+    return { ok: false, detail: sanitizeError(error) || "请求失败" };
   }
 }
 

package/src/group-manager.js

@@ -1,9 +1,12 @@
 export function formatGroupOption(group) {
   const name = group?.name || "";
   const displayName = group?.display_name || name;
-  const ratio = Number(group?.ratio);
-  const ratioText = Number.isFinite(ratio) ? `（倍率 ${formatRatio(ratio)}x）` : "";
-  return `${displayName} / ${name}${ratioText}`;
+  // ratio 为 null/undefined（如 auto 分组）时不展示倍率，避免把 Number(null)=0 杜撰成 0.0x
+  const ratio = group?.ratio == null ? NaN : Number(group.ratio);
+  const ratioText = Number.isFinite(ratio) ? ` ${formatRatio(ratio)}x` : "";
+  const desc = group?.desc && group.desc !== displayName ? `  ${group.desc}` : "";
+  const recommended = group?.recommended ? "  推荐" : "";
+  return `${displayName}${ratioText}${desc}${recommended}`;
 }
 
 export async function loadGroups(api) {