clawt 2.3.7 → 2.3.9

package/dist/index.js

@@ -100,7 +100,8 @@ var MESSAGES = {
   /** sync 冲突 */
   SYNC_CONFLICT: (worktreePath) => `\u5408\u5E76\u5B58\u5728\u51B2\u7A81\uFF0C\u8BF7\u8FDB\u5165\u76EE\u6807 worktree \u624B\u52A8\u89E3\u51B3\uFF1A
   cd ${worktreePath}
-  \u89E3\u51B3\u51B2\u7A81\u540E\u6267\u884C git add . && git merge --continue`,
+  \u89E3\u51B3\u51B2\u7A81\u540E\u6267\u884C git add . && git merge --continue
+  clawt validate -b <branch> \u9A8C\u8BC1\u53D8\u66F4`,
   /** validate patch apply 失败，提示用户同步主分支 */
   VALIDATE_PATCH_APPLY_FAILED: (branch) => `\u53D8\u66F4\u8FC1\u79FB\u5931\u8D25\uFF1A\u76EE\u6807\u5206\u652F\u4E0E\u4E3B\u5206\u652F\u5DEE\u5F02\u8FC7\u5927
   \u8BF7\u5148\u6267\u884C clawt sync -b ${branch} \u540C\u6B65\u4E3B\u5206\u652F\u540E\u91CD\u8BD5`,
@@ -666,6 +667,21 @@ function removeSnapshot(projectName, branchName) {
     logger.info(`\u5DF2\u5220\u9664 validate \u5FEB\u7167: ${snapshotPath}`);
   }
 }
+function removeProjectSnapshots(projectName) {
+  const projectDir = join3(VALIDATE_SNAPSHOTS_DIR, projectName);
+  if (!existsSync5(projectDir)) {
+    return;
+  }
+  const files = readdirSync3(projectDir);
+  for (const file of files) {
+    unlinkSync(join3(projectDir, file));
+  }
+  try {
+    rmdirSync2(projectDir);
+  } catch {
+  }
+  logger.info(`\u5DF2\u5220\u9664\u9879\u76EE ${projectName} \u7684\u6240\u6709 validate \u5FEB\u7167`);
+}
 
 // src/commands/list.ts
 import chalk2 from "chalk";
@@ -773,6 +789,7 @@ async function handleRemove(options) {
       if (shouldDeleteBranch) {
         deleteBranch(wt.branch);
       }
+      removeSnapshot(projectName, wt.branch);
       printSuccess(MESSAGES.WORKTREE_REMOVED(wt.path));
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
@@ -780,6 +797,9 @@ async function handleRemove(options) {
       failures.push({ path: wt.path, error: errorMessage });
     }
   }
+  if (options.all) {
+    removeProjectSnapshots(projectName);
+  }
   gitWorktreePrune();
   const projectDir = getProjectWorktreeDir();
   removeEmptyDir(projectDir);
@@ -959,8 +979,8 @@ async function handleRun(options) {
 
 // src/commands/resume.ts
 function registerResumeCommand(program2) {
-  program2.command("resume").description("\u5728\u5DF2\u6709 worktree \u4E2D\u6062\u590D Claude Code \u4EA4\u4E92\u5F0F\u4F1A\u8BDD").requiredOption("-b, --branch <branchName>", "\u8981\u6062\u590D\u7684\u5206\u652F\u540D").action(async (options) => {
-    await handleResume(options);
+  program2.command("resume").description("\u5728\u5DF2\u6709 worktree \u4E2D\u6062\u590D Claude Code \u4EA4\u4E92\u5F0F\u4F1A\u8BDD").requiredOption("-b, --branch <branchName>", "\u8981\u6062\u590D\u7684\u5206\u652F\u540D").action((options) => {
+    handleResume(options);
   });
 }
 function findWorktreeByBranch(branchName) {
@@ -971,7 +991,7 @@ function findWorktreeByBranch(branchName) {
   }
   return matched;
 }
-async function handleResume(options) {
+function handleResume(options) {
   validateMainWorktree();
   validateClaudeCodeInstalled();
   logger.info(`resume \u547D\u4EE4\u6267\u884C\uFF0C\u5206\u652F: ${options.branch}`);

package/package.json

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

package/src/commands/remove.ts

@@ -17,6 +17,8 @@ import {
   printSuccess,
   printError,
   confirmAction,
+  removeSnapshot,
+  removeProjectSnapshots,
 } from '../utils/index.js';
 
 /**
@@ -100,6 +102,8 @@ async function handleRemove(options: RemoveOptions): Promise<void> {
       if (shouldDeleteBranch) {
         deleteBranch(wt.branch);
       }
+      // 清理该分支对应的 validate 快照
+      removeSnapshot(projectName, wt.branch);
       printSuccess(MESSAGES.WORKTREE_REMOVED(wt.path));
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
@@ -108,6 +112,11 @@ async function handleRemove(options: RemoveOptions): Promise<void> {
     }
   }
 
+  // --all 模式下清理整个项目的 validate 快照目录
+  if (options.all) {
+    removeProjectSnapshots(projectName);
+  }
+
   // 清理 worktree 并清除空目录
   gitWorktreePrune();
   const projectDir = getProjectWorktreeDir();

package/src/commands/resume.ts

@@ -19,8 +19,8 @@ export function registerResumeCommand(program: Command): void {
     .command('resume')
     .description('在已有 worktree 中恢复 Claude Code 交互式会话')
     .requiredOption('-b, --branch <branchName>', '要恢复的分支名')
-    .action(async (options: ResumeOptions) => {
-      await handleResume(options);
+    .action((options: ResumeOptions) => {
+      handleResume(options);
     });
 }
 
@@ -46,7 +46,7 @@ function findWorktreeByBranch(branchName: string): WorktreeInfo {
  * 查找已有 worktree 并恢复 Claude Code 会话
  * @param {ResumeOptions} options - 命令选项
  */
-async function handleResume(options: ResumeOptions): Promise<void> {
+function handleResume(options: ResumeOptions): void {
   validateMainWorktree();
   validateClaudeCodeInstalled();
 

package/src/commands/run.ts

@@ -46,7 +46,7 @@ interface ClaudeTaskHandle {
 }
 
 /**
- * 在指定 worktree 中执行 Claude Code 任务
+ * 在指定 worktree 中执行 Claude Code 任务，由于是--output-format json形式，所以这里固定claude code cli的启动命令
  * @param {WorktreeInfo} worktree - worktree 信息
  * @param {string} task - 任务描述
  * @returns {ClaudeTaskHandle} 包含子进程引用和结果 Promise

package/src/constants/messages.ts

@@ -86,7 +86,7 @@ export const MESSAGES = {
     `✓ 已将 ${mainBranch} 的最新代码同步到 ${targetBranch}`,
   /** sync 冲突 */
   SYNC_CONFLICT: (worktreePath: string) =>
-    `合并存在冲突，请进入目标 worktree 手动解决：\n  cd ${worktreePath}\n  解决冲突后执行 git add . && git merge --continue`,
+    `合并存在冲突，请进入目标 worktree 手动解决：\n  cd ${worktreePath}\n  解决冲突后执行 git add . && git merge --continue\n  clawt validate -b <branch> 验证变更`,
   /** validate patch apply 失败，提示用户同步主分支 */
   VALIDATE_PATCH_APPLY_FAILED: (branch: string) =>
     `变更迁移失败：目标分支与主分支差异过大\n  请先执行 clawt sync -b ${branch} 同步主分支后重试`,