@icode-js/icode 3.2.0 → 3.4.0

package/src/commands/release.js

@@ -0,0 +1,112 @@
+import { parseCommandArgs, printJson } from '../core/cli/output.js'
+import { c, keyValues, print, renderMarkdown, title, ui } from '../core/cli/render.js'
+import { logger } from '../core/tools/logger.js'
+
+import { runReleaseWorkflow } from '../workflows/release-workflow.js'
+
+function printHelp() {
+  process.stdout.write(`
+Usage:
+  icode release [options]
+
+Options:
+  -b, --bump <kind>        版本升级: auto(默认，按提交推断) | patch | minor | major | prerelease
+  --preid <id>             预发布标识，例如 beta、rc
+  -n, --name <tag>         直接指定 tag 名（不自动计算）
+  --write-changelog        把 changelog 写到 CHANGELOG.md 顶部并提交
+  --changelog-file <path>  指定 changelog 文件（隐含 --write-changelog）
+  --update-package         同步更新 package.json 的 version（会一起提交）
+  --no-platform            不创建 GitHub/GitLab/Gitee/Gitea Release
+  --draft                  平台 Release 设为草稿
+  --prerelease             平台 Release 标记为预发布
+  --no-push                只在本地打 tag，不推送
+  --dry-run                只展示版本号和 changelog
+  --json                   输出机器可读 JSON
+  -y, --yes                自动确认
+  --no-verify              跳过 hook 校验
+  --repo-mode <mode>       仓库模式: auto | strict
+  -h, --help               查看帮助
+
+Notes:
+  流程: 计算版本 -> 生成 changelog -> (可选)写文件并提交 -> 打 tag 并推送 -> 创建平台 Release。
+  版本推断基于 Conventional Commits：破坏性变更 -> major，feat -> minor，其它 -> patch。
+
+Examples:
+  icode release --dry-run
+  icode release -y
+  icode release --bump minor --write-changelog --update-package -y
+  icode release --bump prerelease --preid rc
+`)
+}
+
+export async function runReleaseCommand(rawArgs) {
+  const { values } = parseCommandArgs(rawArgs, {
+    bump: { type: 'string', short: 'b' },
+    preid: { type: 'string' },
+    name: { type: 'string', short: 'n' },
+    'write-changelog': { type: 'boolean', default: false },
+    'changelog-file': { type: 'string' },
+    'update-package': { type: 'boolean', default: false },
+    'no-platform': { type: 'boolean', default: false },
+    draft: { type: 'boolean', default: false },
+    prerelease: { type: 'boolean', default: false },
+    'no-push': { type: 'boolean', default: false },
+    'dry-run': { type: 'boolean', default: false },
+    'no-verify': { type: 'boolean', default: false }
+  })
+
+  if (values.help) {
+    printHelp()
+    return
+  }
+
+  const result = await runReleaseWorkflow({
+    bump: values.bump,
+    preid: values.preid,
+    name: values.name,
+    writeChangelog: values['write-changelog'],
+    changelogFile: values['changelog-file'],
+    updatePackage: values['update-package'],
+    platform: !values['no-platform'],
+    draft: values.draft,
+    prerelease: values.prerelease,
+    noPush: values['no-push'],
+    dryRun: values['dry-run'],
+    noVerify: values['no-verify'],
+    yes: values.yes,
+    repoMode: values['repo-mode']
+  })
+
+  if (values.json) {
+    printJson(result)
+    return result
+  }
+
+  if (result.canceled) {
+    logger.warn('已取消发版。')
+    return result
+  }
+
+  if (result.dryRun) {
+    print(title('发版预览（dry-run）'))
+    print(keyValues([
+      ['版本', `${result.previousTag ? ui.tag(result.previousTag) : c.gray('(无)')} ${c.gray('→')} ${c.bold(ui.tag(result.tagName))}  ${c.gray(`${result.bump} · ${result.commitCount} 个提交`)}`],
+      ['分支', ui.branch(result.branch)],
+      ['changelog 文件', result.changelogFile ? ui.path(result.changelogFile) : c.gray('不写入（--write-changelog 开启）')],
+      ['平台 Release', result.platform ? (result.platformToken ? c.green(result.platform) : `${c.yellow(result.platform)} ${c.gray('(未配置 token，只给出链接)')}`) : c.gray('不创建')]
+    ]))
+    print('')
+    print(renderMarkdown(result.changelog))
+    logger.hint('确认无误后去掉 --dry-run 执行')
+    return result
+  }
+
+  logger.success(`已发布 ${c.bold(ui.tag(result.tagName))}${result.pushed ? '' : c.yellow('（仅本地，未推送）')}`)
+  if (result.releaseUrl) {
+    logger.info(`Release: ${ui.url(result.releaseUrl)}`)
+  }
+  if (result.platformError) {
+    logger.warn(result.platformError)
+  }
+  return result
+}

