@icode-js/icode 3.2.0 → 3.4.0

package/src/workflows/undo-workflow.js

@@ -1,9 +1,11 @@
 import { IcodeError } from '../core/errors.js'
+import { shortenHome } from '../core/tools/theme.js'
+import { createBackup } from '../core/git/backup.js'
+import { runAbortWorkflow, runContinueWorkflow } from './continue-workflow.js'
 import { resolveGitContext } from '../core/git/context.js'
 import { GitService } from '../core/git/service.js'
-import { chooseOne } from '../core/tools/interactive.js'
+import { chooseOne, confirm } from '../core/tools/interactive.js'
 import { logger } from '../core/tools/logger.js'
-import { runRollbackWorkflow } from './rollback-workflow.js'
 
 const UNDO_OPTIONS = [
   {
@@ -42,6 +44,105 @@ function logWarn(options, message) {
   }
 }
 
+// 静默模式下输出 info 日志，输入执行选项和日志文本，输出为空。
+function logInfo(options, message) {
+  if (!options.silentLog) {
+    logger.info(message)
+  }
+}
+
+function isRevertConflict(error) {
+  const output = `${error?.meta?.stdout || ''}\n${error?.meta?.stderr || ''}\n${error?.message || ''}`
+  return /revert is already in progress|could not revert|after resolving the conflicts|CONFLICT \(/i.test(output)
+}
+
+/**
+ * 执行底层回滚：revert 生成新提交；soft/mixed/hard 移动 HEAD。
+ * reset 前会自动创建恢复点（hard 模式还会备份未提交改动），可用 icode rescue 找回。
+ */
+async function performRollback(options) {
+  const mode = options.mode || 'revert'
+  const ref = options.ref || (mode === 'revert' ? 'HEAD' : 'HEAD~1')
+
+  const context = await resolveGitContext({
+    cwd: options.cwd,
+    repoMode: options.repoMode
+  })
+
+  const git = new GitService(context)
+
+  logInfo(options, `仓库 ${shortenHome(context.topLevelPath)}`)
+  if (context.inheritedFromParent) {
+    logWarn(options, '当前目录继承了父级 Git 仓库，命令将基于父仓库根目录执行。')
+  }
+
+  if (mode === 'revert') {
+    logInfo(options, `执行回滚(revert): ${ref}`)
+    try {
+      await git.revert(ref)
+    } catch (error) {
+      if (isRevertConflict(error)) {
+        throw new IcodeError(
+          'revert 发生冲突。解决冲突后执行 `icode continue`，或执行 `icode abort` 直接中止。',
+          {
+            code: 'REVERT_CONFLICT',
+            cause: error,
+            meta: error.meta
+          }
+        )
+      }
+      throw error
+    }
+    return {
+      mode,
+      ref,
+      repoRoot: context.topLevelPath
+    }
+  }
+
+  if (!['soft', 'mixed', 'hard'].includes(mode)) {
+    throw new IcodeError('mode 仅支持: revert | soft | mixed | hard', {
+      code: 'ROLLBACK_MODE_INVALID',
+      exitCode: 2
+    })
+  }
+
+  if (mode === 'hard' && !options.yes) {
+    // hard reset 会直接丢弃工作区改动，这里强制确认一次降低误操作风险。
+    const accepted = await confirm(
+      `你将执行 git reset --hard ${ref}，这会丢弃未提交改动（已自动备份已跟踪文件的改动），是否继续？`,
+      false
+    )
+    if (!accepted) {
+      logWarn(options, '已取消 hard 回滚。')
+      return {
+        canceled: true,
+        mode,
+        ref,
+        repoRoot: context.topLevelPath
+      }
+    }
+  }
+
+  const backup = await createBackup(git, {
+    reason: `undo reset --${mode} ${ref}`,
+    includeWorktree: mode === 'hard',
+    silent: options.silentLog
+  })
+
+  logInfo(options, `执行回滚(reset --${mode}): ${ref}`)
+  await git.reset(mode, ref)
+
+  return {
+    mode,
+    ref,
+    backupId: backup.entries.length ? backup.id : '',
+    repoRoot: context.topLevelPath
+  }
+}
+
+
+
 // 解析交互菜单选择，输入菜单 value，输出 mode/ref 或 canceled。
 function parseSelection(selection) {
   if (!selection || selection === 'cancel') {
@@ -172,43 +273,21 @@ async function resolvePendingOperation(options) {
     }
   }
 
+  // 与 icode continue / icode abort 走同一套流程：自动暂存已解决文件，并续做被打断的 push/migrate/sync。
   if (action === 'continue') {
-    try {
-      if (pending === 'revert') {
-        await git.revertContinue()
-      } else if (pending === 'merge') {
-        await git.mergeContinue()
-      } else {
-        await git.cherryPickContinue()
-      }
-
-      return {
-        resolvedOperation: pending,
-        recoverAction: 'continue'
-      }
-    } catch (error) {
-      throw new IcodeError(
-        `${pending} --continue 失败，请先解决冲突后重试，或使用 --recover abort。`,
-        {
-          code: 'UNDO_CONTINUE_FAILED',
-          cause: error,
-          meta: error.meta
-        }
-      )
+    const result = await runContinueWorkflow({ cwd: options.cwd, repoMode: options.repoMode })
+    return {
+      resolvedOperation: pending,
+      recoverAction: 'continue',
+      ...(result.resumed ? { resumed: result.resumed, summary: result.summary } : {})
     }
   }
 
-  if (pending === 'revert') {
-    await git.revertAbort()
-  } else if (pending === 'merge') {
-    await git.mergeAbort()
-  } else {
-    await git.abortCherryPick()
-  }
-
+  const result = await runAbortWorkflow({ cwd: options.cwd, repoMode: options.repoMode })
   return {
     resolvedOperation: pending,
-    recoverAction: 'abort'
+    recoverAction: 'abort',
+    ...(result.aborted ? { aborted: result.aborted, returnedTo: result.returnedTo } : {})
   }
 }
 
@@ -334,7 +413,7 @@ export async function runUndoWorkflow(options) {
   }
 
   try {
-    return await runRollbackWorkflow({
+    return await performRollback({
       ref,
       mode,
       yes: options.yes,

package/src/workflows/rollback-workflow.js

@@ -1,99 +0,0 @@
-import { IcodeError } from '../core/errors.js'
-import { resolveGitContext } from '../core/git/context.js'
-import { GitService } from '../core/git/service.js'
-import { confirm } from '../core/tools/interactive.js'
-import { logger } from '../core/tools/logger.js'
-
-function isRevertConflict(error) {
-  const output = `${error?.meta?.stdout || ''}\n${error?.meta?.stderr || ''}\n${error?.message || ''}`
-  return /revert is already in progress|could not revert|after resolving the conflicts|CONFLICT \(/i.test(output)
-}
-
-// 静默模式下输出 info 日志，输入执行选项和日志文本，输出为空。
-function logInfo(options, message) {
-  if (!options.silentLog) {
-    logger.info(message)
-  }
-}
-
-// 静默模式下输出 warn 日志，输入执行选项和日志文本，输出为空。
-function logWarn(options, message) {
-  if (!options.silentLog) {
-    logger.warn(message)
-  }
-}
-
-// 执行底层回滚操作，输入 mode/ref/仓库选项，输出执行结果。
-export async function runRollbackWorkflow(options) {
-  const mode = options.mode || 'revert'
-  const ref = options.ref || (mode === 'revert' ? 'HEAD' : 'HEAD~1')
-
-  const context = await resolveGitContext({
-    cwd: options.cwd,
-    repoMode: options.repoMode
-  })
-
-  const git = new GitService(context)
-
-  logInfo(options, `仓库根目录: ${context.topLevelPath}`)
-  if (context.inheritedFromParent) {
-    logWarn(options, '当前目录继承了父级 Git 仓库，命令将基于父仓库根目录执行。')
-  }
-
-  if (mode === 'revert') {
-    logInfo(options, `执行回滚(revert): ${ref}`)
-    try {
-      await git.revert(ref)
-    } catch (error) {
-      if (isRevertConflict(error)) {
-        throw new IcodeError(
-          'revert 发生冲突。请解决冲突后执行 `git revert --continue`，或使用 `icode undo --recover abort` 直接中止。',
-          {
-            code: 'REVERT_CONFLICT',
-            cause: error,
-            meta: error.meta
-          }
-        )
-      }
-      throw error
-    }
-    return {
-      mode,
-      ref,
-      repoRoot: context.topLevelPath
-    }
-  }
-
-  if (!['soft', 'mixed', 'hard'].includes(mode)) {
-    throw new IcodeError('mode 仅支持: revert | soft | mixed | hard', {
-      code: 'ROLLBACK_MODE_INVALID',
-      exitCode: 2
-    })
-  }
-
-  if (mode === 'hard' && !options.yes) {
-    // hard reset 会直接丢弃工作区改动，这里强制确认一次降低误操作风险。
-    const accepted = await confirm(
-      `你将执行 git reset --hard ${ref}，这会丢失未提交改动，是否继续？`,
-      false
-    )
-    if (!accepted) {
-      logWarn(options, '已取消 hard 回滚。')
-      return {
-        canceled: true,
-        mode,
-        ref,
-        repoRoot: context.topLevelPath
-      }
-    }
-  }
-
-  logInfo(options, `执行回滚(reset --${mode}): ${ref}`)
-  await git.reset(mode, ref)
-
-  return {
-    mode,
-    ref,
-    repoRoot: context.topLevelPath
-  }
-}