@icode-js/icode 3.2.0 → 3.4.0

package/src/cli.js

@@ -4,20 +4,32 @@ import { runCodeReviewCommand } from './commands/codereview.js'
 import { runCompletionCommand, runHiddenCompletionCommand } from './commands/completion.js'
 import { runCheckoutCommand } from './commands/checkout.js'
 import { runConfigCommand } from './commands/config.js'
+import { runAbortCommand, runContinueCommand } from './commands/continue.js'
 import { runDoctorCommand } from './commands/doctor.js'
 import { runExplainCommand } from './commands/explain.js'
 import { printMainHelp } from './commands/help.js'
+import { runAmendCommand, runFixupCommand } from './commands/history.js'
 import { runInfoCommand } from './commands/info.js'
+import { runLogCommand } from './commands/log.js'
 import { runMigrateCommand } from './commands/migrate.js'
+import { runOpenCommand } from './commands/open.js'
+import { runPrCommand } from './commands/pr.js'
 import { runPushCommand } from './commands/push.js'
 import { runReadyCommand } from './commands/ready.js'
+import { runReleaseCommand } from './commands/release.js'
+import { runRescueCommand } from './commands/rescue.js'
 import { runSaveCommand } from './commands/save.js'
+import { runStashCommand } from './commands/stash.js'
+import { runSwCommand } from './commands/sw.js'
 import { runSyncCommand } from './commands/sync.js'
 import { runTagCommand } from './commands/tag.js'
 import { runUndoCommand } from './commands/undo.js'
-import { asIcodeError } from './core/errors.js'
+import { asIcodeError, IcodeError } from './core/errors.js'
 import { normalizeLegacyArgs } from './core/cli/args.js'
 import { notifyIfCliUpdateAvailable } from './core/cli/update-notifier.js'
