clawt 2.9.1 → 2.10.1

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,9 +44,44 @@ 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`,
+  /** 用户取消破坏性操作 */
+  DESTRUCTIVE_OP_CANCELLED: "\u5DF2\u53D6\u6D88\u64CD\u4F5C",
+  /** 请提供提交信息 */
+  COMMIT_MESSAGE_REQUIRED: "\u8BF7\u63D0\u4F9B\u63D0\u4EA4\u4FE1\u606F\uFF08-m \u53C2\u6570\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",
+  /** 中断后自动清理完成 */
+  INTERRUPT_AUTO_CLEANED: (count) => `\u2713 \u5DF2\u81EA\u52A8\u6E05\u7406 ${count} \u4E2A worktree \u548C\u5BF9\u5E94\u5206\u652F`,
+  /** 中断后手动确认清理 */
+  INTERRUPT_CONFIRM_CLEANUP: "\u662F\u5426\u79FB\u9664\u521A\u521A\u521B\u5EFA\u7684 worktree \u548C\u5BF9\u5E94\u5206\u652F\uFF1F",
+  /** 中断后清理完成 */
+  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"
+};
+
+// 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`
+};
+
+// 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" : ""}`,
@@ -58,57 +91,12 @@ var MESSAGES = {
   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}`,
-  /** 请提供提交信息 */
-  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",
-  /** 检测到用户中断 */
-  INTERRUPTED: "\u68C0\u6D4B\u5230\u9000\u51FA\u6307\u4EE4\uFF0C\u5DF2\u505C\u6B62 Claude Code \u4EFB\u52A1",
-  /** 中断后自动清理完成 */
-  INTERRUPT_AUTO_CLEANED: (count) => `\u2713 \u5DF2\u81EA\u52A8\u6E05\u7406 ${count} \u4E2A worktree \u548C\u5BF9\u5E94\u5206\u652F`,
-  /** 中断后手动确认清理 */
-  INTERRUPT_CONFIRM_CLEANUP: "\u662F\u5426\u79FB\u9664\u521A\u521A\u521B\u5EFA\u7684 worktree \u548C\u5BF9\u5E94\u5206\u652F\uFF1F",
-  /** 中断后清理完成 */
-  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",
-  /** 创建数量参数无效 */
-  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`,
   /** 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 +106,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 +146,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,11 +171,93 @@ ${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`,
-  /** 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"
+  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 区块标题 */
+  STATUS_MAIN_SECTION: "\u4E3B Worktree",
+  /** status worktrees 区块标题 */
+  STATUS_WORKTREES_SECTION: "Worktree \u5217\u8868",
+  /** status 快照区块标题 */
+  STATUS_SNAPSHOTS_SECTION: "\u672A\u6E05\u7406\u7684 Validate \u5FEB\u7167",
+  /** status 无 worktree */
+  STATUS_NO_WORKTREES: "(\u65E0\u6D3B\u8DC3 worktree)",
+  /** status 无未清理快照 */
+  STATUS_NO_SNAPSHOTS: "(\u65E0\u672A\u6E05\u7406\u7684\u5FEB\u7167)",
+  /** status 变更状态：已提交 */
+  STATUS_CHANGE_COMMITTED: "\u5DF2\u63D0\u4EA4",
+  /** status 变更状态：未提交修改 */
+  STATUS_CHANGE_UNCOMMITTED: "\u672A\u63D0\u4EA4\u4FEE\u6539",
+  /** status 变更状态：合并冲突 */
+  STATUS_CHANGE_CONFLICT: "\u5408\u5E76\u51B2\u7A81",
+  /** status 变更状态：无变更 */
+  STATUS_CHANGE_CLEAN: "\u65E0\u53D8\u66F4",
+  /** status 快照对应 worktree 已不存在 */
+  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
@@ -420,6 +507,14 @@ function getCommitCountAhead(branchName, cwd) {
   const output = execCommand(`git rev-list --count HEAD..${branchName}`, { cwd });
   return parseInt(output, 10) || 0;
 }
+function getCommitCountBehind(branchName, cwd) {
+  try {
+    const output = execCommand(`git rev-list --count ${branchName}..HEAD`, { cwd });
+    return parseInt(output, 10) || 0;
+  } catch {
+    return 0;
+  }
+}
 function parseShortStat(output) {
   let insertions = 0;
   let deletions = 0;
@@ -798,6 +893,14 @@ function removeSnapshot(projectName, branchName) {
     logger.info(`\u5DF2\u5220\u9664 validate \u5FEB\u7167: ${headPath}`);
   }
 }
