clawt 1.4.0 → 2.1.0

package/CLAUDE.md

@@ -62,7 +62,7 @@ run 命令有两种模式：
   - 快照存储路径：`~/.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 快照
+- `merge`：检测目标 worktree 状态（有修改则需 `-m` 提交，已提交则跳过，无变更则报错）→ **squash 检测**（检查目标分支是否存在 `AUTO_SAVE_COMMIT_MESSAGE` 前缀的 auto-save commit，如有则提示用户是否压缩所有提交：用户确认后通过 `gitMergeBase` 计算分叉点、`gitResetSoftTo` 将所有 commit reset 到暂存区；有 `-m` 则直接提交继续流程，无 `-m` 则提示用户自行提交后退出）→ 合并到主 worktree → pull → push → 可选清理 worktree 和分支（受 `autoDeleteBranch` 配置或交互式确认控制）→ 清理对应的 validate 快照
 - `run` 中断清理：Ctrl+C 终止所有子进程后，根据 `autoDeleteBranch` 配置自动清理或交互式确认清理本次创建的 worktree 和分支
 
 ### sync 命令流程
@@ -78,8 +78,8 @@ run 命令有两种模式：
 ### 目录层级
 
 - `src/commands/` — 各命令的注册与处理逻辑
-- `src/utils/` — 工具函数（git 操作（含三点 diff、分支合并、冲突检测等）、shell 执行与子进程管理、分支名处理、worktree 管理与批量清理、配置、格式化输出、交互式输入、Claude Code 交互式启动、validate 快照管理（含 HEAD hash 一致性校验））
-- `src/constants/` — 常量定义（路径、退出码、消息模板、分支规则、配置默认值、终端控制序列、validate 快照目录、sync 相关消息）
+- `src/utils/` — 工具函数（git 操作（含三点 diff、分支合并、冲突检测、merge-base 计算、commit message 检测、soft reset 到指定 commit 等）、shell 执行与子进程管理、分支名处理、worktree 管理与批量清理、配置、格式化输出、交互式输入、Claude Code 交互式启动、validate 快照管理（含 HEAD hash 一致性校验））
+- `src/constants/` — 常量定义（路径、退出码、消息模板、分支规则、配置默认值、终端控制序列、validate 快照目录、sync 相关消息、git 常量（如 `AUTO_SAVE_COMMIT_MESSAGE`）、squash 相关消息）
 - `src/types/` — TypeScript 类型定义
 - `src/errors/` — 自定义 `ClawtError` 错误类（携带退出码）
 - `src/logger/` — winston 日志（按日期滚动，写入 `~/.clawt/logs/`）

package/README.md

@@ -148,6 +148,8 @@ clawt merge -b <branchName> [-m <commitMessage>]
 
 将目标 worktree 的变更合并到主 worktree 的当前分支，并推送到远程仓库。如果目标 worktree 工作区有未提交的修改，需要通过 `-m` 提供提交信息；如果目标 worktree 已经提交过（工作区干净但有本地提交），可以省略 `-m` 直接合并。merge 成功后会询问是否清理对应的 worktree 和分支（如果配置了 `autoDeleteBranch: true` 则自动清理）。
 
+如果检测到目标分支存在 `clawt sync` 产生的临时提交（auto-save commit），会自动提示是否将所有提交压缩（squash）为一个。用户选择压缩后，所有 commit 会被 reset 到暂存区：如果提供了 `-m` 则直接提交并继续合并流程；如果未提供 `-m` 则提示用户前往目标 worktree 自行提交后重新执行 merge。
+
 ```bash
 # 目标 worktree 有未提交修改，需提供 -m
 clawt merge -b feature-scheme-1 -m "feat: 实现用户登录功能"
@@ -168,11 +170,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

