clawt 2.11.0 → 2.12.0

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

@@ -8,7 +8,7 @@
 - run 命令对应 `5.2 批量创建 Worktree + 执行 Claude Code 任务`，流程按步骤编号描述
 - merge 命令对应 `5.6 合并验证过的分支`，-b 可选，支持模糊匹配（与 resume/validate 共享匹配逻辑），流程按步骤编号描述
 - config 命令对应 `5.10 查看和管理全局配置`，包含查看配置和 config reset 子命令两部分（使用 `####` 子标题区分）
-- resume 命令对应 `5.11 在已有 Worktree 中恢复会话`，支持模糊匹配和交互式分支选择（-b 可选）
+- resume 命令对应 `5.11 在已有 Worktree 中恢复会话`，统一使用多选交互（resolveTargetWorktrees），选 1 个当前终端恢复，选多个在独立终端 Tab 批量恢复（-b 可选）
 - validate 命令对应 `5.4 在主 Worktree 验证其他分支`，-b 可选，支持模糊匹配（与 resume 共享匹配逻辑）
 - sync 命令对应 `5.12 将主分支代码同步到目标 Worktree`，-b 可选，支持模糊匹配（与 resume/validate/merge 共享匹配逻辑）
 - status 命令对应 `5.14 项目全局状态总览`，支持 `--json` 格式输出，展示主 worktree 状态、各 worktree 详细状态、未清理快照
@@ -35,7 +35,13 @@
 - remove 批量操作时收集错误继续处理，最后汇总报告
 - 文档中文风格，技术术语保留英文（worktree, merge, branch, SIGINT 等）
 - cleanupWorktrees 是 merge 和 run 共用的公共清理函数（在 src/utils/worktree.ts）
-- `launchInteractiveClaude` 是 run（交互式模式）和 resume 共用的公共函数（在 src/utils/claude.ts）
+- `launchInteractiveClaude` 是 run（交互式模式）和 resume（单选模式）共用的公共函数（在 src/utils/claude.ts），启动前自动检测会话历史并追加 `--continue`
+- `launchInteractiveClaudeInNewTerminal` 是 resume 批量模式使用的函数（在 src/utils/claude.ts），通过 AppleScript 在新终端 Tab 中启动
+- `buildClaudeCommand` 构建完整 shell 命令字符串（在 src/utils/claude.ts），被 `launchInteractiveClaudeInNewTerminal` 调用
+- `openCommandInNewTerminalTab` 终端 Tab 管理函数（在 src/utils/terminal.ts），支持 iTerm2 和 Terminal.app
+- `detectTerminalApp` 终端类型检测函数（在 src/utils/terminal.ts），读取 `terminalApp` 配置项
+- `hasClaudeSessionHistory` 检测 `~/.claude/projects/<encoded-path>/` 下是否有 `.jsonl` 文件（在 src/utils/claude.ts）
+- `CLAUDE_PROJECTS_DIR` 常量（`~/.claude/projects/`）定义在 `src/constants/paths.ts`
 - killAllChildProcesses 是 run 专用的子进程终止函数（在 src/utils/shell.ts）
 - validate 快照管理函数在 `src/utils/validate-snapshot.ts`，被 validate、merge、remove 和 status 四个命令使用
 - `confirmDestructiveAction` 在 `src/utils/formatter.ts`，被 reset、validate --clean 和 config reset 使用
@@ -74,14 +80,17 @@ Notes:
 - resume 和 run（交互式模式）共用 `launchInteractiveClaude()`，该函数从 run.ts 提取到 src/utils/claude.ts
 - `claudeCodeCommand` 配置项同时影响 run 交互式模式和 resume 命令
 - reset 命令与 validate --clean 的区别：reset 不删除快照文件，validate --clean 会删除快照
-- `resolveTargetWorktree()` 是 resume、validate、merge 和 sync 共用的单选分支匹配函数（在 src/utils/worktree-matcher.ts）
-- `resolveTargetWorktrees()` 是多选分支匹配函数（在 src/utils/worktree-matcher.ts），目前被 remove 命令使用
+- `resolveTargetWorktree()` 是 validate、merge 和 sync 共用的单选分支匹配函数（在 src/utils/worktree-matcher.ts）
+- `resolveTargetWorktrees()` 是多选分支匹配函数（在 src/utils/worktree-matcher.ts），被 remove 和 resume 命令使用
 - `WorktreeResolveMessages` 接口用于单选命令的消息解耦，`WorktreeMultiResolveMessages` 接口用于多选命令的消息解耦
 - `promptSelectBranch()`（Enquirer.Select）用于单选交互，`promptMultiSelectBranches()`（Enquirer.MultiSelect）用于多选交互