+function getProjectSnapshotBranches(projectName) {
+  const projectDir = join3(VALIDATE_SNAPSHOTS_DIR, projectName);
+  if (!existsSync5(projectDir)) {
+    return [];
+  }
+  const files = readdirSync3(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)) {
@@ -833,6 +936,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);
@@ -937,32 +1078,28 @@ function handleCreate(options) {
 }
 
 // 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\u5B8C\u6574\u5206\u652F\u540D\u7CBE\u786E\u5339\u914D\uFF09").action(async (options) => {
+  program2.command("remove").description("\u79FB\u9664 worktree\uFF08\u652F\u6301\u5355\u4E2A/\u6279\u91CF/\u5168\u90E8\uFF09").option("--all", "\u79FB\u9664\u5F53\u524D\u9879\u76EE\u4E0B\u6240\u6709 worktree").option("-b, --branch <branchName>", "\u6307\u5B9A\u5206\u652F\u540D\uFF08\u652F\u6301\u6A21\u7CCA\u5339\u914D\uFF0C\u4E0D\u4F20\u5219\u5217\u51FA\u6240\u6709\u5206\u652F\uFF09").action(async (options) => {
     await handleRemove(options);
   });
 }
-function resolveWorktreesToRemove(options) {
-  const allWorktrees = getProjectWorktrees();
-  if (options.all) {
-    return allWorktrees;
-  }
-  if (!options.branch) {
-    throw new ClawtError("\u8BF7\u6307\u5B9A --all \u6216 -b <branchName> \u53C2\u6570");
-  }
-  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));
-  }
-  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);
+  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;
@@ -1632,6 +1769,185 @@ async function handleReset() {
   }
 }
 
