clawt 1.4.0 → 2.0.0

package/README.md

@@ -168,11 +168,11 @@ clawt remove [options]
 # 移除当前项目下所有 worktree
 clawt remove --all
 
-# 移除指定分支名下的所有 worktree
+# 移除指定分支名下的所有 worktree（匹配 feature-scheme 和 feature-scheme-*）
 clawt remove -b feature-scheme
 
-# 移除指定分支名的某一个 worktree
-clawt remove -b feature-scheme -i 2
+# 移除单个 worktree（直接写完整分支名）
+clawt remove -b feature-scheme-2
 ```
 
 移除时会询问是否同时删除对应的本地分支。

package/dist/index.js

@@ -325,15 +325,9 @@ function parseShortStat(output) {
   }
   return { insertions, deletions };
 }
-function getDiffStat(branchName, worktreePath, cwd) {
-  const committedOutput = execCommand(`git diff --shortstat HEAD...${branchName}`, { cwd });
-  const committed = parseShortStat(committedOutput);
-  const uncommittedOutput = execCommand("git diff --shortstat HEAD", { cwd: worktreePath });
-  const uncommitted = parseShortStat(uncommittedOutput);
-  return {
-    insertions: committed.insertions + uncommitted.insertions,
-    deletions: committed.deletions + uncommitted.deletions
-  };
+function getDiffStat(worktreePath) {
+  const output = execCommand("git diff --shortstat HEAD", { cwd: worktreePath });
+  return parseShortStat(output);
 }
 function gitDiffCachedBinary(cwd) {
   logger.debug(`\u6267\u884C\u547D\u4EE4: git diff --cached --binary${cwd ? ` (cwd: ${cwd})` : ""}`);
@@ -545,7 +539,7 @@ function cleanupWorktrees(worktrees) {
 function getWorktreeStatus(worktree) {
   try {
     const commitCount = getCommitCountAhead(worktree.branch);
-    const { insertions, deletions } = getDiffStat(worktree.branch, worktree.path);
+    const { insertions, deletions } = getDiffStat(worktree.path);
     const hasDirtyFiles = !isWorkingDirClean(worktree.path);
     return { commitCount, insertions, deletions, hasDirtyFiles };
   } catch (error) {
@@ -718,14 +712,12 @@ function handleCreate(options) {
 }
 
 // src/commands/remove.ts
-import { join as join4 } from "path";
 function registerRemoveCommand(program2) {
-  program2.command("remove").description("\u79FB\u9664 worktree\uFF08\u652F\u6301\u5355\u4E2A/\u6279\u91CF/\u5168\u90E8\uFF09").option("--all", "\u79FB\u9664\u5F53\u524D\u9879\u76EE\u4E0B\u6240\u6709 worktree").option("-b, --branch <branchName>", "\u6307\u5B9A\u5206\u652F\u540D").option("-i, --index <index>", "\u6307\u5B9A\u7D22\u5F15\uFF08\u914D\u5408 -b \u4F7F\u7528\uFF09").action(async (options) => {
+  program2.command("remove").description("\u79FB\u9664 worktree\uFF08\u652F\u6301\u5355\u4E2A/\u6279\u91CF/\u5168\u90E8\uFF09").option("--all", "\u79FB\u9664\u5F53\u524D\u9879\u76EE\u4E0B\u6240\u6709 worktree").option("-b, --branch <branchName>", "\u6307\u5B9A\u5206\u652F\u540D\uFF08\u5B8C\u6574\u5206\u652F\u540D\u7CBE\u786E\u5339\u914D\uFF09").action(async (options) => {
     await handleRemove(options);
   });
 }
 function resolveWorktreesToRemove(options) {
-  const projectDir = getProjectWorktreeDir();
   const allWorktrees = getProjectWorktrees();
   if (options.all) {
     return allWorktrees;
@@ -733,15 +725,6 @@ function resolveWorktreesToRemove(options) {
   if (!options.branch) {
     throw new ClawtError("\u8BF7\u6307\u5B9A --all \u6216 -b <branchName> \u53C2\u6570");
   }
-  if (options.index !== void 0) {
-    const targetName = `${options.branch}-${options.index}`;
-    const targetPath = join4(projectDir, targetName);
-    const found = allWorktrees.find((wt) => wt.path === targetPath);
-    if (!found) {
-      throw new ClawtError(MESSAGES.WORKTREE_NOT_FOUND(targetName));
-    }
-    return [found];
-  }
   const matched = allWorktrees.filter(
     (wt) => wt.branch === options.branch || wt.branch.startsWith(`${options.branch}-`)
   );
@@ -975,7 +958,7 @@ async function handleResume(options) {
 }
 
 // src/commands/validate.ts
-import { join as join5 } from "path";
+import { join as join4 } from "path";
 import { existsSync as existsSync6 } from "fs";
 import Enquirer2 from "enquirer";
 function registerValidateCommand(program2) {
@@ -1096,7 +1079,7 @@ async function handleValidate(options) {
   const projectName = getProjectName();
   const mainWorktreePath = getGitTopLevel();
   const projectDir = getProjectWorktreeDir();
-  const targetWorktreePath = join5(projectDir, options.branch);
+  const targetWorktreePath = join4(projectDir, options.branch);
   logger.info(`validate \u547D\u4EE4\u6267\u884C\uFF0C\u5206\u652F: ${options.branch}`);
   if (!existsSync6(targetWorktreePath)) {
     throw new ClawtError(MESSAGES.WORKTREE_NOT_FOUND(options.branch));
@@ -1131,7 +1114,7 @@ async function handleValidate(options) {
 }
 
 // src/commands/merge.ts
-import { join as join6 } from "path";
+import { join as join5 } from "path";
 import { existsSync as existsSync7 } from "fs";
 function registerMergeCommand(program2) {
   program2.command("merge").description("\u5408\u5E76\u67D0\u4E2A\u5DF2\u9A8C\u8BC1\u7684 worktree \u5206\u652F\u5230\u4E3B worktree").requiredOption("-b, --branch <branchName>", "\u8981\u5408\u5E76\u7684\u5206\u652F\u540D").option("-m, --message <message>", "\u63D0\u4EA4\u4FE1\u606F\uFF08\u5DE5\u4F5C\u533A\u6709\u4FEE\u6539\u65F6\u5FC5\u586B\uFF09").action(async (options) => {
@@ -1154,7 +1137,7 @@ async function handleMerge(options) {
   validateMainWorktree();
   const mainWorktreePath = getGitTopLevel();
   const projectDir = getProjectWorktreeDir();
-  const targetWorktreePath = join6(projectDir, options.branch);
+  const targetWorktreePath = join5(projectDir, options.branch);
   logger.info(`merge \u547D\u4EE4\u6267\u884C\uFF0C\u5206\u652F: ${options.branch}\uFF0C\u63D0\u4EA4\u4FE1\u606F: ${options.message ?? "(\u672A\u63D0\u4F9B)"}`);
   if (!existsSync7(targetWorktreePath)) {
     throw new ClawtError(MESSAGES.WORKTREE_NOT_FOUND(options.branch));

package/docs/spec.md

@@ -522,8 +522,7 @@ clawt remove [options]
 | 参数      | 说明                                                       |
 | --------- | ---------------------------------------------------------- |
 | `--all`   | 移除当前项目 (`~/.clawt/worktrees/<project>/`) 下所有 worktree |
-| `-b <branchName>` | 移除指定 branchName 下的所有 worktree               |
-| `-b <branchName> -i <index>` | 移除指定 branchName 的某一个 worktree (如 `branchName-2`) |
+| `-b <branchName>` | 移除匹配 branchName 或 branchName-* 的 worktree      |
 
 **三种移除粒度：**
 
@@ -531,7 +530,7 @@ clawt remove [options]
 | ---- | ---------------------------------------- | ------------------------------------------------------------- |
 | 全部 | `clawt remove --all`                     | `~/.clawt/worktrees/<project>/` 下所有 worktree                |
 | 分支 | `clawt remove -b feature-scheme`         | `~/.clawt/worktrees/<project>/feature-scheme-*` 的所有 worktree |
-| 单个 | `clawt remove -b feature-scheme -i 2`    | 仅移除 `~/.clawt/worktrees/<project>/feature-scheme-2`          |
+| 单个 | `clawt remove -b feature-scheme-2`       | 仅移除 `feature-scheme-2` 对应的 worktree（完整分支名精确匹配）    |
 
 **运行流程：**
 

package/package.json

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

package/src/commands/remove.ts

@@ -1,6 +1,4 @@
 import type { Command } from 'commander';
-import { join } from 'node:path';
-import { existsSync, readdirSync } from 'node:fs';
 import { logger } from '../logger/index.js';
 import { ClawtError } from '../errors/index.js';
 import { MESSAGES } from '../constants/index.js';
@@ -29,8 +27,7 @@ export function registerRemoveCommand(program: Command): void {
     .command('remove')
     .description('移除 worktree（支持单个/批量/全部）')
     .option('--all', '移除当前项目下所有 worktree')
-    .option('-b, --branch <branchName>', '指定分支名')
-    .option('-i, --index <index>', '指定索引（配合 -b 使用）')
+    .option('-b, --branch <branchName>', '指定分支名（完整分支名精确匹配）')
     .action(async (options: RemoveOptions) => {
       await handleRemove(options);
     });
@@ -42,7 +39,6 @@ export function registerRemoveCommand(program: Command): void {
  * @returns {Array<{path: string, branch: string}>} 待移除的 worktree 列表
  */
 function resolveWorktreesToRemove(options: RemoveOptions): Array<{ path: string; branch: string }> {
-  const projectDir = getProjectWorktreeDir();
   const allWorktrees = getProjectWorktrees();
 
   if (options.all) {
@@ -53,23 +49,12 @@ function resolveWorktreesToRemove(options: RemoveOptions): Array<{ path: string;
     throw new ClawtError('请指定 --all 或 -b <branchName> 参数');
   }
 
-  if (options.index !== undefined) {
-    // 单个移除：branchName-<index>
-    const targetName = `${options.branch}-${options.index}`;
-    const targetPath = join(projectDir, targetName);
-    const found = allWorktrees.find((wt) => wt.path === targetPath);
-    if (!found) {
-      throw new ClawtError(MESSAGES.WORKTREE_NOT_FOUND(targetName));
-    }
-    return [found];
-  }
-
   // 分支级移除：匹配 branchName 或 branchName-*
   const matched = allWorktrees.filter(
     (wt) => wt.branch === options.branch || wt.branch.startsWith(`${options.branch}-`),
   );
   if (matched.length === 0) {
-    throw new ClawtError(MESSAGES.WORKTREE_NOT_FOUND(options.branch!));
+    throw new ClawtError(MESSAGES.WORKTREE_NOT_FOUND(options.branch));
   }
   return matched;
 }

package/src/types/command.ts

@@ -36,8 +36,6 @@ export interface RemoveOptions {
   all?: boolean;
   /** 分支名 */
   branch?: string;
-  /** 指定索引 */
-  index?: number;
 }
 
 /** resume 命令选项 */

package/src/types/worktree.ts

@@ -10,9 +10,9 @@ export interface WorktreeInfo {
 export interface WorktreeStatus {
   /** 相对于主分支的新增提交数 */
   commitCount: number;
-  /** 新增行数 */
+  /** 工作区和暂存区的新增行数 */
   insertions: number;
-  /** 删除行数 */
+  /** 工作区和暂存区的删除行数 */
   deletions: number;
   /** 工作区是否有未提交修改 */
   hasDirtyFiles: boolean;

package/src/utils/git.ts

@@ -286,25 +286,14 @@ function parseShortStat(output: string): { insertions: number; deletions: number
 }
 
 /**
- * 获取目标分支的变更统计（已提交 + 未提交）
- * @param {string} branchName - 目标分支名
+ * 获取 worktree 中工作区和暂存区的变更统计
  * @param {string} worktreePath - worktree 目录路径
- * @param {string} [cwd] - 执行 git diff HEAD...branch 的工作目录
- * @returns {{ insertions: number; deletions: number }} 聚合后的新增和删除行数
- */
-export function getDiffStat(branchName: string, worktreePath: string, cwd?: string): { insertions: number; deletions: number } {
-  // 已提交的变更（当前分支与目标分支的差异）
-  const committedOutput = execCommand(`git diff --shortstat HEAD...${branchName}`, { cwd });
-  const committed = parseShortStat(committedOutput);
-
-  // 未提交的变更（在 worktree 内执行）
-  const uncommittedOutput = execCommand('git diff --shortstat HEAD', { cwd: worktreePath });
-  const uncommitted = parseShortStat(uncommittedOutput);
-
-  return {
-    insertions: committed.insertions + uncommitted.insertions,
-    deletions: committed.deletions + uncommitted.deletions,
-  };
+ * @returns {{ insertions: number; deletions: number }} 新增和删除行数
+ */
+export function getDiffStat(worktreePath: string): { insertions: number; deletions: number } {
+  // 工作区和暂存区相对于 HEAD 的变更
+  const output = execCommand('git diff --shortstat HEAD', { cwd: worktreePath });
+  return parseShortStat(output);
 }
 
 /**

package/src/utils/worktree.ts

@@ -115,7 +115,7 @@ export function cleanupWorktrees(worktrees: WorktreeInfo[]): void {
 export function getWorktreeStatus(worktree: WorktreeInfo): WorktreeStatus | null {
   try {
     const commitCount = getCommitCountAhead(worktree.branch);
-    const { insertions, deletions } = getDiffStat(worktree.branch, worktree.path);
+    const { insertions, deletions } = getDiffStat(worktree.path);
     const hasDirtyFiles = !isWorkingDirClean(worktree.path);
 
     return { commitCount, insertions, deletions, hasDirtyFiles };