claude360 0.2.8 → 0.3.0

package/src/notices.js

@@ -0,0 +1,33 @@
+// 许可证与更新日志（优化需求 V2.0 §八）：license / changelog 命令展示真实内容，
+// 随 src/ 一起发布，避免占位提示。changelog 命令侧 slice 前 3 条（需求「最多 3 条」）。
+
+export const LICENSE_TEXT = [
+  "MIT License",
+  "",
+  "Copyright (c) 2026 Claude360",
+  "",
+  "Permission is hereby granted, free of charge, to any person obtaining a copy",
+  "of this software and associated documentation files (the \"Software\"), to deal",
+  "in the Software without restriction, including without limitation the rights",
+  "to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
+  "copies of the Software, and to permit persons to whom the Software is",
+  "furnished to do so, subject to the following conditions:",
+  "",
+  "The above copyright notice and this permission notice shall be included in all",
+  "copies or substantial portions of the Software.",
+  "",
+  "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+  "IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
+  "FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
+  "AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
+  "LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
+  "OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
+  "SOFTWARE.",
+].join("\n");
+
+// 更新日志（最近在前）；changelog 命令展示前 3 条（需求 §八「最多 3 条」）。
+export const CHANGELOG_ENTRIES = [
+  "v0.2.9  执行流程视觉重构：任务页 / 步骤编号 / 分割线 / 表格化 / 窄屏卡片降级 / verbose 详细模式",
+  "v0.2.0  充值、诊断、Codex Provider 配置接入统一执行页组件",
+  "v0.1.x  初始版本：浏览器授权登录、API Key 管理、Claude Code · Codex 接入配置",
+];

package/src/onboarding.js

@@ -1,5 +1,10 @@
 import { commandVersion, defaultCheckPathWritable, defaultExecCommand } from "./diagnostics.js";
 import { installOrUpdateTools as defaultInstallOrUpdateTools } from "./tool-installer.js";
+import { colorLevel } from "./colors.js";
+import { createMessenger } from "./messages.js";
+
+// 语义消息器工厂：真实终端着色，测试/管道（writeLine 被替换）下无色。
+const mk = (writeLine) => createMessenger({ writeLine, color: writeLine === console.log ? colorLevel() : 0 });
 
 const MIN_NODE_MAJOR = 18;
 
