clawt 1.0.0 → 1.0.2

package/dist/index.js

@@ -50,8 +50,7 @@ var MESSAGES = {
   \u63D0\u4EA4\u4FE1\u606F: ${message}
   \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
-  \u5DF2\u63A8\u9001\u5230\u8FDC\u7A0B\u4ED3\u5E93`,
+  MERGE_SUCCESS_NO_MESSAGE: (branch) => `\u2713 \u5206\u652F ${branch} \u5DF2\u6210\u529F\u5408\u5E76\u5230\u5F53\u524D\u5206\u652F`,
   /** merge 冲突 */
   MERGE_CONFLICT: "\u5408\u5E76\u5B58\u5728\u51B2\u7A81\uFF0C\u8BF7\u624B\u52A8\u5904\u7406",
   /** merge 后清理 worktree 和分支成功 */
@@ -89,10 +88,13 @@ var EXIT_CODES = {
 };
 
 // src/constants/config.ts
+var APPEND_SYSTEM_PROMPT = "After the code execution is completed, it is prohibited to build the project for verification.";
 var DEFAULT_CONFIG = {
   autoDeleteBranch: false,
   /** 默认 Claude Code CLI 启动指令，用于不传 --tasks 时在 worktree 中打开交互式界面 */
-  claudeCodeCommand: "claude"
+  claudeCodeCommand: "claude",
+  /** 默认不自动执行 git pull 和 git push，需用户手动操作 */
+  autoPullPush: false
 };
 
 // src/errors/index.ts
@@ -569,7 +571,11 @@ function launchInteractiveClaude(worktree) {
   const commandStr = getConfigValue("claudeCodeCommand");
   const parts = commandStr.split(/\s+/).filter(Boolean);
   const cmd = parts[0];
-  const args = parts.slice(1);
+  const args = [
+    ...parts.slice(1),
+    "--append-system-prompt",
+    APPEND_SYSTEM_PROMPT
+  ];
   printInfo(`\u6B63\u5728 worktree \u4E2D\u542F\u52A8 Claude Code \u4EA4\u4E92\u5F0F\u754C\u9762...`);
   printInfo(`  \u5206\u652F: ${worktree.branch}`);
   printInfo(`  \u8DEF\u5F84: ${worktree.path}`);
@@ -876,8 +882,12 @@ async function handleMerge(options) {
   if (hasMergeConflict(mainWorktreePath)) {
     throw new ClawtError(MESSAGES.MERGE_CONFLICT);
   }
-  gitPull(mainWorktreePath);
-  gitPush(mainWorktreePath);
+  if (getConfigValue("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));
   } else {

package/dist/postinstall.js

@@ -15,7 +15,9 @@ var WORKTREES_DIR = join(CLAWT_HOME, "worktrees");
 var DEFAULT_CONFIG = {
   autoDeleteBranch: false,
   /** 默认 Claude Code CLI 启动指令，用于不传 --tasks 时在 worktree 中打开交互式界面 */
-  claudeCodeCommand: "claude"
+  claudeCodeCommand: "claude",
+  /** 默认不自动执行 git pull 和 git push，需用户手动操作 */
+  autoPullPush: false
 };
 
 // scripts/postinstall.ts

package/package.json

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

package/src/commands/merge.ts

@@ -124,9 +124,13 @@ async function handleMerge(options: MergeOptions): Promise<void> {
     throw new ClawtError(MESSAGES.MERGE_CONFLICT);
   }
 
-  // 步骤 7：推送
-  gitPull(mainWorktreePath);
-  gitPush(mainWorktreePath);
+  // 步骤 7：根据配置决定是否自动 pull 和 push
+  if (getConfigValue('autoPullPush')) {
+    gitPull(mainWorktreePath);
+    gitPush(mainWorktreePath);
+  } else {
+    printInfo('已跳过自动 pull/push，请手动执行 git pull && git push');
+  }
 
   // 步骤 8：输出成功提示（根据是否有 message 选择对应模板）
   if (options.message) {

package/src/commands/run.ts

@@ -3,7 +3,7 @@ import type { ChildProcess } from 'node:child_process';
 import { spawnSync } from 'node:child_process';
 import { logger } from '../logger/index.js';
 import { ClawtError } from '../errors/index.js';
-import { MESSAGES } from '../constants/index.js';
+import { MESSAGES, APPEND_SYSTEM_PROMPT } from '../constants/index.js';
 import type { RunOptions, ClaudeCodeResult, TaskResult, TaskSummary } from '../types/index.js';
 import {
   validateMainWorktree,
@@ -47,7 +47,11 @@ function launchInteractiveClaude(worktree: WorktreeInfo): void {
   const commandStr = getConfigValue('claudeCodeCommand');
   const parts = commandStr.split(/\s+/).filter(Boolean);
   const cmd = parts[0];
-  const args = parts.slice(1);
+  const args = [
+    ...parts.slice(1),
+    '--append-system-prompt',
+    APPEND_SYSTEM_PROMPT,
+  ];
 
   printInfo(`正在 worktree 中启动 Claude Code 交互式界面...`);
   printInfo(`  分支: ${worktree.branch}`);

package/src/constants/config.ts

@@ -1,8 +1,14 @@
 import type { ClawtConfig } from '../types/index.js';
 
+/** Claude Code 系统约束提示，禁止代码执行完成后构建项目验证 */
+export const APPEND_SYSTEM_PROMPT =
+  'After the code execution is completed, it is prohibited to build the project for verification.';
+
 /** 默认配置 */
 export const DEFAULT_CONFIG: ClawtConfig = {
   autoDeleteBranch: false,
   /** 默认 Claude Code CLI 启动指令，用于不传 --tasks 时在 worktree 中打开交互式界面 */
   claudeCodeCommand: 'claude',
+  /** 默认不自动执行 git pull 和 git push，需用户手动操作 */
+  autoPullPush: false,
 };

package/src/constants/index.ts

@@ -3,4 +3,4 @@ export { INVALID_BRANCH_CHARS } from './branch.js';
 export { MESSAGES } from './messages.js';
 export { EXIT_CODES } from './exitCodes.js';
 export { ENABLE_BRACKETED_PASTE, DISABLE_BRACKETED_PASTE, PASTE_THRESHOLD_MS } from './terminal.js';
-export { DEFAULT_CONFIG } from './config.js';
+export { DEFAULT_CONFIG, APPEND_SYSTEM_PROMPT } from './config.js';

package/src/constants/messages.ts

@@ -33,7 +33,7 @@ export const MESSAGES = {
     `✓ 分支 ${branch} 已成功合并到当前分支\n  提交信息: ${message}\n  已推送到远程仓库`,
   /** merge 成功（无提交信息，目标 worktree 已提交过） */
   MERGE_SUCCESS_NO_MESSAGE: (branch: string) =>
-    `✓ 分支 ${branch} 已成功合并到当前分支\n  已推送到远程仓库`,
+    `✓ 分支 ${branch} 已成功合并到当前分支`,
   /** merge 冲突 */
   MERGE_CONFLICT: '合并存在冲突，请手动处理',
   /** merge 后清理 worktree 和分支成功 */

package/src/types/config.ts

@@ -4,4 +4,6 @@ export interface ClawtConfig {
   autoDeleteBranch: boolean;
   /** Claude Code CLI 启动指令（不传 --tasks 时在 worktree 中直接打开交互式界面） */
   claudeCodeCommand: string;
+  /** merge 成功后是否自动执行 git pull 和 git push */
+  autoPullPush: boolean;
 }