clawt 3.4.3 → 3.4.5

package/src/commands/status.ts

@@ -16,7 +16,7 @@ import {
   hasLocalCommits,
   getSnapshotModifiedTime,
   getProjectSnapshotBranches,
-  getBranchCreatedAt,
+  getWorktreeCreatedTime,
   formatRelativeTime,
   printInfo,
   printDoubleSeparator,
@@ -46,7 +46,7 @@ export function registerStatusCommand(program: Command): void {
  * @param {StatusOptions} options - 命令选项
  */
 async function handleStatus(options: StatusOptions): Promise<void> {
-  runPreChecks({ mainWorktree: true, headExists: true });
+  await runPreChecks({ requireMainWorktree: true, requireHead: true });
 
   // 交互式面板模式
   if (options.interactive) {
@@ -116,7 +116,7 @@ function collectWorktreeDetailedStatus(worktree: WorktreeInfo, projectName: stri
   const changeStatus = detectChangeStatus(worktree);
   const { commitsAhead, commitsBehind } = countCommitDivergence(worktree.branch);
   const { insertions, deletions } = countDiffStat(worktree.path);
-  const createdAt = resolveBranchCreatedAt(worktree.branch);
+  const createdAt = getWorktreeCreatedTime(worktree.path);
 
   return {
     path: worktree.path,
@@ -183,19 +183,6 @@ function countDiffStat(worktreePath: string): { insertions: number; deletions: n
   }
 }
 
-/**
- * 获取分支的创建时间
- * @param {string} branchName - 分支名
- * @returns {string | null} ISO 8601 格式的创建时间，获取失败时返回 null
- */
-function resolveBranchCreatedAt(branchName: string): string | null {
-  try {
-    return getBranchCreatedAt(branchName);
-  } catch {
-    return null;
-  }
-}
-
 /**
  * 获取分支的 validate 快照修改时间
  * @param {string} projectName - 项目名

package/src/commands/sync.ts

@@ -3,6 +3,7 @@ import { logger } from '../logger/index.js';
 import { ClawtError } from '../errors/index.js';
 import { MESSAGES, AUTO_SAVE_COMMIT_MESSAGE } from '../constants/index.js';
 import type { SyncOptions } from '../types/index.js';
+import { PRE_CHECK_SYNC } from '../constants/index.js';
 import {
   runPreChecks,
   getGitTopLevel,
@@ -19,7 +20,6 @@ import {
   getMainWorkBranch,
   rebuildValidateBranch,
   getValidateBranchName,
-  guardMainWorkBranch,
 } from '../utils/index.js';
 import type { WorktreeResolveMessages } from '../utils/index.js';
 
@@ -127,8 +127,7 @@ export async function executeSyncForBranch(targetWorktreePath: string, branch: s
  * @param {SyncOptions} options - 命令选项
  */
 async function handleSync(options: SyncOptions): Promise<void> {
-  runPreChecks({ mainWorktree: true, headExists: true, projectConfig: true });
-  await guardMainWorkBranch();
+  await runPreChecks(PRE_CHECK_SYNC);
 
   logger.info(`sync 命令执行，分支: ${options.branch ?? '(未指定)'}`);
 

package/src/commands/validate.ts

@@ -97,7 +97,7 @@ async function handlePatchApplyFailure(targetWorktreePath: string, branchName: s
  * @param {ValidateOptions} options - 命令选项
  */
 async function handleValidateClean(options: ValidateOptions): Promise<void> {
-  runPreChecks({ mainWorktree: true, headExists: true, projectConfig: true });
+  await runPreChecks({ requireMainWorktree: true, requireHead: true, requireProjectConfig: true });
 
   const projectName = getProjectName();
   const mainWorktreePath = getGitTopLevel();
@@ -261,7 +261,7 @@ async function handleValidate(options: ValidateOptions): Promise<void> {
     return;
   }
 
-  runPreChecks({ mainWorktree: true, headExists: true, projectConfig: true });
+  await runPreChecks({ requireMainWorktree: true, requireHead: true, requireProjectConfig: true });
 
   const projectName = getProjectName();
   const mainWorktreePath = getGitTopLevel();

package/src/constants/index.ts

@@ -43,3 +43,4 @@ export {
   PANEL_DATE_SEPARATOR_PREFIX,
   PANEL_FIXED_ROWS,
 } from './interactive-panel.js';
+export { PRE_CHECK_CREATE, PRE_CHECK_RUN, PRE_CHECK_DRY_RUN, PRE_CHECK_MERGE, PRE_CHECK_SYNC, PRE_CHECK_RESUME } from './pre-checks.js';

package/src/constants/interactive-panel.ts

@@ -31,6 +31,8 @@ export const PANEL_SHORTCUT_KEYS = {
   RESUME: 'r',
   /** 同步 */
   SYNC: 's',
+  /** 覆盖 */
+  COVER: 'c',
   /** 手动刷新 */
   REFRESH: 'f',
   /** 退出 */

package/src/constants/messages/interactive-panel.ts

@@ -8,6 +8,7 @@ const SHORTCUT_LABELS: Record<keyof typeof PANEL_SHORTCUT_KEYS, string> = {
   DELETE: '删除',
   RESUME: '恢复',
   SYNC: '同步',
+  COVER: '覆盖',
   REFRESH: '刷新',
   QUIT: '退出',
 };

package/src/constants/pre-checks.ts

@@ -0,0 +1,30 @@
+import type { PreCheckOptions } from '../utils/validation.js';
+
+/** create 命令：主 worktree + HEAD + 切换分支 + 工作区干净 */
+export const PRE_CHECK_CREATE: PreCheckOptions = {
+  requireMainWorktree: true, requireHead: true,
+  ensureOnClawtMainWorkBranch: true, requireCleanWorkingDir: true,
+} as const;
+
+/** run 命令正常模式（不含 requireClaudeCode，因为 claudeCode 在 dryRun 分支之后才需要） */
+export const PRE_CHECK_RUN: PreCheckOptions = { ...PRE_CHECK_CREATE } as const;
+
+/** run dry-run 模式 */
+export const PRE_CHECK_DRY_RUN: PreCheckOptions = { requireMainWorktree: true, requireHead: true } as const;
+
+/** merge 命令 */
+export const PRE_CHECK_MERGE: PreCheckOptions = {
+  requireMainWorktree: true, requireHead: true,
+  ensureOnClawtMainWorkBranch: true,
+} as const;
+
+/** sync 命令 */
+export const PRE_CHECK_SYNC: PreCheckOptions = {
+  requireMainWorktree: true, requireHead: true, requireProjectConfig: true,
+  ensureOnClawtMainWorkBranch: true,
+} as const;
+
+/** resume 命令 */
+export const PRE_CHECK_RESUME: PreCheckOptions = {
+  requireMainWorktree: true, requireHead: true, requireClaudeCode: true,
+} as const;

package/src/utils/index.ts

@@ -50,7 +50,8 @@ export {
   createBranch,
 } from './git.js';
 export { sanitizeBranchName, generateBranchNames, validateBranchesNotExist } from './branch.js';
-export { validateMainWorktree, validateGitInstalled, validateClaudeCodeInstalled, validateHeadExists, runPreChecks } from './validation.js';
+export { validateMainWorktree, validateGitInstalled, validateClaudeCodeInstalled, validateHeadExists, validateWorkingDirClean, runPreChecks } from './validation.js';
+export type { PreCheckOptions } from './validation.js';
 export { createWorktrees, getProjectWorktrees, getProjectWorktreeDir, cleanupWorktrees, getWorktreeStatus, createWorktreesByBranches } from './worktree.js';
 export { loadConfig, writeDefaultConfig, writeConfig, saveConfig, getConfigValue, ensureClawtDirs, parseConcurrency } from './config.js';
 export { printSuccess, printError, printWarning, printInfo, printHint, printSeparator, printDoubleSeparator, confirmAction, confirmDestructiveAction, formatWorktreeStatus, isWorktreeIdle, formatDuration, formatRelativeTime, formatDiskSize, formatLocalISOString } from './formatter.js';
@@ -58,7 +59,7 @@ export { ensureDir, removeEmptyDir, calculateDirSize } from './fs.js';
 export { multilineInput } from './prompt.js';
 export { launchInteractiveClaude, hasClaudeSessionHistory, launchInteractiveClaudeInNewTerminal } from './claude.js';
 export { getSnapshotPath, hasSnapshot, getSnapshotModifiedTime, readSnapshotTreeHash, readSnapshot, writeSnapshot, removeSnapshot, removeProjectSnapshots, getProjectSnapshotBranches } from './validate-snapshot.js';
-export { findExactMatch, findFuzzyMatches, promptSelectBranch, promptMultiSelectBranches, promptGroupedMultiSelectBranches, resolveTargetWorktree, resolveTargetWorktrees, groupWorktreesByDate, buildGroupedChoices, buildGroupMembershipMap, formatRelativeDate, getWorktreeCreatedDate } from './worktree-matcher.js';
+export { findExactMatch, findFuzzyMatches, promptSelectBranch, promptMultiSelectBranches, promptGroupedMultiSelectBranches, resolveTargetWorktree, resolveTargetWorktrees, groupWorktreesByDate, buildGroupedChoices, buildGroupMembershipMap, formatRelativeDate, getWorktreeCreatedDate, getWorktreeCreatedTime } from './worktree-matcher.js';
 export type { WorktreeResolveMessages, WorktreeMultiResolveMessages } from './worktree-matcher.js';
 export { ProgressRenderer } from './progress.js';
 export { parseTaskFile, loadTaskFile, parseTasksFromOptions } from './task-file.js';
@@ -70,7 +71,7 @@ export { truncateTaskDesc, printDryRunPreview } from './dry-run.js';
 export { applyAliases } from './alias.js';
 export { isValidConfigKey, getValidConfigKeys, parseConfigValue, promptConfigValue, formatConfigValue, interactiveConfigEditor } from './config-strategy.js';
 export { checkForUpdates } from './update-checker.js';
-export { getProjectConfigPath, loadProjectConfig, saveProjectConfig, requireProjectConfig, getMainWorkBranch, guardMainWorkBranchExists, guardMainWorkBranch, getValidateRunCommand } from './project-config.js';
+export { getProjectConfigPath, loadProjectConfig, saveProjectConfig, requireProjectConfig, getMainWorkBranch, guardMainWorkBranchExists, getValidateRunCommand } from './project-config.js';
 export { getValidateBranchName, createValidateBranch, deleteValidateBranch, rebuildValidateBranch, ensureOnMainWorkBranch, handleDirtyWorkingDir } from './validate-branch.js';
 export { safeStringify } from './json.js';
 export { executeRunCommand } from './validate-runner.js';

package/src/utils/interactive-panel.ts

@@ -281,6 +281,11 @@ export class InteractivePanel {
       this.executeOperation(() => this.handleSync());
       return;
     }
+
+    if (key === PANEL_SHORTCUT_KEYS.COVER) {
+      this.executeOperation(() => this.handleCover());
+      return;
+    }
   }
 
   /**
@@ -571,6 +576,14 @@ export class InteractivePanel {
     runCommandInherited(`clawt sync -b ${branch}`);
   }
 
+  /**
+   * 执行覆盖操作
+   * cover 命令从主 worktree 当前所在的验证分支名自动推导目标分支
+   */
+  private handleCover(): void {
+    runCommandInherited('clawt cover');
+  }
+
   /**
    * 等待用户按回车键
    * @returns {Promise<void>} 用户按回车时 resolve

package/src/utils/project-config.ts

@@ -1,11 +1,10 @@
 import { existsSync, readFileSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
-import { PROJECTS_CONFIG_DIR, MESSAGES, VALIDATE_BRANCH_PREFIX } from '../constants/index.js';
+import { PROJECTS_CONFIG_DIR, MESSAGES } from '../constants/index.js';
 import { ClawtError } from '../errors/index.js';
 import { logger } from '../logger/index.js';
-import { getProjectName, checkBranchExists, getCurrentBranch } from './git.js';
+import { getProjectName, checkBranchExists } from './git.js';
 import { ensureDir } from './fs.js';
-import { printWarning, confirmAction } from './formatter.js';
 import type { ProjectConfig } from '../types/index.js';
 
 /**
@@ -92,27 +91,6 @@ export function guardMainWorkBranchExists(cwd?: string): void {
   }
 }
 
-/**
- * 守卫检测：验证配置中的主工作分支是否有效
- * 分支不存在 → 抛出 ClawtError（致命错误）
- * 当前分支与配置分支不一致且非验证分支 → 警告并交互确认是否继续
- * @param {string} [cwd] - 工作目录
- */
-export async function guardMainWorkBranch(cwd?: string): Promise<void> {
-  guardMainWorkBranchExists(cwd);
-
-  const config = requireProjectConfig();
-  const mainBranch = config.clawtMainWorkBranch;
-  const currentBranch = getCurrentBranch(cwd);
-  if (currentBranch !== mainBranch && !currentBranch.startsWith(VALIDATE_BRANCH_PREFIX)) {
-    printWarning(MESSAGES.GUARD_BRANCH_MISMATCH(mainBranch, currentBranch));
-    const confirmed = await confirmAction('是否继续执行？');
-    if (!confirmed) {
-      throw new ClawtError(MESSAGES.DESTRUCTIVE_OP_CANCELLED);
-    }
-  }
-}
-
 /**
  * 从项目配置中获取 validate 成功后自动执行的命令
  * @returns {string | undefined} 配置的命令字符串，未配置时返回 undefined

package/src/utils/validate-branch.ts

@@ -1,9 +1,9 @@
 import Enquirer from 'enquirer';
-import { VALIDATE_BRANCH_PREFIX } from '../constants/index.js';
+import { VALIDATE_BRANCH_PREFIX, MESSAGES } 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 { printWarning, confirmAction } from './formatter.js';
 import { ClawtError } from '../errors/index.js';
 
 /**
@@ -133,7 +133,7 @@ export async function handleDirtyWorkingDir(cwd?: string): Promise<void> {
  * 三种情况：
  * 1. 已在主工作分支上 → 直接返回
  * 2. 在验证分支上 → 清理工作区后自动切回主工作分支
- * 3. 在其他分支上 → 处理脏工作区后切换到主工作分支
+ * 3. 在其他分支上 → 警告并确认后，处理脏工作区再切换到主工作分支
  * @param {string} [cwd] - 工作目录
  */
 export async function ensureOnMainWorkBranch(cwd?: string): Promise<void> {
@@ -157,7 +157,12 @@ export async function ensureOnMainWorkBranch(cwd?: string): Promise<void> {
     return;
   }
 
-  // 当前在其他分支上，处理脏工作区后切换
+  // 当前在其他分支上，警告并确认后处理脏工作区再切换
+  printWarning(MESSAGES.GUARD_BRANCH_MISMATCH(mainBranch, currentBranch));
+  const confirmed = await confirmAction('是否继续执行？');
+  if (!confirmed) {
+    throw new ClawtError(MESSAGES.DESTRUCTIVE_OP_CANCELLED);
+  }
   logger.info(`当前在分支 ${currentBranch} 上，需切换到主工作分支 ${mainBranch}`);
   if (!isWorkingDirClean(cwd)) {
     await handleDirtyWorkingDir(cwd);

package/src/utils/validation.ts

@@ -1,19 +1,26 @@
 import { MESSAGES } from '../constants/index.js';
 import { ClawtError } from '../errors/index.js';
 import { execCommand } from './shell.js';
-import { getGitCommonDir } from './git.js';
+import { getGitCommonDir, isWorkingDirClean } from './git.js';
 import { requireProjectConfig, guardMainWorkBranchExists } from './project-config.js';
+import { ensureOnMainWorkBranch } from './validate-branch.js';
 
 /** 统一前置校验选项 */
-interface PreCheckOptions {
-  /** 校验是否在主 worktree 根目录 */
-  mainWorktree?: boolean;
+export interface PreCheckOptions {
+  /** 校验当前目录是否在主 worktree 根目录 */
+  requireMainWorktree?: boolean;
   /** 校验 HEAD 是否存在（仓库有至少一次 commit） */
-  headExists?: boolean;
-  /** 校验项目是否已初始化（配置文件存在） */
-  projectConfig?: boolean;
-  /** 校验配置的主工作分支是否存在 */
-  branchExists?: boolean;
+  requireHead?: boolean;
+  /** 校验项目配置文件是否存在且合法 */
+  requireProjectConfig?: boolean;
+  /** 校验配置中的主工作分支在 git 仓库中是否存在 */
+  requireMainBranchExists?: boolean;
+  /** 确保当前在主工作分支上，不在则自动切换 */
+  ensureOnClawtMainWorkBranch?: boolean;
+  /** 校验主分支工作区和暂存区是否干净 */
+  requireCleanWorkingDir?: boolean;
+  /** 校验 Claude Code CLI 是否已安装 */
+  requireClaudeCode?: boolean;
 }
 
 /**
@@ -38,6 +45,7 @@ export function validateMainWorktree(): void {
 
 /**
  * 校验 Git 是否已安装
+ * @deprecated 当前无调用方，保留函数不删除
  * @throws {ClawtError} Git 未安装时抛出
  */
 export function validateGitInstalled(): void {
@@ -73,26 +81,55 @@ export function validateHeadExists(): void {
   }
 }
 
+/**
+ * 校验主分支工作区和暂存区是否干净
+ * 当存在未提交的更改时抛出错误，防止基于脏状态创建 worktree
+ * @throws {ClawtError} 工作区或暂存区不干净时抛出
+ */
+export function validateWorkingDirClean(): void {
+  if (!isWorkingDirClean()) {
+    throw new ClawtError(MESSAGES.MAIN_WORKTREE_DIRTY);
+  }
+}
+
 /**
  * 统一前置校验入口，按需执行各项校验
+ * 执行顺序：同步快速校验 → 异步交互校验 → 依赖前序结果的校验
  * @param {PreCheckOptions} options - 校验选项
- * @param {boolean} [options.mainWorktree] - 校验是否在主 worktree 根目录
- * @param {boolean} [options.headExists] - 校验 HEAD 是否存在
- * @param {boolean} [options.projectConfig] - 校验项目是否已初始化
- * @param {boolean} [options.branchExists] - 校验配置的主工作分支是否存在
+ * @param {boolean} [options.requireMainWorktree] - 校验当前目录是否在主 worktree 根目录
+ * @param {boolean} [options.requireHead] - 校验 HEAD 是否存在
+ * @param {boolean} [options.requireProjectConfig] - 校验项目配置文件是否存在且合法
+ * @param {boolean} [options.requireMainBranchExists] - 校验配置中的主工作分支在 git 仓库中是否存在
+ * @param {boolean} [options.ensureOnClawtMainWorkBranch] - 确保当前在主工作分支上，不在则自动切换
+ * @param {boolean} [options.requireCleanWorkingDir] - 校验主分支工作区和暂存区是否干净
+ * @param {boolean} [options.requireClaudeCode] - 校验 Claude Code CLI 是否已安装
  * @throws {ClawtError} 任一校验未通过时抛出
  */
-export function runPreChecks(options: PreCheckOptions): void {
-  if (options.mainWorktree) {
+export async function runPreChecks(options: PreCheckOptions): Promise<void> {
+  // 阶段 1：同步快速校验
+  if (options.requireMainWorktree) {
     validateMainWorktree();
   }
-  if (options.headExists) {
+  if (options.requireHead) {
     validateHeadExists();
   }
-  if (options.projectConfig) {
+  if (options.requireProjectConfig) {
     requireProjectConfig();
   }
-  if (options.branchExists) {
+  if (options.requireMainBranchExists) {
     guardMainWorkBranchExists();
   }
+
+  // 阶段 2：异步交互校验
+  if (options.ensureOnClawtMainWorkBranch) {
+    await ensureOnMainWorkBranch();
+  }
+
+  // 阶段 3：依赖前序结果的校验
+  if (options.requireCleanWorkingDir) {
+    validateWorkingDirClean();
+  }
+  if (options.requireClaudeCode) {
+    validateClaudeCodeInstalled();
+  }
 }

package/src/utils/worktree-matcher.ts

@@ -310,6 +310,21 @@ export function getWorktreeCreatedDate(dirPath: string): string | null {
   }
 }
 
+/**
+ * 获取 worktree 目录的创建时间（ISO 8601 格式）
+ * 通过文件系统的 birthtime 获取目录实际创建时间，保留小时/分钟级精度
+ * @param {string} dirPath - worktree 目录路径
+ * @returns {string | null} ISO 8601 格式的时间字符串，无法获取时返回 null
+ */
+export function getWorktreeCreatedTime(dirPath: string): string | null {
+  try {
+    const stat = statSync(dirPath);
+    return stat.birthtime.toISOString();
+  } catch {
+    return null;
+  }
+}
+
 /**
  * 将 YYYY-MM-DD 日期字符串格式化为中文相对日期描述
  * 基于自然日计算，适用于日期分组场景

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

@@ -15,13 +15,17 @@ vi.mock('../../../src/errors/index.js', () => ({
   },
 }));
 
-vi.mock('../../../src/constants/index.js', () => ({
-  MESSAGES: {
-    INVALID_COUNT: (val: string) => `数量必须为正整数: ${val}`,
-    WORKTREE_CREATED: (count: number) => `✓ 已创建 ${count} 个 worktree`,
-  },
-  EXIT_CODES: { SUCCESS: 0, ERROR: 1, ARGUMENT_ERROR: 2 },
-}));
+vi.mock('../../../src/constants/index.js', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../../../src/constants/index.js')>();
+  return {
+    ...actual,
+    MESSAGES: {
+      INVALID_COUNT: (val: string) => `数量必须为正整数: ${val}`,
+      WORKTREE_CREATED: (count: number) => `✓ 已创建 ${count} 个 worktree`,
+    },
+    EXIT_CODES: { SUCCESS: 0, ERROR: 1, ARGUMENT_ERROR: 2 },
+  };
+});
 
 vi.mock('../../../src/utils/index.js', () => ({
   runPreChecks: vi.fn(),

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

@@ -5,12 +5,16 @@ 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: {
-    NO_WORKTREES: '(无 worktree)',
-    WORKTREE_STATUS_UNAVAILABLE: '(状态不可用)',
-  },
-}));
+vi.mock('../../../src/constants/index.js', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../../../src/constants/index.js')>();
+  return {
+    ...actual,
+    MESSAGES: {
+      NO_WORKTREES: '(无 worktree)',
+      WORKTREE_STATUS_UNAVAILABLE: '(状态不可用)',
+    },
+  };
+});
 
 vi.mock('../../../src/utils/index.js', () => ({
   runPreChecks: vi.fn(),
@@ -49,20 +53,20 @@ describe('registerListCommand', () => {
 });
 
 describe('handleList', () => {
-  it('无 worktree 时文本输出', () => {
+  it('无 worktree 时文本输出', async () => {
     mockedGetProjectName.mockReturnValue('test-project');
     mockedGetProjectWorktrees.mockReturnValue([]);
 
     const program = new Command();
     program.exitOverride();
     registerListCommand(program);
-    program.parse(['list'], { from: 'user' });
+    await program.parseAsync(['list'], { from: 'user' });
 
     expect(mockedRunPreChecks).toHaveBeenCalled();
     expect(mockedPrintInfo).toHaveBeenCalled();
   });
 
-  it('有 worktree 时文本输出', () => {
+  it('有 worktree 时文本输出', async () => {
     mockedGetProjectName.mockReturnValue('test-project');
     mockedGetProjectWorktrees.mockReturnValue([
       { path: '/path/feature', branch: 'feature' },
@@ -74,12 +78,12 @@ describe('handleList', () => {
     const program = new Command();
     program.exitOverride();
     registerListCommand(program);
-    program.parse(['list'], { from: 'user' });
+    await program.parseAsync(['list'], { from: 'user' });
 
     expect(mockedGetWorktreeStatus).toHaveBeenCalled();
   });
 
-  it('--json 输出 JSON 格式', () => {
+  it('--json 输出 JSON 格式', async () => {
     mockedGetProjectName.mockReturnValue('test-project');
     mockedGetProjectWorktrees.mockReturnValue([
       { path: '/path/feature', branch: 'feature' },
@@ -89,7 +93,7 @@ describe('handleList', () => {
     const program = new Command();
     program.exitOverride();
     registerListCommand(program);
-    program.parse(['list', '--json'], { from: 'user' });
+    await program.parseAsync(['list', '--json'], { from: 'user' });
 
     // 应通过 console.log 输出 JSON
     const jsonCall = consoleSpy.mock.calls.find((call) => {
@@ -101,7 +105,7 @@ describe('handleList', () => {
     expect(parsed.total).toBe(1);
   });
 
-  it('worktree 状态不可用时显示提示', () => {
+  it('worktree 状态不可用时显示提示', async () => {
     mockedGetProjectName.mockReturnValue('test-project');
     mockedGetProjectWorktrees.mockReturnValue([
       { path: '/path/feature', branch: 'feature' },
@@ -111,7 +115,7 @@ describe('handleList', () => {
     const program = new Command();
     program.exitOverride();
     registerListCommand(program);
-    program.parse(['list'], { from: 'user' });
+    await program.parseAsync(['list'], { from: 'user' });
 
     expect(mockedGetWorktreeStatus).toHaveBeenCalled();
   });

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

@@ -15,29 +15,33 @@ vi.mock('../../../src/errors/index.js', () => ({
   },
 }));
 
-vi.mock('../../../src/constants/index.js', () => ({
-  MESSAGES: {
-    MERGE_NO_WORKTREES: '没有可用的 worktree',
-    MERGE_SELECT_BRANCH: '选择要合并的分支',
-    MERGE_MULTIPLE_MATCHES: (keyword: string) => `找到多个匹配 "${keyword}" 的分支`,
-    MERGE_NO_MATCH: (keyword: string, branches: string[]) => `未找到匹配 "${keyword}" 的分支`,
-    MERGE_SQUASH_PROMPT: '是否压缩提交？',
-    MERGE_SQUASH_COMMITTED: (branch: string) => `已压缩提交: ${branch}`,
-    MERGE_SQUASH_PENDING: (path: string, branch: string) => `请手动提交: ${path}`,
-    MERGE_VALIDATE_STATE_HINT: (branch: string) => `分支 ${branch} 存在 validate 状态`,
-    MAIN_WORKTREE_DIRTY: '主 worktree 有未提交的更改',
-    TARGET_WORKTREE_DIRTY_NO_MESSAGE: (worktreePath: string) =>
-      `${worktreePath} 有未提交修改，请提供 -m 参数`,
-    TARGET_WORKTREE_NO_CHANGES: '没有可合并的变更',
-    MERGE_CONFLICT: '合并冲突',
-    PULL_CONFLICT: 'pull 冲突',
-    PUSH_FAILED: 'push 失败',
-    MERGE_SUCCESS: (branch: string, message: string, autoPullPush: boolean) => `合并成功: ${branch}`,
-    MERGE_SUCCESS_NO_MESSAGE: (branch: string, autoPullPush: boolean) => `合并成功: ${branch}`,
-    WORKTREE_CLEANED: (branch: string) => `已清理: ${branch}`,
-  },
-  AUTO_SAVE_COMMIT_MESSAGE: 'clawt:auto-save',
-}));
+vi.mock('../../../src/constants/index.js', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../../../src/constants/index.js')>();
+  return {
+    ...actual,
+    MESSAGES: {
+      MERGE_NO_WORKTREES: '没有可用的 worktree',
+      MERGE_SELECT_BRANCH: '选择要合并的分支',
+      MERGE_MULTIPLE_MATCHES: (keyword: string) => `找到多个匹配 "${keyword}" 的分支`,
+      MERGE_NO_MATCH: (keyword: string, branches: string[]) => `未找到匹配 "${keyword}" 的分支`,
+      MERGE_SQUASH_PROMPT: '是否压缩提交？',
+      MERGE_SQUASH_COMMITTED: (branch: string) => `已压缩提交: ${branch}`,
+      MERGE_SQUASH_PENDING: (path: string, branch: string) => `请手动提交: ${path}`,
+      MERGE_VALIDATE_STATE_HINT: (branch: string) => `分支 ${branch} 存在 validate 状态`,
+      MAIN_WORKTREE_DIRTY: '主 worktree 有未提交的更改',
+      TARGET_WORKTREE_DIRTY_NO_MESSAGE: (worktreePath: string) =>
+        `${worktreePath} 有未提交修改，请提供 -m 参数`,
+      TARGET_WORKTREE_NO_CHANGES: '没有可合并的变更',
+      MERGE_CONFLICT: '合并冲突',
+      PULL_CONFLICT: 'pull 冲突',
+      PUSH_FAILED: 'push 失败',
+      MERGE_SUCCESS: (branch: string, message: string, autoPullPush: boolean) => `合并成功: ${branch}`,
+      MERGE_SUCCESS_NO_MESSAGE: (branch: string, autoPullPush: boolean) => `合并成功: ${branch}`,
+      WORKTREE_CLEANED: (branch: string) => `已清理: ${branch}`,
+    },
+    AUTO_SAVE_COMMIT_MESSAGE: 'clawt:auto-save',
+  };
+});
 
 vi.mock('../../../src/utils/index.js', () => ({
   runPreChecks: vi.fn(),

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

@@ -5,16 +5,20 @@ 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: {
-    RESUME_NO_WORKTREES: '没有可用的 worktree',
-    RESUME_SELECT_BRANCH: '选择要恢复的分支',
-    RESUME_MULTIPLE_MATCHES: (keyword: string) => `找到多个匹配 "${keyword}" 的分支`,
-    RESUME_NO_MATCH: (keyword: string, branches: string[]) => `未找到匹配 "${keyword}" 的分支`,
-    RESUME_ALL_CONFIRM: (count: number) => `确认恢复 ${count} 个分支？`,
-    RESUME_ALL_SUCCESS: (count: number) => `已恢复 ${count} 个分支`,
-  },
-}));
+vi.mock('../../../src/constants/index.js', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../../../src/constants/index.js')>();
+  return {
+    ...actual,
+    MESSAGES: {
+      RESUME_NO_WORKTREES: '没有可用的 worktree',
+      RESUME_SELECT_BRANCH: '选择要恢复的分支',
+      RESUME_MULTIPLE_MATCHES: (keyword: string) => `找到多个匹配 "${keyword}" 的分支`,
+      RESUME_NO_MATCH: (keyword: string, branches: string[]) => `未找到匹配 "${keyword}" 的分支`,
+      RESUME_ALL_CONFIRM: (count: number) => `确认恢复 ${count} 个分支？`,
+      RESUME_ALL_SUCCESS: (count: number) => `已恢复 ${count} 个分支`,
+    },
+  };
+});
 
 vi.mock('../../../src/utils/index.js', () => ({
   runPreChecks: vi.fn(),
@@ -91,7 +95,6 @@ describe('handleResume', () => {
     await program.parseAsync(['resume', '-b', 'feature'], { from: 'user' });
 
     expect(mockedRunPreChecks).toHaveBeenCalled();
-    expect(mockedValidateClaudeCodeInstalled).toHaveBeenCalled();
     expect(mockedResolveTargetWorktrees).toHaveBeenCalled();
     expect(mockedPromptGroupedMultiSelectBranches).not.toHaveBeenCalled();
     expect(mockedLaunchInteractiveClaude).toHaveBeenCalledWith(worktree, { autoContinue: true });