package/src/commands/rescue.js

@@ -0,0 +1,164 @@
+import { IcodeError } from '../core/errors.js'
+import { parseCommandArgs, printJson } from '../core/cli/output.js'
+import { c, print, table, title, ui } from '../core/cli/render.js'
+import { pad } from '../core/tools/theme.js'
+import { chooseOne, isInteractiveTerminal } from '../core/tools/interactive.js'
+import { logger } from '../core/tools/logger.js'
+import {
+  runRescueListWorkflow,
+  runRescuePruneWorkflow,
+  runRescueRestoreWorkflow
+} from '../workflows/rescue-workflow.js'
+
+function printHelp() {
+  process.stdout.write(`
+Usage:
+  icode rescue [list]                               查看恢复点和最近的 HEAD 历史(reflog)
+  icode rescue restore <id[:分支]|commit> [options]  找回内容（默认新建分支，不动当前分支）
+  icode rescue prune [--keep <n>]                   只保留最近 n 个恢复点（默认 20）
+
+Options:
+  --branch <name>       restore 时新建的分支名（默认 rescue/<分支>-<随机>）
+  --reset               restore 时把当前分支硬重置到目标（会先给当前状态建恢复点）
+  --limit <n>           list 时显示的 reflog 条数（默认 20）
+  --keep <n>            prune 保留的恢复点数量
+  --json                输出机器可读 JSON
+  -y, --yes             自动确认
+  --repo-mode <mode>    仓库模式: auto | strict
+  -h, --help            查看帮助
+
+Notes:
+  undo(reset)、push(本地 merge/强推)、sync、migrate、amend、fixup、clean 执行前都会自动创建恢复点。
+  恢复点保存在 refs/icode/backup/ 下，不会被 push，也不会出现在分支列表里。
+
+Examples:
+  icode rescue
+  icode rescue restore 20261102-153012-120
+  icode rescue restore 20261102-153012-120:feature/login --reset
+  icode rescue restore HEAD@{3} --branch fix/lost-work
+`)
+}
+
+function printList(result) {
+  print(title('恢复点'))
+  if (!result.backups.length) {
+    print(c.gray('  暂无。undo / push / amend / fixup / clean 等操作前会自动创建。'))
+  } else {
+    for (const group of result.backups) {
+      print(`  ${c.yellow(group.id)}  ${c.bold(group.reason || '')}`)
+      for (const entry of group.entries) {
+        const name = entry.worktree ? c.cyan('未提交改动') : ui.branch(entry.branch)
+        print(`      ${pad(name, 30)} ${ui.hash(entry.sha)}`)
+      }
+    }
+  }
+
+  if (result.reflog.length) {
+    print('')
+    print(title('最近的 HEAD 历史 (reflog)'))
+    print(table(result.reflog, [
+      { key: 'selector', label: '选择器', format: (value) => c.cyan(value) },
+      { key: 'shortHash', label: '提交', format: (value) => ui.hash(value) },
+      { key: 'relativeDate', label: '时间', format: (value) => ui.time(value) },
+      { key: 'subject', label: '操作', maxWidth: 70 }
+    ]))
+  }
+
+  print('')
+  logger.hint('找回: icode rescue restore <恢复点id 或 HEAD@{n}>')
+}
+
+function printRestoreResult(result) {
+  if (result.action === 'apply-worktree') {
+    logger.success('已把备份的未提交改动应用回工作区。')
+    return
+  }
+  if (result.action === 'reset') {
+    logger.success(`已把 ${ui.branch(result.branch)} 重置到 ${ui.hash(result.target.sha)}`)
+    logger.hint(`重置前的状态已存为恢复点 ${result.backupId}`)
+    return
+  }
+  logger.success(`已新建分支 ${ui.branch(result.branch)} → ${ui.hash(result.target.sha)}`)
+  logger.hint(`切换过去查看: icode sw ${result.branch}`)
+}
+
+function toInteger(value, label) {
+  if (value == null) {
+    return undefined
+  }
+  const number = Number(value)
+  if (!Number.isInteger(number) || number < 0) {
+    throw new IcodeError(`${label} 需要非负整数`, { code: 'RESCUE_ARG_INVALID', exitCode: 2 })
+  }
+  return number
+}
+
+export async function runRescueCommand(rawArgs) {
+  const parsed = parseCommandArgs(rawArgs, {
+    branch: { type: 'string' },
+    reset: { type: 'boolean', default: false },
+    limit: { type: 'string' },
+    keep: { type: 'string' },
+    entry: { type: 'string' }
+  })
+  const { values, positionals } = parsed
+
+  if (values.help) {
+    printHelp()
+    return
+  }
+
+  const [subcommand = 'list', target] = positionals
+  const base = { repoMode: values['repo-mode'], yes: values.yes }
+
+  if (subcommand === 'list') {
+    const result = await runRescueListWorkflow({ ...base, limit: toInteger(values.limit, '--limit') })
+    if (values.json) {
+      printJson(result)
+      return result
+    }
+    printList(result)
+
+    // 交互终端里直接选择要恢复的恢复点，省去复制 id。
+    if (!values.yes && isInteractiveTerminal() && result.backups.length) {
+      const choice = await chooseOne('要找回其中一个恢复点吗？', [
+        { value: '', label: '不用了' },
+        ...result.backups.slice(0, 15).map((group) => ({ value: group.id, label: group.reason || group.id, hint: `${group.id} · ${group.entries.map((entry) => entry.branch).join(', ')}` }))
+      ], 0)
+      if (choice) {
+        const restored = await runRescueRestoreWorkflow({ ...base, target: choice })
+        printRestoreResult(restored)
+        return restored
+      }
+    }
+    return result
+  }
+
+  if (subcommand === 'restore') {
+    const result = await runRescueRestoreWorkflow({
+      ...base,
+      target,
+      branch: values.branch,
+      reset: values.reset,
+      entry: values.entry
+    })
+    if (values.json) {
+      printJson(result)
+      return result
+    }
+    printRestoreResult(result)
+    return result
+  }
+
+  if (subcommand === 'prune') {
+    const result = await runRescuePruneWorkflow({ ...base, keep: toInteger(values.keep, '--keep') })
+    if (values.json) {
+      printJson(result)
+      return result
+    }
+    logger.success(`已清理 ${result.removed.length} 个旧恢复点，保留最近 ${result.keep} 个。`)
+    return result
+  }
+
+  throw new IcodeError(`未知 rescue 子命令: ${subcommand}`, { code: 'RESCUE_SUBCOMMAND_UNKNOWN', exitCode: 2 })
+}