@@ -8,6 +13,7 @@ export async function ensureEnvironment({
   checkPathWritable = defaultCheckPathWritable,
   writeLine = console.log,
 } = {}) {
+  const msg = mk(writeLine);
   const node = await commandVersion(execCommand, "node", ["--version"]);
   if (!node.ok) {
     throw new Error("未检测到 Node.js。Claude360 CLI 需要 Node.js 18+，请先安装 Node.js LTS 后重新运行。");
@@ -26,10 +32,10 @@ export async function ensureEnvironment({
   const globalDir = prefix.ok ? prefix.stdout.trim() : "";
   const globalNpmWritable = globalDir ? await checkPathWritable(globalDir) : false;
   if (!globalNpmWritable) {
-    writeLine("警告：npm 全局目录可能不可写，安装工具时可能需要修复目录权限或切换到用户级 npm prefix。");
+    msg.warn("npm 全局目录可能不可写，安装工具时可能需要修复目录权限或切换到用户级 npm prefix。");
   }
 
-  writeLine(`环境检查通过：Node ${node.version}，npm ${npm.version}。`);
+  msg.success(`环境检查通过：Node ${node.version}，npm ${npm.version}。`);
   return { node: node.version, npm: npm.version, globalNpmWritable };
 }
 
@@ -44,6 +50,7 @@ export async function guideToolInstall({
     throw new Error("缺少工具选择输入");
   }
 
+  const msg = mk(writeLine);
   const claudeInstalled = (await commandVersion(execCommand, "claude", ["--version"])).ok;
   const codexInstalled = (await commandVersion(execCommand, "codex", ["--version"])).ok;
 
@@ -55,7 +62,7 @@ export async function guideToolInstall({
   ]);
 
   if (selected === "skip") {
-    writeLine("已跳过工具安装，可稍后在主菜单选择“安装或更新工具”。");
+    msg.info("已跳过工具安装，可稍后在主菜单选择“安装或更新工具”。");
     return { skipped: true, targets: [] };
   }
 
@@ -63,11 +70,11 @@ export async function guideToolInstall({
   const results = await installOrUpdateTools({ targets, confirm });
   for (const result of results || []) {
     if (result?.skipped) {
-      writeLine(`已跳过 ${result.target} 安装。`);
+      msg.info(`已跳过 ${result.target} 安装。`);
       continue;
     }
     if (result?.ok === false) {
-      writeLine(`安装 ${result.target} 失败：${result.error || ""}${result.remediation ? `\n建议：${result.remediation}` : ""}`);
+      msg.error(`安装 ${result.target} 失败：${result.error || ""}${result.remediation ? `\n建议：${result.remediation}` : ""}`);
     }
   }
   return { skipped: false, targets, results };

package/src/prompts.js

@@ -20,15 +20,16 @@ import {
 
 import { promptMultiSelect } from "./menu.js";
 
-import { BOLD, RESET, colorLevel, fg, toLevel } from "./colors.js";
+import { BOLD, RESET, colorLevel, theme, toLevel } from "./colors.js";
 
-// 交互配色：按色彩深度 level 现算（真彩色保留 RGB，256 色量化到调色板）。
+// 交互配色：从统一语义主题取色（见 colors.js theme），不再各自硬编码 RGB。
 function palette(level) {
+  const t = theme(level);
   return {
-    cyan: fg(34, 211, 238, level),  // 品牌高亮：选中项
-    red: fg(248, 113, 113, level),  // 危险操作：NO 高亮
-    gray: fg(100, 116, 139, level), // 次要说明 / 未选中项
-    green: fg(74, 222, 128, level), // 完成态答案
+    cyan: t.heading, // 品牌高亮：选中项
+    red: t.error, // 危险操作：NO 高亮
+    gray: t.hint, // 次要说明 / 未选中项
+    green: t.success, // 完成态答案
   };
 }
 

package/src/token-manager.js

@@ -1,32 +1,76 @@
 import { loadGroups, selectGroup } from "./group-manager.js";
 import { maskSecret } from "./config-store.js";
-import { renderTable } from "./ui.js";
+import { renderChoiceTable, renderKeyValueTable, renderTable } from "./ui.js";
 
-// Key 列表表格（补充需求第 3 节）：多 Key 对比展示，长字段由表格渲染层截断
-export function renderTokenTable(tokens, { width = 0 } = {}) {
+// Key 列表表格（补充需求第 3 节）：多 Key 对比展示，长字段由表格渲染层截断。
+// 倍率列从 groups（/api/cli/groups）按 token.group 映射，便于直观对比各 Key 的计费倍率。
+export function renderTokenTable(tokens, { width = 0, groups = [] } = {}) {
+  // 列精简到需求第七节建议的核心 6 列（序号/名称/分组/额度/状态/标记）；
+  // 倍率并入分组列，过期由状态列体现（formatStatusLabel 已含「过期」），
+  // 完整脱敏 Key 在选择项标签与选后摘要展示，不在主表占列。
+  return renderChoiceTable({
+    columns: [
+      ["index", "序号"],
+      ["name", "名称"],
+      ["group", "分组"],
+      ["quota", "额度"],
+      ["status", "状态"],
+      ["mark", "标记"],
+    ],
+    rows: tokens.map((token, index) => ({
+      index: String(index + 1),
+      name: token.name || `Token #${token.id}`,
+      group: appendRatio(token.group, formatGroupRatioLabel(groups, token.group)),
+      quota: token.unlimited_quota ? "不限" : String(token.remain_quota ?? 0),
+      status: formatStatusLabel(token),
+      mark: token.current ? "当前" : "",
+    })),
+  }, { width });
+}
+
+// 分组列追加倍率：default · 1.0x；无倍率（"-"）时仅展示分组名
+function appendRatio(group, ratioLabel) {
+  const name = group || "-";
+  return ratioLabel && ratioLabel !== "-" ? `${name} · ${ratioLabel}` : name;
+}
+
+// 分组倍率展示：以后端 /api/cli/groups 的 ratio 为准；ratio 为 null（如 auto 分组）
+// 或分组未找到时显示 "-"，不杜撰 0.0x。
+function formatGroupRatioLabel(groups, groupName) {
+  const group = (Array.isArray(groups) ? groups : []).find((item) => item?.name === groupName);
+  const ratio = group?.ratio == null ? NaN : Number(group.ratio);
+  if (!Number.isFinite(ratio)) {
+    return "-";
+  }
+  return `${Number.isInteger(ratio) ? ratio.toFixed(1) : String(ratio)}x`;
+}
+
+// 分组表格：创建 Key 时展示各分组的倍率与说明，便于选择前对比。
+export function renderGroupTable(groups, { 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),
-    ]),
+    head: ["分组", "倍率", "说明"],
+    rows: (Array.isArray(groups) ? groups : []).map((group) => {
+      const name = group.display_name || group.name || "-";
+      const ratio = group?.ratio == null ? NaN : Number(group.ratio);
+      const ratioText = Number.isFinite(ratio) ? `${Number.isInteger(ratio) ? ratio.toFixed(1) : String(ratio)}x` : "-";
+      const desc = [
+        group.desc && group.desc !== name ? group.desc : "",
+        group.recommended ? "推荐" : "",
+      ].filter(Boolean).join("  ") || "-";
+      return [name, ratioText, desc];
+    }),
   }, { width });
 }
 
 function formatStatusLabel(token) {
   if (token.status !== 1) {
-    return "禁用";
+    return "❌ 禁用";
   }
   const expired = Number(token.expired_time);
   if (expired > 0 && expired * 1000 < Date.now()) {
-    return "过期";
+    return "⚠️ 过期";
   }
-  return "正常";
+  return "✅ 正常";
 }
 
 function formatExpiryLabel(expiredTime) {
@@ -71,7 +115,7 @@ export const TOKEN_PURPOSES = [
 ];
 
 // 创建新 API Key：选择用途（决定默认名）→ 选择分组（来自后端）→ 创建并返回明文
-export async function createNewToken({ api, promptSelect, promptInput = async (_m, d) => d } = {}) {
+export async function createNewToken({ api, promptSelect, promptInput = async (_m, d) => d, writeLine } = {}) {
   if (!api) {
     throw new Error("缺少 API client");
   }
@@ -80,6 +124,9 @@ export async function createNewToken({ api, promptSelect, promptInput = async (_
   }
   const purpose = await promptSelect("请选择 Key 用途：", TOKEN_PURPOSES);
   const groups = await loadGroups(api);
+  if (typeof writeLine === "function") {
+    writeLine(renderGroupTable(groups, { width: process.stdout.columns || 0 }));
+  }
   const group = await selectGroup({ groups, promptSelect });
   const name = await promptInput("新 API Key 名称", purpose);
   const created = await api.post("/api/cli/tokens", {
@@ -116,8 +163,14 @@ export async function chooseOrCreateToken({
     }
     // 提供 writeLine 时先用表格展示 Key 详情，选项标签保持简短
     const useTable = typeof writeLine === "function";
+    let groups = [];
     if (useTable) {
-      writeLine(renderTokenTable(tokens, { width: process.stdout.columns || 0 }));
+      try {
+        groups = await loadGroups(api);
+      } catch {
+        groups = [];
+      }
+      writeLine(renderTokenTable(tokens, { width: process.stdout.columns || 0, groups }));
     }
     const choices = [
       ...tokens.map((token) => ({
@@ -130,12 +183,18 @@ export async function chooseOrCreateToken({
     ];
     const tokenId = await promptSelect("选择 API Key", choices);
     if (tokenId === "__create__") {
-      return createNewToken({ api, promptSelect, promptInput });
+      return createNewToken({ api, promptSelect, promptInput, writeLine });
     }
     const selected = tokens.find((token) => token.id === tokenId);
     if (!selected) {
       throw new Error("选择的 API Key 无效");
     }
+    if (typeof writeLine === "function") {
+      writeLine("");
+      writeLine("✅ 已选择 API Key");
+      writeLine("");
+      writeLine(renderSelectedTokenSummary(selected, { groups, width: process.stdout.columns || 0 }));
+    }
     const revealed = await api.post(`/api/cli/tokens/${selected.id}/reveal`);
     if (!revealed?.key) {
       throw new Error("未返回 API Key");
@@ -149,7 +208,18 @@ export async function chooseOrCreateToken({
     };
   }
 
-  return createNewToken({ api, promptSelect, promptInput });
+  return createNewToken({ api, promptSelect, promptInput, writeLine });
+}
+
+function renderSelectedTokenSummary(token, { groups = [], width = 0 } = {}) {
+  return renderKeyValueTable([
+    ["名称", token.name || `Token #${token.id}`],
+    ["Key", formatTokenKey(token.masked_key || token.key)],
+    ["分组", token.group || "-"],
+    ["倍率", formatGroupRatioLabel(groups, token.group)],
+    ["状态", formatStatusLabel(token)],
+    ["额度", token.unlimited_quota ? "不限" : String(token.remain_quota ?? 0)],
+  ], { width });
 }
 
 function formatStatus(status) {

package/src/tool-installer.js

@@ -1,5 +1,6 @@
 import { sanitizeText } from "./sanitize.js";
 import { spawn } from "node:child_process";
+import { warningBlock } from "./ui.js";
 
 const TOOL_COMMANDS = {
   claude360: {
@@ -38,6 +39,7 @@ export async function installOrUpdateTools({
   targets,
   confirm,
   execCommand = defaultInstallExec,
+  verbose = false,
 } = {}) {
   if (!Array.isArray(targets) || targets.length === 0) {
     throw new Error("缺少安装或更新目标");
@@ -51,14 +53,17 @@ export async function installOrUpdateTools({
     const install = buildInstallCommand(target);
     const commandText = `${install.command} ${install.args.join(" ")}`;
     const approved = await confirm(
-      `将执行全局 npm 操作：${commandText}\n影响范围：安装或更新 ${install.toolName} 到当前用户 npm 全局目录。\n是否继续？`,
+      warningBlock("即将执行全局 npm 操作", {
+        action: commandText,
+        impact: `当前用户的 npm 全局目录（安装或更新 ${install.toolName}）`,
+      }),
     );
     if (!approved) {
       results.push({ target, skipped: true });
       continue;
     }
 
-    let result = await execCommand(install.command, install.args);
+    let result = await execCommand(install.command, install.args, { verbose });
     let usedMirror = false;
     // 官方源失败时支持国内镜像回退：一次性 --registry 参数重试，不修改用户全局 npm 配置
     if (!result.ok) {
@@ -70,7 +75,7 @@ export async function installOrUpdateTools({
         result = await execCommand(install.command, [
           ...install.args,
           `--registry=${NPM_MIRROR_REGISTRY}`,
-        ]);
+        ], { verbose });
       }
     }
 
@@ -89,12 +94,23 @@ export async function installOrUpdateTools({
   return results;
 }
 
-// 全局包安装可能耗时较久，使用 inherit-stdio 实时显示 npm 进度，且不设超时，
-// 避免被诊断用的短超时执行器（defaultExecCommand）中途 SIGTERM 杀掉。
-function defaultInstallExec(command, args) {
+// 全局包安装可能耗时较久且不设超时，避免被诊断用的短超时执行器
+// （defaultExecCommand）中途 SIGTERM 杀掉。verbose 时 inherit-stdio 实时显示 npm
+// 进度；默认捕获输出，成功只在上层显示摘要，失败时把 stderr 带回供结构化错误展示。
+function defaultInstallExec(command, args, { verbose = false } = {}) {
   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 }));
+    if (verbose) {
+      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 }));
+      return;
+    }
+    let stdout = "";
+    let stderr = "";
+    const child = spawn(command, args, { stdio: ["ignore", "pipe", "pipe"] });
+    child.stdout.on("data", (chunk) => { stdout += chunk; });
+    child.stderr.on("data", (chunk) => { stderr += chunk; });
+    child.on("error", (error) => resolve({ ok: false, error: error.message, stdout, stderr }));
+    child.on("close", (code) => resolve({ ok: code === 0, stdout, stderr }));
   });
 }

package/src/tool-launcher.js

@@ -6,6 +6,12 @@ import { safeErrorMessage } from "./sanitize.js";
 import { copyFile as fsCopyFile, mkdir as fsMkdir, readFile as fsReadFile, writeFile as fsWriteFile } from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
+import { colorLevel } from "./colors.js";
+import { createMessenger } from "./messages.js";
+import { renderDivider, renderKeyValueTable, renderTaskEnd, renderTaskStart, renderTaskStep, warningBlock } from "./ui.js";
+
+// 语义消息器工厂：真实终端着色，测试/管道（writeLine 被替换）下无色。
+const mk = (writeLine) => createMessenger({ writeLine, color: writeLine === console.log ? colorLevel() : 0 });
 
 // Codex 协议兼容性检测：以后端上报为准，CLI 不内置协议判断逻辑
 export async function checkCodexCompat(api) {
@@ -44,9 +50,17 @@ export function resolveCodexConfigPath({ homedir = os.homedir } = {}) {
   return path.join(homedir(), ".codex", "config.toml");
 }
 
+// Codex 0.134.0+ 的 profile（CONFIG_PROFILE_V2）机制：`--profile claude360` 会在
+// 基础配置 config.toml 之上叠加同目录的 claude360.config.toml 覆盖层。profile 专属
+// 键写在这里（顶层键），而不是主 config.toml 的 [profiles.claude360] 表。
+export function resolveCodexProfileConfigPath({ configPath = resolveCodexConfigPath(), profileId = "claude360" } = {}) {
+  return path.join(path.dirname(configPath), `${profileId}.config.toml`);
+}
+
 export async function launchCodex({
   config,
   configPath = resolveCodexConfigPath(),
+  profileConfigPath = resolveCodexProfileConfigPath({ configPath }),
   readFile = fsReadFile,
   writeFile = fsWriteFile,
   mkdir = fsMkdir,
@@ -57,7 +71,7 @@ export async function launchCodex({
   writeLine = () => {},
 } = {}) {
   assertApiKey(config);
-  await configureCodexProvider({ config, configPath, readFile, writeFile, mkdir, copyFile, confirmConflict, writeLine });
+  await configureCodexProvider({ config, configPath, profileConfigPath, readFile, writeFile, mkdir, copyFile, confirmConflict, writeLine });
   return spawnCommand("codex", ["--profile", "claude360"], {
     stdio: "inherit",
     env: {
@@ -70,6 +84,7 @@ export async function launchCodex({
 export async function configureCodexProvider({
   config,
   configPath = resolveCodexConfigPath(),
+  profileConfigPath = resolveCodexProfileConfigPath({ configPath }),
   readFile = fsReadFile,
   writeFile = fsWriteFile,
   mkdir = fsMkdir,
@@ -77,33 +92,88 @@ export async function configureCodexProvider({
   confirmConflict,
   writeLine = () => {},
 } = {}) {
+  writeLine(renderTaskStart("配置 Codex Provider", {
+    intro: ["检查现有配置", "备份配置", "写入 Claude360 Provider", "验证配置"],
+  }));
+  writeLine("");
+  writeLine(renderTaskStep(1, 4, "检查现有配置"));
   const current = await readConfigIfExists(readFile, configPath);
+  const currentProfile = await readConfigIfExists(readFile, profileConfigPath);
   const desired = {
     providerId: "claude360",
     baseUrl: `${normalizeBaseUrl(config.baseUrl)}/v1`,
     envKey: "CLAUDE360_API_KEY",
     wireApi: "responses",
   };
-  await confirmCodexConfigConflict(current, desired, confirmConflict);
+  await confirmCodexConfigConflict({ current, currentProfile, desired, confirmConflict });
+  writeLine(renderKeyValueTable([
+    ["配置文件", configPath],
+    ["Profile 覆盖层", profileConfigPath],
+    ["目标 Provider", desired.providerId],
+  ], { width: process.stdout.columns || 0 }));
+
+  // 基础层（config.toml）：写入 provider 定义，并迁移移除 legacy 的
+  // [profiles.claude360] 表与顶层 profile 选择器（v2 禁止其与 --profile 共存）。
   const content = buildCodexConfig(current, {
     providerId: desired.providerId,
     baseUrl: desired.baseUrl,
     envKey: desired.envKey,
   });
-  const tomlError = validateBasicToml(content);
-  if (tomlError) {
-    throw new Error(`生成的 Codex 配置 TOML 校验失败：${tomlError}`);
+  // 覆盖层（claude360.config.toml）：profile 专属顶层键 model_provider。
+  const profileContent = buildCodexProfileConfig(currentProfile, { providerId: desired.providerId });
+
+  for (const [label, value] of [["config.toml", content], ["claude360.config.toml", profileContent]]) {
+    const tomlError = validateBasicToml(value);
+    if (tomlError) {
+      throw new Error(`生成的 Codex ${label} TOML 校验失败：${tomlError}`);
+    }
   }
+
   await mkdir(path.dirname(configPath), { recursive: true });
-  // 写入前备份原配置（PRD 安全要求）
-  let backupPath = null;
-  if (current !== "") {
-    backupPath = `${configPath}.claude360.bak`;
-    await copyFile(configPath, backupPath);
-    writeLine(`已备份原 Codex 配置到：${backupPath}`);
+  writeLine("");
+  writeLine(renderDivider("section"));
+  writeLine("");
+  writeLine(renderTaskStep(2, 4, "备份配置"));
+  // 写入前备份原配置（PRD 安全要求）：两个文件各自备份
+  const backupPath = await backupIfExists({ copyFile, filePath: configPath, exists: current !== "", writeLine, label: "原 Codex 配置" });
+  const profileBackupPath = await backupIfExists({ copyFile, filePath: profileConfigPath, exists: currentProfile !== "", writeLine, label: "原 Codex profile 配置" });
+  if (!backupPath && !profileBackupPath) {
+    mk(writeLine).info("未发现现有配置，跳过备份。");
   }
+  writeLine("");
+  writeLine(renderDivider("section"));
+  writeLine("");
+  writeLine(renderTaskStep(3, 4, "写入 Claude360 Provider"));
   await writeFile(configPath, content, "utf8");
-  return { content, backupPath };
+  await writeFile(profileConfigPath, profileContent, "utf8");
+  mk(writeLine).success("已写入 model_providers.claude360 与 claude360 profile 覆盖层。");
+  writeLine("");
+  writeLine(renderDivider("section"));
+  writeLine("");
+  writeLine(renderTaskStep(4, 4, "验证配置"));
+  mk(writeLine).success("Codex Provider 配置已通过 TOML 校验。");
+  writeLine("");
+  writeLine(renderTaskEnd("Codex Provider 配置完成", {
+    summary: [
+      ["启动命令", "codex --profile claude360"],
+      ["配置文件", configPath],
+      ["Profile 覆盖层", profileConfigPath],
+      ["Provider", desired.providerId],
+      ["下一步", "\n1. 立即启动 Codex\n2. 返回主菜单"],
+    ],
+  }));
+  return { content, profileContent, backupPath, profileBackupPath };
+}
+
+async function backupIfExists({ copyFile, filePath, exists, writeLine, label }) {
+  const msg = mk(writeLine);
+  if (!exists) {
+    return null;
+  }
+  const backupPath = `${filePath}.claude360.bak`;
+  await copyFile(filePath, backupPath);
+  msg.success(`已备份${label}到：${backupPath}`);
+  return backupPath;
 }
 
 // 真实 TOML 校验（验收 P0-2）：写入 ~/.codex/config.toml 前对合并产物完整 parse，
@@ -120,12 +190,13 @@ export function validateBasicToml(content) {
   }
 }
 
-// 验收 P0-3：provider 与 profile 两类 claude360 块的冲突都必须二次确认，
-// 拒绝时在 mkdir / 备份 / 写入之前抛错，磁盘零改动
-async function confirmCodexConfigConflict(content, desired, confirmConflict) {
+// 验收 P0-3：provider 块（base_url/env_key/wire_api）与 profile 覆盖层的 model_provider
+// 冲突都必须二次确认，拒绝时在 mkdir / 备份 / 写入之前抛错，磁盘零改动。legacy 的
+// [profiles.claude360] 表由迁移逻辑直接移除，不在此处阻塞。
+async function confirmCodexConfigConflict({ current, currentProfile, desired, confirmConflict }) {
   const conflicts = [];
 
-  const providerBlock = extractTableBlock(content, `model_providers.${desired.providerId}`);
+  const providerBlock = extractTableBlock(current, `model_providers.${desired.providerId}`);
   if (providerBlock) {
     const values = parseTomlStringAssignments(providerBlock);
     if (values.base_url && values.base_url !== desired.baseUrl) {
@@ -139,12 +210,9 @@ async function confirmCodexConfigConflict(content, desired, confirmConflict) {
     }
   }
 
-  const profileBlock = extractTableBlock(content, `profiles.${desired.providerId}`);
-  if (profileBlock) {
-    const values = parseTomlStringAssignments(profileBlock);
-    if (values.model_provider && values.model_provider !== desired.providerId) {
-      conflicts.push(`profiles.${desired.providerId}.model_provider: ${values.model_provider} -> ${desired.providerId}`);
-    }
+  const profileValues = parseTomlStringAssignments(topLevelRegion(currentProfile));
+  if (profileValues.model_provider && profileValues.model_provider !== desired.providerId) {
+    conflicts.push(`model_provider: ${profileValues.model_provider} -> ${desired.providerId}`);
   }
 
   if (conflicts.length === 0) {
@@ -154,7 +222,10 @@ async function confirmCodexConfigConflict(content, desired, confirmConflict) {
     throw new Error(`Codex Claude360 配置存在冲突：${conflicts.join("; ")}`);
   }
   const approved = await confirmConflict(
-    `Codex Claude360 配置存在冲突，将覆盖以下字段：\n${conflicts.join("\n")}\n是否继续？`,
+    warningBlock("即将覆盖 Codex Claude360 Provider 配置", {
+      action: `覆盖冲突字段：\n${conflicts.join("\n")}`,
+      impact: "~/.codex/config.toml 与 claude360 profile 覆盖层",
+    }),
   );
   if (!approved) {
     throw new Error(`Codex Claude360 配置存在冲突：${conflicts.join("; ")}`);
@@ -202,7 +273,17 @@ export function buildCodexConfig(content = "", {
     `env_key = "${escapeTomlString(envKey)}"`,
     'wire_api = "responses"',
   ]);
-  nextContent = upsertProfileModelProvider(nextContent, providerId);
+  // 迁移：移除 legacy 的 [profiles.claude360] 表与顶层 profile 选择器。
+  // 新版 Codex 拒绝 `--profile claude360` 与基础配置中的 legacy profile 共存。
+  nextContent = removeTomlTable(nextContent, `profiles.${providerId}`);
+  nextContent = removeTopLevelKeyLine(nextContent, "profile", providerId);
+  return `${nextContent.trimEnd()}\n`;
+}
+
+// 生成 profile 覆盖层（claude360.config.toml）：profile 专属配置以顶层键写入，
+// 由 `codex --profile claude360` 叠加到基础 config.toml 之上。
+export function buildCodexProfileConfig(content = "", { providerId = "claude360" } = {}) {
+  const nextContent = upsertTopLevelKey(content, "model_provider", providerId);
   return `${nextContent.trimEnd()}\n`;
 }
 
@@ -232,22 +313,37 @@ export function upsertTomlTable(content, tableName, tableLines) {
   ].join("\n");
 }
 
-function upsertProfileModelProvider(content, providerId) {
-  return upsertProfileKey(content, providerId, "model_provider", providerId);
+// 在文件顶层区域（首个 [table] 之前）幂等 upsert 单个字符串键：已存在则替换，
+// 不存在则插入到顶层区域末尾，不影响任何 table 块。
+export function upsertTopLevelKey(content, key, value) {
+  const keyLine = `${key} = "${escapeTomlString(value)}"`;
+  const lines = content.split(/\r?\n/);
+  let tableStart = lines.findIndex((line) => /^\s*\[/.test(line));
+  if (tableStart === -1) {
+    tableStart = lines.length;
+  }
+  const keyPattern = new RegExp(`^\\s*${key}\\s*=`);
+  const keyIndex = lines.slice(0, tableStart).findIndex((line) => keyPattern.test(line));
+  if (keyIndex !== -1) {
+    lines[keyIndex] = keyLine;
+    return lines.join("\n");
+  }
+  let insertAt = tableStart;
+  while (insertAt > 0 && lines[insertAt - 1].trim() === "") {
+    insertAt -= 1;
+  }
+  lines.splice(insertAt, 0, keyLine);
+  return lines.join("\n");
 }
 
-// 在 [profiles.<profileId>] 表内行级 upsert 单个字符串键，不影响表内其他键；
-// 表不存在时在文件末尾追加。
-export function upsertProfileKey(content, profileId, key, value) {
+// 移除整个 [tableName] 表块（表头到下一表头 / EOF）。表不存在时原样返回。
+export function removeTomlTable(content, tableName) {
   const lines = content.split(/\r?\n/);
-  const header = `[profiles.${profileId}]`;
-  const keyLine = `${key} = "${escapeTomlString(value)}"`;
+  const header = `[${tableName}]`;
   const start = lines.findIndex((line) => line.trim() === header);
   if (start === -1) {
-    const trimmed = content.trimEnd();
-    return `${trimmed}${trimmed ? "\n\n" : ""}${header}\n${keyLine}\n`;
+    return content;
   }
-
   let end = lines.length;
   for (let index = start + 1; index < lines.length; index += 1) {
     if (/^\s*\[/.test(lines[index])) {
@@ -255,21 +351,29 @@ export function upsertProfileKey(content, profileId, key, value) {
       break;
     }
   }
+  return [...lines.slice(0, start), ...lines.slice(end)].join("\n");
+}
 
-  const profileLines = lines.slice(start, end);
-  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[keyIndex] = keyLine;
+// 移除顶层区域（首个 [table] 之前）中精确匹配 `key = "value"` 的选择器行。
+function removeTopLevelKeyLine(content, key, value) {
+  const lines = content.split(/\r?\n/);
+  let tableStart = lines.findIndex((line) => /^\s*\[/.test(line));
+  if (tableStart === -1) {
+    tableStart = lines.length;
   }
+  const escaped = value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const pattern = new RegExp(`^\\s*${key}\\s*=\\s*"${escaped}"\\s*$`);
+  return lines.filter((line, index) => !(index < tableStart && pattern.test(line))).join("\n");
+}
 
-  return [
-    ...lines.slice(0, start),
-    ...profileLines,
-    ...lines.slice(end),
-  ].join("\n");
+// 返回首个 [table] 之前的顶层区域文本，供 parseTomlStringAssignments 复用。
+function topLevelRegion(content) {
+  const lines = content.split(/\r?\n/);
+  let end = lines.findIndex((line) => /^\s*\[/.test(line));
+  if (end === -1) {
+    end = lines.length;
+  }
+  return lines.slice(0, end).join("\n");
 }
 
 async function readConfigIfExists(readFile, configPath) {