clawt 1.1.1 → 1.3.0

package/.claude/agent-memory/docs-sync-updater/MEMORY.md

@@ -4,16 +4,18 @@
 
 ### docs/spec.md
 - 完整的软件规格说明，包含 7 大章节
-- 命令流程在 `5. 需求场景详细设计` 下，每个命令一个子章节（5.1-5.10）
+- 命令流程在 `5. 需求场景详细设计` 下，每个命令一个子章节（5.1-5.11）
 - run 命令对应 `5.2 批量创建 Worktree + 执行 Claude Code 任务`，流程按步骤编号描述
 - merge 命令对应 `5.6 合并验证过的分支`，流程按步骤编号描述
 - config 命令对应 `5.10 查看全局配置`，只读展示配置
+- resume 命令对应 `5.11 在已有 Worktree 中恢复会话`，查找已有 worktree 并启动交互式界面
 - 配置项说明在 `5.7 默认配置文件` 章节的表格中
 - 更新模式：新增步骤时追加编号，配置项影响范围变化时更新说明列
 
 ### CLAUDE.md
 - 面向 Claude Code 的项目架构指引，精简扼要
 - run 命令流程在 `核心流程（run 命令）` 章节，编号列表描述
+- resume 命令流程在独立的 `### resume 命令流程` 章节，编号列表描述
 - merge 和 run 中断清理在 `validate + merge 工作流` 章节，一行式描述用箭头连接流程
 - utils 目录描述用括号内逗号分隔列举功能模块
 - 更新模式：编号列表追加步骤，箭头链追加阶段，括号内追加关键词
@@ -27,10 +29,13 @@
 ## 关键约定
 - `autoDeleteBranch` 配置项影响三处：remove 命令、merge 命令、run 中断清理
 - merge 的清理确认在 merge 操作之前询问（避免交互中断），但清理在 merge 成功后执行
+- merge 成功后自动清理对应的 validate 快照（hasSnapshot + removeSnapshot）
 - run 的中断清理在所有子进程退出后执行
 - 文档中文风格，技术术语保留英文（worktree, merge, branch, SIGINT 等）
 - cleanupWorktrees 是 merge 和 run 共用的公共清理函数（在 src/utils/worktree.ts）
+- `launchInteractiveClaude` 是 run（交互式模式）和 resume 共用的公共函数（在 src/utils/claude.ts）
 - killAllChildProcesses 是 run 专用的子进程终止函数（在 src/utils/shell.ts）
+- validate 快照管理函数在 `src/utils/validate-snapshot.ts`，被 validate 和 merge 两个命令使用
 
 ## 配置项同步检查点
 
@@ -55,6 +60,24 @@ run 命令有两种模式（自 claudeCodeCommand 特性后）：
 - 传 `--tasks`：并行任务模式（多 worktree + `executeClaudeTask` + spawnProcess）
 - CLAUDE.md 中的核心流程按模式分段描述
 
-## 命令清单（7 个）
+## 命令清单（8 个）
 
-`create`、`run`、`list`、`remove`、`validate`、`merge`、`config`
+`create`、`run`、`resume`、`list`、`remove`、`validate`、`merge`、`config`
+
+Notes:
+- resume 和 run（交互式模式）共用 `launchInteractiveClaude()`，该函数从 run.ts 提取到 src/utils/claude.ts
+- `claudeCodeCommand` 配置项同时影响 run 交互式模式和 resume 命令
+
+## validate 快照机制
+
+- validate 命令支持首次/增量两种模式，通过 `hasSnapshot()` 判断
+- 快照路径：`~/.clawt/validate-snapshots/<projectName>/<branchName>.patch`
+- 常量 `VALIDATE_SNAPSHOTS_DIR` 定义在 `src/constants/paths.ts`
+- validate 新增 `--clean` 选项（`ValidateOptions.clean?: boolean`）
+- 增量模式核心：旧 patch 应用到暂存区 + 新全量变更在工作目录 → `git diff` 可查看增量差异
+- 增量 apply 失败时自动降级为全量模式
+- shell 层新增 `execCommandWithInput()`（`execFileSync` + stdin），用于 `gitApplyCachedFromStdin()`
+- git 层新增 `gitDiffCachedBinary()`（返回 Buffer）和 `gitApplyCachedFromStdin()`
+- merge 成功后自动清理对应快照；merge 时主 worktree 脏 + 存在快照会输出警告提示
+- docs/spec.md 中 validate 章节（5.4）按 `--clean 模式`、`首次 validate`、`增量 validate` 三段描述
+- CLAUDE.md 中在 validate + merge 工作流章节用缩进列表描述两种模式

