@icode-js/icode 3.2.0 → 3.4.0

package/src/commands/migrate.js

@@ -1,6 +1,7 @@
 import { parseArgs } from 'node:util'
 import { normalizeLegacyArgs } from '../core/cli/args.js'
 import { IcodeError } from '../core/errors.js'
+import { c, keyValues, print, title, ui } from '../core/cli/render.js'
 import { logger } from '../core/tools/logger.js'
 import { runMigrateWorkflow } from '../workflows/migrate-workflow.js'
 
@@ -42,18 +43,26 @@ function printDryRunPlan(result) {
   const previewLimit = 10
   const previewCommits = result.commits.slice(0, previewLimit)
 
-  logger.info(`[dry-run] source: ${result.sourceBranch} (${result.sourceRef})`)
-  logger.info(`[dry-run] target: ${result.targetBranch} (${result.targetRef})`)
-  logger.info(`[dry-run] range: ${result.rangeSpec}`)
-  logger.info(`[dry-run] commits: ${result.migratedCommits}`)
-  previewCommits.forEach((commit, index) => {
-    logger.info(`[dry-run] commit ${index + 1}: ${commit.summary || commit.hash}`)
-  })
+  print(title('迁移计划（dry-run）'))
+  print(keyValues([
+    ['来源', `${ui.branch(result.sourceBranch)} ${c.gray(`(${result.sourceRef})`)}`],
+    ['目标', `${ui.branch(result.targetBranch)} ${c.gray(`(${result.targetRef})`)}`],
+    ['范围', c.cyan(result.rangeSpec)],
+    ['提交数', c.bold(String(result.migratedCommits))]
+  ]))
+  if (previewCommits.length) {
+    print('')
+    previewCommits.forEach((commit) => {
+      const [hash, ...rest] = String(commit.summary || commit.hash).split(' ')
+      print(`  ${ui.hash(hash)} ${ui.subject(rest.join(' '))}`)
+    })
+  }
   if (result.commits.length > previewLimit) {
-    logger.info(`[dry-run] ... 还有 ${result.commits.length - previewLimit} 个提交未显示，可用 --json 查看完整计划`)
+    print(c.gray(`  … 还有 ${result.commits.length - previewLimit} 个提交，可用 --json 查看完整计划`))
   }
+  print('')
   result.steps.forEach((step, index) => {
-    logger.info(`[dry-run] ${index + 1}. ${step.action}: ${step.detail}`)
+    print(`  ${c.gray(`${index + 1}.`)} ${step.detail}`)
   })
 }
 
@@ -117,7 +126,5 @@ export async function runMigrateCommand(rawArgs) {
     return result
   }
 
-  logger.success(
-    `migrate 完成: ${result.sourceBranch} -> ${result.targetBranch}, commits=${result.migratedCommits}, mode=${result.rangeMode || 'range'}`
-  )
+  logger.success(`已迁移 ${c.bold(String(result.migratedCommits))} 个提交: ${ui.branch(result.sourceBranch)} ${c.gray('→')} ${ui.branch(result.targetBranch)}${result.pushed ? c.gray('，已推送') : ''}`)
 }

package/src/commands/open.js

