clawt 3.1.0 → 3.1.1

package/dist/index.js

@@ -3631,6 +3631,7 @@ function registerRemoveCommand(program2) {
 }
 async function handleRemove(options) {
   validateMainWorktree();
+  requireProjectConfig();
   const projectName = getProjectName();
   logger.info(`remove \u547D\u4EE4\u6267\u884C\uFF0C\u9879\u76EE: ${projectName}`);
   const allWorktrees = getProjectWorktrees();
@@ -3660,7 +3661,6 @@ async function handleRemove(options) {
   const failures = [];
   for (const wt of worktreesToRemove) {
     try {
-      await ensureOnMainWorkBranch();
       removeWorktreeByPath(wt.path);
       if (shouldDeleteBranch) {
         deleteBranch(wt.branch);
@@ -3893,7 +3893,6 @@ async function executeSyncForBranch(targetWorktreePath, branch) {
 async function handleSync(options) {
   validateMainWorktree();
   requireProjectConfig();
-  await ensureOnMainWorkBranch();
   logger.info(`sync \u547D\u4EE4\u6267\u884C\uFF0C\u5206\u652F: ${options.branch ?? "(\u672A\u6307\u5B9A)"}`);
   const worktrees = getProjectWorktrees();
   const worktree = await resolveTargetWorktree(worktrees, SYNC_RESOLVE_MESSAGES, options.branch);

package/docs/spec.md

@@ -328,7 +328,7 @@ export const PROJECTS_CONFIG_DIR = join(CLAWT_HOME, 'projects');
    ✗ 该项目尚未初始化，请先执行 clawt init -b<branchName>设置主工作分支
    ```
    其他命令（list、resume、config、status、alias、projects、completion）不受影响，无需添加该校验。
-   > **实现细节**：`ensureOnMainWorkBranch()` 内部已通过 `getMainWorkBranch()` → `requireProjectConfig()` 完成了项目配置校验，因此调用了 `ensureOnMainWorkBranch` 的命令（create、run、validate、sync、remove、merge）**无需再显式调用 `requireProjectConfig()`**，避免重复校验。仅 reset 命令因不调用 `ensureOnMainWorkBranch`，需要自行调用 `requireProjectConfig()`。
+   > **实现细节**：`ensureOnMainWorkBranch()` 内部已通过 `getMainWorkBranch()` → `requireProjectConfig()` 完成了项目配置校验，因此调用了 `ensureOnMainWorkBranch` 的命令（create、run、validate、merge）**无需再显式调用 `requireProjectConfig()`**，避免重复校验。sync 和 remove 命令因不依赖主 worktree 的分支状态而不调用 `ensureOnMainWorkBranch`，需自行显式调用 `requireProjectConfig()`。reset 命令同理，也需自行调用 `requireProjectConfig()`。
 3. **主分支名统一从项目级配置获取**：所有需要获取主分支名的场景（sync 中合并主分支、merge 中计算 merge-base、切回主分支等），统一使用项目级配置中的 `clawtMainWorkBranch`，不再通过 `getCurrentBranch(mainWorktreePath)` 动态获取。因为在新架构下，主 worktree 可能处于验证分支上，`getCurrentBranch` 会返回验证分支名而非真正的主工作分支名。
 4. **测试文件全量更新**：本次重构涉及的所有命令（init、create、run、validate、sync、remove、merge、reset），其对应的测试文件必须同步更新，确保覆盖新增的验证分支逻辑、项目级配置逻辑和变更后的流程。
 

package/package.json

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

package/src/commands/remove.ts

@@ -23,7 +23,7 @@ import {
   resolveTargetWorktrees,
   getValidateBranchName,
   deleteValidateBranch,
-  ensureOnMainWorkBranch,
+  requireProjectConfig,
 } from '../utils/index.js';
 import type { WorktreeMultiResolveMessages } from '../utils/index.js';
 
@@ -56,6 +56,7 @@ export function registerRemoveCommand(program: Command): void {
  */
 async function handleRemove(options: RemoveOptions): Promise<void> {
   validateMainWorktree();
+  requireProjectConfig();
 
   const projectName = getProjectName();
   logger.info(`remove 命令执行，项目: ${projectName}`);
@@ -98,8 +99,6 @@ async function handleRemove(options: RemoveOptions): Promise<void> {
   const failures: Array<{ path: string; error: string }> = [];
   for (const wt of worktreesToRemove) {
     try {
-      // 确保当前在主工作分支上
-      await ensureOnMainWorkBranch();
       removeWorktreeByPath(wt.path);
       if (shouldDeleteBranch) {
         deleteBranch(wt.branch);

package/src/commands/sync.ts

@@ -23,7 +23,6 @@ import {
   getMainWorkBranch,
   rebuildValidateBranch,
   getValidateBranchName,
-  ensureOnMainWorkBranch,
 } from '../utils/index.js';
 import type { WorktreeResolveMessages } from '../utils/index.js';
 
@@ -140,7 +139,6 @@ export async function executeSyncForBranch(targetWorktreePath: string, branch: s
 async function handleSync(options: SyncOptions): Promise<void> {
   validateMainWorktree();
   requireProjectConfig();
-  await ensureOnMainWorkBranch();
 
   logger.info(`sync 命令执行，分支: ${options.branch ?? '(未指定)'}`);
 

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

@@ -49,7 +49,6 @@ vi.mock('../../../src/utils/index.js', () => ({
   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/sync.test.ts

@@ -51,7 +51,6 @@ vi.mock('../../../src/utils/index.js', () => ({
   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';