package/CLAUDE.md

@@ -24,7 +24,7 @@ npm i -g .        # 本地全局安装进行测试
 
 每个命令为独立文件 `src/commands/<name>.ts`，导出 `registerXxxCommand(program)` 函数，在 `src/index.ts` 中统一注册到 Commander。命令内部逻辑封装在对应的 `handleXxx` 函数中。
 
-七个命令：`create`、`run`、`list`、`remove`、`validate`、`merge`、`config`。
+八个命令：`create`、`run`、`resume`、`list`、`remove`、`validate`、`merge`、`config`。
 
 ### 核心流程（run 命令）
 
@@ -46,17 +46,28 @@ run 命令有两种模式：
 5. 每个任务完成时实时输出通知，全部完成后输出汇总
 6. SIGINT（Ctrl+C）中断处理：`killAllChildProcesses()` 终止所有子进程 → 等待退出 → `handleInterruptCleanup()` 根据 `autoDeleteBranch` 配置自动或交互式清理 worktree 和分支
 
+### resume 命令流程
+
+1. `validateMainWorktree()` 确认在主 worktree 根目录
+2. `validateClaudeCodeInstalled()` 确认 claude CLI 可用
+3. `findWorktreeByBranch()` 在当前项目的 worktree 列表中按分支名查找已有 worktree
+4. `launchInteractiveClaude()` 在目标 worktree 中启动 Claude Code 交互式界面
+
 ### validate + merge 工作流
 
-- `validate`：将目标 worktree 的变更通过 git stash 迁移到主 worktree，便于在主 worktree 中测试
-- `merge`：检测目标 worktree 状态（有修改则需 `-m` 提交，已提交则跳过，无变更则报错）→ 合并到主 worktree → pull → push → 可选清理 worktree 和分支（受 `autoDeleteBranch` 配置或交互式确认控制）
+- `validate`：将目标 worktree 的变更通过 git stash 迁移到主 worktree，便于在主 worktree 中测试。支持两种模式：
+  - **首次 validate**（无历史快照）：stash 迁移 → 保存纯净快照 patch → 结果：暂存区=空，工作目录=全量变更
+  - **增量 validate**（存在历史快照）：读取旧 patch → 清空主 worktree → stash 迁移最新变更 → 保存新快照 → 旧 patch 应用到暂存区 → 结果：暂存区=上次快照，工作目录=最新变更（可通过 `git diff` 查看增量差异）
+  - `--clean` 选项：重置主 worktree + 删除对应快照文件
+  - 快照存储路径：`~/.clawt/validate-snapshots/<projectName>/<branchName>.patch`
+- `merge`：检测目标 worktree 状态（有修改则需 `-m` 提交，已提交则跳过，无变更则报错）→ 合并到主 worktree → pull → push → 可选清理 worktree 和分支（受 `autoDeleteBranch` 配置或交互式确认控制）→ 清理对应的 validate 快照
 - `run` 中断清理：Ctrl+C 终止所有子进程后，根据 `autoDeleteBranch` 配置自动清理或交互式确认清理本次创建的 worktree 和分支
 
 ### 目录层级
 
 - `src/commands/` — 各命令的注册与处理逻辑
-- `src/utils/` — 工具函数（git 操作、shell 执行与子进程管理、分支名处理、worktree 管理与批量清理、配置、格式化输出、交互式输入）
-- `src/constants/` — 常量定义（路径、退出码、消息模板、分支规则、配置默认值、终端控制序列）
+- `src/utils/` — 工具函数（git 操作、shell 执行与子进程管理、分支名处理、worktree 管理与批量清理、配置、格式化输出、交互式输入、Claude Code 交互式启动、validate 快照管理）
+- `src/constants/` — 常量定义（路径、退出码、消息模板、分支规则、配置默认值、终端控制序列、validate 快照目录）
 - `src/types/` — TypeScript 类型定义
 - `src/errors/` — 自定义 `ClawtError` 错误类（携带退出码）
 - `src/logger/` — winston 日志（按日期滚动，写入 `~/.clawt/logs/`）
