clawt 3.5.0 → 3.5.2

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
@@ -235,7 +250,19 @@ ${branches.map((b) => `    - ${b}`).join("\n")}`,
   VALIDATE_BRANCH_NOT_FOUND: (validateBranch, branch) => `\u9A8C\u8BC1\u5206\u652F ${validateBranch} \u4E0D\u5B58\u5728\uFF0C\u8BF7\u5148\u6267\u884C clawt create \u6216 clawt run \u521B\u5EFA\u5206\u652F ${branch}`,
   /** validate 成功（含验证分支信息） */
   VALIDATE_SUCCESS_WITH_BRANCH: (branch, validateBranch) => `\u2713 \u5DF2\u5207\u6362\u5230\u9A8C\u8BC1\u5206\u652F ${validateBranch} \u5E76\u5E94\u7528\u5206\u652F ${branch} \u7684\u53D8\u66F4
-  \u53EF\u4EE5\u5F00\u59CB\u9A8C\u8BC1\u4E86`
+  \u53EF\u4EE5\u5F00\u59CB\u9A8C\u8BC1\u4E86`,
+  /** 错误信息已复制到剪贴板提示 */
+  VALIDATE_RUN_ERROR_COPIED: "\u2702 \u9519\u8BEF\u4FE1\u606F\u5DF2\u590D\u5236\u5230\u526A\u8D34\u677F",
+  /** 剪贴板复制失败提示 */
+  VALIDATE_RUN_ERROR_COPY_FAILED: "\u26A0 \u9519\u8BEF\u4FE1\u606F\u590D\u5236\u5230\u526A\u8D34\u677F\u5931\u8D25",
+  /** 单命令（含 && 链）剪贴板错误格式 */
+  VALIDATE_CLIPBOARD_SINGLE_ERROR: (command, stderr) => `${command} \u6307\u4EE4\u6267\u884C\u51FA\u9519\uFF0C\u9519\u8BEF\u4FE1\u606F\uFF1A
+${stderr}`,
+  /** 并行命令中单个命令的剪贴板错误格式 */
+  VALIDATE_CLIPBOARD_PARALLEL_ERROR: (command, stderr) => `${command} \u6307\u4EE4\u6267\u884C\u51FA\u9519\uFF0C\u9519\u8BEF\u4FE1\u606F\uFF1A
+${stderr}`,
+  /** 多个错误之间的分隔符 */
+  VALIDATE_CLIPBOARD_SEPARATOR: "\n\n---\n\n"
 };
 
 // src/constants/messages/sync.ts
@@ -667,6 +694,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 +804,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,
@@ -940,29 +991,86 @@ function parseParallelCommands(commandString) {
   const parts = escaped.split("&");
   return parts.map((part) => part.replace(new RegExp(placeholder, "g"), "&&").trim()).filter((part) => part.length > 0);
 }
