clawt 2.3.8 → 2.4.0

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`,
@@ -113,6 +114,8 @@ var MESSAGES = {
   \u8BF7\u5728\u76EE\u6807 worktree \u4E2D\u63D0\u4EA4\u540E\u91CD\u65B0\u6267\u884C merge\uFF1A
   cd ${worktreePath}
   \u63D0\u4EA4\u5B8C\u6210\u540E\u6267\u884C\uFF1Aclawt merge -b ${branch}`,
+  /** 用户取消破坏性操作 */
+  DESTRUCTIVE_OP_CANCELLED: "\u5DF2\u53D6\u6D88\u64CD\u4F5C",
   /** reset 成功 */
   RESET_SUCCESS: "\u2713 \u4E3B worktree \u5DE5\u4F5C\u533A\u548C\u6682\u5B58\u533A\u5DF2\u91CD\u7F6E",
   /** reset 时工作区和暂存区已干净 */
@@ -146,6 +149,10 @@ var CONFIG_DEFINITIONS = {
   autoPullPush: {
     defaultValue: false,
     description: "merge \u6210\u529F\u540E\u662F\u5426\u81EA\u52A8\u6267\u884C git pull \u548C git push"
+  },
+  confirmDestructiveOps: {
+    defaultValue: true,
+    description: "\u6267\u884C\u7834\u574F\u6027\u64CD\u4F5C\uFF08reset\u3001validate --clean\uFF09\u524D\u662F\u5426\u63D0\u793A\u786E\u8BA4"
   }
 };
 function deriveDefaultConfig(definitions) {
@@ -420,6 +427,10 @@ function confirmAction(question) {
     });
   });
 }
+function confirmDestructiveAction(dangerousCommand, description) {
+  printWarning(`\u5373\u5C06\u6267\u884C ${chalk.red.bold(dangerousCommand)}\uFF0C${description}`);
+  return confirmAction("\u662F\u5426\u7EE7\u7EED\uFF1F");
+}
 function formatWorktreeStatus(status) {
   const parts = [];
   parts.push(chalk.yellow(`${status.commitCount} \u4E2A\u63D0\u4EA4`));
@@ -666,6 +677,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 +799,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 +807,9 @@ async function handleRemove(options) {
       failures.push({ path: wt.path, error: errorMessage });
     }
   }
+  if (options.all) {
+    removeProjectSnapshots(projectName);
+  }
   gitWorktreePrune();
   const projectDir = getProjectWorktreeDir();
   removeEmptyDir(projectDir);
@@ -1062,11 +1092,21 @@ function saveCurrentSnapshotTree(mainWorktreePath, projectName, branchName) {
   writeSnapshot(projectName, branchName, treeHash);
   return treeHash;
 }
