clawt 1.3.0 → 2.0.0

package/CLAUDE.md

@@ -24,7 +24,7 @@ npm i -g .        # 本地全局安装进行测试
 
 每个命令为独立文件 `src/commands/<name>.ts`，导出 `registerXxxCommand(program)` 函数，在 `src/index.ts` 中统一注册到 Commander。命令内部逻辑封装在对应的 `handleXxx` 函数中。
 
-八个命令：`create`、`run`、`resume`、`list`、`remove`、`validate`、`merge`、`config`。
+九个命令：`create`、`run`、`resume`、`list`、`remove`、`validate`、`merge`、`config`、`sync`。
 
 ### 核心流程（run 命令）
 
@@ -55,19 +55,31 @@ run 命令有两种模式：
 
 ### validate + merge 工作流
 
-- `validate`：将目标 worktree 的变更通过 git stash 迁移到主 worktree，便于在主 worktree 中测试。支持两种模式：
-  - **首次 validate**（无历史快照）：stash 迁移 → 保存纯净快照 patch → 结果：暂存区=空，工作目录=全量变更
-  - **增量 validate**（存在历史快照）：读取旧 patch → 清空主 worktree → stash 迁移最新变更 → 保存新快照 → 旧 patch 应用到暂存区 → 结果：暂存区=上次快照，工作目录=最新变更（可通过 `git diff` 查看增量差异）
+- `validate`：将目标分支的全量变更（已提交 + 未提交）通过 `git diff HEAD...branch --binary` 的 patch 方式迁移到主 worktree，便于在主 worktree 中测试。支持两种模式：
+  - **首次 validate**（无历史快照）：patch 迁移全量变更 → 保存纯净快照 patch + 主分支 HEAD hash → 结果：暂存区=空，工作目录=全量变更
+  - **增量 validate**（存在历史快照）：校验主分支 HEAD 一致性（不一致则清除旧快照降级为首次模式）→ 读取旧 patch → 确保主 worktree 干净 → patch 迁移最新变更 → 保存新快照 → 旧 patch 应用到暂存区 → 结果：暂存区=上次快照，工作目录=最新变更（可通过 `git diff` 查看增量差异）
   - `--clean` 选项：重置主 worktree + 删除对应快照文件
-  - 快照存储路径：`~/.clawt/validate-snapshots/<projectName>/<branchName>.patch`
+  - 快照存储路径：`~/.clawt/validate-snapshots/<projectName>/<branchName>.patch`（patch 文件）+ `<branchName>.head`（主分支 HEAD hash）
+  - 变更检测：同时检测目标 worktree 的未提交修改和已提交 commit，两者均无则提示无需验证
+  - 未提交修改处理：有未提交修改时先做临时 commit，diff 完成后通过 `git reset --soft` 撤销恢复原状
 - `merge`：检测目标 worktree 状态（有修改则需 `-m` 提交，已提交则跳过，无变更则报错）→ 合并到主 worktree → pull → push → 可选清理 worktree 和分支（受 `autoDeleteBranch` 配置或交互式确认控制）→ 清理对应的 validate 快照
 - `run` 中断清理：Ctrl+C 终止所有子进程后，根据 `autoDeleteBranch` 配置自动清理或交互式确认清理本次创建的 worktree 和分支
 
+### sync 命令流程
+
+1. `validateMainWorktree()` 确认在主 worktree 根目录
+2. 检查目标 worktree 是否存在
+3. 获取主分支名（`getCurrentBranch()`，不硬编码 main/master）
+4. 如果目标 worktree 有未提交变更，自动 `git add . && git commit` 保存
+5. 在目标 worktree 中执行 `git merge <mainBranch>` 合并主分支
+6. 冲突处理：有冲突时提示用户手动解决，无冲突则输出成功
+7. 合并成功后清除该分支的 validate 快照（代码基础已变化，旧快照无效）
+
 ### 目录层级
 
 - `src/commands/` — 各命令的注册与处理逻辑
