claude360 0.2.9 → 0.3.0

package/src/init-flow.js

@@ -5,18 +5,26 @@
 import { safeErrorMessage } from "./sanitize.js";
 import { colorLevel } from "./colors.js";
 import { createMessenger } from "./messages.js";
+import { renderDivider, renderStructuredError, renderTaskEnd, renderTaskStart, renderTaskStep } from "./ui.js";
 
 // 语义消息器工厂：真实终端着色，测试/管道（writeLine 被替换）下无色。
 const mk = (writeLine) => createMessenger({ writeLine, color: writeLine === console.log ? colorLevel() : 0 });
 
 export async function runFullInit({ title, steps, writeLine = console.log } = {}) {
   const msg = mk(writeLine);
-  msg.title(title);
+  writeLine(renderTaskStart(title, {
+    intro: steps.map((step) => step.title),
+  }));
   writeLine("");
   let index = 0;
+  const total = steps.length;
   for (const step of steps) {
     index += 1;
-    msg.step(`第 ${index} 步：${step.title}`);
+    if (index > 1) {
+      writeLine(renderDivider("section"));
+      writeLine("");
+    }
+    writeLine(renderTaskStep(index, total, step.title));
     try {
       const result = await step.run();
       if (step.required && result === false) {
@@ -25,14 +33,18 @@ export async function runFullInit({ title, steps, writeLine = console.log } = {}
       }
     } catch (error) {
       if (step.required) {
-        msg.error(`${step.title}失败：${safeErrorMessage(error)}`);
-        msg.hint("初始化已中止，可稍后在菜单中重试。");
+        writeLine(renderStructuredError(`${step.title}失败`, {
+          reason: safeErrorMessage(error),
+          suggestions: ["初始化已中止，可稍后在菜单中重试。"],
+          detailCommand: "claude360 doctor --verbose",
+        }));
         return { completed: false, abortedAt: step.title };
       }
       msg.warn(`${step.title}失败（已跳过，不影响后续步骤）：${safeErrorMessage(error)}`);
     }
     writeLine("");
   }
+  writeLine(renderTaskEnd(`${title}完成`));
   return { completed: true };
 }
 

package/src/mcp-skill.js

@@ -11,6 +11,7 @@ import { createBackup } from "./backup.js";
 import { upsertTomlTable, validateBasicToml } from "./tool-launcher.js";
 import { colorLevel } from "./colors.js";
 import { createMessenger } from "./messages.js";
+import { renderChoiceTable } from "./ui.js";
 
 // 语义消息器工厂：真实终端着色，测试/管道（writeLine 被替换）下无色。
 const mk = (writeLine) => createMessenger({ writeLine, color: writeLine === console.log ? colorLevel() : 0 });
@@ -165,6 +166,21 @@ async function selectMcps({ mcps, multiSelect, installedIds, writeLine }) {
     }
     fresh.push(mcps.find((mcp) => mcp.id === id));
   }
+  if (fresh.length > 0 && typeof writeLine === "function") {
+    writeLine(`✅ 已选择 ${fresh.length} 个 MCP 服务`);
+    writeLine(renderChoiceTable({
+      columns: [
+        ["index", "序号"],
+        ["service", "服务"],
+        ["description", "说明"],
+      ],
+      rows: fresh.map((mcp, index) => ({
+        index: String(index + 1),
+        service: mcp.id,
+        description: mcp.desc || "-",
+      })),
+    }, { width: process.stdout.columns || 0 }));
+  }
   return fresh;
 }
 

package/src/menu.js

@@ -19,6 +19,7 @@ function palette(level) {
   };
 }
 const MENU_RULE_WIDTH = 46;