-- resume 的消息常量在 `MESSAGES.RESUME_*`，validate 的消息常量在 `MESSAGES.VALIDATE_*`，merge 的消息常量在 `MESSAGES.MERGE_*`，sync 的消息常量在 `MESSAGES.SYNC_*`，status 的消息常量在 `MESSAGES.STATUS_*`，remove 的 fuzzy search 消息在 `MESSAGES.REMOVE_*`
-- resume、validate、merge 和 sync 的 `-b` 参数均为可选，匹配策略一致：精确→模糊（子串，大小写不敏感）→交互单选
+- resume 的消息常量在 `MESSAGES.RESUME_*`（含 RESUME_ALL_CONFIRM / RESUME_ALL_SUCCESS 等批量恢复消息），validate 的消息常量在 `MESSAGES.VALIDATE_*`，merge 的消息常量在 `MESSAGES.MERGE_*`，sync 的消息常量在 `MESSAGES.SYNC_*`，status 的消息常量在 `MESSAGES.STATUS_*`，remove 的 fuzzy search 消息在 `MESSAGES.REMOVE_*`
+- resume 使用多选匹配策略：精确→模糊→交互多选（与 remove 一致），validate、merge 和 sync 使用单选匹配策略：精确→模糊→交互单选
 - remove 的 `-b` 参数可选，匹配策略：精确→模糊→交互多选；不传 `-b` 时列出所有分支供多选
-- validate 的交互式选择和 resume 使用同一个 `promptSelectBranch()`（Enquirer.Select）；remove 使用 `promptMultiSelectBranches()`（Enquirer.MultiSelect）
+- validate 的交互式选择使用 `promptSelectBranch()`（Enquirer.Select）；resume 和 remove 使用 `promptMultiSelectBranches()`（Enquirer.MultiSelect）
+- `promptMultiSelectBranches` 支持「全选」选项（顶部 [select-all]），通过扩展 MultiSelect 覆写 space() 实现全选 toggle
+- `SELECT_ALL_NAME` 和 `SELECT_ALL_LABEL` 常量定义在 `src/constants/prompt.ts`
+- `VALID_TERMINAL_APPS` 和 `ITERM2_APP_PATH` 常量定义在 `src/constants/terminal.ts`
 
 ## validate 快照机制
 

package/README.md

@@ -80,9 +80,15 @@ clawt run -f tasks.md -b feat
 
 ```bash
 clawt resume -b <branch>   # 指定分支
-clawt resume                # 交互式选择
+clawt resume                # 交互式多选
 ```
 
