clawt 2.10.0 → 2.11.0

package/dist/index.js

@@ -18,8 +18,8 @@ var VALIDATE_SNAPSHOTS_DIR = join(CLAWT_HOME, "validate-snapshots");
 // src/constants/branch.ts
 var INVALID_BRANCH_CHARS = /[\/\\.\s~:*?[\]^]+/g;
 
-// src/constants/messages.ts
-var MESSAGES = {
+// src/constants/messages/common.ts
+var COMMON_MESSAGES = {
   /** 不在主 worktree 根目录 */
   NOT_MAIN_WORKTREE: "\u8BF7\u5728\u4E3B worktree \u7684\u6839\u76EE\u5F55\u4E0B\u6267\u884C clawt",
   /** Git 未安装 */
@@ -28,8 +28,6 @@ var MESSAGES = {
   CLAUDE_NOT_INSTALLED: "Claude Code CLI \u672A\u5B89\u88C5\uFF0C\u8BF7\u5148\u5B89\u88C5\uFF1Anpm install -g @anthropic-ai/claude-code",
   /** 分支已存在 */
   BRANCH_EXISTS: (name) => `\u5206\u652F ${name} \u5DF2\u5B58\u5728\uFF0C\u65E0\u6CD5\u521B\u5EFA`,
-  /** 分支已存在时提示使用 resume */
-  BRANCH_EXISTS_USE_RESUME: (name) => `\u5206\u652F ${name} \u5DF2\u5B58\u5728\uFF0C\u8BF7\u4F7F\u7528 clawt resume -b ${name} \u6062\u590D\u4F1A\u8BDD`,
   /** 分支名清理后为空 */
   BRANCH_NAME_EMPTY: (original) => `\u5206\u652F\u540D "${original}" \u4E2D\u4E0D\u5305\u542B\u5408\u6CD5\u5B57\u7B26\uFF0C\u65E0\u6CD5\u521B\u5EFA\u5206\u652F`,
   /** 分支名被转换 */
@@ -46,24 +44,24 @@ 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",
-  /** 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`,
-  /** merge 成功 */
-  MERGE_SUCCESS: (branch, message, pushed) => `\u2713 \u5206\u652F ${branch} \u5DF2\u6210\u529F\u5408\u5E76\u5230\u5F53\u524D\u5206\u652F
-  \u63D0\u4EA4\u4FE1\u606F: ${message}${pushed ? "\n  \u5DF2\u63A8\u9001\u5230\u8FDC\u7A0B\u4ED3\u5E93" : ""}`,
-  /** merge 成功（无提交信息，目标 worktree 已提交过） */
-  MERGE_SUCCESS_NO_MESSAGE: (branch, pushed) => `\u2713 \u5206\u652F ${branch} \u5DF2\u6210\u529F\u5408\u5E76\u5230\u5F53\u524D\u5206\u652F${pushed ? "\n  \u5DF2\u63A8\u9001\u5230\u8FDC\u7A0B\u4ED3\u5E93" : ""}`,
-  /** merge 冲突 */
-  MERGE_CONFLICT: "\u5408\u5E76\u5B58\u5728\u51B2\u7A81\uFF0C\u8BF7\u624B\u52A8\u5904\u7406\uFF1A\n  \u89E3\u51B3\u51B2\u7A81\u540E\u6267\u884C git add . && git merge --continue",
-  /** merge 后清理 worktree 和分支成功 */
-  WORKTREE_CLEANED: (branch) => `\u2713 \u5DF2\u6E05\u7406 worktree \u548C\u5206\u652F: ${branch}`,
+  /** 用户取消破坏性操作 */
+  DESTRUCTIVE_OP_CANCELLED: "\u5DF2\u53D6\u6D88\u64CD\u4F5C",
   /** 请提供提交信息 */
   COMMIT_MESSAGE_REQUIRED: "\u8BF7\u63D0\u4F9B\u63D0\u4EA4\u4FE1\u606F\uFF08-m \u53C2\u6570\uFF09",
-  /** 目标 worktree 有未提交修改但未指定 -m */
-  TARGET_WORKTREE_DIRTY_NO_MESSAGE: "\u76EE\u6807 worktree \u6709\u672A\u63D0\u4EA4\u7684\u4FEE\u6539\uFF0C\u8BF7\u901A\u8FC7 -m \u53C2\u6570\u63D0\u4F9B\u63D0\u4EA4\u4FE1\u606F",
-  /** 目标 worktree 既干净又无本地提交 */
-  TARGET_WORKTREE_NO_CHANGES: "\u76EE\u6807 worktree \u6CA1\u6709\u4EFB\u4F55\u53EF\u5408\u5E76\u7684\u53D8\u66F4\uFF08\u5DE5\u4F5C\u533A\u5E72\u51C0\u4E14\u65E0\u672C\u5730\u63D0\u4EA4\uFF09",
+  /** 配置文件损坏，已重新生成默认配置 */
+  CONFIG_CORRUPTED: "\u914D\u7F6E\u6587\u4EF6\u635F\u574F\u6216\u65E0\u6CD5\u89E3\u6790\uFF0C\u5DF2\u91CD\u65B0\u751F\u6210\u9ED8\u8BA4\u914D\u7F6E",
+  /** worktree 状态获取失败 */
+  WORKTREE_STATUS_UNAVAILABLE: "(\u72B6\u6001\u4E0D\u53EF\u7528)",
+  /** 分隔线 */
+  SEPARATOR: "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500",
+  /** 粗分隔线 */
+  DOUBLE_SEPARATOR: "\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550"
+};
+
+// src/constants/messages/run.ts
+var RUN_MESSAGES = {
+  /** 分支已存在时提示使用 resume */
+  BRANCH_EXISTS_USE_RESUME: (name) => `\u5206\u652F ${name} \u5DF2\u5B58\u5728\uFF0C\u8BF7\u4F7F\u7528 clawt resume -b ${name} \u6062\u590D\u4F1A\u8BDD`,
   /** 检测到用户中断 */
   INTERRUPTED: "\u68C0\u6D4B\u5230\u9000\u51FA\u6307\u4EE4\uFF0C\u5DF2\u505C\u6B62 Claude Code \u4EFB\u52A1",
   /** 中断后自动清理完成 */
@@ -74,41 +72,57 @@ var MESSAGES = {
   INTERRUPT_CLEANED: (count) => `\u2713 \u5DF2\u6E05\u7406 ${count} \u4E2A worktree \u548C\u5BF9\u5E94\u5206\u652F`,
   /** 中断后保留 worktree */
   INTERRUPT_KEPT: "\u5DF2\u4FDD\u7559 worktree\uFF0C\u53EF\u7A0D\u540E\u4F7F\u7528 clawt remove \u624B\u52A8\u6E05\u7406",
-  /** 配置文件损坏，已重新生成默认配置 */
-  CONFIG_CORRUPTED: "\u914D\u7F6E\u6587\u4EF6\u635F\u574F\u6216\u65E0\u6CD5\u89E3\u6790\uFF0C\u5DF2\u91CD\u65B0\u751F\u6210\u9ED8\u8BA4\u914D\u7F6E",
-  /** 配置已恢复为默认值 */
-  CONFIG_RESET_SUCCESS: "\u2713 \u914D\u7F6E\u5DF2\u6062\u590D\u4E3A\u9ED8\u8BA4\u503C",
-  /** 分隔线 */
-  SEPARATOR: "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500",
-  /** 粗分隔线 */
-  DOUBLE_SEPARATOR: "\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550",
+  /** 非 TTY 环境降级输出：任务启动 */
+  PROGRESS_TASK_STARTED: (index, total, branch, path) => `[${index}/${total}] ${branch} \u542F\u52A8  ${path}`,
+  /** 非 TTY 环境降级输出：任务完成 */
+  PROGRESS_TASK_DONE: (index, total, branch, duration, cost, path) => `[${index}/${total}] ${branch} \u2713 \u5B8C\u6210 ${duration} ${cost}  ${path}`,
+  /** 非 TTY 环境降级输出：任务失败 */
+  PROGRESS_TASK_FAILED: (index, total, branch, duration, path) => `[${index}/${total}] ${branch} \u2717 \u5931\u8D25 ${duration}  ${path}`,
+  /** 并发限制提示 */
+  CONCURRENCY_INFO: (concurrency, total) => `\u5E76\u53D1\u9650\u5236: ${concurrency}\uFF0C\u5171 ${total} \u4E2A\u4EFB\u52A1`,
+  /** 并发数无效提示 */
+  CONCURRENCY_INVALID: "\u5E76\u53D1\u6570\u5FC5\u987B\u4E3A\u6B63\u6574\u6570",
+  /** 任务文件不存在 */
+  TASK_FILE_NOT_FOUND: (path) => `\u4EFB\u52A1\u6587\u4EF6\u4E0D\u5B58\u5728: ${path}`,
+  /** 任务文件中没有解析到有效任务 */
+  TASK_FILE_EMPTY: "\u4EFB\u52A1\u6587\u4EF6\u4E2D\u6CA1\u6709\u89E3\u6790\u5230\u6709\u6548\u4EFB\u52A1",
+  /** 任务文件中某个任务块缺少分支名 */
+  TASK_FILE_MISSING_BRANCH: (blockIndex) => `\u4EFB\u52A1\u6587\u4EF6\u7B2C ${blockIndex} \u4E2A\u4EFB\u52A1\u5757\u7F3A\u5C11\u5206\u652F\u540D\uFF08# branch: ...\uFF09`,
+  /** 任务文件中某个任务块缺少任务描述 */
+  TASK_FILE_MISSING_TASK: (branch) => `\u4EFB\u52A1\u6587\u4EF6\u4E2D\u5206\u652F ${branch} \u7F3A\u5C11\u4EFB\u52A1\u63CF\u8FF0`,
+  /** 任务文件中某个任务块缺少任务描述（无分支名时按索引定位） */
+  TASK_FILE_MISSING_TASK_BY_INDEX: (blockIndex) => `\u4EFB\u52A1\u6587\u4EF6\u7B2C ${blockIndex} \u4E2A\u4EFB\u52A1\u5757\u7F3A\u5C11\u4EFB\u52A1\u63CF\u8FF0`,
+  /** --file 和 --tasks 不能同时使用 */
+  FILE_AND_TASKS_CONFLICT: "--file \u548C --tasks \u4E0D\u80FD\u540C\u65F6\u4F7F\u7528",
+  /** 任务文件加载成功 */
+  TASK_FILE_LOADED: (count, path) => `\u2713 \u4ECE ${path} \u52A0\u8F7D\u4E86 ${count} \u4E2A\u4EFB\u52A1`,
+  /** 未指定 -b 或 -f */
+  BRANCH_OR_FILE_REQUIRED: "\u8BF7\u6307\u5B9A -b \u5206\u652F\u540D\u6216 -f \u4EFB\u52A1\u6587\u4EF6"
+};
+
+// src/constants/messages/create.ts
+var CREATE_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)",
-  /** 增量 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`,
+  INVALID_COUNT: (value) => `\u65E0\u6548\u7684\u521B\u5EFA\u6570\u91CF: "${value}"\uFF0C\u8BF7\u8F93\u5165\u6B63\u6574\u6570`
+};
+
+// src/constants/messages/merge.ts
+var MERGE_MESSAGES = {
+  /** merge 成功 */
+  MERGE_SUCCESS: (branch, message, pushed) => `\u2713 \u5206\u652F ${branch} \u5DF2\u6210\u529F\u5408\u5E76\u5230\u5F53\u524D\u5206\u652F
+  \u63D0\u4EA4\u4FE1\u606F: ${message}${pushed ? "\n  \u5DF2\u63A8\u9001\u5230\u8FDC\u7A0B\u4ED3\u5E93" : ""}`,
+  /** merge 成功（无提交信息，目标 worktree 已提交过） */
+  MERGE_SUCCESS_NO_MESSAGE: (branch, pushed) => `\u2713 \u5206\u652F ${branch} \u5DF2\u6210\u529F\u5408\u5E76\u5230\u5F53\u524D\u5206\u652F${pushed ? "\n  \u5DF2\u63A8\u9001\u5230\u8FDC\u7A0B\u4ED3\u5E93" : ""}`,
+  /** merge 冲突 */
+  MERGE_CONFLICT: "\u5408\u5E76\u5B58\u5728\u51B2\u7A81\uFF0C\u8BF7\u624B\u52A8\u5904\u7406\uFF1A\n  \u89E3\u51B3\u51B2\u7A81\u540E\u6267\u884C git add . && git merge --continue",
+  /** merge 后清理 worktree 和分支成功 */
+  WORKTREE_CLEANED: (branch) => `\u2713 \u5DF2\u6E05\u7406 worktree \u548C\u5206\u652F: ${branch}`,
+  /** 目标 worktree 有未提交修改但未指定 -m */
+  TARGET_WORKTREE_DIRTY_NO_MESSAGE: "\u76EE\u6807 worktree \u6709\u672A\u63D0\u4EA4\u7684\u4FEE\u6539\uFF0C\u8BF7\u901A\u8FC7 -m \u53C2\u6570\u63D0\u4F9B\u63D0\u4EA4\u4FE1\u606F",
+  /** 目标 worktree 既干净又无本地提交 */
+  TARGET_WORKTREE_NO_CHANGES: "\u76EE\u6807 worktree \u6CA1\u6709\u4EFB\u4F55\u53EF\u5408\u5E76\u7684\u53D8\u66F4\uFF08\u5DE5\u4F5C\u533A\u5E72\u51C0\u4E14\u65E0\u672C\u5730\u63D0\u4EA4\uFF09",
   /** 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`,
-  /** 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
-  clawt validate -b <branch> \u9A8C\u8BC1\u53D8\u66F4`,
-  /** validate patch apply 失败，提示用户同步主分支 */
-  VALIDATE_PATCH_APPLY_FAILED: (branch) => `\u53D8\u66F4\u8FC1\u79FB\u5931\u8D25\uFF1A\u76EE\u6807\u5206\u652F\u4E0E\u4E3B\u5206\u652F\u5DEE\u5F02\u8FC7\u5927
-  \u8BF7\u5148\u6267\u884C clawt sync -b ${branch} \u540C\u6B65\u4E3B\u5206\u652F\u540E\u91CD\u8BD5`,
   /** 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 直接提交后的提示 */
@@ -118,25 +132,37 @@ var MESSAGES = {
   \u8BF7\u5728\u76EE\u6807 worktree \u4E2D\u63D0\u4EA4\u540E\u91CD\u65B0\u6267\u884C merge\uFF1A
   cd ${worktreePath}
   \u63D0\u4EA4\u5B8C\u6210\u540E\u6267\u884C\uFF1Aclawt merge -b ${branch}`,
-  /** 用户取消破坏性操作 */
-  DESTRUCTIVE_OP_CANCELLED: "\u5DF2\u53D6\u6D88\u64CD\u4F5C",
-  /** reset 成功 */
-  RESET_SUCCESS: "\u2713 \u4E3B worktree \u5DE5\u4F5C\u533A\u548C\u6682\u5B58\u533A\u5DF2\u91CD\u7F6E",
-  /** reset 时工作区和暂存区已干净 */
-  RESET_ALREADY_CLEAN: "\u4E3B worktree \u5DE5\u4F5C\u533A\u548C\u6682\u5B58\u533A\u5DF2\u662F\u5E72\u51C0\u72B6\u6001\uFF0C\u65E0\u9700\u91CD\u7F6E",
-  /** 批量移除部分失败 */
-  REMOVE_PARTIAL_FAILURE: (failures) => `\u4EE5\u4E0B worktree \u79FB\u9664\u5931\u8D25\uFF1A
-${failures.map((f) => `  \u2717 ${f.path}: ${f.error}`).join("\n")}`,
-  /** resume 无可用 worktree */
-  RESUME_NO_WORKTREES: "\u5F53\u524D\u9879\u76EE\u6CA1\u6709\u53EF\u7528\u7684 worktree\uFF0C\u8BF7\u5148\u901A\u8FC7 clawt run \u6216 clawt create \u521B\u5EFA",
-  /** resume 模糊匹配无结果，列出可用分支 */
-  RESUME_NO_MATCH: (name, branches) => `\u672A\u627E\u5230\u4E0E "${name}" \u5339\u914D\u7684\u5206\u652F
+  /** merge 后 pull 冲突 */
+  PULL_CONFLICT: "\u81EA\u52A8 pull \u65F6\u53D1\u751F\u51B2\u7A81\uFF0Cmerge \u5DF2\u5B8C\u6210\u4F46\u8FDC\u7A0B\u540C\u6B65\u5931\u8D25\n  \u8BF7\u624B\u52A8\u89E3\u51B3\u51B2\u7A81\uFF1A\n  \u89E3\u51B3\u51B2\u7A81\u540E\u6267\u884C git add . && git commit\n  \u7136\u540E\u6267\u884C git push \u63A8\u9001\u5230\u8FDC\u7A0B",
+  /** push 失败 */
+  PUSH_FAILED: "\u81EA\u52A8 push \u5931\u8D25\uFF0Cmerge \u548C pull \u5DF2\u5B8C\u6210\n  \u8BF7\u624B\u52A8\u6267\u884C git push",
+  /** merge 无可用 worktree */
+  MERGE_NO_WORKTREES: "\u5F53\u524D\u9879\u76EE\u6CA1\u6709\u53EF\u7528\u7684 worktree\uFF0C\u8BF7\u5148\u901A\u8FC7 clawt run \u6216 clawt create \u521B\u5EFA",
+  /** merge 模糊匹配无结果，列出可用分支 */
+  MERGE_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`,
+  /** merge 交互选择提示 */
+  MERGE_SELECT_BRANCH: "\u8BF7\u9009\u62E9\u8981\u5408\u5E76\u7684\u5206\u652F",
+  /** merge 模糊匹配到多个结果提示 */
+  MERGE_MULTIPLE_MATCHES: (name) => `"${name}" \u5339\u914D\u5230\u591A\u4E2A\u5206\u652F\uFF0C\u8BF7\u9009\u62E9\uFF1A`
+};
+
+// src/constants/messages/validate.ts
+var VALIDATE_MESSAGES = {
+  /** 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`,
+  /** 增量 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 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`,
   /** validate 无可用 worktree */
   VALIDATE_NO_WORKTREES: "\u5F53\u524D\u9879\u76EE\u6CA1\u6709\u53EF\u7528\u7684 worktree\uFF0C\u8BF7\u5148\u901A\u8FC7 clawt run \u6216 clawt create \u521B\u5EFA",
   /** validate 模糊匹配无结果，列出可用分支 */
@@ -146,17 +172,22 @@ ${branches.map((b) => `    - ${b}`).join("\n")}`,
   /** validate 交互选择提示 */
   VALIDATE_SELECT_BRANCH: "\u8BF7\u9009\u62E9\u8981\u9A8C\u8BC1\u7684\u5206\u652F",
   /** validate 模糊匹配到多个结果提示 */
-  VALIDATE_MULTIPLE_MATCHES: (name) => `"${name}" \u5339\u914D\u5230\u591A\u4E2A\u5206\u652F\uFF0C\u8BF7\u9009\u62E9\uFF1A`,
-  /** merge 无可用 worktree */
-  MERGE_NO_WORKTREES: "\u5F53\u524D\u9879\u76EE\u6CA1\u6709\u53EF\u7528\u7684 worktree\uFF0C\u8BF7\u5148\u901A\u8FC7 clawt run \u6216 clawt create \u521B\u5EFA",
-  /** merge 模糊匹配无结果，列出可用分支 */
-  MERGE_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")}`,
-  /** merge 交互选择提示 */
-  MERGE_SELECT_BRANCH: "\u8BF7\u9009\u62E9\u8981\u5408\u5E76\u7684\u5206\u652F",
-  /** merge 模糊匹配到多个结果提示 */
-  MERGE_MULTIPLE_MATCHES: (name) => `"${name}" \u5339\u914D\u5230\u591A\u4E2A\u5206\u652F\uFF0C\u8BF7\u9009\u62E9\uFF1A`,
+  VALIDATE_MULTIPLE_MATCHES: (name) => `"${name}" \u5339\u914D\u5230\u591A\u4E2A\u5206\u652F\uFF0C\u8BF7\u9009\u62E9\uFF1A`
+};
+
+// src/constants/messages/sync.ts
+var SYNC_MESSAGES = {
+  /** 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
+  clawt validate -b <branch> \u9A8C\u8BC1\u53D8\u66F4`,
   /** sync 无可用 worktree */
   SYNC_NO_WORKTREES: "\u5F53\u524D\u9879\u76EE\u6CA1\u6709\u53EF\u7528\u7684 worktree\uFF0C\u8BF7\u5148\u901A\u8FC7 clawt run \u6216 clawt create \u521B\u5EFA",
   /** sync 模糊匹配无结果，列出可用分支 */
@@ -166,7 +197,56 @@ ${branches.map((b) => `    - ${b}`).join("\n")}`,
   /** sync 交互选择提示 */
   SYNC_SELECT_BRANCH: "\u8BF7\u9009\u62E9\u8981\u540C\u6B65\u7684\u5206\u652F",
   /** sync 模糊匹配到多个结果提示 */
-  SYNC_MULTIPLE_MATCHES: (name) => `"${name}" \u5339\u914D\u5230\u591A\u4E2A\u5206\u652F\uFF0C\u8BF7\u9009\u62E9\uFF1A`,
+  SYNC_MULTIPLE_MATCHES: (name) => `"${name}" \u5339\u914D\u5230\u591A\u4E2A\u5206\u652F\uFF0C\u8BF7\u9009\u62E9\uFF1A`
+};
+
+// src/constants/messages/resume.ts
+var RESUME_MESSAGES = {
+  /** resume 无可用 worktree */
+  RESUME_NO_WORKTREES: "\u5F53\u524D\u9879\u76EE\u6CA1\u6709\u53EF\u7528\u7684 worktree\uFF0C\u8BF7\u5148\u901A\u8FC7 clawt run \u6216 clawt create \u521B\u5EFA",
+  /** resume 模糊匹配无结果，列出可用分支 */
+  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`
+};
+
+// src/constants/messages/remove.ts
+var REMOVE_MESSAGES = {
+  /** remove 无可用 worktree */
+  REMOVE_NO_WORKTREES: "\u5F53\u524D\u9879\u76EE\u6CA1\u6709\u53EF\u7528\u7684 worktree\uFF0C\u65E0\u9700\u79FB\u9664",
+  /** remove 多选交互提示 */
+  REMOVE_SELECT_BRANCH: "\u8BF7\u9009\u62E9\u8981\u79FB\u9664\u7684\u5206\u652F\uFF08\u7A7A\u683C\u9009\u62E9\uFF0C\u56DE\u8F66\u786E\u8BA4\uFF09",
+  /** remove 模糊匹配到多个结果提示 */
+  REMOVE_MULTIPLE_MATCHES: (name) => `"${name}" \u5339\u914D\u5230\u591A\u4E2A\u5206\u652F\uFF0C\u8BF7\u9009\u62E9\u8981\u79FB\u9664\u7684\uFF08\u7A7A\u683C\u9009\u62E9\uFF0C\u56DE\u8F66\u786E\u8BA4\uFF09\uFF1A`,
+  /** remove 模糊匹配无结果，列出可用分支 */
+  REMOVE_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")}`,
+  /** 批量移除部分失败 */
+  REMOVE_PARTIAL_FAILURE: (failures) => `\u4EE5\u4E0B worktree \u79FB\u9664\u5931\u8D25\uFF1A
+${failures.map((f) => `  \u2717 ${f.path}: ${f.error}`).join("\n")}`
+};
+
+// src/constants/messages/reset.ts
+var RESET_MESSAGES = {
+  /** reset 成功 */
+  RESET_SUCCESS: "\u2713 \u4E3B worktree \u5DE5\u4F5C\u533A\u548C\u6682\u5B58\u533A\u5DF2\u91CD\u7F6E",
+  /** reset 时工作区和暂存区已干净 */
+  RESET_ALREADY_CLEAN: "\u4E3B worktree \u5DE5\u4F5C\u533A\u548C\u6682\u5B58\u533A\u5DF2\u662F\u5E72\u51C0\u72B6\u6001\uFF0C\u65E0\u9700\u91CD\u7F6E"
+};
+
+// src/constants/messages/config.ts
+var CONFIG_CMD_MESSAGES = {
+  /** 配置已恢复为默认值 */
+  CONFIG_RESET_SUCCESS: "\u2713 \u914D\u7F6E\u5DF2\u6062\u590D\u4E3A\u9ED8\u8BA4\u503C"
+};
+
+// src/constants/messages/status.ts
+var STATUS_MESSAGES = {
   /** status 命令标题 */
   STATUS_TITLE: (projectName) => `\u9879\u76EE\u72B6\u6001\u603B\u89C8: ${projectName}`,
   /** status 主 worktree 区块标题 */
@@ -188,11 +268,22 @@ ${branches.map((b) => `    - ${b}`).join("\n")}`,
   /** status 变更状态：无变更 */
   STATUS_CHANGE_CLEAN: "\u65E0\u53D8\u66F4",
   /** status 快照对应 worktree 已不存在 */
-  STATUS_SNAPSHOT_ORPHANED: "(\u5BF9\u5E94 worktree \u5DF2\u4E0D\u5B58\u5728)",
-  /** merge 后 pull 冲突 */
-  PULL_CONFLICT: "\u81EA\u52A8 pull \u65F6\u53D1\u751F\u51B2\u7A81\uFF0Cmerge \u5DF2\u5B8C\u6210\u4F46\u8FDC\u7A0B\u540C\u6B65\u5931\u8D25\n  \u8BF7\u624B\u52A8\u89E3\u51B3\u51B2\u7A81\uFF1A\n  \u89E3\u51B3\u51B2\u7A81\u540E\u6267\u884C git add . && git commit\n  \u7136\u540E\u6267\u884C git push \u63A8\u9001\u5230\u8FDC\u7A0B",
-  /** push 失败 */
-  PUSH_FAILED: "\u81EA\u52A8 push \u5931\u8D25\uFF0Cmerge \u548C pull \u5DF2\u5B8C\u6210\n  \u8BF7\u624B\u52A8\u6267\u884C git push"
+  STATUS_SNAPSHOT_ORPHANED: "(\u5BF9\u5E94 worktree \u5DF2\u4E0D\u5B58\u5728)"
+};
+
+// src/constants/messages/index.ts
+var MESSAGES = {
+  ...COMMON_MESSAGES,
+  ...RUN_MESSAGES,
+  ...CREATE_MESSAGES,
+  ...MERGE_MESSAGES,
+  ...VALIDATE_MESSAGES,
+  ...SYNC_MESSAGES,
+  ...RESUME_MESSAGES,
+  ...REMOVE_MESSAGES,
+  ...RESET_MESSAGES,
+  ...CONFIG_CMD_MESSAGES,
+  ...STATUS_MESSAGES
 };
 
 // src/constants/exitCodes.ts
@@ -223,6 +314,10 @@ var CONFIG_DEFINITIONS = {
   confirmDestructiveOps: {
     defaultValue: true,
     description: "\u6267\u884C\u7834\u574F\u6027\u64CD\u4F5C\uFF08reset\u3001validate --clean\uFF09\u524D\u662F\u5426\u63D0\u793A\u786E\u8BA4"
+  },
+  maxConcurrency: {
+    defaultValue: 0,
+    description: "run \u547D\u4EE4\u9ED8\u8BA4\u6700\u5927\u5E76\u53D1\u6570\uFF0C0 \u8868\u793A\u4E0D\u9650\u5236"
   }
 };
 function deriveDefaultConfig(definitions) {
@@ -246,6 +341,32 @@ var AUTO_SAVE_COMMIT_MESSAGE = "chore: auto-save before sync";
 // src/constants/logger.ts
 var DEBUG_TIMESTAMP_FORMAT = "HH:mm:ss.SSS";
 
+// src/constants/progress.ts
+var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+var SPINNER_INTERVAL_MS = 100;
+var CURSOR_UP = (n) => `\x1B[${n}A`;
+var CLEAR_LINE = "\x1B[0K";
+var CURSOR_HIDE = "\x1B[?25l";
+var CURSOR_SHOW = "\x1B[?25h";
+var TASK_STATUS_ICONS = {
+  /** 排队中 */
+  PENDING: "\u25E6",
+  /** 完成 */
+  DONE: "\u2713",
+  /** 失败 */
+  FAILED: "\u2717"
+};
+var TASK_STATUS_LABELS = {
+  /** 排队中 */
+  PENDING: "\u6392\u961F\u4E2D",
+  /** 运行中 */
+  RUNNING: "\u8FD0\u884C\u4E2D",
+  /** 完成 */
+  DONE: "\u5B8C\u6210",
+  /** 失败 */
+  FAILED: "\u5931\u8D25"
+};
+
 // src/errors/index.ts
 var ClawtError = class extends Error {
   /** 退出码 */
@@ -551,14 +672,14 @@ function printDoubleSeparator() {
   console.log(MESSAGES.DOUBLE_SEPARATOR);
 }
 function confirmAction(question) {
-  return new Promise((resolve) => {
+  return new Promise((resolve2) => {
     const rl = createInterface({
       input: process.stdin,
       output: process.stdout
     });
     rl.question(`${question} (y/N) `, (answer) => {
       rl.close();
-      resolve(answer.toLowerCase() === "y");
+      resolve2(answer.toLowerCase() === "y");
     });
   });
 }
@@ -585,6 +706,15 @@ function formatWorktreeStatus(status) {
   }
   return parts.join("   ");
 }
+function formatDuration(ms) {
+  const totalSeconds = ms / 1e3;
+  if (totalSeconds < 60) {
+    return `${totalSeconds.toFixed(1)}s`;
+  }
+  const minutes = Math.floor(totalSeconds / 60);
+  const seconds = Math.floor(totalSeconds % 60);
+  return `${minutes}m${String(seconds).padStart(2, "0")}s`;
+}
 
 // src/utils/branch.ts
 function sanitizeBranchName(branchName) {
@@ -677,6 +807,19 @@ function createWorktrees(branchName, count) {
   }
   return results;
 }
+function createWorktreesByBranches(branchNames) {
+  validateBranchesNotExist(branchNames);
+  const projectDir = getProjectWorktreeDir();
+  ensureDir(projectDir);
+  const results = [];
+  for (const name of branchNames) {
+    const worktreePath = join2(projectDir, name);
+    createWorktree(name, worktreePath);
+    results.push({ path: worktreePath, branch: name });
+    logger.info(`worktree \u521B\u5EFA\u5B8C\u6210: ${worktreePath} (\u5206\u652F: ${name})`);
+  }
+  return results;
+}
 function getProjectWorktrees() {
   const projectDir = getProjectWorktreeDir();
   if (!existsSync3(projectDir)) {
@@ -871,6 +1014,44 @@ async function promptSelectBranch(worktrees, message) {
   }).run();
   return worktrees.find((wt) => wt.branch === selectedBranch);
 }
+async function promptMultiSelectBranches(worktrees, message) {
+  const selectedBranches = await new Enquirer2.MultiSelect({
+    message,
+    choices: worktrees.map((wt) => ({
+      name: wt.branch,
+      message: wt.branch
+    })),
+    // 使用空心圆/实心圆作为选中指示符
+    symbols: {
+      indicator: { on: "\u25CF", off: "\u25CB" }
+    }
+  }).run();
+  return worktrees.filter((wt) => selectedBranches.includes(wt.branch));
+}
+async function resolveTargetWorktrees(worktrees, messages, branchName) {
+  if (worktrees.length === 0) {
+    throw new ClawtError(messages.noWorktrees);
+  }
+  if (!branchName) {
+    if (worktrees.length === 1) {
+      return [worktrees[0]];
+    }
+    return promptMultiSelectBranches(worktrees, messages.selectBranch);
+  }
+  const exactMatch = findExactMatch(worktrees, branchName);
+  if (exactMatch) {
+    return [exactMatch];
+  }
+  const fuzzyMatches = findFuzzyMatches(worktrees, branchName);
+  if (fuzzyMatches.length === 1) {
+    return [fuzzyMatches[0]];
+  }
+  if (fuzzyMatches.length > 1) {
+    return promptMultiSelectBranches(fuzzyMatches, messages.multipleMatches(branchName));
+  }
+  const allBranches = worktrees.map((wt) => wt.branch);
+  throw new ClawtError(messages.noMatch(branchName, allBranches));
+}
 async function resolveTargetWorktree(worktrees, messages, branchName) {
   if (worktrees.length === 0) {
     throw new ClawtError(messages.noWorktrees);
@@ -896,160 +1077,262 @@ async function resolveTargetWorktree(worktrees, messages, branchName) {
   throw new ClawtError(messages.noMatch(branchName, allBranches));
 }
 
-// src/commands/list.ts
+// src/utils/progress-render.ts
 import chalk3 from "chalk";
-function registerListCommand(program2) {
-  program2.command("list").description("\u5217\u51FA\u5F53\u524D\u9879\u76EE\u6240\u6709 worktree").option("--json", "\u4EE5 JSON \u683C\u5F0F\u8F93\u51FA").action((options) => {
-    handleList(options);
-  });
-}
-function handleList(options) {
-  validateMainWorktree();
-  const projectName = getProjectName();
-  const worktrees = getProjectWorktrees();
-  logger.info(`list \u547D\u4EE4\u6267\u884C\uFF0C\u9879\u76EE: ${projectName}\uFF0C\u5171 ${worktrees.length} \u4E2A worktree`);
-  if (options.json) {
-    printListAsJson(projectName, worktrees);
-    return;
+function getMaxBranchWidth(tasks) {
+  return Math.max(...tasks.map((t) => t.branch.length));
+}
+function renderTaskLine(task, total, maxBranchWidth, spinnerChar) {
+  const indexStr = `[${task.index}/${total}]`;
+  const branchStr = task.branch.padEnd(maxBranchWidth);
+  switch (task.status) {
+    case "pending": {
+      return `${indexStr} ${branchStr}  ${chalk3.gray(TASK_STATUS_ICONS.PENDING)} ${chalk3.gray(TASK_STATUS_LABELS.PENDING)}  ${chalk3.dim(task.path)}`;
+    }
+    case "running": {
+      const elapsed = formatDuration(Date.now() - task.startedAt);
+      return `${indexStr} ${branchStr}  ${chalk3.cyan(spinnerChar)} ${chalk3.cyan(TASK_STATUS_LABELS.RUNNING)} ${chalk3.gray(elapsed)}  ${chalk3.dim(task.path)}`;
+    }
+    case "done": {
+      const duration = task.durationMs != null ? formatDuration(task.durationMs) : "N/A";
+      const cost = task.costUsd != null ? `$${task.costUsd.toFixed(2)}` : "";
+      return `${indexStr} ${branchStr}  ${chalk3.green(TASK_STATUS_ICONS.DONE)} ${chalk3.green(TASK_STATUS_LABELS.DONE)}   ${chalk3.gray(duration)}  ${chalk3.yellow(cost)}  ${chalk3.dim(task.path)}`;
+    }
+    case "failed": {
+      const duration = task.durationMs != null ? formatDuration(task.durationMs) : "N/A";
+      return `${indexStr} ${branchStr}  ${chalk3.red(TASK_STATUS_ICONS.FAILED)} ${chalk3.red(TASK_STATUS_LABELS.FAILED)}   ${chalk3.gray(duration)}  ${chalk3.dim(task.path)}`;
+    }
   }
-  printListAsText(projectName, worktrees);
 }
-function printListAsJson(projectName, worktrees) {
-  const result = {
-    project: projectName,
-    total: worktrees.length,
-    worktrees: worktrees.map((wt) => ({
-      path: wt.path,
-      branch: wt.branch
-    }))
-  };
-  console.log(JSON.stringify(result, null, 2));
+function renderSummaryLine(tasks, total) {
+  const running = tasks.filter((t) => t.status === "running").length;
+  const done = tasks.filter((t) => t.status === "done").length;
+  const failed = tasks.filter((t) => t.status === "failed").length;
+  const pending = tasks.filter((t) => t.status === "pending").length;
+  const parts = [];
+  if (running > 0) parts.push(chalk3.cyan(`${running}/${total} ${TASK_STATUS_LABELS.RUNNING}`));
+  if (done > 0) parts.push(chalk3.green(`${done}/${total} ${TASK_STATUS_LABELS.DONE}`));
+  if (failed > 0) parts.push(chalk3.red(`${failed}/${total} ${TASK_STATUS_LABELS.FAILED}`));
+  if (pending > 0) parts.push(chalk3.gray(`${pending}/${total} ${TASK_STATUS_LABELS.PENDING}`));
+  return `[${parts.join(", ")}]`;
 }
-function printListAsText(projectName, worktrees) {
-  printInfo(`\u5F53\u524D\u9879\u76EE: ${projectName}
-`);
-  if (worktrees.length === 0) {
-    printInfo(`  ${MESSAGES.NO_WORKTREES}`);
-  } else {
-    for (const wt of worktrees) {
-      const status = getWorktreeStatus(wt);
-      const isIdle = status ? isWorktreeIdle(status) : false;
-      const pathDisplay = isIdle ? chalk3.hex("#FF8C00")(wt.path) : wt.path;
-      printInfo(`  ${pathDisplay}   [${wt.branch}]`);
-      if (status) {
-        printInfo(`    ${formatWorktreeStatus(status)}`);
-      } else {
-        printInfo(`    ${chalk3.yellow(MESSAGES.WORKTREE_STATUS_UNAVAILABLE)}`);
+
+// src/utils/progress.ts
+var ProgressRenderer = class {
+  /** 所有任务的进度状态 */
+  tasks;
+  /** 总任务数 */
+  total;
+  /** 当前 spinner 帧索引 */
+  frameIndex;
+  /** 定时器引用 */
+  timer;
+  /** 是否为 TTY 环境 */
+  isTTY;
+  /** 已渲染的行数（用于回退光标） */
+  renderedLineCount;
+  /** 是否已停止 */
+  stopped;
+  /** 是否存在排队任务（启用汇总行渲染） */
+  hasPendingTasks;
+  /**
+   * 创建进度面板渲染器
+   * @param {string[]} branches - 分支名列表，顺序对应任务列表
+   * @param {string[]} paths - worktree 路径列表，完成/失败后显示
+   * @param {boolean} [allRunning=true] - 是否将所有任务初始化为 running 状态，false 时初始化为 pending
+   */
+  constructor(branches, paths, allRunning = true) {
+    const now = Date.now();
+    this.total = branches.length;
+    this.frameIndex = 0;
+    this.timer = null;
+    this.isTTY = !!process.stdout.isTTY;
+    this.renderedLineCount = 0;
+    this.stopped = false;
+    this.hasPendingTasks = !allRunning;
+    this.tasks = branches.map((branch, i) => ({
+      index: i + 1,
+      branch,
+      path: paths[i],
+      status: allRunning ? "running" : "pending",
+      startedAt: allRunning ? now : 0,
+      finishedAt: null,
+      lastActiveAt: allRunning ? now : 0,
+      durationMs: null,
+      costUsd: null
+    }));
+  }
+  /**
+   * 启动定时渲染循环
+   * TTY 模式下每 SPINNER_INTERVAL_MS 毫秒刷新一次面板
+   * 非 TTY 模式下输出状态为 running 的任务的启动信息
+   */
+  start() {
+    if (this.stopped) return;
+    if (!this.isTTY) {
+      for (const task of this.tasks) {
+        if (task.status === "running") {
+          console.log(MESSAGES.PROGRESS_TASK_STARTED(task.index, this.total, task.branch, task.path));
+        }
       }
-      printInfo("");
+      return;
+    }
+    process.stdout.write(CURSOR_HIDE);
+    this.render();
+    this.timer = setInterval(() => {
+      this.frameIndex = (this.frameIndex + 1) % SPINNER_FRAMES.length;
+      this.render();
+    }, SPINNER_INTERVAL_MS);
+    if (this.timer.unref) {
+      this.timer.unref();
     }
-    printInfo(`\u5171 ${worktrees.length} \u4E2A worktree`);
   }
-}
-
-// src/commands/create.ts
-function registerCreateCommand(program2) {
-  program2.command("create").description("\u6279\u91CF\u521B\u5EFA worktree \u53CA\u5BF9\u5E94\u5206\u652F").requiredOption("-b, --branch <branchName>", "\u5206\u652F\u540D").option("-n, --number <count>", "\u521B\u5EFA\u6570\u91CF", "1").action((options) => {
-    handleCreate(options);
-  });
-}
-function handleCreate(options) {
-  validateMainWorktree();
-  const count = Number(options.number);
-  if (!Number.isInteger(count) || count <= 0) {
-    throw new ClawtError(
-      MESSAGES.INVALID_COUNT(options.number),
-      EXIT_CODES.ARGUMENT_ERROR
-    );
+  /**
+   * 更新指定任务的最后活动时间戳
+   * 当 child.stderr 有输出时调用，表示任务仍然活跃
+   * @param {number} index - 任务索引（从 0 开始）
+   */
+  updateActivity(index) {
+    this.tasks[index].lastActiveAt = Date.now();
   }
-  logger.info(`create \u547D\u4EE4\u6267\u884C\uFF0C\u5206\u652F: ${options.branch}\uFF0C\u6570\u91CF: ${count}`);
-  const worktrees = createWorktrees(options.branch, count);
-  printSuccess(MESSAGES.WORKTREE_CREATED(worktrees.length));
-  printInfo("");
-  worktrees.forEach((wt, index) => {
-    printInfo(`\u76EE\u5F55\u8DEF\u5F84${index + 1}\uFF1A`);
-    printInfo(`  ${wt.path}`);
-    printInfo(`  \u5206\u652F\u540D: ${wt.branch}`);
-    printSeparator();
-  });
-}
-
-// src/commands/remove.ts
-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\uFF08\u5B8C\u6574\u5206\u652F\u540D\u7CBE\u786E\u5339\u914D\uFF09").action(async (options) => {
-    await handleRemove(options);
-  });
-}
-function resolveWorktreesToRemove(options) {
-  const allWorktrees = getProjectWorktrees();
-  if (options.all) {
-    return allWorktrees;
+  /**
+   * 标记指定任务为运行中状态
+   * 将 pending 任务标记为 running 并设置启动时间戳
+   * @param {number} index - 任务索引（从 0 开始）
+   */
+  markRunning(index) {
+    const task = this.tasks[index];
+    const now = Date.now();
+    task.status = "running";
+    task.startedAt = now;
+    task.lastActiveAt = now;
+    if (!this.isTTY) {
+      console.log(MESSAGES.PROGRESS_TASK_STARTED(task.index, this.total, task.branch, task.path));
+    }
   }
-  if (!options.branch) {
-    throw new ClawtError("\u8BF7\u6307\u5B9A --all \u6216 -b <branchName> \u53C2\u6570");
+  /**
+   * 标记指定任务为完成状态
+   * @param {number} index - 任务索引（从 0 开始）
+   * @param {number} durationMs - 耗时（毫秒）
+   * @param {number} costUsd - 费用（美元）
+   */
+  markDone(index, durationMs, costUsd) {
+    const task = this.tasks[index];
+    task.status = "done";
+    task.finishedAt = Date.now();
+    task.durationMs = durationMs;
+    task.costUsd = costUsd;
+    if (!this.isTTY) {
+      const duration = formatDuration(durationMs);
+      const cost = `$${costUsd.toFixed(2)}`;
+      console.log(MESSAGES.PROGRESS_TASK_DONE(task.index, this.total, task.branch, duration, cost, task.path));
+    }
   }
-  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));
+  /**
+   * 标记指定任务为失败状态
+   * @param {number} index - 任务索引（从 0 开始）
+   * @param {number} durationMs - 耗时（毫秒）
+   */
+  markFailed(index, durationMs) {
+    const task = this.tasks[index];
+    task.status = "failed";
+    task.finishedAt = Date.now();
+    task.durationMs = durationMs;
+    if (!this.isTTY) {
+      const duration = formatDuration(durationMs);
+      console.log(MESSAGES.PROGRESS_TASK_FAILED(task.index, this.total, task.branch, duration, task.path));
+    }
   }
-  return matched;
-}
-async function handleRemove(options) {
-  validateMainWorktree();
-  const projectName = getProjectName();
-  logger.info(`remove \u547D\u4EE4\u6267\u884C\uFF0C\u9879\u76EE: ${projectName}`);
-  const worktreesToRemove = resolveWorktreesToRemove(options);
-  if (worktreesToRemove.length === 0) {
-    printInfo(MESSAGES.NO_WORKTREES);
-    return;
+  /**
+   * 停止渲染循环并恢复光标
+   * 在所有任务完成或 SIGINT 中断时调用
+   */
+  stop() {
+    if (this.stopped) return;
+    this.stopped = true;
+    if (this.timer) {
+      clearInterval(this.timer);
+      this.timer = null;
+    }
+    if (this.isTTY) {
+      this.render();
+      process.stdout.write(CURSOR_SHOW);
+    }
   }
-  printInfo("\u5373\u5C06\u79FB\u9664\u4EE5\u4E0B worktree \u53CA\u672C\u5730\u5206\u652F\uFF1A\n");
-  worktreesToRemove.forEach((wt, index) => {
-    printInfo(`  ${index + 1}. ${wt.path}  \u2192  \u5206\u652F: ${wt.branch}`);
-  });
-  printInfo("");
-  const autoDelete = getConfigValue("autoDeleteBranch");
-  let shouldDeleteBranch = autoDelete;
-  if (!autoDelete) {
-    shouldDeleteBranch = await confirmAction("\u662F\u5426\u540C\u65F6\u5220\u9664\u5BF9\u5E94\u7684\u672C\u5730\u5206\u652F\uFF1F");
+  /**
+   * 执行一次完整的面板渲染
+   * 先回退光标到面板起始位置，再逐行输出
+   */
+  render() {
+    const maxBranchWidth = getMaxBranchWidth(this.tasks);
+    const spinnerChar = SPINNER_FRAMES[this.frameIndex];
+    const lines = this.tasks.map((task) => renderTaskLine(task, this.total, maxBranchWidth, spinnerChar));
+    if (this.hasPendingTasks) {
+      lines.push(renderSummaryLine(this.tasks, this.total));
+    }
+    if (this.renderedLineCount > 0) {
+      process.stdout.write(CURSOR_UP(this.renderedLineCount));
+    }
+    for (const line of lines) {
+      process.stdout.write(`${line}${CLEAR_LINE}
+`);
+    }
+    this.renderedLineCount = lines.length;
   }
-  const failures = [];
-  for (const wt of worktreesToRemove) {
-    try {
-      removeWorktreeByPath(wt.path);
-      if (shouldDeleteBranch) {
-        deleteBranch(wt.branch);
+};
+
+// src/utils/task-file.ts
+import { resolve } from "path";
+import { existsSync as existsSync6, 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) {
+  const branchRequired = options?.branchRequired ?? true;
+  const entries = [];
+  let match;
+  let blockIndex = 0;
+  TASK_BLOCK_REGEX.lastIndex = 0;
+  while ((match = TASK_BLOCK_REGEX.exec(content)) !== null) {
+    blockIndex++;
+    const blockContent = match[1].trim();
+    const lines = blockContent.split("\n");
+    let branch;
+    const taskLines = [];
+    for (const line of lines) {
+      const branchMatch = line.trim().match(BRANCH_LINE_REGEX);
+      if (branchMatch) {
+        branch = branchMatch[1].trim();
+      } else {
+        taskLines.push(line);
       }
-      removeSnapshot(projectName, wt.branch);
-      printSuccess(MESSAGES.WORKTREE_REMOVED(wt.path));
-    } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : String(error);
-      logger.error(`\u79FB\u9664 worktree \u5931\u8D25: ${wt.path} - ${error}`);
-      failures.push({ path: wt.path, error: errorMessage });
     }
+    if (branchRequired && !branch) {
+      throw new ClawtError(MESSAGES.TASK_FILE_MISSING_BRANCH(blockIndex));
+    }
+    const task = taskLines.join("\n").trim();
+    if (!task) {
+      throw new ClawtError(
+        branch ? MESSAGES.TASK_FILE_MISSING_TASK(branch) : MESSAGES.TASK_FILE_MISSING_TASK_BY_INDEX(blockIndex)
+      );
+    }
+    entries.push({ branch, task });
   }
-  if (options.all) {
-    removeProjectSnapshots(projectName);
+  return entries;
+}
+function loadTaskFile(filePath, options) {
+  const absolutePath = resolve(filePath);
+  if (!existsSync6(absolutePath)) {
+    throw new ClawtError(MESSAGES.TASK_FILE_NOT_FOUND(absolutePath));
   }
-  gitWorktreePrune();
-  const projectDir = getProjectWorktreeDir();
-  removeEmptyDir(projectDir);
-  if (failures.length > 0) {
-    printError(MESSAGES.REMOVE_PARTIAL_FAILURE(failures));
-    throw new ClawtError(
-      `${failures.length} \u4E2A worktree \u79FB\u9664\u5931\u8D25`
-    );
+  const content = readFileSync3(absolutePath, "utf-8");
+  const entries = parseTaskFile(content, options);
+  if (entries.length === 0) {
+    throw new ClawtError(MESSAGES.TASK_FILE_EMPTY);
   }
+  return entries;
 }
 
-// src/commands/run.ts
-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);
-  });
-}
+// src/utils/task-executor.ts
 function executeClaudeTask(worktree, task) {
   const child = spawnProcess(
     "claude",
@@ -1063,7 +1346,7 @@ function executeClaudeTask(worktree, task) {
       stdio: ["ignore", "pipe", "pipe"]
     }
   );
-  const promise = new Promise((resolve) => {
+  const promise = new Promise((resolve2) => {
     let stdout = "";
     let stderr = "";
     child.stdout?.on("data", (data) => {
@@ -1083,7 +1366,7 @@ function executeClaudeTask(worktree, task) {
       } catch {
         logger.warn(`\u89E3\u6790 Claude Code \u8F93\u51FA\u5931\u8D25: ${stdout.substring(0, 200)}`);
       }
-      resolve({
+      resolve2({
         task,
         branch: worktree.branch,
         worktreePath: worktree.path,
@@ -1093,7 +1376,7 @@ function executeClaudeTask(worktree, task) {
       });
     });
     child.on("error", (err) => {
-      resolve({
+      resolve2({
         task,
         branch: worktree.branch,
         worktreePath: worktree.path,
@@ -1105,24 +1388,6 @@ function executeClaudeTask(worktree, task) {
   });
   return { child, promise };
 }
-function printTaskNotification(taskResult) {
-  const { success, worktreePath, branch, result } = taskResult;
-  const status = success ? "\u5B8C\u6210" : "\u5931\u8D25";
-  const icon = success ? "\u2713" : "\u2717";
-  const durationStr = result ? `${(result.duration_ms / 1e3).toFixed(1)}s` : "N/A";
-  const costStr = result ? `$${result.total_cost_usd.toFixed(2)}` : "N/A";
-  const resultStr = success ? "success" : "failed";
-  if (success) {
-    printSuccess(`${icon} [${status}] worktree: ${worktreePath}`);
-  } else {
-    printError(`${icon} [${status}] worktree: ${worktreePath}`);
-  }
-  printInfo(`  \u5206\u652F: ${branch}`);
-  printInfo(`  \u8017\u65F6: ${durationStr}`);
-  printInfo(`  \u82B1\u8D39: ${costStr}`);
-  printInfo(`  \u7ED3\u679C: ${resultStr}`);
-  printSeparator();
-}
 function printTaskSummary(summary) {
   printDoubleSeparator();
   printInfo(`\u5168\u90E8\u4EFB\u52A1\u5DF2\u5B8C\u6210 (${summary.total}/${summary.total})`);
@@ -1147,60 +1412,117 @@ async function handleInterruptCleanup(worktrees) {
     printInfo(MESSAGES.INTERRUPT_KEPT);
   }
 }
-async function handleRun(options) {
-  validateMainWorktree();
-  validateClaudeCodeInstalled();
-  if (!options.tasks || options.tasks.length === 0) {
-    const sanitized = sanitizeBranchName(options.branch);
-    if (checkBranchExists(sanitized)) {
-      throw new ClawtError(MESSAGES.BRANCH_EXISTS_USE_RESUME(sanitized));
-    }
-    const worktrees2 = createWorktrees(options.branch, 1);
-    const worktree = worktrees2[0];
-    printSuccess(MESSAGES.WORKTREE_CREATED(1));
-    launchInteractiveClaude(worktree);
-    return;
-  }
-  const tasks = options.tasks.map((t) => t.trim()).filter(Boolean);
-  if (tasks.length === 0) {
-    throw new ClawtError("\u4EFB\u52A1\u5217\u8868\u4E0D\u80FD\u4E3A\u7A7A");
-  }
-  const count = tasks.length;
-  logger.info(`run \u547D\u4EE4\u6267\u884C\uFF0C\u5206\u652F: ${options.branch}\uFF0C\u4EFB\u52A1\u6570: ${count}`);
-  const worktrees = createWorktrees(options.branch, count);
-  printSuccess(MESSAGES.WORKTREE_CREATED(worktrees.length));
-  for (const wt of worktrees) {
-    printInfo(`  \u5206\u652F: ${wt.branch}  \u8DEF\u5F84: ${wt.path}`);
+function updateRendererStatus(renderer, index, result, startTime) {
+  if (result.success) {
+    renderer.markDone(
+      index,
+      result.result?.duration_ms ?? Date.now() - startTime,
+      result.result?.total_cost_usd ?? 0
+    );
+  } else {
+    renderer.markFailed(
+      index,
+      result.result?.duration_ms ?? Date.now() - startTime
+    );
   }
-  printInfo("");
-  const startTime = Date.now();
+}
+async function executeWithConcurrency(worktrees, tasks, concurrency, renderer, startTime, isInterrupted, childProcesses) {
+  const total = tasks.length;
+  const results = new Array(total);
+  let nextIndex = 0;
+  let completedCount = 0;
+  return new Promise((resolve2) => {
+    function launchNext() {
+      if (nextIndex >= total || isInterrupted()) return;
+      const index = nextIndex;
+      nextIndex++;
+      const wt = worktrees[index];
+      const task = tasks[index];
+      logger.info(`\u542F\u52A8\u4EFB\u52A1 ${index + 1}: ${task} (worktree: ${wt.path})`);
+      renderer.markRunning(index);
+      const handle = executeClaudeTask(wt, task);
+      childProcesses.push(handle.child);
+      handle.child.stderr?.on("data", () => {
+        renderer.updateActivity(index);
+      });
+      handle.promise.then((result) => {
+        results[index] = result;
+        completedCount++;
+        if (!isInterrupted()) {
+          updateRendererStatus(renderer, index, result, startTime);
+        }
+        launchNext();
+        if (completedCount === total) {
+          resolve2(results);
+        }
+      });
+    }
+    const initialBatch = Math.min(concurrency, total);
+    for (let i = 0; i < initialBatch; i++) {
+      launchNext();
+    }
+  });
+}
+async function executeAllParallel(worktrees, tasks, renderer, startTime, isInterrupted, childProcesses) {
   const handles = worktrees.map((wt, index) => {
     const task = tasks[index];
     logger.info(`\u542F\u52A8\u4EFB\u52A1 ${index + 1}: ${task} (worktree: ${wt.path})`);
-    return executeClaudeTask(wt, task);
+    const handle = executeClaudeTask(wt, task);
+    childProcesses.push(handle.child);
+    handle.child.stderr?.on("data", () => {
+      renderer.updateActivity(index);
+    });
+    return handle;
   });
-  const childProcesses = handles.map((h) => h.child);
+  const results = await Promise.all(
+    handles.map(
+      (handle, index) => handle.promise.then((result) => {
+        if (!isInterrupted()) {
+          updateRendererStatus(renderer, index, result, startTime);
+        }
+        return result;
+      })
+    )
+  );
+  return results;
+}
+async function executeBatchTasks(worktrees, tasks, concurrency) {
+  const count = tasks.length;
+  if (concurrency > 0) {
+    printInfo(MESSAGES.CONCURRENCY_INFO(concurrency, count));
+    printInfo("");
+  }
+  const startTime = Date.now();
+  const branches = worktrees.map((wt) => wt.branch);
+  const paths = worktrees.map((wt) => wt.path);
+  const allRunning = concurrency === 0;
+  const renderer = new ProgressRenderer(branches, paths, allRunning);
+  renderer.start();
   let interrupted = false;
+  const isInterrupted = () => interrupted;
+  const childProcesses = [];
   const sigintHandler = async () => {
     if (interrupted) return;
     interrupted = true;
+    renderer.stop();
     printInfo("");
     printWarning(MESSAGES.INTERRUPTED);
     killAllChildProcesses(childProcesses);
-    await Promise.allSettled(handles.map((h) => h.promise));
+    await Promise.allSettled(childProcesses.map(
+      (cp) => new Promise((resolve2) => {
+        if (cp.exitCode !== null) {
+          resolve2();
+        } else {
+          cp.on("close", () => resolve2());
+        }
+      })
+    ));
     await handleInterruptCleanup(worktrees);
     process.exit(1);
   };
   process.on("SIGINT", sigintHandler);
-  const taskPromises = handles.map(
-    (handle) => handle.promise.then((result) => {
-      if (!interrupted) {
-        printTaskNotification(result);
-      }
-      return result;
-    })
-  );
-  const results = await Promise.all(taskPromises);
+  const results = concurrency > 0 ? await executeWithConcurrency(worktrees, tasks, concurrency, renderer, startTime, isInterrupted, childProcesses) : await executeAllParallel(worktrees, tasks, renderer, startTime, isInterrupted, childProcesses);
+  renderer.stop();
   process.removeListener("SIGINT", sigintHandler);
   if (interrupted) return;
   const totalDurationMs = Date.now() - startTime;
@@ -1214,6 +1536,216 @@ async function handleRun(options) {
   printTaskSummary(summary);
 }
 
+// src/commands/list.ts
+import chalk4 from "chalk";
+function registerListCommand(program2) {
+  program2.command("list").description("\u5217\u51FA\u5F53\u524D\u9879\u76EE\u6240\u6709 worktree").option("--json", "\u4EE5 JSON \u683C\u5F0F\u8F93\u51FA").action((options) => {
+    handleList(options);
+  });
+}
+function handleList(options) {
+  validateMainWorktree();
+  const projectName = getProjectName();
+  const worktrees = getProjectWorktrees();
+  logger.info(`list \u547D\u4EE4\u6267\u884C\uFF0C\u9879\u76EE: ${projectName}\uFF0C\u5171 ${worktrees.length} \u4E2A worktree`);
+  if (options.json) {
+    printListAsJson(projectName, worktrees);
+    return;
+  }
+  printListAsText(projectName, worktrees);
+}
+function printListAsJson(projectName, worktrees) {
+  const result = {
+    project: projectName,
+    total: worktrees.length,
+    worktrees: worktrees.map((wt) => ({
+      path: wt.path,
+      branch: wt.branch
+    }))
+  };
+  console.log(JSON.stringify(result, null, 2));
+}
+function printListAsText(projectName, worktrees) {
+  printInfo(`\u5F53\u524D\u9879\u76EE: ${projectName}
+`);
+  if (worktrees.length === 0) {
+    printInfo(`  ${MESSAGES.NO_WORKTREES}`);
+  } else {
+    for (const wt of worktrees) {
+      const status = getWorktreeStatus(wt);
+      const isIdle = status ? isWorktreeIdle(status) : false;
+      const pathDisplay = isIdle ? chalk4.hex("#FF8C00")(wt.path) : wt.path;
+      printInfo(`  ${pathDisplay}   [${wt.branch}]`);
+      if (status) {
+        printInfo(`    ${formatWorktreeStatus(status)}`);
+      } else {
+        printInfo(`    ${chalk4.yellow(MESSAGES.WORKTREE_STATUS_UNAVAILABLE)}`);
+      }
+      printInfo("");
+    }
+    printInfo(`\u5171 ${worktrees.length} \u4E2A worktree`);
+  }
+}
+
+// src/commands/create.ts
+function registerCreateCommand(program2) {
+  program2.command("create").description("\u6279\u91CF\u521B\u5EFA worktree \u53CA\u5BF9\u5E94\u5206\u652F").requiredOption("-b, --branch <branchName>", "\u5206\u652F\u540D").option("-n, --number <count>", "\u521B\u5EFA\u6570\u91CF", "1").action((options) => {
+    handleCreate(options);
+  });
+}
+function handleCreate(options) {
+  validateMainWorktree();
+  const count = Number(options.number);
+  if (!Number.isInteger(count) || count <= 0) {
+    throw new ClawtError(
+      MESSAGES.INVALID_COUNT(options.number),
+      EXIT_CODES.ARGUMENT_ERROR
+    );
+  }
+  logger.info(`create \u547D\u4EE4\u6267\u884C\uFF0C\u5206\u652F: ${options.branch}\uFF0C\u6570\u91CF: ${count}`);
+  const worktrees = createWorktrees(options.branch, count);
+  printSuccess(MESSAGES.WORKTREE_CREATED(worktrees.length));
+  printInfo("");
+  worktrees.forEach((wt, index) => {
+    printInfo(`\u76EE\u5F55\u8DEF\u5F84${index + 1}\uFF1A`);
+    printInfo(`  ${wt.path}`);
+    printInfo(`  \u5206\u652F\u540D: ${wt.branch}`);
+    printSeparator();
+  });
+}
+
+// src/commands/remove.ts
+var REMOVE_RESOLVE_MESSAGES = {
+  noWorktrees: MESSAGES.REMOVE_NO_WORKTREES,
+  selectBranch: MESSAGES.REMOVE_SELECT_BRANCH,
+  multipleMatches: MESSAGES.REMOVE_MULTIPLE_MATCHES,
+  noMatch: MESSAGES.REMOVE_NO_MATCH
+};
+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\uFF08\u652F\u6301\u6A21\u7CCA\u5339\u914D\uFF0C\u4E0D\u4F20\u5219\u5217\u51FA\u6240\u6709\u5206\u652F\uFF09").action(async (options) => {
+    await handleRemove(options);
+  });
+}
+async function handleRemove(options) {
+  validateMainWorktree();
+  const projectName = getProjectName();
+  logger.info(`remove \u547D\u4EE4\u6267\u884C\uFF0C\u9879\u76EE: ${projectName}`);
+  const allWorktrees = getProjectWorktrees();
+  let worktreesToRemove;
+  if (options.all) {
+    worktreesToRemove = allWorktrees;
+  } else {
+    worktreesToRemove = await resolveTargetWorktrees(allWorktrees, REMOVE_RESOLVE_MESSAGES, options.branch);
+  }
+  if (worktreesToRemove.length === 0) {
+    printInfo(MESSAGES.NO_WORKTREES);
+    return;
+  }
+  printInfo("\u5373\u5C06\u79FB\u9664\u4EE5\u4E0B worktree \u53CA\u672C\u5730\u5206\u652F\uFF1A\n");
+  worktreesToRemove.forEach((wt, index) => {
+    printInfo(`  ${index + 1}. ${wt.path}  \u2192  \u5206\u652F: ${wt.branch}`);
+  });
+  printInfo("");
+  const autoDelete = getConfigValue("autoDeleteBranch");
+  let shouldDeleteBranch = autoDelete;
+  if (!autoDelete) {
+    shouldDeleteBranch = await confirmAction("\u662F\u5426\u540C\u65F6\u5220\u9664\u5BF9\u5E94\u7684\u672C\u5730\u5206\u652F\uFF1F");
+  }
+  const failures = [];
+  for (const wt of worktreesToRemove) {
+    try {
+      removeWorktreeByPath(wt.path);
+      if (shouldDeleteBranch) {
+        deleteBranch(wt.branch);
+      }
+      removeSnapshot(projectName, wt.branch);
+      printSuccess(MESSAGES.WORKTREE_REMOVED(wt.path));
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      logger.error(`\u79FB\u9664 worktree \u5931\u8D25: ${wt.path} - ${error}`);
+      failures.push({ path: wt.path, error: errorMessage });
+    }
+  }
+  if (options.all) {
+    removeProjectSnapshots(projectName);
+  }
+  gitWorktreePrune();
+  const projectDir = getProjectWorktreeDir();
+  removeEmptyDir(projectDir);
+  if (failures.length > 0) {
+    printError(MESSAGES.REMOVE_PARTIAL_FAILURE(failures));
+    throw new ClawtError(
+      `${failures.length} \u4E2A worktree \u79FB\u9664\u5931\u8D25`
+    );
+  }
+}
+
+// src/commands/run.ts
+function registerRunCommand(program2) {
+  program2.command("run").description("\u6279\u91CF\u521B\u5EFA worktree \u5E76\u542F\u52A8 Claude Code \u6267\u884C\u4EFB\u52A1").option("-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").option("-c, --concurrency <n>", "\u6700\u5927\u5E76\u53D1\u6570\uFF0C0 \u8868\u793A\u4E0D\u9650\u5236").option("-f, --file <path>", "\u4ECE\u4EFB\u52A1\u6587\u4EF6\u8BFB\u53D6\u4EFB\u52A1\u5217\u8868\uFF08\u4E0E --tasks \u4E92\u65A5\uFF09").action(async (options) => {
+    await handleRun(options);
+  });
+}
+function parseConcurrency(optionValue, configValue) {
+  if (optionValue === void 0) {
+    return configValue;
+  }
+  const parsed = parseInt(optionValue, 10);
+  if (Number.isNaN(parsed) || parsed < 0) {
+    throw new ClawtError(MESSAGES.CONCURRENCY_INVALID);
+  }
+  return parsed;
+}
+async function handleRunFromFile(options) {
+  const branchRequired = !options.branch;
+  const entries = loadTaskFile(options.file, { branchRequired });
+  printSuccess(MESSAGES.TASK_FILE_LOADED(entries.length, options.file));
+  const tasks = entries.map((e) => e.task);
+  let worktrees;
+  if (options.branch) {
+    worktrees = createWorktrees(options.branch, entries.length);
+  } else {
+    const branches = entries.map((e) => sanitizeBranchName(e.branch));
+    worktrees = createWorktreesByBranches(branches);
+  }
+  const concurrency = parseConcurrency(options.concurrency, getConfigValue("maxConcurrency"));
+  logger.info(`run \u547D\u4EE4\uFF08\u6587\u4EF6\u6A21\u5F0F\uFF09\u6267\u884C\uFF0C\u4EFB\u52A1\u6570: ${entries.length}\uFF0C\u5E76\u53D1\u6570: ${concurrency || "\u4E0D\u9650\u5236"}`);
+  await executeBatchTasks(worktrees, tasks, concurrency);
+}
+async function handleRun(options) {
+  validateMainWorktree();
+  validateClaudeCodeInstalled();
+  if (options.file && options.tasks) {
+    throw new ClawtError(MESSAGES.FILE_AND_TASKS_CONFLICT);
+  }
+  if (options.file) {
+    return handleRunFromFile(options);
+  }
+  if (!options.branch) {
+    throw new ClawtError(MESSAGES.BRANCH_OR_FILE_REQUIRED);
+  }
+  if (!options.tasks || options.tasks.length === 0) {
+    const sanitized = sanitizeBranchName(options.branch);
+    if (checkBranchExists(sanitized)) {
+      throw new ClawtError(MESSAGES.BRANCH_EXISTS_USE_RESUME(sanitized));
+    }
+    const worktrees2 = createWorktrees(options.branch, 1);
+    const worktree = worktrees2[0];
+    printSuccess(MESSAGES.WORKTREE_CREATED(1));
+    launchInteractiveClaude(worktree);
+    return;
+  }
+  const tasks = options.tasks.map((t) => t.trim()).filter(Boolean);
+  if (tasks.length === 0) {
+    throw new ClawtError("\u4EFB\u52A1\u5217\u8868\u4E0D\u80FD\u4E3A\u7A7A");
+  }
+  const count = tasks.length;
+  const concurrency = parseConcurrency(options.concurrency, getConfigValue("maxConcurrency"));
+  logger.info(`run \u547D\u4EE4\u6267\u884C\uFF0C\u5206\u652F: ${options.branch}\uFF0C\u4EFB\u52A1\u6570: ${count}\uFF0C\u5E76\u53D1\u6570: ${concurrency || "\u4E0D\u9650\u5236"}`);
+  const worktrees = createWorktrees(options.branch, count);
+  await executeBatchTasks(worktrees, tasks, concurrency);
+}
+
 // src/commands/resume.ts
 var RESUME_RESOLVE_MESSAGES = {
   noWorktrees: MESSAGES.RESUME_NO_WORKTREES,
@@ -1538,7 +2070,7 @@ async function handleMerge(options) {
 }
 
 // src/commands/config.ts
-import chalk4 from "chalk";
+import chalk5 from "chalk";
 function registerConfigCommand(program2) {
   const configCmd = program2.command("config").description("\u67E5\u770B\u548C\u7BA1\u7406\u5168\u5C40\u914D\u7F6E").action(() => {
     handleConfig();
@@ -1551,7 +2083,7 @@ function handleConfig() {
   const config = loadConfig();
   logger.info("config \u547D\u4EE4\u6267\u884C\uFF0C\u5C55\u793A\u5168\u5C40\u914D\u7F6E");
   printInfo(`
-${chalk4.dim("\u914D\u7F6E\u6587\u4EF6\u8DEF\u5F84:")} ${CONFIG_PATH}
+${chalk5.dim("\u914D\u7F6E\u6587\u4EF6\u8DEF\u5F84:")} ${CONFIG_PATH}
 `);
   printSeparator();
   const keys = Object.keys(DEFAULT_CONFIG);
@@ -1561,8 +2093,8 @@ ${chalk4.dim("\u914D\u7F6E\u6587\u4EF6\u8DEF\u5F84:")} ${CONFIG_PATH}
     const description = CONFIG_DESCRIPTIONS[key];
     const formattedValue = formatConfigValue(value);
     if (i === 0) printInfo("");
-    printInfo(`  ${chalk4.bold(key)}: ${formattedValue}`);
-    printInfo(`  ${chalk4.dim(description)}`);
+    printInfo(`  ${chalk5.bold(key)}: ${formattedValue}`);
+    printInfo(`  ${chalk5.dim(description)}`);
     printInfo("");
   }
   printSeparator();
@@ -1582,9 +2114,9 @@ async function handleConfigReset() {
 }
 function formatConfigValue(value) {
   if (typeof value === "boolean") {
-    return value ? chalk4.green("true") : chalk4.yellow("false");
+    return value ? chalk5.green("true") : chalk5.yellow("false");
   }
-  return chalk4.cyan(String(value));
+  return chalk5.cyan(String(value));
 }
 
 // src/commands/sync.ts
@@ -1671,7 +2203,7 @@ async function handleReset() {
 }
 
 // src/commands/status.ts
-import chalk5 from "chalk";
+import chalk6 from "chalk";
 function registerStatusCommand(program2) {
   program2.command("status").description("\u663E\u793A\u9879\u76EE\u5168\u5C40\u72B6\u6001\u603B\u89C8").option("--json", "\u4EE5 JSON \u683C\u5F0F\u8F93\u51FA").action((options) => {
     handleStatus(options);
@@ -1767,7 +2299,7 @@ function printStatusAsJson(result) {
 }
 function printStatusAsText(result) {
   printDoubleSeparator();
-  printInfo(`  ${chalk5.bold.cyan(MESSAGES.STATUS_TITLE(result.main.projectName))}`);
+  printInfo(`  ${chalk6.bold.cyan(MESSAGES.STATUS_TITLE(result.main.projectName))}`);
   printDoubleSeparator();
   printInfo("");
   printMainSection(result.main);
@@ -1780,17 +2312,17 @@ function printStatusAsText(result) {
   printDoubleSeparator();
 }
 function printMainSection(main) {
-  printInfo(`  ${chalk5.bold("\u25C6")} ${chalk5.bold(MESSAGES.STATUS_MAIN_SECTION)}`);
-  printInfo(`    \u5206\u652F: ${chalk5.bold(main.branch)}`);
+  printInfo(`  ${chalk6.bold("\u25C6")} ${chalk6.bold(MESSAGES.STATUS_MAIN_SECTION)}`);
+  printInfo(`    \u5206\u652F: ${chalk6.bold(main.branch)}`);
   if (main.isClean) {
-    printInfo(`    \u72B6\u6001: ${chalk5.green("\u2713 \u5E72\u51C0")}`);
+    printInfo(`    \u72B6\u6001: ${chalk6.green("\u2713 \u5E72\u51C0")}`);
   } else {
-    printInfo(`    \u72B6\u6001: ${chalk5.yellow("\u2717 \u6709\u672A\u63D0\u4EA4\u4FEE\u6539")}`);
+    printInfo(`    \u72B6\u6001: ${chalk6.yellow("\u2717 \u6709\u672A\u63D0\u4EA4\u4FEE\u6539")}`);
   }
   printInfo("");
 }
 function printWorktreesSection(worktrees, total) {
-  printInfo(`  ${chalk5.bold("\u25C6")} ${chalk5.bold(MESSAGES.STATUS_WORKTREES_SECTION)} (${total} \u4E2A)`);
+  printInfo(`  ${chalk6.bold("\u25C6")} ${chalk6.bold(MESSAGES.STATUS_WORKTREES_SECTION)} (${total} \u4E2A)`);
   printInfo("");
   if (worktrees.length === 0) {
     printInfo(`    ${MESSAGES.STATUS_NO_WORKTREES}`);
@@ -1802,39 +2334,39 @@ function printWorktreesSection(worktrees, total) {
 }
 function printWorktreeItem(wt) {
   const statusLabel = formatChangeStatusLabel(wt.changeStatus);
-  printInfo(`  ${chalk5.bold("\u25CF")} ${chalk5.bold(wt.branch)}   [${statusLabel}]`);
+  printInfo(`  ${chalk6.bold("\u25CF")} ${chalk6.bold(wt.branch)}   [${statusLabel}]`);
   const parts = [];
   if (wt.insertions > 0 || wt.deletions > 0) {
-    parts.push(`${chalk5.green(`+${wt.insertions}`)} ${chalk5.red(`-${wt.deletions}`)}`);
+    parts.push(`${chalk6.green(`+${wt.insertions}`)} ${chalk6.red(`-${wt.deletions}`)}`);
   }
   if (wt.commitsAhead > 0) {
-    parts.push(chalk5.yellow(`${wt.commitsAhead} \u4E2A\u672C\u5730\u63D0\u4EA4`));
+    parts.push(chalk6.yellow(`${wt.commitsAhead} \u4E2A\u672C\u5730\u63D0\u4EA4`));
   }
   if (wt.commitsBehind > 0) {
-    parts.push(chalk5.yellow(`\u843D\u540E\u4E3B\u5206\u652F ${wt.commitsBehind} \u4E2A\u63D0\u4EA4`));
+    parts.push(chalk6.yellow(`\u843D\u540E\u4E3B\u5206\u652F ${wt.commitsBehind} \u4E2A\u63D0\u4EA4`));
   } else {
-    parts.push(chalk5.green("\u4E0E\u4E3B\u5206\u652F\u540C\u6B65"));
+    parts.push(chalk6.green("\u4E0E\u4E3B\u5206\u652F\u540C\u6B65"));
   }
   printInfo(`    ${parts.join("   ")}`);
   if (wt.hasSnapshot) {
-    printInfo(`    ${chalk5.blue("\u6709 validate \u5FEB\u7167")}`);
+    printInfo(`    ${chalk6.blue("\u6709 validate \u5FEB\u7167")}`);
   }
   printInfo("");
 }
 function formatChangeStatusLabel(status) {
   switch (status) {
     case "committed":
-      return chalk5.green(MESSAGES.STATUS_CHANGE_COMMITTED);
+      return chalk6.green(MESSAGES.STATUS_CHANGE_COMMITTED);
     case "uncommitted":
-      return chalk5.yellow(MESSAGES.STATUS_CHANGE_UNCOMMITTED);
+      return chalk6.yellow(MESSAGES.STATUS_CHANGE_UNCOMMITTED);
     case "conflict":
-      return chalk5.red(MESSAGES.STATUS_CHANGE_CONFLICT);
+      return chalk6.red(MESSAGES.STATUS_CHANGE_CONFLICT);
     case "clean":
-      return chalk5.gray(MESSAGES.STATUS_CHANGE_CLEAN);
+      return chalk6.gray(MESSAGES.STATUS_CHANGE_CLEAN);
   }
 }
 function printSnapshotsSection(snapshots) {
-  printInfo(`  ${chalk5.bold("\u25C6")} ${chalk5.bold(MESSAGES.STATUS_SNAPSHOTS_SECTION)} (${snapshots.length} \u4E2A)`);
+  printInfo(`  ${chalk6.bold("\u25C6")} ${chalk6.bold(MESSAGES.STATUS_SNAPSHOTS_SECTION)} (${snapshots.length} \u4E2A)`);
   printInfo("");
   if (snapshots.length === 0) {
     printInfo(`    ${MESSAGES.STATUS_NO_SNAPSHOTS}`);
@@ -1842,8 +2374,8 @@ function printSnapshotsSection(snapshots) {
     return;
   }
   for (const snap of snapshots) {
-    const orphanLabel = snap.worktreeExists ? "" : `  ${chalk5.yellow(MESSAGES.STATUS_SNAPSHOT_ORPHANED)}`;
-    const icon = snap.worktreeExists ? chalk5.blue("\u25CF") : chalk5.yellow("\u26A0");
+    const orphanLabel = snap.worktreeExists ? "" : `  ${chalk6.yellow(MESSAGES.STATUS_SNAPSHOT_ORPHANED)}`;
+    const icon = snap.worktreeExists ? chalk6.blue("\u25CF") : chalk6.yellow("\u26A0");
     printInfo(`  ${icon} ${snap.branch}${orphanLabel}`);
   }
   printInfo("");