clawt 2.7.3 → 2.7.4

package/dist/index.js

@@ -55,7 +55,7 @@ var MESSAGES = {
   /** merge 成功（无提交信息，目标 worktree 已提交过） */
   MERGE_SUCCESS_NO_MESSAGE: (branch, pushed) => `\u2713 \u5206\u652F ${branch} \u5DF2\u6210\u529F\u5408\u5E76\u5230\u5F53\u524D\u5206\u652F${pushed ? "\n  \u5DF2\u63A8\u9001\u5230\u8FDC\u7A0B\u4ED3\u5E93" : ""}`,
   /** merge 冲突 */
-  MERGE_CONFLICT: "\u5408\u5E76\u5B58\u5728\u51B2\u7A81\uFF0C\u8BF7\u624B\u52A8\u5904\u7406",
+  MERGE_CONFLICT: "\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",
   /** merge 后清理 worktree 和分支成功 */
   WORKTREE_CLEANED: (branch) => `\u2713 \u5DF2\u6E05\u7406 worktree \u548C\u5206\u652F: ${branch}`,
   /** 请提供提交信息 */
@@ -166,7 +166,11 @@ ${branches.map((b) => `    - ${b}`).join("\n")}`,
   /** sync 交互选择提示 */
   SYNC_SELECT_BRANCH: "\u8BF7\u9009\u62E9\u8981\u540C\u6B65\u7684\u5206\u652F",
   /** sync 模糊匹配到多个结果提示 */
-  SYNC_MULTIPLE_MATCHES: (name) => `"${name}" \u5339\u914D\u5230\u591A\u4E2A\u5206\u652F\uFF0C\u8BF7\u9009\u62E9\uFF1A`
+  SYNC_MULTIPLE_MATCHES: (name) => `"${name}" \u5339\u914D\u5230\u591A\u4E2A\u5206\u652F\uFF0C\u8BF7\u9009\u62E9\uFF1A`,
+  /** merge 后 pull 冲突 */
+  PULL_CONFLICT: "\u81EA\u52A8 pull \u65F6\u53D1\u751F\u51B2\u7A81\uFF0Cmerge \u5DF2\u5B8C\u6210\u4F46\u8FDC\u7A0B\u540C\u6B65\u5931\u8D25\n  \u8BF7\u624B\u52A8\u89E3\u51B3\u51B2\u7A81\uFF1A\n  \u89E3\u51B3\u51B2\u7A81\u540E\u6267\u884C git add . && git commit\n  \u7136\u540E\u6267\u884C git push \u63A8\u9001\u5230\u8FDC\u7A0B",
+  /** push 失败 */
+  PUSH_FAILED: "\u81EA\u52A8 push \u5931\u8D25\uFF0Cmerge \u548C pull \u5DF2\u5B8C\u6210\n  \u8BF7\u624B\u52A8\u6267\u884C git push"
 };
 
 // src/constants/exitCodes.ts
@@ -1430,8 +1434,21 @@ async function handleMerge(options) {
   }
   const autoPullPush = getConfigValue("autoPullPush");
   if (autoPullPush) {
-    gitPull(mainWorktreePath);
-    gitPush(mainWorktreePath);
+    try {
+      gitPull(mainWorktreePath);
+    } catch {
+      if (hasMergeConflict(mainWorktreePath)) {
+        printWarning(MESSAGES.PULL_CONFLICT);
+        return;
+      }
+      throw new ClawtError(MESSAGES.PULL_CONFLICT);
+    }
+    try {
+      gitPush(mainWorktreePath);
+    } catch {
+      printWarning(MESSAGES.PUSH_FAILED);
+      return;
+    }
   } else {
     printInfo("\u5DF2\u8DF3\u8FC7\u81EA\u52A8 pull/push\uFF0C\u8BF7\u624B\u52A8\u6267\u884C git pull && git push");
   }

package/package.json

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

package/src/commands/merge.ts

@@ -196,8 +196,23 @@ async function handleMerge(options: MergeOptions): Promise<void> {
   // 步骤 7：根据配置决定是否自动 pull 和 push
   const autoPullPush = getConfigValue('autoPullPush');
   if (autoPullPush) {
-    gitPull(mainWorktreePath);
-    gitPush(mainWorktreePath);
+    // pull 阶段：检测冲突并给出针对性引导
+    try {
+      gitPull(mainWorktreePath);
+    } catch {
+      if (hasMergeConflict(mainWorktreePath)) {
+        printWarning(MESSAGES.PULL_CONFLICT);
+        return;
+      }
+      throw new ClawtError(MESSAGES.PULL_CONFLICT);
+    }
+    // push 阶段
+    try {
+      gitPush(mainWorktreePath);
+    } catch {
+      printWarning(MESSAGES.PUSH_FAILED);
+      return;
+    }
   } else {
     printInfo('已跳过自动 pull/push，请手动执行 git pull && git push');
   }

package/src/constants/messages.ts

@@ -39,7 +39,7 @@ export const MESSAGES = {
   MERGE_SUCCESS_NO_MESSAGE: (branch: string, pushed: boolean) =>
     `✓ 分支 ${branch} 已成功合并到当前分支${pushed ? '\n  已推送到远程仓库' : ''}`,
   /** merge 冲突 */
-  MERGE_CONFLICT: '合并存在冲突，请手动处理',
+  MERGE_CONFLICT: '合并存在冲突，请手动处理：\n  解决冲突后执行 git add . && git merge --continue',
   /** merge 后清理 worktree 和分支成功 */
   WORKTREE_CLEANED: (branch: string) => `✓ 已清理 worktree 和分支: ${branch}`,
   /** 请提供提交信息 */
@@ -148,4 +148,9 @@ export const MESSAGES = {
   SYNC_SELECT_BRANCH: '请选择要同步的分支',
   /** sync 模糊匹配到多个结果提示 */
   SYNC_MULTIPLE_MATCHES: (name: string) => `"${name}" 匹配到多个分支，请选择：`,
+  /** 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;