package/src/commands/save.js

@@ -1,5 +1,8 @@
 import { parseArgs } from 'node:util'
 import { normalizeLegacyArgs } from '../core/cli/args.js'
+import { formatRiskFindings } from '../core/git/file-guard.js'
+import { c, formatChanges, keyValues, print, ui } from '../core/cli/render.js'
+import { isInteractiveTerminal } from '../core/tools/interactive.js'
 import { logger } from '../core/tools/logger.js'
 import { runSaveWorkflow } from '../workflows/save-workflow.js'
 
@@ -10,14 +13,19 @@ import { runSaveWorkflow } from '../workflows/save-workflow.js'
 function printHelp() {
   process.stdout.write(`
 Usage:
-  icode save (--message <msg> | --ai-commit) [options]
+  icode save [--message <msg> | --ai-commit] [path...] [options]
+
+Arguments:
+  [path...]              只提交这些路径（文件或目录）；不传则提交全部改动
 
 Options:
   -m, --message <msg>    指定提交信息
   --ai-commit            使用 AI 根据全部未提交改动生成提交信息
   --profile <name>       指定 AI profile（仅 --ai-commit 使用）
   --lang <zh|en>         AI 提交信息语言，默认 zh
-  --dry-run              只检查并展示将提交的信息，不执行 add/commit
+  --staged-only          只提交暂存区（不自动 git add）
+  --allow-risky          检测到敏感文件/疑似密钥/大文件时仍继续提交
+  --dry-run              只检查并展示将提交的信息与风险，不执行 add/commit
   --json                 输出机器可读 JSON
   --repo-mode <mode>     仓库模式: auto(自动继承父仓库) | strict(禁止继承)
   --no-verify            commit 时跳过 hook/husky 校验
@@ -25,7 +33,15 @@ Options:
   -h, --help             查看帮助
 
 Notes:
-  save 是安全快速提交场景：检查状态 -> 暂存全部改动 -> commit。不会 push。
+  在终端里不传 -m 时会进入提交信息向导（AI 生成 / 选类型+范围 / 手动输入）。
+  save 是安全快速提交场景：检查状态 -> 风险扫描 -> 暂存 -> commit。不会 push。
+  风险规则可在仓库根目录 .icoderc.json 的 save 字段调整（maxFileSizeMB / sensitivePatterns / allowPatterns）。
+
+Examples:
+  icode save -m "feat: login"
+  icode save -m "fix: typo" src/pages/login.vue
+  icode save --staged-only -m "chore: partial"
+  icode save --ai-commit --dry-run --json
 `)
 }
 