+支持多选：选 1 个在当前终端恢复，选多个自动在独立终端 Tab 中批量恢复（仅 macOS）。
+
+如果目标 worktree 存在历史会话，会自动继续上次对话（`--continue`）。
+
+> **注意：** 使用 Terminal.app 批量恢复时，需要在「系统设置 → 隐私与安全性 → 辅助功能」中授权终端应用。iTerm2 无需额外授权。终端类型可通过配置项 `terminalApp` 指定。
+
 ### `clawt create` — 仅创建 worktree（不执行任务）
 
 ```bash
@@ -157,6 +163,8 @@ clawt config reset    # 恢复默认配置
 | `claudeCodeCommand` | `"claude"` | Claude Code CLI 启动命令 |
 | `autoPullPush` | `false` | merge 后自动 pull/push |
 | `confirmDestructiveOps` | `true` | 破坏性操作前确认 |
+| `maxConcurrency` | `0` | run 命令最大并发数，`0` 为不限制 |
+| `terminalApp` | `"auto"` | 批量 resume 使用的终端：`auto` / `iterm2` / `terminal` |
 
 ## 全局选项
 

package/dist/index.js

@@ -14,6 +14,7 @@ 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");
+var CLAUDE_PROJECTS_DIR = join(homedir(), ".claude", "projects");
 
 // src/constants/branch.ts
 var INVALID_BRANCH_CHARS = /[\/\\.\s~:*?[\]^]+/g;
@@ -208,10 +209,18 @@ var RESUME_MESSAGES = {
   RESUME_NO_MATCH: (name, branches) => `\u672A\u627E\u5230\u4E0E "${name}" \u5339\u914D\u7684\u5206\u652F
   \u53EF\u7528\u5206\u652F\uFF1A
 ${branches.map((b) => `    - ${b}`).join("\n")}`,
-  /** resume 交互选择提示 */
-  RESUME_SELECT_BRANCH: "\u8BF7\u9009\u62E9\u8981\u6062\u590D\u7684\u5206\u652F",
-  /** resume 模糊匹配到多个结果提示 */
-  RESUME_MULTIPLE_MATCHES: (name) => `"${name}" \u5339\u914D\u5230\u591A\u4E2A\u5206\u652F\uFF0C\u8BF7\u9009\u62E9\uFF1A`
+  /** resume 多选交互提示 */
+  RESUME_SELECT_BRANCH: "\u8BF7\u9009\u62E9\u8981\u6062\u590D\u7684\u5206\u652F\uFF08\u7A7A\u683C\u9009\u62E9\uFF0C\u56DE\u8F66\u786E\u8BA4\uFF09",
+  /** resume 模糊匹配到多个结果的多选提示 */
+  RESUME_MULTIPLE_MATCHES: (keyword) => `"${keyword}" \u5339\u914D\u5230\u591A\u4E2A\u5206\u652F\uFF0C\u8BF7\u9009\u62E9\u8981\u6062\u590D\u7684\uFF1A`,
+  /** 批量 resume 确认提示 */
+  RESUME_ALL_CONFIRM: (count) => `\u5373\u5C06\u5728 ${count} \u4E2A\u72EC\u7ACB\u7EC8\u7AEF Tab \u4E2D\u6062\u590D Claude Code \u4F1A\u8BDD\uFF0C\u662F\u5426\u7EE7\u7EED\uFF1F`,
+  /** 批量 resume 完成提示 */
+  RESUME_ALL_SUCCESS: (count) => `\u5DF2\u5728 ${count} \u4E2A\u7EC8\u7AEF Tab \u4E2D\u542F\u52A8 Claude Code \u4F1A\u8BDD`,
+  /** 批量 resume 非 macOS 平台提示 */
+  RESUME_ALL_PLATFORM_UNSUPPORTED: "\u6279\u91CF resume \u76EE\u524D\u4EC5\u652F\u6301 macOS \u5E73\u53F0\uFF08\u901A\u8FC7 AppleScript \u6253\u5F00\u7EC8\u7AEF Tab\uFF09",
+  /** 批量 resume 无匹配分支提示 */
+  RESUME_ALL_NO_MATCH: (keyword) => `\u672A\u627E\u5230\u4E0E "${keyword}" \u5339\u914D\u7684\u5206\u652F`
 };
 
 // src/constants/messages/remove.ts
@@ -296,6 +305,10 @@ var EXIT_CODES = {
   ARGUMENT_ERROR: 2
 };
 
+// src/constants/terminal.ts
+var VALID_TERMINAL_APPS = ["auto", "iterm2", "terminal"];
+var ITERM2_APP_PATH = "/Applications/iTerm.app";
+
 // src/constants/config.ts
 var APPEND_SYSTEM_PROMPT = "After the code execution is completed, it is prohibited to build the project for verification.";
 var CONFIG_DEFINITIONS = {
@@ -318,6 +331,10 @@ var CONFIG_DEFINITIONS = {
   maxConcurrency: {
     defaultValue: 0,
     description: "run \u547D\u4EE4\u9ED8\u8BA4\u6700\u5927\u5E76\u53D1\u6570\uFF0C0 \u8868\u793A\u4E0D\u9650\u5236"
+  },
+  terminalApp: {
+    defaultValue: "auto",
+    description: "\u6279\u91CF resume \u4F7F\u7528\u7684\u7EC8\u7AEF\u5E94\u7528\uFF1Aauto\uFF08\u81EA\u52A8\u68C0\u6D4B\uFF09\u3001iterm2\u3001terminal\uFF08macOS\uFF09"
   }
 };
 function deriveDefaultConfig(definitions) {
@@ -367,6 +384,10 @@ var TASK_STATUS_LABELS = {
   FAILED: "\u5931\u8D25"
 };
 
+// src/constants/prompt.ts
+var SELECT_ALL_NAME = "__select_all__";
+var SELECT_ALL_LABEL = "[select-all]";
+
 // src/errors/index.ts
 var ClawtError = class extends Error {
   /** 退出码 */
@@ -904,7 +925,94 @@ import Enquirer from "enquirer";
 
 // src/utils/claude.ts
 import { spawnSync } from "child_process";
-function launchInteractiveClaude(worktree) {
+import { existsSync as existsSync6, readdirSync as readdirSync3 } from "fs";
+import { join as join3 } from "path";
+
+// src/utils/terminal.ts
+import { execFileSync as execFileSync2 } from "child_process";
+import { existsSync as existsSync5 } from "fs";
+function isITerm2Installed() {
+  return existsSync5(ITERM2_APP_PATH);
+}
+function detectTerminalApp() {
+  const configured = getConfigValue("terminalApp");
+  if (configured === "iterm2" || configured === "terminal") {
+    return configured;
+  }
+  if (!VALID_TERMINAL_APPS.includes(configured)) {
+    logger.warn(`terminalApp \u914D\u7F6E\u503C "${configured}" \u65E0\u6548\uFF0C\u6709\u6548\u503C: ${VALID_TERMINAL_APPS.join(", ")}\uFF0C\u5C06\u4F7F\u7528\u81EA\u52A8\u68C0\u6D4B`);
+  }
+  if (isITerm2Installed()) {
+    return "iterm2";
+  }
+  return "terminal";
+}
+function escapeAppleScriptString(str) {
+  return str.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+}
+function buildTerminalAppleScript(command, title) {
+  const escapedCommand = escapeAppleScriptString(command);
+  const escapedTitle = escapeAppleScriptString(title);
+  return `
+tell application "Terminal"
+  activate
+  tell application "System Events" to tell process "Terminal" to keystroke "t" using command down
+  delay 0.3
+  do script "${escapedCommand}" in front window's selected tab
+  set custom title of front window's selected tab to "${escapedTitle}"
+end tell
+  `.trim();
+}
+function buildITermAppleScript(command, title) {
+  const escapedCommand = escapeAppleScriptString(command);
+  const escapedTitle = escapeAppleScriptString(title);
+  return `
+tell application "iTerm"
+  activate
+  tell current window
+    create tab with default profile
+    tell current session
+      set name to "${escapedTitle}"
+      write text "${escapedCommand}"
+    end tell
+  end tell
+end tell
+  `.trim();
+}
+function openCommandInNewTerminalTab(command, tabTitle) {
+  if (process.platform !== "darwin") {
+    throw new ClawtError("\u6279\u91CF resume \u76EE\u524D\u4EC5\u652F\u6301 macOS \u5E73\u53F0\uFF08\u901A\u8FC7 AppleScript \u6253\u5F00\u7EC8\u7AEF Tab\uFF09");
+  }
+  const terminalApp = detectTerminalApp();
+  const script = terminalApp === "iterm2" ? buildITermAppleScript(command, tabTitle) : buildTerminalAppleScript(command, tabTitle);
+  logger.debug(`\u6253\u5F00\u7EC8\u7AEF Tab [${terminalApp}]: ${tabTitle}`);
+  logger.debug(`\u6267\u884C\u547D\u4EE4: ${command}`);
+  try {
+    execFileSync2("osascript", ["-e", script], {
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    const accessibilityHint = terminalApp === "terminal" ? "\n\u63D0\u793A\uFF1ATerminal.app \u9700\u8981\u8F85\u52A9\u529F\u80FD\u6743\u9650\uFF0C\u8BF7\u5728\u300C\u7CFB\u7EDF\u8BBE\u7F6E \u2192 \u9690\u79C1\u4E0E\u5B89\u5168\u6027 \u2192 \u8F85\u52A9\u529F\u80FD\u300D\u4E2D\u6388\u6743\u7EC8\u7AEF\u5E94\u7528" : "";
+    throw new ClawtError(`\u6253\u5F00\u7EC8\u7AEF Tab \u5931\u8D25: ${message}${accessibilityHint}`);
+  }
+}
+
+// src/utils/claude.ts
+function encodeClaudeProjectPath(absolutePath) {
+  return absolutePath.replace(/[^a-zA-Z0-9]/g, "-");
+}
+function hasClaudeSessionHistory(worktreePath) {
+  const encodedName = encodeClaudeProjectPath(worktreePath);
+  const projectDir = join3(CLAUDE_PROJECTS_DIR, encodedName);
+  if (!existsSync6(projectDir)) {
+    return false;
+  }
+  const entries = readdirSync3(projectDir);
+  return entries.some((entry) => entry.endsWith(".jsonl"));
+}
+function launchInteractiveClaude(worktree, options = {}) {
   const commandStr = getConfigValue("claudeCodeCommand");
   const parts = commandStr.split(/\s+/).filter(Boolean);
   const cmd = parts[0];
@@ -913,10 +1021,17 @@ function launchInteractiveClaude(worktree) {
     "--append-system-prompt",
     APPEND_SYSTEM_PROMPT
   ];
+  const hasPreviousSession = options.autoContinue === true && hasClaudeSessionHistory(worktree.path);
+  if (hasPreviousSession) {
+    args.push("--continue");
+  }
   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}`);
