clawt 2.12.0 → 2.12.1

package/README.md

@@ -19,22 +19,19 @@ npm i -g clawt
 ```bash
 # 1. 在项目根目录（包含 .git 的目录）下执行
 # 2. 并行执行 3 个任务，每个任务在独立的 worktree 中运行
-clawt run -b feature-auth \
-  --tasks "实现用户登录功能" \
-  --tasks "实现用户注册功能" \
-  --tasks "实现密码重置功能"
+clawt run -b <branch-1>
+clawt run -b <branch-2>
+clawt run -b <branch-3>
 
 # 3. 查看所有 worktree 状态
 clawt status
 
 # 4. 验证某个分支的变更（在主 worktree 中测试）
-clawt validate -b feature-auth-1
+clawt validate -b branch-1
 
 # 5. 确认无误后合并到主分支
-clawt merge -b feature-auth-1 -m "feat: 实现用户登录功能"
+clawt merge -b branch-1 -m "feat: 实现xxx功能"
 
-# 6. 清理不需要的 worktree
-clawt remove -b feature-auth
 ```
 
 ## 命令一览

package/dist/index.js

@@ -119,7 +119,7 @@ var MERGE_MESSAGES = {
   /** merge 后清理 worktree 和分支成功 */
   WORKTREE_CLEANED: (branch) => `\u2713 \u5DF2\u6E05\u7406 worktree \u548C\u5206\u652F: ${branch}`,
   /** 目标 worktree 有未提交修改但未指定 -m */
-  TARGET_WORKTREE_DIRTY_NO_MESSAGE: "\u76EE\u6807 worktree \u6709\u672A\u63D0\u4EA4\u7684\u4FEE\u6539\uFF0C\u8BF7\u901A\u8FC7 -m \u53C2\u6570\u63D0\u4F9B\u63D0\u4EA4\u4FE1\u606F",
+  TARGET_WORKTREE_DIRTY_NO_MESSAGE: (worktreePath) => `${worktreePath} \u6709\u672A\u63D0\u4EA4\u7684\u4FEE\u6539\uFF0C\u8BF7\u901A\u8FC7 -m \u53C2\u6570\u63D0\u4F9B\u63D0\u4EA4\u4FE1\u606F`,
   /** 目标 worktree 既干净又无本地提交 */
   TARGET_WORKTREE_NO_CHANGES: "\u76EE\u6807 worktree \u6CA1\u6709\u4EFB\u4F55\u53EF\u5408\u5E76\u7684\u53D8\u66F4\uFF08\u5DE5\u4F5C\u533A\u5E72\u51C0\u4E14\u65E0\u672C\u5730\u63D0\u4EA4\uFF09",
   /** merge 命令检测到 validate 状态的提示 */
@@ -2205,7 +2205,7 @@ async function handleMerge(options) {
   const targetClean = isWorkingDirClean(targetWorktreePath);
   if (!targetClean) {
     if (!options.message) {
-      throw new ClawtError(MESSAGES.TARGET_WORKTREE_DIRTY_NO_MESSAGE);
+      throw new ClawtError(MESSAGES.TARGET_WORKTREE_DIRTY_NO_MESSAGE(targetWorktreePath));
     }
     gitAddAll(targetWorktreePath);
     gitCommit(options.message, targetWorktreePath);

package/dist/postinstall.js

@@ -111,7 +111,7 @@ var MERGE_MESSAGES = {
   /** merge 后清理 worktree 和分支成功 */
   WORKTREE_CLEANED: (branch) => `\u2713 \u5DF2\u6E05\u7406 worktree \u548C\u5206\u652F: ${branch}`,
   /** 目标 worktree 有未提交修改但未指定 -m */
-  TARGET_WORKTREE_DIRTY_NO_MESSAGE: "\u76EE\u6807 worktree \u6709\u672A\u63D0\u4EA4\u7684\u4FEE\u6539\uFF0C\u8BF7\u901A\u8FC7 -m \u53C2\u6570\u63D0\u4F9B\u63D0\u4EA4\u4FE1\u606F",
+  TARGET_WORKTREE_DIRTY_NO_MESSAGE: (worktreePath) => `${worktreePath} \u6709\u672A\u63D0\u4EA4\u7684\u4FEE\u6539\uFF0C\u8BF7\u901A\u8FC7 -m \u53C2\u6570\u63D0\u4F9B\u63D0\u4EA4\u4FE1\u606F`,
   /** 目标 worktree 既干净又无本地提交 */
   TARGET_WORKTREE_NO_CHANGES: "\u76EE\u6807 worktree \u6CA1\u6709\u4EFB\u4F55\u53EF\u5408\u5E76\u7684\u53D8\u66F4\uFF08\u5DE5\u4F5C\u533A\u5E72\u51C0\u4E14\u65E0\u672C\u5730\u63D0\u4EA4\uFF09",
   /** merge 命令检测到 validate 状态的提示 */

package/docs/spec.md

@@ -751,7 +751,7 @@ clawt merge [-m <commitMessage>]
 5. **根据目标 worktree 状态决定是否需要提交**
    - 检测目标 worktree 工作区是否干净（`git status --porcelain`）
    - **工作区有未提交修改**：
-     - 如果用户未提供 `-m`，提示 `目标 worktree 有未提交的修改，请通过 -m 参数提供提交信息`，退出
+     - 如果用户未提供 `-m`，提示 `<worktreePath> 有未提交的修改，请通过 -m 参数提供提交信息`（其中 `<worktreePath>` 为目标 worktree 的完整路径），退出
      - 提供了 `-m` → 执行提交：
        ```bash
        cd ~/.clawt/worktrees/<project>/<branchName>

package/package.json

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

package/src/commands/merge.ts

@@ -165,7 +165,7 @@ async function handleMerge(options: MergeOptions): Promise<void> {
   if (!targetClean) {
     // 目标 worktree 有未提交修改，必须提供 -m
     if (!options.message) {
-      throw new ClawtError(MESSAGES.TARGET_WORKTREE_DIRTY_NO_MESSAGE);
+      throw new ClawtError(MESSAGES.TARGET_WORKTREE_DIRTY_NO_MESSAGE(targetWorktreePath));
     }
     gitAddAll(targetWorktreePath);
     gitCommit(options.message, targetWorktreePath);

package/src/constants/messages/merge.ts

@@ -11,7 +11,8 @@ export const MERGE_MESSAGES = {
   /** merge 后清理 worktree 和分支成功 */
   WORKTREE_CLEANED: (branch: string) => `✓ 已清理 worktree 和分支: ${branch}`,
   /** 目标 worktree 有未提交修改但未指定 -m */
-  TARGET_WORKTREE_DIRTY_NO_MESSAGE: '目标 worktree 有未提交的修改，请通过 -m 参数提供提交信息',
+  TARGET_WORKTREE_DIRTY_NO_MESSAGE: (worktreePath: string) =>
+    `${worktreePath} 有未提交的修改，请通过 -m 参数提供提交信息`,
   /** 目标 worktree 既干净又无本地提交 */
   TARGET_WORKTREE_NO_CHANGES: '目标 worktree 没有任何可合并的变更（工作区干净且无本地提交）',
   /** merge 命令检测到 validate 状态的提示 */

package/src/constants/messages.ts

@@ -45,7 +45,8 @@ export const MESSAGES = {
   /** 请提供提交信息 */
   COMMIT_MESSAGE_REQUIRED: '请提供提交信息（-m 参数）',
   /** 目标 worktree 有未提交修改但未指定 -m */
-  TARGET_WORKTREE_DIRTY_NO_MESSAGE: '目标 worktree 有未提交的修改，请通过 -m 参数提供提交信息',
+  TARGET_WORKTREE_DIRTY_NO_MESSAGE: (worktreePath: string) =>
+    `${worktreePath} 有未提交的修改，请通过 -m 参数提供提交信息`,
   /** 目标 worktree 既干净又无本地提交 */
   TARGET_WORKTREE_NO_CHANGES: '目标 worktree 没有任何可合并的变更（工作区干净且无本地提交）',
   /** 检测到用户中断 */

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

@@ -26,7 +26,8 @@ vi.mock('../../../src/constants/index.js', () => ({
     MERGE_SQUASH_PENDING: (path: string, branch: string) => `请手动提交: ${path}`,
     MERGE_VALIDATE_STATE_HINT: (branch: string) => `分支 ${branch} 存在 validate 状态`,
     MAIN_WORKTREE_DIRTY: '主 worktree 有未提交的更改',
-    TARGET_WORKTREE_DIRTY_NO_MESSAGE: '目标 worktree 有未提交修改，请提供 -m 参数',
+    TARGET_WORKTREE_DIRTY_NO_MESSAGE: (worktreePath: string) =>
+      `${worktreePath} 有未提交修改，请提供 -m 参数`,
     TARGET_WORKTREE_NO_CHANGES: '没有可合并的变更',
     MERGE_CONFLICT: '合并冲突',
     PULL_CONFLICT: 'pull 冲突',