-- `src/utils/` — 工具函数（git 操作、shell 执行与子进程管理、分支名处理、worktree 管理与批量清理、配置、格式化输出、交互式输入、Claude Code 交互式启动、validate 快照管理）
-- `src/constants/` — 常量定义（路径、退出码、消息模板、分支规则、配置默认值、终端控制序列、validate 快照目录）
+- `src/utils/` — 工具函数（git 操作（含三点 diff、分支合并、冲突检测等）、shell 执行与子进程管理、分支名处理、worktree 管理与批量清理、配置、格式化输出、交互式输入、Claude Code 交互式启动、validate 快照管理（含 HEAD hash 一致性校验））
+- `src/constants/` — 常量定义（路径、退出码、消息模板、分支规则、配置默认值、终端控制序列、validate 快照目录、sync 相关消息）
 - `src/types/` — TypeScript 类型定义
 - `src/errors/` — 自定义 `ClawtError` 错误类（携带退出码）
 - `src/logger/` — winston 日志（按日期滚动，写入 `~/.clawt/logs/`）

package/README.md

@@ -101,9 +101,11 @@ clawt validate -b <branchName> [--clean]
 | `-b` | 是 | 要验证的分支名 |
 | `--clean` | 否 | 清理 validate 状态（重置主 worktree 并删除快照） |
 
-将目标 worktree 的变更通过 `git stash` 迁移到主 worktree，方便在主 worktree 中直接测试，无需重新安装依赖。
+将目标 worktree 的变更通过 `git diff`（三点 diff）迁移到主 worktree，方便在主 worktree 中直接测试，无需重新安装依赖。同时检测未提交修改和已提交 commit，确保所有变更都能被捕获。
 
-支持增量模式：首次 validate 后会自动保存快照，再次 validate 同一分支时会将上次快照应用到暂存区、最新变更保留在工作目录，用户可通过 `git diff` 查看两次 validate 之间的增量差异。使用 `--clean` 可清理 validate 状态（重置主 worktree 并删除快照文件）。
+支持增量模式：首次 validate 后会自动保存快照（patch + 主分支 HEAD hash），再次 validate 同一分支时会先校验主分支 HEAD 一致性（不一致则降级为首次模式），然后将上次快照应用到暂存区、最新变更保留在工作目录，用户可通过 `git diff` 查看两次 validate 之间的增量差异。使用 `--clean` 可清理 validate 状态（重置主 worktree 并删除快照文件）。
+
+> **提示：** 如果 validate 时 patch apply 失败（目标分支与主分支差异过大），可先执行 `clawt sync -b <branchName>` 同步主分支后重试。
 
 ```bash
 # 首次验证
@@ -116,6 +118,23 @@ clawt validate -b feature-scheme-1
 clawt validate -b feature-scheme-1 --clean
 ```
 
+### `clawt sync` — 将主分支代码同步到目标 worktree
+
+```bash
+clawt sync -b <branchName>
+```
+
+| 参数 | 必填 | 说明 |
+| ---- | ---- | ---- |
+| `-b` | 是 | 要同步的分支名 |
+
+将主分支最新代码合并到目标 worktree 的分支中。如果目标 worktree 有未提交的修改，会自动保存后再合并。存在冲突时会提示用户手动解决。合并成功后会自动清除该分支的 validate 快照（代码基础已变化，旧快照无效）。
+
+```bash
+# 将主分支最新代码同步到目标 worktree
+clawt sync -b feature-scheme-1
+```
+
 ### `clawt merge` — 合并分支到主 worktree
 
 ```bash
@@ -149,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

@@ -42,8 +42,6 @@ var MESSAGES = {
   MAIN_WORKTREE_DIRTY: "\u4E3B worktree \u6709\u672A\u63D0\u4EA4\u7684\u66F4\u6539\uFF0C\u8BF7\u5148\u5904\u7406",
   /** 目标 worktree 无更改 */
   TARGET_WORKTREE_CLEAN: "\u8BE5 worktree \u7684\u5206\u652F\u4E0A\u6CA1\u6709\u4EFB\u4F55\u66F4\u6539\uFF0C\u65E0\u9700\u9A8C\u8BC1",
-  /** stash 已变更 */
-  STASH_CHANGED: "git stash list \u5DF2\u53D8\u66F4\uFF0C\u8BF7\u91CD\u65B0\u6267\u884C",
   /** validate 成功 */
   VALIDATE_SUCCESS: (branch) => `\u2713 \u5DF2\u5C06\u5206\u652F ${branch} \u7684\u53D8\u66F4\u5E94\u7528\u5230\u4E3B worktree
   \u53EF\u4EE5\u5F00\u59CB\u9A8C\u8BC1\u4E86`,
@@ -90,10 +88,21 @@ var MESSAGES = {
   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`