@@ -0,0 +1,138 @@
+import fs from 'node:fs'
+import path from 'node:path'
+import { IcodeError } from '../core/errors.js'
+import { parseCommandArgs, printJson } from '../core/cli/output.js'
+import { resolveGitContext } from '../core/git/context.js'
+import { GitService } from '../core/git/service.js'
+import { createPlatformClientForGit } from '../core/platform/index.js'
+import { openInBrowser } from '../core/tools/browser.js'
+import { logger } from '../core/tools/logger.js'
+
+function printHelp() {
+  process.stdout.write(`
+Usage:
+  icode open [target] [options]
+
+Targets:
+  (不传)                 当前分支页面（在主分支上时打开仓库首页）
+  repo                   仓库首页
+  <file>[:line]          文件（当前分支），例如 src/cli.js:42
+  commit [ref]           提交页面（默认 HEAD）
+  compare [base]         当前分支与 base 的对比（默认主分支）
+  pr                     当前分支的 PR/MR；没有时打开创建页面
+  prs                    PR/MR 列表
+  ci                     CI / 流水线页面
+  releases               Release 页面
+
+Options:
+  -p, --print            只打印链接，不打开浏览器
+  --branch <name>        指定分支（默认当前分支）
+  --json                 输出机器可读 JSON
+  --repo-mode <mode>     仓库模式: auto | strict
+  -h, --help             查看帮助
+
+Examples:
+  icode open
+  icode open src/cli.js:120
+  icode open pr
+  icode open compare release -p
+`)
+}
+
+// 把用户给的文件路径转换成仓库根目录相对路径，并解析 :行号 后缀。
+function resolveFileTarget(context, target) {
+  const match = String(target).match(/^(.*?)(?::(\d+))?$/)
+  const filePart = match?.[1] || target
+  const line = match?.[2] ? Number(match[2]) : 0
+  const absolute = path.resolve(process.cwd(), filePart)
+  if (!fs.existsSync(absolute)) {
+    return null
+  }
+  const relative = path.relative(context.topLevelPath, absolute).split(path.sep).join('/')
+  if (relative.startsWith('..')) {
+    return null
+  }
+  return { file: relative, line }
+}
+
+async function resolveUrl(git, context, client, target, options) {
+  const branch = options.branch || (await git.getCurrentBranch()) || context.defaultBranch
+  const urls = client.urls
+
+  switch (target) {
+    case '':
+      return branch && branch !== context.defaultBranch ? urls.branch(branch) : urls.repo()
+    case 'repo':
+      return urls.repo()
+    case 'prs':
+    case 'mrs':
+      return urls.prs()
+    case 'ci':
+    case 'actions':
+    case 'pipelines':
+      return urls.pipelines()
+    case 'releases':
+      return urls.releases()
+    case 'commit': {
+      const sha = await git.revParse(options.ref || 'HEAD')
+      if (!sha) {
+        throw new IcodeError(`提交不存在: ${options.ref}`, { code: 'OPEN_REF_NOT_FOUND', exitCode: 2 })
+      }
+      return urls.commit(sha)
+    }
+    case 'compare':
+      return urls.compare(options.ref || context.defaultBranch, branch)
+    case 'pr':
+    case 'mr': {
+      if (client.hasToken) {
+        try {
+          const [pr] = await client.listPullRequests({ head: branch, state: 'open' })
+          if (pr) {
+            return pr.url || urls.pr(pr.number)
+          }
+        } catch (error) {
+          logger.debug(`查询 PR 失败，改为打开创建页面: ${error.message}`)
+        }
+      }
+      return urls.newPr(context.defaultBranch, branch)
+    }
+    default: {
+      const fileTarget = resolveFileTarget(context, target)
+      if (!fileTarget) {
+        throw new IcodeError(`无法识别的目标: ${target}（不是已存在的文件，也不是 repo/pr/commit/compare/ci/releases）`, {
+          code: 'OPEN_TARGET_UNKNOWN',
+          exitCode: 2
+        })
+      }
+      return urls.file(branch, fileTarget.file, fileTarget.line)
+    }
+  }
+}
+
+export async function runOpenCommand(rawArgs) {
+  const { values, positionals } = parseCommandArgs(rawArgs, {
+    print: { type: 'boolean', short: 'p', default: false },
+    branch: { type: 'string' }
+  })
+  if (values.help) {
+    printHelp()
+    return
+  }
+
+  const context = await resolveGitContext({ repoMode: values['repo-mode'] })
+  const git = new GitService(context)
+  const client = await createPlatformClientForGit(git)
+  const [target = '', ref] = positionals
+  const url = await resolveUrl(git, context, client, target, { branch: values.branch, ref })
+
+  if (values.json) {
+    printJson({ url, provider: client.name })
+    return { url }
+  }
+
+  process.stdout.write(`${url}\n`)
+  if (!values.print) {
+    openInBrowser(url)
+  }
+  return { url }
+}

