clawt 3.7.1 → 3.8.1

package/src/types/command.ts

@@ -4,6 +4,8 @@ export interface CreateOptions {
   branch: string;
   /** 创建数量（Commander 传入为字符串），默认 '1' */
   number: string;
+  /** 是否执行 postCreate hook，--no-post-create 时为 false */
+  postCreate?: boolean;
 }
 
 /** run 命令选项 */
@@ -18,6 +20,8 @@ export interface RunOptions {
   file?: string;
   /** 预览模式，仅展示任务计划不实际执行 */
   dryRun?: boolean;
+  /** 是否执行 postCreate hook，--no-post-create 时为 false */
+  postCreate?: boolean;
 }
 
 /** validate 命令选项 */

package/src/types/index.ts

@@ -7,3 +7,4 @@ export type { WorktreeDetailedStatus, MainWorktreeStatus, SnapshotInfo, Snapshot
 export type { TaskFileEntry, ParseTaskFileOptions } from './taskFile.js';
 export type { ProjectOverview, ProjectWorktreeDetail, ProjectDetailResult, ProjectsOverviewResult } from './project.js';
 export type { ProjectConfig, ProjectConfigItemDefinition, ProjectConfigDefinitions } from './projectConfig.js';
+export type { PostCreateHookSource, PostCreateHookResult, ResolvedHook } from './postCreateHook.js';

package/src/types/postCreateHook.ts

@@ -0,0 +1,24 @@
+/** postCreate hook 的来源 */
+export type PostCreateHookSource = 'projectConfig' | 'postCreateScript';
+
+/** 单个 worktree 的 hook 执行结果 */
+export interface PostCreateHookResult {
+  /** worktree 绝对路径 */
+  worktreePath: string;
+  /** 分支名 */
+  branch: string;
+  /** 是否执行成功 */
+  success: boolean;
+  /** hook 来源 */
+  source: PostCreateHookSource;
+  /** 失败时的错误信息 */
+  error?: string;
+}
+
+/** hook 解析结果 */
+export interface ResolvedHook {
+  /** 待执行的命令 */
+  command: string;
+  /** hook 来源 */
+  source: PostCreateHookSource;
+}

package/src/types/projectConfig.ts

@@ -4,6 +4,8 @@ export interface ProjectConfig {
   clawtMainWorkBranch: string;
   /** validate 成功后自动执行的命令（-r 的默认值） */
   validateRunCommand?: string;
+  /** worktree 创建后自动执行的命令，用于安装依赖等初始化操作 */
+  postCreate?: string;
 }
 
 /** 单个项目配置项的完整定义（默认值 + 描述） */

package/src/utils/claude.ts

@@ -108,9 +108,10 @@ function escapeShellSingleQuote(str: string): string {
  */
 export function buildClaudeCommand(worktree: WorktreeInfo, hasPreviousSession: boolean): string {
   const commandStr = getConfigValue('claudeCodeCommand');
+  const systemPrompt = APPEND_SYSTEM_PROMPT;
 
   const escapedPath = escapeShellSingleQuote(worktree.path);
-  const escapedPrompt = escapeShellSingleQuote(APPEND_SYSTEM_PROMPT);
+  const escapedPrompt = escapeShellSingleQuote(systemPrompt);
   const continueFlag = hasPreviousSession ? ' --continue' : '';
 
   return `cd '${escapedPath}' && ${commandStr} --append-system-prompt '${escapedPrompt}'${continueFlag}`;

package/src/utils/index.ts

@@ -89,4 +89,5 @@ export { InteractivePanel } from './interactive-panel.js';
 export { buildPanelFrame, buildGroupedWorktreeLines, buildDisplayOrder, renderDateSeparator, renderWorktreeBlock, renderSnapshotSummary, renderFooter, calculateVisibleRows } from './interactive-panel-render.js';
 export type { PanelLine } from './interactive-panel-render.js';
 export { buildConflictResolvePrompt, invokeClaudeForConflictResolve, resolveConflictsWithAI, determineConflictResolveMode, handleMergeConflict } from './conflict-resolver.js';
+export { resolvePostCreateHook, executePostCreateHooks, runPostCreateHooks } from '../hooks/index.js';
 

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/commands/create.test.ts

@@ -39,6 +39,7 @@ vi.mock('../../../src/utils/index.js', () => ({
   printSeparator: vi.fn(),
   guardMainWorkBranch: vi.fn().mockResolvedValue(undefined),
   guardMainWorkBranchExists: vi.fn(),
+  runPostCreateHooks: vi.fn().mockReturnValue(false),
 }));
 
 import { registerCreateCommand } from '../../../src/commands/create.js';

package/tests/unit/commands/run.test.ts

@@ -79,6 +79,7 @@ vi.mock('../../../src/utils/index.js', async (importOriginal) => {
     ensureOnMainWorkBranch: vi.fn().mockResolvedValue(undefined),
     guardMainWorkBranch: vi.fn().mockResolvedValue(undefined),
     guardMainWorkBranchExists: vi.fn(),
+    runPostCreateHooks: vi.fn(),
   };
 });
 

package/tests/unit/commands/tasks.test.ts

@@ -11,7 +11,7 @@ vi.mock('../../../src/constants/index.js', () => ({
     TASK_INIT_SUCCESS: (path: string) => `✓ 任务模板已生成: ${path}`,
     TASK_INIT_HINT: (path: string) => `使用 clawt run -f ${path} 执行任务`,
   },
-  TASK_TEMPLATE_OUTPUT_DIR: 'clawt/tasks',
+  TASK_TEMPLATE_OUTPUT_DIR: '.clawt/tasks',
   TASK_TEMPLATE_FILENAME_PREFIX: 'clawt-tasks',
   TASK_TEMPLATE_CONTENT: '# 模板内容',
 }));
@@ -90,17 +90,17 @@ describe('handleTasksInit', () => {
     await program.parseAsync(['tasks', 'init'], { from: 'user' });
 
     expect(mockGenerateTaskFilename).toHaveBeenCalledWith('clawt-tasks');
-    // 默认路径应输出到 clawt/tasks/ 目录下
+    // 默认路径应输出到 .clawt/tasks/ 目录下
     expect(mockWriteFileSync).toHaveBeenCalledWith(
-      expect.stringContaining('clawt/tasks/clawt-tasks-2026-01-01-00-00-00.md'),
+      expect.stringContaining('.clawt/tasks/clawt-tasks-2026-01-01-00-00-00.md'),
       '# 模板内容',
       'utf-8',
     );
     expect(mockedPrintSuccess).toHaveBeenCalledWith(
-      expect.stringContaining('clawt/tasks/clawt-tasks-2026-01-01-00-00-00.md'),
+      expect.stringContaining('.clawt/tasks/clawt-tasks-2026-01-01-00-00-00.md'),
     );
     expect(mockedPrintHint).toHaveBeenCalledWith(
-      expect.stringContaining('clawt/tasks/clawt-tasks-2026-01-01-00-00-00.md'),
+      expect.stringContaining('.clawt/tasks/clawt-tasks-2026-01-01-00-00-00.md'),
     );
   });
 

package/tests/unit/constants/messages-post-create.test.ts

@@ -0,0 +1,112 @@
+import { describe, it, expect } from 'vitest';
+import { POST_CREATE_MESSAGES } from '../../../src/constants/messages/post-create.js';
+
+describe('POST_CREATE_MESSAGES', () => {
+  describe('纯字符串消息', () => {
+    it('HOOK_SKIPPED 包含 --no-post-create', () => {
+      expect(POST_CREATE_MESSAGES.HOOK_SKIPPED).toContain('--no-post-create');
+    });
+
+    it('HOOK_SKIPPED 不包含旧的 --no-deps', () => {
+      expect(POST_CREATE_MESSAGES.HOOK_SKIPPED).not.toContain('--no-deps');
+    });
+
+    it('HOOK_NOT_CONFIGURED 不包含"依赖"字样', () => {
+      expect(POST_CREATE_MESSAGES.HOOK_NOT_CONFIGURED).not.toContain('依赖');
+    });
+
+    it('HOOK_NOT_CONFIGURED 包含"未配置"和"跳过"', () => {
+      expect(POST_CREATE_MESSAGES.HOOK_NOT_CONFIGURED).toContain('未配置');
+      expect(POST_CREATE_MESSAGES.HOOK_NOT_CONFIGURED).toContain('跳过');
+    });
+  });
+
+  describe('模板函数消息', () => {
+    it('HOOK_SOURCE_INFO 包含来源描述', () => {
+      const result = POST_CREATE_MESSAGES.HOOK_SOURCE_INFO('项目配置 (postCreate)');
+      expect(result).toContain('项目配置 (postCreate)');
+      expect(result).toContain('postCreate hook 来源');
+    });
+
+    it('HOOK_EXECUTING 包含分支名和命令', () => {
+      const result = POST_CREATE_MESSAGES.HOOK_EXECUTING('feat-login', 'npm install');
+      expect(result).toContain('feat-login');
+      expect(result).toContain('npm install');
+    });
+
+    it('HOOK_SUCCESS 包含分支名', () => {
+      const result = POST_CREATE_MESSAGES.HOOK_SUCCESS('feat-login');
+      expect(result).toContain('feat-login');
+      expect(result).toContain('成功');
+    });
+
+    it('HOOK_FAILED 包含分支名和错误信息', () => {
+      const result = POST_CREATE_MESSAGES.HOOK_FAILED('feat-login', '命令退出码: 1');
+      expect(result).toContain('feat-login');
+      expect(result).toContain('命令退出码: 1');
+      expect(result).toContain('失败');
+    });
+
+    it('HOOK_SUMMARY 包含成功和失败计数', () => {
+      const result = POST_CREATE_MESSAGES.HOOK_SUMMARY(3, 1);
+      expect(result).toContain('3');
+      expect(result).toContain('1');
+      expect(result).toContain('成功');
+      expect(result).toContain('失败');
+    });
+
+    it('HOOK_SUMMARY 全部成功时失败数为 0', () => {
+      const result = POST_CREATE_MESSAGES.HOOK_SUMMARY(5, 0);
+      expect(result).toContain('5 成功');
+      expect(result).toContain('0 失败');
+    });
+
+    it('POST_CREATE_SCRIPT_NOT_EXECUTABLE 包含路径和手动 chmod 提示', () => {
+      const result = POST_CREATE_MESSAGES.POST_CREATE_SCRIPT_NOT_EXECUTABLE('/repo/.clawt/postCreate.sh');
+      expect(result).toContain('/repo/.clawt/postCreate.sh');
+      expect(result).toContain('chmod +x');
+      expect(result).toContain('不可执行');
+    });
+
+    it('POST_CREATE_SCRIPT_AUTO_CHMOD 包含路径和自动修复提示', () => {
+      const result = POST_CREATE_MESSAGES.POST_CREATE_SCRIPT_AUTO_CHMOD('/repo/.clawt/postCreate.sh');
+      expect(result).toContain('/repo/.clawt/postCreate.sh');
+      expect(result).toContain('已自动添加执行权限');
+    });
+
+    it('HOOK_BACKGROUND_START 包含 worktree 数量和命令', () => {
+      const result = POST_CREATE_MESSAGES.HOOK_BACKGROUND_START(3, 'npm install');
+      expect(result).toContain('3');
+      expect(result).toContain('npm install');
+      expect(result).toContain('后台执行');
+    });
+
+    it('HOOK_BACKGROUND_START 单个 worktree 时正确显示', () => {
+      const result = POST_CREATE_MESSAGES.HOOK_BACKGROUND_START(1, 'pnpm install');
+      expect(result).toContain('1 个 worktree');
+      expect(result).toContain('pnpm install');
+    });
+  });
+
+  describe('语义修正验证', () => {
+    it('不存在旧的 HOOK_SKIPPED_NO_DEPS 键', () => {
+      expect('HOOK_SKIPPED_NO_DEPS' in POST_CREATE_MESSAGES).toBe(false);
+    });
+
+    it('不存在旧的 SETUP_SCRIPT_NOT_EXECUTABLE 键', () => {
+      expect('SETUP_SCRIPT_NOT_EXECUTABLE' in POST_CREATE_MESSAGES).toBe(false);
+    });
+
+    it('存在新的 HOOK_SKIPPED 键', () => {
+      expect('HOOK_SKIPPED' in POST_CREATE_MESSAGES).toBe(true);
+    });
+
+    it('存在新的 POST_CREATE_SCRIPT_NOT_EXECUTABLE 键', () => {
+      expect('POST_CREATE_SCRIPT_NOT_EXECUTABLE' in POST_CREATE_MESSAGES).toBe(true);
+    });
+
+    it('存在新的 POST_CREATE_SCRIPT_AUTO_CHMOD 键', () => {
+      expect('POST_CREATE_SCRIPT_AUTO_CHMOD' in POST_CREATE_MESSAGES).toBe(true);
+    });
+  });
+});