clawt 3.2.0 → 3.2.1

package/dist/index.js

@@ -299,7 +299,11 @@ ${failures.map((f) => `  \u2717 ${f.path}: ${f.error}`).join("\n")}`,
   /** 用户选择保留本地分支 */
   REMOVE_BRANCHES_KEPT: "\u5DF2\u4FDD\u7559\u672C\u5730\u5206\u652F\uFF0C\u53EF\u7A0D\u540E\u4F7F\u7528 git branch -D <\u5206\u652F\u540D> \u624B\u52A8\u5220\u9664",
   /** 确认删除本地分支和验证分支 */
-  REMOVE_CONFIRM_DELETE_BRANCHES: "\u662F\u5426\u540C\u65F6\u5220\u9664\u5BF9\u5E94\u7684\u672C\u5730\u5206\u652F\u548C\u9A8C\u8BC1\u5206\u652F\uFF1F"
+  REMOVE_CONFIRM_DELETE_BRANCHES: "\u662F\u5426\u540C\u65F6\u5220\u9664\u5BF9\u5E94\u7684\u672C\u5730\u5206\u652F\u548C\u9A8C\u8BC1\u5206\u652F\uFF1F",
+  /** 待移除的 worktree 的分支是主 worktree 当前所在分支 */
+  REMOVE_BRANCH_IS_CURRENT: (branch) => `\u65E0\u6CD5\u79FB\u9664\uFF1A\u5206\u652F ${branch} \u662F\u4E3B worktree \u5F53\u524D\u6240\u5728\u5206\u652F\uFF0C\u8BF7\u5148\u5207\u6362\u5230\u5176\u4ED6\u5206\u652F\u540E\u518D\u79FB\u9664`,
+  /** 待移除的 worktree 对应的验证分支是主 worktree 当前所在分支 */
+  REMOVE_VALIDATE_BRANCH_IS_CURRENT: (branch, validateBranch) => `\u65E0\u6CD5\u79FB\u9664\uFF1A\u5206\u652F ${branch} \u7684\u9A8C\u8BC1\u5206\u652F ${validateBranch} \u662F\u4E3B worktree \u5F53\u524D\u6240\u5728\u5206\u652F\uFF0C\u8BF7\u5148\u5207\u6362\u5230\u5176\u4ED6\u5206\u652F\u540E\u518D\u79FB\u9664`
 };
 
 // src/constants/messages/reset.ts
@@ -3811,6 +3815,16 @@ async function handleRemove(options) {
     printInfo(MESSAGES.NO_WORKTREES);
     return;
   }
+  const currentBranch = getCurrentBranch();
+  for (const wt of worktreesToRemove) {
+    if (wt.branch === currentBranch) {
+      throw new ClawtError(MESSAGES.REMOVE_BRANCH_IS_CURRENT(wt.branch));
+    }
+    const validateBranch = getValidateBranchName(wt.branch);
+    if (validateBranch === currentBranch) {
+      throw new ClawtError(MESSAGES.REMOVE_VALIDATE_BRANCH_IS_CURRENT(wt.branch, validateBranch));
+    }
+  }
   printInfo("\u5373\u5C06\u79FB\u9664\u4EE5\u4E0B worktree \u53CA\u672C\u5730\u5206\u652F\uFF1A\n");
   worktreesToRemove.forEach((wt, index) => {
     printInfo(`  ${index + 1}. ${wt.path}  \u2192  \u5206\u652F: ${wt.branch}  \u9A8C\u8BC1\u5206\u652F: ${getValidateBranchName(wt.branch)}`);

package/dist/postinstall.js

@@ -290,7 +290,11 @@ ${failures.map((f) => `  \u2717 ${f.path}: ${f.error}`).join("\n")}`,
   /** 用户选择保留本地分支 */
   REMOVE_BRANCHES_KEPT: "\u5DF2\u4FDD\u7559\u672C\u5730\u5206\u652F\uFF0C\u53EF\u7A0D\u540E\u4F7F\u7528 git branch -D <\u5206\u652F\u540D> \u624B\u52A8\u5220\u9664",
   /** 确认删除本地分支和验证分支 */
-  REMOVE_CONFIRM_DELETE_BRANCHES: "\u662F\u5426\u540C\u65F6\u5220\u9664\u5BF9\u5E94\u7684\u672C\u5730\u5206\u652F\u548C\u9A8C\u8BC1\u5206\u652F\uFF1F"
+  REMOVE_CONFIRM_DELETE_BRANCHES: "\u662F\u5426\u540C\u65F6\u5220\u9664\u5BF9\u5E94\u7684\u672C\u5730\u5206\u652F\u548C\u9A8C\u8BC1\u5206\u652F\uFF1F",
+  /** 待移除的 worktree 的分支是主 worktree 当前所在分支 */
+  REMOVE_BRANCH_IS_CURRENT: (branch) => `\u65E0\u6CD5\u79FB\u9664\uFF1A\u5206\u652F ${branch} \u662F\u4E3B worktree \u5F53\u524D\u6240\u5728\u5206\u652F\uFF0C\u8BF7\u5148\u5207\u6362\u5230\u5176\u4ED6\u5206\u652F\u540E\u518D\u79FB\u9664`,
+  /** 待移除的 worktree 对应的验证分支是主 worktree 当前所在分支 */
+  REMOVE_VALIDATE_BRANCH_IS_CURRENT: (branch, validateBranch) => `\u65E0\u6CD5\u79FB\u9664\uFF1A\u5206\u652F ${branch} \u7684\u9A8C\u8BC1\u5206\u652F ${validateBranch} \u662F\u4E3B worktree \u5F53\u524D\u6240\u5728\u5206\u652F\uFF0C\u8BF7\u5148\u5207\u6362\u5230\u5176\u4ED6\u5206\u652F\u540E\u518D\u79FB\u9664`
 };
 
 // src/constants/messages/reset.ts