@@ -102,7 +102,16 @@ var MESSAGES = {
   \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`
+  \u8BF7\u5148\u6267\u884C clawt sync -b ${branch} \u540C\u6B65\u4E3B\u5206\u652F\u540E\u91CD\u8BD5`,
+  /** merge 检测到 auto-save 提交，提示用户是否压缩 */
+  MERGE_SQUASH_PROMPT: "\u68C0\u6D4B\u5230 sync \u4EA7\u751F\u7684\u4E34\u65F6\u63D0\u4EA4\uFF0C\u662F\u5426\u5C06\u6240\u6709\u63D0\u4EA4\u538B\u7F29\u4E3A\u4E00\u4E2A\uFF1F\n  \u538B\u7F29\u540E\u53D8\u66F4\u5C06\u4FDD\u7559\u5728\u76EE\u6807worktree\u7684\u6682\u5B58\u533A\uFF0C\u9700\u8981\u91CD\u65B0\u63D0\u4EA4\uFF08\u53EF\u4F7F\u7528 Claude Code Cli\u6216\u5176\u4ED6\u5DE5\u5177\u751F\u6210\u63D0\u4EA4\u4FE1\u606F\uFF09",
+  /** squash 完成且通过 -m 直接提交后的提示 */
+  MERGE_SQUASH_COMMITTED: (branch) => `\u2713 \u5DF2\u5C06\u5206\u652F ${branch} \u7684\u6240\u6709\u63D0\u4EA4\u538B\u7F29\u4E3A\u4E00\u4E2A`,
+  /** squash 完成但未提供 -m，提示用户自行提交 */
+  MERGE_SQUASH_PENDING: (worktreePath, branch) => `\u2713 \u5DF2\u5C06\u6240\u6709\u63D0\u4EA4\u538B\u7F29\u5230\u6682\u5B58\u533A
+  \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}`
 };
 
 // src/constants/exitCodes.ts
