@icode-js/icode 3.2.0 → 3.4.0

package/src/workflows/push/commit-step.js

@@ -0,0 +1,123 @@
+import { formatAiCommitSummary } from '../../core/ai/commit-summary.js'
+import { IcodeError } from '../../core/errors.js'
+import { assertNoRiskyFiles, inspectPendingFiles } from '../../core/git/file-guard.js'
+import { promptCommitMessage } from '../../core/tools/commit-prompt.js'
+import { isInteractiveTerminal } from '../../core/tools/interactive.js'
+import { logger } from '../../core/tools/logger.js'
+import { runAiCommitWorkflow } from '../ai-commit-workflow.js'
+
+// push 前的提交阶段：可选 AI commit，或用 -m 提交；两者都会先做风险扫描。
+
+// 提交前扫描敏感文件/疑似密钥/大文件，发现风险时按 --allow-risky 决定是否阻断。
+async function guardPendingFiles(git, context, options) {
+  const { findings } = await inspectPendingFiles(git, context, { mode: 'all' })
+  assertNoRiskyFiles(findings, 'push', 'PUSH_RISKY_FILES', options.allowRisky === true)
+  return findings
+}
+
+// Run AI commit before push and keep the full generated message in follow-up logs.
+export async function prepareAiCommitIfEnabled(git, context, inputOptions, changes) {
+  if (!inputOptions.aiCommit) {
+    return {
+      enabled: false
+    }
+  }
+
+  if (inputOptions.message?.trim()) {
+    logger.warn('--ai-commit 已启用，将优先使用 AI 生成的提交信息。')
+  }
+
+  if (changes && !changes.clean) {
+    await guardPendingFiles(git, context, inputOptions)
+  }
+
+  try {
+    const result = await runAiCommitWorkflow({
+      apply: true,
+      lang: inputOptions.aiCommitLang || 'zh',
+      profile: inputOptions.aiProfile,
+      repoMode: inputOptions.repoMode,
+      noVerify: inputOptions.noVerify,
+      yes: inputOptions.yes,
+      cwd: inputOptions.cwd,
+      silentContextLog: true
+    })
+
+    if (result.canceled) {
+      logger.warn('已取消 AI 自动提交。')
+      return {
+        enabled: true,
+        canceled: true
+      }
+    }
+
+    logger.success(`AI 自动提交完成:\n${formatAiCommitSummary(result.commitId, result.commitMessage)}`)
+    return {
+      enabled: true,
+      applied: true,
+      commitId: result.commitId,
+      commitMessage: result.commitMessage
+    }
+  } catch (error) {
+    if (error?.code === 'AI_COMMIT_EMPTY_DIFF') {
+      logger.info('未检测到可提交改动，跳过 --ai-commit。')
+      return {
+        enabled: true,
+        skipped: true,
+        reason: 'no-diff'
+      }
+    }
+
+    throw error
+  }
+}
+
+// 在 push 场景下按需创建本地提交，输入 GitService、上下文、命令参数和已读取的改动摘要，输出是否提交。
+export async function prepareCommitIfNeeded(git, context, options, changes) {
+  if (changes.clean) {
+    logger.info('工作区无改动，跳过 commit。')
+    return false
+  }
+
+  await guardPendingFiles(git, context, options)
+
+  let message = options.message?.trim()
+  if (!message && isInteractiveTerminal() && !options.yes) {
+    const { files } = await inspectPendingFiles(git, context, { mode: 'all' })
+    const answer = await promptCommitMessage({ files })
+    if (answer.canceled) {
+      throw new IcodeError('已取消提交，push 未执行。', { code: 'PUSH_COMMIT_CANCELED', exitCode: 1 })
+    }
+    if (answer.useAi) {
+      const result = await runAiCommitWorkflow({
+        apply: true,
+        lang: options.aiCommitLang || 'zh',
+        profile: options.aiProfile,
+        repoMode: options.repoMode,
+        noVerify: options.noVerify,
+        cwd: options.cwd,
+        silentContextLog: true
+      })
+      if (result.canceled) {
+        throw new IcodeError('已取消提交，push 未执行。', { code: 'PUSH_COMMIT_CANCELED', exitCode: 1 })
+      }
+      return true
+    }
+    message = answer.message
+  }
+
+  if (!message) {
+    throw new IcodeError('检测到代码改动但未提供提交信息，请使用 -m 或 --message。', {
+      code: 'PUSH_COMMIT_MESSAGE_REQUIRED',
+      exitCode: 2
+    })
+  }
+
+  // 统一自动暂存，降低同学手动 add 的负担。
+  await git.stageAll()
+  await git.commit(message, {
+    noVerify: options.noVerify
+  })
+  logger.success(`已提交 ${message}`)
+  return true
+}

