@icode-js/icode 3.1.0 → 3.2.0

package/src/workflows/rollback-workflow.js

@@ -9,6 +9,21 @@ function isRevertConflict(error) {
   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')
@@ -20,13 +35,13 @@ export async function runRollbackWorkflow(options) {
 
   const git = new GitService(context)
 
-  logger.info(`仓库根目录: ${context.topLevelPath}`)
+  logInfo(options, `仓库根目录: ${context.topLevelPath}`)
   if (context.inheritedFromParent) {
-    logger.warn('当前目录继承了父级 Git 仓库，命令将基于父仓库根目录执行。')
+    logWarn(options, '当前目录继承了父级 Git 仓库，命令将基于父仓库根目录执行。')
   }
 
   if (mode === 'revert') {
-    logger.info(`执行回滚(revert): ${ref}`)
+    logInfo(options, `执行回滚(revert): ${ref}`)
     try {
       await git.revert(ref)
     } catch (error) {
@@ -63,7 +78,7 @@ export async function runRollbackWorkflow(options) {
       false
     )
     if (!accepted) {
-      logger.warn('已取消 hard 回滚。')
+      logWarn(options, '已取消 hard 回滚。')
       return {
         canceled: true,
         mode,
@@ -73,7 +88,7 @@ export async function runRollbackWorkflow(options) {
     }
   }
 
-  logger.info(`执行回滚(reset --${mode}): ${ref}`)
+  logInfo(options, `执行回滚(reset --${mode}): ${ref}`)
   await git.reset(mode, ref)
 
   return {

package/src/workflows/save-workflow.js

@@ -0,0 +1,152 @@
+import { getAiProfile } from '../core/ai/config.js'
+import { IcodeError } from '../core/errors.js'
+import { resolveGitContext } from '../core/git/context.js'
+import {
+  assertNoConflictedFiles,
+  assertNoPendingOperation,
+  assertOnBranch,
+  readGitSafetyState
+} from '../core/git/preconditions.js'
+import { GitService } from '../core/git/service.js'
+import { runAiCommitWorkflow } from './ai-commit-workflow.js'
+
+/**
+ * 清理提交信息。
+ * 输入为任意字符串，输出去掉首尾空白后的提交信息。
+ */
+function normalizeMessage(message) {
+  return String(message || '').trim()
+}
+
+/**
+ * 校验 save 的提交信息来源。
+ * 输入为 workflow options，输出为空；发现冲突配置时抛错。
+ */
+function validateMessageSource(options) {
+  const hasMessage = Boolean(normalizeMessage(options.message))
+  const useAiCommit = options.aiCommit === true
+
+  if (hasMessage && useAiCommit) {
+    throw new IcodeError('不能同时使用 --message 和 --ai-commit。请明确选择一种提交信息来源。', {
+      code: 'SAVE_MESSAGE_SOURCE_CONFLICT',
+      exitCode: 2
+    })
+  }
+
+  if (!hasMessage && !useAiCommit) {
+    throw new IcodeError('缺少提交信息。请使用 --message <msg>，或显式使用 --ai-commit。', {
+      code: 'SAVE_MESSAGE_REQUIRED',
+      exitCode: 2
+    })
+  }
+}
+
+/**
+ * 校验当前仓库是否允许执行 save。
+ * 输入为当前分支、未完成操作和改动摘要，输出为空；不满足条件时抛出明确错误。
+ */
+function validateSavePreconditions(currentBranch, operation, changes) {
+  assertOnBranch(currentBranch, 'save', 'SAVE_DETACHED_HEAD')
+  assertNoPendingOperation(operation, 'save', 'SAVE_GIT_OPERATION_IN_PROGRESS')
+  assertNoConflictedFiles(changes, 'save', 'SAVE_CONFLICTED_FILES')
+
+  if (changes.clean) {
+    throw new IcodeError('没有可提交的改动，save 已停止。', {
+      code: 'SAVE_NO_CHANGES',
+      exitCode: 2
+    })
+  }
+}
+
+/**
+ * 构建 dry-run 结果。
+ * 输入为上下文、分支、改动和计划提交信息，输出不会产生副作用的预览结构。
+ */
+function buildDryRunResult(context, currentBranch, changes, commitMessage, source) {
+  return {
+    applied: false,
+    dryRun: true,
+    commitId: '',
+    commitMessage,
+    source,
+    context: {
+      topLevelPath: context.topLevelPath,
+      currentBranch
+    },
+    changes
+  }
+}
+
+/**
+ * 执行安全快速提交。
+ * 输入为 save 参数，输出提交结果；关键假设：dry-run 不执行 add/commit，AI 模式必须使用有效 profile。
+ */
+export async function runSaveWorkflow(options = {}) {
+  validateMessageSource(options)
+
+  const context = await resolveGitContext({
+    cwd: options.cwd,
+    repoMode: options.repoMode
+  })
+  const git = new GitService(context)
+  const { currentBranch, operation, changes } = await readGitSafetyState(git)
+
+  validateSavePreconditions(currentBranch, operation, changes)
+
+  if (options.aiCommit === true) {
+    // AI 模式必须先校验 profile 存在，避免 askAiJson 在缺配置时隐式选择其它配置。
+    getAiProfile(options.profile)
+    const aiResult = await runAiCommitWorkflow({
+      cwd: context.topLevelPath,
+      repoMode: 'strict',
+      profile: options.profile,
+      lang: options.lang || 'zh',
+      apply: options.dryRun !== true,
+      yes: options.yes === true,
+      noVerify: options.noVerify === true,
+      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 || '',
+      commitMessage: aiResult.commitMessage,
+      source: 'ai',
+      context: {
+        topLevelPath: context.topLevelPath,
+        currentBranch
+      },
+      changes
+    }
+  }
+
+  const commitMessage = normalizeMessage(options.message)
+  if (options.dryRun === true) {
+    return buildDryRunResult(context, currentBranch, changes, commitMessage, 'message')
+  }
+
+  await git.stageAll()
+  await git.commit(commitMessage, {
+    noVerify: options.noVerify === true
+  })
+  const commitId = await git.revParseShort('HEAD')
+
+  return {
+    applied: true,
+    dryRun: false,
+    commitId,
+    commitMessage,
+    source: 'message',
+    context: {
+      topLevelPath: context.topLevelPath,
+      currentBranch
+    },
+    changes
+  }
+}

package/src/workflows/sync-workflow.js

@@ -1,5 +1,12 @@
 import { IcodeError } from '../core/errors.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 { logger } from '../core/tools/logger.js'
@@ -33,6 +40,10 @@ async function ensureBranchReady(git, branchName) {
   }
 }
 
+/**
+ * 执行 sync 工作流。
+ * 输入为目标分支与同步选项，输出每个分支的同步摘要；实际切换分支前要求当前仓库处于干净状态。
+ */
 export async function runSyncWorkflow(options) {
   const context = await resolveGitContext({
     cwd: options.cwd,
@@ -40,7 +51,12 @@ export async function runSyncWorkflow(options) {
   })
 
   const git = new GitService(context)
-  const currentBranch = (await git.getCurrentBranch()) || context.currentBranch
+  const safetyState = await readGitSafetyState(git)
+  const currentBranch = safetyState.currentBranch || context.currentBranch
+  assertOnBranch(currentBranch, 'sync', 'SYNC_DETACHED_HEAD')
+  assertNoPendingOperation(safetyState.operation, 'sync', 'SYNC_GIT_OPERATION_IN_PROGRESS')
+  assertNoConflictedFiles(safetyState.changes, 'sync', 'SYNC_CONFLICTED_FILES')
+  assertCleanWorktree(safetyState.changes, 'sync', 'SYNC_DIRTY_WORKTREE')
 
   let targetInput = options.branches?.length
     ? [...options.branches]
@@ -99,7 +115,7 @@ export async function runSyncWorkflow(options) {
       if (setup.remoteExists) {
         await git.pull(branchName, {
           noRebase: !options.rebase,
-          allowUnrelatedHistories: true
+          rebase: options.rebase
         })
       }
 

package/src/workflows/undo-workflow.js

@@ -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)
 
@@ -265,7 +282,7 @@ export async function runUndoWorkflow(options) {
     const selected = await chooseOne('请选择回滚策略：', UNDO_OPTIONS, 0)
     const parsed = parseSelection(selected)
     if (parsed.canceled) {
-      logger.warn('已取消 undo。')
+      logWarn(options, '已取消 undo。')
       return {
         canceled: true
       }
@@ -285,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,
@@ -307,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,
@@ -322,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)
   }
 }