-function runParallelCommands(commands, options) {
-  const promises = commands.map((command) => {
-    return new Promise((resolve4) => {
-      logger.debug(`\u5E76\u884C\u542F\u52A8\u547D\u4EE4: ${command}${options?.cwd ? ` (cwd: ${options.cwd})` : ""}`);
-      const child = spawn(command, {
-        cwd: options?.cwd,
-        stdio: "inherit",
-        shell: true
-      });
-      child.on("error", (err) => {
-        resolve4({ command, exitCode: 1, error: err.message });
+function spawnWithStderrCapture(command, options) {
+  return new Promise((resolve4) => {
+    const child = spawn(command, {
+      cwd: options?.cwd,
+      stdio: ["inherit", "inherit", "pipe"],
+      shell: true
+    });
+    const stderrChunks = [];
+    child.stderr?.on("data", (chunk) => {
+      process.stderr.write(chunk);
+      stderrChunks.push(chunk);
+    });
+    child.on("error", (err) => {
+      resolve4({
+        exitCode: 1,
+        error: err.message,
+        stderr: Buffer.concat(stderrChunks).toString("utf-8")
       });
-      child.on("close", (code) => {
-        resolve4({ command, exitCode: code ?? 1 });
+    });
+    child.on("close", (code) => {
+      resolve4({
+        exitCode: code ?? 1,
+        stderr: Buffer.concat(stderrChunks).toString("utf-8")
       });
     });
   });
+}
+function runCommandWithStderrCapture(command, options) {
+  logger.debug(`\u6267\u884C\u547D\u4EE4(stderr\u6355\u83B7): ${command}${options?.cwd ? ` (cwd: ${options.cwd})` : ""}`);
+  return spawnWithStderrCapture(command, options);
+}
+function runParallelCommandsWithStderrCapture(commands, options) {
+  const promises = commands.map(async (command) => {
+    logger.debug(`\u5E76\u884C\u542F\u52A8\u547D\u4EE4(stderr\u6355\u83B7): ${command}${options?.cwd ? ` (cwd: ${options.cwd})` : ""}`);
+    const result = await spawnWithStderrCapture(command, options);
+    return { command, ...result };
+  });
   return Promise.all(promises);
 }
 
+// src/utils/clipboard.ts
+import { spawnSync as spawnSync2 } from "child_process";
+function getClipboardCommand() {
+  switch (process.platform) {
+    case "darwin":
+      return { command: "pbcopy", args: [] };
+    case "linux":
+      return { command: "xclip", args: ["-selection", "clipboard"] };
+    case "win32":
+      return { command: "clip", args: [] };
+    default:
+      return null;
+  }
+}
+function copyToClipboard(text) {
+  try {
+    const clipboardCmd = getClipboardCommand();
+    if (!clipboardCmd) {
+      logger.debug(`\u4E0D\u652F\u6301\u7684\u5E73\u53F0: ${process.platform}\uFF0C\u8DF3\u8FC7\u526A\u8D34\u677F\u590D\u5236`);
+      return false;
+    }
+    const result = spawnSync2(clipboardCmd.command, clipboardCmd.args, {
+      input: text,
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    if (result.status !== 0) {
+      logger.debug(`\u526A\u8D34\u677F\u547D\u4EE4\u6267\u884C\u5931\u8D25\uFF0C\u9000\u51FA\u7801: ${result.status}`);
+      return false;
+    }
+    return true;
+  } catch (error) {
+    logger.debug(`\u526A\u8D34\u677F\u590D\u5236\u5F02\u5E38: ${error.message}`);
+    return false;
+  }
+}
+
 // 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 +1193,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) {
@@ -1700,12 +1826,12 @@ function parseConcurrency(optionValue, configValue) {
 import Enquirer2 from "enquirer";
 
 // src/utils/claude.ts
-import { spawnSync as spawnSync2 } from "child_process";
+import { spawnSync as spawnSync3 } from "child_process";
 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 +1890,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"]
     });
@@ -1809,7 +1935,7 @@ function launchInteractiveClaude(worktree, options = {}) {
     printInfo(`  \u6A21\u5F0F: ${hasPreviousSession ? "\u7EE7\u7EED\u4E0A\u6B21\u5BF9\u8BDD" : "\u65B0\u5BF9\u8BDD"}`);
   }
   printInfo("");
-  const result = spawnSync2(cmd, args, {
+  const result = spawnSync3(cmd, args, {
     cwd: worktree.path,
     stdio: "inherit"
   });
@@ -3170,39 +3296,66 @@ async function checkForUpdates(currentVersion) {
 }
 
 // src/utils/validate-runner.ts
-function executeSingleCommand(command, mainWorktreePath) {
+function handleErrorClipboard(clipboardContent) {
+  const success = copyToClipboard(clipboardContent);
+  if (success) {
+    printInfo(MESSAGES.VALIDATE_RUN_ERROR_COPIED);
+  } else {
+    printWarning(MESSAGES.VALIDATE_RUN_ERROR_COPY_FAILED);
+  }
+}
+function buildSingleErrorClipboard(command, stderr, exitCode) {
+  if (stderr.trim()) {
+    return MESSAGES.VALIDATE_CLIPBOARD_SINGLE_ERROR(command, stderr.trim());
+  }
+  return `${command} \u6307\u4EE4\u6267\u884C\u51FA\u9519\uFF0C\u9000\u51FA\u7801: ${exitCode}`;
+}
+async function executeSingleCommand(command, mainWorktreePath) {
   printInfo(MESSAGES.VALIDATE_RUN_START(command));
   printSeparator();
-  const result = runCommandInherited(command, { cwd: mainWorktreePath });
+  const result = await runCommandWithStderrCapture(command, { cwd: mainWorktreePath });
   printSeparator();
   if (result.error) {
-    printError(MESSAGES.VALIDATE_RUN_ERROR(command, result.error.message));
+    printError(MESSAGES.VALIDATE_RUN_ERROR(command, result.error));
+    const clipboardContent = MESSAGES.VALIDATE_CLIPBOARD_SINGLE_ERROR(command, result.error);
+    handleErrorClipboard(clipboardContent);
     return;
   }
-  const exitCode = result.status ?? 1;
-  if (exitCode === 0) {
+  if (result.exitCode === 0) {
     printSuccess(MESSAGES.VALIDATE_RUN_SUCCESS(command));
   } else {
-    printError(MESSAGES.VALIDATE_RUN_FAILED(command, exitCode));
+    printError(MESSAGES.VALIDATE_RUN_FAILED(command, result.exitCode));
+    const clipboardContent = buildSingleErrorClipboard(command, result.stderr, result.exitCode);
+    handleErrorClipboard(clipboardContent);
   }
 }
 function reportParallelResults(results) {
   printSeparator();
   const successCount = results.filter((r) => r.exitCode === 0 && !r.error).length;
   const failedCount = results.length - successCount;
+  const errorClipboardParts = [];
   for (const result of results) {
     if (result.error) {
       printError(MESSAGES.VALIDATE_PARALLEL_CMD_ERROR(result.command, result.error));
+      errorClipboardParts.push(
+        MESSAGES.VALIDATE_CLIPBOARD_PARALLEL_ERROR(result.command, result.error)
+      );
     } else if (result.exitCode === 0) {
       printSuccess(MESSAGES.VALIDATE_PARALLEL_CMD_SUCCESS(result.command));
     } else {
       printError(MESSAGES.VALIDATE_PARALLEL_CMD_FAILED(result.command, result.exitCode));
+      const errorContent = result.stderr.trim() ? result.stderr.trim() : `\u9000\u51FA\u7801: ${result.exitCode}`;
+      errorClipboardParts.push(
+        MESSAGES.VALIDATE_CLIPBOARD_PARALLEL_ERROR(result.command, errorContent)
+      );
     }
   }
   if (failedCount === 0) {
     printSuccess(MESSAGES.VALIDATE_PARALLEL_RUN_ALL_SUCCESS(results.length));
   } else {
     printError(MESSAGES.VALIDATE_PARALLEL_RUN_SUMMARY(successCount, failedCount));
+    const clipboardContent = errorClipboardParts.join(MESSAGES.VALIDATE_CLIPBOARD_SEPARATOR);
+    handleErrorClipboard(clipboardContent);
   }
 }
 async function executeParallelCommands(commands, mainWorktreePath) {
@@ -3211,14 +3364,14 @@ async function executeParallelCommands(commands, mainWorktreePath) {
     printInfo(MESSAGES.VALIDATE_PARALLEL_CMD_START(i + 1, commands.length, commands[i]));
   }
   printSeparator();
-  const results = await runParallelCommands(commands, { cwd: mainWorktreePath });
+  const results = await runParallelCommandsWithStderrCapture(commands, { cwd: mainWorktreePath });
   reportParallelResults(results);
 }
 async function executeRunCommand(command, mainWorktreePath) {
   printInfo("");
   const commands = parseParallelCommands(command);
   if (commands.length <= 1) {
-    executeSingleCommand(commands[0] || command, mainWorktreePath);
+    await executeSingleCommand(commands[0] || command, mainWorktreePath);
   } else {
     await executeParallelCommands(commands, mainWorktreePath);
   }
@@ -3948,6 +4101,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 +4763,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 +4835,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
@@ -226,7 +241,19 @@ ${branches.map((b) => `    - ${b}`).join("\n")}`,
   VALIDATE_BRANCH_NOT_FOUND: (validateBranch, branch) => `\u9A8C\u8BC1\u5206\u652F ${validateBranch} \u4E0D\u5B58\u5728\uFF0C\u8BF7\u5148\u6267\u884C clawt create \u6216 clawt run \u521B\u5EFA\u5206\u652F ${branch}`,
   /** validate 成功（含验证分支信息） */
   VALIDATE_SUCCESS_WITH_BRANCH: (branch, validateBranch) => `\u2713 \u5DF2\u5207\u6362\u5230\u9A8C\u8BC1\u5206\u652F ${validateBranch} \u5E76\u5E94\u7528\u5206\u652F ${branch} \u7684\u53D8\u66F4
-  \u53EF\u4EE5\u5F00\u59CB\u9A8C\u8BC1\u4E86`
+  \u53EF\u4EE5\u5F00\u59CB\u9A8C\u8BC1\u4E86`,
+  /** 错误信息已复制到剪贴板提示 */
+  VALIDATE_RUN_ERROR_COPIED: "\u2702 \u9519\u8BEF\u4FE1\u606F\u5DF2\u590D\u5236\u5230\u526A\u8D34\u677F",
+  /** 剪贴板复制失败提示 */
+  VALIDATE_RUN_ERROR_COPY_FAILED: "\u26A0 \u9519\u8BEF\u4FE1\u606F\u590D\u5236\u5230\u526A\u8D34\u677F\u5931\u8D25",
+  /** 单命令（含 && 链）剪贴板错误格式 */
+  VALIDATE_CLIPBOARD_SINGLE_ERROR: (command, stderr) => `${command} \u6307\u4EE4\u6267\u884C\u51FA\u9519\uFF0C\u9519\u8BEF\u4FE1\u606F\uFF1A
+${stderr}`,
+  /** 并行命令中单个命令的剪贴板错误格式 */
+  VALIDATE_CLIPBOARD_PARALLEL_ERROR: (command, stderr) => `${command} \u6307\u4EE4\u6267\u884C\u51FA\u9519\uFF0C\u9519\u8BEF\u4FE1\u606F\uFF1A
+${stderr}`,
+  /** 多个错误之间的分隔符 */
+  VALIDATE_CLIPBOARD_SEPARATOR: "\n\n---\n\n"
 };
 
 // src/constants/messages/sync.ts
@@ -603,6 +630,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.2",
   "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/constants/messages/validate.ts

@@ -71,4 +71,16 @@ export const VALIDATE_MESSAGES = {
   /** validate 成功（含验证分支信息） */
   VALIDATE_SUCCESS_WITH_BRANCH: (branch: string, validateBranch: string) =>
     `✓ 已切换到验证分支 ${validateBranch} 并应用分支 ${branch} 的变更\n  可以开始验证了`,
+  /** 错误信息已复制到剪贴板提示 */
+  VALIDATE_RUN_ERROR_COPIED: '✂ 错误信息已复制到剪贴板',
+  /** 剪贴板复制失败提示 */
+  VALIDATE_RUN_ERROR_COPY_FAILED: '⚠ 错误信息复制到剪贴板失败',
+  /** 单命令（含 && 链）剪贴板错误格式 */
+  VALIDATE_CLIPBOARD_SINGLE_ERROR: (command: string, stderr: string) =>
+    `${command} 指令执行出错，错误信息：\n${stderr}`,
+  /** 并行命令中单个命令的剪贴板错误格式 */
+  VALIDATE_CLIPBOARD_PARALLEL_ERROR: (command: string, stderr: string) =>
+    `${command} 指令执行出错，错误信息：\n${stderr}`,
+  /** 多个错误之间的分隔符 */
+  VALIDATE_CLIPBOARD_SEPARATOR: '\n\n---\n\n',
 } as const;