clawt 3.9.9 → 3.9.10

package/dist/index.js

@@ -704,6 +704,7 @@ var VALID_TERMINAL_APPS = ["auto", "iterm2", "terminal", "cmux"];
 var ITERM2_APP_PATH = "/Applications/iTerm.app";
 
 // src/constants/config.ts
+var APPEND_SYSTEM_PROMPT = "Currently, you are in the git worktree directory.";
 var CLAUDE_CODE_ENTRYPOINT_VALUE = "cli";
 var CONFIG_DEFINITIONS = {
   autoDeleteBranch: {
@@ -2299,7 +2300,9 @@ function launchInteractiveClaude(worktree, options = {}) {
   const parts = commandStr.split(/\s+/).filter(Boolean);
   const cmd = parts[0];
   const args = [
-    ...parts.slice(1)
+    ...parts.slice(1),
+    "--append-system-prompt",
+    APPEND_SYSTEM_PROMPT
   ];
   const hasPreviousSession = options.autoContinue === true && hasClaudeSessionHistory(worktree.path);
   if (hasPreviousSession) {
@@ -2329,9 +2332,11 @@ function escapeShellSingleQuote(str) {
 }
 function buildClaudeCommand(worktree, hasPreviousSession) {
   const commandStr = resolveClaudeCodeCommand();
+  const systemPrompt = APPEND_SYSTEM_PROMPT;
   const escapedPath = escapeShellSingleQuote(worktree.path);
+  const escapedPrompt = escapeShellSingleQuote(systemPrompt);
   const continueFlag = hasPreviousSession ? " --continue" : "";
-  return `cd '${escapedPath}' && ${commandStr}${continueFlag}`;
+  return `cd '${escapedPath}' && ${commandStr} --append-system-prompt '${escapedPrompt}'${continueFlag}`;
 }
 function launchInteractiveClaudeInNewTerminal(worktree, hasPreviousSession) {
   const command = buildClaudeCommand(worktree, hasPreviousSession);
@@ -3107,7 +3112,8 @@ function parseStreamEvent(event) {
 
 // src/utils/task-executor.ts
 function executeClaudeTask(worktree, task, onActivity, continueSession) {
-  const args = ["-p", task, "--output-format", "stream-json", "--verbose", "--permission-mode", "bypassPermissions"];
+  const systemPrompt = APPEND_SYSTEM_PROMPT;
+  const args = ["-p", task, "--output-format", "stream-json", "--verbose", "--permission-mode", "bypassPermissions", "--append-system-prompt", systemPrompt];
   if (continueSession) {
     args.push("--continue");
   }

package/docs/post-create-hook.md

@@ -4,7 +4,7 @@
 
 postCreate hook 是在 worktree 创建完成后自动执行的钩子命令，可用于执行任意初始化操作（如安装依赖、生成配置文件、编译资源等）。`create` 和 `run` 命令在创建 worktree 之后，会尝试解析并执行 postCreate hook。
 
-hook 以 **fire-and-forget** 模式后台异步并行执行，不阻塞主流程（不 await）。执行结果仅写入日志，不影响后续 Claude Code 的启动。
+hook 以 **fire-and-forget** 模式后台异步并行执行，不阻塞主流程（不 await）。执行结果仅写入日志，不影响后续 Claude Code 的启动或系统提示。
 
 #### 配置方式
 
@@ -100,6 +100,10 @@ clawt run -b feat --no-post-create
 - **结果汇总**：后台执行完毕后通过 `.then()` 回调写入日志汇总（成功数 + 失败数）
 - **返回值**：`runPostCreateHooks()` 返回 `void`——以 fire-and-forget 模式后台执行，不等待结果
 
+#### 系统提示
+
+Claude Code 启动时统一使用 `APPEND_SYSTEM_PROMPT` 常量（定义在 `src/constants/config.ts`）作为 `--append-system-prompt` 参数值，内容为通用的 worktree 目录提示，不因 hook 执行结果而变化。
+
 #### 相关类型定义
 
 类型定义位于 `src/types/postCreateHook.ts`：

package/docs/run.md

@@ -86,8 +86,9 @@ clawt run -b <branchName>
 5. 通过公共函数 `executeBatchTasks`（`src/utils/task-executor.ts`）启动批量任务执行，该函数负责进度面板渲染、SIGINT 中断处理、并发控制和汇总输出。对每个 worktree 并行启动 Claude Code CLI：
    ```bash
    cd ~/.clawt/worktrees/<project>/<branchName>-<i>
-   claude -p "<tasks[i]>" --output-format stream-json --verbose --permission-mode bypassPermissions
+   claude -p "<tasks[i]>" --output-format stream-json --verbose --permission-mode bypassPermissions --append-system-prompt "<系统提示>"
    ```
+   其中 `--append-system-prompt` 使用统一的 `APPEND_SYSTEM_PROMPT` 常量（定义在 `src/constants/config.ts`）。
    子进程通过 `spawnProcess()`（`src/utils/shell.ts`）启动，会自动注入环境变量 `CLAUDE_CODE_ENTRYPOINT="cli"`（通过 `getEnvWithoutNestedSessionFlag()` 函数），使会话支持通过 `--continue` 恢复。
    使用 `stream-json` 格式可实时获取 Claude Code 的流式事件（工具调用、文本输出、最终结果），用于在进度面板中显示每个任务的实时活动描述和结果预览。流式事件解析由 `src/utils/stream-parser.ts` 负责。
 6. 进入**事件监听通知**阶段（见 [5.3](#53-任务完成通知机制)）

package/package.json

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

package/src/constants/config.ts

@@ -1,6 +1,10 @@
 import type { ClawtConfig, ConfigDefinitions } from '../types/index.js';
 import { VALID_TERMINAL_APPS } from './terminal.js';
 
+/** Claude Code 系统约束提示 */
+export const APPEND_SYSTEM_PROMPT =
+  'Currently, you are in the git worktree directory.';
+
 /**
  * 通过 clawt 启动的 Claude Code 非交互式会话（claude -p）的 entrypoint 标识
  * 设置为 'cli' 使 claude -p 启动的会话可以通过 --continue 恢复

package/src/constants/index.ts

@@ -5,7 +5,7 @@ export { CONFIG_ALIAS_DISABLED_HINT } from './messages/index.js';
 export { UPDATE_MESSAGES, UPDATE_COMMANDS } from './messages/update.js';
 export { EXIT_CODES } from './exitCodes.js';
 export { ENABLE_BRACKETED_PASTE, DISABLE_BRACKETED_PASTE, PASTE_THRESHOLD_MS, VALID_TERMINAL_APPS, ITERM2_APP_PATH } from './terminal.js';
-export { DEFAULT_CONFIG, CONFIG_DESCRIPTIONS, CONFIG_DEFINITIONS, CLAUDE_CODE_ENTRYPOINT_VALUE } from './config.js';
+export { DEFAULT_CONFIG, CONFIG_DESCRIPTIONS, CONFIG_DEFINITIONS, APPEND_SYSTEM_PROMPT, CLAUDE_CODE_ENTRYPOINT_VALUE } from './config.js';
 export { PROJECT_CONFIG_DEFINITIONS, PROJECT_DEFAULT_CONFIG, PROJECT_CONFIG_DESCRIPTIONS } from './project-config.js';
 export { AUTO_SAVE_COMMIT_MESSAGE_PREFIX } from './git.js';
 export { DEBUG_LOG_PREFIX, DEBUG_TIMESTAMP_FORMAT } from './logger.js';

package/src/utils/claude.ts

@@ -2,7 +2,7 @@ import { spawnSync } from 'node:child_process';
 import { existsSync, readdirSync } from 'node:fs';
 import { join } from 'node:path';
 import { ClawtError } from '../errors/index.js';
-import { CLAUDE_PROJECTS_DIR } from '../constants/index.js';
+import { APPEND_SYSTEM_PROMPT, CLAUDE_PROJECTS_DIR } from '../constants/index.js';
 import { resolveClaudeCodeCommand } from './project-config.js';
 import { printInfo, printWarning } from './formatter.js';
 import { openCommandInNewTerminalTab } from './terminal.js';
@@ -56,6 +56,8 @@ export function launchInteractiveClaude(worktree: WorktreeInfo, options: LaunchC
   const cmd = parts[0];
   const args = [
     ...parts.slice(1),
+    '--append-system-prompt',
+    APPEND_SYSTEM_PROMPT,
   ];
 
   // 仅在启用 autoContinue 时检测历史会话并追加 --continue
@@ -99,18 +101,20 @@ function escapeShellSingleQuote(str: string): string {
 
 /**
  * 构建在指定 worktree 中启动 Claude Code 的完整 shell 命令
- * 生成格式：cd <path> && <claudeCommand> [--continue]
+ * 生成格式：cd <path> && <claudeCommand> --append-system-prompt '...' [--continue]
  * @param {WorktreeInfo} worktree - worktree 信息
  * @param {boolean} hasPreviousSession - 是否存在历史会话（由调用方预计算，避免重复 I/O）
  * @returns {string} 完整的 shell 命令字符串
  */
 export function buildClaudeCommand(worktree: WorktreeInfo, hasPreviousSession: boolean): string {
   const commandStr = resolveClaudeCodeCommand();
+  const systemPrompt = APPEND_SYSTEM_PROMPT;
 
   const escapedPath = escapeShellSingleQuote(worktree.path);
+  const escapedPrompt = escapeShellSingleQuote(systemPrompt);
   const continueFlag = hasPreviousSession ? ' --continue' : '';
 
-  return `cd '${escapedPath}' && ${commandStr}${continueFlag}`;
+  return `cd '${escapedPath}' && ${commandStr} --append-system-prompt '${escapedPrompt}'${continueFlag}`;
 }
 
 /**

package/src/utils/task-executor.ts

@@ -5,6 +5,7 @@ import type { ClaudeCodeResult, TaskResult, TaskSummary, WorktreeInfo } from '..
 import { spawnProcess, killAllChildProcesses } from './shell.js';
 import { cleanupWorktrees } from './worktree.js';
 import { getConfigValue } from './config.js';
+import { APPEND_SYSTEM_PROMPT } from '../constants/index.js';
 import { printSuccess, printWarning, printInfo, printDoubleSeparator, confirmAction } from './formatter.js';
 import { ProgressRenderer } from './progress.js';
 import { createLineBuffer, parseStreamLine, parseStreamEvent, truncateText } from './stream-parser.js';
@@ -34,8 +35,11 @@ type ActivityCallback = (activityText: string) => void;
  * @returns {ClaudeTaskHandle} 包含子进程引用和结果 Promise
  */
 function executeClaudeTask(worktree: WorktreeInfo, task: string, onActivity?: ActivityCallback, continueSession?: boolean): ClaudeTaskHandle {
+  // 使用统一的系统提示常量
+  const systemPrompt = APPEND_SYSTEM_PROMPT;
+
   // 旧版使用 --output-format json，现改为 stream-json --verbose 以支持实时活动信息
-  const args = ['-p', task, '--output-format', 'stream-json', '--verbose', '--permission-mode', 'bypassPermissions'];
+  const args = ['-p', task, '--output-format', 'stream-json', '--verbose', '--permission-mode', 'bypassPermissions', '--append-system-prompt', systemPrompt];
 
   // 追问模式：追加 --continue 继续该目录下最新会话
   if (continueSession) {

package/tests/unit/utils/claude.test.ts

@@ -33,6 +33,7 @@ import { launchInteractiveClaude, hasClaudeSessionHistory, buildClaudeCommand }
 import { getConfigValue } from '../../../src/utils/config.js';
 import { printInfo, printWarning } from '../../../src/utils/formatter.js';
 import { ClawtError } from '../../../src/errors/index.js';
+import { APPEND_SYSTEM_PROMPT } from '../../../src/constants/config.js';
 import { createWorktreeInfo } from '../../helpers/fixtures.js';
 
 const mockedSpawnSync = vi.mocked(spawnSync);
@@ -103,7 +104,7 @@ describe('launchInteractiveClaude', () => {
     expect(mockedGetConfigValue).toHaveBeenCalledWith('claudeCodeCommand');
     expect(mockedSpawnSync).toHaveBeenCalledWith(
       'claude',
-      expect.any(Array),
+      expect.arrayContaining(['--append-system-prompt']),
       expect.objectContaining({
         cwd: '/tmp/test-worktree',
         stdio: 'inherit',
@@ -147,7 +148,7 @@ describe('launchInteractiveClaude', () => {
 
     expect(mockedSpawnSync).toHaveBeenCalledWith(
       'npx',
-      expect.arrayContaining(['claude']),
+      expect.arrayContaining(['claude', '--append-system-prompt']),
       expect.any(Object),
     );
   });
@@ -284,7 +285,7 @@ describe('launchInteractiveClaude', () => {
     expect(callArgs).not.toContain('--continue');
   });
 
-  it('不包含 --append-system-prompt 参数', () => {
+  it('固定使用 APPEND_SYSTEM_PROMPT 作为系统提示', () => {
     mockedGetConfigValue.mockReturnValue('claude');
     mockedExistsSync.mockReturnValue(false);
     mockedSpawnSync.mockReturnValue({
@@ -300,7 +301,8 @@ describe('launchInteractiveClaude', () => {
     launchInteractiveClaude(worktree);
 
     const callArgs = mockedSpawnSync.mock.calls[0][1] as string[];
-    expect(callArgs).not.toContain('--append-system-prompt');
+    const promptIndex = callArgs.indexOf('--append-system-prompt');
+    expect(callArgs[promptIndex + 1]).toBe(APPEND_SYSTEM_PROMPT);
   });
 });
 
@@ -317,6 +319,7 @@ describe('buildClaudeCommand', () => {
 
     expect(cmd).toContain("cd '/tmp/test-worktree'");
     expect(cmd).toContain('claude');
+    expect(cmd).toContain('--append-system-prompt');
   });
 
   it('hasPreviousSession 为 true 时包含 --continue', () => {
@@ -335,12 +338,12 @@ describe('buildClaudeCommand', () => {
     expect(cmd).not.toContain('--continue');
   });
 
-  it('不包含 --append-system-prompt 参数', () => {
+  it('固定使用 APPEND_SYSTEM_PROMPT 作为系统提示', () => {
     mockedGetConfigValue.mockReturnValue('claude');
 
     const cmd = buildClaudeCommand(worktree, false);
 
-    expect(cmd).not.toContain('--append-system-prompt');
+    expect(cmd).toContain(APPEND_SYSTEM_PROMPT);
   });
 
   it('路径中的单引号被正确转义', () => {