clawt 3.5.0 → 3.5.1

package/dist/index.js

@@ -173,7 +173,22 @@ ${branches.map((b) => `    - ${b}`).join("\n")}`,
   /** merge 交互选择提示 */
   MERGE_SELECT_BRANCH: "\u8BF7\u9009\u62E9\u8981\u5408\u5E76\u7684\u5206\u652F",
   /** merge 模糊匹配到多个结果提示 */
-  MERGE_MULTIPLE_MATCHES: (name) => `"${name}" \u5339\u914D\u5230\u591A\u4E2A\u5206\u652F\uFF0C\u8BF7\u9009\u62E9\uFF1A`
+  MERGE_MULTIPLE_MATCHES: (name) => `"${name}" \u5339\u914D\u5230\u591A\u4E2A\u5206\u652F\uFF0C\u8BF7\u9009\u62E9\uFF1A`,
+  /** 询问是否使用 AI 辅助解决冲突 */
+  MERGE_CONFLICT_ASK_AI: "\u68C0\u6D4B\u5230\u5408\u5E76\u51B2\u7A81\uFF0C\u662F\u5426\u4F7F\u7528 Claude Code \u81EA\u52A8\u89E3\u51B3\uFF1F",
+  /** AI 冲突解决开始 */
+  MERGE_CONFLICT_AI_START: (fileCount) => `\u6B63\u5728\u4F7F\u7528 Claude Code \u5206\u6790\u5E76\u89E3\u51B3 ${fileCount} \u4E2A\u51B2\u7A81\u6587\u4EF6...`,
+  /** AI 冲突解决成功 */
+  MERGE_CONFLICT_AI_SUCCESS: "\u2713 Claude Code \u5DF2\u6210\u529F\u89E3\u51B3\u6240\u6709\u51B2\u7A81",
+  /** AI 冲突解决后仍有未解决的冲突 */
+  MERGE_CONFLICT_AI_PARTIAL: (remaining) => `Claude Code \u5DF2\u5904\u7406\u51B2\u7A81\u6587\u4EF6\uFF0C\u4F46\u4ECD\u6709 ${remaining} \u4E2A\u6587\u4EF6\u5B58\u5728\u51B2\u7A81
+  \u8BF7\u624B\u52A8\u5904\u7406\u5269\u4F59\u51B2\u7A81\u540E\u6267\u884C git add . && git merge --continue`,
+  /** AI 冲突解决失败 */
+  MERGE_CONFLICT_AI_FAILED: (errorMsg) => `Claude Code \u89E3\u51B3\u51B2\u7A81\u5931\u8D25: ${errorMsg}
+  \u8BF7\u624B\u52A8\u5904\u7406\uFF1A
+  \u89E3\u51B3\u51B2\u7A81\u540E\u6267\u884C git add . && git merge --continue`,
+  /** --auto 模式下的冲突手动解决（配置为 manual） */
+  MERGE_CONFLICT_MANUAL: "\u5408\u5E76\u5B58\u5728\u51B2\u7A81\uFF0C\u8BF7\u624B\u52A8\u5904\u7406\uFF1A\n  \u89E3\u51B3\u51B2\u7A81\u540E\u6267\u884C git add . && git merge --continue"
 };
 
 // src/constants/messages/validate.ts
@@ -667,6 +682,15 @@ var CONFIG_DEFINITIONS = {
   autoUpdate: {
     defaultValue: true,
     description: "\u662F\u5426\u542F\u7528\u81EA\u52A8\u66F4\u65B0\u68C0\u67E5\uFF08\u6BCF 24 \u5C0F\u65F6\u68C0\u67E5\u4E00\u6B21 npm registry\uFF09"
+  },
+  conflictResolveMode: {
+    defaultValue: "ask",
+    description: "merge \u51B2\u7A81\u65F6\u7684\u89E3\u51B3\u6A21\u5F0F\uFF1Aask\uFF08\u8BE2\u95EE\u662F\u5426\u4F7F\u7528 AI\uFF09\u3001auto\uFF08\u81EA\u52A8 AI \u89E3\u51B3\uFF09\u3001manual\uFF08\u624B\u52A8\u89E3\u51B3\uFF09",
+    allowedValues: ["ask", "auto", "manual"]
+  },
+  conflictResolveTimeoutMs: {
+    defaultValue: 3e5,
+    description: "Claude Code \u51B2\u7A81\u89E3\u51B3\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09\uFF0C\u9ED8\u8BA4 300000\uFF085 \u5206\u949F\uFF09"
   }
 };
 function deriveDefaultConfig(definitions) {
@@ -768,6 +792,21 @@ var GROUP_SEPARATOR_LABEL = (dateLabel, relativeTime) => `\u2550\u2550\u2550\u25
 var UNKNOWN_DATE_GROUP = "\u672A\u77E5\u65E5\u671F";
 var UNKNOWN_DATE_SEPARATOR_LABEL = `\u2550\u2550\u2550\u2550 ${chalk2.bold.hex("#FF8C00")("\u672A\u77E5\u65E5\u671F")} \u2550\u2550\u2550\u2550`;
 