package/package.json

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

package/src/commands/remove.ts

@@ -24,6 +24,7 @@ import {
   getValidateBranchName,
   deleteValidateBranch,
   requireProjectConfig,
+  getCurrentBranch,
 } from '../utils/index.js';
 import type { WorktreeMultiResolveMessages } from '../utils/index.js';
 
@@ -77,6 +78,18 @@ async function handleRemove(options: RemoveOptions): Promise<void> {
     return;
   }
 
+  // 检查待移除的分支是否是主 worktree 当前所在分支
+  const currentBranch = getCurrentBranch();
+  for (const wt of worktreesToRemove) {
+    if (wt.branch === currentBranch) {
+      throw new ClawtError(MESSAGES.REMOVE_BRANCH_IS_CURRENT(wt.branch));
+    }
+    const validateBranch = getValidateBranchName(wt.branch);
+    if (validateBranch === currentBranch) {
+      throw new ClawtError(MESSAGES.REMOVE_VALIDATE_BRANCH_IS_CURRENT(wt.branch, validateBranch));
+    }
+  }
+
   // 列出即将移除的 worktree
   printInfo('即将移除以下 worktree 及本地分支：\n');
   worktreesToRemove.forEach((wt, index) => {

package/src/constants/messages/remove.ts

@@ -16,4 +16,10 @@ export const REMOVE_MESSAGES = {
   REMOVE_BRANCHES_KEPT: '已保留本地分支，可稍后使用 git branch -D <分支名> 手动删除',
   /** 确认删除本地分支和验证分支 */
   REMOVE_CONFIRM_DELETE_BRANCHES: '是否同时删除对应的本地分支和验证分支？',
+  /** 待移除的 worktree 的分支是主 worktree 当前所在分支 */
+  REMOVE_BRANCH_IS_CURRENT: (branch: string) =>
+    `无法移除：分支 ${branch} 是主 worktree 当前所在分支，请先切换到其他分支后再移除`,
+  /** 待移除的 worktree 对应的验证分支是主 worktree 当前所在分支 */
+  REMOVE_VALIDATE_BRANCH_IS_CURRENT: (branch: string, validateBranch: string) =>
+    `无法移除：分支 ${branch} 的验证分支 ${validateBranch} 是主 worktree 当前所在分支，请先切换到其他分支后再移除`,
 } as const;

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

@@ -25,6 +25,10 @@ vi.mock('../../../src/constants/index.js', () => ({
     REMOVE_MULTIPLE_MATCHES: (name: string) => `"${name}" 匹配到多个分支`,
     REMOVE_NO_MATCH: (name: string, branches: string[]) => `未找到与 "${name}" 匹配的分支，可用：${branches.join(', ')}`,
     REMOVE_BRANCHES_KEPT: '已保留本地分支，可稍后使用 git branch -D <分支名> 手动删除',
+    REMOVE_BRANCH_IS_CURRENT: (branch: string) =>
+      `无法移除：分支 ${branch} 是主 worktree 当前所在分支，请先切换到其他分支后再移除`,
+    REMOVE_VALIDATE_BRANCH_IS_CURRENT: (branch: string, validateBranch: string) =>
+      `无法移除：分支 ${branch} 的验证分支 ${validateBranch} 是主 worktree 当前所在分支，请先切换到其他分支后再移除`,
   },
 }));
 
@@ -49,6 +53,7 @@ vi.mock('../../../src/utils/index.js', () => ({
   requireProjectConfig: vi.fn().mockReturnValue({ clawtMainWorkBranch: 'main' }),
   getValidateBranchName: vi.fn((name: string) => `clawt-validate-${name}`),
   deleteValidateBranch: vi.fn(),
+  getCurrentBranch: vi.fn(),
 }));
 
 import { registerRemoveCommand } from '../../../src/commands/remove.js';
@@ -66,6 +71,7 @@ import {
   printError,
   printHint,
   resolveTargetWorktrees,
+  getCurrentBranch,
 } from '../../../src/utils/index.js';
 
 const mockedGetProjectName = vi.mocked(getProjectName);
@@ -80,6 +86,7 @@ const mockedPrintSuccess = vi.mocked(printSuccess);
 const mockedPrintError = vi.mocked(printError);
 const mockedPrintHint = vi.mocked(printHint);
 const mockedResolveTargetWorktrees = vi.mocked(resolveTargetWorktrees);
+const mockedGetCurrentBranch = vi.mocked(getCurrentBranch);
 
 beforeEach(() => {
   vi.mocked(validateMainWorktree).mockReset();
@@ -95,6 +102,8 @@ beforeEach(() => {
   mockedPrintError.mockReset();
   mockedPrintHint.mockReset();
   mockedResolveTargetWorktrees.mockReset();
+  mockedGetCurrentBranch.mockReset();
+  mockedGetCurrentBranch.mockReturnValue('main');
 });
 
 describe('registerRemoveCommand', () => {