+import { chooseOne, isInteractiveTerminal } from './core/tools/interactive.js'
+import { c } from './core/tools/theme.js'
+import { inspectPausedWork } from './workflows/continue-workflow.js'
 import { logger } from './core/tools/logger.js'
 
 function isTruthy(value) {
@@ -25,11 +37,38 @@ function isTruthy(value) {
   return ['1', 'true', 'yes', 'y', 'on'].includes(normalized)
 }
 
+function redactSensitiveMeta(value, seen = new WeakSet()) {
+  if (typeof value === 'string') {
+    return value
+      .replace(/(Bearer\s+)[^\s"']+/gi, '$1[REDACTED]')
+      .replace(/((?:api[_-]?key|private[_-]?token|authorization)\s*[=:]\s*)[^\s,;"']+/gi, '$1[REDACTED]')
+  }
+  if (!value || typeof value !== 'object') {
+    return value
+  }
+  if (seen.has(value)) {
+    return '[Circular]'
+  }
+
+  seen.add(value)
+  if (Array.isArray(value)) {
+    return value.map((item) => redactSensitiveMeta(item, seen))
+  }
+
+  const sanitized = {}
+  for (const [key, item] of Object.entries(value)) {
+    sanitized[key] = /api[_-]?key|token|authorization|secret|password/i.test(key)
+      ? '[REDACTED]'
+      : redactSensitiveMeta(item, seen)
+  }
+  return sanitized
+}
+
 function serializeErrorMeta(meta) {
   try {
-    return JSON.stringify(meta, null, 2)
+    return JSON.stringify(redactSensitiveMeta(meta), null, 2)
   } catch {
-    return String(meta)
+    return '[无法序列化错误详情]'
   }
 }
 
@@ -44,8 +83,21 @@ const COMMANDS = {
   sync: runSyncCommand,
   clean: runCleanCommand,
   undo: runUndoCommand,
+  continue: runContinueCommand,
+  abort: runAbortCommand,
+  rescue: runRescueCommand,
+  stash: runStashCommand,
+  sw: runSwCommand,
+  switch: runSwCommand,
+  log: runLogCommand,
+  amend: runAmendCommand,
+  fixup: runFixupCommand,
   migrate: runMigrateCommand,
   tag: runTagCommand,
+  release: runReleaseCommand,
+  pr: runPrCommand,
+  mr: runPrCommand,
+  open: runOpenCommand,
   config: runConfigCommand,
   doctor: runDoctorCommand,
   explain: runExplainCommand,
@@ -58,6 +110,54 @@ const COMMANDS = {
 
 const NO_UPDATE_NOTIFICATION_COMMANDS = new Set(['help', 'completion', '__complete'])
 
+const MAIN_MENU = [
+  { value: 'ready', label: 'ready', hint: '看看仓库现在什么状态' },
+  { value: 'save', label: 'save', hint: '提交改动（引导写提交信息）' },
+  { value: 'push', label: 'push', hint: '提交并推送，可选合并到其他分支' },
+  { value: 'sw', label: 'sw', hint: '切换分支' },
+  { value: 'checkout', label: 'checkout', hint: '切换或新建分支' },
+  { value: 'sync', label: 'sync', hint: '同步分支' },
+  { value: 'stash', label: 'stash', hint: '暂存 / 恢复改动' },
+  { value: 'log', label: 'log', hint: '最近的提交' },
+  { value: 'amend', label: 'amend', hint: '修改上一个提交' },
+  { value: 'fixup', label: 'fixup', hint: '把改动合进更早的提交' },
+  { value: 'undo', label: 'undo', hint: '撤销 / 回滚' },
+  { value: 'continue', label: 'continue', hint: '冲突解决后继续' },
+  { value: 'rescue', label: 'rescue', hint: '找回丢失的提交和改动' },
+  { value: 'clean', label: 'clean', hint: '清理已合并的分支' },
+  { value: 'pr', label: 'pr create', hint: '创建 PR / MR' },
+  { value: 'open', label: 'open', hint: '在浏览器打开仓库' },
+  { value: 'tag', label: 'tag', hint: '打 tag' },
+  { value: 'release', label: 'release', hint: '发版' },
+  { value: 'config', label: 'config', hint: '配置 token / AI / remote' },
+  { value: 'doctor', label: 'doctor', hint: '环境检查' },
+  { value: 'help', label: 'help', hint: '查看全部命令' }
+]
+
+async function pickCommandFromMenu() {
+  // 有被冲突打断的操作时，把“继续 / 放弃”放在最前面。
+  let paused = null
+  try {
+    paused = await inspectPausedWork({})
+  } catch {
+    paused = null
+  }
+  const menu = paused
+    ? [
+      { value: 'continue', label: c.yellow('continue'), hint: `冲突解决后继续：${paused.description}` },
+      { value: 'abort', label: 'abort', hint: '放弃被中断的操作并切回原分支' },
+      ...MAIN_MENU
+    ]
+    : MAIN_MENU
+  const picked = await chooseOne(paused ? `有被中断的操作（${paused.description}），要做什么？` : '要做什么？', menu, 0)
+  // pr 从菜单进入时直接走创建流程。
+  if (picked === 'pr') {
+    await COMMANDS.pr(['create'])
+    return ''
+  }
+  return picked
+}
+
 /**
  * 执行 CLI 主流程并在命令成功后触发升级提示检查。
  * 输入为命令行参数与可注入依赖，输出为建议的退出码。
@@ -74,13 +174,30 @@ export async function runCli(argv = process.argv.slice(2), dependencies = {}) {
   }
 
   if (!commandName) {
+    // 终端里直接运行 icode：显示常用操作菜单，选中后直接执行。
+    if (!dependencies.commands && isInteractiveTerminal()) {
+      const picked = await pickCommandFromMenu()
+      if (picked) {
+        await COMMANDS[picked]([])
+      }
+      return 0
+    }
     printHelp()
     return 0
   }
 
+  // --json 调用时 stdout 只输出结构化结果（config 的 --json 是取值参数，不算）。
+  if (commandName !== 'config' && commandArgs.includes('--json')) {
+    logger.setLogsToStderr(true)
+  }
+
   const command = commands[commandName]
   if (!command) {
-    throw new Error(`未知命令: ${commandName}`)
+    throw new IcodeError(`未知命令: ${commandName}`, {
+      code: 'CLI_UNKNOWN_COMMAND',
+      exitCode: 2,
+      meta: { commandName }
+    })
   }
 
   await command(commandArgs)
@@ -92,9 +209,23 @@ export async function runCli(argv = process.argv.slice(2), dependencies = {}) {
   return 0
 }
 
+// 需要跟一个值的全局参数（值不能被当成命令名）。
+const GLOBAL_VALUE_FLAGS = new Set(['-R', '--remote'])
+
 function parseEntryArgs(argv) {
   const args = normalizeLegacyArgs(argv)
-  const firstCommandIndex = args.findIndex((arg) => !arg.startsWith('-'))
+  let firstCommandIndex = -1
+  for (let index = 0; index < args.length; index += 1) {
+    const arg = args[index]
+    if (GLOBAL_VALUE_FLAGS.has(arg)) {
+      index += 1
+      continue
+    }
+    if (!arg.startsWith('-')) {
+      firstCommandIndex = index
+      break
+    }
+  }
 
   const globalArgs = firstCommandIndex === -1 ? args : args.slice(0, firstCommandIndex)
   const commandName = firstCommandIndex === -1 ? null : args[firstCommandIndex]
@@ -108,7 +239,24 @@ function parseEntryArgs(argv) {
 }
 
 function applyGlobalFlags(globalArgs) {
-  for (const flag of globalArgs) {
+  for (let index = 0; index < globalArgs.length; index += 1) {
+    const flag = globalArgs[index]
+    if (flag === '-R' || flag === '--remote' || flag.startsWith('--remote=')) {
+      const value = flag.startsWith('--remote=') ? flag.slice('--remote='.length) : globalArgs[index + 1]
+      if (!flag.startsWith('--remote=')) {
+        index += 1
+      }
+      if (!value || value.startsWith('-')) {
+        throw new IcodeError('--remote 需要指定 remote 名称，例如: icode --remote upstream sync', {
+          code: 'CLI_REMOTE_REQUIRED',
+          exitCode: 2
+        })
+      }
+      // 通过环境变量传给所有命令的仓库上下文解析。
+      process.env.ICODE_REMOTE = value
+      continue
+    }
+
     if (flag === '-d' || flag === '--debug') {
       logger.setVerbose(true)
       process.env.ICODE_DEBUG = '1'
@@ -123,7 +271,11 @@ function applyGlobalFlags(globalArgs) {
       }
     }
 
-    throw new Error(`未知全局参数: ${flag}`)
+    throw new IcodeError(`未知全局参数: ${flag}`, {
+      code: 'CLI_UNKNOWN_GLOBAL_FLAG',
+      exitCode: 2,
+      meta: { flag }
+    })
   }
 
   return {
@@ -144,8 +296,23 @@ export async function main(argv = process.argv.slice(2), dependencies = {}) {
  * 统一处理 CLI 异常并输出对用户可读的错误信息。
  * 输入为任意异常对象，输出为进程退出。
  */
-export function handleCliError(error) {
+export function handleCliError(error, argv = process.argv.slice(2)) {
   const normalized = asIcodeError(error)
+
+  // 带 --json 的调用（通常是脚本或 AI agent）同时在 stdout 输出结构化错误。
+  // config ai options set 的 --json 是取值参数，不算 JSON 输出模式。
+  const { commandName } = parseEntryArgs(argv)
+  if (argv.includes('--json') && commandName !== 'config') {
+    process.stdout.write(`${JSON.stringify({
+      ok: false,
+      error: {
+        code: normalized.code || 'UNKNOWN',
+        message: normalized.message,
+        exitCode: normalized.exitCode || 1
+      }
+    }, null, 2)}\n`)
+  }
+
   logger.error(normalized.message)
 
   if (normalized.code === 'AI_EMPTY_RESPONSE') {

package/src/commands/checkout.js

@@ -1,21 +1,28 @@
 import { parseArgs } from 'node:util'
 import { normalizeLegacyArgs } from '../core/cli/args.js'
+import { c, ui } from '../core/cli/render.js'
+import { resolveGitContext } from '../core/git/context.js'
+import { GitService } from '../core/git/service.js'
+import { chooseOne, input, isInteractiveTerminal } from '../core/tools/interactive.js'
+import { listSwitchCandidates } from '../workflows/switch-workflow.js'
 import { logger } from '../core/tools/logger.js'
 import { runCheckoutWorkflow } from '../workflows/checkout-workflow.js'
 
 function printHelp() {
   process.stdout.write(`
 Usage:
-  icode checkout <branch> [base] [options]
+  icode checkout [branch] [base] [options]
 
 Arguments:
-  <branch>               目标分支名（必填）
+  [branch]               目标分支名；在终端里不传时可直接选择或新建
   [base]                 新建分支基线，默认主分支
 
 Options:
   -y, --yes              自动确认（跳过交互提示）
-  --push-origin          新建分支后立即推送到 origin
+  --push-origin          新建分支后立即推送到远程（当前 remote）
   --pull-main            切换后同步主分支到当前分支
+  --autostash            有未提交改动时自动 stash，切换后恢复
+  --json                 输出机器可读 JSON
   --repo-mode <mode>     仓库模式: auto(自动继承父仓库) | strict(禁止继承)
   --no-verify            跳过 hook/husky 校验
   -h, --help             查看帮助
@@ -25,6 +32,44 @@ Notes:
 `)
 }
 
+async function pickCheckoutTarget(repoMode) {
+  const context = await resolveGitContext({ repoMode })
+  const git = new GitService(context)
+  const candidates = (await listSwitchCandidates(git, { all: true })).filter((item) => item.name !== context.currentBranch)
+  const choice = await chooseOne('切换到哪个分支？', [
+    { value: '__new__', label: c.green('+ 新建分支…') },
+    ...candidates.map((item) => ({
+      value: item.name,
+      label: item.name,
+      hint: [item.kind === 'remote' ? '仅远程' : '', ui.sync(item.ahead, item.behind), item.relativeDate].filter(Boolean).join(' · ')
+    }))
+  ], candidates.length ? 1 : 0)
+
+  if (choice !== '__new__') {
+    return { branchName: choice }
+  }
+
+  const prefix = await chooseOne('分支类型', [
+    { value: 'feature/', label: 'feature/', hint: '新功能' },
+    { value: 'fix/', label: 'fix/', hint: '修复' },
+    { value: 'hotfix/', label: 'hotfix/', hint: '线上紧急修复' },
+    { value: 'chore/', label: 'chore/', hint: '杂项' },
+    { value: 'release/', label: 'release/', hint: '发版' },
+    { value: '', label: '不加前缀' }
+  ], 0, { filter: false })
+  const name = await input(`分支名 ${c.gray(prefix || '')}`, '')
+  if (!name) {
+    return null
+  }
+  const bases = [...new Set([context.defaultBranch, context.currentBranch, ...candidates.filter((item) => item.kind === 'local').map((item) => item.name)])].filter(Boolean)
+  const base = await chooseOne('基于哪个分支创建？', bases.map((item) => ({
+    value: item,
+    label: item,
+    hint: item === context.defaultBranch ? '主分支' : item === context.currentBranch ? '当前分支' : ''
+  })), 0)
+  return { branchName: `${prefix}${name.replace(/\s+/g, '-')}`, baseBranchName: base }
+}
+
 export async function runCheckoutCommand(rawArgs) {
   const args = normalizeLegacyArgs(rawArgs)
   const parsed = parseArgs({
@@ -35,25 +80,47 @@ export async function runCheckoutCommand(rawArgs) {
       help: { type: 'boolean', short: 'h', default: false },
       'push-origin': { type: 'boolean', default: false },
       'pull-main': { type: 'boolean', default: false },
+      autostash: { type: 'boolean', default: false },
+      json: { type: 'boolean', default: false },
       'repo-mode': { type: 'string', default: 'auto' },
       'no-verify': { type: 'boolean', default: false }
     }
   })
 
-  if (parsed.values.help || parsed.positionals.length < 1) {
+  if (parsed.values.help) {
     printHelp()
     return
   }
 
-  const [branchName, baseBranchName] = parsed.positionals
+  let [branchName, baseBranchName] = parsed.positionals
+  if (!branchName) {
+    if (parsed.values.json || !isInteractiveTerminal()) {
+      printHelp()
+      return
+    }
+    // 不传分支名时直接选择：已有分支，或新建分支（只需输入名字，基线也用选的）。
+    const picked = await pickCheckoutTarget(parsed.values['repo-mode'])
+    if (!picked) {
+      return
+    }
+    ;({ branchName, baseBranchName } = picked)
+  }
   const result = await runCheckoutWorkflow({
     branchName,
     baseBranchName,
     pushOrigin: parsed.values['push-origin'],
     pullMain: parsed.values['pull-main'],
+    autostash: parsed.values.autostash,
     repoMode: parsed.values['repo-mode'],
     noVerify: parsed.values['no-verify']
   })
 
-  logger.success(`checkout 完成: ${result.branchName}`)
+  if (parsed.values.json) {
+    process.stdout.write(`${JSON.stringify({ ok: true, ...result }, null, 2)}\n`)
+    return result
+  }
+
+  const how = { local: '', tracking: c.gray(`（跟踪 ${result.remote}/${result.branchName}）`), created: c.gray(`（基于 ${result.baseBranchName} 新建）`) }[result.mode] || ''
+  logger.success(`已切换到 ${c.bold(ui.branch(result.branchName))}${how}`)
+  return result
 }

package/src/commands/clean.js

@@ -1,5 +1,7 @@
 import { parseArgs } from 'node:util'
 import { normalizeLegacyArgs } from '../core/cli/args.js'
+import { printJson } from '../core/cli/output.js'
+import { c, print, table, title, ui } from '../core/cli/render.js'
 import { logger } from '../core/tools/logger.js'
 import { runCleanWorkflow } from '../workflows/clean-workflow.js'
 
@@ -9,19 +11,27 @@ Usage:
   icode clean [options]
 
 Options:
-  --merged-target <branch>   基于该分支判断“已合并”状态，默认主分支
+  --merged-target <branch>   基于该分支判断“已合并”状态，默认主分支（优先用远程版本）
+  --merged                   清理已合并分支（默认；与 --gone/--stale 同用时取并集）
+  --gone                     清理远程分支已被删除的本地分支
+  --stale <days>             清理超过 N 天没有新提交的本地分支
   --keep <branch|csv>        额外保留分支，可重复使用或逗号分隔
-  --remote                   同时删除远程分支
+  --remote                   同时删除远程分支（仅限已合并的分支）
   --force                    强制删除本地分支（-D）
+  --dry-run                  只列出将被删除的分支
+  --json                     输出机器可读 JSON
   -y, --yes                  自动确认（跳过确认提示）
   --repo-mode <mode>         仓库模式: auto(自动继承父仓库) | strict(禁止继承)
   -h, --help                 查看帮助
 
 Notes:
-  默认保护当前分支/主分支/受保护分支。
+  默认保护当前分支/主分支/受保护分支。不会切换分支，工作区有改动也可以执行。
+  删除前会自动创建恢复点，误删可用 icode rescue 找回。
 
 Examples:
   icode clean
+  icode clean --gone -y
+  icode clean --stale 90 --dry-run
   icode clean --merged-target main --keep release,hotfix
   icode clean --remote --force -y
 `)
@@ -35,9 +45,14 @@ export async function runCleanCommand(rawArgs) {
     allowPositionals: true,
     options: {
       'merged-target': { type: 'string' },
+      merged: { type: 'boolean', default: false },
+      gone: { type: 'boolean', default: false },
+      stale: { type: 'string' },
       keep: { type: 'string', multiple: true, default: [] },
       remote: { type: 'boolean', default: false },
       force: { type: 'boolean', default: false },
+      'dry-run': { type: 'boolean', default: false },
+      json: { type: 'boolean', default: false },
       yes: { type: 'boolean', short: 'y', default: false },
       'repo-mode': { type: 'string', default: 'auto' },
       help: { type: 'boolean', short: 'h', default: false }
@@ -51,18 +66,43 @@ export async function runCleanCommand(rawArgs) {
 
   const result = await runCleanWorkflow({
     mergedTarget: parsed.values['merged-target'],
+    merged: parsed.values.merged,
+    gone: parsed.values.gone,
+    stale: parsed.values.stale,
     keep: parsed.values.keep,
     remote: parsed.values.remote,
     force: parsed.values.force,
+    dryRun: parsed.values['dry-run'],
+    json: parsed.values.json,
     yes: parsed.values.yes,
     repoMode: parsed.values['repo-mode']
   })
 
+  if (parsed.values.json) {
+    printJson(result)
+    return result
+  }
+
   if (result.canceled) {
-    return
+    return result
   }
 
-  logger.success(
-    `clean 完成: 本地删除 ${result.deletedLocal.length} 个, 远程删除 ${result.deletedRemote.length} 个`
-  )
+  if (result.dryRun) {
+    print(title(`将删除 ${result.candidates.length} 个分支（dry-run）`))
+    print(table(result.candidates, [
+      { key: 'branch', label: '分支', format: (value) => ui.branch(value) },
+      { key: 'reasons', label: '原因', format: (value) => c.gray(value.join('；')) }
+    ]))
+    return result
+  }
+
+  ;(result.failed || []).forEach((item) => logger.warn(`删除失败: ${ui.branch(item.branch)} ${c.gray(item.reason)}`))
+  if (!result.deletedLocal.length && !result.failed?.length) {
+    return result
+  }
+  logger.success(`已删除本地分支 ${c.bold(String(result.deletedLocal.length))} 个${result.deletedRemote.length ? `，远程分支 ${c.bold(String(result.deletedRemote.length))} 个` : ''}`)
+  if (result.backupId) {
+    logger.hint(`误删可用 icode rescue restore ${result.backupId} 找回`)
+  }
+  return result
 }