+// src/constants/ai-prompts.ts
+var CONFLICT_RESOLVE_PROMPT = `\u4F60\u662F\u4E00\u4E2A Git \u5408\u5E76\u51B2\u7A81\u89E3\u51B3\u4E13\u5BB6\u3002\u5F53\u524D\u4ED3\u5E93\u5904\u4E8E\u5408\u5E76\u51B2\u7A81\u72B6\u6001\u3002
+
+## \u4EFB\u52A1
+
+1. \u901A\u8FC7 git status \u548C git diff \u7B49\u547D\u4EE4\uFF0C\u81EA\u884C\u67E5\u770B\u5F53\u524D\u4ED3\u5E93\u7684\u51B2\u7A81\u6587\u4EF6\u5217\u8868\u53CA\u51B2\u7A81\u5185\u5BB9
+2. \u901A\u8FC7 git log \u7B49\u547D\u4EE4\uFF0C\u5206\u6790\u4E24\u4E2A\u5206\u652F\u5404\u81EA\u7684\u53D8\u66F4\u610F\u56FE
+3. \u76F4\u63A5\u7F16\u8F91\u6BCF\u4E2A\u51B2\u7A81\u6587\u4EF6\uFF0C\u79FB\u9664\u6240\u6709\u51B2\u7A81\u6807\u8BB0\uFF08<<<<<<<\u3001=======\u3001>>>>>>>\uFF09
+4. \u4FDD\u7559\u53CC\u65B9\u6709\u610F\u4E49\u7684\u53D8\u66F4\uFF0C\u5408\u7406\u5408\u5E76\u4EE3\u7801\u903B\u8F91
+5. \u5982\u679C\u4E24\u4E2A\u5206\u652F\u4FEE\u6539\u4E86\u540C\u4E00\u6BB5\u4EE3\u7801\u4F46\u610F\u56FE\u4E0D\u540C\uFF0C\u4F18\u5148\u4FDD\u8BC1\u4EE3\u7801\u7684\u6B63\u786E\u6027\u548C\u5B8C\u6574\u6027
+6. \u89E3\u51B3\u51B2\u7A81\u540E\uFF0C\u786E\u4FDD\u4EE3\u7801\u8BED\u6CD5\u6B63\u786E\u3001\u903B\u8F91\u5B8C\u6574
+7. \u4E0D\u8981\u6DFB\u52A0\u4EFB\u4F55\u6CE8\u91CA\u8BF4\u660E\u4F60\u505A\u4E86\u4EC0\u4E48\u4FEE\u6539\uFF0C\u53EA\u9700\u8981\u4FEE\u6539\u6587\u4EF6\u5185\u5BB9
+
+\u8BF7\u76F4\u63A5\u5F00\u59CB\u3002`;
+
 // src/constants/pre-checks.ts
 var PRE_CHECK_CREATE = {
   requireMainWorktree: true,
@@ -962,7 +1001,7 @@ function runParallelCommands(commands, options) {
 
 // src/utils/git-core.ts
 import { basename } from "path";
-import { execSync as execSync2 } from "child_process";
+import { execSync as execSync2, execFileSync as execFileSync2 } from "child_process";
 function getGitCommonDir(cwd) {
   return execCommand("git rev-parse --git-common-dir", { cwd });
 }
@@ -1085,6 +1124,24 @@ function gitApplyCachedCheck(patchContent, cwd) {
     return false;
   }
 }
+function getConflictFiles(cwd) {
+  const status = getStatusPorcelain(cwd);
+  if (!status) return [];
+  return status.split("\n").filter((line) => /^(UU|AA|DD|DU|UD|AU|UA)/.test(line)).map((line) => line.slice(3));
+}
+function gitAddFiles(files, cwd) {
+  if (files.length === 0) return;
+  const args = ["add", "--", ...files];
+  logger.debug(`\u6267\u884C\u547D\u4EE4: git ${args.join(" ")}${cwd ? ` (cwd: ${cwd})` : ""}`);
+  execFileSync2("git", args, {
+    cwd,
+    encoding: "utf-8",
+    stdio: ["pipe", "pipe", "pipe"]
+  });
+}
+function gitMergeContinue(cwd) {
+  execCommand("GIT_EDITOR=true git merge --continue", { cwd });
+}
 
 // src/utils/git-branch.ts
 function checkBranchExists(branchName, cwd) {
@@ -1705,7 +1762,7 @@ import { existsSync as existsSync7, readdirSync as readdirSync3 } from "fs";
 import { join as join5 } from "path";
 
 // src/utils/terminal.ts
-import { execFileSync as execFileSync2 } from "child_process";
+import { execFileSync as execFileSync3 } from "child_process";
 import { existsSync as existsSync6 } from "fs";
 function isITerm2Installed() {
   return existsSync6(ITERM2_APP_PATH);
@@ -1764,7 +1821,7 @@ function openCommandInNewTerminalTab(command, tabTitle) {
   logger.debug(`\u6253\u5F00\u7EC8\u7AEF Tab [${terminalApp}]: ${tabTitle}`);
   logger.debug(`\u6267\u884C\u547D\u4EE4: ${command}`);
   try {
-    execFileSync2("osascript", ["-e", script], {
+    execFileSync3("osascript", ["-e", script], {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"]
     });
@@ -3948,6 +4005,89 @@ var InteractivePanel = class {
   }
 };
 
+// src/utils/conflict-resolver.ts
+import { execFileSync as execFileSync4 } from "child_process";
+var DEFAULT_CONFLICT_RESOLVE_TIMEOUT_MS = 3e5;
+function buildConflictResolvePrompt() {
+  return CONFLICT_RESOLVE_PROMPT;
+}
+function getConflictResolveTimeout() {
+  const configValue = getConfigValue("conflictResolveTimeoutMs");
+  if (typeof configValue === "number" && configValue > 0) {
+    return configValue;
+  }
+  return DEFAULT_CONFLICT_RESOLVE_TIMEOUT_MS;
+}
+function invokeClaudeForConflictResolve(prompt, cwd) {
+  const args = ["-p", prompt, "--permission-mode", "bypassPermissions"];
+  logger.info(`\u8C03\u7528 Claude Code \u89E3\u51B3\u51B2\u7A81\uFF0C\u547D\u4EE4: claude -p "..." --permission-mode bypassPermissions`);
+  try {
+    const output = execFileSync4("claude", args, {
+      cwd,
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"],
+      timeout: getConflictResolveTimeout()
+    });
+    return output;
+  } catch (error) {
+    const errMsg = error instanceof Error ? error.message : String(error);
+    logger.error(`Claude Code \u51B2\u7A81\u89E3\u51B3\u5931\u8D25: ${errMsg}`);
+    throw new ClawtError(MESSAGES.MERGE_CONFLICT_AI_FAILED(errMsg));
+  }
+}
+function resolveConflictsWithAI(currentBranch, incomingBranch, cwd) {
+  const conflictFiles = getConflictFiles(cwd);
+  if (conflictFiles.length === 0) {
+    return true;
+  }
+  printInfo(MESSAGES.MERGE_CONFLICT_AI_START(conflictFiles.length));
+  const prompt = buildConflictResolvePrompt();
+  try {
+    invokeClaudeForConflictResolve(prompt, cwd);
+  } catch (error) {
+    const errMsg = error instanceof ClawtError ? error.message : String(error);
+    printWarning(errMsg);
+    return false;
+  }
+  const remainingConflicts = getConflictFiles(cwd);
+  if (remainingConflicts.length === 0) {
+    gitAddFiles(conflictFiles, cwd);
+    gitMergeContinue(cwd);
+    printSuccess(MESSAGES.MERGE_CONFLICT_AI_SUCCESS);
+    return true;
+  }
+  const resolvedFiles = conflictFiles.filter((f) => !remainingConflicts.includes(f));
+  if (resolvedFiles.length > 0) {
+    gitAddFiles(resolvedFiles, cwd);
+  }
+  printWarning(MESSAGES.MERGE_CONFLICT_AI_PARTIAL(remainingConflicts.length));
+  return false;
+}
+function determineConflictResolveMode(autoFlag) {
+  if (autoFlag === true) {
+    return "auto";
+  }
+  const configMode = getConfigValue("conflictResolveMode");
+  if (configMode === "auto" || configMode === "manual") {
+    return configMode;
+  }
+  return "ask";
+}
+async function handleMergeConflict(currentBranch, incomingBranch, cwd, autoFlag) {
+  const mode = determineConflictResolveMode(autoFlag);
+  if (mode === "manual") {
+    throw new ClawtError(MESSAGES.MERGE_CONFLICT_MANUAL);
+  }
+  if (mode === "auto") {
+    return resolveConflictsWithAI(currentBranch, incomingBranch, cwd);
+  }
+  const shouldUseAI = await confirmAction(MESSAGES.MERGE_CONFLICT_ASK_AI);
+  if (!shouldUseAI) {
+    throw new ClawtError(MESSAGES.MERGE_CONFLICT_MANUAL);
+  }
+  return resolveConflictsWithAI(currentBranch, incomingBranch, cwd);
+}
+
 // src/commands/list.ts
 import chalk10 from "chalk";
 function registerListCommand(program2) {
@@ -4527,7 +4667,7 @@ async function handleCoverValidate() {
 
 // src/commands/merge.ts
 function registerMergeCommand(program2) {
-  program2.command("merge").description("\u5408\u5E76\u67D0\u4E2A\u5DF2\u9A8C\u8BC1\u7684 worktree \u5206\u652F\u5230\u4E3B worktree").option("-b, --branch <branchName>", "\u8981\u5408\u5E76\u7684\u5206\u652F\u540D\uFF08\u652F\u6301\u6A21\u7CCA\u5339\u914D\uFF0C\u4E0D\u4F20\u5219\u5217\u51FA\u6240\u6709\u5206\u652F\u4F9B\u9009\u62E9\uFF09").option("-m, --message <commitMessage>", "\u63D0\u4EA4\u4FE1\u606F\uFF08\u76EE\u6807 worktree \u5DE5\u4F5C\u533A\u6709\u4FEE\u6539\u65F6\u5FC5\u586B\uFF09").action(async (options) => {
+  program2.command("merge").description("\u5408\u5E76\u67D0\u4E2A\u5DF2\u9A8C\u8BC1\u7684 worktree \u5206\u652F\u5230\u4E3B worktree").option("-b, --branch <branchName>", "\u8981\u5408\u5E76\u7684\u5206\u652F\u540D\uFF08\u652F\u6301\u6A21\u7CCA\u5339\u914D\uFF0C\u4E0D\u4F20\u5219\u5217\u51FA\u6240\u6709\u5206\u652F\u4F9B\u9009\u62E9\uFF09").option("-m, --message <commitMessage>", "\u63D0\u4EA4\u4FE1\u606F\uFF08\u76EE\u6807 worktree \u5DE5\u4F5C\u533A\u6709\u4FEE\u6539\u65F6\u5FC5\u586B\uFF09").option("--auto", "\u9047\u5230\u51B2\u7A81\u76F4\u63A5\u8C03\u7528 AI \u89E3\u51B3\uFF0C\u4E0D\u518D\u8BE2\u95EE").action(async (options) => {
     await handleMerge(options);
   });
 }
@@ -4599,16 +4739,25 @@ async function handleMerge(options) {
       throw new ClawtError(MESSAGES.TARGET_WORKTREE_NO_CHANGES);
     }
   }
+  let mergeHadConflict = false;
   try {
     gitMerge(branch, mainWorktreePath);
   } catch (error) {
     if (hasMergeConflict(mainWorktreePath)) {
-      throw new ClawtError(MESSAGES.MERGE_CONFLICT);
+      mergeHadConflict = true;
+    } else {
+      throw error;
     }
-    throw error;
   }
-  if (hasMergeConflict(mainWorktreePath)) {
-    throw new ClawtError(MESSAGES.MERGE_CONFLICT);
+  if (!mergeHadConflict && hasMergeConflict(mainWorktreePath)) {
+    mergeHadConflict = true;
+  }
+  if (mergeHadConflict) {
+    const currentBranch = getCurrentBranch(mainWorktreePath);
+    const resolved = await handleMergeConflict(currentBranch, branch, mainWorktreePath, options.auto);
+    if (!resolved) {
+      return;
+    }
   }
   const autoPullPush = getConfigValue("autoPullPush");
   if (autoPullPush) {

package/dist/postinstall.js

@@ -164,7 +164,22 @@ ${branches.map((b) => `    - ${b}`).join("\n")}`,
   /** merge 交互选择提示 */
   MERGE_SELECT_BRANCH: "\u8BF7\u9009\u62E9\u8981\u5408\u5E76\u7684\u5206\u652F",
   /** merge 模糊匹配到多个结果提示 */
-  MERGE_MULTIPLE_MATCHES: (name) => `"${name}" \u5339\u914D\u5230\u591A\u4E2A\u5206\u652F\uFF0C\u8BF7\u9009\u62E9\uFF1A`
+  MERGE_MULTIPLE_MATCHES: (name) => `"${name}" \u5339\u914D\u5230\u591A\u4E2A\u5206\u652F\uFF0C\u8BF7\u9009\u62E9\uFF1A`,
+  /** 询问是否使用 AI 辅助解决冲突 */
+  MERGE_CONFLICT_ASK_AI: "\u68C0\u6D4B\u5230\u5408\u5E76\u51B2\u7A81\uFF0C\u662F\u5426\u4F7F\u7528 Claude Code \u81EA\u52A8\u89E3\u51B3\uFF1F",
+  /** AI 冲突解决开始 */
+  MERGE_CONFLICT_AI_START: (fileCount) => `\u6B63\u5728\u4F7F\u7528 Claude Code \u5206\u6790\u5E76\u89E3\u51B3 ${fileCount} \u4E2A\u51B2\u7A81\u6587\u4EF6...`,
+  /** AI 冲突解决成功 */
+  MERGE_CONFLICT_AI_SUCCESS: "\u2713 Claude Code \u5DF2\u6210\u529F\u89E3\u51B3\u6240\u6709\u51B2\u7A81",
+  /** AI 冲突解决后仍有未解决的冲突 */
+  MERGE_CONFLICT_AI_PARTIAL: (remaining) => `Claude Code \u5DF2\u5904\u7406\u51B2\u7A81\u6587\u4EF6\uFF0C\u4F46\u4ECD\u6709 ${remaining} \u4E2A\u6587\u4EF6\u5B58\u5728\u51B2\u7A81
+  \u8BF7\u624B\u52A8\u5904\u7406\u5269\u4F59\u51B2\u7A81\u540E\u6267\u884C git add . && git merge --continue`,
+  /** AI 冲突解决失败 */
+  MERGE_CONFLICT_AI_FAILED: (errorMsg) => `Claude Code \u89E3\u51B3\u51B2\u7A81\u5931\u8D25: ${errorMsg}
+  \u8BF7\u624B\u52A8\u5904\u7406\uFF1A
+  \u89E3\u51B3\u51B2\u7A81\u540E\u6267\u884C git add . && git merge --continue`,
+  /** --auto 模式下的冲突手动解决（配置为 manual） */
+  MERGE_CONFLICT_MANUAL: "\u5408\u5E76\u5B58\u5728\u51B2\u7A81\uFF0C\u8BF7\u624B\u52A8\u5904\u7406\uFF1A\n  \u89E3\u51B3\u51B2\u7A81\u540E\u6267\u884C git add . && git merge --continue"
 };
 
 // src/constants/messages/validate.ts
@@ -603,6 +618,15 @@ var CONFIG_DEFINITIONS = {
   autoUpdate: {
     defaultValue: true,
     description: "\u662F\u5426\u542F\u7528\u81EA\u52A8\u66F4\u65B0\u68C0\u67E5\uFF08\u6BCF 24 \u5C0F\u65F6\u68C0\u67E5\u4E00\u6B21 npm registry\uFF09"
+  },
+  conflictResolveMode: {
+    defaultValue: "ask",
+    description: "merge \u51B2\u7A81\u65F6\u7684\u89E3\u51B3\u6A21\u5F0F\uFF1Aask\uFF08\u8BE2\u95EE\u662F\u5426\u4F7F\u7528 AI\uFF09\u3001auto\uFF08\u81EA\u52A8 AI \u89E3\u51B3\uFF09\u3001manual\uFF08\u624B\u52A8\u89E3\u51B3\uFF09",
+    allowedValues: ["ask", "auto", "manual"]
+  },
+  conflictResolveTimeoutMs: {
+    defaultValue: 3e5,
+    description: "Claude Code \u51B2\u7A81\u89E3\u51B3\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09\uFF0C\u9ED8\u8BA4 300000\uFF085 \u5206\u949F\uFF09"
   }
 };
 function deriveDefaultConfig(definitions) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clawt",
-  "version": "3.5.0",
+  "version": "3.5.1",
   "description": "本地并行执行多个Claude Code Agent任务，融合 Git Worktree 与 Claude Code CLI 的命令行工具",
   "type": "module",
   "main": "dist/index.js",

package/src/commands/merge.ts

@@ -33,6 +33,8 @@ import {
   gitCheckout,
   resolveTargetWorktree,
   getMainWorkBranch,
+  getCurrentBranch,
+  handleMergeConflict,
 } from '../utils/index.js';
 import type { WorktreeResolveMessages } from '../utils/index.js';
 
@@ -46,6 +48,7 @@ export function registerMergeCommand(program: Command): void {
     .description('合并某个已验证的 worktree 分支到主 worktree')
     .option('-b, --branch <branchName>', '要合并的分支名（支持模糊匹配，不传则列出所有分支供选择）')
     .option('-m, --message <commitMessage>', '提交信息（目标 worktree 工作区有修改时必填）')
+    .option('--auto', '遇到冲突直接调用 AI 解决，不再询问')
     .action(async (options: MergeOptions) => {
       await handleMerge(options);
     });
@@ -182,19 +185,31 @@ async function handleMerge(options: MergeOptions): Promise<void> {
   }
 
   // 步骤 5：回到主 worktree 进行合并
+  let mergeHadConflict = false;
   try {
     gitMerge(branch, mainWorktreePath);
   } catch (error) {
     // 检查是否有冲突
     if (hasMergeConflict(mainWorktreePath)) {
-      throw new ClawtError(MESSAGES.MERGE_CONFLICT);
+      mergeHadConflict = true;
+    } else {
+      throw error;
     }
-    throw error;
   }
 
-  // 步骤 6：冲突检测（二次确认）
-  if (hasMergeConflict(mainWorktreePath)) {
-    throw new ClawtError(MESSAGES.MERGE_CONFLICT);
+  // 步骤 5.5：冲突检测（二次确认）
+  if (!mergeHadConflict && hasMergeConflict(mainWorktreePath)) {
+    mergeHadConflict = true;
+  }
+
+  // 步骤 5.6：如果有冲突，尝试 AI 辅助解决
+  if (mergeHadConflict) {
+    const currentBranch = getCurrentBranch(mainWorktreePath);
+    const resolved = await handleMergeConflict(currentBranch, branch, mainWorktreePath, options.auto);
+    if (!resolved) {
+      // AI 未能完全解决冲突，流程中止（handleMergeConflict 内部已输出提示）
+      return;
+    }
   }
 
   // 步骤 7：根据配置决定是否自动 pull 和 push

package/src/constants/ai-prompts.ts

@@ -0,0 +1,14 @@
+/** Claude Code 冲突解决指令性 prompt */
+export const CONFLICT_RESOLVE_PROMPT = `你是一个 Git 合并冲突解决专家。当前仓库处于合并冲突状态。
+
+## 任务
+
+1. 通过 git status 和 git diff 等命令，自行查看当前仓库的冲突文件列表及冲突内容
+2. 通过 git log 等命令，分析两个分支各自的变更意图
+3. 直接编辑每个冲突文件，移除所有冲突标记（<<<<<<<、=======、>>>>>>>）
+4. 保留双方有意义的变更，合理合并代码逻辑
+5. 如果两个分支修改了同一段代码但意图不同，优先保证代码的正确性和完整性
+6. 解决冲突后，确保代码语法正确、逻辑完整
+7. 不要添加任何注释说明你做了什么修改，只需要修改文件内容
+
+请直接开始。`;

package/src/constants/config.ts

@@ -47,6 +47,15 @@ export const CONFIG_DEFINITIONS: ConfigDefinitions = {
     defaultValue: true,
     description: '是否启用自动更新检查（每 24 小时检查一次 npm registry）',
   },
+  conflictResolveMode: {
+    defaultValue: 'ask',
+    description: 'merge 冲突时的解决模式：ask（询问是否使用 AI）、auto（自动 AI 解决）、manual（手动解决）',
+    allowedValues: ['ask', 'auto', 'manual'] as const,
+  },
+  conflictResolveTimeoutMs: {
+    defaultValue: 300000,
+    description: 'Claude Code 冲突解决超时时间（毫秒），默认 300000（5 分钟）',
+  },
 };
 
 /**

package/src/constants/index.ts

@@ -31,6 +31,7 @@ export {
   CURSOR_HOME,
 } from './progress.js';
 export { SELECT_ALL_NAME, SELECT_ALL_LABEL, GROUP_SELECT_ALL_PREFIX, GROUP_SELECT_ALL_LABEL, GROUP_SEPARATOR_LABEL, UNKNOWN_DATE_GROUP, UNKNOWN_DATE_SEPARATOR_LABEL } from './prompt.js';
+export { CONFLICT_RESOLVE_PROMPT } from './ai-prompts.js';
 export {
   PANEL_REFRESH_INTERVAL_MS,
   PANEL_COUNTDOWN_INTERVAL_MS,

package/src/constants/messages/merge.ts

@@ -40,4 +40,19 @@ export const MERGE_MESSAGES = {
   MERGE_SELECT_BRANCH: '请选择要合并的分支',
   /** merge 模糊匹配到多个结果提示 */
   MERGE_MULTIPLE_MATCHES: (name: string) => `"${name}" 匹配到多个分支，请选择：`,
+  /** 询问是否使用 AI 辅助解决冲突 */
+  MERGE_CONFLICT_ASK_AI: '检测到合并冲突，是否使用 Claude Code 自动解决？',
+  /** AI 冲突解决开始 */
+  MERGE_CONFLICT_AI_START: (fileCount: number) =>
+    `正在使用 Claude Code 分析并解决 ${fileCount} 个冲突文件...`,
+  /** AI 冲突解决成功 */
+  MERGE_CONFLICT_AI_SUCCESS: '✓ Claude Code 已成功解决所有冲突',
+  /** AI 冲突解决后仍有未解决的冲突 */
+  MERGE_CONFLICT_AI_PARTIAL: (remaining: number) =>
+    `Claude Code 已处理冲突文件，但仍有 ${remaining} 个文件存在冲突\n  请手动处理剩余冲突后执行 git add . && git merge --continue`,
+  /** AI 冲突解决失败 */
+  MERGE_CONFLICT_AI_FAILED: (errorMsg: string) =>
+    `Claude Code 解决冲突失败: ${errorMsg}\n  请手动处理：\n  解决冲突后执行 git add . && git merge --continue`,
+  /** --auto 模式下的冲突手动解决（配置为 manual） */
+  MERGE_CONFLICT_MANUAL: '合并存在冲突，请手动处理：\n  解决冲突后执行 git add . && git merge --continue',
 } as const;

package/src/types/command.ts

@@ -36,6 +36,8 @@ export interface MergeOptions {
   branch?: string;
   /** 提交信息（目标 worktree 工作区有修改时必填） */
   message?: string;
+  /** 遇到冲突直接调用 AI 解决，不再询问 */
+  auto?: boolean;
 }
 
 /** remove 命令选项 */

package/src/types/config.ts

@@ -18,6 +18,10 @@ export interface ClawtConfig {
   aliases: Record<string, string>;
   /** 是否启用自动更新检查 */
   autoUpdate: boolean;
+  /** merge 冲突时的解决模式：ask（询问）、auto（自动 AI 解决）、manual（手动解决） */
+  conflictResolveMode: 'ask' | 'auto' | 'manual';
+  /** Claude Code 冲突解决超时时间（毫秒），默认 300000（5 分钟） */
+  conflictResolveTimeoutMs: number;
 }
 
 /** 单个配置项的完整定义（默认值 + 描述） */

package/src/utils/conflict-resolver.ts

@@ -0,0 +1,170 @@
+import { execFileSync } from 'node:child_process';
+import { logger } from '../logger/index.js';
+import { ClawtError } from '../errors/index.js';
+import { getConfigValue } from './config.js';
+import { getConflictFiles, gitAddFiles, gitMergeContinue } from './git.js';
+import { printInfo, printSuccess, printWarning } from './formatter.js';
+import { confirmAction } from './formatter.js';
+import { MESSAGES } from '../constants/index.js';
+import { CONFLICT_RESOLVE_PROMPT } from '../constants/ai-prompts.js';
+
+/** 默认 Claude Code 冲突解决超时时间（毫秒） */
+const DEFAULT_CONFLICT_RESOLVE_TIMEOUT_MS = 300000;
+
+/**
+ * 构建发送给 Claude Code 的冲突解决 prompt
+ * Claude Code 会自动读取当前工作目录下的冲突文件，无需手动传入
+ * @returns {string} 纯指令性 AI prompt
+ */
+export function buildConflictResolvePrompt(): string {
+  return CONFLICT_RESOLVE_PROMPT;
+}
+
+/**
+ * 获取冲突解决超时时间（毫秒）
+ * 优先使用配置项，未配置时使用默认值
+ * @returns {number} 超时时间（毫秒）
+ */
+function getConflictResolveTimeout(): number {
+  const configValue = getConfigValue('conflictResolveTimeoutMs');
+  if (typeof configValue === 'number' && configValue > 0) {
+    return configValue;
+  }
+  return DEFAULT_CONFLICT_RESOLVE_TIMEOUT_MS;
+}
+
+/**
+ * 调用 Claude Code CLI 以非交互模式解决冲突
+ * 使用 execFileSync 数组参数形式避免 shell 注入
+ * @param {string} prompt - AI prompt
+ * @param {string} cwd - 工作目录
+ * @returns {string} Claude Code 的输出
+ */
+export function invokeClaudeForConflictResolve(prompt: string, cwd: string): string {
+  const args = ['-p', prompt, '--permission-mode', 'bypassPermissions'];
+
+  logger.info(`调用 Claude Code 解决冲突，命令: claude -p "..." --permission-mode bypassPermissions`);
+
+  try {
+    const output = execFileSync('claude', args, {
+      cwd,
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe'],
+      timeout: getConflictResolveTimeout(),
+    });
+    return output;
+  } catch (error: unknown) {
+    const errMsg = error instanceof Error ? error.message : String(error);
+    logger.error(`Claude Code 冲突解决失败: ${errMsg}`);
+    throw new ClawtError(MESSAGES.MERGE_CONFLICT_AI_FAILED(errMsg));
+  }
+}
+
+/**
+ * 执行 AI 辅助冲突解决的完整流程
+ * 1. 获取冲突文件列表
+ * 2. 构建 AI prompt
+ * 3. 调用 Claude Code 解决冲突
+ * 4. 检查冲突是否解决
+ * 5. git add 已解决的文件并 merge --continue
+ * @param {string} currentBranch - 当前分支名
+ * @param {string} incomingBranch - 传入分支名
+ * @param {string} cwd - 工作目录
+ * @returns {boolean} 是否所有冲突都已解决
+ */
+export function resolveConflictsWithAI(
+  currentBranch: string,
+  incomingBranch: string,
+  cwd: string,
+): boolean {
+  const conflictFiles = getConflictFiles(cwd);
+  if (conflictFiles.length === 0) {
+    return true;
+  }
+
+  printInfo(MESSAGES.MERGE_CONFLICT_AI_START(conflictFiles.length));
+
+  // 构建 prompt 并调用 Claude Code，捕获异常提供恢复提示
+  const prompt = buildConflictResolvePrompt();
+  try {
+    invokeClaudeForConflictResolve(prompt, cwd);
+  } catch (error) {
+    // AI 调用失败时输出友好提示，告知用户可手动解决或重试
+    const errMsg = error instanceof ClawtError ? error.message : String(error);
+    printWarning(errMsg);
+    return false;
+  }
+
+  // 检查冲突是否已解决
+  const remainingConflicts = getConflictFiles(cwd);
+
+  if (remainingConflicts.length === 0) {
+    // 所有冲突已解决，git add 所有原冲突文件并完成 merge
+    gitAddFiles(conflictFiles, cwd);
+    gitMergeContinue(cwd);
+    printSuccess(MESSAGES.MERGE_CONFLICT_AI_SUCCESS);
+    return true;
+  }
+
+  // 部分冲突已解决，git add 已解决的文件
+  const resolvedFiles = conflictFiles.filter((f) => !remainingConflicts.includes(f));
+  if (resolvedFiles.length > 0) {
+    gitAddFiles(resolvedFiles, cwd);
+  }
+
+  printWarning(MESSAGES.MERGE_CONFLICT_AI_PARTIAL(remainingConflicts.length));
+  return false;
+}
+
+/**
+ * 根据配置和命令选项判断冲突解决模式
+ * @param {boolean} [autoFlag] - --auto 命令行参数
+ * @returns {'ask' | 'auto' | 'manual'} 冲突解决模式
+ */
+export function determineConflictResolveMode(autoFlag?: boolean): 'ask' | 'auto' | 'manual' {
+  // --auto 命令行参数优先级最高
+  if (autoFlag === true) {
+    return 'auto';
+  }
+
+  const configMode = getConfigValue('conflictResolveMode');
+  if (configMode === 'auto' || configMode === 'manual') {
+    return configMode;
+  }
+
+  return 'ask';
+}
+
+/**
+ * 处理合并冲突的入口函数
+ * 根据冲突解决模式决定处理方式：auto 直接 AI 解决，ask 询问用户，manual 抛出错误
+ * @param {string} currentBranch - 当前分支名
+ * @param {string} incomingBranch - 传入分支名
+ * @param {string} cwd - 工作目录
+ * @param {boolean} [autoFlag] - --auto 命令行参数
+ * @returns {Promise<boolean>} 是否成功解决了所有冲突
+ */
+export async function handleMergeConflict(
+  currentBranch: string,
+  incomingBranch: string,
+  cwd: string,
+  autoFlag?: boolean,
+): Promise<boolean> {
+  const mode = determineConflictResolveMode(autoFlag);
+
+  if (mode === 'manual') {
+    throw new ClawtError(MESSAGES.MERGE_CONFLICT_MANUAL);
+  }
+
+  if (mode === 'auto') {
+    return resolveConflictsWithAI(currentBranch, incomingBranch, cwd);
+  }
+
+  // mode === 'ask'
+  const shouldUseAI = await confirmAction(MESSAGES.MERGE_CONFLICT_ASK_AI);
+  if (!shouldUseAI) {
+    throw new ClawtError(MESSAGES.MERGE_CONFLICT_MANUAL);
+  }
+
+  return resolveConflictsWithAI(currentBranch, incomingBranch, cwd);
+}

package/src/utils/git-core.ts

@@ -1,5 +1,5 @@
 import { basename } from 'node:path';
-import { execSync } from 'node:child_process';
+import { execSync, execFileSync } from 'node:child_process';
 import { execCommand, execCommandWithInput } from './shell.js';
 import { logger } from '../logger/index.js';
 
@@ -367,3 +367,51 @@ export function gitApplyCachedCheck(patchContent: Buffer, cwd?: string): boolean
     return false;
   }
 }
+
+/**
+ * 获取冲突文件列表
+ * 通过 git status --porcelain 解析 UU/AA/DD 等冲突标记
+ * @param {string} [cwd] - 工作目录
+ * @returns {string[]} 冲突文件路径列表
+ */
+export function getConflictFiles(cwd?: string): string[] {
+  const status = getStatusPorcelain(cwd);
+  if (!status) return [];
+  return status
+    .split('\n')
+    .filter((line) => /^(UU|AA|DD|DU|UD|AU|UA)/.test(line))
+    .map((line) => line.slice(3));
+}
+
+/**
+ * git add 指定文件
+ * 使用 execFileSync 数组参数形式避免文件名中特殊字符导致的注入风险
+ * @param {string[]} files - 文件路径列表
+ * @param {string} [cwd] - 工作目录
+ */
+export function gitAddFiles(files: string[], cwd?: string): void {
+  if (files.length === 0) return;
+  const args = ['add', '--', ...files];
+  logger.debug(`执行命令: git ${args.join(' ')}${cwd ? ` (cwd: ${cwd})` : ''}`);
+  execFileSync('git', args, {
+    cwd,
+    encoding: 'utf-8',
+    stdio: ['pipe', 'pipe', 'pipe'],
+  });
+}
+
+/**
+ * git merge --continue（非交互式）
+ * @param {string} [cwd] - 工作目录
+ */
+export function gitMergeContinue(cwd?: string): void {
+  execCommand('GIT_EDITOR=true git merge --continue', { cwd });
+}
+
+/**
+ * git merge --abort
+ * @param {string} [cwd] - 工作目录
+ */
+export function gitMergeAbort(cwd?: string): void {
+  execCommand('git merge --abort', { cwd });
+}

package/src/utils/index.ts

@@ -48,6 +48,10 @@ export {
   getBranchCreatedAt,
   gitCheckout,
   createBranch,
+  getConflictFiles,
+  gitAddFiles,
+  gitMergeContinue,
+  gitMergeAbort,
 } from './git.js';
 export { sanitizeBranchName, generateBranchNames, validateBranchesNotExist } from './branch.js';
 export { validateMainWorktree, validateGitInstalled, validateClaudeCodeInstalled, validateHeadExists, validateWorkingDirClean, runPreChecks } from './validation.js';
@@ -59,7 +63,7 @@ export { ensureDir, removeEmptyDir, calculateDirSize } from './fs.js';
 export { multilineInput } from './prompt.js';
 export { launchInteractiveClaude, hasClaudeSessionHistory, launchInteractiveClaudeInNewTerminal } from './claude.js';
 export { getSnapshotPath, hasSnapshot, getSnapshotModifiedTime, readSnapshotTreeHash, readSnapshot, writeSnapshot, removeSnapshot, removeProjectSnapshots, getProjectSnapshotBranches } from './validate-snapshot.js';
-export { findExactMatch, findFuzzyMatches, promptSelectBranch, promptMultiSelectBranches, promptGroupedMultiSelectBranches, resolveTargetWorktree, resolveTargetWorktrees, groupWorktreesByDate, buildGroupedChoices, buildGroupMembershipMap, formatRelativeDate, getWorktreeCreatedDate, getWorktreeCreatedTime } from './worktree-matcher.js';
+export { findExactMatch, findFuzzyMatches, promptGroupedMultiSelectBranches, resolveTargetWorktree, resolveTargetWorktrees, groupWorktreesByDate, buildGroupedChoices, buildGroupMembershipMap, formatRelativeDate, getWorktreeCreatedDate, getWorktreeCreatedTime } from './worktree-matcher.js';
 export type { WorktreeResolveMessages, WorktreeMultiResolveMessages } from './worktree-matcher.js';
 export { ProgressRenderer } from './progress.js';
 export { parseTaskFile, loadTaskFile, parseTasksFromOptions } from './task-file.js';
@@ -79,4 +83,5 @@ export { migrateChangesViaPatch, computeCurrentTreeHash, saveCurrentSnapshotTree
 export { InteractivePanel } from './interactive-panel.js';
 export { buildPanelFrame, buildGroupedWorktreeLines, buildDisplayOrder, renderDateSeparator, renderWorktreeBlock, renderSnapshotSummary, renderFooter, calculateVisibleRows } from './interactive-panel-render.js';
 export type { PanelLine } from './interactive-panel-render.js';
+export { buildConflictResolvePrompt, invokeClaudeForConflictResolve, resolveConflictsWithAI, determineConflictResolveMode, handleMergeConflict } from './conflict-resolver.js';
 

package/tests/unit/commands/merge.test.ts

@@ -67,7 +67,7 @@ vi.mock('../../../src/utils/index.js', () => ({
   hasCommitWithMessage: vi.fn(),
   gitMergeBase: vi.fn(),
   gitResetSoftTo: vi.fn(),
-  getCurrentBranch: vi.fn(),
+  getCurrentBranch: vi.fn().mockReturnValue('main'),
   gitResetHard: vi.fn(),
   gitCleanForce: vi.fn(),
   gitCheckout: vi.fn(),
@@ -77,6 +77,7 @@ vi.mock('../../../src/utils/index.js', () => ({
   ensureOnMainWorkBranch: vi.fn(),
   guardMainWorkBranch: vi.fn().mockResolvedValue(undefined),
   guardMainWorkBranchExists: vi.fn(),
+  handleMergeConflict: vi.fn(),
 }));
 
 import { registerMergeCommand } from '../../../src/commands/merge.js';
@@ -101,6 +102,7 @@ import {
   cleanupWorktrees,
   hasCommitWithMessage,
   resolveTargetWorktree,
+  handleMergeConflict,
 } from '../../../src/utils/index.js';
 
 const mockedGetProjectName = vi.mocked(getProjectName);
@@ -123,6 +125,7 @@ const mockedConfirmAction = vi.mocked(confirmAction);
 const mockedCleanupWorktrees = vi.mocked(cleanupWorktrees);
 const mockedHasCommitWithMessage = vi.mocked(hasCommitWithMessage);
 const mockedResolveTargetWorktree = vi.mocked(resolveTargetWorktree);
+const mockedHandleMergeConflict = vi.mocked(handleMergeConflict);
 
 const worktree = { path: '/path/feature', branch: 'feature' };
 
@@ -147,6 +150,8 @@ beforeEach(() => {
   mockedPrintWarning.mockReset();
   mockedRemoveSnapshot.mockReset();
   mockedCleanupWorktrees.mockReset();
+  mockedHandleMergeConflict.mockReset();
+  mockedHandleMergeConflict.mockResolvedValue(true); // 默认 AI 解决成功
 });
 
 describe('registerMergeCommand', () => {
@@ -229,11 +234,29 @@ describe('handleMerge', () => {
     expect(mockedPrintSuccess).toHaveBeenCalled();
   });
 
-  it('合并冲突时抛出错误', async () => {
+  it('合并冲突时调用 handleMergeConflict', async () => {
     mockedIsWorkingDirClean.mockReturnValue(true);
     mockedHasLocalCommits.mockReturnValue(true);
     mockedGitMerge.mockImplementation(() => { throw new Error('merge conflict'); });
     mockedHasMergeConflict.mockReturnValue(true);
+    mockedHandleMergeConflict.mockResolvedValue(true);
+    mockedConfirmAction.mockResolvedValue(false);
+
+    const program = new Command();
+    program.exitOverride();
+    registerMergeCommand(program);
+    await program.parseAsync(['merge', '-b', 'feature'], { from: 'user' });
+
+    expect(mockedHandleMergeConflict).toHaveBeenCalledWith('main', 'feature', '/repo', undefined);
+    expect(mockedPrintSuccess).toHaveBeenCalled();
+  });
+
+  it('合并冲突且 handleMergeConflict 抛出时向上传播错误', async () => {
+    mockedIsWorkingDirClean.mockReturnValue(true);
+    mockedHasLocalCommits.mockReturnValue(true);
+    mockedGitMerge.mockImplementation(() => { throw new Error('merge conflict'); });
+    mockedHasMergeConflict.mockReturnValue(true);
+    mockedHandleMergeConflict.mockRejectedValue(new Error('请手动解决冲突'));
 
     const program = new Command();
     program.exitOverride();
@@ -244,6 +267,39 @@ describe('handleMerge', () => {
     ).rejects.toThrow();
   });
 
+  it('合并冲突且 AI 部分解决时提前返回', async () => {
+    mockedIsWorkingDirClean.mockReturnValue(true);
+    mockedHasLocalCommits.mockReturnValue(true);
+    mockedGitMerge.mockImplementation(() => { throw new Error('merge conflict'); });
+    mockedHasMergeConflict.mockReturnValue(true);
+    mockedHandleMergeConflict.mockResolvedValue(false);
+
+    const program = new Command();
+    program.exitOverride();
+    registerMergeCommand(program);
+    await program.parseAsync(['merge', '-b', 'feature'], { from: 'user' });
+
+    // AI 未完全解决，不应继续到 pull/push 和 success
+    expect(mockedGitPull).not.toHaveBeenCalled();
+    expect(mockedPrintSuccess).not.toHaveBeenCalled();
+  });
+
+  it('--auto 参数传递给 handleMergeConflict', async () => {
+    mockedIsWorkingDirClean.mockReturnValue(true);
+    mockedHasLocalCommits.mockReturnValue(true);
+    mockedGitMerge.mockImplementation(() => { throw new Error('merge conflict'); });
+    mockedHasMergeConflict.mockReturnValue(true);
+    mockedHandleMergeConflict.mockResolvedValue(true);
+    mockedConfirmAction.mockResolvedValue(false);
+
+    const program = new Command();
+    program.exitOverride();
+    registerMergeCommand(program);
+    await program.parseAsync(['merge', '-b', 'feature', '--auto'], { from: 'user' });
+
+    expect(mockedHandleMergeConflict).toHaveBeenCalledWith('main', 'feature', '/repo', true);
+  });
+
   it('autoPullPush=true 时执行 pull 和 push', async () => {
     mockedIsWorkingDirClean.mockReturnValue(true);
     mockedHasLocalCommits.mockReturnValue(true);
@@ -303,7 +359,7 @@ describe('handleMerge', () => {
     });
     mockedGitPull.mockImplementation(() => { throw new Error('pull failed'); });
     // merge 成功后的调用顺序：
-    // 1. 步骤 6 二次确认 hasMergeConflict → false
+    // 1. 步骤 5.5 二次确认 hasMergeConflict → false（merge 成功无冲突）
     // 2. pull catch 中 hasMergeConflict → true（触发 printWarning 并 return）
     mockedHasMergeConflict.mockReturnValueOnce(false)
       .mockReturnValueOnce(true);

package/tests/unit/utils/conflict-resolver.test.ts

@@ -0,0 +1,250 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+
+// mock logger
+vi.mock('../../../src/logger/index.js', () => ({
+  logger: { debug: vi.fn(), info: vi.fn(), warn: vi.fn(), error: vi.fn() },
+}));
+
+// mock errors
+vi.mock('../../../src/errors/index.js', () => ({
+  ClawtError: class ClawtError extends Error {
+    exitCode: number;
+    constructor(message: string, exitCode = 1) {
+      super(message);
+      this.exitCode = exitCode;
+    }
+  },
+}));
+
+// mock node:child_process
+vi.mock('node:child_process', () => ({
+  execFileSync: vi.fn(),
+}));
+
+// mock constants（使用与 src/constants/messages/merge.ts 一致的消息文本）
+vi.mock('../../../src/constants/index.js', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../../../src/constants/index.js')>();
+  return {
+    ...actual,
+    MESSAGES: {
+      ...actual.MESSAGES,
+      MERGE_CONFLICT_ASK_AI: '检测到合并冲突，是否使用 Claude Code 自动解决？',
+      MERGE_CONFLICT_AI_START: (fileCount: number) =>
+        `正在使用 Claude Code 分析并解决 ${fileCount} 个冲突文件...`,
+      MERGE_CONFLICT_AI_SUCCESS: '✓ Claude Code 已成功解决所有冲突',
+      MERGE_CONFLICT_AI_PARTIAL: (remaining: number) =>
+        `Claude Code 已处理冲突文件，但仍有 ${remaining} 个文件存在冲突\n  请手动处理剩余冲突后执行 git add . && git merge --continue`,
+      MERGE_CONFLICT_AI_FAILED: (errorMsg: string) =>
+        `Claude Code 解决冲突失败: ${errorMsg}\n  请手动处理：\n  解决冲突后执行 git add . && git merge --continue`,
+      MERGE_CONFLICT_MANUAL: '合并存在冲突，请手动处理：\n  解决冲突后执行 git add . && git merge --continue',
+    },
+  };
+});
+
+// mock config（determineConflictResolveMode 仍需要）
+vi.mock('../../../src/utils/config.js', () => ({
+  getConfigValue: vi.fn(),
+}));
+
+// mock formatter
+vi.mock('../../../src/utils/formatter.js', () => ({
+  printInfo: vi.fn(),
+  printSuccess: vi.fn(),
+  printWarning: vi.fn(),
+  confirmAction: vi.fn(),
+}));
+
+// mock git
+vi.mock('../../../src/utils/git.js', () => ({
+  getConflictFiles: vi.fn(),
+  hasMergeConflict: vi.fn(),
+  gitAddFiles: vi.fn(),
+  gitMergeContinue: vi.fn(),
+}));
+
+import { execFileSync } from 'node:child_process';
+import {
+  buildConflictResolvePrompt,
+  invokeClaudeForConflictResolve,
+  resolveConflictsWithAI,
+  determineConflictResolveMode,
+  handleMergeConflict,
+} from '../../../src/utils/conflict-resolver.js';
+import { getConfigValue } from '../../../src/utils/config.js';
+import { confirmAction, printInfo, printSuccess, printWarning } from '../../../src/utils/formatter.js';
+import { getConflictFiles, gitAddFiles, gitMergeContinue } from '../../../src/utils/git.js';
+import { ClawtError } from '../../../src/errors/index.js';
+
+const mockedExecFileSync = vi.mocked(execFileSync);
+const mockedGetConfigValue = vi.mocked(getConfigValue);
+const mockedConfirmAction = vi.mocked(confirmAction);
+const mockedGetConflictFiles = vi.mocked(getConflictFiles);
+const mockedGitAddFiles = vi.mocked(gitAddFiles);
+const mockedGitMergeContinue = vi.mocked(gitMergeContinue);
+const mockedPrintInfo = vi.mocked(printInfo);
+const mockedPrintSuccess = vi.mocked(printSuccess);
+const mockedPrintWarning = vi.mocked(printWarning);
+
+beforeEach(() => {
+  vi.clearAllMocks();
+  mockedGetConfigValue.mockReturnValue('ask');
+});
+
+describe('buildConflictResolvePrompt', () => {
+  it('生成纯指令性 prompt（无参数）', () => {
+    const prompt = buildConflictResolvePrompt();
+
+    expect(prompt).toContain('Git 合并冲突解决专家');
+    expect(prompt).toContain('git status');
+    expect(prompt).toContain('git log');
+    expect(prompt).toContain('冲突标记');
+    expect(prompt).toContain('请直接开始');
+  });
+});
+
+describe('invokeClaudeForConflictResolve', () => {
+  it('成功调用 execFileSync 并返回输出', () => {
+    mockedExecFileSync.mockReturnValue('冲突已解决');
+
+    const result = invokeClaudeForConflictResolve('test prompt', '/repo');
+
+    expect(result).toBe('冲突已解决');
+    expect(mockedExecFileSync).toHaveBeenCalledWith(
+      'claude',
+      ['-p', 'test prompt', '--permission-mode', 'bypassPermissions'],
+      expect.objectContaining({ cwd: '/repo' }),
+    );
+  });
+
+  it('Claude Code 执行失败时抛出 ClawtError', () => {
+    mockedExecFileSync.mockImplementation(() => { throw new Error('command failed'); });
+
+    expect(() => invokeClaudeForConflictResolve('test prompt', '/repo')).toThrow(ClawtError);
+  });
+});
+
+describe('resolveConflictsWithAI', () => {
+  it('无冲突文件时直接返回 true', () => {
+    mockedGetConflictFiles.mockReturnValue([]);
+
+    const result = resolveConflictsWithAI('main', 'feature', '/repo');
+
+    expect(result).toBe(true);
+  });
+
+  it('AI 成功解决所有冲突后 git add 并 merge continue', () => {
+    mockedGetConflictFiles
+      .mockReturnValueOnce(['src/a.ts']) // 初始冲突文件
+      .mockReturnValueOnce([]); // AI 解决后无冲突
+    mockedExecFileSync.mockReturnValue('resolved');
+
+    const result = resolveConflictsWithAI('main', 'feature', '/repo');
+
+    expect(result).toBe(true);
+    expect(mockedGitAddFiles).toHaveBeenCalledWith(['src/a.ts'], '/repo');
+    expect(mockedGitMergeContinue).toHaveBeenCalledWith('/repo');
+    expect(mockedPrintSuccess).toHaveBeenCalled();
+  });
+
+  it('AI 部分解决冲突时 git add 已解决的文件并返回 false', () => {
+    mockedGetConflictFiles
+      .mockReturnValueOnce(['src/a.ts', 'src/b.ts']) // 初始 2 个冲突
+      .mockReturnValueOnce(['src/b.ts']); // AI 后还剩 1 个
+    mockedExecFileSync.mockReturnValue('partial');
+
+    const result = resolveConflictsWithAI('main', 'feature', '/repo');
+
+    expect(result).toBe(false);
+    expect(mockedGitAddFiles).toHaveBeenCalledWith(['src/a.ts'], '/repo');
+    expect(mockedPrintWarning).toHaveBeenCalled();
+  });
+
+  it('AI 调用失败时输出警告并返回 false', () => {
+    mockedGetConflictFiles.mockReturnValueOnce(['src/a.ts']);
+    mockedExecFileSync.mockImplementation(() => { throw new Error('timeout'); });
+
+    const result = resolveConflictsWithAI('main', 'feature', '/repo');
+
+    expect(result).toBe(false);
+    expect(mockedPrintWarning).toHaveBeenCalled();
+    expect(mockedGitAddFiles).not.toHaveBeenCalled();
+    expect(mockedGitMergeContinue).not.toHaveBeenCalled();
+  });
+});
+
+describe('determineConflictResolveMode', () => {
+  it('--auto 参数优先返回 auto', () => {
+    mockedGetConfigValue.mockReturnValue('manual');
+
+    expect(determineConflictResolveMode(true)).toBe('auto');
+  });
+
+  it('配置为 auto 时返回 auto', () => {
+    mockedGetConfigValue.mockReturnValue('auto');
+
+    expect(determineConflictResolveMode()).toBe('auto');
+  });
+
+  it('配置为 manual 时返回 manual', () => {
+    mockedGetConfigValue.mockReturnValue('manual');
+
+    expect(determineConflictResolveMode()).toBe('manual');
+  });
+
+  it('配置为 ask 时返回 ask', () => {
+    mockedGetConfigValue.mockReturnValue('ask');
+
+    expect(determineConflictResolveMode()).toBe('ask');
+  });
+
+  it('默认返回 ask', () => {
+    mockedGetConfigValue.mockReturnValue('unknown');
+
+    expect(determineConflictResolveMode()).toBe('ask');
+  });
+});
+
+describe('handleMergeConflict', () => {
+  it('manual 模式抛出 ClawtError', async () => {
+    mockedGetConfigValue.mockReturnValue('manual');
+
+    await expect(
+      handleMergeConflict('main', 'feature', '/repo'),
+    ).rejects.toThrow(ClawtError);
+  });
+
+  it('auto 模式直接调用 AI 解决', async () => {
+    mockedGetConflictFiles
+      .mockReturnValueOnce(['src/a.ts'])
+      .mockReturnValueOnce([]);
+    mockedExecFileSync.mockReturnValue('resolved');
+
+    const result = await handleMergeConflict('main', 'feature', '/repo', true);
+
+    expect(result).toBe(true);
+    expect(mockedConfirmAction).not.toHaveBeenCalled();
+  });
+
+  it('ask 模式用户选择使用 AI 时调用 AI 解决', async () => {
+    mockedGetConfigValue.mockReturnValue('ask');
+    mockedConfirmAction.mockResolvedValue(true);
+    mockedGetConflictFiles
+      .mockReturnValueOnce(['src/a.ts'])
+      .mockReturnValueOnce([]);
+    mockedExecFileSync.mockReturnValue('resolved');
+
+    const result = await handleMergeConflict('main', 'feature', '/repo');
+
+    expect(result).toBe(true);
+    expect(mockedConfirmAction).toHaveBeenCalled();
+  });
+
+  it('ask 模式用户拒绝 AI 时抛出 ClawtError', async () => {
+    mockedGetConfigValue.mockReturnValue('ask');
+    mockedConfirmAction.mockResolvedValue(false);
+
+    await expect(
+      handleMergeConflict('main', 'feature', '/repo'),
+    ).rejects.toThrow(ClawtError);
+  });
+});

package/src/constants/messages.ts

@@ -1,179 +0,0 @@
-/** 提示消息模板 */
-export const MESSAGES = {
-  /** 不在主 worktree 根目录 */
-  NOT_MAIN_WORKTREE: '请在主 worktree 的根目录下执行 clawt',
-  /** Git 未安装 */
-  GIT_NOT_INSTALLED: 'Git 未安装或不在 PATH 中，请先安装 Git',
-  /** Claude Code CLI 未安装 */
-  CLAUDE_NOT_INSTALLED: 'Claude Code CLI 未安装，请先安装：npm install -g @anthropic-ai/claude-code',
-  /** 分支已存在 */
-  BRANCH_EXISTS: (name: string) => `分支 ${name} 已存在，无法创建`,
-  /** 分支已存在时提示使用 resume */
-  BRANCH_EXISTS_USE_RESUME: (name: string) =>
-    `分支 ${name} 已存在，请使用 clawt resume -b ${name} 恢复会话`,
-  /** 分支名清理后为空 */
-  BRANCH_NAME_EMPTY: (original: string) =>
-    `分支名 "${original}" 中不包含合法字符，无法创建分支`,
-  /** 分支名被转换 */
-  BRANCH_SANITIZED: (original: string, sanitized: string) =>
-    `分支名已转换: ${original} → ${sanitized}`,
-  /** worktree 创建成功 */
-  WORKTREE_CREATED: (count: number) => `✓ 已创建 ${count} 个 worktree`,
-  /** worktree 移除成功 */
-  WORKTREE_REMOVED: (path: string) => `✓ 已移除 worktree: ${path}`,
-  /** 没有 worktree */
-  NO_WORKTREES: '(无 worktree)',
-  /** 目标 worktree 不存在 */
-  WORKTREE_NOT_FOUND: (name: string) => `worktree ${name} 不存在`,
-  /** 主 worktree 有未提交更改 */
-  MAIN_WORKTREE_DIRTY: '主 worktree 有未提交的更改，请先处理',
-  /** 目标 worktree 无更改 */
-  TARGET_WORKTREE_CLEAN: '该 worktree 的分支上没有任何更改，无需验证',
-  /** validate 成功 */
-  VALIDATE_SUCCESS: (branch: string) =>
-    `✓ 已将分支 ${branch} 的变更应用到主 worktree\n  可以开始验证了`,
-  /** merge 成功 */
-  MERGE_SUCCESS: (branch: string, message: string, pushed: boolean) =>
-    `✓ 分支 ${branch} 已成功合并到当前分支\n  提交信息: ${message}${pushed ? '\n  已推送到远程仓库' : ''}`,
-  /** merge 成功（无提交信息，目标 worktree 已提交过） */
-  MERGE_SUCCESS_NO_MESSAGE: (branch: string, pushed: boolean) =>
-    `✓ 分支 ${branch} 已成功合并到当前分支${pushed ? '\n  已推送到远程仓库' : ''}`,
-  /** merge 冲突 */
-  MERGE_CONFLICT: '合并存在冲突，请手动处理：\n  解决冲突后执行 git add . && git merge --continue',
-  /** merge 后清理 worktree 和分支成功 */
-  WORKTREE_CLEANED: (branch: string) => `✓ 已清理 worktree 和分支: ${branch}`,
-  /** 请提供提交信息 */
-  COMMIT_MESSAGE_REQUIRED: '请提供提交信息（-m 参数）',
-  /** 目标 worktree 有未提交修改但未指定 -m */
-  TARGET_WORKTREE_DIRTY_NO_MESSAGE: (worktreePath: string) =>
-    `${worktreePath} 有未提交的修改，请通过 -m 参数提供提交信息`,
-  /** 目标 worktree 既干净又无本地提交 */
-  TARGET_WORKTREE_NO_CHANGES: '目标 worktree 没有任何可合并的变更（工作区干净且无本地提交）',
-  /** 检测到用户中断 */
-  INTERRUPTED: '检测到退出指令，已停止 Claude Code 任务',
-  /** 中断后自动清理完成 */
-  INTERRUPT_AUTO_CLEANED: (count: number) => `✓ 已自动清理 ${count} 个 worktree 和对应分支`,
-  /** 中断后手动确认清理 */
-  INTERRUPT_CONFIRM_CLEANUP: '是否移除刚刚创建的 worktree 和对应分支？',
-  /** 中断后清理完成 */
-  INTERRUPT_CLEANED: (count: number) => `✓ 已清理 ${count} 个 worktree 和对应分支`,
-  /** 中断后保留 worktree */
-  INTERRUPT_KEPT: '已保留 worktree，可稍后使用 clawt remove 手动清理',
-  /** 配置文件损坏，已重新生成默认配置 */
-  CONFIG_CORRUPTED: '配置文件损坏或无法解析，已重新生成默认配置',
-  /** 配置已恢复为默认值 */
-  CONFIG_RESET_SUCCESS: '✓ 配置已恢复为默认值',
-  /** 分隔线 */
-  SEPARATOR: '────────────────────────────────────────',
-  /** 粗分隔线 */
-  DOUBLE_SEPARATOR: '════════════════════════════════════════',
-  /** 创建数量参数无效 */
-  INVALID_COUNT: (value: string) => `无效的创建数量: "${value}"，请输入正整数`,
-  /** worktree 状态获取失败 */
-  WORKTREE_STATUS_UNAVAILABLE: '(状态不可用)',
-  /** 增量 validate 成功提示 */
-  INCREMENTAL_VALIDATE_SUCCESS: (branch: string) =>
-    `✓ 已将分支 ${branch} 的最新变更应用到主 worktree（增量模式）\n  暂存区 = 上次快照，工作目录 = 最新变更`,
-  /** 增量 validate 降级为全量模式提示 */
-  INCREMENTAL_VALIDATE_FALLBACK: '增量对比失败，已降级为全量模式',
-  /** validate 状态已清理 */
-  VALIDATE_CLEANED: (branch: string) => `✓ 分支 ${branch} 的 validate 状态已清理`,
-  /** merge 命令检测到 validate 状态的提示 */
-  MERGE_VALIDATE_STATE_HINT: (branch: string) =>
-    `主 worktree 可能存在 validate 残留状态，可先执行 clawt validate -b ${branch} --clean 清理`,
-  /** sync 自动保存未提交变更 */
-  SYNC_AUTO_COMMITTED: (branch: string) =>
-    `已自动保存 ${branch} 分支的未提交变更`,
-  /** sync 开始合并 */
-  SYNC_MERGING: (targetBranch: string, mainBranch: string) =>
-    `正在将 ${mainBranch} 合并到 ${targetBranch} ...`,
-  /** sync 成功 */
-  SYNC_SUCCESS: (targetBranch: string, mainBranch: string) =>
-    `✓ 已将 ${mainBranch} 的最新代码同步到 ${targetBranch}`,
-  /** sync 冲突 */
-  SYNC_CONFLICT: (worktreePath: string) =>
-    `合并存在冲突，请进入目标 worktree 手动解决：\n  cd ${worktreePath}\n  解决冲突后执行 git add . && git merge --continue\n  clawt validate -b <branch> 验证变更`,
-  /** validate patch apply 失败，提示用户同步主分支 */
-  VALIDATE_PATCH_APPLY_FAILED: (branch: string) =>
-    `变更迁移失败：目标分支与主分支差异过大\n  请先执行 clawt sync -b ${branch} 同步主分支后重试`,
-  /** merge 检测到 auto-save 提交，提示用户是否压缩 */
-  MERGE_SQUASH_PROMPT: '检测到 sync 产生的临时提交，是否将所有提交压缩为一个？\n  压缩后变更将保留在目标worktree的暂存区，需要重新提交（可使用 Claude Code Cli或其他工具生成提交信息）',
-  /** squash 完成且通过 -m 直接提交后的提示 */
-  MERGE_SQUASH_COMMITTED: (branch: string) =>
-    `✓ 已将分支 ${branch} 的所有提交压缩为一个`,
-  /** squash 完成但未提供 -m，提示用户自行提交 */
-  MERGE_SQUASH_PENDING: (worktreePath: string, branch: string) =>
-    `✓ 已将所有提交压缩到暂存区\n  请在目标 worktree 中提交后重新执行 merge：\n  cd ${worktreePath}\n  提交完成后执行：clawt merge -b ${branch}`,
-  /** 用户取消破坏性操作 */
-  DESTRUCTIVE_OP_CANCELLED: '已取消操作',
-  /** reset 成功 */
-  RESET_SUCCESS: '✓ 主 worktree 工作区和暂存区已重置',
-  /** reset 时工作区和暂存区已干净 */
-  RESET_ALREADY_CLEAN: '主 worktree 工作区和暂存区已是干净状态，无需重置',
-  /** 批量移除部分失败 */
-  REMOVE_PARTIAL_FAILURE: (failures: Array<{ path: string; error: string }>) =>
-    `以下 worktree 移除失败：\n${failures.map((f) => `  ✗ ${f.path}: ${f.error}`).join('\n')}`,
-  /** resume 无可用 worktree */
-  RESUME_NO_WORKTREES: '当前项目没有可用的 worktree，请先通过 clawt run 或 clawt create 创建',
-  /** resume 模糊匹配无结果，列出可用分支 */
-  RESUME_NO_MATCH: (name: string, branches: string[]) =>
-    `未找到与 "${name}" 匹配的分支\n  可用分支：\n${branches.map((b) => `    - ${b}`).join('\n')}`,
-  /** resume 交互选择提示 */
-  RESUME_SELECT_BRANCH: '请选择要恢复的分支',
-  /** resume 模糊匹配到多个结果提示 */
-  RESUME_MULTIPLE_MATCHES: (name: string) => `"${name}" 匹配到多个分支，请选择：`,
-  /** validate 无可用 worktree */
-  VALIDATE_NO_WORKTREES: '当前项目没有可用的 worktree，请先通过 clawt run 或 clawt create 创建',
-  /** validate 模糊匹配无结果，列出可用分支 */
-  VALIDATE_NO_MATCH: (name: string, branches: string[]) =>
-    `未找到与 "${name}" 匹配的分支\n  可用分支：\n${branches.map((b) => `    - ${b}`).join('\n')}`,
-  /** validate 交互选择提示 */
-  VALIDATE_SELECT_BRANCH: '请选择要验证的分支',
-  /** validate 模糊匹配到多个结果提示 */
-  VALIDATE_MULTIPLE_MATCHES: (name: string) => `"${name}" 匹配到多个分支，请选择：`,
-  /** merge 无可用 worktree */
-  MERGE_NO_WORKTREES: '当前项目没有可用的 worktree，请先通过 clawt run 或 clawt create 创建',
-  /** merge 模糊匹配无结果，列出可用分支 */
-  MERGE_NO_MATCH: (name: string, branches: string[]) =>
-    `未找到与 "${name}" 匹配的分支\n  可用分支：\n${branches.map((b) => `    - ${b}`).join('\n')}`,
-  /** merge 交互选择提示 */
-  MERGE_SELECT_BRANCH: '请选择要合并的分支',
-  /** merge 模糊匹配到多个结果提示 */
-  MERGE_MULTIPLE_MATCHES: (name: string) => `"${name}" 匹配到多个分支，请选择：`,
-  /** sync 无可用 worktree */
-  SYNC_NO_WORKTREES: '当前项目没有可用的 worktree，请先通过 clawt run 或 clawt create 创建',
-  /** sync 模糊匹配无结果，列出可用分支 */
-  SYNC_NO_MATCH: (name: string, branches: string[]) =>
-    `未找到与 "${name}" 匹配的分支\n  可用分支：\n${branches.map((b) => `    - ${b}`).join('\n')}`,
-  /** sync 交互选择提示 */
-  SYNC_SELECT_BRANCH: '请选择要同步的分支',
-  /** sync 模糊匹配到多个结果提示 */
-  SYNC_MULTIPLE_MATCHES: (name: string) => `"${name}" 匹配到多个分支，请选择：`,
-  /** status 命令标题 */
-  STATUS_TITLE: (projectName: string) => `项目状态总览: ${projectName}`,
-  /** status 主 worktree 区块标题 */
-  STATUS_MAIN_SECTION: '主 Worktree',
-  /** status worktrees 区块标题 */
-  STATUS_WORKTREES_SECTION: 'Worktree 列表',
-  /** status 快照区块标题 */
-  STATUS_SNAPSHOTS_SECTION: '未清理的 Validate 快照',
-  /** status 无 worktree */
-  STATUS_NO_WORKTREES: '(无活跃 worktree)',
-  /** status 无未清理快照 */
-  STATUS_NO_SNAPSHOTS: '(无未清理的快照)',
-  /** status 变更状态：已提交 */
-  STATUS_CHANGE_COMMITTED: '已提交',
-  /** status 变更状态：未提交修改 */
-  STATUS_CHANGE_UNCOMMITTED: '未提交修改',
-  /** status 变更状态：合并冲突 */
-  STATUS_CHANGE_CONFLICT: '合并冲突',
-  /** status 变更状态：无变更 */
-  STATUS_CHANGE_CLEAN: '无变更',
-  /** status 快照对应 worktree 已不存在 */
-  STATUS_SNAPSHOT_ORPHANED: '(对应 worktree 已不存在)',
-  /** merge 后 pull 冲突 */
-  PULL_CONFLICT:
-    '自动 pull 时发生冲突，merge 已完成但远程同步失败\n  请手动解决冲突：\n  解决冲突后执行 git add . && git commit\n  然后执行 git push 推送到远程',
-  /** push 失败 */
-  PUSH_FAILED: '自动 push 失败，merge 和 pull 已完成\n  请手动执行 git push',
-} as const;