package/src/workflows/push/local-merge-step.js

@@ -0,0 +1,213 @@
+import { IcodeError } from '../../core/errors.js'
+import { ui } from '../../core/tools/theme.js'
+import { confirm, isInteractiveTerminal } from '../../core/tools/interactive.js'
+import { logger } from '../../core/tools/logger.js'
+
+// 本地 merge 阶段：切到目标分支 -> 同步远程 -> merge 源分支 -> push。
+
+// 提取底层 Git 失败细节，输入异常对象，输出用于暂停错误的简洁原因。
+export function resolveGitFailureReason(error) {
+  const stderr = typeof error?.meta?.stderr === 'string' ? error.meta.stderr.trim() : ''
+  const stdout = typeof error?.meta?.stdout === 'string' ? error.meta.stdout.trim() : ''
+  const output = [stderr, stdout].filter(Boolean).join('\n').trim()
+  const message = typeof error?.message === 'string' ? error.message.trim() : ''
+  const reason = output || message || 'Git 操作失败'
+
+  return reason.length > 2000 ? `${reason.slice(0, 2000)}...` : reason
+}
+
+// 判断 Git 失败是否来自合并冲突，输入异常对象，输出布尔结果。
+export function isGitConflictFailure(error) {
+  const text = [
+    error?.meta?.stderr || '',
+    error?.meta?.stdout || '',
+    error?.message || ''
+  ].join('\n')
+
+  return /CONFLICT \(|Automatic merge failed|fix conflicts|unmerged files|needs merge|you need to resolve your current index first/i.test(text)
+}
+
+// 构建本地合并暂停错误，输入分支、阶段和原始异常，输出可被命令层汇总的 IcodeError。
+export function buildLocalMergePauseError({ sourceBranch, targetBranch, step, error, summary = [] }) {
+  const reason = resolveGitFailureReason(error)
+  const conflict = isGitConflictFailure(error)
+  const prefix = conflict ? '本地合并冲突' : '本地合并失败'
+  const nextStep = conflict
+    ? '解决冲突后执行 `icode continue`（会自动暂存已解决的文件，并接着完成剩下的推送），或执行 `icode abort` 放弃并切回原分支。'
+    : '请根据上面的 Git 错误修复后重试。'
+
+  return new IcodeError(`${prefix}(${step}): ${sourceBranch} -> ${targetBranch}\n${reason}\n${nextStep}`, {
+    code: 'PUSH_LOCAL_MERGE_PAUSED',
+    exitCode: 2,
+    cause: error,
+    meta: {
+      sourceBranch,
+      targetBranch,
+      step,
+      reason,
+      summary
+    }
+  })
+}
+
+/**
+ * 目标分支本地和远程都不存在时，是否允许从源分支新建。
+ * 显式 --create-target 直接允许；交互终端里询问（默认否）；-y 或非交互环境直接报错，避免拼错分支名时悄悄建新分支。
+ */
+async function ensureTargetCreationAllowed(targetBranch, sourceBranch, options) {
+  if (options.createTarget) {
+    return
+  }
+
+  if (!options.yes && isInteractiveTerminal()) {
+    const accepted = await confirm(`目标分支 ${targetBranch} 在本地和远程都不存在，是否从 ${sourceBranch} 新建？`, false)
+    if (accepted) {
+      return
+    }
+  }
+
+  throw new IcodeError(
+    `目标分支不存在: ${targetBranch}。如确实要从 ${sourceBranch} 新建，请加 --create-target。`,
+    {
+      code: 'PUSH_TARGET_MISSING',
+      exitCode: 2,
+      meta: { targetBranch, sourceBranch }
+    }
+  )
+}
+
+export async function checkoutTargetBranch(git, targetBranch, sourceBranch, options = {}, summary = []) {
+  const localExists = await git.branchExistsLocal(targetBranch)
+  const remoteExists = await git.branchExistsRemote(targetBranch)
+  let checkoutMode = 'local'
+
+  if (localExists) {
+    await git.checkout(targetBranch)
+  } else if (remoteExists) {
+    await git.checkoutTracking(targetBranch)
+    checkoutMode = 'tracking'
+  } else {
+    await ensureTargetCreationAllowed(targetBranch, sourceBranch, options)
+    logger.warn(`目标分支 ${ui.branch(targetBranch)} 不存在，将从 ${ui.branch(sourceBranch)} 创建。`)
+    await git.checkoutNewBranch(targetBranch, sourceBranch)
+    checkoutMode = 'created'
+  }
+
+  if (remoteExists) {
+    try {
+      await git.pull(targetBranch, {
+        noRebase: true
+      })
+    } catch (error) {
+      throw buildLocalMergePauseError({
+        sourceBranch,
+        targetBranch,
+        step: 'pull-target',
+        error,
+        summary
+      })
+    }
+  }
+
+  return {
+    remoteExists,
+    checkoutMode
+  }
+}
+
+/**
+ * 把源分支本地 merge 到目标分支并推送。
+ * 输入为 GitService、源/目标分支、push 选项和摘要数组，输出该分支的摘要项。
+ */
+export async function mergeIntoTargetAndPush(git, sourceBranch, targetBranch, options, summary) {
+  logger.info(`处理分支: ${ui.branch(targetBranch)}`)
+  logger.info(`切换到目标分支: ${ui.branch(targetBranch)}`)
+  const { remoteExists, checkoutMode } = await checkoutTargetBranch(git, targetBranch, sourceBranch, options, summary)
+  logger.info(`目标分支准备完成: ${ui.branch(targetBranch)} (${checkoutMode})`)
+
+  // 保留 merge commit，方便后续追溯“从哪个分支合并过来”。
+  logger.info(`合并分支: ${ui.branch(sourceBranch)} -> ${ui.branch(targetBranch)}`)
+  try {
+    await git.merge(sourceBranch, {
+      noFf: true,
+      noEdit: true
+    })
+  } catch (error) {
+    throw buildLocalMergePauseError({
+      sourceBranch,
+      targetBranch,
+      step: 'merge-target',
+      error,
+      summary
+    })
+  }
+  logger.success(`合并成功: ${ui.branch(sourceBranch)} -> ${ui.branch(targetBranch)}`)
+
+  logger.info(`推送目标分支: ${ui.branch(targetBranch)}`)
+  await git.push(targetBranch, {
+    setUpstream: !remoteExists,
+    noVerify: options.noVerify
+  })
+
+  logger.success(`目标分支推送成功: ${ui.branch(targetBranch)}`)
+  return { branch: targetBranch, status: 'merged-and-pushed' }
+}
+
+/**
+ * 同步并推送当前分支；force=true 时跳过 pull，使用 --force-with-lease 覆盖远程。
+ * expectedRemoteSha 是 fetch 之前记录的远程 sha，用来防止覆盖别人刚推上去的提交。
+ */
+export async function pushCurrentBranch(git, branchName, options, summary) {
+  logger.info(`处理分支: ${ui.branch(branchName)}`)
+  const remoteExists = await git.branchExistsRemote(branchName)
+
+  if (options.force) {
+    logger.warn(`安全强推当前分支: ${ui.branch(branchName)}（--force-with-lease）`)
+    try {
+      await git.push(branchName, {
+        setUpstream: !remoteExists,
+        noVerify: options.noVerify,
+        forceWithLease: remoteExists,
+        expectedRemoteSha: options.expectedRemoteSha
+      })
+    } catch (error) {
+      const reason = resolveGitFailureReason(error)
+      if (/stale info|rejected/i.test(reason)) {
+        throw new IcodeError(
+          `强推被拒绝：远程 ${git.remoteRef(branchName)} 在你上次 fetch 之后有新提交，已停止以免覆盖别人的改动。\n` +
+            '请先查看远程改动（git log HEAD..' + git.remoteRef(branchName) + '），合并或 rebase 后再推。',
+          { code: 'PUSH_FORCE_LEASE_REJECTED', exitCode: 2, cause: error, meta: { reason, summary } }
+        )
+      }
+      throw error
+    }
+    logger.success(`强推成功: ${ui.branch(branchName)}`)
+    return { branch: branchName, status: 'force-pushed' }
+  }
+
+  if (remoteExists) {
+    logger.info(`同步远程分支: ${ui.branch(branchName)}`)
+    try {
+      await git.pull(branchName, {
+        noRebase: true
+      })
+    } catch (error) {
+      throw buildLocalMergePauseError({
+        sourceBranch: git.remoteRef(branchName),
+        targetBranch: branchName,
+        step: 'pull-current',
+        error,
+        summary
+      })
+    }
+  }
+
+  logger.info(`推送当前分支: ${ui.branch(branchName)}`)
+  await git.push(branchName, {
+    setUpstream: !remoteExists,
+    noVerify: options.noVerify
+  })
+
+  logger.success(`推送成功: ${ui.branch(branchName)}`)
+  return { branch: branchName, status: 'pushed' }
+}

package/src/workflows/push/plan.js

@@ -0,0 +1,63 @@
+// 构建 push dry-run 步骤，输入分支目标和策略，输出不会产生副作用的计划列表。
+export function buildPushDryRunPlan({ currentBranch, branchTargets, protectedBranches, inputOptions, remote = 'origin' }) {
+  const steps = []
+
+  if (inputOptions.aiCommit) {
+    steps.push({
+      action: 'ai-commit',
+      branch: currentBranch,
+      reason: '将生成并提交 AI commit'
+    })
+  } else {
+    steps.push({
+      action: 'commit-if-needed',
+      branch: currentBranch,
+      reason: inputOptions.message ? '检测到改动时使用 -m/--message 提交' : '检测到改动时会要求输入提交信息'
+    })
+  }
+
+  if (inputOptions.pullMain) {
+    steps.push({
+      action: 'pull-main',
+      branch: currentBranch,
+      reason: '将主分支同步到当前分支'
+    })
+  }
+
+  branchTargets.forEach((targetBranch) => {
+    if (protectedBranches.has(targetBranch) && !inputOptions.forceProtected) {
+      steps.push({
+        action: 'skip-protected',
+        branch: targetBranch,
+        reason: '受保护分支，未传 --force-protected'
+      })
+      return
+    }
+
+    if (targetBranch === currentBranch) {
+      steps.push({
+        action: inputOptions.force ? 'force-push-current' : 'push-current',
+        branch: targetBranch,
+        reason: inputOptions.force
+          ? `将以 --force-with-lease 覆盖 ${remote}/${targetBranch}`
+          : '将同步并推送当前分支'
+      })
+      return
+    }
+
+    steps.push({
+      action: inputOptions.remoteMerge ? 'remote-merge' : 'local-merge',
+      branch: targetBranch,
+      reason: inputOptions.remoteMerge ? '将创建并合并远程 PR/MR' : '将切换目标分支、本地 merge 后推送'
+    })
+  })
+
+  return {
+    currentBranch,
+    branchTargets,
+    remote,
+    remoteMerge: Boolean(inputOptions.remoteMerge),
+    force: Boolean(inputOptions.force),
+    steps
+  }
+}

package/src/workflows/push/remote-merge-step.js

@@ -0,0 +1,224 @@
+import { readConfig } from '../../core/config/store.js'
+import { ui } from '../../core/tools/theme.js'
+import { IcodeError } from '../../core/errors.js'
+import { resolvePlatformToken, resolveProviderName } from '../../core/platform/index.js'
+import { requestRemoteMerge, resolveRemoteMergeProjectUrl } from '../../core/remote-merge/client.js'
+import { logger } from '../../core/tools/logger.js'
+
+// 远程合并阶段：通过平台 API 创建 PR/MR 并合并，不在本地切换分支。
+
+// 基于 commit 内容构建远程 MR 标题与正文，确保标题和内容都来自真实提交信息。
+export async function buildRemoteMergeCommitContent(git, sourceBranch, targetBranch) {
+  const rangeSpec = `${git.remoteRef(targetBranch)}..${sourceBranch}`
+  let commits = await git.listCommitMessages(rangeSpec)
+
+  if (!commits.length) {
+    const latestCommit = await git.getCommitMessage(sourceBranch)
+    if (latestCommit) {
+      commits = [latestCommit]
+    }
+  }
+
+  if (!commits.length) {
+    throw new IcodeError(`无法读取远程合并提交内容: ${sourceBranch} -> ${targetBranch}`, {
+      code: 'PUSH_REMOTE_MERGE_COMMIT_CONTENT_EMPTY',
+      exitCode: 2
+    })
+  }
+
+  const latestCommit = commits[commits.length - 1]
+  const description = commits
+    .map((commit) => {
+      if (commit.body) {
+        return `${commit.subject}\n\n${commit.body}`
+      }
+      return commit.subject
+    })
+    .join('\n\n')
+
+  return {
+    title: latestCommit.subject,
+    description
+  }
+}
+
+// 提取远程合并失败原因，优先使用 IcodeError.meta，其次回退到 error.message。
+function resolveRemoteMergeFailureReason(error) {
+  const metaStep = typeof error?.meta?.step === 'string' ? error.meta.step.trim() : ''
+  const metaReason = typeof error?.meta?.reason === 'string' ? error.meta.reason.trim() : ''
+  if (metaReason) {
+    return metaStep ? `${metaReason} [step=${metaStep}]` : metaReason
+  }
+
+  const message = typeof error?.message === 'string' ? error.message.trim() : ''
+  return message || '远程合并失败'
+}
+
+export function normalizeRemoteMergePolicy(policy = {}) {
+  const remoteMerge = policy.remoteMerge && typeof policy.remoteMerge === 'object' ? policy.remoteMerge : {}
+  return {
+    enabled: remoteMerge.enabled !== false
+  }
+}
+
+/**
+ * 解析远程合并使用的平台和 token。
+ * provider 优先按 remote 主机名识别（github/gitlab/gitee/gitea），识别不到再用旧配置 platforms.remoteMerge.provider。
+ */
+export async function resolveRemoteMergePlatform(git) {
+  const config = readConfig()
+  const remoteUrl = await git.getRemoteUrl()
+  const provider = resolveProviderName(remoteUrl, {}, config)
+  const { token, source } = provider ? resolvePlatformToken(provider, config) : { token: '', source: '' }
+  return {
+    provider,
+    apiKey: token,
+    tokenSource: source,
+    remoteUrl
+  }
+}
+
+function buildRemoteMergePauseError(targetBranch, reason, meta = {}) {
+  return new IcodeError(`远程合并已暂停(${targetBranch}): ${reason}`, {
+    code: 'PUSH_REMOTE_MERGE_PAUSED',
+    exitCode: 2,
+    meta: {
+      targetBranch,
+      reason,
+      ...meta
+    }
+  })
+}
+
+// 统一把 provider 返回的 step 注入错误文案，便于定位 create/merge/inspect 具体失败点。
+function buildRemoteMergeResultMessage(prefix, result) {
+  const reason = typeof result?.reason === 'string' && result.reason.trim()
+    ? result.reason.trim()
+    : '未知原因'
+  const step = typeof result?.step === 'string' && result.step.trim()
+    ? result.step.trim()
+    : ''
+
+  return step ? `${prefix}(${step}): ${reason}` : `${prefix}: ${reason}`
+}
+
+// 构建批量远程合并暂停错误，明确指出具体失败分支与原因。
+export function buildRemoteMergeBatchPauseError(failures, summary) {
+  const branchesLabel = failures.map((item) => item.branch).join(', ')
+  const detail = failures.map((item) => `${item.branch}: ${item.reason}`).join(' | ')
+
+  return new IcodeError(`远程合并已暂停(${branchesLabel}): ${detail}`, {
+    code: 'PUSH_REMOTE_MERGE_PAUSED',
+    exitCode: 2,
+    meta: {
+      failures,
+      summary
+    }
+  })
+}
+
+// 基于当前 remote 推导项目地址并发起 PR/MR 创建 + 合并请求。
+async function performRemoteMerge({ git, currentBranch, targetBranch, remoteExists, inputOptions, remoteMergePolicy, remoteMergePlatform }) {
+  if (!remoteExists) {
+    throw buildRemoteMergePauseError(targetBranch, `远程合并要求目标分支已存在于 ${git.remote}。`, {
+      remoteExists: false
+    })
+  }
+
+  if (!remoteMergePolicy.enabled) {
+    throw buildRemoteMergePauseError(targetBranch, '仓库未启用远程合并配置，请先配置 repositories.<repo>.remoteMerge.enabled=true。')
+  }
+
+  if (!remoteMergePlatform.provider) {
+    throw buildRemoteMergePauseError(targetBranch, `无法从 ${git.remote} 识别代码托管平台，请执行 icode config platform host set <host> github|gitlab|gitee|gitea。`, {
+      remote: remoteMergePlatform.remoteUrl
+    })
+  }
+
+  if (!remoteMergePlatform.apiKey) {
+    throw buildRemoteMergePauseError(targetBranch, `未配置 ${remoteMergePlatform.provider} 平台 token，请先执行 icode config platform token set ${remoteMergePlatform.provider} <token>。`)
+  }
+
+  const projectUrl = resolveRemoteMergeProjectUrl({
+    provider: remoteMergePlatform.provider,
+    remoteUrl: remoteMergePlatform.remoteUrl
+  })
+  if (!projectUrl) {
+    throw buildRemoteMergePauseError(targetBranch, `无法从 ${git.remote} 自动识别项目 URL，请检查 remote 地址。`, {
+      remote: remoteMergePlatform.remoteUrl
+    })
+  }
+  logger.info(`${remoteMergePlatform.provider} 项目 URL(${git.remote}): ${logger.color('green', projectUrl)}`)
+
+  logger.info(`发起远程合并: ${logger.color('yellow', currentBranch)} -> ${logger.color('yellow', targetBranch)}`)
+  const mergeRequestContent = await buildRemoteMergeCommitContent(git, currentBranch, targetBranch)
+  const result = await requestRemoteMerge({
+    provider: remoteMergePlatform.provider,
+    apiKey: remoteMergePlatform.apiKey,
+    projectUrl,
+    sourceBranch: currentBranch,
+    targetBranch,
+    mergeRequestTitle: mergeRequestContent.title,
+    mergeRequestDescription: mergeRequestContent.description,
+    repoRoot: git.cwd,
+    noVerify: inputOptions.noVerify
+  })
+
+  if (result.conflict) {
+    throw buildRemoteMergePauseError(targetBranch, buildRemoteMergeResultMessage('远程合并冲突', result), {
+      sourceBranch: currentBranch,
+      step: result.step || '',
+      result
+    })
+  }
+
+  if (!result.ok) {
+    throw buildRemoteMergePauseError(targetBranch, buildRemoteMergeResultMessage('远程合并失败', result), {
+      sourceBranch: currentBranch,
+      step: result.step || '',
+      result
+    })
+  }
+
+  const successReason = typeof result.reason === 'string' && result.reason.trim()
+    ? result.reason.trim()
+    : '远程合并已完成'
+
+  if (result.mergeRequestUrl) {
+    logger.success(`${successReason}: ${logger.color('green', result.mergeRequestUrl)}`)
+  } else {
+    logger.success(`${successReason}: ${logger.color('yellow', currentBranch)} -> ${logger.color('yellow', targetBranch)}`)
+  }
+
+  return result
+}
+
+// 并发执行多个远程合并目标分支，并把冲突/失败精确归档到对应分支。
+export async function runConcurrentRemoteMerges(options) {
+  const tasks = options.targetBranches.map(async (targetBranch) => {
+    try {
+      logger.info(`处理分支: ${ui.branch(targetBranch)}`)
+      const remoteExists = await options.git.branchExistsRemote(targetBranch)
+      const remoteMergeResult = await performRemoteMerge({
+        ...options,
+        targetBranch,
+        remoteExists
+      })
+
+      return {
+        branch: targetBranch,
+        status: 'remote-merged-and-pushed',
+        mergeRequestUrl: remoteMergeResult.mergeRequestUrl || '',
+        mergeRequestId: remoteMergeResult.mergeRequestId || ''
+      }
+    } catch (error) {
+      return {
+        branch: targetBranch,
+        status: 'paused',
+        reason: resolveRemoteMergeFailureReason(error)
+      }
+    }
+  })
+
+  return Promise.all(tasks)
+}