claude360 0.2.8 → 0.2.9

package/src/tool-launcher.js

@@ -6,6 +6,11 @@ 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";
+
+// 语义消息器工厂：真实终端着色，测试/管道（writeLine 被替换）下无色。
+const mk = (writeLine) => createMessenger({ writeLine, color: writeLine === console.log ? colorLevel() : 0 });
 
 // Codex 协议兼容性检测：以后端上报为准，CLI 不内置协议判断逻辑
 export async function checkCodexCompat(api) {
@@ -44,9 +49,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 +70,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 +83,7 @@ export async function launchCodex({
 export async function configureCodexProvider({
   config,
   configPath = resolveCodexConfigPath(),
+  profileConfigPath = resolveCodexProfileConfigPath({ configPath }),
   readFile = fsReadFile,
   writeFile = fsWriteFile,
   mkdir = fsMkdir,
@@ -78,32 +92,50 @@ export async function configureCodexProvider({
   writeLine = () => {},
 } = {}) {
   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 });
+
+  // 基础层（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}`);
-  }
+  // 写入前备份原配置（PRD 安全要求）：两个文件各自备份
+  const backupPath = await backupIfExists({ copyFile, filePath: configPath, exists: current !== "", writeLine, label: "原 Codex 配置" });
   await writeFile(configPath, content, "utf8");
-  return { content, backupPath };
+  const profileBackupPath = await backupIfExists({ copyFile, filePath: profileConfigPath, exists: currentProfile !== "", writeLine, label: "原 Codex profile 配置" });
+  await writeFile(profileConfigPath, profileContent, "utf8");
+  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 +152,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 +172,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) {
@@ -202,7 +232,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 +272,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 +310,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) {

package/src/topup.js

@@ -1,3 +1,5 @@
+import { colorLevel } from "./colors.js";
+import { createMessenger } from "./messages.js";
 import { renderKeyValueTable, renderSectionTitle } from "./ui.js";
 
 export async function loadTopUpOptions(api) {
@@ -31,6 +33,7 @@ export async function runWechatTopUp({
     throw new Error("缺少 API client");
   }
 
+  const msg = createMessenger({ writeLine, color: writeLine === console.log ? colorLevel() : 0 });
   const options = await loadTopUpOptions(api);
   // 后端口径前置拦截（验收 P1-2）：禁用时不进金额选择、不创建订单
   if (options?.wechat_enabled === false) {
@@ -49,7 +52,7 @@ export async function runWechatTopUp({
     ["金额", String(order.money_display || order.money || amount)],
     ["支付方式", "微信扫码"],
   ]));
-  writeLine("请使用微信扫码支付：");
+  msg.info("请使用微信扫码支付：");
   await printQrOrCodeUrl({ codeUrl: order.code_url, renderQr, writeLine });
   const status = await waitTopUpPaid({
     api,
@@ -96,13 +99,14 @@ async function chooseTopUpAmount({ options, promptSelect, promptInput }) {
 }
 
 async function printQrOrCodeUrl({ codeUrl, renderQr, writeLine }) {
+  const msg = createMessenger({ writeLine, color: writeLine === console.log ? colorLevel() : 0 });
   try {
     const qr = await renderQr(codeUrl);
     if (qr) {
       writeLine(qr);
     }
   } catch {
-    writeLine(`二维码渲染失败，请复制 code_url 完成支付：${codeUrl}`);
+    msg.warn(`二维码渲染失败，请复制 code_url 完成支付：${codeUrl}`);
   }
 }
 

package/src/ui.js

@@ -5,13 +5,14 @@
 
 import { displayWidth } from "./banner.js";
 
-import { BOLD, RESET, fg, toLevel } from "./colors.js";
+import { BOLD, PALETTE, RESET, fg, theme, toLevel } from "./colors.js";
 
-// 表格/标题配色：按色彩深度 level 现算（真彩色保留 RGB，256 色量化到调色板）。
+// 表格/标题配色：从统一语义主题取色（见 colors.js theme），不再各自硬编码 RGB。
 function palette(level) {
+  const t = theme(level);
   return {
-    border: fg(71, 85, 105, level), // 边框：青灰
-    head: fg(125, 211, 252, level), // 表头：天蓝
+    border: t.border, // 边框：青灰
+    head: t.info, // 表头：天蓝
   };
 }
 
@@ -177,10 +178,10 @@ export function renderHeader(title, { subtitle = "", color = false } = {}) {
 // 四种状态：文字前缀（mark）始终存在，颜色仅增强层级（需求二「不依赖颜色表达唯一信息」）
 const BOX_MARKS = { info: "i", warn: "!", error: "×", success: "✓" };
 const BOX_RGB = {
-  info: [125, 211, 252],
-  warn: [250, 204, 21],
-  error: [248, 113, 113],
-  success: [74, 222, 128],
+  info: PALETTE.info,
+  warn: PALETTE.warn,
+  error: PALETTE.error,
+  success: PALETTE.success,
 };
 
 export function renderBox(message, { kind = "info", color = false, width = 0 } = {}) {

package/src/workflows.js

@@ -8,6 +8,8 @@ import path from "node:path";
 
 import { createBackup } from "./backup.js";
 import { ZCF_ATTRIBUTION_COMMENT } from "./zcf-notice.js";
+import { colorLevel } from "./colors.js";
+import { createMessenger } from "./messages.js";
 
 const defaultFs = { copyFile, cp, mkdir, readFile, stat, writeFile };
 
@@ -229,6 +231,7 @@ async function installWorkflowSet({
   if (typeof multiSelect !== "function" || typeof confirm !== "function") {
     throw new Error("缺少交互输入");
   }
+  const msg = createMessenger({ writeLine, color: writeLine === console.log ? colorLevel() : 0 });
   const selected = await multiSelect({
     message: "请选择要安装的工作流：",
     choices: workflows.map((workflow) => ({
@@ -238,23 +241,23 @@ async function installWorkflowSet({
     })),
   });
   if (selected.length === 0) {
-    writeLine("已跳过工作流安装。");
+    msg.info("已跳过工作流安装。");
     return { installed: [], skipped: true };
   }
 
   const picked = workflows.filter((workflow) => selected.includes(workflow.id));
-  writeLine(`安装将写入目录：${targetDir}`);
+  msg.info(`安装将写入目录：${targetDir}`);
 
   // 备份已存在的同名文件（一次性集中备份到时间戳目录）
   const targets = picked.flatMap((workflow) => workflow.files.map((file) => path.join(targetDir, file.name)));
   const { backupDir } = await createBackup({ baseDir: backupBaseDir, paths: targets, fs, now });
   if (backupDir) {
-    writeLine(`✓ 已创建备份：${backupDir}`);
+    msg.success(`已创建备份：${backupDir}`);
   }
 
   const installed = [];
   for (const workflow of picked) {
-    writeLine(`正在安装工作流：${workflow.label}...`);
+    msg.step(`正在安装工作流：${workflow.label}...`);
     let wroteAny = false;
     for (const file of workflow.files) {
       const filePath = path.join(targetDir, file.name);
@@ -263,19 +266,19 @@ async function installWorkflowSet({
         if (existing !== file.content) {
           const approved = await confirm(`文件已存在：${filePath}\n是否覆盖？（原文件已备份）`);
           if (!approved) {
-            writeLine(`已跳过：${file.name}`);
+            msg.info(`已跳过：${file.name}`);
             continue;
           }
         }
       }
       await fs.mkdir(targetDir, { recursive: true });
       await fs.writeFile(filePath, file.content, "utf8");
-      writeLine(`✓ 已安装命令：${file.name}`);
+      msg.success(`已安装命令：${file.name}`);
       wroteAny = true;
     }
     if (wroteAny) {
       installed.push(workflow.id);
-      writeLine(`✓ ${workflow.label}安装成功`);
+      msg.success(`${workflow.label}安装成功`);
     }
   }
   if (installed.length > 0 && usageHint) {