@@ -65,7 +76,7 @@ run 命令有两种模式：
 
 - 所有命令执行前都会调用 `validateMainWorktree()` 确保在主 worktree 根目录（`git rev-parse --git-common-dir === ".git"`）
 - Worktree 统一存放在 `~/.clawt/worktrees/<projectName>/` 下
-- 全局配置文件 `~/.clawt/config.json`，postinstall 时自动创建/合并，包含 `autoDeleteBranch`（是否自动删除分支）、`claudeCodeCommand`（Claude Code CLI 启动指令）、`autoPullPush`（merge 后是否自动 pull/push）三个配置项。配置项以 `CONFIG_DEFINITIONS` 为单一数据源，`DEFAULT_CONFIG` 和 `CONFIG_DESCRIPTIONS` 均从中派生
-- shell 命令执行有同步（`execCommand` → `execSync`）和异步（`spawnProcess` → `spawn`）两种方式
+- 全局配置文件 `~/.clawt/config.json`，postinstall 时自动创建/合并，包含 `autoDeleteBranch`（是否自动删除分支）、`claudeCodeCommand`（Claude Code CLI 启动指令，用于 `run` 和 `resume` 的交互式界面）、`autoPullPush`（merge 后是否自动 pull/push）三个配置项。配置项以 `CONFIG_DEFINITIONS` 为单一数据源，`DEFAULT_CONFIG` 和 `CONFIG_DESCRIPTIONS` 均从中派生
+- shell 命令执行有同步（`execCommand` → `execSync`）、异步（`spawnProcess` → `spawn`）和同步带 stdin（`execCommandWithInput` → `execFileSync`）三种方式
 - 项目为纯 ESM（`"type": "module"`），模块导入需带 `.js` 后缀
 - 分支名特殊字符会被 `sanitizeBranchName()` 自动清理

package/README.md

@@ -12,7 +12,7 @@ npm i -g clawt
 
 - Node.js >= 18
 - Git >= 2.15
-- Claude Code CLI（仅 `clawt run` 需要）
+- Claude Code CLI（`clawt run` 和 `clawt resume` 需要）
 
 ## 使用前提
 
@@ -73,20 +73,47 @@ clawt run -b feature-scheme \
 clawt run -b feature-login
 ```
 
+### `clawt resume` — 在已有 worktree 中恢复 Claude Code 会话
+
+```bash
+clawt resume -b <branchName>
+```
+
+| 参数 | 必填 | 说明 |
+| ---- | ---- | ---- |
+| `-b` | 是 | 要恢复的分支名 |
+
+在之前通过 `clawt run` 或 `clawt create` 创建的 worktree 中重新打开 Claude Code 交互式界面，继续之前的工作。启动命令由配置项 `claudeCodeCommand` 指定（默认 `claude`）。
+
+```bash
+# 在已有 worktree 中恢复会话
+clawt resume -b feature-login
+```
+
 ### `clawt validate` — 在主 worktree 验证分支变更
 
 ```bash
-clawt validate -b <branchName>
+clawt validate -b <branchName> [--clean]
 ```
 
 | 参数 | 必填 | 说明 |
 | ---- | ---- | ---- |
 | `-b` | 是 | 要验证的分支名 |
+| `--clean` | 否 | 清理 validate 状态（重置主 worktree 并删除快照） |
 
 将目标 worktree 的变更通过 `git stash` 迁移到主 worktree，方便在主 worktree 中直接测试，无需重新安装依赖。
 
+支持增量模式：首次 validate 后会自动保存快照，再次 validate 同一分支时会将上次快照应用到暂存区、最新变更保留在工作目录，用户可通过 `git diff` 查看两次 validate 之间的增量差异。使用 `--clean` 可清理 validate 状态（重置主 worktree 并删除快照文件）。
+
 ```bash
+# 首次验证
 clawt validate -b feature-scheme-1
