@icode-js/icode 3.0.3 → 3.1.0

package/src/workflows/ai-commit-workflow.js

@@ -1,10 +1,10 @@
 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 { askAiJson } from '../core/ai-client.js'
-import { scanCommitConventions } from '../core/commit-conventions.js'
-import { confirm } from '../core/prompts.js'
+import { askAiJson } from '../core/ai/client.js'
+import { resolveGitContext } from '../core/git/context.js'
+import { scanCommitConventions } from '../core/git/commit-conventions.js'
+import { GitService } from '../core/git/service.js'
+import { confirm } from '../core/tools/interactive.js'
+import { logger } from '../core/tools/logger.js'
 
 function normalizeCommitType(value) {
   const allowed = new Set(['feat', 'fix', 'docs', 'style', 'refactor', 'perf', 'test', 'chore', 'build', 'ci', 'revert'])
@@ -33,6 +33,15 @@ function buildCommitMessage(parsed) {
   return `${header}\n\n${body}`
 }
 
+// 将多个 diff 片段稳定拼接，避免空块污染 prompt。
+function joinDiffSections(sections) {
+  return sections
+    .map((item) => (item || '').trim())
+    .filter(Boolean)
+    .join('\n\n')
+}
+
+// 基于“全部未提交改动”生成 AI commit，确保未暂存新文件也能被识别并提交。
 export async function runAiCommitWorkflow(options) {
   const context = await resolveGitContext({
     cwd: options.cwd,
@@ -44,13 +53,19 @@ export async function runAiCommitWorkflow(options) {
     logger.info(`仓库根目录: ${context.topLevelPath}`)
   }
 
-  let diff = await git.diffStaged()
-  let diffSource = 'staged'
-
-  if (!diff.trim()) {
-    diff = await git.diffWorkingTree()
-    diffSource = 'working-tree'
-  }
+  const stagedDiff = await git.diffStaged()
+  const workingDiff = await git.diffWorkingTree()
+  const hasStagedDiff = Boolean(stagedDiff.trim())
+  const hasWorkingDiff = Boolean(workingDiff.trim())
+  const diff = joinDiffSections([
+    hasStagedDiff ? `--- STAGED DIFF ---\n${stagedDiff}` : '',
+    hasWorkingDiff ? `--- WORKING TREE DIFF ---\n${workingDiff}` : ''
+  ])
+  const diffSource = hasStagedDiff && hasWorkingDiff
+    ? 'staged+working-tree'
+    : hasStagedDiff
+      ? 'staged'
+      : 'working-tree'
 
   if (!diff.trim()) {
     throw new IcodeError('没有可用于生成提交信息的代码改动。', {
@@ -105,8 +120,8 @@ export async function runAiCommitWorkflow(options) {
     }
   }
 
-  if (diffSource === 'working-tree') {
-    // 从 working-tree 生成信息时，提交前统一暂存，避免 commit 为空。
+  if (hasWorkingDiff) {
+    // 统一暂存工作区改动，确保未暂存修改和新文件与 AI 看到的 diff 保持一致。
     await git.stageAll()
   }
 

package/src/workflows/ai-conflict-workflow.js

@@ -1,10 +1,10 @@
 import fs from 'node:fs'
 import path from 'node:path'
-import { askAi } from '../core/ai-client.js'
+import { askAi } from '../core/ai/client.js'
 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 { resolveGitContext } from '../core/git/context.js'
+import { GitService } from '../core/git/service.js'
+import { logger } from '../core/tools/logger.js'
 
 function extractConflictBlocks(content, maxBlocks = 3, maxLines = 80) {
   const lines = content.split('\n')

package/src/workflows/ai-explain-workflow.js

@@ -1,8 +1,8 @@
-import { askAi } from '../core/ai-client.js'
-import { resolveAiDiffRange } from '../core/ai-diff-range.js'
+import { askAi } from '../core/ai/client.js'
+import { resolveAiDiffRange } from '../core/ai/diff-range.js'
 import { IcodeError } from '../core/errors.js'
-import { resolveGitContext } from '../core/git-context.js'
-import { GitService } from '../core/git-service.js'
+import { resolveGitContext } from '../core/git/context.js'
+import { GitService } from '../core/git/service.js'
 
 function truncate(value, limit) {
   const text = value || ''

package/src/workflows/ai-risk-review-workflow.js

@@ -1,4 +1,4 @@
-import { askAiJson } from '../core/ai-client.js'
+import { askAiJson } from '../core/ai/client.js'
 
 function normalizeDecision(value) {
   const normalized = (value || '').trim().toLowerCase()

package/src/workflows/checkout-workflow.js

@@ -1,7 +1,7 @@
 import { IcodeError } from '../core/errors.js'
-import { GitService } from '../core/git-service.js'
-import { resolveGitContext } from '../core/git-context.js'
-import { logger } from '../core/logger.js'
+import { resolveGitContext } from '../core/git/context.js'
+import { GitService } from '../core/git/service.js'
+import { logger } from '../core/tools/logger.js'
 
 export async function runCheckoutWorkflow(input) {
   if (!input.branchName) {

package/src/workflows/clean-workflow.js

@@ -1,9 +1,9 @@
-import { getRepoPolicy } from '../core/config-store.js'
+import { getRepoPolicy } from '../core/config/store.js'
 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 { confirm } from '../core/prompts.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 normalizeKeepList(values = []) {
   return new Set(

package/src/workflows/info-workflow.js

@@ -1,7 +1,7 @@
-import { getAiConfig } from '../core/ai-config.js'
-import { getConfigFilePath, getRepoPolicy } from '../core/config-store.js'
-import { resolveGitContext } from '../core/git-context.js'
-import { runCommand } from '../core/shell.js'
+import { getAiConfig } from '../core/ai/config.js'
+import { getConfigFilePath, getRepoPolicy } from '../core/config/store.js'
+import { resolveGitContext } from '../core/git/context.js'
+import { runCommand } from '../core/commands/shell.js'
 
 export async function runInfoWorkflow(options) {
   const context = await resolveGitContext({

package/src/workflows/migrate-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 { chooseMany, chooseOne, isInteractiveTerminal } from '../core/prompts.js'
+import { resolveGitContext } from '../core/git/context.js'
+import { GitService } from '../core/git/service.js'
+import { chooseMany, chooseOne, isInteractiveTerminal } from '../core/tools/interactive.js'
+import { logger } from '../core/tools/logger.js'
 
 const INTERACTIVE_COMMIT_LIMIT = 30
 

package/src/workflows/push-workflow.js

@@ -1,16 +1,64 @@
-import { getRepoPolicy } from '../core/config-store.js'
+import { formatAiCommitSummary } from '../core/ai/commit-summary.js'
+import { getPlatformConfig, getRepoPolicy } from '../core/config/store.js'
 import { IcodeError } from '../core/errors.js'
-import { GitService } from '../core/git-service.js'
-import { resolveGitContext } from '../core/git-context.js'
-import { formatAiCommitSummary } from '../core/ai-commit-summary.js'
-import { logger } from '../core/logger.js'
-import { confirm, input } from '../core/prompts.js'
+import { resolveGitContext } from '../core/git/context.js'
+import { GitService } from '../core/git/service.js'
+import { confirm, input } from '../core/tools/interactive.js'
+import { requestRemoteMerge, resolveRemoteMergeProjectUrl } from '../core/remote-merge/client.js'
+import { logger } from '../core/tools/logger.js'
 import { runAiCommitWorkflow } from './ai-commit-workflow.js'
 
 function uniqueBranches(branches) {
   return [...new Set(branches.map((item) => item.trim()).filter(Boolean))]
 }
 
+// 基于 commit 内容构建远程 MR 标题与正文，确保标题和内容都来自真实提交信息。
+async function buildRemoteMergeCommitContent(git, sourceBranch, targetBranch) {
+  const rangeSpec = `origin/${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 || '远程合并失败'
+}
+
 // Run AI commit before push and keep the full generated message in follow-up logs.
 async function prepareAiCommitIfEnabled(inputOptions) {
   if (!inputOptions.aiCommit) {
@@ -122,6 +170,162 @@ async function checkoutTargetBranch(git, targetBranch, sourceBranch) {
   }
 }
 
+function normalizeRemoteMergePolicy(policy = {}) {
+  const remoteMerge = policy.remoteMerge && typeof policy.remoteMerge === 'object' ? policy.remoteMerge : {}
+  return {
+    enabled: remoteMerge.enabled !== false,
+    projectUrl: typeof remoteMerge.projectUrl === 'string' ? remoteMerge.projectUrl.trim() : ''
+  }
+}
+
+// 归一化平台级远程合并配置，避免命令层拿到带空白的原始值。
+function normalizeRemoteMergePlatformConfig(config = {}) {
+  return {
+    provider: typeof config.provider === 'string' ? config.provider.trim() : '',
+    apiKey: typeof config.apiKey === 'string' ? config.apiKey.trim() : ''
+  }
+}
+
+function buildRemoteMergePauseError(targetBranch, reason, meta = {}) {
+  return new IcodeError(`远程合并已暂停(${targetBranch}): ${reason}`, {
+    code: 'PUSH_REMOTE_MERGE_PAUSED',
+    exitCode: 2,
+    meta: {
+      targetBranch,
+      reason,
+      ...meta
+    }
+  })
+}
+
+// 统一把 provider 返回的 step 注入错误文案，便于定位 create/approve/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}`
+}
+
+// 构建批量远程合并暂停错误，明确指出具体失败分支与原因。
+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
+    }
+  })
+}
+
+// 基于 origin 推导 GitLab 项目地址并发起固定 API 的 MR 创建请求。
+async function performRemoteMerge({ git, currentBranch, targetBranch, remoteExists, inputOptions, remoteMergePolicy, remoteMergePlatform }) {
+  if (!remoteExists) {
+    throw buildRemoteMergePauseError(targetBranch, '远程合并要求目标分支已存在于 origin。', {
+      remoteExists: false
+    })
+  }
+
+  if (!remoteMergePolicy.enabled) {
+    throw buildRemoteMergePauseError(targetBranch, '仓库未启用远程合并配置，请先配置 repositories.<repo>.remoteMerge.enabled=true。')
+  }
+
+  if (!remoteMergePlatform.apiKey) {
+    throw buildRemoteMergePauseError(targetBranch, '平台未配置远程合并密钥，请先执行 icode config platform remote-merge set --provider <name> --api-key <key>。')
+  }
+
+  const remoteOriginUrl = await git.getRemoteUrl('origin')
+  const projectUrl = resolveRemoteMergeProjectUrl({
+    provider: remoteMergePlatform.provider,
+    remoteUrl: remoteOriginUrl
+  })
+  if (!projectUrl) {
+    throw buildRemoteMergePauseError(targetBranch, '无法从 origin 自动识别 GitLab 项目 URL，请检查 origin 是否指向 GitLab 仓库。', {
+      origin: remoteOriginUrl
+    })
+  }
+  logger.info(`已根据 origin 自动识别 GitLab 项目 URL: ${projectUrl}`)
+
+  logger.info(`发起远程合并: ${currentBranch} -> ${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}: ${result.mergeRequestUrl}`)
+  } else {
+    logger.success(`${successReason}: ${currentBranch} -> ${targetBranch}`)
+  }
+
+  return result
+}
+
+// 并发执行多个远程合并目标分支，并把冲突/失败精确归档到对应分支。
+async function runConcurrentRemoteMerges(options) {
+  const tasks = options.targetBranches.map(async (targetBranch) => {
+    try {
+      logger.info(`处理分支: ${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)
+}
+
 export async function runPushWorkflow(inputOptions) {
   const context = await resolveGitContext({
     cwd: inputOptions.cwd,
@@ -131,6 +335,8 @@ export async function runPushWorkflow(inputOptions) {
   const git = new GitService(context)
   const policy = getRepoPolicy(context.topLevelPath)
   const protectedBranches = new Set((policy.protectedBranches || []).map((item) => item.trim()).filter(Boolean))
+  const remoteMergePolicy = normalizeRemoteMergePolicy(policy)
+  const remoteMergePlatform = normalizeRemoteMergePlatformConfig(getPlatformConfig('remoteMerge'))
 
   logger.info(`仓库根目录: ${context.topLevelPath}`)
   if (context.inheritedFromParent) {
@@ -203,6 +409,7 @@ export async function runPushWorkflow(inputOptions) {
 
   const summary = []
   const originalBranch = currentBranch
+  const remoteMergeTargets = []
 
   try {
     for (const targetBranch of branchTargets) {
@@ -212,9 +419,8 @@ export async function runPushWorkflow(inputOptions) {
         continue
       }
 
-      logger.info(`处理分支: ${targetBranch}`)
-
       if (targetBranch === currentBranch) {
+        logger.info(`处理分支: ${targetBranch}`)
         const remoteExists = await git.branchExistsRemote(targetBranch)
         if (remoteExists) {
           logger.info(`同步远程分支: ${targetBranch}`)
@@ -235,26 +441,55 @@ export async function runPushWorkflow(inputOptions) {
         continue
       }
 
-      logger.info(`切换到目标分支: ${targetBranch}`)
-      const { remoteExists, checkoutMode } = await checkoutTargetBranch(git, targetBranch, currentBranch)
-      logger.info(`目标分支准备完成: ${targetBranch} (${checkoutMode})`)
+      if (inputOptions.remoteMerge) {
+        remoteMergeTargets.push(targetBranch)
+      } else {
+        logger.info(`处理分支: ${targetBranch}`)
+        logger.info(`切换到目标分支: ${targetBranch}`)
+        const { remoteExists, checkoutMode } = await checkoutTargetBranch(git, targetBranch, currentBranch)
+        logger.info(`目标分支准备完成: ${targetBranch} (${checkoutMode})`)
+
+        // 保留 merge commit，方便后续追溯“从哪个分支合并过来”。
+        logger.info(`合并分支: ${currentBranch} -> ${targetBranch}`)
+        await git.merge(currentBranch, {
+          noFf: true,
+          noEdit: true
+        })
+        logger.success(`合并成功: ${currentBranch} -> ${targetBranch}`)
 
-      // 保留 merge commit，方便后续追溯“从哪个分支合并过来”。
-      logger.info(`合并分支: ${currentBranch} -> ${targetBranch}`)
-      await git.merge(currentBranch, {
-        noFf: true,
-        noEdit: true
-      })
-      logger.success(`合并成功: ${currentBranch} -> ${targetBranch}`)
+        logger.info(`推送目标分支: ${targetBranch}`)
+        await git.push(targetBranch, {
+          setUpstream: !remoteExists,
+          noVerify: inputOptions.noVerify
+        })
 
-      logger.info(`推送目标分支: ${targetBranch}`)
-      await git.push(targetBranch, {
-        setUpstream: !remoteExists,
-        noVerify: inputOptions.noVerify
+        logger.success(`目标分支推送成功: ${targetBranch}`)
+        summary.push({ branch: targetBranch, status: 'merged-and-pushed' })
+      }
+    }
+
+    if (inputOptions.remoteMerge && remoteMergeTargets.length) {
+      logger.info(`并发处理远程合并分支: ${remoteMergeTargets.join(', ')}`)
+      const remoteMergeSummary = await runConcurrentRemoteMerges({
+        git,
+        currentBranch,
+        targetBranches: remoteMergeTargets,
+        inputOptions,
+        remoteMergePolicy,
+        remoteMergePlatform
       })
+      summary.push(...remoteMergeSummary)
 
-      logger.success(`目标分支推送成功: ${targetBranch}`)
-      summary.push({ branch: targetBranch, status: 'merged-and-pushed' })
+      const failures = remoteMergeSummary
+        .filter((item) => item.status === 'paused')
+        .map((item) => ({
+          branch: item.branch,
+          reason: item.reason || '远程合并失败'
+        }))
+
+      if (failures.length) {
+        throw buildRemoteMergeBatchPauseError(failures, summary)
+      }
     }
   } finally {
     const branchAfterWorkflow = await git.getCurrentBranch()

package/src/workflows/rollback-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 { confirm } from '../core/prompts.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 || ''}`

package/src/workflows/sync-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 { confirm } from '../core/prompts.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 unique(list) {
   return [...new Set(list.map((item) => item.trim()).filter(Boolean))]

package/src/workflows/tag-workflow.js

@@ -1,8 +1,8 @@
 import { IcodeError } from '../core/errors.js'
-import { GitService } from '../core/git-service.js'
-import { resolveGitContext } from '../core/git-context.js'
-import { logger } from '../core/logger.js'
-import { input } from '../core/prompts.js'
+import { resolveGitContext } from '../core/git/context.js'
+import { GitService } from '../core/git/service.js'
+import { input } from '../core/tools/interactive.js'
+import { logger } from '../core/tools/logger.js'
 
 function todayStamp() {
   const now = new Date()

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 = [
@@ -247,6 +247,10 @@ async function handleRevertConflict(options, mode, ref) {
   }
 }
 
+/**
+ * 执行 undo 工作流。
+ * 输入为已归一化的回滚模式、目标 ref/hash、恢复策略和仓库选项，输出为执行结果或取消状态。
+ */
 export async function runUndoWorkflow(options) {
   const pendingResult = await resolvePendingOperation(options)
   if (pendingResult) {
@@ -255,6 +259,7 @@ 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)
@@ -267,7 +272,9 @@ export async function runUndoWorkflow(options) {
     }
 
     mode = parsed.mode
-    ref = parsed.ref
+    if (!hasExplicitRef) {
+      ref = parsed.ref
+    }
   }
 
   const defaultRef = resolveDefaultRef(mode)