claude360 0.2.1 → 0.2.3

package/src/mcp-skill.js

@@ -3,82 +3,277 @@
 
 import { sanitizeText } from "./sanitize.js";
 import { spawn } from "node:child_process";
-import { copyFile, mkdir, readFile, writeFile } from "node:fs/promises";
+import { copyFile, cp, mkdir, readFile, stat, writeFile } from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 
+import { createBackup } from "./backup.js";
+import { upsertTomlTable, validateBasicToml } from "./tool-launcher.js";
+
 // ──────────────────────────────────────────────
-// 推荐 MCP（通过官方 `claude mcp add --scope user` 安装，修改 ~/.claude.json）
+// 推荐 MCP（PRD 6.6）：Claude Code 通过官方 `claude mcp add --scope user`
+// 安装（修改 ~/.claude.json）；Codex 写入 ~/.codex/config.toml [mcp_servers.*]。
+// 默认推荐 Context7 / Open Web Search / DeepWiki；Playwright、Serena 依赖较重，
+// 安装前单独确认。全部可跳过、失败不阻塞主流程、不重复安装同名 MCP。
 // ──────────────────────────────────────────────
 
 export const RECOMMENDED_MCPS = [
   {
     id: "context7",
-    label: "Context7        官方文档查询，推荐",
-    args: ["mcp", "add", "--scope", "user", "context7", "--", "npx", "-y", "@upstash/context7-mcp"],
+    label: "Context7 文档查询",
+    desc: "查询最新库文档和代码示例",
+    recommended: true,
+    claudeArgs: ["mcp", "add", "--scope", "user", "context7", "--", "npx", "-y", "@upstash/context7-mcp"],
+    codex: { command: "npx", args: ["-y", "@upstash/context7-mcp"] },
   },
   {
-    id: "playwright",
-    label: "Playwright      浏览器自动化，推荐",
-    args: ["mcp", "add", "--scope", "user", "playwright", "--", "npx", "-y", "@playwright/mcp@latest"],
+    id: "open-websearch",
+    label: "Open Web Search 网页搜索",
+    desc: "使用搜索引擎进行网页搜索",
+    recommended: true,
+    claudeArgs: ["mcp", "add", "--scope", "user", "open-websearch", "--", "npx", "-y", "open-websearch@latest"],
+    codex: { command: "npx", args: ["-y", "open-websearch@latest"] },
+  },
+  {
+    id: "spec-workflow",
+    label: "Spec 工作流",
+    desc: "规范化特性开发流程",
+    claudeArgs: ["mcp", "add", "--scope", "user", "spec-workflow", "--", "npx", "-y", "@pimzino/spec-workflow-mcp@latest"],
+    codex: { command: "npx", args: ["-y", "@pimzino/spec-workflow-mcp@latest"] },
   },
   {
     id: "deepwiki",
-    label: "DeepWiki        GitHub 仓库文档查询",
-    args: ["mcp", "add", "--scope", "user", "--transport", "http", "deepwiki", "https://mcp.deepwiki.com/mcp"],
+    label: "DeepWiki 仓库文档",
+    desc: "查询 GitHub 仓库文档",
+    recommended: true,
+    claudeArgs: ["mcp", "add", "--scope", "user", "--transport", "http", "deepwiki", "https://mcp.deepwiki.com/mcp"],
+    codex: { command: "npx", args: ["-y", "mcp-deepwiki@latest"] },
   },
   {
-    id: "open-websearch",
-    label: "Open Web Search 网络搜索",
-    args: ["mcp", "add", "--scope", "user", "open-websearch", "--", "npx", "-y", "open-websearch@latest"],
+    id: "playwright",
+    label: "Playwright 浏览器控制",
+    desc: "浏览器自动化操作",
+    heavy: "需要下载浏览器内核，占用磁盘较大",
+    claudeArgs: ["mcp", "add", "--scope", "user", "playwright", "--", "npx", "-y", "@playwright/mcp@latest"],
+    codex: { command: "npx", args: ["-y", "@playwright/mcp@latest"] },
+  },
+  {
+    id: "exa",
+    label: "Exa AI 搜索",
+    desc: "AI 搜索能力（需自备 EXA_API_KEY）",
+    claudeArgs: ["mcp", "add", "--scope", "user", "exa", "--", "npx", "-y", "exa-mcp-server"],
+    codex: { command: "npx", args: ["-y", "exa-mcp-server"] },
+  },
+  {
+    id: "serena",
+    label: "Serena 助手",
+    desc: "语义代码检索与编辑助手",
+    heavy: "依赖 Python uv 工具链",
+    claudeArgs: ["mcp", "add", "--scope", "user", "serena", "--", "uvx", "--from", "git+https://github.com/oraios/serena", "serena", "start-mcp-server"],
+    codex: { command: "uvx", args: ["--from", "git+https://github.com/oraios/serena", "serena", "start-mcp-server"] },
   },
 ];
 