+
+# 再次验证（增量模式，可通过 git diff 查看增量差异）
+clawt validate -b feature-scheme-1
+
+# 清理 validate 状态
+clawt validate -b feature-scheme-1 --clean
 ```
 
 ### `clawt merge` — 合并分支到主 worktree
@@ -162,7 +189,7 @@ clawt config
 | 配置项 | 类型 | 默认值 | 说明 |
 | ------ | ---- | ------ | ---- |
 | `autoDeleteBranch` | `boolean` | `false` | 移除 worktree 时自动删除对应本地分支；merge 成功后自动清理 worktree 和分支；run 中断后自动清理本次创建的 worktree 和分支 |
-| `claudeCodeCommand` | `string` | `"claude"` | Claude Code CLI 启动指令，用于 `clawt run` 不传 `--tasks` 时在 worktree 中打开交互式界面 |
+| `claudeCodeCommand` | `string` | `"claude"` | Claude Code CLI 启动指令，用于 `clawt run` 不传 `--tasks` 时和 `clawt resume` 在 worktree 中打开交互式界面 |
 | `autoPullPush` | `boolean` | `false` | merge 成功后是否自动执行 git pull 和 git push |
 
 ## 分支名规则

package/dist/index.js

@@ -13,6 +13,7 @@ var CLAWT_HOME = join(homedir(), ".clawt");
 var CONFIG_PATH = join(CLAWT_HOME, "config.json");
 var LOGS_DIR = join(CLAWT_HOME, "logs");
 var WORKTREES_DIR = join(CLAWT_HOME, "worktrees");
+var VALIDATE_SNAPSHOTS_DIR = join(CLAWT_HOME, "validate-snapshots");
 
 // src/constants/branch.ts
 var INVALID_BRANCH_CHARS = /[\/\\.\s~:*?[\]^]+/g;
@@ -81,7 +82,18 @@ var MESSAGES = {
   /** 创建数量参数无效 */
   INVALID_COUNT: (value) => `\u65E0\u6548\u7684\u521B\u5EFA\u6570\u91CF: "${value}"\uFF0C\u8BF7\u8F93\u5165\u6B63\u6574\u6570`,
   /** worktree 状态获取失败 */
-  WORKTREE_STATUS_UNAVAILABLE: "(\u72B6\u6001\u4E0D\u53EF\u7528)"
+  WORKTREE_STATUS_UNAVAILABLE: "(\u72B6\u6001\u4E0D\u53EF\u7528)",
+  /** 增量 validate 成功提示 */
+  INCREMENTAL_VALIDATE_SUCCESS: (branch) => `\u2713 \u5DF2\u5C06\u5206\u652F ${branch} \u7684\u6700\u65B0\u53D8\u66F4\u5E94\u7528\u5230\u4E3B worktree\uFF08\u589E\u91CF\u6A21\u5F0F\uFF09
+  \u6682\u5B58\u533A = \u4E0A\u6B21\u5FEB\u7167\uFF0C\u5DE5\u4F5C\u76EE\u5F55 = \u6700\u65B0\u53D8\u66F4`,
+  /** 增量 validate 降级为全量模式提示 */
+  INCREMENTAL_VALIDATE_FALLBACK: "\u589E\u91CF\u5BF9\u6BD4\u5931\u8D25\uFF0C\u5DF2\u964D\u7EA7\u4E3A\u5168\u91CF\u6A21\u5F0F",
+  /** validate 状态已清理 */
+  VALIDATE_CLEANED: (branch) => `\u2713 \u5206\u652F ${branch} \u7684 validate \u72B6\u6001\u5DF2\u6E05\u7406`,
+  /** 增量 validate 检测到脏状态，即将清空 */
+  INCREMENTAL_VALIDATE_RESET: "\u68C0\u6D4B\u5230\u4E0A\u6B21 validate \u7684\u6B8B\u7559\u72B6\u6001\uFF0C\u5C06\u6E05\u7A7A\u4E3B worktree \u5E76\u91CD\u65B0\u5E94\u7528",
+  /** merge 命令检测到 validate 状态的提示 */
+  MERGE_VALIDATE_STATE_HINT: (branch) => `\u4E3B worktree \u53EF\u80FD\u5B58\u5728 validate \u6B8B\u7559\u72B6\u6001\uFF0C\u53EF\u5148\u6267\u884C clawt validate -b ${branch} --clean \u6E05\u7406`
 };
 
 // src/constants/exitCodes.ts
@@ -168,7 +180,7 @@ var logger = winston.createLogger({
 });
 
 // src/utils/shell.ts
-import { execSync, spawn } from "child_process";
+import { execSync, execFileSync, spawn } from "child_process";
 function execCommand(command, options) {
   logger.debug(`\u6267\u884C\u547D\u4EE4: ${command}${options?.cwd ? ` (cwd: ${options.cwd})` : ""}`);
   const result = execSync(command, {
@@ -192,9 +204,20 @@ function killAllChildProcesses(children) {
     }
   }
 }
+function execCommandWithInput(command, args, options) {
+  logger.debug(`\u6267\u884C\u547D\u4EE4(stdin): ${command} ${args.join(" ")}${options.cwd ? ` (cwd: ${options.cwd})` : ""}`);
+  const result = execFileSync(command, args, {
+    cwd: options.cwd,
+    input: options.input,
+    encoding: "utf-8",
+    stdio: ["pipe", "pipe", "pipe"]
+  });
+  return result.trim();
+}
 
 // src/utils/git.ts
 import { basename } from "path";
+import { execSync as execSync2 } from "child_process";
 function getGitCommonDir(cwd) {
   return execCommand("git rev-parse --git-common-dir", { cwd });
 }
@@ -316,6 +339,16 @@ function getDiffStat(branchName, worktreePath, cwd) {
     deletions: committed.deletions + uncommitted.deletions
   };
 }
+function gitDiffCachedBinary(cwd) {
+  logger.debug(`\u6267\u884C\u547D\u4EE4: git diff --cached --binary${cwd ? ` (cwd: ${cwd})` : ""}`);
+  return execSync2("git diff --cached --binary", {
+    cwd,
+    stdio: ["pipe", "pipe", "pipe"]
+  });
+}
+function gitApplyCachedFromStdin(patchContent, cwd) {
+  execCommandWithInput("git", ["apply", "--cached"], { input: patchContent, cwd });
+}
 
 // src/utils/formatter.ts
 import chalk from "chalk";
@@ -537,6 +570,63 @@ function ensureClawtDirs() {
 // src/utils/prompt.ts
 import Enquirer from "enquirer";
 
+// src/utils/claude.ts
+import { spawnSync } from "child_process";
+function launchInteractiveClaude(worktree) {
+  const commandStr = getConfigValue("claudeCodeCommand");
+  const parts = commandStr.split(/\s+/).filter(Boolean);
+  const cmd = parts[0];
+  const args = [
+    ...parts.slice(1),
+    "--append-system-prompt",
+    APPEND_SYSTEM_PROMPT
+  ];
+  printInfo(`\u6B63\u5728 worktree \u4E2D\u542F\u52A8 Claude Code \u4EA4\u4E92\u5F0F\u754C\u9762...`);
+  printInfo(`  \u5206\u652F: ${worktree.branch}`);
+  printInfo(`  \u8DEF\u5F84: ${worktree.path}`);
+  printInfo(`  \u6307\u4EE4: ${commandStr}`);
+  printInfo("");
+  const result = spawnSync(cmd, args, {
+    cwd: worktree.path,
+    stdio: "inherit"
+  });
+  if (result.error) {
+    throw new ClawtError(`\u542F\u52A8 Claude Code \u5931\u8D25: ${result.error.message}`);
+  }
+  if (result.status !== null && result.status !== 0) {
+    printWarning(`Claude Code \u9000\u51FA\u7801: ${result.status}`);
+  }
+}
+
+// src/utils/validate-snapshot.ts
+import { join as join3 } from "path";
+import { existsSync as existsSync5, readFileSync as readFileSync2, writeFileSync as writeFileSync2, unlinkSync, readdirSync as readdirSync3, rmdirSync as rmdirSync2 } from "fs";
+function getSnapshotPath(projectName, branchName) {
+  return join3(VALIDATE_SNAPSHOTS_DIR, projectName, `${branchName}.patch`);
+}
+function hasSnapshot(projectName, branchName) {
+  return existsSync5(getSnapshotPath(projectName, branchName));
+}
+function readSnapshot(projectName, branchName) {
+  const snapshotPath = getSnapshotPath(projectName, branchName);
+  logger.debug(`\u8BFB\u53D6 validate \u5FEB\u7167: ${snapshotPath}`);
+  return readFileSync2(snapshotPath);
+}
+function writeSnapshot(projectName, branchName, patch) {
+  const snapshotPath = getSnapshotPath(projectName, branchName);
+  const snapshotDir = join3(VALIDATE_SNAPSHOTS_DIR, projectName);
+  ensureDir(snapshotDir);
+  writeFileSync2(snapshotPath, patch);
+  logger.info(`\u5DF2\u4FDD\u5B58 validate \u5FEB\u7167: ${snapshotPath}`);
+}
+function removeSnapshot(projectName, branchName) {
+  const snapshotPath = getSnapshotPath(projectName, branchName);
+  if (existsSync5(snapshotPath)) {
+    unlinkSync(snapshotPath);
+    logger.info(`\u5DF2\u5220\u9664 validate \u5FEB\u7167: ${snapshotPath}`);
+  }
+}
+
 // src/commands/list.ts
 import chalk2 from "chalk";
 function registerListCommand(program2) {
@@ -596,7 +686,7 @@ function handleCreate(options) {
 }
 
 // src/commands/remove.ts
-import { join as join3 } from "path";
+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) => {
     await handleRemove(options);
@@ -613,7 +703,7 @@ function resolveWorktreesToRemove(options) {
   }
   if (options.index !== void 0) {
     const targetName = `${options.branch}-${options.index}`;
-    const targetPath = join3(projectDir, targetName);
+    const targetPath = join4(projectDir, targetName);
     const found = allWorktrees.find((wt) => wt.path === targetPath);
     if (!found) {
       throw new ClawtError(MESSAGES.WORKTREE_NOT_FOUND(targetName));
@@ -665,37 +755,11 @@ async function handleRemove(options) {
 }
 
 // src/commands/run.ts
-import { spawnSync } from "child_process";
 function registerRunCommand(program2) {
   program2.command("run").description("\u6279\u91CF\u521B\u5EFA worktree \u5E76\u542F\u52A8 Claude Code \u6267\u884C\u4EFB\u52A1").requiredOption("-b, --branch <branchName>", "\u5206\u652F\u540D").option("--tasks <task...>", "\u4EFB\u52A1\u5217\u8868\uFF08\u53EF\u591A\u6B21\u6307\u5B9A\uFF09\uFF0C\u4E0D\u4F20\u5219\u5728 worktree \u4E2D\u6253\u5F00 Claude Code \u4EA4\u4E92\u5F0F\u754C\u9762").action(async (options) => {
     await handleRun(options);
   });
 }
-function launchInteractiveClaude(worktree) {
-  const commandStr = getConfigValue("claudeCodeCommand");
-  const parts = commandStr.split(/\s+/).filter(Boolean);
-  const cmd = parts[0];
-  const args = [
-    ...parts.slice(1),
-    "--append-system-prompt",
-    APPEND_SYSTEM_PROMPT
-  ];
-  printInfo(`\u6B63\u5728 worktree \u4E2D\u542F\u52A8 Claude Code \u4EA4\u4E92\u5F0F\u754C\u9762...`);
-  printInfo(`  \u5206\u652F: ${worktree.branch}`);
-  printInfo(`  \u8DEF\u5F84: ${worktree.path}`);
-  printInfo(`  \u6307\u4EE4: ${commandStr}`);
-  printInfo("");
-  const result = spawnSync(cmd, args, {
-    cwd: worktree.path,
-    stdio: "inherit"
-  });
-  if (result.error) {
-    throw new ClawtError(`\u542F\u52A8 Claude Code \u5931\u8D25: ${result.error.message}`);
-  }
-  if (result.status !== null && result.status !== 0) {
-    printWarning(`Claude Code \u9000\u51FA\u7801: ${result.status}`);
-  }
-}
 function executeClaudeTask(worktree, task) {
   const child = spawnProcess(
     "claude",
@@ -856,12 +920,34 @@ async function handleRun(options) {
   printTaskSummary(summary);
 }
 
+// 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);
+  });
+}
+function findWorktreeByBranch(branchName) {
+  const worktrees = getProjectWorktrees();
+  const matched = worktrees.find((wt) => wt.branch === branchName);
+  if (!matched) {
+    throw new ClawtError(MESSAGES.WORKTREE_NOT_FOUND(branchName));
+  }
+  return matched;
+}
+async function handleResume(options) {
+  validateMainWorktree();
+  validateClaudeCodeInstalled();
+  logger.info(`resume \u547D\u4EE4\u6267\u884C\uFF0C\u5206\u652F: ${options.branch}`);
+  const worktree = findWorktreeByBranch(options.branch);
+  launchInteractiveClaude(worktree);
+}
+
 // src/commands/validate.ts
-import { join as join4 } from "path";
-import { existsSync as existsSync5 } from "fs";
+import { join as join5 } from "path";
+import { existsSync as existsSync6 } from "fs";
 import Enquirer2 from "enquirer";
 function registerValidateCommand(program2) {
-  program2.command("validate").description("\u5728\u4E3B worktree \u9A8C\u8BC1\u67D0\u4E2A worktree \u5206\u652F\u7684\u53D8\u66F4").requiredOption("-b, --branch <branchName>", "\u8981\u9A8C\u8BC1\u7684\u5206\u652F\u540D").action(async (options) => {
+  program2.command("validate").description("\u5728\u4E3B worktree \u9A8C\u8BC1\u67D0\u4E2A worktree \u5206\u652F\u7684\u53D8\u66F4").requiredOption("-b, --branch <branchName>", "\u8981\u9A8C\u8BC1\u7684\u5206\u652F\u540D").option("--clean", "\u6E05\u7406 validate \u72B6\u6001\uFF08\u91CD\u7F6E\u4E3B worktree \u5E76\u5220\u9664\u5FEB\u7167\uFF09").action(async (options) => {
     await handleValidate(options);
   });
 }
@@ -899,24 +985,8 @@ async function handleDirtyMainWorktree(mainWorktreePath) {
     throw new ClawtError("\u5DE5\u4F5C\u533A\u4ECD\u7136\u4E0D\u5E72\u51C0\uFF0C\u8BF7\u624B\u52A8\u5904\u7406");
   }
 }
-async function handleValidate(options) {
-  validateMainWorktree();
-  const projectName = getProjectName();
-  const mainWorktreePath = getGitTopLevel();
-  const projectDir = getProjectWorktreeDir();
-  const targetWorktreePath = join4(projectDir, options.branch);
-  logger.info(`validate \u547D\u4EE4\u6267\u884C\uFF0C\u5206\u652F: ${options.branch}`);
-  if (!existsSync5(targetWorktreePath)) {
-    throw new ClawtError(MESSAGES.WORKTREE_NOT_FOUND(options.branch));
-  }
-  if (!isWorkingDirClean(mainWorktreePath)) {
-    await handleDirtyMainWorktree(mainWorktreePath);
-  }
-  if (isWorkingDirClean(targetWorktreePath)) {
-    printInfo(MESSAGES.TARGET_WORKTREE_CLEAN);
-    return;
-  }
-  const stashMessage = `clawt:validate:${options.branch}`;
+function migrateChangesViaStash(targetWorktreePath, mainWorktreePath, branchName) {
+  const stashMessage = `clawt:validate:${branchName}`;
   gitAddAll(targetWorktreePath);
   gitStashPush(stashMessage, targetWorktreePath);
   gitStashApply(targetWorktreePath);
@@ -927,12 +997,86 @@ async function handleValidate(options) {
     throw new ClawtError(MESSAGES.STASH_CHANGED);
   }
   gitStashPop(0, mainWorktreePath);
-  printSuccess(MESSAGES.VALIDATE_SUCCESS(options.branch));
+}
+function saveCurrentSnapshotPatch(mainWorktreePath, projectName, branchName) {
+  gitAddAll(mainWorktreePath);
+  const patch = gitDiffCachedBinary(mainWorktreePath);
+  gitRestoreStaged(mainWorktreePath);
+  writeSnapshot(projectName, branchName, patch);
+  return patch;
+}
+function handleValidateClean(options) {
+  validateMainWorktree();
+  const projectName = getProjectName();
+  const mainWorktreePath = getGitTopLevel();
+  logger.info(`validate --clean \u6267\u884C\uFF0C\u5206\u652F: ${options.branch}`);
+  if (!isWorkingDirClean(mainWorktreePath)) {
+    gitResetHard(mainWorktreePath);
+    gitCleanForce(mainWorktreePath);
+  }
+  removeSnapshot(projectName, options.branch);
+  printSuccess(MESSAGES.VALIDATE_CLEANED(options.branch));
+}
+function handleFirstValidate(targetWorktreePath, mainWorktreePath, projectName, branchName) {
+  migrateChangesViaStash(targetWorktreePath, mainWorktreePath, branchName);
+  saveCurrentSnapshotPatch(mainWorktreePath, projectName, branchName);
+  printSuccess(MESSAGES.VALIDATE_SUCCESS(branchName));
+}
+function handleIncrementalValidate(targetWorktreePath, mainWorktreePath, projectName, branchName) {
+  const oldPatch = readSnapshot(projectName, branchName);
+  printInfo(MESSAGES.INCREMENTAL_VALIDATE_RESET);
+  gitResetHard(mainWorktreePath);
+  gitCleanForce(mainWorktreePath);
+  migrateChangesViaStash(targetWorktreePath, mainWorktreePath, branchName);
+  const newPatch = saveCurrentSnapshotPatch(mainWorktreePath, projectName, branchName);
+  if (oldPatch.length > 0) {
+    try {
+      gitApplyCachedFromStdin(oldPatch, mainWorktreePath);
+    } catch (error) {
+      logger.warn(`\u589E\u91CF apply \u5931\u8D25: ${error}`);
+      printWarning(MESSAGES.INCREMENTAL_VALIDATE_FALLBACK);
+      printSuccess(MESSAGES.VALIDATE_SUCCESS(branchName));
+      return;
+    }
+  }
+  printSuccess(MESSAGES.INCREMENTAL_VALIDATE_SUCCESS(branchName));
+}
+async function handleValidate(options) {
+  if (options.clean) {
+    handleValidateClean(options);
+    return;
+  }
+  validateMainWorktree();
+  const projectName = getProjectName();
+  const mainWorktreePath = getGitTopLevel();
+  const projectDir = getProjectWorktreeDir();
+  const targetWorktreePath = join5(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));
+  }
+  const isIncremental = hasSnapshot(projectName, options.branch);
+  if (isIncremental) {
+    if (isWorkingDirClean(targetWorktreePath)) {
+      printInfo(MESSAGES.TARGET_WORKTREE_CLEAN);
+      return;
+    }
+    handleIncrementalValidate(targetWorktreePath, mainWorktreePath, projectName, options.branch);
+  } else {
+    if (!isWorkingDirClean(mainWorktreePath)) {
+      await handleDirtyMainWorktree(mainWorktreePath);
+    }
+    if (isWorkingDirClean(targetWorktreePath)) {
+      printInfo(MESSAGES.TARGET_WORKTREE_CLEAN);
+      return;
+    }
+    handleFirstValidate(targetWorktreePath, mainWorktreePath, projectName, options.branch);
+  }
 }
 
 // src/commands/merge.ts
-import { join as join5 } from "path";
-import { existsSync as existsSync6 } from "fs";
+import { join as join6 } 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) => {
     await handleMerge(options);
@@ -954,12 +1098,16 @@ async function handleMerge(options) {
   validateMainWorktree();
   const mainWorktreePath = getGitTopLevel();
   const projectDir = getProjectWorktreeDir();
-  const targetWorktreePath = join5(projectDir, options.branch);
+  const targetWorktreePath = join6(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 (!existsSync6(targetWorktreePath)) {
+  if (!existsSync7(targetWorktreePath)) {
     throw new ClawtError(MESSAGES.WORKTREE_NOT_FOUND(options.branch));
   }
+  const projectName = getProjectName();
   if (!isWorkingDirClean(mainWorktreePath)) {
+    if (hasSnapshot(projectName, options.branch)) {
+      printWarning(MESSAGES.MERGE_VALIDATE_STATE_HINT(options.branch));
+    }
     throw new ClawtError(MESSAGES.MAIN_WORKTREE_DIRTY);
   }
   const shouldCleanup = await shouldCleanupAfterMerge(options.branch);
@@ -1000,6 +1148,9 @@ async function handleMerge(options) {
   if (shouldCleanup) {
     cleanupWorktreeAndBranch(targetWorktreePath, options.branch);
   }
+  if (hasSnapshot(projectName, options.branch)) {
+    removeSnapshot(projectName, options.branch);
+  }
 }
 
 // src/commands/config.ts
@@ -1046,6 +1197,7 @@ registerListCommand(program);
 registerCreateCommand(program);
 registerRemoveCommand(program);
 registerRunCommand(program);
+registerResumeCommand(program);
 registerValidateCommand(program);
 registerMergeCommand(program);
 registerConfigCommand(program);

package/dist/postinstall.js

@@ -10,6 +10,7 @@ var CLAWT_HOME = join(homedir(), ".clawt");
 var CONFIG_PATH = join(CLAWT_HOME, "config.json");
 var LOGS_DIR = join(CLAWT_HOME, "logs");
 var WORKTREES_DIR = join(CLAWT_HOME, "worktrees");
+var VALIDATE_SNAPSHOTS_DIR = join(CLAWT_HOME, "validate-snapshots");
 
 // src/constants/config.ts
 var CONFIG_DEFINITIONS = {