clawt 2.3.0 → 2.3.1

package/dist/index.js

@@ -46,11 +46,10 @@ var MESSAGES = {
   VALIDATE_SUCCESS: (branch) => `\u2713 \u5DF2\u5C06\u5206\u652F ${branch} \u7684\u53D8\u66F4\u5E94\u7528\u5230\u4E3B worktree
   \u53EF\u4EE5\u5F00\u59CB\u9A8C\u8BC1\u4E86`,
   /** merge 成功 */
-  MERGE_SUCCESS: (branch, message) => `\u2713 \u5206\u652F ${branch} \u5DF2\u6210\u529F\u5408\u5E76\u5230\u5F53\u524D\u5206\u652F
-  \u63D0\u4EA4\u4FE1\u606F: ${message}
-  \u5DF2\u63A8\u9001\u5230\u8FDC\u7A0B\u4ED3\u5E93`,
+  MERGE_SUCCESS: (branch, message, pushed) => `\u2713 \u5206\u652F ${branch} \u5DF2\u6210\u529F\u5408\u5E76\u5230\u5F53\u524D\u5206\u652F
+  \u63D0\u4EA4\u4FE1\u606F: ${message}${pushed ? "\n  \u5DF2\u63A8\u9001\u5230\u8FDC\u7A0B\u4ED3\u5E93" : ""}`,
   /** merge 成功（无提交信息，目标 worktree 已提交过） */
-  MERGE_SUCCESS_NO_MESSAGE: (branch) => `\u2713 \u5206\u652F ${branch} \u5DF2\u6210\u529F\u5408\u5E76\u5230\u5F53\u524D\u5206\u652F`,
+  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 后清理 worktree 和分支成功 */
@@ -1192,16 +1191,17 @@ async function handleMerge(options) {
   if (hasMergeConflict(mainWorktreePath)) {
     throw new ClawtError(MESSAGES.MERGE_CONFLICT);
   }
-  if (getConfigValue("autoPullPush")) {
+  const autoPullPush = getConfigValue("autoPullPush");
+  if (autoPullPush) {
     gitPull(mainWorktreePath);
     gitPush(mainWorktreePath);
   } else {
     printInfo("\u5DF2\u8DF3\u8FC7\u81EA\u52A8 pull/push\uFF0C\u8BF7\u624B\u52A8\u6267\u884C git pull && git push");
   }
   if (options.message) {
-    printSuccess(MESSAGES.MERGE_SUCCESS(options.branch, options.message));
+    printSuccess(MESSAGES.MERGE_SUCCESS(options.branch, options.message, autoPullPush));
   } else {
-    printSuccess(MESSAGES.MERGE_SUCCESS_NO_MESSAGE(options.branch));
+    printSuccess(MESSAGES.MERGE_SUCCESS_NO_MESSAGE(options.branch, autoPullPush));
   }
   if (shouldCleanup) {
     cleanupWorktreeAndBranch(targetWorktreePath, options.branch);

package/package.json

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

package/src/commands/merge.ts

@@ -191,7 +191,8 @@ async function handleMerge(options: MergeOptions): Promise<void> {
   }
 
   // 步骤 7：根据配置决定是否自动 pull 和 push
-  if (getConfigValue('autoPullPush')) {
+  const autoPullPush = getConfigValue('autoPullPush');
+  if (autoPullPush) {
     gitPull(mainWorktreePath);
     gitPush(mainWorktreePath);
   } else {
@@ -200,9 +201,9 @@ async function handleMerge(options: MergeOptions): Promise<void> {
 
   // 步骤 8：输出成功提示（根据是否有 message 选择对应模板）
   if (options.message) {
-    printSuccess(MESSAGES.MERGE_SUCCESS(options.branch, options.message));
+    printSuccess(MESSAGES.MERGE_SUCCESS(options.branch, options.message, autoPullPush));
   } else {
-    printSuccess(MESSAGES.MERGE_SUCCESS_NO_MESSAGE(options.branch));
+    printSuccess(MESSAGES.MERGE_SUCCESS_NO_MESSAGE(options.branch, autoPullPush));
   }
 
   // 步骤 9：merge 成功后清理 worktree 和分支

package/src/constants/messages.ts

@@ -27,11 +27,11 @@ export const MESSAGES = {
   VALIDATE_SUCCESS: (branch: string) =>
     `✓ 已将分支 ${branch} 的变更应用到主 worktree\n  可以开始验证了`,
   /** merge 成功 */
-  MERGE_SUCCESS: (branch: string, message: string) =>
-    `✓ 分支 ${branch} 已成功合并到当前分支\n  提交信息: ${message}\n  已推送到远程仓库`,
+  MERGE_SUCCESS: (branch: string, message: string, pushed: boolean) =>
+    `✓ 分支 ${branch} 已成功合并到当前分支\n  提交信息: ${message}${pushed ? '\n  已推送到远程仓库' : ''}`,
   /** merge 成功（无提交信息，目标 worktree 已提交过） */
-  MERGE_SUCCESS_NO_MESSAGE: (branch: string) =>
-    `✓ 分支 ${branch} 已成功合并到当前分支`,
+  MERGE_SUCCESS_NO_MESSAGE: (branch: string, pushed: boolean) =>
+    `✓ 分支 ${branch} 已成功合并到当前分支${pushed ? '\n  已推送到远程仓库' : ''}`,
   /** merge 冲突 */
   MERGE_CONFLICT: '合并存在冲突，请手动处理',
   /** merge 后清理 worktree 和分支成功 */