clawt 3.8.4 → 3.8.6

package/dist/index.js

@@ -26,6 +26,8 @@ var VALIDATE_BRANCH_PREFIX = "clawt-validate-";
 var COMMON_MESSAGES = {
   /** 不在主 worktree 根目录 */
   NOT_MAIN_WORKTREE: "\u8BF7\u5728\u4E3B worktree \u7684\u6839\u76EE\u5F55\u4E0B\u6267\u884C clawt",
+  /** 不在 git 仓库中 */
+  NOT_GIT_REPO: "\u5F53\u524D\u76EE\u5F55\u4E0D\u662F git \u4ED3\u5E93\uFF0C\u8BF7\u5148\u6267\u884C git init \u5E76\u63D0\u4EA4\u540E\uFF0C\u518D\u6267\u884C clawt init \u521D\u59CB\u5316\u9879\u76EE",
   /** Git 未安装 */
   GIT_NOT_INSTALLED: "Git \u672A\u5B89\u88C5\u6216\u4E0D\u5728 PATH \u4E2D\uFF0C\u8BF7\u5148\u5B89\u88C5 Git",
   /** Claude Code CLI 未安装 */
@@ -794,7 +796,7 @@ var PROJECT_DEFAULT_CONFIG = deriveDefaultConfig2(PROJECT_CONFIG_DEFINITIONS);
 var PROJECT_CONFIG_DESCRIPTIONS = deriveConfigDescriptions2(PROJECT_CONFIG_DEFINITIONS);
 
 // src/constants/git.ts
-var AUTO_SAVE_COMMIT_MESSAGE = "chore: auto-save before sync";
+var AUTO_SAVE_COMMIT_MESSAGE_PREFIX = "clawt: auto-save before merging";
 var EXEC_MAX_BUFFER = 200 * 1024 * 1024;
 
 // src/constants/logger.ts
@@ -1288,6 +1290,9 @@ function gitAddFiles(files, cwd) {
 function gitMergeContinue(cwd) {
   execCommand("GIT_EDITOR=true git merge --continue", { cwd });
 }
+function buildAutoSaveCommitMessage(mainBranch, branch) {
+  return `${AUTO_SAVE_COMMIT_MESSAGE_PREFIX} ${mainBranch} into ${branch}`;
+}
 
 // src/utils/git-branch.ts
 function checkBranchExists(branchName, cwd) {
@@ -1735,15 +1740,11 @@ async function ensureOnMainWorkBranch(cwd) {
 
 // src/utils/validation.ts
 function validateMainWorktree() {
-  try {
-    const gitCommonDir = getGitCommonDir();
-    if (gitCommonDir !== ".git") {
-      throw new ClawtError(MESSAGES.NOT_MAIN_WORKTREE);
-    }
-  } catch (error) {
-    if (error instanceof ClawtError) {
-      throw error;
-    }
+  if (!isInsideGitRepo()) {
+    throw new ClawtError(MESSAGES.NOT_GIT_REPO);
+  }
+  const gitCommonDir = getGitCommonDir();
+  if (gitCommonDir !== ".git") {
     throw new ClawtError(MESSAGES.NOT_MAIN_WORKTREE);
   }
 }
@@ -4814,9 +4815,9 @@ var SYNC_RESOLVE_MESSAGES = {
   multipleMatches: MESSAGES.SYNC_MULTIPLE_MATCHES,
   noMatch: MESSAGES.SYNC_NO_MATCH
 };
-function autoSaveChanges(worktreePath, branch) {
+function autoSaveChanges(worktreePath, branch, mainBranch) {
   gitAddAll(worktreePath);
-  gitCommit(AUTO_SAVE_COMMIT_MESSAGE, worktreePath);
+  gitCommit(buildAutoSaveCommitMessage(mainBranch, branch), worktreePath);
   printInfo(MESSAGES.SYNC_AUTO_COMMITTED(branch));
   logger.info(`\u5DF2\u81EA\u52A8\u4FDD\u5B58 ${branch} \u5206\u652F\u7684\u672A\u63D0\u4EA4\u53D8\u66F4`);
 }
@@ -4835,7 +4836,7 @@ async function executeSyncForBranch(targetWorktreePath, branch) {
   const mainWorktreePath = getGitTopLevel();
   const mainBranch = getMainWorkBranch();
   if (!isWorkingDirClean(targetWorktreePath)) {
-    autoSaveChanges(targetWorktreePath, branch);
+    autoSaveChanges(targetWorktreePath, branch, mainBranch);
   }
   printInfo(MESSAGES.SYNC_MERGING(branch, mainBranch));
   const hasConflict = mergeMainBranch(targetWorktreePath, mainBranch);
@@ -5085,7 +5086,7 @@ function commitSquash(message, worktreePath, branchName) {
   printSuccess(MESSAGES.MERGE_SQUASH_COMMITTED(branchName));
 }
 async function handleSquashIfNeeded(targetWorktreePath, mainWorktreePath, branchName, commitMessage) {
-  if (!hasCommitWithMessage(branchName, AUTO_SAVE_COMMIT_MESSAGE, mainWorktreePath)) {
+  if (!hasCommitWithMessage(branchName, AUTO_SAVE_COMMIT_MESSAGE_PREFIX, mainWorktreePath)) {
     return false;
   }
   const shouldSquash = await confirmAction(MESSAGES.MERGE_SQUASH_PROMPT, false);
@@ -6044,7 +6045,7 @@ function registerHomeCommand(program2) {
 }
 async function handleHome() {
   if (!isInsideGitRepo()) {
-    printError(MESSAGES.NOT_MAIN_WORKTREE);
+    printError(MESSAGES.NOT_GIT_REPO);
     return;
   }
   if (!isMainWorktree()) {

package/dist/postinstall.js

@@ -17,6 +17,8 @@ var PROJECTS_CONFIG_DIR = join(CLAWT_HOME, "projects");
 var COMMON_MESSAGES = {
   /** 不在主 worktree 根目录 */
   NOT_MAIN_WORKTREE: "\u8BF7\u5728\u4E3B worktree \u7684\u6839\u76EE\u5F55\u4E0B\u6267\u884C clawt",
+  /** 不在 git 仓库中 */
+  NOT_GIT_REPO: "\u5F53\u524D\u76EE\u5F55\u4E0D\u662F git \u4ED3\u5E93\uFF0C\u8BF7\u5148\u6267\u884C git init \u5E76\u63D0\u4EA4\u540E\uFF0C\u518D\u6267\u884C clawt init \u521D\u59CB\u5316\u9879\u76EE",
   /** Git 未安装 */
   GIT_NOT_INSTALLED: "Git \u672A\u5B89\u88C5\u6216\u4E0D\u5728 PATH \u4E2D\uFF0C\u8BF7\u5148\u5B89\u88C5 Git",
   /** Claude Code CLI 未安装 */

package/docs/merge.md

@@ -42,7 +42,7 @@ clawt merge [-m <commitMessage>]
      - 提示 `主 worktree 有未提交的更改，请先处理`，退出
    - 无更改 → 继续
 6. **Squash 检测与执行（auto-save 临时提交压缩）**
-   - 通过 `git log HEAD..<branchName> --format=%s` 检查目标分支是否存在以 `AUTO_SAVE_COMMIT_MESSAGE`（`chore: auto-save before sync`）为前缀的 commit
+   - 通过 `git log HEAD..<branchName> --format=%s` 检查目标分支是否存在以 `AUTO_SAVE_COMMIT_MESSAGE_PREFIX`（`clawt: auto-save before merging`）为前缀的 commit
    - **不存在** → 跳过，进入步骤 7
    - **存在** → 提示用户是否将所有提交压缩为一个：
      ```

package/docs/sync.md

@@ -61,7 +61,7 @@ export interface SyncResult {
 
 1. **获取主 worktree 路径和主分支名**：通过 `getGitTopLevel()` 获取主 worktree 路径（后续传给 `rebuildValidateBranch`），通过项目级配置 `clawtMainWorkBranch` 获取主工作分支名（不再通过 `getCurrentBranch` 动态获取，因为在新架构下主 worktree 可能处于验证分支上）
 2. **自动保存未提交变更**：检查目标 worktree 是否有未提交修改
-   - 有修改 → 自动执行 `git add . && git commit -m "<AUTO_SAVE_COMMIT_MESSAGE>"` 保存变更（commit message 由常量 `AUTO_SAVE_COMMIT_MESSAGE` 定义，值为 `chore: auto-save before sync`，同时用于 merge 命令的 squash 检测）
+   - 有修改 → 自动执行 `git add . && git commit -m "<message>"` 保存变更（commit message 由 `buildAutoSaveCommitMessage(mainBranch, branch)` 函数动态生成，格式为 `clawt: auto-save before merging {mainBranch} into {branch}`，前缀部分由常量 `AUTO_SAVE_COMMIT_MESSAGE_PREFIX` 定义，值为 `clawt: auto-save before merging`，同时用于 merge 命令的 squash 检测）
    - 无修改 → 跳过
 3. **在目标 worktree 中合并主分支**：
    ```bash

package/package.json

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

package/src/commands/home.ts

@@ -37,7 +37,7 @@ export function registerHomeCommand(program: Command): void {
 async function handleHome(): Promise<void> {
   // 场景 1：不在 git 仓库中，直接报错
   if (!isInsideGitRepo()) {
-    printError(MESSAGES.NOT_MAIN_WORKTREE);
+    printError(MESSAGES.NOT_GIT_REPO);
     return;
   }
 

package/src/commands/merge.ts

@@ -1,7 +1,7 @@
 import type { Command } from 'commander';
 import { logger } from '../logger/index.js';
 import { ClawtError } from '../errors/index.js';
-import { MESSAGES, AUTO_SAVE_COMMIT_MESSAGE } from '../constants/index.js';
+import { MESSAGES, AUTO_SAVE_COMMIT_MESSAGE_PREFIX } from '../constants/index.js';
 import type { MergeOptions } from '../types/index.js';
 import { PRE_CHECK_MERGE } from '../constants/index.js';
 import {
@@ -92,7 +92,7 @@ async function handleSquashIfNeeded(
   commitMessage?: string,
 ): Promise<boolean> {
   // 检查目标分支是否存在 auto-save commit
-  if (!hasCommitWithMessage(branchName, AUTO_SAVE_COMMIT_MESSAGE, mainWorktreePath)) {
+  if (!hasCommitWithMessage(branchName, AUTO_SAVE_COMMIT_MESSAGE_PREFIX, mainWorktreePath)) {
     return false;
   }
 

package/src/commands/sync.ts

@@ -1,7 +1,7 @@
 import type { Command } from 'commander';
 import { logger } from '../logger/index.js';
 import { ClawtError } from '../errors/index.js';
-import { MESSAGES, AUTO_SAVE_COMMIT_MESSAGE } from '../constants/index.js';
+import { MESSAGES } from '../constants/index.js';
 import type { SyncOptions } from '../types/index.js';
 import { PRE_CHECK_SYNC } from '../constants/index.js';
 import {
@@ -20,6 +20,7 @@ import {
   getMainWorkBranch,
   rebuildValidateBranch,
   getValidateBranchName,
+  buildAutoSaveCommitMessage,
 } from '../utils/index.js';
 import type { WorktreeResolveMessages } from '../utils/index.js';
 
@@ -49,10 +50,11 @@ const SYNC_RESOLVE_MESSAGES: WorktreeResolveMessages = {
  * 自动保存目标 worktree 中的未提交变更
  * @param {string} worktreePath - 目标 worktree 路径
  * @param {string} branch - 分支名
+ * @param {string} mainBranch - 主分支名
  */
-function autoSaveChanges(worktreePath: string, branch: string): void {
+function autoSaveChanges(worktreePath: string, branch: string, mainBranch: string): void {
   gitAddAll(worktreePath);
-  gitCommit(AUTO_SAVE_COMMIT_MESSAGE, worktreePath);
+  gitCommit(buildAutoSaveCommitMessage(mainBranch, branch), worktreePath);
   printInfo(MESSAGES.SYNC_AUTO_COMMITTED(branch));
   logger.info(`已自动保存 ${branch} 分支的未提交变更`);
 }
@@ -99,7 +101,7 @@ export async function executeSyncForBranch(targetWorktreePath: string, branch: s
 
   // 检查目标 worktree 是否有未提交变更，有则自动保存
   if (!isWorkingDirClean(targetWorktreePath)) {
-    autoSaveChanges(targetWorktreePath, branch);
+    autoSaveChanges(targetWorktreePath, branch, mainBranch);
   }
 
   // 在目标 worktree 中合并主分支

package/src/constants/git.ts

@@ -1,5 +1,5 @@
 /** sync 自动保存的 commit message 前缀，用于检测 auto-save 提交 */
-export const AUTO_SAVE_COMMIT_MESSAGE = 'chore: auto-save before sync';
+export const AUTO_SAVE_COMMIT_MESSAGE_PREFIX = 'clawt: auto-save before merging';
 
 /** execSync 最大缓冲区大小（200MB），防止大分支 diff 时触发 ENOBUFS 错误 */
 export const EXEC_MAX_BUFFER = 200 * 1024 * 1024;

package/src/constants/index.ts

@@ -7,7 +7,7 @@ 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, APPEND_SYSTEM_PROMPT } from './config.js';
 export { PROJECT_CONFIG_DEFINITIONS, PROJECT_DEFAULT_CONFIG, PROJECT_CONFIG_DESCRIPTIONS } from './project-config.js';
-export { AUTO_SAVE_COMMIT_MESSAGE } from './git.js';
+export { AUTO_SAVE_COMMIT_MESSAGE_PREFIX } from './git.js';
 export { DEBUG_LOG_PREFIX, DEBUG_TIMESTAMP_FORMAT } from './logger.js';
 export { UPDATE_CHECK_INTERVAL_MS, NPM_REGISTRY_URL, NPM_REGISTRY_TIMEOUT_MS, PACKAGE_NAME } from './update.js';
 export {

package/src/constants/messages/common.ts

@@ -2,6 +2,8 @@
 export const COMMON_MESSAGES = {
   /** 不在主 worktree 根目录 */
   NOT_MAIN_WORKTREE: '请在主 worktree 的根目录下执行 clawt',
+  /** 不在 git 仓库中 */
+  NOT_GIT_REPO: '当前目录不是 git 仓库，请先执行 git init 并提交后，再执行 clawt init 初始化项目',
   /** Git 未安装 */
   GIT_NOT_INSTALLED: 'Git 未安装或不在 PATH 中，请先安装 Git',
   /** Claude Code CLI 未安装 */

package/src/utils/git-core.ts

@@ -2,7 +2,7 @@ import { basename } from 'node:path';
 import { execSync, execFileSync } from 'node:child_process';
 import { execCommand, execCommandWithInput } from './shell.js';
 import { logger } from '../logger/index.js';
-import { EXEC_MAX_BUFFER } from '../constants/git.js';
+import { EXEC_MAX_BUFFER, AUTO_SAVE_COMMIT_MESSAGE_PREFIX } from '../constants/git.js';
 
 /**
  * 获取 git common dir（用于判断是否为主 worktree）
@@ -459,3 +459,13 @@ export function gitMergeContinue(cwd?: string): void {
 export function gitMergeAbort(cwd?: string): void {
   execCommand('git merge --abort', { cwd });
 }
+
+/**
+ * 生成完整的 auto-save commit message
+ * @param {string} mainBranch - 主分支名（被合并的源分支）
+ * @param {string} branch - 目标分支名（合并到的分支）
+ * @returns {string} 完整的 commit message
+ */
+export function buildAutoSaveCommitMessage(mainBranch: string, branch: string): string {
+  return `${AUTO_SAVE_COMMIT_MESSAGE_PREFIX} ${mainBranch} into ${branch}`;
+}

package/src/utils/index.ts

@@ -56,6 +56,7 @@ export {
   gitAddFiles,
   gitMergeContinue,
   gitMergeAbort,
+  buildAutoSaveCommitMessage,
 } from './git.js';
 export { sanitizeBranchName, generateBranchNames, validateBranchesNotExist } from './branch.js';
 export { validateMainWorktree, validateGitInstalled, validateClaudeCodeInstalled, validateHeadExists, validateWorkingDirClean, runPreChecks } from './validation.js';

package/src/utils/validation.ts

@@ -1,7 +1,7 @@
 import { MESSAGES } from '../constants/index.js';
 import { ClawtError } from '../errors/index.js';
 import { execCommand } from './shell.js';
-import { getGitCommonDir, isWorkingDirClean } from './git.js';
+import { getGitCommonDir, isInsideGitRepo, isWorkingDirClean } from './git.js';
 import { requireProjectConfig, guardMainWorkBranchExists } from './project-config.js';
 import { ensureOnMainWorkBranch } from './validate-branch.js';
 
@@ -25,20 +25,18 @@ export interface PreCheckOptions {
 
 /**
  * 校验当前目录是否为主 worktree 的根目录
- * 条件：git rev-parse --git-common-dir === ".git"
- * @throws {ClawtError} 不在主 worktree 根目录时抛出（包括不在 git 仓库中的情况）
+ * 先判断是否在 git 仓库中，再判断是否为主 worktree
+ * @throws {ClawtError} 不在 git 仓库时抛出 NOT_GIT_REPO
+ * @throws {ClawtError} 不在主 worktree 根目录时抛出 NOT_MAIN_WORKTREE
  */
 export function validateMainWorktree(): void {
-  try {
-    const gitCommonDir = getGitCommonDir();
-    if (gitCommonDir !== '.git') {
-      throw new ClawtError(MESSAGES.NOT_MAIN_WORKTREE);
-    }
-  } catch (error) {
-    if (error instanceof ClawtError) {
-      throw error;
-    }
-    // git 命令执行失败，可能不在 git 仓库中
+  // 先检查是否在 git 仓库中
+  if (!isInsideGitRepo()) {
+    throw new ClawtError(MESSAGES.NOT_GIT_REPO);
+  }
+  // 再检查是否在主 worktree 根目录
+  const gitCommonDir = getGitCommonDir();
+  if (gitCommonDir !== '.git') {
     throw new ClawtError(MESSAGES.NOT_MAIN_WORKTREE);
   }
 }

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

@@ -41,7 +41,7 @@ vi.mock('../../../src/constants/index.js', async (importOriginal) => {
       MERGE_SUCCESS_NO_MESSAGE: (branch: string, autoPullPush: boolean) => `合并成功: ${branch}`,
       WORKTREE_CLEANED: (branch: string) => `已清理: ${branch}`,
     },
-    AUTO_SAVE_COMMIT_MESSAGE: 'clawt:auto-save',
+    AUTO_SAVE_COMMIT_MESSAGE_PREFIX: 'clawt: auto-save before merging',
   };
 });
 

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

@@ -30,7 +30,7 @@ vi.mock('../../../src/constants/index.js', async (importOriginal) => {
       SYNC_SUCCESS: (branch: string, mainBranch: string) => `✓ 已将 ${mainBranch} 同步到 ${branch}`,
       SYNC_VALIDATE_BRANCH_REBUILT: (validateBranch: string) => `验证分支 ${validateBranch} 已重建`,
     },
-    AUTO_SAVE_COMMIT_MESSAGE: 'clawt:auto-save',
+    AUTO_SAVE_COMMIT_MESSAGE_PREFIX: 'clawt: auto-save before merging',
   };
 });
 
@@ -54,6 +54,8 @@ vi.mock('../../../src/utils/index.js', () => ({
   getValidateBranchName: vi.fn((name: string) => `clawt-validate-${name}`),
   guardMainWorkBranch: vi.fn().mockResolvedValue(undefined),
   guardMainWorkBranchExists: vi.fn(),
+  buildAutoSaveCommitMessage: (mainBranch: string, branch: string) =>
+    `clawt: auto-save before merging ${mainBranch} into ${branch}`,
 }));
 
 import { registerSyncCommand } from '../../../src/commands/sync.js';
@@ -135,7 +137,10 @@ describe('handleSync', () => {
     await program.parseAsync(['sync', '-b', 'feature'], { from: 'user' });
 
     expect(mockedGitAddAll).toHaveBeenCalledWith('/path/feature');
-    expect(mockedGitCommit).toHaveBeenCalledWith('clawt:auto-save', '/path/feature');
+    expect(mockedGitCommit).toHaveBeenCalledWith(
+      'clawt: auto-save before merging main into feature',
+      '/path/feature',
+    );
     expect(mockedGitMerge).toHaveBeenCalled();
   });
 

package/tests/unit/constants/git.test.ts

@@ -1,17 +1,17 @@
 import { describe, it, expect } from 'vitest';
-import { AUTO_SAVE_COMMIT_MESSAGE } from '../../../src/constants/git.js';
+import { AUTO_SAVE_COMMIT_MESSAGE_PREFIX } from '../../../src/constants/git.js';
 
-describe('AUTO_SAVE_COMMIT_MESSAGE', () => {
-  it('值为预期的 commit message', () => {
-    expect(AUTO_SAVE_COMMIT_MESSAGE).toBe('chore: auto-save before sync');
+describe('AUTO_SAVE_COMMIT_MESSAGE_PREFIX', () => {
+  it('值为预期的前缀', () => {
+    expect(AUTO_SAVE_COMMIT_MESSAGE_PREFIX).toBe('clawt: auto-save before merging');
   });
 
   it('是非空字符串', () => {
-    expect(typeof AUTO_SAVE_COMMIT_MESSAGE).toBe('string');
-    expect(AUTO_SAVE_COMMIT_MESSAGE.length).toBeGreaterThan(0);
+    expect(typeof AUTO_SAVE_COMMIT_MESSAGE_PREFIX).toBe('string');
+    expect(AUTO_SAVE_COMMIT_MESSAGE_PREFIX.length).toBeGreaterThan(0);
   });
 
   it('符合 conventional commit 格式', () => {
-    expect(AUTO_SAVE_COMMIT_MESSAGE).toMatch(/^[a-z]+:\s.+$/);
+    expect(AUTO_SAVE_COMMIT_MESSAGE_PREFIX).toMatch(/^[a-z]+:\s.+$/);
   });
 });

package/tests/unit/constants/messages.test.ts

@@ -5,6 +5,7 @@ describe('MESSAGES', () => {
   describe('纯字符串消息', () => {
     const stringKeys = [
       'NOT_MAIN_WORKTREE',
+      'NOT_GIT_REPO',
       'GIT_NOT_INSTALLED',
       'CLAUDE_NOT_INSTALLED',
       'NO_WORKTREES',

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

@@ -64,6 +64,7 @@ import {
   gitDiffTree,
   gitApplyCachedCheck,
   getBranchCreatedAt,
+  buildAutoSaveCommitMessage,
 } from '../../../src/utils/git.js';
 
 const mockedExecCommand = vi.mocked(execCommand);
@@ -610,3 +611,20 @@ describe('getBranchCreatedAt', () => {
     );
   });
 });
+
+describe('buildAutoSaveCommitMessage', () => {
+  it('生成包含分支信息的完整 commit message', () => {
+    const result = buildAutoSaveCommitMessage('main', 'feature/login');
+    expect(result).toBe('clawt: auto-save before merging main into feature/login');
+  });
+
+  it('生成的 message 以前缀常量开头', () => {
+    const result = buildAutoSaveCommitMessage('main', 'feat-xyz');
+    expect(result.startsWith('clawt: auto-save before merging')).toBe(true);
+  });
+
+  it('符合 conventional commit 格式', () => {
+    const result = buildAutoSaveCommitMessage('develop', 'hotfix');
+    expect(result).toMatch(/^[a-z]+:\s.+$/);
+  });
+});

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

@@ -5,9 +5,10 @@ vi.mock('../../../src/utils/shell.js', () => ({
   execCommand: vi.fn(),
 }));
 
-// mock git（validateMainWorktree 依赖 getGitCommonDir）
+// mock git（validateMainWorktree 依赖 getGitCommonDir 和 isInsideGitRepo）
 vi.mock('../../../src/utils/git.js', () => ({
   getGitCommonDir: vi.fn(),
+  isInsideGitRepo: vi.fn(),
 }));
 
 // mock project-config（runPreChecks 依赖 requireProjectConfig 和 guardMainWorkBranchExists）
@@ -22,30 +23,35 @@ vi.mock('../../../src/logger/index.js', () => ({
 }));
 
 import { execCommand } from '../../../src/utils/shell.js';
-import { getGitCommonDir } from '../../../src/utils/git.js';
+import { getGitCommonDir, isInsideGitRepo } from '../../../src/utils/git.js';
 import { validateMainWorktree, validateGitInstalled, validateClaudeCodeInstalled, validateHeadExists, runPreChecks } from '../../../src/utils/validation.js';
 import { requireProjectConfig, guardMainWorkBranchExists } from '../../../src/utils/project-config.js';
 import { ClawtError } from '../../../src/errors/index.js';
 
 const mockedExecCommand = vi.mocked(execCommand);
 const mockedGetGitCommonDir = vi.mocked(getGitCommonDir);
+const mockedIsInsideGitRepo = vi.mocked(isInsideGitRepo);
 const mockedRequireProjectConfig = vi.mocked(requireProjectConfig);
 const mockedGuardMainWorkBranchExists = vi.mocked(guardMainWorkBranchExists);
 
 describe('validateMainWorktree', () => {
-  it('.git 返回时正常通过', () => {
+  it('在主 worktree 根目录时正常通过', () => {
+    mockedIsInsideGitRepo.mockReturnValue(true);
     mockedGetGitCommonDir.mockReturnValue('.git');
     expect(() => validateMainWorktree()).not.toThrow();
   });
 
-  it('非 .git 时抛出 ClawtError', () => {
+  it('在子 worktree 中时抛出 NOT_MAIN_WORKTREE 错误', () => {
+    mockedIsInsideGitRepo.mockReturnValue(true);
     mockedGetGitCommonDir.mockReturnValue('/path/to/.git');
     expect(() => validateMainWorktree()).toThrow(ClawtError);
+    expect(() => validateMainWorktree()).toThrow('请在主 worktree 的根目录下执行 clawt');
   });
 
-  it('命令失败时抛出 ClawtError', () => {
-    mockedGetGitCommonDir.mockImplementation(() => { throw new Error('not a git repo'); });
+  it('不在 git 仓库中时抛出 NOT_GIT_REPO 错误', () => {
+    mockedIsInsideGitRepo.mockReturnValue(false);
     expect(() => validateMainWorktree()).toThrow(ClawtError);
+    expect(() => validateMainWorktree()).toThrow('当前目录不是 git 仓库');
   });
 });
 
@@ -87,6 +93,7 @@ describe('validateHeadExists', () => {
 
 describe('runPreChecks', () => {
   it('按选项组合调用对应校验', () => {
+    mockedIsInsideGitRepo.mockReturnValue(true);
     mockedGetGitCommonDir.mockReturnValue('.git');
     mockedExecCommand.mockReturnValue('abc1234');
     mockedRequireProjectConfig.mockReturnValue({ clawtMainWorkBranch: 'main' });