@icode-js/icode 3.0.3 → 3.1.0

package/src/commands/push.js

@@ -1,15 +1,17 @@
 import { parseArgs } from 'node:util'
-import { normalizeLegacyArgs } from '../core/args.js'
-import { getAiCommandOptions } from '../core/ai-config.js'
-import { logger } from '../core/logger.js'
+import { getAiCommandOptions } from '../core/ai/config.js'
+import { normalizeLegacyArgs } from '../core/cli/args.js'
+import { logger } from '../core/tools/logger.js'
 import { runPushWorkflow } from '../workflows/push-workflow.js'
 
 function formatBranchStatus(status) {
   const map = {
     pushed: '已推送',
     'merged-and-pushed': '已合并并推送',
+    'remote-merged-and-pushed': '已远程合并并推送',
     'skipped-protected': '已跳过(受保护)',
-    'skipped-missing-remote': '已跳过(远程分支不存在)'
+    'skipped-missing-remote': '已跳过(远程分支不存在)',
+    paused: '已暂停'
   }
 
   return map[status] || status
@@ -27,6 +29,7 @@ Options:
   -m, --message <msg>         提交信息（未填会提示输入）
   -y, --yes                   自动确认（跳过确认提示）
   --local-merge               使用本地 merge 模式（默认，会切换分支并生成 merge commit）
+  --remote-merge              使用远程 PR/MR 合并模式（默认启用项目远程合并）
   --ai-commit                 push 前自动执行 AI commit（会参考本地 hook/commitlint 规范）
   --ai-profile <name>         指定 AI profile（用于 --ai-commit）
   --pull-main                 提交前将主分支同步到当前分支
@@ -39,6 +42,8 @@ Options:
 Notes:
   默认使用本地 merge 模式。
   未指定 target 时默认处理当前分支。
+  远程 merge 通过 PR/MR API 发起，不会本地切换到目标分支。
+  远程 merge 若出现冲突会暂停流程，并保留明确失败原因。
   布尔开关仅在命令行显式传入时生效（如 --ai-commit / --pull-main / --no-verify / -y）。
 `)
 }
@@ -69,12 +74,21 @@ function resolveStringOption(cliValue, configValue, fallback = '') {
   return fallback
 }
 
+// 统一输出 push 结果摘要，失败分支会追加具体原因，方便定位问题目标分支。
+function printPushSummary(summary = []) {
+  summary.forEach((item) => {
+    const reason = typeof item.reason === 'string' && item.reason.trim() ? ` - ${item.reason.trim()}` : ''
+    logger.info(`[结果] ${item.branch}: ${formatBranchStatus(item.status)}${reason}`)
+  })
+}
+
 export function resolvePushWorkflowOptions(parsedValues, parsedPositionals, scopedOptions = {}) {
   return {
     targetBranches: parsedPositionals,
     message: parsedValues.message,
     // 显式传入开关才生效，避免配置项隐式开启 push 行为。
     yes: resolveBooleanOption(parsedValues.yes, false),
+    remoteMerge: resolveBooleanOption(parsedValues['remote-merge'], false),
     aiCommit: resolveBooleanOption(parsedValues['ai-commit'], false),
     aiCommitLang: resolveStringOption(undefined, scopedOptions.aiCommitLang, 'zh'),
     aiProfile: resolveStringOption(parsedValues['ai-profile'], scopedOptions.aiProfile, ''),
@@ -96,6 +110,7 @@ export async function runPushCommand(rawArgs) {
       message: { type: 'string', short: 'm' },
       yes: { type: 'boolean', short: 'y' },
       'local-merge': { type: 'boolean' },
+      'remote-merge': { type: 'boolean' },
       'ai-commit': { type: 'boolean' },
       'ai-profile': { type: 'string' },
       help: { type: 'boolean', short: 'h' },
@@ -112,14 +127,20 @@ export async function runPushCommand(rawArgs) {
     return
   }
 
-  const result = await runPushWorkflow(resolvePushWorkflowOptions(parsed.values, parsed.positionals, scopedOptions))
+  let result
+  try {
+    result = await runPushWorkflow(resolvePushWorkflowOptions(parsed.values, parsed.positionals, scopedOptions))
+  } catch (error) {
+    if (Array.isArray(error?.meta?.summary) && error.meta.summary.length) {
+      printPushSummary(error.meta.summary)
+    }
+    throw error
+  }
 
   if (result.canceled) {
     return
   }
 
-  result.summary.forEach((item) => {
-    logger.info(`[结果] ${item.branch}: ${formatBranchStatus(item.status)}`)
-  })
+  printPushSummary(result.summary)
   logger.success(`push 完成，共处理 ${result.summary.length} 个分支。`)
 }

package/src/commands/sync.js

@@ -1,6 +1,6 @@
 import { parseArgs } from 'node:util'
-import { normalizeLegacyArgs } from '../core/args.js'
-import { logger } from '../core/logger.js'
+import { normalizeLegacyArgs } from '../core/cli/args.js'
+import { logger } from '../core/tools/logger.js'
 import { runSyncWorkflow } from '../workflows/sync-workflow.js'
 
 function printHelp() {

package/src/commands/tag.js

@@ -1,6 +1,6 @@
 import { parseArgs } from 'node:util'
-import { normalizeLegacyArgs } from '../core/args.js'
-import { logger } from '../core/logger.js'
+import { normalizeLegacyArgs } from '../core/cli/args.js'
+import { logger } from '../core/tools/logger.js'
 import { runTagWorkflow } from '../workflows/tag-workflow.js'
 
 function printHelp() {

package/src/commands/undo.js

@@ -1,15 +1,21 @@
 import { parseArgs } from 'node:util'
-import { logger } from '../core/logger.js'
+import { IcodeError } from '../core/errors.js'
+import { logger } from '../core/tools/logger.js'
 import { runUndoWorkflow } from '../workflows/undo-workflow.js'
 
+/**
+ * 输出 undo 命令帮助文本。
+ * 输入为空，输出为标准输出文本。
+ */
 function printHelp() {
   process.stdout.write(`
 Usage:
-  icode undo [options]
+  icode undo [ref] [options]
 
 Options:
   --mode <mode>          回滚模式: revert | soft | mixed | hard
   --ref <ref>            回滚目标，默认按 mode 自动给出
+  --hash <hash>          按 commit hash 指定回滚目标（等同 --ref）
   --recover <action>     冲突恢复策略: continue | abort | keep
   -y, --yes              自动确认（跳过确认提示）
   --repo-mode <mode>     仓库模式: auto(自动继承父仓库) | strict(禁止继承)
@@ -20,12 +26,62 @@ Notes:
 
 Examples:
   icode undo
+  icode undo a1b2c3d
   icode undo --mode revert --ref HEAD~2
+  icode undo --mode hard --hash a1b2c3d -y
   icode undo --recover abort
   icode undo --mode hard --ref HEAD~1 -y
 `)
 }
 
+/**
+ * 归一化 undo 命令参数。
+ * 输入为 parseArgs 的 values、positionals 与默认配置，输出为 workflow 可直接使用的显式选项。
+ */
+export function resolveUndoWorkflowOptions(values, positionals, defaults = {}) {
+  if (positionals.length > 1) {
+    throw new IcodeError('undo 最多支持一个位置参数作为回滚目标 ref/hash', {
+      code: 'UNDO_POSITIONAL_INVALID',
+      exitCode: 2
+    })
+  }
+
+  const refCandidates = [
+    { source: '--ref', value: values.ref },
+    { source: '--hash', value: values.hash },
+    { source: 'position', value: positionals[0] }
+  ].filter((candidate) => typeof candidate.value === 'string' && candidate.value.trim())
+
+  const normalizedRefs = refCandidates.map((candidate) => ({
+    source: candidate.source,
+    value: candidate.value.trim()
+  }))
+  const firstRef = normalizedRefs[0]?.value
+  const conflict = normalizedRefs.find((candidate) => candidate.value !== firstRef)
+
+  if (conflict) {
+    throw new IcodeError(
+      `undo 回滚目标冲突: ${normalizedRefs.map((item) => `${item.source}=${item.value}`).join(', ')}`,
+      {
+        code: 'UNDO_REF_CONFLICT',
+        exitCode: 2
+      }
+    )
+  }
+
+  return {
+    mode: values.mode,
+    ref: firstRef,
+    recover: values.recover,
+    yes: values.yes === true,
+    repoMode: values['repo-mode'] || defaults.repoMode || 'auto'
+  }
+}
+
+/**
+ * 执行 undo 命令。
+ * 输入为子命令参数数组，输出为空；内部会按参数调用 undo workflow 并打印结果。
+ */
 export async function runUndoCommand(rawArgs) {
   const parsed = parseArgs({
     args: rawArgs,
@@ -33,6 +89,7 @@ export async function runUndoCommand(rawArgs) {
     options: {
       mode: { type: 'string' },
       ref: { type: 'string' },
+      hash: { type: 'string' },
       recover: { type: 'string' },
       yes: { type: 'boolean', short: 'y', default: false },
       'repo-mode': { type: 'string', default: 'auto' },
@@ -45,13 +102,7 @@ export async function runUndoCommand(rawArgs) {
     return
   }
 
-  const result = await runUndoWorkflow({
-    mode: parsed.values.mode,
-    ref: parsed.values.ref,
-    recover: parsed.values.recover,
-    yes: parsed.values.yes,
-    repoMode: parsed.values['repo-mode']
-  })
+  const result = await runUndoWorkflow(resolveUndoWorkflowOptions(parsed.values, parsed.positionals))
 
   if (result.canceled) {
     return

package/src/core/{ai-client.js → ai/client.js}

@@ -1,6 +1,6 @@
-import { IcodeError } from './errors.js'
-import { getAiProfile } from './ai-config.js'
-import { withSpinner } from './loading.js'
+import { IcodeError } from '../errors.js'
+import { withSpinner } from '../tools/loading.js'
+import { getAiProfile } from './config.js'
 
 function trimSlash(value) {
   return value.replace(/\/+$/, '')

package/src/core/{ai-config.js → ai/config.js}

@@ -1,5 +1,5 @@
-import { IcodeError } from './errors.js'
-import { readConfig, writeConfig } from './config-store.js'
+import { IcodeError } from '../errors.js'
+import { readConfig, writeConfig } from '../config/store.js'
 
 const DEFAULT_PROFILE = {
   provider: 'custom',

package/src/core/{ai-diff-range.js → ai/diff-range.js}

@@ -1,5 +1,5 @@
-import { IcodeError } from './errors.js'
-import { logger } from './logger.js'
+import { IcodeError } from '../errors.js'
+import { logger } from '../tools/logger.js'
 
 function unique(values) {
   return [...new Set(values.filter(Boolean))]