clawt 2.20.0 → 3.1.0

package/src/utils/project-config.ts

@@ -0,0 +1,77 @@
+import { existsSync, readFileSync, writeFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { PROJECTS_CONFIG_DIR, MESSAGES } from '../constants/index.js';
+import { ClawtError } from '../errors/index.js';
+import { logger } from '../logger/index.js';
+import { getProjectName } from './git.js';
+import { ensureDir } from './fs.js';
+import type { ProjectConfig } from '../types/index.js';
+
+/**
+ * 获取项目配置文件路径
+ * @param {string} projectName - 项目名
+ * @returns {string} 配置文件路径
+ */
+export function getProjectConfigPath(projectName: string): string {
+  return join(PROJECTS_CONFIG_DIR, projectName, 'config.json');
+}
+
+/**
+ * 加载当前项目的配置
+ * @returns {ProjectConfig | null} 项目配置，不存在时返回 null
+ */
+export function loadProjectConfig(): ProjectConfig | null {
+  const projectName = getProjectName();
+  const configPath = getProjectConfigPath(projectName);
+
+  if (!existsSync(configPath)) {
+    return null;
+  }
+
+  try {
+    const raw = readFileSync(configPath, 'utf-8');
+    return JSON.parse(raw) as ProjectConfig;
+  } catch (error) {
+    logger.warn(`项目配置文件解析失败: ${error}`);
+    return null;
+  }
+}
+
+/**
+ * 保存项目配置
+ * @param {ProjectConfig} config - 要保存的项目配置
+ */
+export function saveProjectConfig(config: ProjectConfig): void {
+  const projectName = getProjectName();
+  const configPath = getProjectConfigPath(projectName);
+  // 确保项目子目录存在
+  const projectDir = join(PROJECTS_CONFIG_DIR, projectName);
+  ensureDir(projectDir);
+  writeFileSync(configPath, JSON.stringify(config, null, 2), 'utf-8');
+  logger.info(`项目配置已保存: ${configPath}`);
+}
+
+/**
+ * 获取当前项目配置，不存在则抛出错误
+ * @returns {ProjectConfig} 项目配置
+ */
+export function requireProjectConfig(): ProjectConfig {
+  const config = loadProjectConfig();
+  if (!config) {
+    throw new ClawtError(MESSAGES.PROJECT_NOT_INITIALIZED);
+  }
+  // 校验配置文件中是否包含 clawtMainWorkBranch 字段
+  if (!config.clawtMainWorkBranch) {
+    throw new ClawtError(MESSAGES.PROJECT_CONFIG_MISSING_BRANCH);
+  }
+  return config;
+}
+
+/**
+ * 从项目配置中获取主工作分支名
+ * @returns {string} 主工作分支名
+ */
+export function getMainWorkBranch(): string {
+  const config = requireProjectConfig();
+  return config.clawtMainWorkBranch;
+}

package/src/utils/validate-branch.ts

@@ -0,0 +1,166 @@
+import Enquirer from 'enquirer';
+import { VALIDATE_BRANCH_PREFIX } from '../constants/index.js';
+import { logger } from '../logger/index.js';
+import { checkBranchExists, createBranch, deleteBranch, getCurrentBranch, gitCheckout, gitResetHard, gitCleanForce, isWorkingDirClean, gitAddAll, gitStashPush } from './git.js';
+import { getMainWorkBranch } from './project-config.js';
+import { printWarning } from './formatter.js';
+import { ClawtError } from '../errors/index.js';
+
+/**
+ * 生成验证分支名
+ * @param {string} branchName - 原始分支名
+ * @returns {string} 验证分支名
+ */
+export function getValidateBranchName(branchName: string): string {
+  return `${VALIDATE_BRANCH_PREFIX}${branchName}`;
+}
+
+/**
+ * 创建验证分支（如果不存在）
+ * @param {string} branchName - 原始分支名
+ * @param {string} [cwd] - 工作目录
+ */
+export function createValidateBranch(branchName: string, cwd?: string): void {
+  const validateBranchName = getValidateBranchName(branchName);
+
+  if (checkBranchExists(validateBranchName, cwd)) {
+    logger.info(`验证分支已存在，跳过创建: ${validateBranchName}`);
+    return;
+  }
+
+  createBranch(validateBranchName, cwd);
+  logger.info(`验证分支已创建: ${validateBranchName}`);
+}
+
+/**
+ * 删除验证分支（如果存在）
+ * @param {string} branchName - 原始分支名
+ * @param {string} [cwd] - 工作目录
+ */
+export function deleteValidateBranch(branchName: string, cwd?: string): void {
+  const validateBranchName = getValidateBranchName(branchName);
+
+  if (!checkBranchExists(validateBranchName, cwd)) {
+    logger.info(`验证分支不存在，跳过删除: ${validateBranchName}`);
+    return;
+  }
+
+  deleteBranch(validateBranchName, cwd);
+  logger.info(`验证分支已删除: ${validateBranchName}`);
+}
+
+/**
+ * 重建验证分支（先删除再创建）
+ * 确保在主工作分支上创建验证分支，处理三种情况：
+ * 1. 已在主工作分支上 → 直接重建
+ * 2. 在验证分支上 → 清理工作区后自动切回主工作分支
+ * 3. 在其他分支上 → 检查工作区是否干净，不干净则交互处理后切回主工作分支
+ * @param {string} branchName - 原始分支名
+ * @param {string} [cwd] - 工作目录
+ */
+export async function rebuildValidateBranch(branchName: string, cwd?: string): Promise<void> {
+  const mainBranch = getMainWorkBranch();
+  const currentBranch = getCurrentBranch(cwd);
+
+  if (currentBranch === mainBranch) {
+    // 已在主工作分支上，无需切换
+  } else if (currentBranch.startsWith(VALIDATE_BRANCH_PREFIX)) {
+    // 在验证分支上，验证分支的修改是可丢弃的，直接清理后切回
+    gitResetHard(cwd);
+    gitCleanForce(cwd);
+    gitCheckout(mainBranch, cwd);
+  } else {
+    // 在其他分支上，需确保工作区干净后切回主工作分支
+    if (!isWorkingDirClean(cwd)) {
+      await handleDirtyWorkingDir(cwd);
+    }
+    gitCheckout(mainBranch, cwd);
+  }
+
+  deleteValidateBranch(branchName, cwd);
+  createValidateBranch(branchName, cwd);
+  logger.info(`验证分支已重建: ${getValidateBranchName(branchName)}`);
+}
+
+/**
+ * 处理工作区有未提交更改的情况
+ * 提供交互式选择：reset（丢弃所有更改）、stash（暂存更改）、exit（退出让用户手动处理）
+ * @param {string} [cwd] - 工作目录
+ */
+export async function handleDirtyWorkingDir(cwd?: string): Promise<void> {
+  printWarning('当前分支有未提交的更改，请选择处理方式：\n');
+
+  // @ts-expect-error enquirer 类型声明未导出 Select 类，但运行时存在
+  const choice = await new Enquirer.Select({
+    message: '选择处理方式',
+    choices: [
+      {
+        name: 'reset',
+        message: 'reset        - 丢弃所有更改 (git reset --hard HEAD && git clean -fd)',
+      },
+      {
+        name: 'stash',
+        message: 'stash        - 暂存更改 (git add . && git stash)',
+      },
+      {
+        name: 'exit',
+        message: 'exit         - 退出，手动处理',
+      },
+    ],
+    initial: 0,
+  }).run();
+
+  if (choice === 'exit') {
+    throw new ClawtError('用户选择退出，请手动处理工作区更改后重试');
+  }
+
+  if (choice === 'reset') {
+    gitResetHard(cwd);
+    gitCleanForce(cwd);
+  } else if (choice === 'stash') {
+    gitAddAll(cwd);
+    gitStashPush('clawt:auto-stash', cwd);
+  }
+
+  // 再次检查是否干净
+  if (!isWorkingDirClean(cwd)) {
+    throw new ClawtError('工作区仍然不干净，请手动处理');
+  }
+}
+
+/**
+ * 确保当前在主工作分支上
+ * 三种情况：
+ * 1. 已在主工作分支上 → 直接返回
+ * 2. 在验证分支上 → 清理工作区后自动切回主工作分支
+ * 3. 在其他分支上 → 处理脏工作区后切换到主工作分支
+ * @param {string} [cwd] - 工作目录
+ */
+export async function ensureOnMainWorkBranch(cwd?: string): Promise<void> {
+  const mainBranch = getMainWorkBranch();
+  const currentBranch = getCurrentBranch(cwd);
+
+  // 已在主工作分支上，无需操作
+  if (currentBranch === mainBranch) {
+    return;
+  }
+
+  // 当前在验证分支上，清理工作区后自动切回
+  if (currentBranch.startsWith(VALIDATE_BRANCH_PREFIX)) {
+    logger.info(`当前在验证分支 ${currentBranch} 上，自动切回主工作分支 ${mainBranch}`);
+    // 验证分支上的修改是可丢弃的，直接清理
+    if (!isWorkingDirClean(cwd)) {
+      gitResetHard(cwd);
+      gitCleanForce(cwd);
+    }
+    gitCheckout(mainBranch, cwd);
+    return;
+  }
+
+  // 当前在其他分支上，处理脏工作区后切换
+  logger.info(`当前在分支 ${currentBranch} 上，需切换到主工作分支 ${mainBranch}`);
+  if (!isWorkingDirClean(cwd)) {
+    await handleDirtyWorkingDir(cwd);
+  }
+  gitCheckout(mainBranch, cwd);
+}

package/src/utils/worktree-matcher.ts

@@ -301,7 +301,7 @@ function formatLocalDate(date: Date): string {
  * @param {string} dirPath - worktree 目录路径
  * @returns {string | null} YYYY-MM-DD 格式的本地日期字符串，无法获取时返回 null
  */
-function getWorktreeCreatedDate(dirPath: string): string | null {
+export function getWorktreeCreatedDate(dirPath: string): string | null {
   try {
     const stat = statSync(dirPath);
     return formatLocalDate(stat.birthtime);
@@ -316,7 +316,7 @@ function getWorktreeCreatedDate(dirPath: string): string | null {
  * @param {string} dateStr - YYYY-MM-DD 格式的日期字符串
  * @returns {string} 中文相对日期描述，如"今天"、"昨天"、"3 天前"
  */
-function formatRelativeDate(dateStr: string): string {
+export function formatRelativeDate(dateStr: string): string {
   const today = formatLocalDate(new Date());
   const todayMs = new Date(today).getTime();
   const targetMs = new Date(dateStr).getTime();

package/src/utils/worktree.ts

@@ -5,6 +5,7 @@ import { logger } from '../logger/index.js';
 import { createWorktree as gitCreateWorktree, getProjectName, gitWorktreeList, removeWorktreeByPath, deleteBranch, gitWorktreePrune, getCommitCountAhead, getDiffStat, isWorkingDirClean } from './git.js';
 import { sanitizeBranchName, generateBranchNames, validateBranchesNotExist } from './branch.js';
 import { ensureDir, removeEmptyDir } from './fs.js';
+import { createValidateBranch, deleteValidateBranch } from './validate-branch.js';
 import type { WorktreeInfo, WorktreeStatus } from '../types/index.js';
 
 /**
@@ -37,11 +38,12 @@ export function createWorktrees(branchName: string, count: number): WorktreeInfo
   const projectDir = getProjectWorktreeDir();
   ensureDir(projectDir);
 
-  // 5. 串行创建 worktree
+  // 5. 串行创建 worktree 及对应验证分支
   const results: WorktreeInfo[] = [];
   for (const name of branchNames) {
     const worktreePath = join(projectDir, name);
     gitCreateWorktree(name, worktreePath);
+    createValidateBranch(name);
     results.push({ path: worktreePath, branch: name });
     logger.info(`worktree 创建完成: ${worktreePath} (分支: ${name})`);
   }
@@ -64,11 +66,12 @@ export function createWorktreesByBranches(branchNames: string[]): WorktreeInfo[]
   const projectDir = getProjectWorktreeDir();
   ensureDir(projectDir);
 
-  // 3. 串行创建 worktree
+  // 3. 串行创建 worktree 及对应验证分支
   const results: WorktreeInfo[] = [];
   for (const name of branchNames) {
     const worktreePath = join(projectDir, name);
     gitCreateWorktree(name, worktreePath);
+    createValidateBranch(name);
     results.push({ path: worktreePath, branch: name });
     logger.info(`worktree 创建完成: ${worktreePath} (分支: ${name})`);
   }
@@ -123,6 +126,7 @@ export function cleanupWorktrees(worktrees: WorktreeInfo[]): void {
     try {
       removeWorktreeByPath(wt.path);
       deleteBranch(wt.branch);
+      deleteValidateBranch(wt.branch);
       logger.info(`已清理 worktree 和分支: ${wt.branch}`);
     } catch (error) {
       logger.error(`清理 worktree 失败: ${wt.path} - ${error}`);

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

@@ -26,6 +26,10 @@ vi.mock('../../../src/constants/index.js', () => ({
 vi.mock('../../../src/utils/index.js', () => ({
   validateMainWorktree: vi.fn(),
   createWorktrees: vi.fn(),
+  getConfigValue: vi.fn().mockReturnValue(true),
+  requireProjectConfig: vi.fn().mockReturnValue({ clawtMainWorkBranch: 'main' }),
+  ensureOnMainWorkBranch: vi.fn().mockResolvedValue(undefined),
+  getValidateBranchName: vi.fn((name: string) => `clawt-validate-${name}`),
   printSuccess: vi.fn(),
   printInfo: vi.fn(),
   printSeparator: vi.fn(),
@@ -54,7 +58,7 @@ describe('registerCreateCommand', () => {
 });
 
 describe('handleCreate', () => {
-  it('成功创建 worktree', () => {
+  it('成功创建 worktree', async () => {
     mockedCreateWorktrees.mockReturnValue([
       { path: '/path/feature', branch: 'feature' },
     ]);
@@ -62,14 +66,14 @@ describe('handleCreate', () => {
     const program = new Command();
     program.exitOverride();
     registerCreateCommand(program);
-    program.parse(['create', '-b', 'feature'], { from: 'user' });
+    await program.parseAsync(['create', '-b', 'feature'], { from: 'user' });
 
     expect(mockedValidateMainWorktree).toHaveBeenCalled();
     expect(mockedCreateWorktrees).toHaveBeenCalledWith('feature', 1);
     expect(mockedPrintSuccess).toHaveBeenCalled();
   });
 
-  it('支持 -n 指定创建数量', () => {
+  it('支持 -n 指定创建数量', async () => {
     mockedCreateWorktrees.mockReturnValue([
       { path: '/path/feature-1', branch: 'feature-1' },
       { path: '/path/feature-2', branch: 'feature-2' },
@@ -78,38 +82,38 @@ describe('handleCreate', () => {
     const program = new Command();
     program.exitOverride();
     registerCreateCommand(program);
-    program.parse(['create', '-b', 'feature', '-n', '2'], { from: 'user' });
+    await program.parseAsync(['create', '-b', 'feature', '-n', '2'], { from: 'user' });
 
     expect(mockedCreateWorktrees).toHaveBeenCalledWith('feature', 2);
   });
 
-  it('无效数量抛出 ClawtError', () => {
+  it('无效数量抛出 ClawtError', async () => {
     const program = new Command();
     program.exitOverride();
     registerCreateCommand(program);
 
-    expect(() => {
-      program.parse(['create', '-b', 'feature', '-n', 'abc'], { from: 'user' });
-    }).toThrow();
+    await expect(
+      program.parseAsync(['create', '-b', 'feature', '-n', 'abc'], { from: 'user' }),
+    ).rejects.toThrow();
   });
 
-  it('数量为 0 时抛出 ClawtError', () => {
+  it('数量为 0 时抛出 ClawtError', async () => {
     const program = new Command();
     program.exitOverride();
     registerCreateCommand(program);
 
-    expect(() => {
-      program.parse(['create', '-b', 'feature', '-n', '0'], { from: 'user' });
-    }).toThrow();
+    await expect(
+      program.parseAsync(['create', '-b', 'feature', '-n', '0'], { from: 'user' }),
+    ).rejects.toThrow();
   });
 
-  it('负数数量抛出 ClawtError', () => {
+  it('负数数量抛出 ClawtError', async () => {
     const program = new Command();
     program.exitOverride();
     registerCreateCommand(program);
 
-    expect(() => {
-      program.parse(['create', '-b', 'feature', '-n', '-1'], { from: 'user' });
-    }).toThrow();
+    await expect(
+      program.parseAsync(['create', '-b', 'feature', '-n', '-1'], { from: 'user' }),
+    ).rejects.toThrow();
   });
 });

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

@@ -0,0 +1,146 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { Command } from 'commander';
+
+vi.mock('../../../src/logger/index.js', () => ({
+  logger: { debug: vi.fn(), info: vi.fn(), warn: vi.fn(), error: vi.fn() },
+}));
+
+vi.mock('../../../src/constants/index.js', () => ({
+  MESSAGES: {
+    INIT_SUCCESS: (branch: string) => `✓ 项目初始化成功，主工作分支设置为: ${branch}`,
+    INIT_UPDATED: (oldBranch: string, newBranch: string) => `✓ 已将主工作分支从 ${oldBranch} 更新为 ${newBranch}`,
+    INIT_SHOW: (configJson: string) => `当前项目配置:\n${configJson}`,
+    PROJECT_NOT_INITIALIZED: '项目尚未初始化，请先执行 clawt init 设置主工作分支',
+    PROJECT_CONFIG_MISSING_BRANCH: '项目配置缺少主工作分支信息，请重新执行 clawt init 设置主工作分支',
+  },
+}));
+
+vi.mock('../../../src/utils/index.js', () => ({
+  validateMainWorktree: vi.fn(),
+  getCurrentBranch: vi.fn().mockReturnValue('main'),
+  loadProjectConfig: vi.fn(),
+  saveProjectConfig: vi.fn(),
+  requireProjectConfig: vi.fn().mockReturnValue({ clawtMainWorkBranch: 'main' }),
+  printSuccess: vi.fn(),
+  printInfo: vi.fn(),
+  safeStringify: vi.fn((value: unknown, indent: number = 2) => JSON.stringify(value, null, indent)),
+}));
+
+import { registerInitCommand } from '../../../src/commands/init.js';
+import {
+  loadProjectConfig,
+  saveProjectConfig,
+  requireProjectConfig,
+  printSuccess,
+  printInfo,
+  getCurrentBranch,
+} from '../../../src/utils/index.js';
+
+const mockedLoadProjectConfig = vi.mocked(loadProjectConfig);
+const mockedSaveProjectConfig = vi.mocked(saveProjectConfig);
+const mockedRequireProjectConfig = vi.mocked(requireProjectConfig);
+const mockedPrintSuccess = vi.mocked(printSuccess);
+const mockedPrintInfo = vi.mocked(printInfo);
+const mockedGetCurrentBranch = vi.mocked(getCurrentBranch);
+
+beforeEach(() => {
+  mockedLoadProjectConfig.mockReset();
+  mockedSaveProjectConfig.mockReset();
+  mockedRequireProjectConfig.mockReset();
+  mockedRequireProjectConfig.mockReturnValue({ clawtMainWorkBranch: 'main' });
+  mockedPrintSuccess.mockReset();
+  mockedPrintInfo.mockReset();
+  mockedGetCurrentBranch.mockReturnValue('main');
+});
+
+describe('registerInitCommand', () => {
+  it('注册 init 命令', () => {
+    const program = new Command();
+    registerInitCommand(program);
+    const cmd = program.commands.find((c) => c.name() === 'init');
+    expect(cmd).toBeDefined();
+  });
+
+  it('注册 init show 子命令', () => {
+    const program = new Command();
+    registerInitCommand(program);
+    const initCmd = program.commands.find((c) => c.name() === 'init');
+    const showCmd = initCmd?.commands.find((c) => c.name() === 'show');
+    expect(showCmd).toBeDefined();
+  });
+});
+
+describe('handleInit', () => {
+  it('无参数且已初始化时使用当前分支切换主工作分支', async () => {
+    mockedLoadProjectConfig.mockReturnValue({ clawtMainWorkBranch: 'develop' });
+
+    const program = new Command();
+    program.exitOverride();
+    registerInitCommand(program);
+    await program.parseAsync(['init'], { from: 'user' });
+
+    expect(mockedSaveProjectConfig).toHaveBeenCalledWith({ clawtMainWorkBranch: 'main' });
+    expect(mockedPrintSuccess).toHaveBeenCalledWith(
+      expect.stringContaining('develop'),
+    );
+    expect(mockedPrintSuccess).toHaveBeenCalledWith(
+      expect.stringContaining('main'),
+    );
+  });
+
+  it('无参数且未初始化时使用当前分支初始化', async () => {
+    mockedLoadProjectConfig.mockReturnValue(null);
+
+    const program = new Command();
+    program.exitOverride();
+    registerInitCommand(program);
+    await program.parseAsync(['init'], { from: 'user' });
+
+    expect(mockedSaveProjectConfig).toHaveBeenCalledWith({ clawtMainWorkBranch: 'main' });
+    expect(mockedPrintSuccess).toHaveBeenCalled();
+  });
+
+  it('有 -b 参数时设置指定分支', async () => {
+    mockedLoadProjectConfig.mockReturnValue(null);
+
+    const program = new Command();
+    program.exitOverride();
+    registerInitCommand(program);
+    await program.parseAsync(['init', '-b', 'develop'], { from: 'user' });
+
+    expect(mockedSaveProjectConfig).toHaveBeenCalledWith({ clawtMainWorkBranch: 'develop' });
+    expect(mockedPrintSuccess).toHaveBeenCalled();
+  });
+
+  it('有 -b 参数且已初始化时更新配置', async () => {
+    mockedLoadProjectConfig.mockReturnValue({ clawtMainWorkBranch: 'main' });
+
+    const program = new Command();
+    program.exitOverride();
+    registerInitCommand(program);
+    await program.parseAsync(['init', '-b', 'develop'], { from: 'user' });
+
+    expect(mockedSaveProjectConfig).toHaveBeenCalledWith({ clawtMainWorkBranch: 'develop' });
+    // 验证 INIT_UPDATED 传入了旧分支名和新分支名
+    expect(mockedPrintSuccess).toHaveBeenCalledWith(
+      expect.stringContaining('main'),
+    );
+    expect(mockedPrintSuccess).toHaveBeenCalledWith(
+      expect.stringContaining('develop'),
+    );
+  });
+});
+
+describe('handleInitShow (show 子命令)', () => {
+  it('clawt init show 展示当前配置', async () => {
+    mockedRequireProjectConfig.mockReturnValue({ clawtMainWorkBranch: 'develop' });
+
+    const program = new Command();
+    program.exitOverride();
+    registerInitCommand(program);
+    await program.parseAsync(['init', 'show'], { from: 'user' });
+
+    expect(mockedPrintInfo).toHaveBeenCalled();
+    expect(mockedSaveProjectConfig).not.toHaveBeenCalled();
+  });
+});

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

@@ -64,7 +64,13 @@ vi.mock('../../../src/utils/index.js', () => ({
   gitMergeBase: vi.fn(),
   gitResetSoftTo: vi.fn(),
   getCurrentBranch: vi.fn(),
+  gitResetHard: vi.fn(),
+  gitCleanForce: vi.fn(),
+  gitCheckout: vi.fn(),
   resolveTargetWorktree: vi.fn(),
+  requireProjectConfig: vi.fn().mockReturnValue({ clawtMainWorkBranch: 'main' }),
+  getMainWorkBranch: vi.fn().mockReturnValue('main'),
+  ensureOnMainWorkBranch: vi.fn(),
 }));
 
 import { registerMergeCommand } from '../../../src/commands/merge.js';
@@ -175,7 +181,7 @@ describe('handleMerge', () => {
 
   it('目标 worktree 有未提交修改且提供 -m 时先提交再合并', async () => {
     mockedIsWorkingDirClean
-      .mockReturnValueOnce(true)   // 主 worktree 干净
+      .mockReturnValueOnce(true)   // 主 worktree 状态检测：干净
       .mockReturnValueOnce(false); // 目标 worktree 不干净
     mockedConfirmAction.mockResolvedValue(false); // 不清理
 

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

@@ -46,6 +46,10 @@ vi.mock('../../../src/utils/index.js', () => ({
   removeSnapshot: vi.fn(),
   removeProjectSnapshots: vi.fn(),
   resolveTargetWorktrees: vi.fn(),
+  requireProjectConfig: vi.fn().mockReturnValue({ clawtMainWorkBranch: 'main' }),
+  getValidateBranchName: vi.fn((name: string) => `clawt-validate-${name}`),
+  deleteValidateBranch: vi.fn(),
+  ensureOnMainWorkBranch: vi.fn(),
 }));
 
 import { registerRemoveCommand } from '../../../src/commands/remove.js';

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

@@ -23,6 +23,8 @@ vi.mock('../../../src/utils/index.js', () => ({
   confirmDestructiveAction: vi.fn(),
   printSuccess: vi.fn(),
   printInfo: vi.fn(),
+  requireProjectConfig: vi.fn().mockReturnValue({ clawtMainWorkBranch: 'main' }),
+  switchBackIfOnValidateBranch: vi.fn(),
 }));
 
 import { registerResetCommand } from '../../../src/commands/reset.js';

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

@@ -71,6 +71,8 @@ vi.mock('../../../src/utils/index.js', async (importOriginal) => {
     parseTasksFromOptions: vi.fn(),
     createWorktreesByBranches: vi.fn(),
     printDryRunPreview: vi.fn(),
+    requireProjectConfig: vi.fn().mockReturnValue({ clawtMainWorkBranch: 'main' }),
+    ensureOnMainWorkBranch: vi.fn().mockResolvedValue(undefined),
   };
 });
 

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

@@ -25,6 +25,7 @@ vi.mock('../../../src/constants/index.js', () => ({
     SYNC_MERGING: (branch: string, mainBranch: string) => `正在将 ${mainBranch} 合并到 ${branch}...`,
     SYNC_CONFLICT: (path: string) => `合并冲突，请手动解决: ${path}`,
     SYNC_SUCCESS: (branch: string, mainBranch: string) => `✓ 已将 ${mainBranch} 同步到 ${branch}`,
+    SYNC_VALIDATE_BRANCH_REBUILT: (validateBranch: string) => `验证分支 ${validateBranch} 已重建`,
   },
   AUTO_SAVE_COMMIT_MESSAGE: 'clawt:auto-save',
 }));
@@ -46,6 +47,11 @@ vi.mock('../../../src/utils/index.js', () => ({
   printInfo: vi.fn(),
   printWarning: vi.fn(),
   resolveTargetWorktree: vi.fn(),
+  requireProjectConfig: vi.fn().mockReturnValue({ clawtMainWorkBranch: 'main' }),
+  getMainWorkBranch: vi.fn().mockReturnValue('main'),
+  rebuildValidateBranch: vi.fn(),
+  getValidateBranchName: vi.fn((name: string) => `clawt-validate-${name}`),
+  ensureOnMainWorkBranch: vi.fn(),
 }));
 
 import { registerSyncCommand } from '../../../src/commands/sync.js';

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

@@ -40,6 +40,11 @@ vi.mock('../../../src/constants/index.js', () => ({
     VALIDATE_PARALLEL_CMD_FAILED: (cmd: string, code: number) => `  ✗ ${cmd}（退出码: ${code}）`,
     VALIDATE_PARALLEL_CMD_ERROR: (cmd: string, msg: string) => `  ✗ ${cmd}（错误: ${msg}）`,
     SEPARATOR: '────',
+    VALIDATE_BRANCH_NOT_FOUND: (validateBranch: string, branch: string) => `验证分支 ${validateBranch} 不存在`,
+    VALIDATE_SUCCESS_WITH_BRANCH: (branch: string, validateBranch: string) => `✓ 已切换到验证分支 ${validateBranch} 并验证 ${branch}`,
+    VALIDATE_CONFIRM_AUTO_SYNC: (branch: string) => `是否自动 sync ${branch}`,
+    VALIDATE_AUTO_SYNC_DECLINED: (branch: string) => `已跳过 ${branch} 的自动 sync`,
+    VALIDATE_AUTO_SYNC_START: (branch: string) => `正在自动 sync ${branch}`,
   },
 }));
 
@@ -79,6 +84,7 @@ vi.mock('../../../src/utils/index.js', () => ({
   writeSnapshot: vi.fn(),
   removeSnapshot: vi.fn(),
   confirmDestructiveAction: vi.fn(),
+  confirmAction: vi.fn(),
   printSuccess: vi.fn(),
   printWarning: vi.fn(),
   printInfo: vi.fn(),
@@ -88,6 +94,13 @@ vi.mock('../../../src/utils/index.js', () => ({
   printSeparator: vi.fn(),
   parseParallelCommands: vi.fn(),
   runParallelCommands: vi.fn(),
+  requireProjectConfig: vi.fn().mockReturnValue({ clawtMainWorkBranch: 'main' }),
+  getValidateBranchName: vi.fn((name: string) => `clawt-validate-${name}`),
+  gitCheckout: vi.fn(),
+  ensureOnMainWorkBranch: vi.fn(),
+  handleDirtyWorkingDir: vi.fn(),
+  checkBranchExists: vi.fn().mockReturnValue(true),
+  getCurrentBranch: vi.fn().mockReturnValue('main'),
 }));
 
 import { registerValidateCommand } from '../../../src/commands/validate.js';

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

@@ -90,9 +90,9 @@ describe('writeConfig', () => {
 });
 
 describe('ensureClawtDirs', () => {
-  it('确保三个全局目录存在', () => {
+  it('确保四个全局目录存在', () => {
     ensureClawtDirs();
-    expect(mockedEnsureDir).toHaveBeenCalledTimes(3);
+    expect(mockedEnsureDir).toHaveBeenCalledTimes(4);
   });
 });