@icode-js/icode 3.2.0 → 3.4.0

package/src/workflows/ready-workflow.js

@@ -1,5 +1,7 @@
+import { resolveRemoteMergePlatform } from './push/remote-merge-step.js'
+import { describeOperationState, loadOperationState } from '../core/git/operation-state.js'
 import { getAiConfig } from '../core/ai/config.js'
-import { getPlatformConfig, getRepoPolicy } from '../core/config/store.js'
+import { getRepoPolicy } from '../core/config/store.js'
 import { resolveGitContext } from '../core/git/context.js'
 import { GitService } from '../core/git/service.js'
 
@@ -94,17 +96,19 @@ function checkCurrentBranch(currentBranch) {
  * 检查是否存在未完成的 Git 操作。
  * 输入为 operation 字符串，输出 ready 检查项。
  */
-function checkInProgressOperation(operation) {
-  if (!operation) {
+function checkInProgressOperation(operation, pausedState) {
+  const paused = describeOperationState(pausedState)
+  if (!operation && !pausedState) {
     return buildCheck('git.operation', 'pass', '没有未完成的 Git 操作', '工作区未处于 merge/rebase/cherry-pick/revert 流程中。')
   }
 
+  const detail = [operation ? `当前操作: ${operation}` : '', paused ? `被中断的 icode 命令: ${paused}` : ''].filter(Boolean).join('；')
   return buildCheck(
     'git.operation',
     'fail',
-    '存在未完成的 Git 操作',
-    `当前操作: ${operation}`,
-    `请先完成或中止 ${operation}，再继续执行 save/push。`
+    '有被中断的操作',
+    detail,
+    '解决冲突后执行 icode continue 接着完成；或执行 icode abort 放弃并切回原分支。'
   )
 }
 
@@ -218,8 +222,8 @@ function checkRemoteMerge(remoteMergePlatform, repoPolicy) {
       'remoteMerge.config',
       'warn',
       '远程合并配置不完整',
-      '缺少 provider 或 apiKey，push -r 不可用。',
-      '如需远程合并，请执行: icode config platform remote-merge set --provider gitlab --api-key <key>'
+      remoteMergePlatform.provider ? `未找到 ${remoteMergePlatform.provider} token，push -r 不可用。` : '无法从 remote 识别代码托管平台，push -r 不可用。',
+      `如需远程合并，请执行: icode config platform token set ${remoteMergePlatform.provider || '<provider>'} <token>`
     )
   }
 
@@ -244,11 +248,11 @@ export async function runReadyWorkflow(options = {}) {
   ])
   const aiConfig = getAiConfig()
   const repoPolicy = getRepoPolicy(context.topLevelPath)
-  const remoteMergePlatform = getPlatformConfig('remoteMerge')
+  const remoteMergePlatform = await resolveRemoteMergePlatform(git)
 
   const checks = [
     checkCurrentBranch(currentBranch),
-    checkInProgressOperation(operation),
+    checkInProgressOperation(operation, loadOperationState(context)),
     checkChanges(changes),
     checkUpstream(upstream),
     checkAiProfile(aiConfig),

package/src/workflows/release-workflow.js

@@ -0,0 +1,189 @@
+import fs from 'node:fs'
+import path from 'node:path'
+import { IcodeError } from '../core/errors.js'
+import { resolveGitContext } from '../core/git/context.js'
+import { assertCleanWorktree, assertNoPendingOperation, assertOnBranch, readGitSafetyState } from '../core/git/preconditions.js'
+import { buildChangelog, parseVersionTag } from '../core/git/semver.js'
+import { GitService } from '../core/git/service.js'
+import { createPlatformClientForGit } from '../core/platform/index.js'
+import { confirm } from '../core/tools/interactive.js'
+import { logger } from '../core/tools/logger.js'
+import { resolveNextSemverTag } from './tag-workflow.js'
+
+function today() {
+  const now = new Date()
+  return `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')}`
+}
+
+// 平台客户端可选：拿不到时只影响链接和平台 Release，不影响打 tag。
+async function tryCreatePlatformClient(git) {
+  try {
+    return await createPlatformClientForGit(git)
+  } catch (error) {
+    logger.debug(`未识别代码托管平台: ${error.message}`)
+    return null
+  }
+}
+
+// 把新版本段落插到 CHANGELOG 顶部（保留已有的一级标题）。
+function prependChangelog(filePath, section) {
+  const existing = fs.existsSync(filePath) ? fs.readFileSync(filePath, 'utf8') : ''
+  if (!existing.trim()) {
+    fs.writeFileSync(filePath, `# Changelog\n\n${section}`, 'utf8')
+    return
+  }
+  const headerMatch = existing.match(/^# .*\n+/)
+  const next = headerMatch
+    ? `${headerMatch[0]}${section}\n${existing.slice(headerMatch[0].length)}`
+    : `${section}\n${existing}`
+  fs.writeFileSync(filePath, next, 'utf8')
+}
+
+// 同步 package.json 的 version 字段（只改这一个字段，保持其它格式）。
+function updatePackageVersion(repoRoot, version) {
+  const filePath = path.resolve(repoRoot, 'package.json')
+  if (!fs.existsSync(filePath)) {
+    return ''
+  }
+  const content = fs.readFileSync(filePath, 'utf8')
+  if (!/"version"\s*:\s*"[^"]*"/.test(content)) {
+    return ''
+  }
+  fs.writeFileSync(filePath, content.replace(/("version"\s*:\s*")[^"]*(")/, `$1${version}$2`), 'utf8')
+  return filePath
+}
+
+/**
+ * 一条命令发版：计算版本 -> 生成 changelog -> （可选）写 CHANGELOG/package.json 并提交 -> 打 tag 推送 -> 创建平台 Release。
+ * 输入为 { bump, name, preid, writeChangelog, changelogFile, updatePackage, platform, draft, prerelease, dryRun, yes }。
+ */
+export async function runReleaseWorkflow(options = {}) {
+  const context = await resolveGitContext({ cwd: options.cwd, repoMode: options.repoMode, remote: options.remote })
+  const git = new GitService(context)
+  const state = await readGitSafetyState(git)
+  assertOnBranch(state.currentBranch, 'release', 'RELEASE_DETACHED_HEAD')
+  assertNoPendingOperation(state.operation, 'release', 'RELEASE_GIT_OPERATION_IN_PROGRESS')
+  if (!options.dryRun) {
+    assertCleanWorktree(state.changes, 'release', 'RELEASE_DIRTY_WORKTREE')
+  }
+
+  await git.exec(['fetch', git.remote, '--tags'], { allowFailure: true })
+
+  const semver = await resolveNextSemverTag(git, { bump: options.bump || 'auto', preid: options.preid, prefix: options.prefix })
+  const tagName = String(options.name || semver.tagName).trim()
+  if (await git.tagExists(tagName)) {
+    throw new IcodeError(`tag 已存在: ${tagName}`, { code: 'RELEASE_TAG_EXISTS', exitCode: 2 })
+  }
+  if (!semver.commits.length) {
+    throw new IcodeError(`自 ${semver.previousTag || '仓库创建'} 以来没有新提交，无需发版。`, { code: 'RELEASE_NO_COMMITS', exitCode: 2 })
+  }
+
+  const client = await tryCreatePlatformClient(git)
+  const changelog = buildChangelog(semver.commits, {
+    version: tagName,
+    date: today(),
+    compareUrl: client && semver.previousTag ? client.urls.compare(semver.previousTag, tagName) : '',
+    commitUrl: client ? (sha) => client.urls.commit(sha) : null
+  })
+  const versionNumber = (() => {
+    const parsed = parseVersionTag(tagName)
+    return parsed ? tagName.slice(parsed.prefix.length) : tagName
+  })()
+  const changelogFile = options.writeChangelog || options.changelogFile
+    ? path.resolve(context.topLevelPath, options.changelogFile || 'CHANGELOG.md')
+    : ''
+
+  const plan = {
+    repoRoot: context.topLevelPath,
+    branch: state.currentBranch,
+    previousTag: semver.previousTag,
+    tagName,
+    version: versionNumber,
+    bump: semver.bump,
+    commitCount: semver.commits.length,
+    changelog,
+    changelogFile: changelogFile ? path.relative(context.topLevelPath, changelogFile) : '',
+    updatePackage: Boolean(options.updatePackage),
+    platform: client && options.platform !== false ? client.name : '',
+    platformToken: Boolean(client?.hasToken)
+  }
+
+  if (options.dryRun) {
+    return { ...plan, dryRun: true }
+  }
+
+  if (!options.yes) {
+    logger.info(`\n${changelog}`)
+    const accepted = await confirm(`确认发布 ${tagName}（${semver.previousTag || '首个版本'} 以来 ${semver.commits.length} 个提交）？`, false)
+    if (!accepted) {
+      return { ...plan, canceled: true }
+    }
+  }
+
+  // 1. 可选：写入 CHANGELOG / package.json 并生成发版提交。
+  const changedFiles = []
+  if (changelogFile) {
+    prependChangelog(changelogFile, changelog)
+    changedFiles.push(changelogFile)
+  }
+  if (options.updatePackage) {
+    const packageFile = updatePackageVersion(context.topLevelPath, versionNumber)
+    if (packageFile) {
+      changedFiles.push(packageFile)
+    }
+  }
+  let releaseCommit = ''
+  if (changedFiles.length) {
+    await git.stagePaths(changedFiles.map((file) => path.relative(context.topLevelPath, file)))
+    await git.commit(`chore(release): ${tagName}`, { noVerify: options.noVerify })
+    releaseCommit = await git.revParseShort('HEAD')
+  }
+
+  // 2. 打 tag，tag 备注就是 changelog。
+  await git.createAnnotatedTag(tagName, changelog)
+
+  // 3. 推送发版提交和 tag。
+  if (!options.noPush) {
+    if (releaseCommit) {
+      await git.push(state.currentBranch, { noVerify: options.noVerify })
+    }
+    try {
+      await git.pushTag(tagName, { noVerify: options.noVerify })
+    } catch (error) {
+      await git.deleteTag(tagName)
+      throw error
+    }
+  }
+
+  // 4. 平台 Release（没有 token 时给出网页链接，不算失败）。
+  let releaseUrl = ''
+  let platformError = ''
+  if (client && options.platform !== false && !options.noPush) {
+    if (client.hasToken) {
+      try {
+        const created = await client.createRelease({
+          tag: tagName,
+          name: tagName,
+          body: changelog,
+          draft: options.draft,
+          prerelease: options.prerelease || Boolean(parseVersionTag(tagName)?.prerelease),
+          target: state.currentBranch
+        })
+        releaseUrl = created.url
+      } catch (error) {
+        platformError = error.message
+      }
+    } else {
+      releaseUrl = client.urls.releases()
+      platformError = `未配置 ${client.name} token，未创建平台 Release`
+    }
+  }
+
+  return {
+    ...plan,
+    releaseCommit,
+    pushed: !options.noPush,
+    releaseUrl,
+    platformError
+  }
+}

package/src/workflows/rescue-workflow.js

@@ -0,0 +1,137 @@
+import { IcodeError } from '../core/errors.js'
+import { createBackup, listBackups, pruneBackups } from '../core/git/backup.js'
+import { resolveGitContext } from '../core/git/context.js'
+import { GitService } from '../core/git/service.js'
+import { chooseOne, isInteractiveTerminal } from '../core/tools/interactive.js'
+import { logger } from '../core/tools/logger.js'
+
+async function openGit(options) {
+  const context = await resolveGitContext({ cwd: options.cwd, repoMode: options.repoMode })
+  return { context, git: new GitService(context) }
+}
+
+/**
+ * 列出可找回的内容：icode 恢复点 + HEAD reflog。
+ * 输入为 { limit }，输出 { backups, reflog }。
+ */
+export async function runRescueListWorkflow(options = {}) {
+  const { context, git } = await openGit(options)
+  const backups = await listBackups(git)
+  const reflog = options.noReflog ? [] : await git.reflogEntries('HEAD', options.limit || 20)
+  return {
+    repoRoot: context.topLevelPath,
+    backups,
+    reflog
+  }
+}
+
+// 根据用户输入定位要恢复的提交：恢复点 id（可带 /分支）或任意 commit/reflog 选择器。
+async function resolveRescueTarget(git, target, options) {
+  const backups = await listBackups(git)
+  const [groupId, ...entryParts] = String(target).split(':')
+  const group = backups.find((item) => item.id === groupId)
+
+  if (!group) {
+    const sha = await git.revParse(target)
+    if (!sha) {
+      throw new IcodeError(`找不到恢复点或提交: ${target}。先执行 icode rescue list 查看。`, {
+        code: 'RESCUE_TARGET_NOT_FOUND',
+        exitCode: 2
+      })
+    }
+    return { sha, branch: '', worktree: false, label: target }
+  }
+
+  const wanted = entryParts.join(':') || options.entry || ''
+  let entries = group.entries
+  if (wanted) {
+    entries = entries.filter((entry) => entry.branch === wanted || (wanted === 'worktree' && entry.worktree))
+  }
+
+  if (entries.length === 1) {
+    return { ...entries[0], label: `${group.id}:${entries[0].branch}` }
+  }
+
+  if (!entries.length) {
+    throw new IcodeError(`恢复点 ${group.id} 中没有 ${wanted}`, { code: 'RESCUE_ENTRY_NOT_FOUND', exitCode: 2 })
+  }
+
+  if (options.yes || !isInteractiveTerminal()) {
+    throw new IcodeError(
+      `恢复点 ${group.id} 包含多个分支，请指定其中一个: ${entries.map((entry) => `${group.id}:${entry.worktree ? 'worktree' : entry.branch}`).join(', ')}`,
+      { code: 'RESCUE_ENTRY_AMBIGUOUS', exitCode: 2 }
+    )
+  }
+
+  const selected = await chooseOne(
+    `恢复点 ${group.id}（${group.reason}）包含多个分支，选择要恢复的：`,
+    entries.map((entry, index) => ({ value: String(index), label: `${entry.branch} @ ${entry.shortSha}` })),
+    0
+  )
+  const entry = entries[Number(selected)]
+  return { ...entry, label: `${group.id}:${entry.branch}` }
+}
+
+function sanitizeBranchName(value) {
+  return String(value).replace(/[^A-Za-z0-9._/-]+/g, '-').replace(/\/+/g, '/').replace(/^-+|-+$/g, '')
+}
+
+/**
+ * 恢复指定内容。默认新建分支指向它（最安全，不动当前分支）；
+ * --reset 时把当前分支硬重置过去（先给当前状态再建一个恢复点）；未提交改动类型的恢复点会 stash apply 回工作区。
+ */
+export async function runRescueRestoreWorkflow(options = {}) {
+  const { context, git } = await openGit(options)
+  if (!options.target) {
+    throw new IcodeError('缺少要恢复的目标: icode rescue restore <恢复点id[:分支]|commit>', {
+      code: 'RESCUE_TARGET_REQUIRED',
+      exitCode: 2
+    })
+  }
+
+  const target = await resolveRescueTarget(git, options.target, options)
+
+  if (target.worktree) {
+    await git.exec(['stash', 'apply', target.sha])
+    return { action: 'apply-worktree', target, repoRoot: context.topLevelPath }
+  }
+
+  if (options.reset) {
+    const currentBranch = await git.getCurrentBranch()
+    if (!currentBranch) {
+      throw new IcodeError('当前不在分支上，无法 --reset。', { code: 'RESCUE_DETACHED_HEAD', exitCode: 2 })
+    }
+    const backup = await createBackup(git, {
+      reason: `rescue reset ${currentBranch} -> ${target.sha.slice(0, 8)}`,
+      includeWorktree: true
+    })
+    await git.reset('hard', target.sha)
+    return {
+      action: 'reset',
+      branch: currentBranch,
+      target,
+      backupId: backup.entries.length ? backup.id : '',
+      repoRoot: context.topLevelPath
+    }
+  }
+
+  const baseName = target.branch && !target.branch.includes(' ') ? target.branch.replace(/^remote-/, '') : target.sha.slice(0, 8)
+  const branchName = sanitizeBranchName(options.branch || `rescue/${baseName}-${Date.now().toString(36)}`)
+  if (await git.branchExistsLocal(branchName)) {
+    throw new IcodeError(`分支已存在: ${branchName}，请用 --branch 换一个名字。`, {
+      code: 'RESCUE_BRANCH_EXISTS',
+      exitCode: 2
+    })
+  }
+  await git.createBranch(branchName, target.sha)
+  logger.debug(`rescue: ${branchName} -> ${target.sha}`)
+
+  return { action: 'branch', branch: branchName, target, repoRoot: context.topLevelPath }
+}
+
+export async function runRescuePruneWorkflow(options = {}) {
+  const { context, git } = await openGit(options)
+  const keep = Number.isInteger(options.keep) ? options.keep : 20
+  const removed = await pruneBackups(git, { keep })
+  return { removed, keep, repoRoot: context.topLevelPath }
+}

package/src/workflows/save-workflow.js

@@ -7,7 +7,9 @@ import {
   assertOnBranch,
   readGitSafetyState
 } from '../core/git/preconditions.js'
+import { assertNoRiskyFiles, inspectPendingFiles } from '../core/git/file-guard.js'
 import { GitService } from '../core/git/service.js'
+import { promptCommitMessage } from '../core/tools/commit-prompt.js'
 import { runAiCommitWorkflow } from './ai-commit-workflow.js'
 
 /**
@@ -43,9 +45,9 @@ function validateMessageSource(options) {
 
 /**
  * 校验当前仓库是否允许执行 save。
- * 输入为当前分支、未完成操作和改动摘要，输出为空；不满足条件时抛出明确错误。
+ * 输入为当前分支、未完成操作、改动摘要与提交范围，输出为空；不满足条件时抛出明确错误。
  */
-function validateSavePreconditions(currentBranch, operation, changes) {
+function validateSavePreconditions(currentBranch, operation, changes, scope) {
   assertOnBranch(currentBranch, 'save', 'SAVE_DETACHED_HEAD')
   assertNoPendingOperation(operation, 'save', 'SAVE_GIT_OPERATION_IN_PROGRESS')
   assertNoConflictedFiles(changes, 'save', 'SAVE_CONFLICTED_FILES')
@@ -56,42 +58,107 @@ function validateSavePreconditions(currentBranch, operation, changes) {
       exitCode: 2
     })
   }
+
+  if (scope.stagedOnly && scope.paths.length) {
+    throw new IcodeError('--staged-only 不能与指定路径同时使用。', {
+      code: 'SAVE_SCOPE_CONFLICT',
+      exitCode: 2
+    })
+  }
+
+  if (scope.stagedOnly && changes.staged === 0) {
+    throw new IcodeError('暂存区没有改动，--staged-only 已停止。请先 git add 需要提交的文件。', {
+      code: 'SAVE_NO_STAGED_CHANGES',
+      exitCode: 2
+    })
+  }
 }
 
-/**
- * 构建 dry-run 结果。
- * 输入为上下文、分支、改动和计划提交信息，输出不会产生副作用的预览结构。
- */
-function buildDryRunResult(context, currentBranch, changes, commitMessage, source) {
+// 归一化提交范围：all（默认全部改动）/ staged（仅暂存区）/ paths（指定路径）。
+function resolveScope(options) {
+  const paths = Array.isArray(options.paths) ? options.paths.map((item) => String(item).trim()).filter(Boolean) : []
+  const stagedOnly = options.stagedOnly === true
+  return {
+    mode: stagedOnly ? 'staged' : paths.length ? 'paths' : 'all',
+    stagedOnly,
+    paths
+  }
+}
+
+function buildResult(context, currentBranch, changes, extra) {
   return {
     applied: false,
-    dryRun: true,
+    dryRun: false,
     commitId: '',
-    commitMessage,
-    source,
+    commitMessage: '',
+    source: 'message',
     context: {
       topLevelPath: context.topLevelPath,
       currentBranch
     },
-    changes
+    changes,
+    ...extra
   }
 }
 
 /**
  * 执行安全快速提交。
- * 输入为 save 参数，输出提交结果；关键假设：dry-run 不执行 add/commit，AI 模式必须使用有效 profile。
+ * 输入为 save 参数，输出提交结果；关键假设：dry-run 不执行 add/commit，AI 模式必须使用有效 profile，
+ * 提交前会扫描敏感文件 / 疑似密钥 / 大文件，发现风险默认阻断（--allow-risky 放行）。
  */
 export async function runSaveWorkflow(options = {}) {
-  validateMessageSource(options)
+  // 交互终端里没给提交信息时，后面会进入提交信息向导，这里先不报错。
+  const needsPrompt = options.interactive === true && !normalizeMessage(options.message) && options.aiCommit !== true
+  if (!needsPrompt) {
+    validateMessageSource(options)
+  }
 
   const context = await resolveGitContext({
     cwd: options.cwd,
-    repoMode: options.repoMode
+    repoMode: options.repoMode,
+    remote: options.remote
   })
   const git = new GitService(context)
   const { currentBranch, operation, changes } = await readGitSafetyState(git)
+  const scope = resolveScope(options)
+
+  validateSavePreconditions(currentBranch, operation, changes, scope)
+
+  const { files, findings } = await inspectPendingFiles(git, context, {
+    mode: scope.mode === 'staged' ? 'staged' : 'all',
+    paths: scope.paths
+  })
+
+  if (scope.mode === 'paths' && !files.length) {
+    throw new IcodeError(`指定路径下没有可提交的改动: ${scope.paths.join(', ')}`, {
+      code: 'SAVE_PATHS_NO_CHANGES',
+      exitCode: 2
+    })
+  }
+
+  const scopeInfo = {
+    scope: scope.mode,
+    paths: scope.paths,
+    files,
+    risks: findings
+  }
 
-  validateSavePreconditions(currentBranch, operation, changes)
+  // dry-run 只报告风险，不阻断，方便先看清楚再决定。
+  if (options.dryRun !== true) {
+    assertNoRiskyFiles(findings, 'save', 'SAVE_RISKY_FILES', options.allowRisky === true)
+  }
+
+  if (needsPrompt) {
+    const answer = await promptCommitMessage({ files })
+    if (answer.canceled) {
+      return buildResult(context, currentBranch, changes, { canceled: true, ...scopeInfo })
+    }
+    if (answer.useAi) {
+      options = { ...options, aiCommit: true }
+    } else {
+      options = { ...options, message: answer.message }
+    }
+  }
 
   if (options.aiCommit === true) {
     // AI 模式必须先校验 profile 存在，避免 askAiJson 在缺配置时隐式选择其它配置。
@@ -104,49 +171,47 @@ export async function runSaveWorkflow(options = {}) {
       apply: options.dryRun !== true,
       yes: options.yes === true,
       noVerify: options.noVerify === true,
+      stagedOnly: scope.stagedOnly,
+      paths: scope.paths,
       silentContextLog: true,
       silentResultLog: true
     })
 
-    if (options.dryRun === true) {
-      return buildDryRunResult(context, currentBranch, changes, aiResult.commitMessage, 'ai')
-    }
-
-    return {
-      applied: aiResult.applied,
-      dryRun: false,
-      commitId: aiResult.commitId || '',
+    return buildResult(context, currentBranch, changes, {
+      applied: options.dryRun === true ? false : aiResult.applied,
+      dryRun: options.dryRun === true,
+      commitId: options.dryRun === true ? '' : aiResult.commitId || '',
       commitMessage: aiResult.commitMessage,
       source: 'ai',
-      context: {
-        topLevelPath: context.topLevelPath,
-        currentBranch
-      },
-      changes
-    }
+      ...scopeInfo
+    })
   }
 
   const commitMessage = normalizeMessage(options.message)
   if (options.dryRun === true) {
-    return buildDryRunResult(context, currentBranch, changes, commitMessage, 'message')
+    return buildResult(context, currentBranch, changes, {
+      dryRun: true,
+      commitMessage,
+      ...scopeInfo
+    })
+  }
+
+  if (scope.mode === 'all') {
+    await git.stageAll()
+  } else if (scope.mode === 'paths') {
+    await git.stagePaths(scope.paths)
   }
 
-  await git.stageAll()
   await git.commit(commitMessage, {
-    noVerify: options.noVerify === true
+    noVerify: options.noVerify === true,
+    paths: scope.paths
   })
   const commitId = await git.revParseShort('HEAD')
 
-  return {
+  return buildResult(context, currentBranch, changes, {
     applied: true,
-    dryRun: false,
     commitId,
     commitMessage,
-    source: 'message',
-    context: {
-      topLevelPath: context.topLevelPath,
-      currentBranch
-    },
-    changes
-  }
+    ...scopeInfo
+  })
 }