@icode-js/icode 3.2.0 → 3.4.0

package/src/workflows/clean-workflow.js

@@ -1,15 +1,15 @@
 import { getRepoPolicy } from '../core/config/store.js'
+import { ui, shortenHome } from '../core/tools/theme.js'
 import { IcodeError } from '../core/errors.js'
+import { createBackup } from '../core/git/backup.js'
 import { resolveGitContext } from '../core/git/context.js'
 import {
-  assertCleanWorktree,
-  assertNoConflictedFiles,
   assertNoPendingOperation,
   assertOnBranch,
   readGitSafetyState
 } from '../core/git/preconditions.js'
 import { GitService } from '../core/git/service.js'
-import { confirm } from '../core/tools/interactive.js'
+import { chooseMany, confirm, isInteractiveTerminal } from '../core/tools/interactive.js'
 import { logger } from '../core/tools/logger.js'
 
 function normalizeKeepList(values = []) {
@@ -21,14 +21,28 @@ function normalizeKeepList(values = []) {
   )
 }
 
+function parseStaleDays(value) {
+  if (value == null || value === '') {
+    return 0
+  }
+  const days = Number(value)
+  if (!Number.isFinite(days) || days <= 0) {
+    throw new IcodeError('--stale 需要正数天数，例如 --stale 90', { code: 'CLEAN_STALE_INVALID', exitCode: 2 })
+  }
+  return days
+}
+
 /**
  * 执行 clean 工作流。
- * 输入为清理基线、保留分支和删除选项，输出已删除分支；执行前要求工作区干净并在普通分支上。
+ * 清理范围：已合并（默认）、--gone（远程分支已删除）、--stale <天>（超过 N 天没有提交）。
+ * 不切换分支、不要求工作区干净；删除前会为所有待删分支创建恢复点。
+ * 输出 { candidates: [{ branch, reasons }], deletedLocal, deletedRemote, backupId }。
  */
 export async function runCleanWorkflow(options) {
   const context = await resolveGitContext({
     cwd: options.cwd,
-    repoMode: options.repoMode
+    repoMode: options.repoMode,
+    remote: options.remote
   })
 
   const git = new GitService(context)
@@ -38,111 +52,149 @@ export async function runCleanWorkflow(options) {
   const policy = getRepoPolicy(context.topLevelPath)
   assertOnBranch(currentBranch, 'clean', 'CLEAN_DETACHED_HEAD')
   assertNoPendingOperation(safetyState.operation, 'clean', 'CLEAN_GIT_OPERATION_IN_PROGRESS')
-  assertNoConflictedFiles(safetyState.changes, 'clean', 'CLEAN_CONFLICTED_FILES')
-  assertCleanWorktree(safetyState.changes, 'clean', 'CLEAN_DIRTY_WORKTREE')
 
-  logger.info(`仓库根目录: ${context.topLevelPath}`)
-  if (context.inheritedFromParent) {
-    logger.warn('当前目录继承了父级 Git 仓库，命令将基于父仓库根目录执行。')
+  const staleDays = parseStaleDays(options.stale)
+  const selectGone = options.gone === true
+  // 只传 --gone/--stale 时只清理这些；同时传 --merged 时三者合并。
+  const selectMerged = options.merged === true || (!selectGone && !staleDays)
+
+  if (!options.json) {
+    logger.hint(`仓库 ${shortenHome(context.topLevelPath)}`)
   }
 
   await git.fetch()
 
-  const targetLocalExists = await git.branchExistsLocal(mergedTarget)
-  const targetRemoteExists = await git.branchExistsRemote(mergedTarget)
-  if (!targetLocalExists && !targetRemoteExists) {
-    throw new IcodeError(`清理基线分支不存在: ${mergedTarget}`, {
-      code: 'CLEAN_TARGET_MISSING',
-      exitCode: 2
-    })
-  }
-
-  try {
-    if (targetLocalExists) {
-      await git.checkout(mergedTarget)
+  // 优先用远程的基线分支判断，避免本地主分支落后导致漏判。
+  let mergedRef = ''
+  if (selectMerged) {
+    const remoteTarget = git.remoteRef(mergedTarget)
+    if (await git.refExists(remoteTarget)) {
+      mergedRef = remoteTarget
+    } else if (await git.branchExistsLocal(mergedTarget)) {
+      mergedRef = mergedTarget
     } else {
-      await git.checkoutTracking(mergedTarget)
-    }
-
-    if (targetRemoteExists) {
-      await git.pull(mergedTarget, {
-        noRebase: true
+      throw new IcodeError(`清理基线分支不存在: ${mergedTarget}`, {
+        code: 'CLEAN_TARGET_MISSING',
+        exitCode: 2
       })
     }
+  }
 
-    const mergedBranches = await git.listMergedLocalBranches(mergedTarget)
-    const protectedBranches = new Set((policy.protectedBranches || []).map((item) => item.trim()).filter(Boolean))
-    const keepSet = normalizeKeepList(options.keep || [])
+  const protectedBranches = [...(policy.protectedBranches || []), ...(context.repoConfig?.protectedBranches || [])]
+  const keepSet = normalizeKeepList(options.keep || [])
+  // 这些分支永远不进入清理列表，避免误删核心分支。
+  ;[mergedTarget, context.defaultBranch, currentBranch, ...protectedBranches]
+    .map((branch) => String(branch || '').trim())
+    .filter(Boolean)
+    .forEach((branch) => keepSet.add(branch))
+
+  const reasonsByBranch = new Map()
+  const addReason = (branch, reason) => {
+    if (keepSet.has(branch)) {
+      return
+    }
+    if (!reasonsByBranch.has(branch)) {
+      reasonsByBranch.set(branch, [])
+    }
+    reasonsByBranch.get(branch).push(reason)
+  }
 
-    // 这些分支永远不进入清理列表，避免误删核心分支。
-    keepSet.add(mergedTarget)
-    if (context.defaultBranch) {
-      keepSet.add(context.defaultBranch)
+  if (selectMerged) {
+    for (const branch of await git.listMergedLocalBranches(mergedRef)) {
+      addReason(branch, `已合并到 ${mergedRef}`)
     }
-    if (currentBranch) {
-      keepSet.add(currentBranch)
+  }
+
+  if (selectGone || staleDays) {
+    const now = Date.now() / 1000
+    for (const detail of await git.listBranchDetails()) {
+      if (selectGone && detail.gone) {
+        addReason(detail.name, '远程分支已删除')
+      }
+      if (staleDays && detail.timestamp && now - detail.timestamp > staleDays * 86400) {
+        addReason(detail.name, `超过 ${staleDays} 天未提交（${detail.relativeDate}）`)
+      }
     }
-    protectedBranches.forEach((branch) => keepSet.add(branch))
+  }
 
-    const candidates = mergedBranches.filter((branch) => !keepSet.has(branch))
+  const candidates = [...reasonsByBranch.entries()].map(([branch, reasons]) => ({ branch, reasons }))
+  const baseResult = {
+    repoRoot: context.topLevelPath,
+    mergedTarget,
+    candidates,
+    deletedLocal: [],
+    deletedRemote: []
+  }
 
-    if (!candidates.length) {
+  if (!candidates.length) {
+    if (!options.json) {
       logger.info('没有可清理的本地分支。')
-      return {
-        repoRoot: context.topLevelPath,
-        mergedTarget,
-        deletedLocal: [],
-        deletedRemote: []
-      }
     }
+    return baseResult
+  }
+
+  if (options.dryRun) {
+    return { ...baseResult, dryRun: true }
+  }
 
-    if (!options.yes) {
-      const accepted = await confirm(
-        `确认清理以下分支吗: ${candidates.join(', ')} ?`,
-        false
-      )
+  let selected = candidates
+  if (!options.yes) {
+    if (isInteractiveTerminal()) {
+      // 勾选要删的分支（默认全选），不想删的取消勾选即可。
+      const picked = await chooseMany(`选择要删除的分支（共 ${candidates.length} 个）`, candidates.map((item) => ({
+        value: item.branch,
+        label: item.branch,
+        hint: item.reasons.join('；')
+      })), { defaultValues: candidates.map((item) => item.branch), doneLabel: '删除' })
+      if (!picked || !picked.length) {
+        logger.warn('已取消清理。')
+        return { ...baseResult, canceled: true }
+      }
+      selected = candidates.filter((item) => picked.includes(item.branch))
+    } else {
+      const accepted = await confirm(`确认删除 ${candidates.length} 个分支吗？`, false)
       if (!accepted) {
         logger.warn('已取消清理。')
-        return {
-          canceled: true,
-          repoRoot: context.topLevelPath,
-          mergedTarget,
-          candidates
-        }
+        return { ...baseResult, canceled: true }
       }
     }
+  }
 
-    const deletedLocal = []
-    const deletedRemote = []
+  // 有恢复点兜底，未合并的 gone/stale 分支也可以安全地用 -D 删除。
+  const backup = await createBackup(git, {
+    reason: `clean ${selected.length} branches`,
+    branches: selected.map((item) => item.branch),
+    silent: options.json
+  })
 
-    for (const branch of candidates) {
-      await git.deleteLocalBranch(branch, {
-        force: options.force
-      })
-      deletedLocal.push(branch)
+  const deletedLocal = []
+  const deletedRemote = []
+  const failed = []
 
-      if (options.remote) {
-        const existsRemote = await git.branchExistsRemote(branch)
-        if (existsRemote) {
-          await git.deleteRemoteBranch(branch)
-          deletedRemote.push(branch)
-        }
-      }
+  for (const { branch, reasons } of selected) {
+    const merged = reasons.some((reason) => reason.startsWith('已合并'))
+    try {
+      await git.deleteLocalBranch(branch, { force: options.force || !merged })
+      deletedLocal.push(branch)
+    } catch (error) {
+      failed.push({ branch, reason: error.message.split('\n')[0] })
+      continue
     }
 
-    return {
-      repoRoot: context.topLevelPath,
-      mergedTarget,
-      deletedLocal,
-      deletedRemote
-    }
-  } finally {
-    if (currentBranch && currentBranch !== mergedTarget) {
-      try {
-        await git.checkout(currentBranch)
-      } catch (error) {
-        logger.warn(`未能切回原分支 ${currentBranch}: ${error.message}`)
+    if (options.remote && merged) {
+      const existsRemote = await git.branchExistsRemote(branch)
+      if (existsRemote) {
+        await git.deleteRemoteBranch(branch)
+        deletedRemote.push(branch)
       }
     }
   }
+
+  return {
+    ...baseResult,
+    deletedLocal,
+    deletedRemote,
+    failed,
+    backupId: backup.entries.length ? backup.id : ''
+  }
 }

package/src/workflows/continue-workflow.js

@@ -0,0 +1,233 @@
+import { IcodeError } from '../core/errors.js'
+import { inspectConflicts, stageResolvedConflicts } from '../core/git/conflicts.js'
+import { resolveGitContext } from '../core/git/context.js'
+import { clearOperationState, describeOperationState, loadOperationState, saveOperationState } from '../core/git/operation-state.js'
+import { abortOperation, continueOperation, OPERATION_LABELS } from '../core/git/operations.js'
+import { GitService } from '../core/git/service.js'
+import { logger } from '../core/tools/logger.js'
+import { ui } from '../core/tools/theme.js'
+import { mergeIntoTargetAndPush, pushCurrentBranch } from './push/local-merge-step.js'
+import { runSyncBranches } from './sync-workflow.js'
+
+async function openGit(options) {
+  const context = await resolveGitContext({ cwd: options.cwd, repoMode: options.repoMode })
+  return { context, git: new GitService(context) }
+}
+
+function formatUnresolved(unresolved) {
+  return unresolved
+    .map((item) => `  - ${item.file}（第 ${item.lines.slice(0, 5).join(', ')}${item.lines.length > 5 ? ' …' : ''} 行）`)
+    .join('\n')
+}
+
+/**
+ * 读取当前是否有需要继续/放弃的内容，供 ready / 主菜单提示。
+ * 输出 { operation, state, description } 或 null。
+ */
+export async function inspectPausedWork(options = {}) {
+  const { context, git } = await openGit(options)
+  const operation = await git.getInProgressOperation()
+  const state = loadOperationState(context)
+  if (!operation && !state) {
+    return null
+  }
+  return {
+    operation,
+    state,
+    description: [operation ? OPERATION_LABELS[operation] || operation : '', describeOperationState(state)].filter(Boolean).join(' · ')
+  }
+}
+
+// 冲突解决后把 push 剩下的步骤做完：推送已合并的目标分支、处理剩余目标、切回原分支。
+async function resumePush(git, context, state) {
+  const summary = [...(state.summary || [])]
+  const options = { ...(state.options || {}), yes: true }
+  const remaining = [...(state.remainingTargets || [])]
+
+  if (state.pendingPush) {
+    const remoteExists = await git.branchExistsRemote(state.pendingPush)
+    logger.info(`推送目标分支: ${ui.branch(state.pendingPush)}`)
+    await git.push(state.pendingPush, { setUpstream: !remoteExists, noVerify: options.noVerify })
+    summary.push({ branch: state.pendingPush, status: 'merged-and-pushed' })
+  }
+
+  for (let index = 0; index < remaining.length; index += 1) {
+    const branch = remaining[index]
+    try {
+      if (branch === state.sourceBranch) {
+        await git.checkout(state.sourceBranch)
+        summary.push(await pushCurrentBranch(git, branch, options, summary))
+      } else {
+        summary.push(await mergeIntoTargetAndPush(git, state.sourceBranch, branch, options, summary))
+      }
+    } catch (error) {
+      // 又遇到冲突：更新进度，等下一次 icode continue。
+      if (error?.code === 'PUSH_LOCAL_MERGE_PAUSED' && await git.getInProgressOperation()) {
+        const mergedTarget = error.meta?.step === 'merge-target'
+        saveOperationState(context, {
+          ...state,
+          pendingPush: mergedTarget ? branch : null,
+          remainingTargets: remaining.slice(mergedTarget ? index + 1 : index),
+          summary
+        })
+      }
+      throw error
+    }
+  }
+
+  return summary
+}
+
+async function resumeMigrate(git, state) {
+  const summary = []
+  if (state.push) {
+    logger.info(`推送目标分支: ${ui.branch(state.targetBranch)}`)
+    await git.push(state.targetBranch, { setUpstream: !state.targetExistsRemote, noVerify: state.options?.noVerify })
+    summary.push({ branch: state.targetBranch, status: 'pushed' })
+  }
+  return summary
+}
+
+async function resumeSync(git, context, state) {
+  const targets = [state.currentBranch, ...(state.remainingTargets || [])].filter(Boolean)
+  // runSyncBranches 结束时会自己切回原分支，并在再次冲突时更新进度。
+  clearOperationState(context)
+  const summary = await runSyncBranches(git, context, targets, state.options || {}, state.originalBranch, {
+    branch: state.currentBranch,
+    startAt: state.startAt || 'push'
+  })
+  return [...(state.summary || []), ...summary]
+}
+
+async function returnToOriginalBranch(git, state) {
+  const original = state?.originalBranch
+  if (!original) {
+    return ''
+  }
+  const current = await git.getCurrentBranch()
+  if (current !== original) {
+    await git.checkout(original)
+  }
+  return original
+}
+
+/**
+ * icode continue：检查冲突是否都已解决 -> 自动暂存 -> 继续 Git 操作 -> 接着完成 push/migrate/sync 剩下的步骤。
+ * 输出 { operation, staged, resumed, summary, returnedTo }。
+ */
+export async function runContinueWorkflow(options = {}) {
+  const { context, git } = await openGit(options)
+  const operation = await git.getInProgressOperation()
+  const state = loadOperationState(context)
+
+  if (!operation && !state) {
+    throw new IcodeError('没有需要继续的操作。', { code: 'CONTINUE_NOTHING', exitCode: 2 })
+  }
+
+  let staged = []
+  if (operation) {
+    const { resolved, unresolved } = await inspectConflicts(git)
+    if (unresolved.length) {
+      throw new IcodeError(
+        `还有 ${unresolved.length} 个文件存在冲突标记，请先处理：\n${formatUnresolved(unresolved)}\n处理完再执行 icode continue；想放弃可执行 icode abort。`,
+        { code: 'CONTINUE_UNRESOLVED_CONFLICTS', exitCode: 2, meta: { unresolved } }
+      )
+    }
+    staged = await stageResolvedConflicts(git, resolved)
+    if (staged.length && !options.silentLog) {
+      logger.info(`已自动暂存 ${staged.length} 个已解决的文件: ${staged.map(ui.path).join(' ')}`)
+    }
+
+    try {
+      await continueOperation(git, operation)
+    } catch (error) {
+      // rebase / cherry-pick 的下一个提交可能又冲突。
+      const still = await git.getInProgressOperation()
+      const next = still ? await inspectConflicts(git) : { unresolved: [] }
+      if (next.unresolved.length) {
+        throw new IcodeError(
+          `下一个提交又出现冲突：\n${formatUnresolved(next.unresolved)}\n处理完再执行 icode continue。`,
+          { code: 'CONTINUE_NEXT_CONFLICT', exitCode: 2, meta: { unresolved: next.unresolved }, cause: error }
+        )
+      }
+      throw new IcodeError(`继续 ${operation} 失败：${error.message.split('\n').slice(0, 4).join('\n')}`, {
+        code: 'CONTINUE_FAILED',
+        exitCode: 2,
+        cause: error
+      })
+    }
+  }
+
+  if (operation && !options.silentLog) {
+    logger.success(`${OPERATION_LABELS[operation] || operation} 已完成`)
+  }
+
+  let summary = []
+  if (state) {
+    if (state.command === 'push') {
+      summary = await resumePush(git, context, state)
+    } else if (state.command === 'migrate') {
+      summary = await resumeMigrate(git, state)
+    } else if (state.command === 'sync') {
+      summary = await resumeSync(git, context, state)
+    }
+  }
+
+  // 进度只在全部完成后清除；中途再次冲突时上面已经抛错并更新了进度。
+  let returnedTo = ''
+  if (state) {
+    if (state.command !== 'sync') {
+      returnedTo = await returnToOriginalBranch(git, state)
+    } else {
+      returnedTo = state.originalBranch || ''
+    }
+    clearOperationState(context)
+  }
+
+  return {
+    operation,
+    staged,
+    resumed: state ? state.command : '',
+    description: describeOperationState(state),
+    summary,
+    returnedTo,
+    repoRoot: context.topLevelPath
+  }
+}
+
+/**
+ * icode abort：中止进行中的 Git 操作，清除中断进度并切回原分支。
+ * 已经推送成功的分支不会被撤回。
+ */
+export async function runAbortWorkflow(options = {}) {
+  const { context, git } = await openGit(options)
+  const operation = await git.getInProgressOperation()
+  const state = loadOperationState(context)
+
+  if (!operation && !state) {
+    throw new IcodeError('没有需要放弃的操作。', { code: 'ABORT_NOTHING', exitCode: 2 })
+  }
+
+  if (operation) {
+    await abortOperation(git, operation)
+  }
+
+  let returnedTo = ''
+  if (state) {
+    try {
+      returnedTo = await returnToOriginalBranch(git, state)
+    } catch (error) {
+      logger.warn(`未能切回 ${state.originalBranch}: ${error.message.split('\n')[0]}`)
+    }
+    clearOperationState(context)
+  }
+
+  return {
+    operation,
+    aborted: state ? state.command : '',
+    description: describeOperationState(state),
+    done: (state?.summary || []).filter((item) => /pushed/.test(item.status)).map((item) => item.branch),
+    returnedTo,
+    repoRoot: context.topLevelPath
+  }
+}

package/src/workflows/doctor-workflow.js

@@ -1,5 +1,6 @@
+import { resolveRemoteMergePlatform } from './push/remote-merge-step.js'
 import { getAiConfig } from '../core/ai/config.js'
-import { getConfigFilePath, getPlatformConfig, getRepoPolicy } from '../core/config/store.js'
+import { getConfigFilePath, getRepoPolicy } from '../core/config/store.js'
 import { resolveGitContext } from '../core/git/context.js'
 import { GitService } from '../core/git/service.js'
 import { runCommand } from '../core/commands/shell.js'
@@ -57,14 +58,16 @@ async function checkGitVersion(repoRoot) {
   return buildCheck('git.version', 'pass', 'Git 命令可用', result.stdout.trim())
 }
 
-// 检查 origin remote 是否存在，输入 GitService，输出健康检查项。
+// 检查当前使用的 remote 是否存在，输入 GitService，输出健康检查项（id 保持 git.origin 兼容旧脚本）。
 async function checkOriginRemote(git) {
-  const remoteUrl = await git.getRemoteUrl('origin')
+  const remoteName = git.remote
+  const remoteUrl = await git.getRemoteUrl(remoteName)
   if (!remoteUrl) {
-    return buildCheck('git.origin', 'warn', 'origin remote 未配置', '当前仓库没有 origin remote。', '需要 push 或远程合并前，请先配置 git remote add origin <url>。')
+    return buildCheck('git.origin', 'warn', `${remoteName} remote 未配置`, `当前仓库没有 ${remoteName} remote。`, `需要 push 或远程合并前，请先配置 git remote add ${remoteName} <url>，或用 icode --remote <name> 指定其它 remote。`)
   }
 
-  return buildCheck('git.origin', 'pass', 'origin remote 已配置', remoteUrl)
+  const source = git.context.remoteSource && git.context.remoteSource !== 'default' ? `，来源: ${git.context.remoteSource}` : ''
+  return buildCheck('git.origin', 'pass', `${remoteName} remote 已配置${source}`, remoteUrl)
 }
 
 // 检查 hook 配置，输入 git context，输出健康检查项。
@@ -97,7 +100,7 @@ function checkRemoteMerge(remoteMergePlatform, repoPolicy) {
   }
 
   if (!remoteMergePlatform.provider || !remoteMergePlatform.apiKey) {
-    return buildCheck('remoteMerge.config', 'warn', '远程合并平台未完整配置', '缺少 provider 或 apiKey。', '如需 icode push -r，请执行 icode config platform remote-merge set --provider gitlab --api-key <key>。')
+    return buildCheck('remoteMerge.config', 'warn', '远程合并平台未完整配置', remoteMergePlatform.provider ? `未找到 ${remoteMergePlatform.provider} token。` : '无法从 remote 识别代码托管平台。', `如需 icode push -r / icode pr，请执行 icode config platform token set ${remoteMergePlatform.provider || '<provider>'} <token>。`)
   }
 
   return buildCheck('remoteMerge.config', 'pass', '远程合并平台已配置', `provider=${remoteMergePlatform.provider}`)
@@ -112,7 +115,7 @@ export async function runDoctorWorkflow(options = {}) {
   const git = new GitService(context)
   const repoPolicy = getRepoPolicy(context.topLevelPath)
   const aiConfig = getAiConfig()
-  const remoteMergePlatform = getPlatformConfig('remoteMerge')
+  const remoteMergePlatform = await resolveRemoteMergePlatform(git)
 
   const checks = [
     await checkGitVersion(context.topLevelPath),