package/src/commands/pr.js

@@ -0,0 +1,219 @@
+import { IcodeError } from '../core/errors.js'
+import { parseCommandArgs, printJson } from '../core/cli/output.js'
+import { c, keyValues, print, table, ui } from '../core/cli/render.js'
+import { openInBrowser } from '../core/tools/browser.js'
+import { confirm, isInteractiveTerminal } from '../core/tools/interactive.js'
+import { logger } from '../core/tools/logger.js'
+import {
+  runPrCheckoutWorkflow,
+  runPrCreateWorkflow,
+  runPrListWorkflow,
+  runPrMergeWorkflow,
+  runPrViewWorkflow
+} from '../workflows/pr-workflow.js'
+
+function printHelp() {
+  process.stdout.write(`
+Usage:
+  icode pr create [options]          为当前分支创建 PR/MR（会先推送当前分支）
+  icode pr list [options]            列出 PR/MR
+  icode pr view [number]             查看 PR/MR（默认当前分支对应的）
+  icode pr checkout <number>         检出 PR/MR 到本地分支 pr/<number>
+  icode pr merge [number]            合并 PR/MR（会确认）
+  icode pr open [number]             在浏览器打开 PR/MR（无编号时打开列表）
+
+Options:
+  -b, --base <branch>      目标分支（默认主分支）
+  -t, --title <text>       标题（默认取提交信息）
+  --body <text>            正文
+  --draft                  创建草稿
+  --ai                     用 AI 生成标题和描述
+  --profile <name>         AI profile（配合 --ai）
+  --lang <zh|en>           AI 输出语言
+  --no-push                不自动推送当前分支
+  --web                    不调 API，直接在浏览器打开创建页面
+  --state <state>          list 的状态: open | closed | merged | all
+  --method <method>        merge 方式: merge | squash | rebase
+  --branch <name>          checkout 的本地分支名
+  --provider <name>        强制指定平台: github | gitlab | gitee | gitea
+  --json                   输出机器可读 JSON
+  -y, --yes                自动确认
+  --repo-mode <mode>       仓库模式: auto | strict
+  -h, --help               查看帮助
+
+Notes:
+  平台按 remote 地址自动识别。需要 token: icode config platform token set <provider> <token>
+  （也可用 GITHUB_TOKEN / GITLAB_TOKEN 等环境变量）。没有 token 时 create 会打开网页创建页面。
+
+Examples:
+  icode pr create
+  icode pr create -b release --ai
+  icode pr list --state all
+  icode pr checkout 42
+  icode pr merge 42 --method squash -y
+`)
+}
+
+function formatState(pr) {
+  if (pr.merged) {
+    return c.magenta('已合并')
+  }
+  if (pr.state === 'open') {
+    return pr.draft ? c.gray('草稿') : c.green('打开')
+  }
+  return c.gray(pr.state === 'closed' ? '已关闭' : pr.state)
+}
+
+function printPr(pr, noun) {
+  print(`  ${c.yellow(`${noun} #${pr.number}`)}  ${c.bold(ui.subject(pr.title))}`)
+  print(keyValues([
+    ['分支', `${ui.branch(pr.head)} ${c.gray('→')} ${ui.branch(pr.base)}`],
+    ['状态', `${formatState(pr)}${pr.conflict ? `  ${c.red('存在冲突')}` : ''}`],
+    ['作者', pr.author ? ui.author(`@${pr.author}`) : ''],
+    ['链接', ui.url(pr.url)]
+  ], { indent: 4 }))
+}
+
+export async function runPrCommand(rawArgs) {
+  const { values, positionals } = parseCommandArgs(rawArgs, {
+    base: { type: 'string', short: 'b' },
+    title: { type: 'string', short: 't' },
+    body: { type: 'string' },
+    draft: { type: 'boolean', default: false },
+    ai: { type: 'boolean', default: false },
+    profile: { type: 'string' },
+    lang: { type: 'string', default: 'zh' },
+    'no-push': { type: 'boolean', default: false },
+    'no-verify': { type: 'boolean', default: false },
+    web: { type: 'boolean', default: false },
+    state: { type: 'string' },
+    method: { type: 'string' },
+    branch: { type: 'string' },
+    provider: { type: 'string' },
+    limit: { type: 'string' }
+  })
+
+  const [subcommand = '', target] = positionals
+  if (values.help || !subcommand) {
+    printHelp()
+    return
+  }
+
+  const base = { repoMode: values['repo-mode'], provider: values.provider }
+
+  if (subcommand === 'create') {
+    const result = await runPrCreateWorkflow({
+      ...base,
+      base: values.base,
+      title: values.title,
+      body: values.body,
+      draft: values.draft,
+      ai: values.ai,
+      profile: values.profile,
+      lang: values.lang,
+      noPush: values['no-push'],
+      noVerify: values['no-verify'],
+      web: values.web,
+      interactive: !values.json && !values.yes && isInteractiveTerminal()
+    })
+    if (values.json) {
+      printJson(result)
+      return result
+    }
+    if (result.canceled) {
+      logger.warn('已取消。')
+      return result
+    }
+    if (!result.created && !result.existed) {
+      if (result.reason === 'no-token') {
+        logger.warn(`未配置 ${result.provider} token，改为在浏览器中创建。配置: icode config platform token set ${result.provider} <token>`)
+      }
+      logger.info(`在浏览器中完成创建: ${ui.url(result.webUrl)}`)
+      openInBrowser(result.webUrl)
+      return result
+    }
+    if (result.existed) {
+      logger.info('该分支已有打开的 PR/MR：')
+    } else {
+      logger.success('已创建：')
+    }
+    printPr(result.pr, result.provider === 'gitlab' ? 'MR' : 'PR')
+    return result
+  }
+
+  if (subcommand === 'list' || subcommand === 'ls') {
+    const result = await runPrListWorkflow({ ...base, state: values.state, base: values.base, limit: values.limit ? Number(values.limit) : undefined })
+    if (values.json) {
+      printJson(result)
+      return result
+    }
+    if (!result.items.length) {
+      logger.info(`没有${values.state && values.state !== 'open' ? '' : '打开的'} ${result.prNoun}。`)
+      return result
+    }
+    print(table(result.items, [
+      { key: 'number', label: '#', format: (value) => c.yellow(`#${value}`) },
+      { key: 'title', label: '标题', maxWidth: 50, format: (value) => ui.subject(value) },
+      { key: 'head', label: '分支', format: (_, pr) => `${ui.branch(pr.head)} ${c.gray('→')} ${ui.branch(pr.base)}` },
+      { key: 'state', label: '状态', format: (_, pr) => formatState(pr) + (pr.conflict ? ` ${c.red('冲突')}` : '') },
+      { key: 'author', label: '作者', format: (value) => ui.author(value ? `@${value}` : '') }
+    ]))
+    return result
+  }
+
+  if (subcommand === 'view') {
+    const result = await runPrViewWorkflow({ ...base, number: target })
+    if (values.json) {
+      printJson(result)
+      return result
+    }
+    printPr(result.pr, result.prNoun)
+    return result
+  }
+
+  if (subcommand === 'open') {
+    // 有编号打开该 PR；没有编号时先找当前分支的 PR，找不到就打开列表页。
+    const result = await runPrViewWorkflow({ ...base, number: target }).catch((error) => {
+      if (!target && error.code === 'PR_NOT_FOUND') {
+        return null
+      }
+      throw error
+    })
+    const url = result ? result.pr.url : (await runPrListWorkflow(base)).webUrl
+    logger.info(ui.url(url))
+    openInBrowser(url)
+    return { url }
+  }
+
+  if (subcommand === 'checkout' || subcommand === 'co') {
+    if (!target) {
+      throw new IcodeError('缺少编号: icode pr checkout <number>', { code: 'PR_NUMBER_REQUIRED', exitCode: 2 })
+    }
+    const result = await runPrCheckoutWorkflow({ ...base, number: target, branch: values.branch })
+    if (values.json) {
+      printJson(result)
+      return result
+    }
+    logger.success(`已检出到本地分支 ${ui.branch(result.branch)}`)
+    return result
+  }
+
+  if (subcommand === 'merge') {
+    if (!values.yes) {
+      const accepted = await confirm(`确认合并 ${target ? `#${target}` : '当前分支的 PR/MR'}？`, false)
+      if (!accepted) {
+        logger.warn('已取消。')
+        return
+      }
+    }
+    const result = await runPrMergeWorkflow({ ...base, number: target, method: values.method })
+    if (values.json) {
+      printJson(result)
+      return result
+    }
+    logger.success(result.alreadyMerged ? `#${result.number} 之前已合并。` : `#${result.number} 已合并。`)
+    return result
+  }
+
+  throw new IcodeError(`未知 pr 子命令: ${subcommand}`, { code: 'PR_SUBCOMMAND_UNKNOWN', exitCode: 2 })
+}

package/src/commands/push.js

@@ -1,6 +1,7 @@
 import { parseArgs } from 'node:util'
 import { getAiCommandOptions } from '../core/ai/config.js'
 import { normalizeLegacyArgs } from '../core/cli/args.js'
+import { c, keyValues, print, renderBranchResults, title, ui } from '../core/cli/render.js'
 import { logger } from '../core/tools/logger.js'
 import { runPushWorkflow } from '../workflows/push-workflow.js'
 
@@ -16,22 +17,14 @@ const PUSH_PARSE_OPTIONS = {
   'pull-main': { type: 'boolean' },
   'not-push-current': { type: 'boolean' },
   'force-protected': { type: 'boolean' },
+  force: { type: 'boolean', short: 'f' },
+  'create-target': { type: 'boolean' },
+  'allow-risky': { type: 'boolean' },
+  json: { type: 'boolean' },
   'repo-mode': { type: 'string' },
   'no-verify': { type: 'boolean' }
 }
 
-function formatBranchStatus(status) {
-  const map = {
-    pushed: '已推送',
-    'merged-and-pushed': '已合并并推送',
-    'remote-merged-and-pushed': '已远程合并并推送',
-    'skipped-protected': '已跳过(受保护)',
-    'skipped-missing-remote': '已跳过(远程分支不存在)',
-    paused: '已暂停'
-  }
-
-  return map[status] || status
-}
 
 function printHelp() {
   process.stdout.write(`
@@ -52,6 +45,10 @@ Options:
   --pull-main                 提交前将主分支同步到当前分支
   --not-push-current          不推送当前分支，只处理目标分支
   --force-protected           强制处理配置里的受保护分支
+  -f, --force                 安全强推当前分支（只用 --force-with-lease，拒绝主分支/受保护分支）
+  --create-target             目标分支不存在时允许从当前分支新建（默认会询问或报错）
+  --allow-risky               检测到敏感文件/疑似密钥/大文件时仍继续提交
+  --json                      输出机器可读 JSON
   --repo-mode <mode>          仓库模式: auto(自动继承父仓库) | strict(禁止继承)
   --no-verify                 跳过 hook/husky 校验
   -h, --help                  查看帮助
@@ -62,6 +59,14 @@ Notes:
   远程 merge 通过 PR/MR API 发起，不会本地切换到目标分支。
   远程 merge 若出现冲突会暂停流程，并保留明确失败原因。
   布尔开关仅在命令行显式传入时生效（如 --ai-commit / --pull-main / --no-verify / -y）。
+  本地 merge 和强推前会自动创建恢复点，可用 icode rescue 找回。
+
+Examples:
+  icode push -m "feat: login"
+  icode push release test -y
+  icode push release -r -y
+  icode push --force -y
+  icode --remote upstream push -m "fix: typo"
 `)
 }
 
@@ -91,23 +96,46 @@ function resolveStringOption(cliValue, configValue, fallback = '') {
   return fallback
 }
 
+const STATUS_LABELS = {
+  pushed: '已推送',
+  'merged-and-pushed': '已合并并推送',
+  'remote-merged-and-pushed': '已远程合并',
+  'force-pushed': '已强推 (--force-with-lease)',
+  'skipped-protected': '已跳过（受保护分支，可加 --force-protected）',
+  'skipped-missing-remote': '已跳过（远程分支不存在）',
+  paused: '已暂停'
+}
+
 // 统一输出 push 结果摘要，失败分支会追加具体原因，方便定位问题目标分支。
 function printPushSummary(summary = []) {
-  summary.forEach((item) => {
-    const reason = typeof item.reason === 'string' && item.reason.trim() ? ` - ${item.reason.trim()}` : ''
-    logger.info(`[结果] ${item.branch}: ${formatBranchStatus(item.status)}${reason}`)
-  })
+  print('')
+  renderBranchResults(summary, STATUS_LABELS)
 }
 
 // 输出 dry-run 计划摘要，输入 workflow 返回的计划，输出对用户可读的阶段列表。
 function printDryRunPlan(plan) {
-  logger.info(`[dry-run] 当前分支: ${plan.currentBranch}`)
-  logger.info(`[dry-run] 目标分支: ${plan.branchTargets.join(', ')}`)
-  logger.info(`[dry-run] 合并模式: ${plan.remoteMerge ? 'remote-merge' : 'local-merge'}`)
+  const actionLabels = {
+    'ai-commit': 'AI 生成提交信息并提交',
+    'commit-if-needed': '有改动时提交',
+    'pull-main': '同步主分支',
+    'skip-protected': '跳过受保护分支',
+    'push-current': '推送当前分支',
+    'force-push-current': '强推当前分支',
+    'local-merge': '本地 merge 后推送',
+    'remote-merge': '创建并合并 PR/MR'
+  }
+  print(title('push 计划（dry-run）'))
+  print(keyValues([
+    ['当前分支', ui.branch(plan.currentBranch)],
+    ['remote', ui.remote(plan.remote || 'origin')],
+    ['目标分支', plan.branchTargets.map(ui.branch).join(', ')],
+    ['合并方式', plan.remoteMerge ? '远程 PR/MR' : '本地 merge']
+  ]))
+  print('')
   plan.steps.forEach((step, index) => {
-    const reason = step.reason ? ` - ${step.reason}` : ''
-    logger.info(`[dry-run] ${index + 1}. ${step.action}: ${step.branch}${reason}`)
+    print(`  ${c.gray(`${index + 1}.`)} ${actionLabels[step.action] || step.action} ${ui.branch(step.branch)} ${c.gray(step.reason || '')}`)
   })
+  print(c.gray('\n  未执行任何操作。去掉 --dry-run 即可执行。'))
 }
 
 export function resolvePushWorkflowOptions(parsedValues, parsedPositionals, scopedOptions = {}) {
@@ -124,6 +152,9 @@ export function resolvePushWorkflowOptions(parsedValues, parsedPositionals, scop
     pullMain: resolveBooleanOption(parsedValues['pull-main'], false),
     notPushCurrent: resolveBooleanOption(parsedValues['not-push-current'], false),
     forceProtected: resolveBooleanOption(parsedValues['force-protected'], false),
+    force: resolveBooleanOption(parsedValues.force, false),
+    createTarget: resolveBooleanOption(parsedValues['create-target'], false),
+    allowRisky: resolveBooleanOption(parsedValues['allow-risky'], false),
     repoMode: resolveStringOption(parsedValues['repo-mode'], undefined, 'auto'),
     noVerify: resolveBooleanOption(parsedValues['no-verify'], false)
   }
@@ -159,6 +190,11 @@ export async function runPushCommand(rawArgs) {
     throw error
   }
 
+  if (parsed.values.json) {
+    process.stdout.write(`${JSON.stringify({ ok: !result.canceled, ...result }, null, 2)}\n`)
+    return result
+  }
+
   if (result.canceled) {
     return
   }
@@ -169,5 +205,9 @@ export async function runPushCommand(rawArgs) {
   }
 
   printPushSummary(result.summary)
-  logger.success(`push 完成，共处理 ${result.summary.length} 个分支。`)
+  print('')
+  logger.success(`push 完成，共处理 ${result.summary.length} 个分支`)
+  if (result.backupId) {
+    logger.hint(`已创建恢复点 ${result.backupId}，需要时可用 icode rescue 找回`)
+  }
 }

package/src/commands/ready.js

@@ -1,6 +1,6 @@
 import { parseArgs } from 'node:util'
 import { normalizeLegacyArgs } from '../core/cli/args.js'
-import { logger } from '../core/tools/logger.js'
+import { c, formatChanges, keyValues, print, renderChecks, renderOverallStatus, title, ui } from '../core/cli/render.js'
 import { withSpinner } from '../core/tools/loading.js'
 import { runReadyWorkflow } from '../workflows/ready-workflow.js'
 
@@ -23,55 +23,25 @@ Notes:
 `)
 }
 
-/**
- * 根据检查状态选择彩色输出函数。
- * 输入为 pass/warn/fail，输出 logger 方法。
- */
-function resolveLogMethod(status) {
-  if (status === 'fail') {
-    return logger.error
-  }
-  if (status === 'warn') {
-    return logger.warn
-  }
-  return logger.success
-}
-
-/**
- * 输出单条 ready 检查结果。
- * 输入为检查项，输出彩色日志和下一步建议。
- */
-function printCheck(check) {
-  const log = resolveLogMethod(check.status).bind(logger)
-  const statusLabel = check.status.toUpperCase()
-  log(`[${statusLabel}] ${check.title}: ${check.detail}`)
-  if (check.nextStep) {
-    logger.info(`下一步: ${check.nextStep}`)
-  }
-}
-
-/**
- * 输出 ready 的人类可读摘要。
- * 输入为 workflow 返回结果，输出分色日志。
- */
 function printReadyResult(result) {
-  const branchText = logger.color('green', result.context.currentBranch || 'DETACHED')
-  const statusColor = result.status === 'fail' ? 'red' : result.status === 'warn' ? 'yellow' : 'green'
-  const statusText = logger.color(statusColor, result.status.toUpperCase())
-
-  logger.info(`仓库根目录: ${result.context.topLevelPath}`)
-  logger.info(`当前分支: ${branchText}`)
-  logger.info(`整体状态: ${statusText}`)
-  logger.info(`改动统计: staged=${result.changes.staged}, unstaged=${result.changes.unstaged}, untracked=${result.changes.untracked}, conflicted=${result.changes.conflicted}`)
-
-  if (result.upstream.configured) {
-    logger.info(`upstream: ${result.upstream.upstream} (ahead=${result.upstream.ahead}, behind=${result.upstream.behind})`)
-  } else {
-    logger.warn('upstream: 未配置')
-  }
+  const upstream = result.upstream.configured
+    ? `${ui.remote(result.upstream.upstream)} ${ui.sync(result.upstream.ahead, result.upstream.behind) || c.gray('已同步')}`
+    : c.yellow('未配置')
 
-  result.checks.forEach((check) => {
-    printCheck(check)
+  print(title('仓库状态'))
+  print(keyValues([
+    ['仓库', ui.path(result.context.topLevelPath)],
+    ['分支', result.context.currentBranch ? ui.branch(result.context.currentBranch) : c.red('DETACHED')],
+    ['主分支', ui.branch(result.context.defaultBranch)],
+    ['upstream', upstream],
+    ['改动', formatChanges(result.changes)]
+  ]))
+  print('')
+  renderChecks(result.checks)
+  renderOverallStatus(result.status, {
+    通过: result.summary?.pass,
+    注意: result.summary?.warn,
+    失败: result.summary?.fail
   })
 }