+// src/commands/status.ts
+import chalk5 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);
+  });
+}
+function handleStatus(options) {
+  validateMainWorktree();
+  const statusResult = collectStatus();
+  logger.info(`status \u547D\u4EE4\u6267\u884C\uFF0C\u9879\u76EE: ${statusResult.main.projectName}\uFF0C\u5171 ${statusResult.totalWorktrees} \u4E2A worktree`);
+  if (options.json) {
+    printStatusAsJson(statusResult);
+    return;
+  }
+  printStatusAsText(statusResult);
+}
+function collectStatus() {
+  const projectName = getProjectName();
+  const currentBranch = getCurrentBranch();
+  const isClean = isWorkingDirClean();
+  const main = {
+    branch: currentBranch,
+    isClean,
+    projectName
+  };
+  const worktrees = getProjectWorktrees();
+  const worktreeStatuses = worktrees.map((wt) => collectWorktreeDetailedStatus(wt, projectName));
+  const snapshots = collectSnapshots(projectName, worktrees);
+  return {
+    main,
+    worktrees: worktreeStatuses,
+    snapshots,
+    totalWorktrees: worktrees.length
+  };
+}
+function collectWorktreeDetailedStatus(worktree, projectName) {
+  const changeStatus = detectChangeStatus(worktree);
+  const { commitsAhead, commitsBehind } = countCommitDivergence(worktree.branch);
+  const { insertions, deletions } = countDiffStat(worktree.path);
+  return {
+    path: worktree.path,
+    branch: worktree.branch,
+    changeStatus,
+    commitsAhead,
+    commitsBehind,
+    hasSnapshot: hasSnapshot(projectName, worktree.branch),
+    insertions,
+    deletions
+  };
+}
+function detectChangeStatus(worktree) {
+  try {
+    if (hasMergeConflict(worktree.path)) {
+      return "conflict";
+    }
+    if (!isWorkingDirClean(worktree.path)) {
+      return "uncommitted";
+    }
+    if (hasLocalCommits(worktree.branch)) {
+      return "committed";
+    }
+    return "clean";
+  } catch {
+    return "clean";
+  }
+}
+function countCommitDivergence(branchName) {
+  try {
+    return {
+      commitsAhead: getCommitCountAhead(branchName),
+      commitsBehind: getCommitCountBehind(branchName)
+    };
+  } catch {
+    return { commitsAhead: 0, commitsBehind: 0 };
+  }
+}
+function countDiffStat(worktreePath) {
+  try {
+    return getDiffStat(worktreePath);
+  } catch {
+    return { insertions: 0, deletions: 0 };
+  }
+}
+function collectSnapshots(projectName, worktrees) {
+  const snapshotBranches = getProjectSnapshotBranches(projectName);
+  const worktreeBranchSet = new Set(worktrees.map((wt) => wt.branch));
+  return snapshotBranches.map((branch) => ({
+    branch,
+    worktreeExists: worktreeBranchSet.has(branch)
+  }));
+}
+function printStatusAsJson(result) {
+  console.log(JSON.stringify(result, null, 2));
+}
+function printStatusAsText(result) {
+  printDoubleSeparator();
+  printInfo(`  ${chalk5.bold.cyan(MESSAGES.STATUS_TITLE(result.main.projectName))}`);
+  printDoubleSeparator();
+  printInfo("");
+  printMainSection(result.main);
+  printSeparator();
+  printInfo("");
+  printWorktreesSection(result.worktrees, result.totalWorktrees);
+  printSeparator();
+  printInfo("");
+  printSnapshotsSection(result.snapshots);
+  printDoubleSeparator();
+}
+function printMainSection(main) {
+  printInfo(`  ${chalk5.bold("\u25C6")} ${chalk5.bold(MESSAGES.STATUS_MAIN_SECTION)}`);
+  printInfo(`    \u5206\u652F: ${chalk5.bold(main.branch)}`);
+  if (main.isClean) {
+    printInfo(`    \u72B6\u6001: ${chalk5.green("\u2713 \u5E72\u51C0")}`);
+  } else {
+    printInfo(`    \u72B6\u6001: ${chalk5.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("");
+  if (worktrees.length === 0) {
+    printInfo(`    ${MESSAGES.STATUS_NO_WORKTREES}`);
+    return;
+  }
+  for (const wt of worktrees) {
+    printWorktreeItem(wt);
+  }
+}
+function printWorktreeItem(wt) {
+  const statusLabel = formatChangeStatusLabel(wt.changeStatus);
+  printInfo(`  ${chalk5.bold("\u25CF")} ${chalk5.bold(wt.branch)}   [${statusLabel}]`);
+  const parts = [];
+  if (wt.insertions > 0 || wt.deletions > 0) {
+    parts.push(`${chalk5.green(`+${wt.insertions}`)} ${chalk5.red(`-${wt.deletions}`)}`);
+  }
+  if (wt.commitsAhead > 0) {
+    parts.push(chalk5.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`));
+  } else {
+    parts.push(chalk5.green("\u4E0E\u4E3B\u5206\u652F\u540C\u6B65"));
+  }
+  printInfo(`    ${parts.join("   ")}`);
+  if (wt.hasSnapshot) {
+    printInfo(`    ${chalk5.blue("\u6709 validate \u5FEB\u7167")}`);
+  }
+  printInfo("");
+}
+function formatChangeStatusLabel(status) {
+  switch (status) {
+    case "committed":
+      return chalk5.green(MESSAGES.STATUS_CHANGE_COMMITTED);
+    case "uncommitted":
+      return chalk5.yellow(MESSAGES.STATUS_CHANGE_UNCOMMITTED);
+    case "conflict":
+      return chalk5.red(MESSAGES.STATUS_CHANGE_CONFLICT);
+    case "clean":
+      return chalk5.gray(MESSAGES.STATUS_CHANGE_CLEAN);
+  }
+}
+function printSnapshotsSection(snapshots) {
+  printInfo(`  ${chalk5.bold("\u25C6")} ${chalk5.bold(MESSAGES.STATUS_SNAPSHOTS_SECTION)} (${snapshots.length} \u4E2A)`);
+  printInfo("");
+  if (snapshots.length === 0) {
+    printInfo(`    ${MESSAGES.STATUS_NO_SNAPSHOTS}`);
+    printInfo("");
+    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");
+    printInfo(`  ${icon} ${snap.branch}${orphanLabel}`);
+  }
+  printInfo("");
+}
+
 // src/index.ts
 var require2 = createRequire(import.meta.url);
 var { version } = require2("../package.json");
@@ -1653,6 +1969,7 @@ registerMergeCommand(program);
 registerConfigCommand(program);
 registerSyncCommand(program);
 registerResetCommand(program);
+registerStatusCommand(program);
 process.on("uncaughtException", (error) => {
   if (error instanceof ClawtError) {
     printError(error.message);