@@ -146,6 +155,9 @@ function deriveConfigDescriptions(definitions) {
 var DEFAULT_CONFIG = deriveDefaultConfig(CONFIG_DEFINITIONS);
 var CONFIG_DESCRIPTIONS = deriveConfigDescriptions(CONFIG_DEFINITIONS);
 
+// src/constants/git.ts
+var AUTO_SAVE_COMMIT_MESSAGE = "chore: auto-save before sync";
+
 // src/errors/index.ts
 var ClawtError = class extends Error {
   /** 退出码 */
@@ -325,15 +337,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})` : ""}`);
@@ -364,6 +370,21 @@ function gitApplyFromStdin(patchContent, cwd) {
 function gitResetSoft(count = 1, cwd) {
   execCommand(`git reset --soft HEAD~${count}`, { cwd });
 }
+function gitMergeBase(branchA, branchB, cwd) {
+  return execCommand(`git merge-base ${branchA} ${branchB}`, { cwd });
+}
+function hasCommitWithMessage(branchName, messagePrefix, cwd) {
+  try {
+    const output = execCommand(`git log HEAD..${branchName} --format=%s`, { cwd });
+    if (!output.trim()) return false;
+    return output.trim().split("\n").some((msg) => msg.startsWith(messagePrefix));
+  } catch {
+    return false;
+  }
+}
+function gitResetSoftTo(commitHash, cwd) {
+  execCommand(`git reset --soft ${commitHash}`, { cwd });
+}
 
 // src/utils/formatter.ts
 import chalk from "chalk";
@@ -545,7 +566,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) {
@@ -718,14 +739,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;
@@ -733,15 +752,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}-`)
   );
@@ -975,7 +985,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) {
@@ -1096,7 +1106,7 @@ 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));
@@ -1131,13 +1141,33 @@ async function handleValidate(options) {
 }
 
 // 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) => {
     await handleMerge(options);
   });
 }
+async function handleSquashIfNeeded(targetWorktreePath, mainWorktreePath, branchName, commitMessage) {
+  if (!hasCommitWithMessage(branchName, AUTO_SAVE_COMMIT_MESSAGE, mainWorktreePath)) {
+    return false;
+  }
+  const shouldSquash = await confirmAction(MESSAGES.MERGE_SQUASH_PROMPT);
+  if (!shouldSquash) {
+    return false;
+  }
+  const mainBranch = getCurrentBranch(mainWorktreePath);
+  const mergeBase = gitMergeBase(mainBranch, branchName, mainWorktreePath);
+  logger.info(`squash: merge-base = ${mergeBase}, \u5206\u652F = ${branchName}`);
+  gitResetSoftTo(mergeBase, targetWorktreePath);
+  if (commitMessage) {
+    gitCommit(commitMessage, targetWorktreePath);
+    printSuccess(MESSAGES.MERGE_SQUASH_COMMITTED(branchName));
+    return false;
+  }
+  printInfo(MESSAGES.MERGE_SQUASH_PENDING(targetWorktreePath, branchName));
+  return true;
+}
 async function shouldCleanupAfterMerge(branchName) {
   const autoDelete = getConfigValue("autoDeleteBranch");
   if (autoDelete) {
@@ -1154,7 +1184,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));
@@ -1166,6 +1196,10 @@ async function handleMerge(options) {
     }
     throw new ClawtError(MESSAGES.MAIN_WORKTREE_DIRTY);
   }
+  const shouldExit = await handleSquashIfNeeded(targetWorktreePath, mainWorktreePath, options.branch, options.message);
+  if (shouldExit) {
+    return;
+  }
   const shouldCleanup = await shouldCleanupAfterMerge(options.branch);
   const targetClean = isWorkingDirClean(targetWorktreePath);
   if (!targetClean) {
@@ -1252,7 +1286,7 @@ function registerSyncCommand(program2) {
 }
 function autoSaveChanges(worktreePath, branch) {
   gitAddAll(worktreePath);
-  gitCommit("chore: auto-save before sync", worktreePath);
+  gitCommit(AUTO_SAVE_COMMIT_MESSAGE, worktreePath);
   printInfo(MESSAGES.SYNC_AUTO_COMMITTED(branch));
   logger.info(`\u5DF2\u81EA\u52A8\u4FDD\u5B58 ${branch} \u5206\u652F\u7684\u672A\u63D0\u4EA4\u53D8\u66F4`);
 }

package/docs/spec.md

@@ -522,8 +522,7 @@ clawt remove [options]
 | 参数      | 说明                                                       |
 | --------- | ---------------------------------------------------------- |
 | `--all`   | 移除当前项目 (`~/.clawt/worktrees/<project>/`) 下所有 worktree |
-| `-b <branchName>` | 移除指定 branchName 下的所有 worktree               |
-| `-b <branchName> -i <index>` | 移除指定 branchName 的某一个 worktree (如 `branchName-2`) |
+| `-b <branchName>` | 移除匹配 branchName 或 branchName-* 的 worktree      |
 
 **三种移除粒度：**
 
@@ -531,7 +530,7 @@ clawt remove [options]
 | ---- | ---------------------------------------- | ------------------------------------------------------------- |
 | 全部 | `clawt remove --all`                     | `~/.clawt/worktrees/<project>/` 下所有 worktree                |
 | 分支 | `clawt remove -b feature-scheme`         | `~/.clawt/worktrees/<project>/feature-scheme-*` 的所有 worktree |
-| 单个 | `clawt remove -b feature-scheme -i 2`    | 仅移除 `~/.clawt/worktrees/<project>/feature-scheme-2`          |
+| 单个 | `clawt remove -b feature-scheme-2`       | 仅移除 `feature-scheme-2` 对应的 worktree（完整分支名精确匹配）    |
 
 **运行流程：**
 
@@ -590,7 +589,22 @@ clawt merge -b <branchName> [-m <commitMessage>]
      - 如果存在该分支的 validate 快照（`~/.clawt/validate-snapshots/<project>/<branchName>.patch`），额外输出警告提示用户可先执行 `clawt validate -b <branchName> --clean` 清理
      - 提示 `主 worktree 有未提交的更改，请先处理`，退出
    - 无更改 → 继续
-3. **根据目标 worktree 状态决定是否需要提交**
+3. **Squash 检测与执行（auto-save 临时提交压缩）**
+   - 通过 `git log HEAD..<branchName> --format=%s` 检查目标分支是否存在以 `AUTO_SAVE_COMMIT_MESSAGE`（`chore: auto-save before sync`）为前缀的 commit
+   - **不存在** → 跳过，进入步骤 4
+   - **存在** → 提示用户是否将所有提交压缩为一个：
+     ```
+     检测到 sync 产生的临时提交，是否将所有提交压缩为一个？
+       压缩后变更将保留在目标worktree的暂存区，需要重新提交
+     ```
+   - **用户选择不压缩** → 跳过，进入步骤 4
+   - **用户选择压缩** →
+     1. 获取主分支名（`git rev-parse --abbrev-ref HEAD`）
+     2. 计算分叉点：`git merge-base <mainBranch> <branchName>`
+     3. 在目标 worktree 中执行 `git reset --soft <merge-base>`，将所有 commit 撤销到暂存区
+     4. 如果用户提供了 `-m` → 直接在目标 worktree 执行 `git commit -m '<commitMessage>'`，输出成功提示，继续步骤 4
+     5. 如果用户未提供 `-m` → 提示用户前往目标 worktree 自行提交后重新执行 `clawt merge`，**退出流程**
+4. **根据目标 worktree 状态决定是否需要提交**
    - 检测目标 worktree 工作区是否干净（`git status --porcelain`）
    - **工作区有未提交修改**：
      - 如果用户未提供 `-m`，提示 `目标 worktree 有未提交的修改，请通过 -m 参数提供提交信息`，退出
@@ -604,21 +618,21 @@ clawt merge -b <branchName> [-m <commitMessage>]
      - 检查目标分支相对于主分支是否有本地提交（`git log HEAD..<branchName> --oneline`）
      - 有本地提交 → 跳过提交步骤，直接进入合并
      - 无本地提交 → 提示 `目标 worktree 没有任何可合并的变更（工作区干净且无本地提交）`，退出
-4. **回到主 worktree 进行合并**
+5. **回到主 worktree 进行合并**
    ```bash
    cd <主 worktree 路径>
    git merge <branchName>
    ```
-5. **冲突检测**
+6. **冲突检测**
    - 检查 merge 退出码及 `git status` 是否存在冲突
    - **有冲突** → 提示 `合并存在冲突，请手动处理`，退出
    - **无冲突** → 继续
-6. **推送**
+7. **推送**
    ```bash
    git pull
    git push
    ```
-7. **输出成功提示**
+8. **输出成功提示**
 
 ```
 # 提供了 -m 时