+  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`,
+  /** sync 自动保存未提交变更 */
+  SYNC_AUTO_COMMITTED: (branch) => `\u5DF2\u81EA\u52A8\u4FDD\u5B58 ${branch} \u5206\u652F\u7684\u672A\u63D0\u4EA4\u53D8\u66F4`,
+  /** sync 开始合并 */
+  SYNC_MERGING: (targetBranch, mainBranch) => `\u6B63\u5728\u5C06 ${mainBranch} \u5408\u5E76\u5230 ${targetBranch} ...`,
+  /** sync 成功 */
+  SYNC_SUCCESS: (targetBranch, mainBranch) => `\u2713 \u5DF2\u5C06 ${mainBranch} \u7684\u6700\u65B0\u4EE3\u7801\u540C\u6B65\u5230 ${targetBranch}`,
+  /** 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`,
+  /** 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`
 };
 
 // src/constants/exitCodes.ts
@@ -282,19 +291,6 @@ function gitCleanForce(cwd) {
 function gitStashPush(message, cwd) {
   execCommand(`git stash push -m "${message}"`, { cwd });
 }
-function gitStashApply(cwd) {
-  execCommand("git stash apply", { cwd });
-}
-function gitStashPop(index = 0, cwd) {
-  execCommand(`git stash pop stash@{${index}}`, { cwd });
-}
-function gitStashList(cwd) {
-  try {
-    return execCommand("git stash list", { cwd });
-  } catch {
-    return "";
-  }
-}
 function gitRestoreStaged(cwd) {
   execCommand("git restore --staged .", { cwd });
 }
@@ -329,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})` : ""}`);
@@ -349,6 +339,25 @@ function gitDiffCachedBinary(cwd) {
 function gitApplyCachedFromStdin(patchContent, cwd) {
   execCommandWithInput("git", ["apply", "--cached"], { input: patchContent, cwd });
 }
+function getCurrentBranch(cwd) {
+  return execCommand("git rev-parse --abbrev-ref HEAD", { cwd });
+}
+function getHeadCommitHash(cwd) {
+  return execCommand("git rev-parse HEAD", { cwd });
+}
+function gitDiffBinaryAgainstBranch(branchName, cwd) {
+  logger.debug(`\u6267\u884C\u547D\u4EE4: git diff HEAD...${branchName} --binary${cwd ? ` (cwd: ${cwd})` : ""}`);
+  return execSync2(`git diff HEAD...${branchName} --binary`, {
+    cwd,
+    stdio: ["pipe", "pipe", "pipe"]
+  });
+}
+function gitApplyFromStdin(patchContent, cwd) {
+  execCommandWithInput("git", ["apply"], { input: patchContent, cwd });
+}
+function gitResetSoft(count = 1, cwd) {
+  execCommand(`git reset --soft HEAD~${count}`, { cwd });
+}
 
 // src/utils/formatter.ts
 import chalk from "chalk";
@@ -530,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) {
@@ -604,6 +613,9 @@ import { existsSync as existsSync5, readFileSync as readFileSync2, writeFileSync
 function getSnapshotPath(projectName, branchName) {
   return join3(VALIDATE_SNAPSHOTS_DIR, projectName, `${branchName}.patch`);
 }
+function getSnapshotHeadPath(projectName, branchName) {
+  return join3(VALIDATE_SNAPSHOTS_DIR, projectName, `${branchName}.head`);
+}
 function hasSnapshot(projectName, branchName) {
   return existsSync5(getSnapshotPath(projectName, branchName));
 }
@@ -612,11 +624,14 @@ function readSnapshot(projectName, branchName) {
   logger.debug(`\u8BFB\u53D6 validate \u5FEB\u7167: ${snapshotPath}`);
   return readFileSync2(snapshotPath);
 }
-function writeSnapshot(projectName, branchName, patch) {
+function writeSnapshot(projectName, branchName, patch, headHash) {
   const snapshotPath = getSnapshotPath(projectName, branchName);
   const snapshotDir = join3(VALIDATE_SNAPSHOTS_DIR, projectName);
   ensureDir(snapshotDir);
   writeFileSync2(snapshotPath, patch);
+  if (headHash) {
+    writeFileSync2(getSnapshotHeadPath(projectName, branchName), headHash, "utf-8");
+  }
   logger.info(`\u5DF2\u4FDD\u5B58 validate \u5FEB\u7167: ${snapshotPath}`);
 }
 function removeSnapshot(projectName, branchName) {
@@ -625,6 +640,17 @@ function removeSnapshot(projectName, branchName) {
     unlinkSync(snapshotPath);
     logger.info(`\u5DF2\u5220\u9664 validate \u5FEB\u7167: ${snapshotPath}`);
   }
+  const headPath = getSnapshotHeadPath(projectName, branchName);
+  if (existsSync5(headPath)) {
+    unlinkSync(headPath);
+  }
+}
+function readSnapshotHead(projectName, branchName) {
+  const headPath = getSnapshotHeadPath(projectName, branchName);
+  if (!existsSync5(headPath)) {
+    return null;
+  }
+  return readFileSync2(headPath, "utf-8").trim();
 }
 
 // src/commands/list.ts
@@ -686,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;
@@ -701,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}-`)
   );
@@ -943,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) {
@@ -985,24 +1000,37 @@ async function handleDirtyMainWorktree(mainWorktreePath) {
     throw new ClawtError("\u5DE5\u4F5C\u533A\u4ECD\u7136\u4E0D\u5E72\u51C0\uFF0C\u8BF7\u624B\u52A8\u5904\u7406");
   }
 }
-function migrateChangesViaStash(targetWorktreePath, mainWorktreePath, branchName) {
-  const stashMessage = `clawt:validate:${branchName}`;
-  gitAddAll(targetWorktreePath);
-  gitStashPush(stashMessage, targetWorktreePath);
-  gitStashApply(targetWorktreePath);
-  gitRestoreStaged(targetWorktreePath);
-  const stashList = gitStashList(mainWorktreePath);
-  const firstLine = stashList.split("\n")[0] || "";
-  if (!firstLine.includes(stashMessage)) {
-    throw new ClawtError(MESSAGES.STASH_CHANGED);
+function migrateChangesViaPatch(targetWorktreePath, mainWorktreePath, branchName, hasUncommitted) {
+  let didTempCommit = false;
+  try {
+    if (hasUncommitted) {
+      gitAddAll(targetWorktreePath);
+      gitCommit("clawt:temp-commit-for-validate", targetWorktreePath);
+      didTempCommit = true;
+    }
+    const patch = gitDiffBinaryAgainstBranch(branchName, mainWorktreePath);
+    if (patch.length > 0) {
+      try {
+        gitApplyFromStdin(patch, mainWorktreePath);
+      } catch (error) {
+        logger.warn(`patch apply \u5931\u8D25: ${error}`);
+        printWarning(MESSAGES.VALIDATE_PATCH_APPLY_FAILED(branchName));
+        throw error;
+      }
+    }
+  } finally {
+    if (didTempCommit) {
+      gitResetSoft(1, targetWorktreePath);
+      gitRestoreStaged(targetWorktreePath);
+    }
   }
-  gitStashPop(0, mainWorktreePath);
 }
 function saveCurrentSnapshotPatch(mainWorktreePath, projectName, branchName) {
   gitAddAll(mainWorktreePath);
   const patch = gitDiffCachedBinary(mainWorktreePath);
   gitRestoreStaged(mainWorktreePath);
-  writeSnapshot(projectName, branchName, patch);
+  const headHash = getHeadCommitHash(mainWorktreePath);
+  writeSnapshot(projectName, branchName, patch, headHash);
   return patch;
 }
 function handleValidateClean(options) {
@@ -1017,18 +1045,19 @@ function handleValidateClean(options) {
   removeSnapshot(projectName, options.branch);
   printSuccess(MESSAGES.VALIDATE_CLEANED(options.branch));
 }
-function handleFirstValidate(targetWorktreePath, mainWorktreePath, projectName, branchName) {
-  migrateChangesViaStash(targetWorktreePath, mainWorktreePath, branchName);
+function handleFirstValidate(targetWorktreePath, mainWorktreePath, projectName, branchName, hasUncommitted) {
+  migrateChangesViaPatch(targetWorktreePath, mainWorktreePath, branchName, hasUncommitted);
   saveCurrentSnapshotPatch(mainWorktreePath, projectName, branchName);
   printSuccess(MESSAGES.VALIDATE_SUCCESS(branchName));
 }
-function handleIncrementalValidate(targetWorktreePath, mainWorktreePath, projectName, branchName) {
+function handleIncrementalValidate(targetWorktreePath, mainWorktreePath, projectName, branchName, hasUncommitted) {
   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 (!isWorkingDirClean(mainWorktreePath)) {
+    gitResetHard(mainWorktreePath);
+    gitCleanForce(mainWorktreePath);
+  }
+  migrateChangesViaPatch(targetWorktreePath, mainWorktreePath, branchName, hasUncommitted);
+  saveCurrentSnapshotPatch(mainWorktreePath, projectName, branchName);
   if (oldPatch.length > 0) {
     try {
       gitApplyCachedFromStdin(oldPatch, mainWorktreePath);
@@ -1050,32 +1079,42 @@ 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));
   }
-  const isIncremental = hasSnapshot(projectName, options.branch);
+  const hasUncommitted = !isWorkingDirClean(targetWorktreePath);
+  const hasCommitted = hasLocalCommits(options.branch, mainWorktreePath);
+  if (!hasUncommitted && !hasCommitted) {
+    printInfo(MESSAGES.TARGET_WORKTREE_CLEAN);
+    return;
+  }
+  let isIncremental = hasSnapshot(projectName, options.branch);
   if (isIncremental) {
-    if (isWorkingDirClean(targetWorktreePath)) {
-      printInfo(MESSAGES.TARGET_WORKTREE_CLEAN);
-      return;
+    const savedHead = readSnapshotHead(projectName, options.branch);
+    const currentHead = getHeadCommitHash(mainWorktreePath);
+    if (!savedHead || savedHead !== currentHead) {
+      logger.info(`\u4E3B\u5206\u652F HEAD \u4E0D\u5339\u914D (${savedHead ?? "null"} \u2192 ${currentHead})\uFF0C\u6E05\u9664\u65E7\u5FEB\u7167`);
+      removeSnapshot(projectName, options.branch);
+      isIncremental = false;
     }
-    handleIncrementalValidate(targetWorktreePath, mainWorktreePath, projectName, options.branch);
-  } else {
+  }
+  if (isIncremental) {
     if (!isWorkingDirClean(mainWorktreePath)) {
       await handleDirtyMainWorktree(mainWorktreePath);
     }
-    if (isWorkingDirClean(targetWorktreePath)) {
-      printInfo(MESSAGES.TARGET_WORKTREE_CLEAN);
-      return;
+    handleIncrementalValidate(targetWorktreePath, mainWorktreePath, projectName, options.branch, hasUncommitted);
+  } else {
+    if (!isWorkingDirClean(mainWorktreePath)) {
+      await handleDirtyMainWorktree(mainWorktreePath);
     }
-    handleFirstValidate(targetWorktreePath, mainWorktreePath, projectName, options.branch);
+    handleFirstValidate(targetWorktreePath, mainWorktreePath, projectName, options.branch, hasUncommitted);
   }
 }
 
 // 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) => {
@@ -1098,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));
@@ -1187,6 +1226,58 @@ function formatConfigValue(value) {
   return chalk3.cyan(String(value));
 }
 
+// src/commands/sync.ts
+import { existsSync as existsSync8 } from "fs";
+function registerSyncCommand(program2) {
+  program2.command("sync").description("\u5C06\u4E3B\u5206\u652F\u6700\u65B0\u4EE3\u7801\u540C\u6B65\u5230\u76EE\u6807 worktree").requiredOption("-b, --branch <branchName>", "\u8981\u540C\u6B65\u7684\u5206\u652F\u540D").action(async (options) => {
+    await handleSync(options);
+  });
+}
+function autoSaveChanges(worktreePath, branch) {
+  gitAddAll(worktreePath);
+  gitCommit("chore: auto-save before sync", worktreePath);
+  printInfo(MESSAGES.SYNC_AUTO_COMMITTED(branch));
+  logger.info(`\u5DF2\u81EA\u52A8\u4FDD\u5B58 ${branch} \u5206\u652F\u7684\u672A\u63D0\u4EA4\u53D8\u66F4`);
+}
+function mergeMainBranch(worktreePath, mainBranch) {
+  try {
+    gitMerge(mainBranch, worktreePath);
+    return false;
+  } catch {
+    if (hasMergeConflict(worktreePath)) {
+      return true;
+    }
+    throw new ClawtError(`\u5408\u5E76 ${mainBranch} \u5931\u8D25`);
+  }
+}
+async function handleSync(options) {
+  validateMainWorktree();
+  const { branch } = options;
+  logger.info(`sync \u547D\u4EE4\u6267\u884C\uFF0C\u5206\u652F: ${branch}`);
+  const projectWorktreeDir = getProjectWorktreeDir();
+  const targetWorktreePath = `${projectWorktreeDir}/${branch}`;
+  if (!existsSync8(targetWorktreePath)) {
+    throw new ClawtError(MESSAGES.WORKTREE_NOT_FOUND(branch));
+  }
+  const mainWorktreePath = getGitTopLevel();
+  const mainBranch = getCurrentBranch(mainWorktreePath);
+  if (!isWorkingDirClean(targetWorktreePath)) {
+    autoSaveChanges(targetWorktreePath, branch);
+  }
+  printInfo(MESSAGES.SYNC_MERGING(branch, mainBranch));
+  const hasConflict = mergeMainBranch(targetWorktreePath, mainBranch);
+  if (hasConflict) {
+    printWarning(MESSAGES.SYNC_CONFLICT(targetWorktreePath));
+    return;
+  }
+  const projectName = getProjectName();
+  if (hasSnapshot(projectName, branch)) {
+    removeSnapshot(projectName, branch);
+    logger.info(`\u5DF2\u6E05\u9664\u5206\u652F ${branch} \u7684 validate \u5FEB\u7167`);
+  }
+  printSuccess(MESSAGES.SYNC_SUCCESS(branch, mainBranch));
+}
+
 // src/index.ts
 var require2 = createRequire(import.meta.url);
 var { version } = require2("../package.json");
@@ -1201,6 +1292,7 @@ registerResumeCommand(program);
 registerValidateCommand(program);
 registerMergeCommand(program);
 registerConfigCommand(program);
+registerSyncCommand(program);
 process.on("uncaughtException", (error) => {
   if (error instanceof ClawtError) {
     printError(error.message);