+  if (options.autoContinue) {
+    printInfo(`  \u6A21\u5F0F: ${hasPreviousSession ? "\u7EE7\u7EED\u4E0A\u6B21\u5BF9\u8BDD" : "\u65B0\u5BF9\u8BDD"}`);
+  }
   printInfo("");
   const result = spawnSync(cmd, args, {
     cwd: worktree.path,
@@ -929,31 +1044,47 @@ function launchInteractiveClaude(worktree) {
     printWarning(`Claude Code \u9000\u51FA\u7801: ${result.status}`);
   }
 }
+function escapeShellSingleQuote(str) {
+  return str.replace(/'/g, "'\\''");
+}
+function buildClaudeCommand(worktree, hasPreviousSession) {
+  const commandStr = getConfigValue("claudeCodeCommand");
+  const escapedPath = escapeShellSingleQuote(worktree.path);
+  const escapedPrompt = escapeShellSingleQuote(APPEND_SYSTEM_PROMPT);
+  const continueFlag = hasPreviousSession ? " --continue" : "";
+  return `cd '${escapedPath}' && ${commandStr} --append-system-prompt '${escapedPrompt}'${continueFlag}`;
+}
+function launchInteractiveClaudeInNewTerminal(worktree, hasPreviousSession) {
+  const command = buildClaudeCommand(worktree, hasPreviousSession);
+  const modeLabel = hasPreviousSession ? "\u7EE7\u7EED" : "\u65B0\u5BF9\u8BDD";
+  const tabTitle = `clawt: ${worktree.branch}`;
+  openCommandInNewTerminalTab(command, tabTitle);
+}
 
 // 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";
+import { join as join4 } from "path";
+import { existsSync as existsSync7, readFileSync as readFileSync2, writeFileSync as writeFileSync2, unlinkSync, readdirSync as readdirSync4, rmdirSync as rmdirSync2 } from "fs";
 function getSnapshotPath(projectName, branchName) {
-  return join3(VALIDATE_SNAPSHOTS_DIR, projectName, `${branchName}.tree`);
+  return join4(VALIDATE_SNAPSHOTS_DIR, projectName, `${branchName}.tree`);
 }
 function getSnapshotHeadPath(projectName, branchName) {
-  return join3(VALIDATE_SNAPSHOTS_DIR, projectName, `${branchName}.head`);
+  return join4(VALIDATE_SNAPSHOTS_DIR, projectName, `${branchName}.head`);
 }
 function hasSnapshot(projectName, branchName) {
-  return existsSync5(getSnapshotPath(projectName, branchName));
+  return existsSync7(getSnapshotPath(projectName, branchName));
 }
 function readSnapshot(projectName, branchName) {
   const snapshotPath = getSnapshotPath(projectName, branchName);
   const headPath = getSnapshotHeadPath(projectName, branchName);
   logger.debug(`\u8BFB\u53D6 validate \u5FEB\u7167: ${snapshotPath}`);
-  const treeHash = existsSync5(snapshotPath) ? readFileSync2(snapshotPath, "utf-8").trim() : "";
-  const headCommitHash = existsSync5(headPath) ? readFileSync2(headPath, "utf-8").trim() : "";
+  const treeHash = existsSync7(snapshotPath) ? readFileSync2(snapshotPath, "utf-8").trim() : "";
+  const headCommitHash = existsSync7(headPath) ? readFileSync2(headPath, "utf-8").trim() : "";
   return { treeHash, headCommitHash };
 }
 function writeSnapshot(projectName, branchName, treeHash, headCommitHash) {
   const snapshotPath = getSnapshotPath(projectName, branchName);
   const headPath = getSnapshotHeadPath(projectName, branchName);
-  const snapshotDir = join3(VALIDATE_SNAPSHOTS_DIR, projectName);
+  const snapshotDir = join4(VALIDATE_SNAPSHOTS_DIR, projectName);
   ensureDir(snapshotDir);
   writeFileSync2(snapshotPath, treeHash, "utf-8");
   writeFileSync2(headPath, headCommitHash, "utf-8");
@@ -962,31 +1093,31 @@ function writeSnapshot(projectName, branchName, treeHash, headCommitHash) {
 function removeSnapshot(projectName, branchName) {
   const snapshotPath = getSnapshotPath(projectName, branchName);
   const headPath = getSnapshotHeadPath(projectName, branchName);
-  if (existsSync5(snapshotPath)) {
+  if (existsSync7(snapshotPath)) {
     unlinkSync(snapshotPath);
     logger.info(`\u5DF2\u5220\u9664 validate \u5FEB\u7167: ${snapshotPath}`);
   }
-  if (existsSync5(headPath)) {
+  if (existsSync7(headPath)) {
     unlinkSync(headPath);
     logger.info(`\u5DF2\u5220\u9664 validate \u5FEB\u7167: ${headPath}`);
   }
 }
 function getProjectSnapshotBranches(projectName) {
-  const projectDir = join3(VALIDATE_SNAPSHOTS_DIR, projectName);
-  if (!existsSync5(projectDir)) {
+  const projectDir = join4(VALIDATE_SNAPSHOTS_DIR, projectName);
+  if (!existsSync7(projectDir)) {
     return [];
   }
-  const files = readdirSync3(projectDir);
+  const files = readdirSync4(projectDir);
   return files.filter((f) => f.endsWith(".tree")).map((f) => f.replace(/\.tree$/, ""));
 }
 function removeProjectSnapshots(projectName) {
-  const projectDir = join3(VALIDATE_SNAPSHOTS_DIR, projectName);
-  if (!existsSync5(projectDir)) {
+  const projectDir = join4(VALIDATE_SNAPSHOTS_DIR, projectName);
+  if (!existsSync7(projectDir)) {
     return;
   }
-  const files = readdirSync3(projectDir);
+  const files = readdirSync4(projectDir);
   for (const file of files) {
-    unlinkSync(join3(projectDir, file));
+    unlinkSync(join4(projectDir, file));
   }
   try {
     rmdirSync2(projectDir);
@@ -1015,12 +1146,37 @@ async function promptSelectBranch(worktrees, message) {
   return worktrees.find((wt) => wt.branch === selectedBranch);
 }
 async function promptMultiSelectBranches(worktrees, message) {
-  const selectedBranches = await new Enquirer2.MultiSelect({
+  const branchChoices = worktrees.map((wt) => ({
+    name: wt.branch,
+    message: wt.branch
+  }));
+  const choices = [
+    { name: SELECT_ALL_NAME, message: SELECT_ALL_LABEL },
+    ...branchChoices
+  ];
+  const MultiSelect = Enquirer2.MultiSelect;
+  class MultiSelectWithSelectAll extends MultiSelect {
+    space() {
+      if (!this.focused) return;
+      if (this.focused.name === SELECT_ALL_NAME) {
+        const willEnable = !this.focused.enabled;
+        for (const ch of this.choices) {
+          ch.enabled = willEnable;
+        }
+        return this.render();
+      }
+      this.toggle(this.focused);
+      const selectAllChoice = this.choices.find((ch) => ch.name === SELECT_ALL_NAME);
+      const branchItems = this.choices.filter((ch) => ch.name !== SELECT_ALL_NAME);
+      if (selectAllChoice) {
+        selectAllChoice.enabled = branchItems.every((ch) => ch.enabled);
+      }
+      return this.render();
+    }
+  }
+  const selectedBranches = await new MultiSelectWithSelectAll({
     message,
-    choices: worktrees.map((wt) => ({
-      name: wt.branch,
-      message: wt.branch
-    })),
+    choices,
     // 使用空心圆/实心圆作为选中指示符
     symbols: {
       indicator: { on: "\u25CF", off: "\u25CB" }
@@ -1283,7 +1439,7 @@ var ProgressRenderer = class {
 
 // src/utils/task-file.ts
 import { resolve } from "path";
-import { existsSync as existsSync6, readFileSync as readFileSync3 } from "fs";
+import { existsSync as existsSync8, readFileSync as readFileSync3 } from "fs";
 var TASK_BLOCK_REGEX = /<!-- CLAWT-TASKS:START -->([\s\S]*?)<!-- CLAWT-TASKS:END -->/g;
 var BRANCH_LINE_REGEX = /^#\s*branch:\s*(.+)$/;
 function parseTaskFile(content, options) {
@@ -1321,7 +1477,7 @@ function parseTaskFile(content, options) {
 }
 function loadTaskFile(filePath, options) {
   const absolutePath = resolve(filePath);
-  if (!existsSync6(absolutePath)) {
+  if (!existsSync8(absolutePath)) {
     throw new ClawtError(MESSAGES.TASK_FILE_NOT_FOUND(absolutePath));
   }
   const content = readFileSync3(absolutePath, "utf-8");
@@ -1761,10 +1917,44 @@ function registerResumeCommand(program2) {
 async function handleResume(options) {
   validateMainWorktree();
   validateClaudeCodeInstalled();
-  logger.info(`resume \u547D\u4EE4\u6267\u884C\uFF0C\u5206\u652F: ${options.branch ?? "(\u672A\u6307\u5B9A)"}`);
+  logger.info(`resume \u547D\u4EE4\u6267\u884C\uFF0C\u5206\u652F\u8FC7\u6EE4: ${options.branch ?? "(\u65E0)"}`);
   const worktrees = getProjectWorktrees();
-  const worktree = await resolveTargetWorktree(worktrees, RESUME_RESOLVE_MESSAGES, options.branch);
-  launchInteractiveClaude(worktree);
+  const targetWorktrees = await resolveTargetWorktrees(worktrees, RESUME_RESOLVE_MESSAGES, options.branch);
+  if (targetWorktrees.length === 0) {
+    return;
+  }
+  if (targetWorktrees.length === 1) {
+    launchInteractiveClaude(targetWorktrees[0], { autoContinue: true });
+  } else {
+    await handleBatchResume(targetWorktrees);
+  }
+}
+function printBatchResumePreview(worktrees, sessionMap) {
+  printInfo("\u5373\u5C06\u6062\u590D\u7684\u5206\u652F\uFF1A");
+  for (const wt of worktrees) {
+    const modeLabel = sessionMap.get(wt.path) ? "\u7EE7\u7EED\u4E0A\u6B21\u5BF9\u8BDD" : "\u65B0\u5BF9\u8BDD";
+    printInfo(`  - ${wt.branch} (${modeLabel})`);
+  }
+  printInfo("");
+}
+function buildSessionMap(worktrees) {
+  const map = /* @__PURE__ */ new Map();
+  for (const wt of worktrees) {
+    map.set(wt.path, hasClaudeSessionHistory(wt.path));
+  }
+  return map;
+}
+async function handleBatchResume(worktrees) {
+  const sessionMap = buildSessionMap(worktrees);
+  printBatchResumePreview(worktrees, sessionMap);
+  const confirmed = await confirmAction(MESSAGES.RESUME_ALL_CONFIRM(worktrees.length));
+  if (!confirmed) {
+    return;
+  }
+  for (const wt of worktrees) {
+    launchInteractiveClaudeInNewTerminal(wt, sessionMap.get(wt.path) ?? false);
+  }
+  printSuccess(MESSAGES.RESUME_ALL_SUCCESS(worktrees.length));
 }
 
 // src/commands/validate.ts

package/dist/postinstall.js

@@ -9,6 +9,7 @@ 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");
+var CLAUDE_PROJECTS_DIR = join(homedir(), ".claude", "projects");
 
 // src/constants/messages/common.ts
 var COMMON_MESSAGES = {
@@ -200,10 +201,18 @@ var RESUME_MESSAGES = {
   RESUME_NO_MATCH: (name, branches) => `\u672A\u627E\u5230\u4E0E "${name}" \u5339\u914D\u7684\u5206\u652F
   \u53EF\u7528\u5206\u652F\uFF1A
 ${branches.map((b) => `    - ${b}`).join("\n")}`,
-  /** resume 交互选择提示 */
-  RESUME_SELECT_BRANCH: "\u8BF7\u9009\u62E9\u8981\u6062\u590D\u7684\u5206\u652F",
-  /** resume 模糊匹配到多个结果提示 */
-  RESUME_MULTIPLE_MATCHES: (name) => `"${name}" \u5339\u914D\u5230\u591A\u4E2A\u5206\u652F\uFF0C\u8BF7\u9009\u62E9\uFF1A`
+  /** resume 多选交互提示 */
+  RESUME_SELECT_BRANCH: "\u8BF7\u9009\u62E9\u8981\u6062\u590D\u7684\u5206\u652F\uFF08\u7A7A\u683C\u9009\u62E9\uFF0C\u56DE\u8F66\u786E\u8BA4\uFF09",
+  /** resume 模糊匹配到多个结果的多选提示 */
+  RESUME_MULTIPLE_MATCHES: (keyword) => `"${keyword}" \u5339\u914D\u5230\u591A\u4E2A\u5206\u652F\uFF0C\u8BF7\u9009\u62E9\u8981\u6062\u590D\u7684\uFF1A`,
+  /** 批量 resume 确认提示 */
+  RESUME_ALL_CONFIRM: (count) => `\u5373\u5C06\u5728 ${count} \u4E2A\u72EC\u7ACB\u7EC8\u7AEF Tab \u4E2D\u6062\u590D Claude Code \u4F1A\u8BDD\uFF0C\u662F\u5426\u7EE7\u7EED\uFF1F`,
+  /** 批量 resume 完成提示 */
+  RESUME_ALL_SUCCESS: (count) => `\u5DF2\u5728 ${count} \u4E2A\u7EC8\u7AEF Tab \u4E2D\u542F\u52A8 Claude Code \u4F1A\u8BDD`,
+  /** 批量 resume 非 macOS 平台提示 */
+  RESUME_ALL_PLATFORM_UNSUPPORTED: "\u6279\u91CF resume \u76EE\u524D\u4EC5\u652F\u6301 macOS \u5E73\u53F0\uFF08\u901A\u8FC7 AppleScript \u6253\u5F00\u7EC8\u7AEF Tab\uFF09",
+  /** 批量 resume 无匹配分支提示 */
+  RESUME_ALL_NO_MATCH: (keyword) => `\u672A\u627E\u5230\u4E0E "${keyword}" \u5339\u914D\u7684\u5206\u652F`
 };
 
 // src/constants/messages/remove.ts
@@ -299,6 +308,10 @@ var CONFIG_DEFINITIONS = {
   maxConcurrency: {
     defaultValue: 0,
     description: "run \u547D\u4EE4\u9ED8\u8BA4\u6700\u5927\u5E76\u53D1\u6570\uFF0C0 \u8868\u793A\u4E0D\u9650\u5236"
+  },
+  terminalApp: {
+    defaultValue: "auto",
+    description: "\u6279\u91CF resume \u4F7F\u7528\u7684\u7EC8\u7AEF\u5E94\u7528\uFF1Aauto\uFF08\u81EA\u52A8\u68C0\u6D4B\uFF09\u3001iterm2\u3001terminal\uFF08macOS\uFF09"
   }
 };
 function deriveDefaultConfig(definitions) {

package/docs/spec.md

@@ -175,7 +175,7 @@ git show-ref --verify refs/heads/<branchName> 2>/dev/null
 | `clawt list`          | 列出当前项目所有 worktree（支持 `--json` 格式输出） | 5.8      |
 | `clawt config`        | 查看全局配置                                     | 5.10     |
 | `clawt config reset`  | 将配置恢复为默认值                                | 5.10     |
-| `clawt resume`        | 在已有 worktree 中恢复 Claude Code 交互式会话      | 5.11     |
+| `clawt resume`        | 在已有 worktree 中恢复 Claude Code 会话（支持多选批量恢复） | 5.11     |
 | `clawt sync`          | 将主分支最新代码同步到目标 worktree                  | 5.12     |
 | `clawt reset`         | 重置主 worktree 工作区和暂存区                       | 5.13     |
 | `clawt status`        | 显示项目全局状态总览（支持 `--json` 格式输出）          | 5.14     |
@@ -840,7 +840,9 @@ clawt merge [-m <commitMessage>]
   "autoDeleteBranch": false,
   "claudeCodeCommand": "claude",
   "autoPullPush": false,
-  "confirmDestructiveOps": true
+  "confirmDestructiveOps": true,
+  "maxConcurrency": 0,
+  "terminalApp": "auto"
 }
 ```
 
@@ -852,6 +854,8 @@ clawt merge [-m <commitMessage>]
 | `claudeCodeCommand` | `string` | `"claude"` | Claude Code CLI 启动指令，用于 `clawt run` 不传 `--tasks` 时和 `clawt resume` 在 worktree 中打开交互式界面 |
 | `autoPullPush` | `boolean` | `false` | merge 成功后是否自动执行 git pull 和 git push |
 | `confirmDestructiveOps` | `boolean` | `true` | 执行破坏性操作（reset、validate --clean、config reset）前是否提示确认 |
+| `maxConcurrency` | `number` | `0` | run 命令默认最大并发数，`0` 表示不限制 |
+| `terminalApp` | `string` | `"auto"` | 批量 resume 使用的终端应用：`auto`（自动检测）、`iterm2`、`terminal`（macOS） |
 
 ---
 
@@ -1054,7 +1058,7 @@ clawt config reset
 # 指定分支名（支持模糊匹配）
 clawt resume -b <branchName>
 
-# 不指定分支名（列出所有分支供选择）
+# 不指定分支名（列出所有分支供多选）
 clawt resume
 ```
 
@@ -1062,32 +1066,59 @@ clawt resume
 
 | 参数 | 必填 | 说明                                                  |
 | ---- | ---- | ----------------------------------------------------- |
-| `-b` | 否   | 要恢复的分支名（支持模糊匹配，不传则列出所有分支供选择） |
+| `-b` | 否   | 要恢复的分支名（支持模糊匹配，不传则列出所有分支供多选） |
 
 **使用场景：**
 
-当用户之前通过 `clawt run` 或 `clawt create` 创建了 worktree 但会话已结束，希望在该 worktree 中重新打开 Claude Code 交互式界面继续工作。
+当用户之前通过 `clawt run` 或 `clawt create` 创建了 worktree 但会话已结束，希望在该 worktree 中重新打开 Claude Code 交互式界面继续工作。支持一次选中多个分支，自动在独立终端 Tab 中批量恢复。
 
 **运行流程：**
 
 1. **主 worktree 校验** (2.1)
 2. **Claude Code CLI 校验**：确认 `claude` CLI 可用
-3. **解析目标 worktree**：根据 `-b` 参数解析目标 worktree，匹配策略如下：
+3. **解析目标 worktree（多选模式）**：统一使用 `resolveTargetWorktrees`（多选版本）解析目标 worktree，匹配策略如下：
    - **未传 `-b` 参数**：
      - 获取当前项目所有 worktree
      - 无可用 worktree → 报错退出
      - 仅 1 个 worktree → 直接使用，无需选择
-     - 多个 worktree → 通过交互式列表（Enquirer.Select）让用户选择
+     - 多个 worktree → 通过交互式多选列表（Enquirer.MultiSelect）让用户选择（空格选择，回车确认），顶部提供「全选」选项
    - **传了 `-b` 参数**：
      1. **精确匹配优先**：在 worktree 列表中查找分支名完全相同的 worktree，找到则直接使用
      2. **模糊匹配**（子串匹配，大小写不敏感）：
         - 唯一匹配 → 直接使用
-        - 多个匹配 → 通过交互式列表让用户从匹配结果中选择
+        - 多个匹配 → 通过交互式多选列表让用户从匹配结果中选择
      3. **无匹配** → 报错退出，并列出所有可用分支名
-4. **启动 Claude Code 交互式界面**：通过 `launchInteractiveClaude()` 在目标 worktree 中启动 Claude Code CLI 交互式界面（使用 `spawnSync` + `inherit stdio`）
+4. **根据选中数量自动分发**：
+   - **用户未选择任何分支** → 直接退出
+   - **选中 1 个** → 在当前终端恢复（同原有行为），通过 `launchInteractiveClaude()` 启动（使用 `spawnSync` + `inherit stdio`）
+   - **选中多个** → 进入批量恢复流程（见下文）
+
+**批量恢复流程：**
+
+1. **计算会话状态**：一次性遍历所有选中的 worktree，通过 `hasClaudeSessionHistory()` 检测是否存在历史会话，构建 sessionMap 避免重复 I/O
+2. **输出预览**：列出即将恢复的分支及其会话状态（"继续上次对话"或"新对话"）
+3. **用户确认**：提示即将在 N 个独立终端 Tab 中恢复会话，等待用户确认
+4. **逐个在新终端 Tab 中启动**：通过 `launchInteractiveClaudeInNewTerminal()` 构建 shell 命令并通过 AppleScript 在新终端 Tab 中执行
+5. **输出完成提示**
+
+**终端 Tab 管理：**
+
+批量恢复通过 `openCommandInNewTerminalTab()`（`src/utils/terminal.ts`）在新终端 Tab 中启动 Claude Code。终端类型由配置项 `terminalApp` 控制：
+
+| 配置值     | 行为                                                         |
+| ---------- | ------------------------------------------------------------ |
+| `auto`     | 自动检测：优先检测 iTerm2 是否已安装（`/Applications/iTerm.app`），已安装则使用 iTerm2，否则降级到 Terminal.app |
+| `iterm2`   | 强制使用 iTerm2                                               |
+| `terminal` | 强制使用 Terminal.app                                         |
+
+**平台限制：** 批量恢复目前仅支持 macOS 平台（通过 AppleScript 打开终端 Tab）。非 macOS 平台会抛出错误。
+
+**权限要求：** Terminal.app 通过 System Events 模拟键盘操作（`Cmd+T`）新建 Tab，需要在「系统设置 → 隐私与安全性 → 辅助功能」中授权终端应用。iTerm2 使用原生 AppleScript 接口，无需辅助功能权限。
 
 启动命令通过配置项 `claudeCodeCommand`（默认值 `claude`）指定，与 `clawt run` 不传 `--tasks` 时的交互式界面行为一致。
 
+**会话自动续接：** 启动前会自动检测该 worktree 是否存在 Claude Code 历史会话（通过检查 `~/.claude/projects/<encoded-path>/` 下是否有 `.jsonl` 文件判断），如果存在则自动追加 `--continue` 参数继续上次对话，否则打开新对话。启动信息中会显示当前模式（"继续上次对话"或"新对话"）。路径编码规则：将绝对路径中所有非字母数字字符替换为 `-`（与 Claude Code 源码的编码逻辑一致）。
+
 ---
 
 ### 5.12 将主分支代码同步到目标 Worktree

package/package.json

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