@@ -631,7 +645,7 @@ clawt merge -b <branchName> [-m <commitMessage>]
   已推送到远程仓库
 ```
 
-8. **merge 成功后清理 worktree 和分支（可选）**
+9. **merge 成功后清理 worktree 和分支（可选）**
    - 如果配置文件中 `autoDeleteBranch` 为 `true`，自动执行清理
    - 否则交互式询问用户是否清理
    - 用户确认后，依次执行：
@@ -646,8 +660,8 @@ clawt merge -b <branchName> [-m <commitMessage>]
      ```
    - 输出清理成功提示：`✓ 已清理 worktree 和分支: <branchName>`
 
-9. **清理 validate 快照**
-   - merge 成功后，如果存在该分支的 validate 快照（`~/.clawt/validate-snapshots/<project>/<branchName>.patch`），自动删除该快照文件（merge 成功后快照已无意义）
+10. **清理 validate 快照**
+    - merge 成功后，如果存在该分支的 validate 快照（`~/.clawt/validate-snapshots/<project>/<branchName>.patch`），自动删除该快照文件（merge 成功后快照已无意义）
 
 > **注意：** 清理确认在 merge 操作之前询问（避免 merge 成功后因交互中断而遗留未清理的 worktree），但清理操作在 merge 成功后才执行。
 