+export function resolveClaudeJsonPath({ homedir = os.homedir } = {}) {
+  return path.join(homedir(), ".claude.json");
+}
+
+// 已安装的 Claude Code 用户级 MCP（读取 ~/.claude.json 的 mcpServers 键）
+export async function readInstalledClaudeMcps({
+  claudeJsonPath = resolveClaudeJsonPath(),
+  fs = { readFile },
+} = {}) {
+  const content = await readFileIfExists(fs.readFile, claudeJsonPath);
+  if (content.trim() === "") {
+    return [];
+  }
+  try {
+    const json = JSON.parse(content);
+    return Object.keys(json?.mcpServers || {});
+  } catch {
+    return [];
+  }
+}
+
+// 多选推荐 MCP；已安装项展示为「已安装」且不可重复安装（PRD 6.6）
+async function selectMcps({ multiSelect, installedIds, writeLine }) {
+  const choices = RECOMMENDED_MCPS.map((mcp) => ({
+    label: `${mcp.label}${installedIds.includes(mcp.id) ? "（已安装）" : ""}`,
+    value: mcp.id,
+    hint: mcp.desc,
+  }));
+  const preselected = RECOMMENDED_MCPS
+    .filter((mcp) => mcp.recommended && !installedIds.includes(mcp.id))
+    .map((mcp) => mcp.id);
+  const selected = await multiSelect({
+    message: "请选择要安装的 MCP 服务（默认推荐 Context7 / Open Web Search / DeepWiki）：",
+    choices,
+    preselected,
+  });
+  const fresh = [];
+  for (const id of selected) {
+    if (installedIds.includes(id)) {
+      writeLine(`已安装，跳过：${id}`);
+      continue;
+    }
+    fresh.push(RECOMMENDED_MCPS.find((mcp) => mcp.id === id));
+  }
+  return fresh;
+}
+
+// 重依赖（Playwright / Serena 等）逐项单独确认
+async function confirmHeavyMcps(mcps, confirm, writeLine) {
+  const approved = [];
+  for (const mcp of mcps) {
+    if (!mcp.heavy) {
+      approved.push(mcp);
+      continue;
+    }
+    const ok = await confirm(`${mcp.label} 依赖较重（${mcp.heavy}），确认安装？`);
+    if (ok) {
+      approved.push(mcp);
+    } else {
+      writeLine(`已跳过 ${mcp.id}。`);
+    }
+  }
+  return approved;
+}
+
 export async function installRecommendedMcps({
-  promptSelect,
+  multiSelect,
   confirm,
   execCommand = defaultExec,
   writeLine = console.log,
+  claudeJsonPath = resolveClaudeJsonPath(),
+  fs = { readFile },
 } = {}) {
-  if (typeof promptSelect !== "function" || typeof confirm !== "function") {
+  if (typeof multiSelect !== "function" || typeof confirm !== "function") {
     throw new Error("缺少交互输入");
   }
+  const installedIds = await readInstalledClaudeMcps({ claudeJsonPath, fs });
+  const fresh = await selectMcps({ multiSelect, installedIds, writeLine });
+  if (fresh.length === 0) {
+    writeLine("已跳过 MCP 安装。");
+    return [];
+  }
+  const approved = await confirmHeavyMcps(fresh, confirm, writeLine);
+  if (approved.length === 0) {
+    writeLine("已跳过 MCP 安装。");
+    return [];
+  }
+
+  writeLine([
+    "即将通过 Claude Code 官方命令安装以下 MCP（修改 ~/.claude.json 用户级配置）：",
+    ...approved.map((mcp) => `  claude ${mcp.claudeArgs.join(" ")}`),
+  ].join("\n"));
+  if (!(await confirm("是否继续？"))) {
+    writeLine("已取消 MCP 安装。");
+    return [];
+  }
+
   const installed = [];
-  while (true) {
-    const choices = [
-      ...RECOMMENDED_MCPS.map((mcp) => ({
-        label: installed.includes(mcp.id) ? `${mcp.label}（本次已安装）` : mcp.label,
-        value: mcp.id,
-      })),
-      { label: "完成 / 跳过", value: "done" },
-    ];
-    const selected = await promptSelect("推荐 MCP（安装会修改 ~/.claude.json 的用户级 MCP 配置）", choices);
-    if (selected === "done") {
-      break;
-    }
-    const mcp = RECOMMENDED_MCPS.find((item) => item.id === selected);
-    if (!mcp) {
-      continue;
-    }
-    const commandText = `claude ${mcp.args.join(" ")}`;
-    const approved = await confirm(
-      `即将执行：${commandText}\n影响范围：在 Claude Code 用户级配置（~/.claude.json）中添加 MCP ${mcp.id}。\n是否继续？`,
-    );
-    if (!approved) {
-      writeLine(`已跳过 ${mcp.id}。`);
-      continue;
-    }
-    const result = await execCommand("claude", mcp.args);
+  for (const mcp of approved) {
+    writeLine(`正在安装 MCP：${mcp.label}...`);
+    const result = await execCommand("claude", mcp.claudeArgs);
     if (result.ok) {
       installed.push(mcp.id);
       writeLine(`✓ 已安装 MCP：${mcp.id}`);
     } else {
-      writeLine(`× 安装 ${mcp.id} 失败：${sanitizeText(result.stderr || result.error || "未知错误")}\n安装失败不影响 Claude360 API 调用，可稍后重试。`);
+      writeLine([
+        `× 安装 ${mcp.id} 失败`,
+        "",
+        `原因：${sanitizeText(result.stderr || result.error || "未知错误")}`,
+        "",
+        "建议：",
+        "1. 检查网络",
+        "2. 使用国内 npm 镜像",
+        "3. 稍后重试（安装失败不影响 Claude360 API 调用）",
+      ].join("\n"));
     }
   }
   return installed;
 }
 
+// ──────────────────────────────────────────────
+// Codex 推荐 MCP：写入 ~/.codex/config.toml 的 [mcp_servers.*] 表，
+// 写入前备份并做 TOML 校验，校验失败不落盘（PRD 6.6 / 8 章）
+// ──────────────────────────────────────────────
+
+export async function readInstalledCodexMcps({
+  codexDir = resolveCodexUserDir(),
+  fs = { readFile },
+} = {}) {
+  const content = await readFileIfExists(fs.readFile, path.join(codexDir, "config.toml"));
+  const ids = [];
+  for (const match of content.matchAll(/^\s*\[mcp_servers\.([A-Za-z0-9_-]+)\]\s*$/gm)) {
+    ids.push(match[1]);
+  }
+  return ids;
+}
+
+function escapeTomlString(value) {
+  return String(value).replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+}
+
+export function buildCodexMcpTable(mcp) {
+  const args = mcp.codex.args.map((arg) => `"${escapeTomlString(arg)}"`).join(", ");
+  return [
+    `[mcp_servers.${mcp.id}]`,
+    `command = "${escapeTomlString(mcp.codex.command)}"`,
+    `args = [${args}]`,
+  ];
+}
+
+export async function installCodexMcps({
+  multiSelect,
+  confirm,
+  writeLine = console.log,
+  codexDir = resolveCodexUserDir(),
+  fs = { readFile, writeFile, mkdir, copyFile, cp, stat },
+  now,
+} = {}) {
+  if (typeof multiSelect !== "function" || typeof confirm !== "function") {
+    throw new Error("缺少交互输入");
+  }
+  const configPath = path.join(codexDir, "config.toml");
+  const installedIds = await readInstalledCodexMcps({ codexDir, fs });
+  const fresh = await selectMcps({ multiSelect, installedIds, writeLine });
+  if (fresh.length === 0) {
+    writeLine("已跳过 MCP 安装。");
+    return [];
+  }
+  const approved = await confirmHeavyMcps(fresh, confirm, writeLine);
+  if (approved.length === 0) {
+    writeLine("已跳过 MCP 安装。");
+    return [];
+  }
+  if (!(await confirm(`即将在 ${configPath} 中写入 ${approved.map((mcp) => mcp.id).join("、")} 的 MCP 配置（写入前备份）。\n是否继续？`))) {
+    writeLine("已取消 MCP 安装。");
+    return [];
+  }
+
+  let content = await readFileIfExists(fs.readFile, configPath);
+  for (const mcp of approved) {
+    content = upsertTomlTable(content, `mcp_servers.${mcp.id}`, buildCodexMcpTable(mcp));
+  }
+  content = `${content.trimEnd()}\n`;
+  const tomlError = validateBasicToml(content);
+  if (tomlError) {
+    writeLine(`× 生成的 Codex 配置 TOML 校验失败：${tomlError}\n已放弃写入，原配置保持不变。`);
+    return [];
+  }
+  const { backupDir } = await createBackup({ baseDir: codexDir, paths: [configPath], fs, now });
+  if (backupDir) {
+    writeLine(`✓ 已创建备份：${backupDir}`);
+  }
+  await fs.mkdir(codexDir, { recursive: true });
+  await fs.writeFile(configPath, content, "utf8");
+  for (const mcp of approved) {
+    writeLine(`✓ 已安装 MCP：${mcp.id}`);
+  }
+  return approved.map((mcp) => mcp.id);
+}
+
 // ──────────────────────────────────────────────
 // 标记区块：幂等写入公共 Markdown 文件
 // ──────────────────────────────────────────────
@@ -277,17 +472,38 @@ export async function installCodexAgents({
 export async function listInstalledEnhancements({
   claudeDir = resolveClaudeUserDir(),
   codexDir = resolveCodexUserDir(),
+  claudeJsonPath = resolveClaudeJsonPath(),
   fs = { readFile },
 } = {}) {
-  const lines = ["已安装增强配置："];
+  const lines = ["已安装增强配置：", ""];
+
+  const claudeMcps = await readInstalledClaudeMcps({ claudeJsonPath, fs });
+  const codexMcps = await readInstalledCodexMcps({ codexDir, fs });
+  lines.push("[MCP]");
+  for (const mcp of RECOMMENDED_MCPS) {
+    const states = [
+      claudeMcps.includes(mcp.id) ? "Claude Code 已安装" : null,
+      codexMcps.includes(mcp.id) ? "Codex 已安装" : null,
+    ].filter(Boolean);
+    lines.push(`- ${mcp.label}：${states.length > 0 ? states.join("，") : "未安装"}`);
+  }
+
+  lines.push("", "[Claude Code 工作流 / Skill]");
   const memory = await readFileIfExists(fs.readFile, path.join(claudeDir, "CLAUDE.md"));
   lines.push(`- Claude360 编程助手规则：${memory.includes("claude360:assistant-rules:start") ? "已安装" : "未安装"}`);
+  lines.push(`- AI 输出语言偏好：${memory.includes("claude360:output-language:start") ? "已配置" : "未配置"}`);
+  lines.push(`- 系统提示词风格：${memory.includes("claude360:prompt-style:start") ? "已配置" : "未配置"}`);
   for (const skill of RECOMMENDED_SKILLS.filter((item) => item.kind === "command")) {
     const content = await readFileIfExists(fs.readFile, path.join(claudeDir, "commands", "claude360", skill.file));
     lines.push(`- ${skill.label}：${content ? "已安装" : "未安装"}`);
   }
+
+  lines.push("", "[Codex]");
   const agents = await readFileIfExists(fs.readFile, path.join(codexDir, "AGENTS.md"));
   lines.push(`- Codex AGENTS 规范：${agents.includes(`claude360:${CODEX_AGENTS_BLOCK_ID}:start`) ? "已安装" : "未安装"}`);
+  lines.push(`- Codex AI 输出语言偏好：${agents.includes("claude360:output-language:start") ? "已配置" : "未配置"}`);
+  const prompts = await readFileIfExists(fs.readFile, path.join(codexDir, "prompts", "workflow.md"));
+  lines.push(`- Codex 六步工作流 prompts：${prompts ? "已安装" : "未安装"}`);
   return lines.join("\n");
 }
 

package/src/menu.js

@@ -15,6 +15,7 @@ const RULE_COLOR = fg(71, 85, 105);      // 分隔线：青灰
 const SECTION_COLOR = fg(34, 211, 238);  // 分区标题：亮青
 const KEY_COLOR = fg(125, 211, 252);     // 选择键：天蓝
 const EXIT_COLOR = fg(248, 113, 113);    // 退出键：红
+const DESC_COLOR = fg(100, 116, 139);    // 功能说明：暗灰
 const MENU_RULE_WIDTH = 46;
 
 export function buildFirstRunMenu() {
@@ -29,13 +30,13 @@ export function buildFirstRunMenu() {
       {
         title: null,
         items: [
-          { key: "1", label: "一键配置 Claude Code", value: "setup_claude" },
-          { key: "2", label: "一键配置 Codex", value: "setup_codex" },
-          { key: "3", label: "同时配置 Claude Code + Codex", value: "setup_both" },
-          { key: "4", label: "仅登录 Claude360 并创建 API Key", value: "login_only" },
-          { key: "5", label: "生成 cc-switch 配置", value: "cc_switch" },
-          { key: "6", label: "打开 Claude360 注册 / 登录页面", value: "open_register" },
-          { key: "Q", label: "退出", value: "exit" },
+          { key: "1", label: "一键配置 Claude Code", value: "setup_claude", desc: "登录并创建 API Key，自动写入 Claude Code 配置" },
+          { key: "2", label: "一键配置 Codex", value: "setup_codex", desc: "登录并创建 API Key，自动写入 Codex 配置" },
+          { key: "3", label: "同时配置 Claude Code + Codex", value: "setup_both", desc: "一次登录，两个工具同时完成接入" },
+          { key: "4", label: "仅登录 Claude360 并创建 API Key", value: "login_only", desc: "只获取 Key，不修改本地工具配置" },
+          { key: "5", label: "生成 cc-switch 配置", value: "cc_switch", desc: "生成可导入 cc-switch 的供应商配置" },
+          { key: "6", label: "打开 Claude360 注册 / 登录页面", value: "open_register", desc: "在浏览器中打开官网注册或登录" },
+          { key: "Q", label: "退出", value: "exit", desc: "退出 claude360 CLI" },
         ],
       },
     ],
@@ -49,34 +50,35 @@ export function buildDailyMenu() {
       {
         title: "快速启动",
         items: [
-          { key: "1", label: "启动 Claude Code", value: "launch_claude" },
-          { key: "2", label: "启动 Codex", value: "launch_codex" },
+          { key: "1", label: "启动 Claude Code", value: "launch_claude", desc: "使用 Claude360 接入配置直接启动" },
+          { key: "2", label: "启动 Codex", value: "launch_codex", desc: "使用 Claude360 接入配置直接启动" },
         ],
       },
       {
         title: "Claude360",
         items: [
-          { key: "3", label: "余额与充值", value: "balance_topup" },
-          { key: "4", label: "创建新的 API Key", value: "create_key" },
-          { key: "5", label: "打开 Claude360 控制台", value: "open_console" },
+          { key: "3", label: "余额与充值", value: "balance_topup", desc: "查看余额用量，支持微信扫码充值" },
+          { key: "4", label: "创建新的 API Key", value: "create_key", desc: "在当前账号下新建一个 API Key" },
+          { key: "5", label: "打开 Claude360 控制台", value: "open_console", desc: "在浏览器中打开网页控制台" },
         ],
       },
       {
         title: "工具配置",
         items: [
-          { key: "6", label: "Claude Code 配置", value: "claude_code_menu" },
-          { key: "7", label: "Codex 配置", value: "codex_menu" },
-          { key: "8", label: "推荐 MCP / Skill", value: "mcp_skill" },
-          { key: "9", label: "生成 cc-switch 配置", value: "cc_switch" },
+          { key: "6", label: "Claude Code 配置", value: "claude_code_menu", desc: "完整初始化、工作流、MCP、模型与记忆配置" },
+          { key: "7", label: "Codex 配置", value: "codex_menu", desc: "完整初始化、Provider、工作流与 MCP 配置" },
+          { key: "8", label: "一键完整初始化", value: "full_init", desc: "Claude Code / Codex 完整初始化向导" },
+          { key: "9", label: "推荐 MCP / Skill", value: "mcp_skill", desc: "安装推荐的 MCP、工作流与 Skill 增强" },
+          { key: "C", label: "生成 cc-switch 配置", value: "cc_switch", desc: "生成可导入 cc-switch 的供应商配置" },
         ],
       },
       {
         title: "维护",
         items: [
-          { key: "A", label: "诊断与修复", value: "diagnostics_menu" },
-          { key: "B", label: "安装或更新工具", value: "install_tools" },
-          { key: "0", label: "重新登录", value: "relogin" },
-          { key: "Q", label: "退出", value: "exit" },
+          { key: "D", label: "诊断与修复", value: "diagnostics_menu", desc: "一键诊断环境与配置问题并尝试修复" },
+          { key: "B", label: "安装或更新工具", value: "install_tools", desc: "安装或升级 Claude Code / Codex / 本 CLI" },
+          { key: "0", label: "重新登录", value: "relogin", desc: "清除本地登录态后重新浏览器授权" },
+          { key: "Q", label: "退出", value: "exit", desc: "退出 claude360 CLI" },
         ],
       },
     ],
@@ -95,12 +97,13 @@ function renderSectionRule(title, color) {
 }
 
 function renderItem(item, color) {
-  const plain = `  ${item.key}. ${item.label}`;
+  const desc = item.desc ? ` - ${item.desc}` : "";
   if (!color) {
-    return plain;
+    return `  ${item.key}. ${item.label}${desc}`;
   }
   const keyColor = item.value === "exit" ? EXIT_COLOR : KEY_COLOR;
-  return `  ${BOLD}${keyColor}${item.key}.${RESET} ${item.label}`;
+  const coloredDesc = desc ? `${DESC_COLOR}${desc}${RESET}` : "";
+  return `  ${BOLD}${keyColor}${item.key}.${RESET} ${item.label}${coloredDesc}`;
 }
 
 export function renderMenu(menu, { color = false } = {}) {
@@ -154,3 +157,64 @@ export async function promptMenu({ menu, promptInput, writeLine = console.log }
     writeLine("选择无效，请重新输入。");
   }
 }
+
+// 多选交互（补充需求 6.5 / 6.6 / 8.4）：数字切换勾选，A 全选，I 反选，
+// 回车确认。返回选中的 value 数组；用户清空全部选项后回车即视为跳过。
+export function renderMultiSelect({ message, choices, selected }) {
+  const lines = [message, ""];
+  choices.forEach((choice, index) => {
+    const mark = selected.has(choice.value) ? "[x]" : "[ ]";
+    const hint = choice.hint ? `   ${choice.hint}` : "";
+    lines.push(`  ${index + 1}. ${mark} ${choice.label}${hint}`);
+  });
+  lines.push("", "  A. 全选   I. 反选   Enter. 确认");
+  return lines.join("\n");
+}
+
+export async function promptMultiSelect({
+  message,
+  choices = [],
+  preselected = [],
+  promptInput,
+  writeLine = console.log,
+} = {}) {
+  if (typeof promptInput !== "function") {
+    throw new Error("缺少多选输入");
+  }
+  const selected = new Set(preselected.filter((value) => choices.some((choice) => choice.value === value)));
+  while (true) {
+    writeLine(renderMultiSelect({ message, choices, selected }));
+    const answer = String(await promptInput("请输入编号（可多个，回车确认）") ?? "").trim();
+    if (answer === "") {
+      return choices.filter((choice) => selected.has(choice.value)).map((choice) => choice.value);
+    }
+    if (answer.toLowerCase() === "a") {
+      choices.forEach((choice) => selected.add(choice.value));
+      continue;
+    }
+    if (answer.toLowerCase() === "i") {
+      choices.forEach((choice) => {
+        if (selected.has(choice.value)) {
+          selected.delete(choice.value);
+        } else {
+          selected.add(choice.value);
+        }
+      });
+      continue;
+    }
+    const tokens = answer.split(/[\s,，]+/).filter(Boolean);
+    const indexes = tokens.map((token) => Number(token) - 1);
+    if (indexes.some((index) => !Number.isInteger(index) || !choices[index])) {
+      writeLine("输入无效，请输入编号、A、I 或直接回车确认。");
+      continue;
+    }
+    for (const index of indexes) {
+      const value = choices[index].value;
+      if (selected.has(value)) {
+        selected.delete(value);
+      } else {
+        selected.add(value);
+      }
+    }
+  }
+}

package/src/token-manager.js

@@ -1,5 +1,45 @@
 import { loadGroups, selectGroup } from "./group-manager.js";
 import { maskSecret } from "./config-store.js";
+import { renderTable } from "./ui.js";
+
+// Key 列表表格（补充需求第 3 节）：多 Key 对比展示，长字段由表格渲染层截断
+export function renderTokenTable(tokens, { width = 0 } = {}) {
+  return renderTable({
+    head: ["序号", "名称", "Key", "分组", "状态", "额度", "过期时间"],
+    rows: tokens.map((token, index) => [
+      String(index + 1),
+      token.name || `Token #${token.id}`,
+      formatTokenKey(token.masked_key || token.key),
+      token.group || "-",
+      formatStatusLabel(token),
+      token.unlimited_quota ? "不限" : String(token.remain_quota ?? 0),
+      formatExpiryLabel(token.expired_time),
+    ]),
+  }, { width });
+}
+
+function formatStatusLabel(token) {
+  if (token.status !== 1) {
+    return "禁用";
+  }
+  const expired = Number(token.expired_time);
+  if (expired > 0 && expired * 1000 < Date.now()) {
+    return "过期";
+  }
+  return "正常";
+}
+
+function formatExpiryLabel(expiredTime) {
+  if (expiredTime === -1 || expiredTime === 0 || expiredTime === undefined || expiredTime === null) {
+    return "永不";
+  }
+  const date = new Date(Number(expiredTime) * 1000);
+  if (Number.isNaN(date.getTime())) {
+    return String(expiredTime);
+  }
+  const pad = (value) => String(value).padStart(2, "0");
+  return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}`;
+}
 
 export async function loadBalance(api) {
   return api.get("/api/cli/me");
@@ -62,6 +102,7 @@ export async function chooseOrCreateToken({
   api,
   promptSelect,
   promptInput = async (_message, defaultValue = "Claude360 CLI") => defaultValue,
+  writeLine,
 } = {}) {
   if (!api) {
     throw new Error("缺少 API client");
@@ -73,9 +114,16 @@ export async function chooseOrCreateToken({
     if (typeof promptSelect !== "function") {
       throw new Error("缺少 Token 选择输入");
     }
+    // 提供 writeLine 时先用表格展示 Key 详情，选项标签保持简短
+    const useTable = typeof writeLine === "function";
+    if (useTable) {
+      writeLine(renderTokenTable(tokens, { width: process.stdout.columns || 0 }));
+    }
     const choices = [
       ...tokens.map((token) => ({
-        label: formatTokenOption(token),
+        label: useTable
+          ? `${token.name || `Token #${token.id}`}（${formatTokenKey(token.masked_key || token.key)}）`
+          : formatTokenOption(token),
         value: token.id,
       })),
       { label: "创建新的 API Key", value: "__create__" },

package/src/tool-launcher.js

@@ -206,7 +206,7 @@ export function buildCodexConfig(content = "", {
   return `${nextContent.trimEnd()}\n`;
 }
 
-function upsertTomlTable(content, tableName, tableLines) {
+export function upsertTomlTable(content, tableName, tableLines) {
   const block = tableLines.join("\n");
   const header = `[${tableName}]`;
 
@@ -233,12 +233,19 @@ function upsertTomlTable(content, tableName, tableLines) {
 }
 
 function upsertProfileModelProvider(content, providerId) {
+  return upsertProfileKey(content, providerId, "model_provider", providerId);
+}
+
+// 在 [profiles.<profileId>] 表内行级 upsert 单个字符串键，不影响表内其他键；
+// 表不存在时在文件末尾追加。
+export function upsertProfileKey(content, profileId, key, value) {
   const lines = content.split(/\r?\n/);
-  const header = `[profiles.${providerId}]`;
+  const header = `[profiles.${profileId}]`;
+  const keyLine = `${key} = "${escapeTomlString(value)}"`;
   const start = lines.findIndex((line) => line.trim() === header);
   if (start === -1) {
     const trimmed = content.trimEnd();
-    return `${trimmed}${trimmed ? "\n\n" : ""}${header}\nmodel_provider = "${escapeTomlString(providerId)}"\n`;
+    return `${trimmed}${trimmed ? "\n\n" : ""}${header}\n${keyLine}\n`;
   }
 
   let end = lines.length;
@@ -250,12 +257,12 @@ function upsertProfileModelProvider(content, providerId) {
   }
 
   const profileLines = lines.slice(start, end);
-  const providerLine = `model_provider = "${escapeTomlString(providerId)}"`;
-  const providerIndex = profileLines.findIndex((line) => /^\s*model_provider\s*=/.test(line));
-  if (providerIndex === -1) {
-    profileLines.splice(1, 0, providerLine);
+  const keyPattern = new RegExp(`^\\s*${key}\\s*=`);
+  const keyIndex = profileLines.findIndex((line) => keyPattern.test(line));
+  if (keyIndex === -1) {
+    profileLines.splice(1, 0, keyLine);
   } else {
-    profileLines[providerIndex] = providerLine;
+    profileLines[keyIndex] = keyLine;
   }
 
   return [