@icode-js/icode 3.0.4 → 3.2.0

package/src/workflows/undo-workflow.js

@@ -1,8 +1,8 @@
 import { IcodeError } from '../core/errors.js'
-import { resolveGitContext } from '../core/git-context.js'
-import { GitService } from '../core/git-service.js'
-import { logger } from '../core/logger.js'
-import { chooseOne } from '../core/prompts.js'
+import { resolveGitContext } from '../core/git/context.js'
+import { GitService } from '../core/git/service.js'
+import { chooseOne } from '../core/tools/interactive.js'
+import { logger } from '../core/tools/logger.js'
 import { runRollbackWorkflow } from './rollback-workflow.js'
 
 const UNDO_OPTIONS = [
@@ -35,6 +35,14 @@ const UNDO_REF_SUGGESTIONS = {
   hard: ['HEAD~1', 'HEAD~2', 'HEAD~3', 'HEAD~5', 'HEAD']
 }
 
+// 静默模式下输出 warn 日志，输入执行选项和日志文本，输出为空。
+function logWarn(options, message) {
+  if (!options.silentLog) {
+    logger.warn(message)
+  }
+}
+
+// 解析交互菜单选择，输入菜单 value，输出 mode/ref 或 canceled。
 function parseSelection(selection) {
   if (!selection || selection === 'cancel') {
     return {
@@ -49,10 +57,12 @@ function parseSelection(selection) {
   }
 }
 
+// 解析指定模式的默认 ref，输入 mode，输出默认回滚目标。
 function resolveDefaultRef(mode) {
   return mode === 'revert' ? 'HEAD' : 'HEAD~1'
 }
 
+// 构建 undo 的 ref 选择项，输入 workflow options 和 mode，输出交互候选项。
 async function buildUndoRefChoices(options, mode) {
   const fallbackRef = resolveDefaultRef(mode)
   const suggestedRefs = UNDO_REF_SUGGESTIONS[mode] || UNDO_REF_SUGGESTIONS.soft
@@ -98,6 +108,7 @@ async function buildUndoRefChoices(options, mode) {
   }
 }
 
+// 校验并归一化 recover 参数，输入用户参数，输出 continue/abort/keep 或空字符串。
 function normalizeRecover(value) {
   const normalized = (value || '').trim().toLowerCase()
   if (!normalized) {
@@ -115,6 +126,7 @@ function normalizeRecover(value) {
   return normalized
 }
 
+// 处理未完成的 merge/revert/cherry-pick 操作，输入 workflow options，输出恢复结果或 null。
 async function resolvePendingOperation(options) {
   const context = await resolveGitContext({
     cwd: options.cwd,
@@ -127,7 +139,7 @@ async function resolvePendingOperation(options) {
     return null
   }
 
-  logger.warn(`检测到未完成的 ${pending} 操作。`)
+  logWarn(options, `检测到未完成的 ${pending} 操作。`)
 
   let action = normalizeRecover(options.recover)
   if (!action) {
@@ -153,7 +165,7 @@ async function resolvePendingOperation(options) {
   }
 
   if (action === 'keep') {
-    logger.warn('保持现场，未执行继续/中止。')
+    logWarn(options, '保持现场，未执行继续/中止。')
     return {
       canceled: true,
       pendingOperation: pending
@@ -164,6 +176,8 @@ async function resolvePendingOperation(options) {
     try {
       if (pending === 'revert') {
         await git.revertContinue()
+      } else if (pending === 'merge') {
+        await git.mergeContinue()
       } else {
         await git.cherryPickContinue()
       }
@@ -186,6 +200,8 @@ async function resolvePendingOperation(options) {
 
   if (pending === 'revert') {
     await git.revertAbort()
+  } else if (pending === 'merge') {
+    await git.mergeAbort()
   } else {
     await git.abortCherryPick()
   }
@@ -196,6 +212,7 @@ async function resolvePendingOperation(options) {
   }
 }
 
+// 处理 revert 冲突后的恢复策略，输入 options/mode/ref，输出恢复结果。
 async function handleRevertConflict(options, mode, ref) {
   let action = normalizeRecover(options.recover)
 
@@ -247,6 +264,10 @@ async function handleRevertConflict(options, mode, ref) {
   }
 }
 
+/**
+ * 执行 undo 工作流。
+ * 输入为已归一化的回滚模式、目标 ref/hash、恢复策略和仓库选项，输出为执行结果或取消状态。
+ */
 export async function runUndoWorkflow(options) {
   const pendingResult = await resolvePendingOperation(options)
   if (pendingResult) {
@@ -255,19 +276,22 @@ export async function runUndoWorkflow(options) {
 
   let mode = options.mode?.trim()
   let ref = options.ref?.trim()
+  const hasExplicitRef = Boolean(ref)
 
   if (!mode) {
     const selected = await chooseOne('请选择回滚策略：', UNDO_OPTIONS, 0)
     const parsed = parseSelection(selected)
     if (parsed.canceled) {
-      logger.warn('已取消 undo。')
+      logWarn(options, '已取消 undo。')
       return {
         canceled: true
       }
     }
 
     mode = parsed.mode
-    ref = parsed.ref
+    if (!hasExplicitRef) {
+      ref = parsed.ref
+    }
   }
 
   const defaultRef = resolveDefaultRef(mode)
@@ -278,7 +302,7 @@ export async function runUndoWorkflow(options) {
       const refChoice = await buildUndoRefChoices(options, mode)
       const selectedRef = await chooseOne('请选择要回滚的 ref：', refChoice.choices, refChoice.defaultIndex)
       if (selectedRef === 'cancel') {
-        logger.warn('已取消 undo。')
+        logWarn(options, '已取消 undo。')
         return {
           canceled: true,
           mode,
@@ -300,7 +324,7 @@ export async function runUndoWorkflow(options) {
       mode !== 'hard' ? 0 : 1
     )) === 'yes'
     if (!accepted) {
-      logger.warn('已取消 undo。')
+      logWarn(options, '已取消 undo。')
       return {
         canceled: true,
         mode,
@@ -315,14 +339,15 @@ export async function runUndoWorkflow(options) {
       mode,
       yes: options.yes,
       repoMode: options.repoMode,
-      cwd: options.cwd
+      cwd: options.cwd,
+      silentLog: options.silentLog
     })
   } catch (error) {
     if (error?.code !== 'REVERT_CONFLICT') {
       throw error
     }
 
-    logger.warn(error.message)
+    logWarn(options, error.message)
     return handleRevertConflict(options, mode, ref)
   }
 }

package/src/core/prompts.js

@@ -1,152 +0,0 @@
-import { createInterface } from 'node:readline/promises'
-import { stdin, stdout } from 'node:process'
-
-function isInteractive() {
-  return Boolean(stdin.isTTY && stdout.isTTY)
-}
-
-export function isInteractiveTerminal() {
-  return isInteractive()
-}
-
-export async function confirm(message, defaultValue = true) {
-  if (!isInteractive()) {
-    return defaultValue
-  }
-
-  const rl = createInterface({ input: stdin, output: stdout })
-  const suffix = defaultValue ? '[Y/n]' : '[y/N]'
-  const answer = (await rl.question(`${message} ${suffix} `)).trim().toLowerCase()
-  rl.close()
-
-  if (!answer) {
-    return defaultValue
-  }
-
-  if (['y', 'yes'].includes(answer)) {
-    return true
-  }
-
-  if (['n', 'no'].includes(answer)) {
-    return false
-  }
-
-  return defaultValue
-}
-
-export async function input(message, defaultValue = '') {
-  if (!isInteractive()) {
-    return defaultValue
-  }
-
-  const rl = createInterface({ input: stdin, output: stdout })
-  const answer = await rl.question(`${message}${defaultValue ? ` (${defaultValue})` : ''}: `)
-  rl.close()
-  const normalized = answer.trim()
-  return normalized || defaultValue
-}
-
-export async function chooseOne(message, choices, defaultIndex = 0) {
-  if (!Array.isArray(choices) || choices.length === 0) {
-    throw new Error('chooseOne 需要至少一个可选项')
-  }
-
-  const safeDefaultIndex = Math.min(Math.max(defaultIndex, 0), choices.length - 1)
-  if (!isInteractive()) {
-    return choices[safeDefaultIndex].value
-  }
-
-  stdout.write(`${message}\n`)
-  choices.forEach((choice, index) => {
-    stdout.write(`  ${index + 1}. ${choice.label}\n`)
-  })
-
-  const rl = createInterface({ input: stdin, output: stdout })
-  const answer = (await rl.question(`请选择 [${safeDefaultIndex + 1}]: `)).trim()
-  rl.close()
-
-  if (!answer) {
-    return choices[safeDefaultIndex].value
-  }
-
-  const numeric = Number(answer)
-  if (!Number.isInteger(numeric) || numeric < 1 || numeric > choices.length) {
-    return choices[safeDefaultIndex].value
-  }
-
-  return choices[numeric - 1].value
-}
-
-export async function chooseMany(message, choices, options = {}) {
-  if (!Array.isArray(choices) || choices.length === 0) {
-    throw new Error('chooseMany 需要至少一个可选项')
-  }
-
-  const parsedMin = Number(options.minSelections ?? 0)
-  const parsedMax = Number(options.maxSelections ?? choices.length)
-  const minSelections = Number.isFinite(parsedMin) ? Math.max(0, Math.floor(parsedMin)) : 0
-  const maxCap = Number.isFinite(parsedMax) ? Math.max(0, Math.floor(parsedMax)) : choices.length
-  const maxSelections = Math.max(minSelections, Math.min(choices.length, maxCap))
-  const doneLabel = options.doneLabel || '完成选择'
-  const cancelLabel = options.cancelLabel || '取消'
-  const defaultValues = Array.isArray(options.defaultValues) ? options.defaultValues : []
-  const defaultSet = new Set(defaultValues)
-  const selectedValues = choices
-    .map((choice) => choice.value)
-    .filter((value) => defaultSet.has(value))
-    .slice(0, maxSelections)
-
-  if (!isInteractive()) {
-    return selectedValues
-  }
-
-  const selected = new Set(selectedValues)
-  const doneValue = '__prompt_done__'
-  const cancelValue = '__prompt_cancel__'
-
-  while (true) {
-    const menuChoices = choices.map((choice) => ({
-      value: choice.value,
-      label: `${selected.has(choice.value) ? '[x]' : '[ ]'} ${choice.label}`
-    }))
-    menuChoices.push({
-      value: doneValue,
-      label: `${doneLabel}（已选 ${selected.size} 项）`
-    })
-    menuChoices.push({
-      value: cancelValue,
-      label: cancelLabel
-    })
-
-    const defaultChoiceValue = selected.size >= minSelections ? doneValue : choices[0].value
-    const defaultIndex = Math.max(0, menuChoices.findIndex((item) => item.value === defaultChoiceValue))
-    const selectedAction = await chooseOne(`${message}`, menuChoices, defaultIndex)
-
-    if (selectedAction === cancelValue) {
-      return null
-    }
-
-    if (selectedAction === doneValue) {
-      if (selected.size < minSelections) {
-        stdout.write(`至少需要选择 ${minSelections} 项。\n`)
-        continue
-      }
-      return choices
-        .map((choice) => choice.value)
-        .filter((value) => selected.has(value))
-        .slice(0, maxSelections)
-    }
-
-    if (selected.has(selectedAction)) {
-      selected.delete(selectedAction)
-      continue
-    }
-
-    if (selected.size >= maxSelections) {
-      stdout.write(`最多只能选择 ${maxSelections} 项。\n`)
-      continue
-    }
-
-    selected.add(selectedAction)
-  }
-}