@@ -852,7 +866,7 @@ clawt sync -b <branchName>
    - 不存在 → 报错退出
 3. **获取主分支名**：通过 `git rev-parse --abbrev-ref HEAD` 获取主 worktree 当前分支名（不硬编码 main/master）
 4. **自动保存未提交变更**：检查目标 worktree 是否有未提交修改
-   - 有修改 → 自动执行 `git add . && git commit -m "chore: auto-save before sync"` 保存变更
+   - 有修改 → 自动执行 `git add . && git commit -m "<AUTO_SAVE_COMMIT_MESSAGE>"` 保存变更（commit message 由常量 `AUTO_SAVE_COMMIT_MESSAGE` 定义，值为 `chore: auto-save before sync`，同时用于 merge 命令的 squash 检测）
    - 无修改 → 跳过
 5. **在目标 worktree 中合并主分支**：
    ```bash

package/package.json

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

package/src/commands/merge.ts

@@ -3,7 +3,7 @@ import { join } from 'node:path';
 import { existsSync } from 'node:fs';
 import { logger } from '../logger/index.js';
 import { ClawtError } from '../errors/index.js';
-import { MESSAGES } from '../constants/index.js';
+import { MESSAGES, AUTO_SAVE_COMMIT_MESSAGE } from '../constants/index.js';
 import type { MergeOptions } from '../types/index.js';
 import {
   validateMainWorktree,
@@ -26,6 +26,10 @@ import {
   getConfigValue,
   confirmAction,
   cleanupWorktrees,
+  hasCommitWithMessage,
+  gitMergeBase,
+  gitResetSoftTo,
+  getCurrentBranch,
 } from '../utils/index.js';
 
 /**
@@ -43,6 +47,52 @@ export function registerMergeCommand(program: Command): void {
     });
 }
 
+/**
+ * 检测并处理目标分支的 auto-save 提交压缩
+ * 如果检测到 sync 产生的临时提交，提示用户是否将所有提交压缩为一个
+ * @param {string} targetWorktreePath - 目标 worktree 路径
+ * @param {string} mainWorktreePath - 主 worktree 路径
+ * @param {string} branchName - 分支名
+ * @param {string} [commitMessage] - 用户提供的提交信息
+ * @returns {Promise<boolean>} 是否需要退出 merge 流程（用户选择 squash 但未提供 -m 时返回 true）
+ */
+async function handleSquashIfNeeded(
+  targetWorktreePath: string,
+  mainWorktreePath: string,
+  branchName: string,
+  commitMessage?: string,
+): Promise<boolean> {
+  // 检查目标分支是否存在 auto-save commit
+  if (!hasCommitWithMessage(branchName, AUTO_SAVE_COMMIT_MESSAGE, mainWorktreePath)) {
+    return false;
+  }
+
+  // 提示用户是否压缩
+  const shouldSquash = await confirmAction(MESSAGES.MERGE_SQUASH_PROMPT);
+  if (!shouldSquash) {
+    return false;
+  }
+
+  // 获取当前主分支名并计算分叉点
+  const mainBranch = getCurrentBranch(mainWorktreePath);
+  const mergeBase = gitMergeBase(mainBranch, branchName, mainWorktreePath);
+  logger.info(`squash: merge-base = ${mergeBase}, 分支 = ${branchName}`);
+
+  // 在目标 worktree 中执行 reset --soft 到分叉点
+  gitResetSoftTo(mergeBase, targetWorktreePath);
+
+  if (commitMessage) {
+    // 有 -m 参数，直接提交
+    gitCommit(commitMessage, targetWorktreePath);
+    printSuccess(MESSAGES.MERGE_SQUASH_COMMITTED(branchName));
+    return false;
+  }
+
+  // 没有 -m 参数，提示用户自行提交
+  printInfo(MESSAGES.MERGE_SQUASH_PENDING(targetWorktreePath, branchName));
+  return true;
+}
+
 /**
  * 判断 merge 成功后是否需要清理 worktree 和分支
  * 如果全局配置了 autoDeleteBranch 则直接返回 true，否则询问用户
@@ -97,6 +147,12 @@ async function handleMerge(options: MergeOptions): Promise<void> {
     throw new ClawtError(MESSAGES.MAIN_WORKTREE_DIRTY);
   }
 
+  // 步骤 3.5：检测是否需要 squash（sync 临时提交压缩）
+  const shouldExit = await handleSquashIfNeeded(targetWorktreePath, mainWorktreePath, options.branch, options.message);
+  if (shouldExit) {
+    return;
+  }
+
   // merge 前确认是否清理 worktree 和分支
   const shouldCleanup = await shouldCleanupAfterMerge(options.branch);
 

package/src/commands/remove.ts

@@ -1,6 +1,4 @@
 import type { Command } from 'commander';
-import { join } from 'node:path';
-import { existsSync, readdirSync } from 'node:fs';
 import { logger } from '../logger/index.js';
 import { ClawtError } from '../errors/index.js';
 import { MESSAGES } from '../constants/index.js';
@@ -29,8 +27,7 @@ export function registerRemoveCommand(program: Command): void {
     .command('remove')
     .description('移除 worktree（支持单个/批量/全部）')
     .option('--all', '移除当前项目下所有 worktree')
-    .option('-b, --branch <branchName>', '指定分支名')
-    .option('-i, --index <index>', '指定索引（配合 -b 使用）')
+    .option('-b, --branch <branchName>', '指定分支名（完整分支名精确匹配）')
     .action(async (options: RemoveOptions) => {
       await handleRemove(options);
     });
@@ -42,7 +39,6 @@ export function registerRemoveCommand(program: Command): void {
  * @returns {Array<{path: string, branch: string}>} 待移除的 worktree 列表
  */
 function resolveWorktreesToRemove(options: RemoveOptions): Array<{ path: string; branch: string }> {
-  const projectDir = getProjectWorktreeDir();
   const allWorktrees = getProjectWorktrees();
 
   if (options.all) {
@@ -53,23 +49,12 @@ function resolveWorktreesToRemove(options: RemoveOptions): Array<{ path: string;
     throw new ClawtError('请指定 --all 或 -b <branchName> 参数');
   }
 
-  if (options.index !== undefined) {
-    // 单个移除：branchName-<index>
-    const targetName = `${options.branch}-${options.index}`;
-    const targetPath = join(projectDir, targetName);
-    const found = allWorktrees.find((wt) => wt.path === targetPath);
-    if (!found) {
-      throw new ClawtError(MESSAGES.WORKTREE_NOT_FOUND(targetName));
-    }
-    return [found];
-  }
-
   // 分支级移除：匹配 branchName 或 branchName-*
   const matched = allWorktrees.filter(
     (wt) => wt.branch === options.branch || wt.branch.startsWith(`${options.branch}-`),
   );
   if (matched.length === 0) {
-    throw new ClawtError(MESSAGES.WORKTREE_NOT_FOUND(options.branch!));
+    throw new ClawtError(MESSAGES.WORKTREE_NOT_FOUND(options.branch));
   }
   return matched;
 }

package/src/commands/sync.ts

@@ -2,7 +2,7 @@ import { existsSync } from 'node:fs';
 import type { Command } from 'commander';
 import { logger } from '../logger/index.js';
 import { ClawtError } from '../errors/index.js';
-import { MESSAGES } from '../constants/index.js';
+import { MESSAGES, AUTO_SAVE_COMMIT_MESSAGE } from '../constants/index.js';
 import type { SyncOptions } from '../types/index.js';
 import {
   validateMainWorktree,
@@ -43,7 +43,7 @@ export function registerSyncCommand(program: Command): void {
  */
 function autoSaveChanges(worktreePath: string, branch: string): void {
   gitAddAll(worktreePath);
-  gitCommit('chore: auto-save before sync', worktreePath);
+  gitCommit(AUTO_SAVE_COMMIT_MESSAGE, worktreePath);
   printInfo(MESSAGES.SYNC_AUTO_COMMITTED(branch));
   logger.info(`已自动保存 ${branch} 分支的未提交变更`);
 }

package/src/constants/git.ts

@@ -0,0 +1,2 @@
+/** sync 自动保存的 commit message 前缀，用于检测 auto-save 提交 */
+export const AUTO_SAVE_COMMIT_MESSAGE = 'chore: auto-save before sync';

package/src/constants/index.ts

@@ -4,3 +4,4 @@ export { MESSAGES } from './messages.js';
 export { EXIT_CODES } from './exitCodes.js';
 export { ENABLE_BRACKETED_PASTE, DISABLE_BRACKETED_PASTE, PASTE_THRESHOLD_MS } from './terminal.js';
 export { DEFAULT_CONFIG, CONFIG_DESCRIPTIONS, APPEND_SYSTEM_PROMPT } from './config.js';
+export { AUTO_SAVE_COMMIT_MESSAGE } from './git.js';

package/src/constants/messages.ts

@@ -87,4 +87,12 @@ export const MESSAGES = {
   /** validate patch apply 失败，提示用户同步主分支 */
   VALIDATE_PATCH_APPLY_FAILED: (branch: string) =>
     `变更迁移失败：目标分支与主分支差异过大\n  请先执行 clawt sync -b ${branch} 同步主分支后重试`,
+  /** merge 检测到 auto-save 提交，提示用户是否压缩 */
+  MERGE_SQUASH_PROMPT: '检测到 sync 产生的临时提交，是否将所有提交压缩为一个？\n  压缩后变更将保留在目标worktree的暂存区，需要重新提交（可使用 Claude Code Cli或其他工具生成提交信息）',
+  /** squash 完成且通过 -m 直接提交后的提示 */
+  MERGE_SQUASH_COMMITTED: (branch: string) =>
+    `✓ 已将分支 ${branch} 的所有提交压缩为一个`,
+  /** squash 完成但未提供 -m，提示用户自行提交 */
+  MERGE_SQUASH_PENDING: (worktreePath: string, branch: string) =>
+    `✓ 已将所有提交压缩到暂存区\n  请在目标 worktree 中提交后重新执行 merge：\n  cd ${worktreePath}\n  提交完成后执行：clawt merge -b ${branch}`,
 } as const;

package/src/types/command.ts

@@ -36,8 +36,6 @@ export interface RemoveOptions {
   all?: boolean;
   /** 分支名 */
   branch?: string;
-  /** 指定索引 */
-  index?: number;
 }
 
 /** resume 命令选项 */

package/src/types/worktree.ts

@@ -10,9 +10,9 @@ export interface WorktreeInfo {
 export interface WorktreeStatus {
   /** 相对于主分支的新增提交数 */
   commitCount: number;
-  /** 新增行数 */
+  /** 工作区和暂存区的新增行数 */
   insertions: number;
-  /** 删除行数 */
+  /** 工作区和暂存区的删除行数 */
   deletions: number;
   /** 工作区是否有未提交修改 */
   hasDirtyFiles: boolean;

package/src/utils/git.ts

@@ -286,25 +286,14 @@ function parseShortStat(output: string): { insertions: number; deletions: number
 }
 
 /**
- * 获取目标分支的变更统计（已提交 + 未提交）
- * @param {string} branchName - 目标分支名
+ * 获取 worktree 中工作区和暂存区的变更统计
  * @param {string} worktreePath - worktree 目录路径
- * @param {string} [cwd] - 执行 git diff HEAD...branch 的工作目录
- * @returns {{ insertions: number; deletions: number }} 聚合后的新增和删除行数
+ * @returns {{ insertions: number; deletions: number }} 新增和删除行数
  */
-export function getDiffStat(branchName: string, worktreePath: string, cwd?: string): { insertions: number; deletions: number } {
-  // 已提交的变更（当前分支与目标分支的差异）
-  const committedOutput = execCommand(`git diff --shortstat HEAD...${branchName}`, { cwd });
-  const committed = parseShortStat(committedOutput);
-
-  // 未提交的变更（在 worktree 内执行）
-  const uncommittedOutput = execCommand('git diff --shortstat HEAD', { cwd: worktreePath });
-  const uncommitted = parseShortStat(uncommittedOutput);
-
-  return {
-    insertions: committed.insertions + uncommitted.insertions,
-    deletions: committed.deletions + uncommitted.deletions,
-  };
+export function getDiffStat(worktreePath: string): { insertions: number; deletions: number } {
+  // 工作区和暂存区相对于 HEAD 的变更
+  const output = execCommand('git diff --shortstat HEAD', { cwd: worktreePath });
+  return parseShortStat(output);
 }
 
 /**
@@ -380,3 +369,41 @@ export function gitApplyFromStdin(patchContent: Buffer, cwd?: string): void {
 export function gitResetSoft(count: number = 1, cwd?: string): void {
   execCommand(`git reset --soft HEAD~${count}`, { cwd });
 }
+
+/**
+ * 获取两个分支的分叉点（merge-base）
+ * @param {string} branchA - 分支 A
+ * @param {string} branchB - 分支 B
+ * @param {string} [cwd] - 工作目录
+ * @returns {string} merge-base 的 commit hash
+ */
+export function gitMergeBase(branchA: string, branchB: string, cwd?: string): string {
+  return execCommand(`git merge-base ${branchA} ${branchB}`, { cwd });
+}
+
+/**
+ * 检查目标分支相对于当前分支是否存在指定前缀的 commit message
+ * 通过 git log HEAD..<branch> 遍历所有新增 commit 的 message
+ * @param {string} branchName - 目标分支名
+ * @param {string} messagePrefix - 要匹配的 commit message 前缀
+ * @param {string} [cwd] - 工作目录
+ * @returns {boolean} 是否存在匹配的 commit
+ */
+export function hasCommitWithMessage(branchName: string, messagePrefix: string, cwd?: string): boolean {
+  try {
+    const output = execCommand(`git log HEAD..${branchName} --format=%s`, { cwd });
+    if (!output.trim()) return false;
+    return output.trim().split('\n').some((msg) => msg.startsWith(messagePrefix));
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * git reset --soft <commitHash>，将指定 commit 之后的所有提交撤销到暂存区
+ * @param {string} commitHash - 目标 commit hash（reset 到此处）
+ * @param {string} [cwd] - 工作目录
+ */
+export function gitResetSoftTo(commitHash: string, cwd?: string): void {
+  execCommand(`git reset --soft ${commitHash}`, { cwd });
+}

package/src/utils/index.ts

@@ -35,6 +35,9 @@ export {
   gitDiffBinaryAgainstBranch,
   gitApplyFromStdin,
   gitResetSoft,
+  gitMergeBase,
+  hasCommitWithMessage,
+  gitResetSoftTo,
 } from './git.js';
 export { sanitizeBranchName, generateBranchNames, validateBranchesNotExist } from './branch.js';
 export { validateMainWorktree, validateGitInstalled, validateClaudeCodeInstalled } from './validation.js';

package/src/utils/worktree.ts

@@ -115,7 +115,7 @@ export function cleanupWorktrees(worktrees: WorktreeInfo[]): void {
 export function getWorktreeStatus(worktree: WorktreeInfo): WorktreeStatus | null {
   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 };