@icode-js/icode 3.1.0 → 3.2.0

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

@@ -1,4 +1,5 @@
 import { askAi } from '../core/ai/client.js'
+import { buildLimitedDiffPrompt, formatDiffCoverage, summarizeDiffCoverage } from '../core/ai/diff-prompt.js'
 import { resolveAiDiffRange } from '../core/ai/diff-range.js'
 import { IcodeError } from '../core/errors.js'
 import { resolveGitContext } from '../core/git/context.js'
@@ -19,6 +20,14 @@ function joinSections(sections) {
     .join('\n\n')
 }
 
+// 构建 AI code review prompt 中的 diff 片段，输入完整 diff，输出受限 diff 与覆盖范围。
+function buildReviewDiffPrompt(diff) {
+  return buildLimitedDiffPrompt(diff, {
+    limit: 18000
+  })
+}
+
+// 执行 AI 代码审查工作流，输入 diff 范围和 AI 选项，输出审查文本与 diff 覆盖范围。
 export async function runAiCodeReviewWorkflow(options) {
   const context = await resolveGitContext({
     cwd: options.cwd,
@@ -101,10 +110,12 @@ export async function runAiCodeReviewWorkflow(options) {
     ])
   }
 
+  const limitedDiff = buildReviewDiffPrompt(diff)
+
   const review = await askAi(
     {
       systemPrompt: '你是严格的软件代码审查工程师，请优先关注 bug、安全风险、行为回归、缺失测试。输出中文 Markdown。',
-      userPrompt: `请按如下结构输出：\n1. Findings（按严重度从高到低）\n2. Open Questions\n3. Summary\n\nFocus: ${options.focus || 'general'}\nRange: ${rangeSpec}\nDiff Source: ${diffSource}\n\nDiff Stat:\n${truncate(stat, 3000)}\n\nName Status:\n${truncate(nameStatus, 3000)}\n\nUnified Diff:\n${truncate(diff, 18000)}`
+      userPrompt: `请按如下结构输出：\n1. Findings（按严重度从高到低）\n2. Open Questions\n3. Summary\n\nFocus: ${options.focus || 'general'}\nRange: ${rangeSpec}\nDiff Source: ${diffSource}\n\n${formatDiffCoverage(limitedDiff.coverage)}\n\nDiff Stat:\n${truncate(stat, 3000)}\n\nName Status:\n${truncate(nameStatus, 3000)}\n\nUnified Diff:\n${limitedDiff.diff}`
     },
     {
       profile: options.profile,
@@ -121,6 +132,7 @@ export async function runAiCodeReviewWorkflow(options) {
 
   return {
     rangeSpec,
-    review
+    review,
+    diffCoverage: summarizeDiffCoverage(limitedDiff.coverage)
   }
 }

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

@@ -1,5 +1,6 @@
 import { IcodeError } from '../core/errors.js'
 import { askAiJson } from '../core/ai/client.js'
+import { buildLimitedDiffPrompt, formatDiffCoverage, summarizeDiffCoverage } from '../core/ai/diff-prompt.js'
 import { resolveGitContext } from '../core/git/context.js'
 import { scanCommitConventions } from '../core/git/commit-conventions.js'
 import { GitService } from '../core/git/service.js'
@@ -74,7 +75,9 @@ export async function runAiCommitWorkflow(options) {
     })
   }
 
-  const limitedDiff = diff.length > 12000 ? `${diff.slice(0, 12000)}\n\n...<truncated>` : diff
+  const limitedDiff = buildLimitedDiffPrompt(diff, {
+    limit: 12000
+  })
   const conventionContext = scanCommitConventions(context)
   const conventionPrompt = conventionContext.hasConventions
     ? `Local commit conventions were detected from repository hooks/config files. Follow these local rules first when generating the commit message.\n\n${conventionContext.summary}\n\n`
@@ -89,7 +92,7 @@ export async function runAiCommitWorkflow(options) {
   const { parsed, text } = await askAiJson(
     {
       systemPrompt: `You are a senior software engineer. Generate a concise Conventional Commit message. Output JSON only. Language: ${language}.`,
-      userPrompt: `${conventionPrompt}Based on the following git diff, return JSON with fields:\n{\"type\":\"feat|fix|docs|style|refactor|perf|test|chore|build|ci|revert\",\"scope\":\"optional\",\"subject\":\"required one-line summary\",\"body\":\"optional details\"}\n\nDiff Source: ${diffSource}\n\nDiff:\n${limitedDiff}`
+      userPrompt: `${conventionPrompt}Based on the following git diff, return JSON with fields:\n{\"type\":\"feat|fix|docs|style|refactor|perf|test|chore|build|ci|revert\",\"scope\":\"optional\",\"subject\":\"required one-line summary\",\"body\":\"optional details\"}\n\nDiff Source: ${diffSource}\n\n${formatDiffCoverage(limitedDiff.coverage)}\n\nDiff:\n${limitedDiff.diff}`
     },
     {
       profile: options.profile
@@ -98,13 +101,16 @@ export async function runAiCommitWorkflow(options) {
 
   const commitMessage = buildCommitMessage(parsed)
 
-  logger.success(`AI 建议提交信息:\n${commitMessage}`)
+  if (!options.silentResultLog) {
+    logger.success(`AI 建议提交信息:\n${commitMessage}`)
+  }
 
   if (!options.apply) {
     return {
       applied: false,
       commitMessage,
-      raw: text
+      raw: text,
+      diffCoverage: summarizeDiffCoverage(limitedDiff.coverage)
     }
   }
 
@@ -115,6 +121,7 @@ export async function runAiCommitWorkflow(options) {
         applied: false,
         commitMessage,
         raw: text,
+        diffCoverage: summarizeDiffCoverage(limitedDiff.coverage),
         canceled: true
       }
     }
@@ -130,7 +137,7 @@ export async function runAiCommitWorkflow(options) {
   })
 
   const commitId = await git.revParseShort('HEAD')
-  if (commitId) {
+  if (commitId && !options.silentResultLog) {
     logger.success(`AI commit 已创建: ${commitId}`)
   }
 
@@ -138,6 +145,7 @@ export async function runAiCommitWorkflow(options) {
     applied: true,
     commitId,
     commitMessage,
-    raw: text
+    raw: text,
+    diffCoverage: summarizeDiffCoverage(limitedDiff.coverage)
   }
 }

package/src/workflows/checkout-workflow.js

@@ -1,8 +1,18 @@
 import { IcodeError } from '../core/errors.js'
 import { resolveGitContext } from '../core/git/context.js'
+import {
+  assertCleanWorktree,
+  assertNoConflictedFiles,
+  assertNoPendingOperation,
+  readGitSafetyState
+} from '../core/git/preconditions.js'
 import { GitService } from '../core/git/service.js'
 import { logger } from '../core/tools/logger.js'
 
+/**
+ * 执行 checkout 工作流。
+ * 输入为目标分支、基线分支和执行选项，输出分支切换结果；实际切换前要求工作区干净且没有未完成 Git 操作。
+ */
 export async function runCheckoutWorkflow(input) {
   if (!input.branchName) {
     throw new IcodeError('缺少分支名: icode checkout <branch> [base]', {
@@ -19,6 +29,10 @@ export async function runCheckoutWorkflow(input) {
   const git = new GitService(context)
   const branchName = input.branchName.trim()
   const baseBranchName = input.baseBranchName?.trim() || context.defaultBranch
+  const safetyState = await readGitSafetyState(git)
+  assertNoPendingOperation(safetyState.operation, 'checkout', 'CHECKOUT_GIT_OPERATION_IN_PROGRESS')
+  assertNoConflictedFiles(safetyState.changes, 'checkout', 'CHECKOUT_CONFLICTED_FILES')
+  assertCleanWorktree(safetyState.changes, 'checkout', 'CHECKOUT_DIRTY_WORKTREE')
 
   logger.info(`仓库根目录: ${context.topLevelPath}`)
   if (context.inheritedFromParent) {
@@ -55,7 +69,6 @@ export async function runCheckoutWorkflow(input) {
   if (input.pullMain && context.defaultBranch !== branchName) {
     logger.info(`同步主分支到当前分支: ${context.defaultBranch}`)
     await git.pull(context.defaultBranch, {
-      allowUnrelatedHistories: true,
       noRebase: true
     })
   }
@@ -63,7 +76,6 @@ export async function runCheckoutWorkflow(input) {
   if (remoteExists) {
     logger.info(`拉取远程分支: ${branchName}`)
     await git.pull(branchName, {
-      allowUnrelatedHistories: true,
       noRebase: true
     })
   }

package/src/workflows/clean-workflow.js

@@ -1,6 +1,13 @@
 import { getRepoPolicy } from '../core/config/store.js'
 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'
@@ -14,6 +21,10 @@ function normalizeKeepList(values = []) {
   )
 }
 
+/**
+ * 执行 clean 工作流。
+ * 输入为清理基线、保留分支和删除选项，输出已删除分支；执行前要求工作区干净并在普通分支上。
+ */
 export async function runCleanWorkflow(options) {
   const context = await resolveGitContext({
     cwd: options.cwd,
@@ -22,8 +33,13 @@ export async function runCleanWorkflow(options) {
 
   const git = new GitService(context)
   const mergedTarget = (options.mergedTarget || context.defaultBranch).trim()
-  const currentBranch = (await git.getCurrentBranch()) || context.currentBranch
+  const safetyState = await readGitSafetyState(git)
+  const currentBranch = safetyState.currentBranch || context.currentBranch
   const policy = getRepoPolicy(context.topLevelPath)
+  assertOnBranch(currentBranch, 'clean', 'CLEAN_DETACHED_HEAD')
+  assertNoPendingOperation(safetyState.operation, 'clean', 'CLEAN_GIT_OPERATION_IN_PROGRESS')
+  assertNoConflictedFiles(safetyState.changes, 'clean', 'CLEAN_CONFLICTED_FILES')
+  assertCleanWorktree(safetyState.changes, 'clean', 'CLEAN_DIRTY_WORKTREE')
 
   logger.info(`仓库根目录: ${context.topLevelPath}`)
   if (context.inheritedFromParent) {
@@ -41,91 +57,92 @@ export async function runCleanWorkflow(options) {
     })
   }
 
-  if (targetLocalExists) {
-    await git.checkout(mergedTarget)
-  } else {
-    await git.checkoutTracking(mergedTarget)
-  }
-
-  if (targetRemoteExists) {
-    await git.pull(mergedTarget, {
-      allowUnrelatedHistories: true,
-      noRebase: true
-    })
-  }
-
-  const mergedBranches = await git.listMergedLocalBranches(mergedTarget)
-  const protectedBranches = new Set((policy.protectedBranches || []).map((item) => item.trim()).filter(Boolean))
-  const keepSet = normalizeKeepList(options.keep || [])
+  try {
+    if (targetLocalExists) {
+      await git.checkout(mergedTarget)
+    } else {
+      await git.checkoutTracking(mergedTarget)
+    }
 
-  // 这些分支永远不进入清理列表，避免误删核心分支。
-  keepSet.add(mergedTarget)
-  if (context.defaultBranch) {
-    keepSet.add(context.defaultBranch)
-  }
-  if (currentBranch) {
-    keepSet.add(currentBranch)
-  }
-  protectedBranches.forEach((branch) => keepSet.add(branch))
+    if (targetRemoteExists) {
+      await git.pull(mergedTarget, {
+        noRebase: true
+      })
+    }
 
-  const candidates = mergedBranches.filter((branch) => !keepSet.has(branch))
+    const mergedBranches = await git.listMergedLocalBranches(mergedTarget)
+    const protectedBranches = new Set((policy.protectedBranches || []).map((item) => item.trim()).filter(Boolean))
+    const keepSet = normalizeKeepList(options.keep || [])
 
-  if (!candidates.length) {
-    logger.info('没有可清理的本地分支。')
-    return {
-      repoRoot: context.topLevelPath,
-      mergedTarget,
-      deletedLocal: [],
-      deletedRemote: []
+    // 这些分支永远不进入清理列表，避免误删核心分支。
+    keepSet.add(mergedTarget)
+    if (context.defaultBranch) {
+      keepSet.add(context.defaultBranch)
     }
-  }
+    if (currentBranch) {
+      keepSet.add(currentBranch)
+    }
+    protectedBranches.forEach((branch) => keepSet.add(branch))
 
-  if (!options.yes) {
-    const accepted = await confirm(
-      `确认清理以下分支吗: ${candidates.join(', ')} ?`,
-      false
-    )
-    if (!accepted) {
-      logger.warn('已取消清理。')
+    const candidates = mergedBranches.filter((branch) => !keepSet.has(branch))
+
+    if (!candidates.length) {
+      logger.info('没有可清理的本地分支。')
       return {
-        canceled: true,
         repoRoot: context.topLevelPath,
         mergedTarget,
-        candidates
+        deletedLocal: [],
+        deletedRemote: []
       }
     }
-  }
 
-  const deletedLocal = []
-  const deletedRemote = []
-
-  for (const branch of candidates) {
-    await git.deleteLocalBranch(branch, {
-      force: options.force
-    })
-    deletedLocal.push(branch)
+    if (!options.yes) {
+      const accepted = await confirm(
+        `确认清理以下分支吗: ${candidates.join(', ')} ?`,
+        false
+      )
+      if (!accepted) {
+        logger.warn('已取消清理。')
+        return {
+          canceled: true,
+          repoRoot: context.topLevelPath,
+          mergedTarget,
+          candidates
+        }
+      }
+    }
 
-    if (options.remote) {
-      const existsRemote = await git.branchExistsRemote(branch)
-      if (existsRemote) {
-        await git.deleteRemoteBranch(branch)
-        deletedRemote.push(branch)
+    const deletedLocal = []
+    const deletedRemote = []
+
+    for (const branch of candidates) {
+      await git.deleteLocalBranch(branch, {
+        force: options.force
+      })
+      deletedLocal.push(branch)
+
+      if (options.remote) {
+        const existsRemote = await git.branchExistsRemote(branch)
+        if (existsRemote) {
+          await git.deleteRemoteBranch(branch)
+          deletedRemote.push(branch)
+        }
       }
     }
-  }
 
-  try {
+    return {
+      repoRoot: context.topLevelPath,
+      mergedTarget,
+      deletedLocal,
+      deletedRemote
+    }
+  } finally {
     if (currentBranch && currentBranch !== mergedTarget) {
-      await git.checkout(currentBranch)
+      try {
+        await git.checkout(currentBranch)
+      } catch (error) {
+        logger.warn(`未能切回原分支 ${currentBranch}: ${error.message}`)
+      }
     }
-  } catch (error) {
-    logger.warn(`未能切回原分支 ${currentBranch}: ${error.message}`)
-  }
-
-  return {
-    repoRoot: context.topLevelPath,
-    mergedTarget,
-    deletedLocal,
-    deletedRemote
   }
 }

package/src/workflows/doctor-workflow.js

@@ -0,0 +1,131 @@
+import { getAiConfig } from '../core/ai/config.js'
+import { getConfigFilePath, getPlatformConfig, getRepoPolicy } from '../core/config/store.js'
+import { resolveGitContext } from '../core/git/context.js'
+import { GitService } from '../core/git/service.js'
+import { runCommand } from '../core/commands/shell.js'
+
+// 构建单条健康检查结果，输入检查项字段，输出统一结构。
+function buildCheck(id, status, title, detail, suggestion = '') {
+  return {
+    id,
+    status,
+    title,
+    detail,
+    suggestion
+  }
+}
+
+// 汇总检查结果状态，输入 checks 数组，输出整体状态与计数。
+function summarizeChecks(checks) {
+  const summary = {
+    status: 'pass',
+    pass: 0,
+    warn: 0,
+    fail: 0
+  }
+
+  checks.forEach((check) => {
+    if (check.status === 'fail') {
+      summary.fail += 1
+      summary.status = 'fail'
+      return
+    }
+    if (check.status === 'warn') {
+      summary.warn += 1
+      if (summary.status !== 'fail') {
+        summary.status = 'warn'
+      }
+      return
+    }
+    summary.pass += 1
+  })
+
+  return summary
+}
+
+// 检查 git 命令可用性，输入仓库根目录，输出健康检查项。
+async function checkGitVersion(repoRoot) {
+  const result = await runCommand('git', ['--version'], {
+    cwd: repoRoot,
+    allowFailure: true
+  })
+
+  if (result.exitCode !== 0) {
+    return buildCheck('git.version', 'fail', 'Git 命令不可用', '无法执行 git --version。', '请先安装 Git 并确认 PATH 配置正确。')
+  }
+
+  return buildCheck('git.version', 'pass', 'Git 命令可用', result.stdout.trim())
+}
+
+// 检查 origin remote 是否存在，输入 GitService，输出健康检查项。
+async function checkOriginRemote(git) {
+  const remoteUrl = await git.getRemoteUrl('origin')
+  if (!remoteUrl) {
+    return buildCheck('git.origin', 'warn', 'origin remote 未配置', '当前仓库没有 origin remote。', '需要 push 或远程合并前，请先配置 git remote add origin <url>。')
+  }
+
+  return buildCheck('git.origin', 'pass', 'origin remote 已配置', remoteUrl)
+}
+
+// 检查 hook 配置，输入 git context，输出健康检查项。
+function checkHooks(context) {
+  if (context.hasHuskyFolder || context.hasHookPath) {
+    return buildCheck('git.hooks', 'pass', 'Git hooks 已检测到', `hookPath=${context.hookPath}`)
+  }
+
+  return buildCheck('git.hooks', 'warn', '未检测到 Git hooks', '当前仓库没有 .husky 目录或 hooksPath。', '如团队依赖 commitlint/lint-staged，建议补齐 hooks 配置。')
+}
+
+// 检查 AI profile 配置，输入 AI 配置对象，输出健康检查项。
+function checkAiProfile(aiConfig) {
+  const profileCount = Object.keys(aiConfig.profiles || {}).length
+  if (!profileCount || !aiConfig.activeProfile) {
+    return buildCheck('ai.profile', 'warn', 'AI profile 未配置', '当前没有可用 AI profile。', '如需使用 ai commit/codereview/explain，请执行 icode config ai set ... --activate。')
+  }
+
+  return buildCheck('ai.profile', 'pass', 'AI profile 已配置', `activeProfile=${aiConfig.activeProfile}, profileCount=${profileCount}`)
+}
+
+// 检查远程合并平台配置，输入平台配置与仓库策略，输出健康检查项。
+function checkRemoteMerge(remoteMergePlatform, repoPolicy) {
+  const remoteMergePolicy = repoPolicy.remoteMerge && typeof repoPolicy.remoteMerge === 'object'
+    ? repoPolicy.remoteMerge
+    : {}
+
+  if (remoteMergePolicy.enabled === false) {
+    return buildCheck('remoteMerge.config', 'pass', '远程合并已在仓库禁用', 'repositories.<repo>.remoteMerge.enabled=false')
+  }
+
+  if (!remoteMergePlatform.provider || !remoteMergePlatform.apiKey) {
+    return buildCheck('remoteMerge.config', 'warn', '远程合并平台未完整配置', '缺少 provider 或 apiKey。', '如需 icode push -r，请执行 icode config platform remote-merge set --provider gitlab --api-key <key>。')
+  }
+
+  return buildCheck('remoteMerge.config', 'pass', '远程合并平台已配置', `provider=${remoteMergePlatform.provider}`)
+}
+
+// 执行项目健康检查，输入仓库选项，输出 context、checks 和 summary。
+export async function runDoctorWorkflow(options = {}) {
+  const context = await resolveGitContext({
+    cwd: options.cwd,
+    repoMode: options.repoMode
+  })
+  const git = new GitService(context)
+  const repoPolicy = getRepoPolicy(context.topLevelPath)
+  const aiConfig = getAiConfig()
+  const remoteMergePlatform = getPlatformConfig('remoteMerge')
+
+  const checks = [
+    await checkGitVersion(context.topLevelPath),
+    await checkOriginRemote(git),
+    checkHooks(context),
+    checkAiProfile(aiConfig),
+    checkRemoteMerge(remoteMergePlatform, repoPolicy)
+  ]
+
+  return {
+    configPath: getConfigFilePath(),
+    context,
+    checks,
+    summary: summarizeChecks(checks)
+  }
+}