-function handleValidateClean(options) {
+async function handleValidateClean(options) {
   validateMainWorktree();
   const projectName = getProjectName();
   const mainWorktreePath = getGitTopLevel();
   logger.info(`validate --clean \u6267\u884C\uFF0C\u5206\u652F: ${options.branch}`);
+  if (getConfigValue("confirmDestructiveOps")) {
+    const confirmed = await confirmDestructiveAction(
+      "git reset --hard + git clean -fd",
+      `\u91CD\u7F6E\u4E3B worktree \u5E76\u5220\u9664\u5206\u652F ${options.branch} \u7684 validate \u5FEB\u7167`
+    );
+    if (!confirmed) {
+      printInfo(MESSAGES.DESTRUCTIVE_OP_CANCELLED);
+      return;
+    }
+  }
   if (!isWorkingDirClean(mainWorktreePath)) {
     gitResetHard(mainWorktreePath);
     gitCleanForce(mainWorktreePath);
@@ -1099,7 +1139,7 @@ function handleIncrementalValidate(targetWorktreePath, mainWorktreePath, project
 }
 async function handleValidate(options) {
   if (options.clean) {
-    handleValidateClean(options);
+    await handleValidateClean(options);
     return;
   }
   validateMainWorktree();
@@ -1324,15 +1364,25 @@ async function handleSync(options) {
 
 // src/commands/reset.ts
 function registerResetCommand(program2) {
-  program2.command("reset").description("\u91CD\u7F6E\u4E3B worktree \u5DE5\u4F5C\u533A\u548C\u6682\u5B58\u533A\uFF08\u4FDD\u7559 validate \u5FEB\u7167\uFF09").action(() => {
-    handleReset();
+  program2.command("reset").description("\u91CD\u7F6E\u4E3B worktree \u5DE5\u4F5C\u533A\u548C\u6682\u5B58\u533A\uFF08\u4FDD\u7559 validate \u5FEB\u7167\uFF09").action(async () => {
+    await handleReset();
   });
 }
-function handleReset() {
+async function handleReset() {
   validateMainWorktree();
   const mainWorktreePath = getGitTopLevel();
   logger.info("reset \u547D\u4EE4\u6267\u884C");
   if (!isWorkingDirClean(mainWorktreePath)) {
+    if (getConfigValue("confirmDestructiveOps")) {
+      const confirmed = await confirmDestructiveAction(
+        "git reset --hard + git clean -fd",
+        "\u4E22\u5F03\u6240\u6709\u672A\u63D0\u4EA4\u7684\u66F4\u6539"
+      );
+      if (!confirmed) {
+        printInfo(MESSAGES.DESTRUCTIVE_OP_CANCELLED);
+        return;
+      }
+    }
     gitResetHard(mainWorktreePath);
     gitCleanForce(mainWorktreePath);
     printSuccess(MESSAGES.RESET_SUCCESS);

package/dist/postinstall.js

@@ -23,6 +23,10 @@ var CONFIG_DEFINITIONS = {
   autoPullPush: {
     defaultValue: false,
     description: "merge \u6210\u529F\u540E\u662F\u5426\u81EA\u52A8\u6267\u884C git pull \u548C git push"
+  },
+  confirmDestructiveOps: {
+    defaultValue: true,
+    description: "\u6267\u884C\u7834\u574F\u6027\u64CD\u4F5C\uFF08reset\u3001validate --clean\uFF09\u524D\u662F\u5426\u63D0\u793A\u786E\u8BA4"
   }
 };
 function deriveDefaultConfig(definitions) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clawt",
-  "version": "2.3.8",
+  "version": "2.4.0",
   "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/reset.ts

@@ -4,9 +4,11 @@ import { MESSAGES } from '../constants/index.js';
 import {
   validateMainWorktree,
   getGitTopLevel,
+  getConfigValue,
   isWorkingDirClean,
   gitResetHard,
   gitCleanForce,
+  confirmDestructiveAction,
   printSuccess,
   printInfo,
 } from '../utils/index.js';
@@ -19,20 +21,32 @@ export function registerResetCommand(program: Command): void {
   program
     .command('reset')
     .description('重置主 worktree 工作区和暂存区（保留 validate 快照）')
-    .action(() => {
-      handleReset();
+    .action(async () => {
+      await handleReset();
     });
 }
 
 /**
  * 执行 reset 命令：重置主 worktree 工作区和暂存区
  */
-function handleReset(): void {
+async function handleReset(): Promise<void> {
   validateMainWorktree();
   const mainWorktreePath = getGitTopLevel();
   logger.info('reset 命令执行');
 
   if (!isWorkingDirClean(mainWorktreePath)) {
+    // 根据配置决定是否需要确认
+    if (getConfigValue('confirmDestructiveOps')) {
+      const confirmed = await confirmDestructiveAction(
+        'git reset --hard + git clean -fd',
+        '丢弃所有未提交的更改',
+      );
+      if (!confirmed) {
+        printInfo(MESSAGES.DESTRUCTIVE_OP_CANCELLED);
+        return;
+      }
+    }
+
     gitResetHard(mainWorktreePath);
     gitCleanForce(mainWorktreePath);
     printSuccess(MESSAGES.RESET_SUCCESS);

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/commands/validate.ts

@@ -11,6 +11,7 @@ import {
   getProjectName,
   getGitTopLevel,
   getProjectWorktreeDir,
+  getConfigValue,
   isWorkingDirClean,
   gitAddAll,
   gitCommit,
@@ -28,6 +29,7 @@ import {
   readSnapshotTreeHash,
   writeSnapshot,
   removeSnapshot,
+  confirmDestructiveAction,
   printSuccess,
   printWarning,
   printInfo,
@@ -163,7 +165,7 @@ function saveCurrentSnapshotTree(mainWorktreePath: string, projectName: string,
  * 处理 --clean 选项：清理 validate 状态
  * @param {ValidateOptions} options - 命令选项
  */
-function handleValidateClean(options: ValidateOptions): void {
+async function handleValidateClean(options: ValidateOptions): Promise<void> {
   validateMainWorktree();
 
   const projectName = getProjectName();
@@ -171,6 +173,18 @@ function handleValidateClean(options: ValidateOptions): void {
 
   logger.info(`validate --clean 执行，分支: ${options.branch}`);
 
+  // 根据配置决定是否需要确认
+  if (getConfigValue('confirmDestructiveOps')) {
+    const confirmed = await confirmDestructiveAction(
+      'git reset --hard + git clean -fd',
+      `重置主 worktree 并删除分支 ${options.branch} 的 validate 快照`,
+    );
+    if (!confirmed) {
+      printInfo(MESSAGES.DESTRUCTIVE_OP_CANCELLED);
+      return;
+    }
+  }
+
   // 清空主 worktree
   if (!isWorkingDirClean(mainWorktreePath)) {
     gitResetHard(mainWorktreePath);
@@ -250,7 +264,7 @@ function handleIncrementalValidate(targetWorktreePath: string, mainWorktreePath:
 async function handleValidate(options: ValidateOptions): Promise<void> {
   // 处理 --clean 选项
   if (options.clean) {
-    handleValidateClean(options);
+    await handleValidateClean(options);
     return;
   }
 

package/src/constants/config.ts

@@ -21,6 +21,10 @@ export const CONFIG_DEFINITIONS: ConfigDefinitions = {
     defaultValue: false,
     description: 'merge 成功后是否自动执行 git pull 和 git push',
   },
+  confirmDestructiveOps: {
+    defaultValue: true,
+    description: '执行破坏性操作（reset、validate --clean）前是否提示确认',
+  },
 };
 
 /**

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} 同步主分支后重试`,
@@ -98,6 +98,8 @@ export const MESSAGES = {
   /** squash 完成但未提供 -m，提示用户自行提交 */
   MERGE_SQUASH_PENDING: (worktreePath: string, branch: string) =>
     `✓ 已将所有提交压缩到暂存区\n  请在目标 worktree 中提交后重新执行 merge：\n  cd ${worktreePath}\n  提交完成后执行：clawt merge -b ${branch}`,
+  /** 用户取消破坏性操作 */
+  DESTRUCTIVE_OP_CANCELLED: '已取消操作',
   /** reset 成功 */
   RESET_SUCCESS: '✓ 主 worktree 工作区和暂存区已重置',
   /** reset 时工作区和暂存区已干净 */

package/src/types/config.ts

@@ -6,6 +6,8 @@ export interface ClawtConfig {
   claudeCodeCommand: string;
   /** merge 成功后是否自动执行 git pull 和 git push */
   autoPullPush: boolean;
+  /** 执行破坏性操作（reset、validate --clean）前是否提示确认 */
+  confirmDestructiveOps: boolean;
 }
 
 /** 单个配置项的完整定义（默认值 + 描述） */

package/src/utils/formatter.ts

@@ -67,6 +67,17 @@ export function confirmAction(question: string): Promise<boolean> {
   });
 }
 
+/**
+ * 破坏性操作确认：先输出带高亮危险指令的警告，再等待用户确认
+ * @param {string} dangerousCommand - 即将执行的危险指令（会用红色加粗高亮）
+ * @param {string} description - 操作后果描述
+ * @returns {Promise<boolean>} 用户是否确认
+ */
+export function confirmDestructiveAction(dangerousCommand: string, description: string): Promise<boolean> {
+  printWarning(`即将执行 ${chalk.red.bold(dangerousCommand)}，${description}`);
+  return confirmAction('是否继续？');
+}
+
 /**
  * 将 WorktreeStatus 格式化为带颜色的字符串
  * @param {WorktreeStatus} status - worktree 变更统计信息

package/src/utils/index.ts

@@ -45,7 +45,7 @@ export { sanitizeBranchName, generateBranchNames, validateBranchesNotExist } fro
 export { validateMainWorktree, validateGitInstalled, validateClaudeCodeInstalled } from './validation.js';
 export { createWorktrees, getProjectWorktrees, getProjectWorktreeDir, cleanupWorktrees, getWorktreeStatus } from './worktree.js';
 export { loadConfig, getConfigValue, ensureClawtDirs } from './config.js';
-export { printSuccess, printError, printWarning, printInfo, printSeparator, printDoubleSeparator, confirmAction, formatWorktreeStatus } from './formatter.js';
+export { printSuccess, printError, printWarning, printInfo, printSeparator, printDoubleSeparator, confirmAction, confirmDestructiveAction, formatWorktreeStatus } from './formatter.js';
 export { ensureDir, removeEmptyDir } from './fs.js';
 export { multilineInput } from './prompt.js';
 export { launchInteractiveClaude } from './claude.js';