@@ -34,19 +50,33 @@ Notes:
  * 输入为 workflow 结果，输出分色摘要。
  */
 function printSaveResult(result) {
-  logger.info(`仓库根目录: ${result.context.topLevelPath}`)
-  logger.info(`当前分支: ${logger.color('green', result.context.currentBranch)}`)
-  logger.info(`提交来源: ${result.source === 'ai' ? logger.color('cyan', 'AI') : logger.color('cyan', 'message')}`)
-  logger.info(`改动统计: staged=${result.changes.staged}, unstaged=${result.changes.unstaged}, untracked=${result.changes.untracked}`)
+  const scopeText = result.scope === 'staged'
+    ? '仅暂存区'
+    : result.scope === 'paths'
+      ? `指定路径 ${result.paths.map(ui.path).join(' ')}`
+      : '全部改动'
+
+  print(keyValues([
+    ['分支', ui.branch(result.context.currentBranch)],
+    ['改动', formatChanges(result.changes)],
+    ['范围', `${scopeText} ${c.gray(`(${result.files?.length || 0} 个文件)`)}`],
+    ['来源', result.source === 'ai' ? c.magenta('AI 生成') : '手动填写']
+  ]))
+
+  if (result.risks?.length) {
+    print('')
+    logger.warn(`发现 ${result.risks.length} 个风险文件:\n${formatRiskFindings(result.risks)}`)
+  }
 
+  print('')
   if (result.dryRun) {
-    logger.warn('dry-run: 未执行 git add 或 git commit')
-    logger.info(`计划提交信息:\n${logger.color('yellow', result.commitMessage)}`)
+    print(`  ${c.yellow('dry-run')} ${c.gray('未执行 git add / git commit')}`)
+    print(`  ${ui.subject(result.commitMessage.split('\n')[0])}`)
     return
   }
 
-  logger.success(`本地提交已创建: ${logger.color('green', result.commitId)}`)
-  logger.info(`提交信息:\n${result.commitMessage}`)
+  logger.success(`已提交 ${ui.hash(result.commitId)} ${ui.subject(result.commitMessage.split('\n')[0])}`)
+  logger.hint('推送: icode push')
 }
 
 /**
@@ -63,6 +93,8 @@ export async function runSaveCommand(rawArgs) {
       'ai-commit': { type: 'boolean', default: false },
       profile: { type: 'string', default: '' },
       lang: { type: 'string', default: 'zh' },
+      'staged-only': { type: 'boolean', default: false },
+      'allow-risky': { type: 'boolean', default: false },
       'dry-run': { type: 'boolean', default: false },
       json: { type: 'boolean', default: false },
       'repo-mode': { type: 'string', default: 'auto' },
@@ -83,6 +115,10 @@ export async function runSaveCommand(rawArgs) {
     profile: parsed.values.profile,
     lang: parsed.values.lang,
     dryRun: parsed.values['dry-run'],
+    interactive: !parsed.values.json && isInteractiveTerminal(),
+    paths: parsed.positionals,
+    stagedOnly: parsed.values['staged-only'],
+    allowRisky: parsed.values['allow-risky'],
     repoMode: parsed.values['repo-mode'],
     noVerify: parsed.values['no-verify'],
     yes: parsed.values.yes
@@ -93,6 +129,11 @@ export async function runSaveCommand(rawArgs) {
     return result
   }
 
+  if (result.canceled) {
+    logger.warn('已取消，未提交。')
+    return result
+  }
+
   printSaveResult(result)
   return result
 }

package/src/commands/stash.js

@@ -0,0 +1,210 @@
+import { IcodeError } from '../core/errors.js'
+import { parseCommandArgs, printJson } from '../core/cli/output.js'
+import { c, print, table, ui } from '../core/cli/render.js'
+import { resolveGitContext } from '../core/git/context.js'
+import { GitService } from '../core/git/service.js'
+import { chooseOne, confirm, isInteractiveTerminal } from '../core/tools/interactive.js'
+import { logger } from '../core/tools/logger.js'
+
+function printHelp() {
+  process.stdout.write(`
+Usage:
+  icode stash                         交互式选择 stash 并操作（应用/弹出/删除/查看）
+  icode stash list                    列出 stash
+  icode stash save [-m <msg>] [path...] 暂存当前改动（默认包含未跟踪文件）
+  icode stash apply [ref]             应用 stash（保留记录），默认最新
+  icode stash pop [ref]               应用并删除 stash，默认最新
+  icode stash drop [ref]              删除 stash（会确认）
+  icode stash show [ref]              查看 stash 包含的文件
+
+Options:
+  -m, --message <msg>   save 时的说明
+  --staged              save 时只暂存已 add 的改动
+  --no-untracked        save 时不包含未跟踪文件
+  --index               apply/pop 时恢复暂存区状态
+  --json                输出机器可读 JSON
+  -y, --yes             自动确认
+  --repo-mode <mode>    仓库模式: auto | strict
+  -h, --help            查看帮助
+
+Notes:
+  ref 可以写 stash@{1}，也可以只写数字 1。
+
+Examples:
+  icode stash save -m "wip: login"
+  icode stash pop
+  icode stash apply 2
+`)
+}
+
+// 支持只写数字的 stash 引用。
+function normalizeStashRef(ref) {
+  const value = String(ref || '').trim()
+  if (!value) {
+    return 'stash@{0}'
+  }
+  return /^\d+$/.test(value) ? `stash@{${value}}` : value
+}
+
+function printStashList(list) {
+  if (!list.length) {
+    print(c.gray('  没有 stash。用 icode stash save -m "说明" 暂存当前改动。'))
+    return
+  }
+  print(table(list, [
+    { key: 'ref', label: 'stash', format: (value) => c.yellow(value) },
+    { key: 'relativeDate', label: '时间', format: (value) => ui.time(value) },
+    { key: 'subject', label: '说明', maxWidth: 80 }
+  ]))
+}
+
+async function ensureStashExists(git, ref) {
+  const list = await git.stashList()
+  const entry = list.find((item) => item.ref === ref)
+  if (!entry) {
+    throw new IcodeError(`stash 不存在: ${ref}`, { code: 'STASH_NOT_FOUND', exitCode: 2 })
+  }
+  return entry
+}
+
+async function applyStash(git, ref, options) {
+  try {
+    await git.stashApply(ref, { pop: options.pop, index: options.index })
+  } catch (error) {
+    const text = `${error?.meta?.stdout || ''}\n${error?.meta?.stderr || ''}`
+    if (/CONFLICT|conflict/i.test(text)) {
+      throw new IcodeError(
+        `应用 ${ref} 时发生冲突。请解决冲突文件后 git add；stash 记录${options.pop ? '已保留' : '仍在'}，确认无误后可执行 icode stash drop ${ref}。`,
+        { code: 'STASH_APPLY_CONFLICT', exitCode: 2, cause: error }
+      )
+    }
+    throw error
+  }
+}
+
+/**
+ * 执行 stash 子命令。
+ * 输入为原始参数，输出各子命令结果；无子命令时进入交互选择。
+ */
+export async function runStashCommand(rawArgs) {
+  const parsed = parseCommandArgs(rawArgs, {
+    message: { type: 'string', short: 'm' },
+    staged: { type: 'boolean', default: false },
+    'no-untracked': { type: 'boolean', default: false },
+    index: { type: 'boolean', default: false }
+  })
+  const { values, positionals } = parsed
+
+  if (values.help) {
+    printHelp()
+    return
+  }
+
+  const context = await resolveGitContext({ repoMode: values['repo-mode'] })
+  const git = new GitService(context)
+  let [subcommand = '', ...rest] = positionals
+
+  if (!subcommand) {
+    if (values.json || !isInteractiveTerminal()) {
+      subcommand = 'list'
+    } else {
+      const list = await git.stashList()
+      if (!list.length) {
+        logger.info('没有 stash。可以用 icode stash save -m "<说明>" 暂存当前改动。')
+        return
+      }
+      const ref = await chooseOne('选择 stash', list.map((item) => ({
+        value: item.ref,
+        label: `${item.ref}  ${item.subject}`,
+        hint: item.relativeDate
+      })), 0)
+      const action = await chooseOne(`对 ${ref} 执行`, [
+        { value: 'pop', label: '应用并删除（pop）' },
+        { value: 'apply', label: '应用但保留（apply）' },
+        { value: 'show', label: '查看包含的文件' },
+        { value: 'drop', label: '删除' },
+        { value: '', label: '取消' }
+      ], 0)
+      if (!action) {
+        return
+      }
+      subcommand = action
+      rest = [ref]
+    }
+  }
+
+  if (subcommand === 'list') {
+    const list = await git.stashList()
+    if (values.json) {
+      printJson({ stashes: list })
+      return list
+    }
+    printStashList(list)
+    return list
+  }
+
+  if (subcommand === 'save' || subcommand === 'push') {
+    const changes = await git.getStatusSummary()
+    if (changes.clean) {
+      throw new IcodeError('没有需要暂存的改动。', { code: 'STASH_NO_CHANGES', exitCode: 2 })
+    }
+    await git.stashPush({
+      message: values.message,
+      staged: values.staged,
+      includeUntracked: !values['no-untracked'] && !values.staged,
+      paths: rest
+    })
+    const [latest] = await git.stashList()
+    if (values.json) {
+      printJson({ action: 'save', stash: latest })
+      return latest
+    }
+    logger.success(`已暂存: ${latest?.ref || 'stash@{0}'} ${latest?.subject || ''}`)
+    return latest
+  }
+
+  const ref = normalizeStashRef(rest[0])
+
+  if (subcommand === 'apply' || subcommand === 'pop') {
+    const entry = await ensureStashExists(git, ref)
+    await applyStash(git, ref, { pop: subcommand === 'pop', index: values.index })
+    if (values.json) {
+      printJson({ action: subcommand, stash: entry })
+      return entry
+    }
+    logger.success(`已${subcommand === 'pop' ? '应用并删除' : '应用'}: ${ref} ${entry.subject}`)
+    return entry
+  }
+
+  if (subcommand === 'drop') {
+    const entry = await ensureStashExists(git, ref)
+    if (!values.yes) {
+      const accepted = await confirm(`确认删除 ${ref}（${entry.subject}）？`, false)
+      if (!accepted) {
+        logger.warn('已取消。')
+        return
+      }
+    }
+    await git.stashDrop(ref)
+    if (values.json) {
+      printJson({ action: 'drop', stash: entry, recoverHint: `git stash apply ${entry.hash}` })
+      return entry
+    }
+    logger.success(`已删除 ${ref}。如需找回: git stash apply ${entry.hash.slice(0, 12)}`)
+    return entry
+  }
+
+  if (subcommand === 'show') {
+    const entry = await ensureStashExists(git, ref)
+    const stat = await git.stashShow(ref)
+    if (values.json) {
+      printJson({ stash: entry, stat })
+      return entry
+    }
+    logger.info(`${ref}  ${entry.subject}`)
+    process.stdout.write(stat)
+    return entry
+  }
+
+  throw new IcodeError(`未知 stash 子命令: ${subcommand}`, { code: 'STASH_SUBCOMMAND_UNKNOWN', exitCode: 2 })
+}