+const SECTION_DIVIDER = "----------------------------------------";
 
 export function buildFirstRunMenu() {
   return {
@@ -177,13 +178,18 @@ export async function promptMenu({ menu, promptInput, select, writeLine = consol
 // 多选交互（补充需求 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}`);
+  const count = choices.filter((choice) => selected.has(choice.value)).length;
+  const lines = [`⚙️ ${message}`, "", `已选择：${count} 个`, ""];
+  // hint 列按 label 最大显示宽度对齐（需求示例 4），不再用固定空格
+  const labelWidth = choices.reduce((max, choice) => Math.max(max, displayWidth(choice.label)), 0);
+  choices.forEach((choice) => {
+    const mark = selected.has(choice.value) ? "●" : "○";
+    const hint = choice.hint
+      ? `${" ".repeat(Math.max(2, labelWidth - displayWidth(choice.label) + 2))}${choice.hint}`
+      : "";
+    lines.push(`${mark} ${choice.label}${hint}`);
   });
-  lines.push("", "  A. 全选   I. 反选   Enter. 确认");
+  lines.push("", SECTION_DIVIDER, "", "操作：", "输入编号切换   A 全选   I 反选   Enter 确认");
   return lines.join("\n");
 }
 

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/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

@@ -8,6 +8,7 @@ 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 });
@@ -91,6 +92,11 @@ 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 = {
@@ -100,6 +106,11 @@ export async function configureCodexProvider({
     wireApi: "responses",
   };
   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 共存）。
@@ -119,11 +130,38 @@ export async function configureCodexProvider({
   }
 
   await mkdir(path.dirname(configPath), { recursive: true });
+  writeLine("");
+  writeLine(renderDivider("section"));
+  writeLine("");
+  writeLine(renderTaskStep(2, 4, "备份配置"));
   // 写入前备份原配置（PRD 安全要求）：两个文件各自备份
   const backupPath = await backupIfExists({ copyFile, filePath: configPath, exists: current !== "", writeLine, label: "原 Codex 配置" });
-  await writeFile(configPath, content, "utf8");
   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");
   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 };
 }
 
@@ -184,7 +222,10 @@ async function confirmCodexConfigConflict({ current, currentProfile, desired, co
     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("; ")}`);

package/src/topup.js

@@ -1,6 +1,6 @@
 import { colorLevel } from "./colors.js";
 import { createMessenger } from "./messages.js";
-import { renderKeyValueTable, renderSectionTitle } from "./ui.js";
+import { renderChoiceTable, renderDivider, renderKeyValueTable, renderSectionTitle, renderTaskEnd, renderTaskStart, renderTaskStep } from "./ui.js";
 
 export async function loadTopUpOptions(api) {
   if (!api) {
@@ -34,12 +34,25 @@ export async function runWechatTopUp({
   }
 
   const msg = createMessenger({ writeLine, color: writeLine === console.log ? colorLevel() : 0 });
+  writeLine(renderTaskStart("微信扫码充值", {
+    intro: ["加载充值选项", "选择充值金额", "创建支付订单", "等待微信支付", "刷新余额"],
+  }));
+  writeLine("");
+  writeLine(renderTaskStep(1, 5, "加载充值选项"));
   const options = await loadTopUpOptions(api);
   // 后端口径前置拦截（验收 P1-2）：禁用时不进金额选择、不创建订单
   if (options?.wechat_enabled === false) {
     throw new Error("微信支付未启用，请使用网页充值。");
   }
-  const amount = await chooseTopUpAmount({ options, promptSelect, promptInput });
+  writeLine("");
+  writeLine(renderDivider("section"));
+  writeLine("");
+  writeLine(renderTaskStep(2, 5, "选择充值金额"));
+  const amount = await chooseTopUpAmount({ options, promptSelect, promptInput, writeLine });
+  writeLine("");
+  writeLine(renderDivider("section"));
+  writeLine("");
+  writeLine(renderTaskStep(3, 5, "创建支付订单"));
   const order = await api.post("/api/cli/topup/wechat", { amount });
   if (!order?.order_id || !order?.code_url) {
     throw new Error("创建微信充值订单失败");
@@ -54,6 +67,10 @@ export async function runWechatTopUp({
   ]));
   msg.info("请使用微信扫码支付：");
   await printQrOrCodeUrl({ codeUrl: order.code_url, renderQr, writeLine });
+  writeLine("");
+  writeLine(renderDivider("section"));
+  writeLine("");
+  writeLine(renderTaskStep(4, 5, "等待微信支付"));
   const status = await waitTopUpPaid({
     api,
     orderId: order.order_id,
@@ -62,11 +79,22 @@ export async function runWechatTopUp({
     maxPolls,
     writeStatus,
   });
+  writeLine("");
+  writeLine(renderDivider("section"));
+  writeLine("");
+  writeLine(renderTaskStep(5, 5, "刷新余额"));
   const balance = await api.get("/api/cli/me");
+  if (balance?.balance_display) {
+    msg.result("当前余额", balance.balance_display);
+  }
+  writeLine("");
+  writeLine(renderTaskEnd("微信扫码充值完成", {
+    summary: [["充值金额", String(order.money_display || order.money || amount)]],
+  }));
   return { order, status, balance };
 }
 
-async function chooseTopUpAmount({ options, promptSelect, promptInput }) {
+async function chooseTopUpAmount({ options, promptSelect, promptInput, writeLine }) {
   const amountOptions = Array.isArray(options?.amount_options)
     ? options.amount_options.filter((amount) => Number.isFinite(amount) && amount > 0)
     : [];
@@ -74,6 +102,18 @@ async function chooseTopUpAmount({ options, promptSelect, promptInput }) {
     if (typeof promptSelect !== "function") {
       throw new Error("缺少充值金额选择输入");
     }
+    if (typeof writeLine === "function") {
+      writeLine(renderChoiceTable({
+        columns: [
+          ["index", "序号"],
+          ["amount", "金额"],
+        ],
+        rows: amountOptions.map((amount, index) => ({
+          index: String(index + 1),
+          amount: `¥${amount}`,
+        })),
+      }, { width: process.stdout.columns || 0 }));
+    }
     const selected = await promptSelect("选择充值金额", amountOptions.map((amount) => ({
       label: `¥${amount}`,
       value: amount,
@@ -81,6 +121,9 @@ async function chooseTopUpAmount({ options, promptSelect, promptInput }) {
     if (!amountOptions.includes(selected)) {
       throw new Error("请选择后端返回的充值金额");
     }
+    if (typeof writeLine === "function") {
+      writeLine(`✅ 已选择：¥${selected}`);
+    }
     return selected;
   }
 
@@ -95,6 +138,9 @@ async function chooseTopUpAmount({ options, promptSelect, promptInput }) {
   if (minTopUp > 0 && amount < minTopUp) {
     throw new Error(`充值金额不能低于 ${minTopUp}`);
   }
+  if (typeof writeLine === "function") {
+    writeLine(`✅ 已选择：¥${amount}`);
+  }
   return amount;
 }