clawt 3.8.4 → 3.8.5

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 未安装 */
@@ -1735,15 +1737,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);
   }
 }
@@ -6044,7 +6042,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clawt",
-  "version": "3.8.4",
+  "version": "3.8.5",
   "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/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/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/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/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' });