clawt 2.16.2 → 2.16.4

package/README.md

@@ -128,6 +128,8 @@ clawt validate -b <branch> -r "pnpm test & pnpm build"  # 并行执行多个命
 
 支持增量模式：再次 validate 同一分支时，可通过 `git diff` 查看两次之间的增量差异。
 
+当 patch apply 失败（目标分支与主分支差异过大）时，会自动询问是否执行 `sync` 同步主分支到目标 worktree，无需手动操作。
+
 `-r, --run` 选项可在 validate 成功后自动在主 worktree 中执行指定命令（如测试、构建等），命令执行失败不影响 validate 结果。支持用 `&` 分隔多个命令并行执行：
 
 | 用法 | 行为 |
@@ -142,6 +144,8 @@ clawt validate -b <branch> -r "pnpm test & pnpm build"  # 并行执行多个命
 clawt sync -b <branch>
 ```
 
+当 `validate` 的 patch apply 失败时也会自动提示执行 sync，通常无需手动调用。
+
 ### `clawt merge` — 合并分支到主 worktree
 
 ```bash
@@ -171,6 +175,39 @@ clawt status          # 文本格式
 clawt status --json   # JSON 格式
 ```
 
+展示主 worktree 状态、各 worktree 的变更详情（含分支创建时间和验证状态）以及 validate 快照摘要：
+
+```
+════════════════════════════════════════
+  项目状态总览: my-project
+════════════════════════════════════════
+
+  ◆ 主 Worktree
+    分支: main
+    状态: ✓ 干净
+
+────────────────────────────────────────
+
+  ◆ Worktree 列表 (2 个)
+
+  ● feature-login   [已提交]
+    +120 -30   3 个本地提交   与主分支同步
+    创建于 3 天前
+    上次验证: 2 小时前
+
+  ● feature-signup   [未提交修改]
+    +45 -10   1 个本地提交   落后主分支 2 个提交
+    创建于 1 天前
+    ✗ 未验证
+
+────────────────────────────────────────
+
+  ◆ Validate 快照 (3 个)
+    其中 1 个快照对应的 worktree 已不存在
+
+════════════════════════════════════════
+```
+
 ### `clawt reset` — 重置主 worktree 到干净状态
 
 ```bash

package/dist/index.js

@@ -211,7 +211,16 @@ ${branches.map((b) => `    - ${b}`).join("\n")}`,
   /** 并行执行中单个命令失败 */
   VALIDATE_PARALLEL_CMD_FAILED: (command, exitCode) => `  \u2717 ${command}\uFF08\u9000\u51FA\u7801: ${exitCode}\uFF09`,
   /** 并行执行中单个命令启动失败 */
-  VALIDATE_PARALLEL_CMD_ERROR: (command, errorMessage) => `  \u2717 ${command}\uFF08\u9519\u8BEF: ${errorMessage}\uFF09`
+  VALIDATE_PARALLEL_CMD_ERROR: (command, errorMessage) => `  \u2717 ${command}\uFF08\u9519\u8BEF: ${errorMessage}\uFF09`,
+  /** patch apply 失败后询问用户是否执行 sync */
+  VALIDATE_CONFIRM_AUTO_SYNC: (branch) => `\u662F\u5426\u7ACB\u5373\u6267\u884C sync \u540C\u6B65\u4E3B\u5206\u652F\u5230 ${branch}\uFF1F`,
+  /** 自动 sync 开始提示 */
+  VALIDATE_AUTO_SYNC_START: (branch) => `\u6B63\u5728\u81EA\u52A8\u540C\u6B65\u4E3B\u5206\u652F\u5230 ${branch} ...`,
+  /** 自动 sync 存在冲突，无法重试 */
+  VALIDATE_AUTO_SYNC_CONFLICT: (worktreePath) => `\u540C\u6B65\u5B58\u5728\u51B2\u7A81\uFF0C\u8BF7\u8FDB\u5165\u76EE\u6807 worktree \u624B\u52A8\u89E3\u51B3\u51B2\u7A81\u540E\u91CD\u8BD5
+  cd ${worktreePath}`,
+  /** 用户拒绝自动 sync */
+  VALIDATE_AUTO_SYNC_DECLINED: (branch) => `\u8BF7\u624B\u52A8\u6267\u884C clawt sync -b ${branch} \u540C\u6B65\u4E3B\u5206\u652F\u540E\u91CD\u8BD5`
 };
 
 // src/constants/messages/sync.ts
@@ -323,7 +332,7 @@ var STATUS_MESSAGES = {
   /** status worktrees 区块标题 */
   STATUS_WORKTREES_SECTION: "Worktree \u5217\u8868",
   /** status 快照区块标题 */
-  STATUS_SNAPSHOTS_SECTION: "\u672A\u6E05\u7406\u7684 Validate \u5FEB\u7167",
+  STATUS_SNAPSHOTS_SECTION: "Validate \u5FEB\u7167",
   /** status 无 worktree */
   STATUS_NO_WORKTREES: "(\u65E0\u6D3B\u8DC3 worktree)",
   /** status 无未清理快照 */
@@ -337,7 +346,15 @@ var STATUS_MESSAGES = {
   /** status 变更状态：无变更 */
   STATUS_CHANGE_CLEAN: "\u65E0\u53D8\u66F4",
   /** status 快照对应 worktree 已不存在 */
-  STATUS_SNAPSHOT_ORPHANED: "(\u5BF9\u5E94 worktree \u5DF2\u4E0D\u5B58\u5728)"
+  STATUS_SNAPSHOT_ORPHANED: (count) => `\u5176\u4E2D ${count} \u4E2A\u5FEB\u7167\u5BF9\u5E94\u7684 worktree \u5DF2\u4E0D\u5B58\u5728`,
+  /** status 分支创建时间标签 */
+  STATUS_CREATED_AT: (relativeTime) => `\u521B\u5EFA\u4E8E ${relativeTime}`,
+  /** status 分支无分叉提交时的提示 */
+  STATUS_NO_DIVERGED_COMMITS: "\u5C1A\u65E0\u5206\u53C9\u63D0\u4EA4",
+  /** status 上次验证时间标签 */
+  STATUS_LAST_VALIDATED: (relativeTime) => `\u4E0A\u6B21\u9A8C\u8BC1: ${relativeTime}`,
+  /** status 未验证警示 */
+  STATUS_NOT_VALIDATED: "\u2717 \u672A\u9A8C\u8BC1"
 };
 
 // src/constants/messages/alias.ts
@@ -787,6 +804,17 @@ function gitApplyCachedCheck(patchContent, cwd) {
     return false;
   }
 }
+function getBranchCreatedAt(branchName, cwd) {
+  try {
+    const output = execCommand(`git reflog show ${branchName} --format=%cI`, { cwd });
+    if (!output.trim()) return null;
+    const lines = output.trim().split("\n");
+    const lastLine = lines[lines.length - 1];
+    return lastLine || null;
+  } catch {
+    return null;
+  }
+}
 
 // src/utils/formatter.ts
 import chalk2 from "chalk";
@@ -856,6 +884,35 @@ function formatDuration(ms) {
   const seconds = Math.floor(totalSeconds % 60);
   return `${minutes}m${String(seconds).padStart(2, "0")}s`;
 }
+function formatRelativeTime(isoDateString) {
+  const date = new Date(isoDateString);
+  const now = /* @__PURE__ */ new Date();
+  const diffMs = now.getTime() - date.getTime();
+  if (isNaN(diffMs)) {
+    return null;
+  }
+  if (diffMs < 0 || diffMs < 60 * 1e3) {
+    return "\u521A\u521A";
+  }
+  const diffMinutes = Math.floor(diffMs / (1e3 * 60));
+  const diffHours = Math.floor(diffMs / (1e3 * 60 * 60));
+  const diffDays = Math.floor(diffMs / (1e3 * 60 * 60 * 24));
+  if (diffHours < 1) {
+    return `${diffMinutes} \u5206\u949F\u524D`;
+  }
+  if (diffDays < 1) {
+    return `${diffHours} \u5C0F\u65F6\u524D`;
+  }
+  if (diffDays < 30) {
+    return `${diffDays} \u5929\u524D`;
+  }
+  if (diffDays < 365) {
+    const months = Math.floor(diffDays / 30);
+    return `${months} \u4E2A\u6708\u524D`;
+  }
+  const years = Math.floor(diffDays / 365);
+  return `${years} \u5E74\u524D`;
+}
 
 // src/utils/branch.ts
 function sanitizeBranchName(branchName) {
@@ -1199,7 +1256,7 @@ function launchInteractiveClaudeInNewTerminal(worktree, hasPreviousSession) {
 
 // src/utils/validate-snapshot.ts
 import { join as join4 } from "path";
-import { existsSync as existsSync7, readFileSync as readFileSync2, writeFileSync as writeFileSync2, unlinkSync, readdirSync as readdirSync4, rmdirSync as rmdirSync2 } from "fs";
+import { existsSync as existsSync7, readFileSync as readFileSync2, writeFileSync as writeFileSync2, unlinkSync, readdirSync as readdirSync4, rmdirSync as rmdirSync2, statSync } from "fs";
 function getSnapshotPath(projectName, branchName) {
   return join4(VALIDATE_SNAPSHOTS_DIR, projectName, `${branchName}.tree`);
 }
@@ -1209,6 +1266,12 @@ function getSnapshotHeadPath(projectName, branchName) {
 function hasSnapshot(projectName, branchName) {
   return existsSync7(getSnapshotPath(projectName, branchName));
 }
+function getSnapshotModifiedTime(projectName, branchName) {
+  const snapshotPath = getSnapshotPath(projectName, branchName);
+  if (!existsSync7(snapshotPath)) return null;
+  const stat = statSync(snapshotPath);
+  return stat.mtime.toISOString();
+}
 function readSnapshot(projectName, branchName) {
   const snapshotPath = getSnapshotPath(projectName, branchName);
   const headPath = getSnapshotHeadPath(projectName, branchName);
@@ -2283,6 +2346,66 @@ async function handleBatchResume(worktrees) {
 
 // src/commands/validate.ts
 import Enquirer4 from "enquirer";
+
+// src/commands/sync.ts
+function registerSyncCommand(program2) {
+  program2.command("sync").description("\u5C06\u4E3B\u5206\u652F\u6700\u65B0\u4EE3\u7801\u540C\u6B65\u5230\u76EE\u6807 worktree").option("-b, --branch <branchName>", "\u8981\u540C\u6B65\u7684\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 handleSync(options);
+  });
+}
+var SYNC_RESOLVE_MESSAGES = {
+  noWorktrees: MESSAGES.SYNC_NO_WORKTREES,
+  selectBranch: MESSAGES.SYNC_SELECT_BRANCH,
+  multipleMatches: MESSAGES.SYNC_MULTIPLE_MATCHES,
+  noMatch: MESSAGES.SYNC_NO_MATCH
+};
+function autoSaveChanges(worktreePath, branch) {
+  gitAddAll(worktreePath);
+  gitCommit(AUTO_SAVE_COMMIT_MESSAGE, worktreePath);
+  printInfo(MESSAGES.SYNC_AUTO_COMMITTED(branch));
+  logger.info(`\u5DF2\u81EA\u52A8\u4FDD\u5B58 ${branch} \u5206\u652F\u7684\u672A\u63D0\u4EA4\u53D8\u66F4`);
+}
+function mergeMainBranch(worktreePath, mainBranch) {
+  try {
+    gitMerge(mainBranch, worktreePath);
+    return false;
+  } catch {
+    if (hasMergeConflict(worktreePath)) {
+      return true;
+    }
+    throw new ClawtError(`\u5408\u5E76 ${mainBranch} \u5931\u8D25`);
+  }
+}
+function executeSyncForBranch(targetWorktreePath, branch) {
+  const mainWorktreePath = getGitTopLevel();
+  const mainBranch = getCurrentBranch(mainWorktreePath);
+  if (!isWorkingDirClean(targetWorktreePath)) {
+    autoSaveChanges(targetWorktreePath, branch);
+  }
+  printInfo(MESSAGES.SYNC_MERGING(branch, mainBranch));
+  const hasConflict = mergeMainBranch(targetWorktreePath, mainBranch);
+  if (hasConflict) {
+    printWarning(MESSAGES.SYNC_CONFLICT(targetWorktreePath));
+    return { success: false, hasConflict: true };
+  }
+  const projectName = getProjectName();
+  if (hasSnapshot(projectName, branch)) {
+    removeSnapshot(projectName, branch);
+    logger.info(`\u5DF2\u6E05\u9664\u5206\u652F ${branch} \u7684 validate \u5FEB\u7167`);
+  }
+  printSuccess(MESSAGES.SYNC_SUCCESS(branch, mainBranch));
+  return { success: true, hasConflict: false };
+}
+async function handleSync(options) {
+  validateMainWorktree();
+  logger.info(`sync \u547D\u4EE4\u6267\u884C\uFF0C\u5206\u652F: ${options.branch ?? "(\u672A\u6307\u5B9A)"}`);
+  const worktrees = getProjectWorktrees();
+  const worktree = await resolveTargetWorktree(worktrees, SYNC_RESOLVE_MESSAGES, options.branch);
+  const { path: targetWorktreePath, branch } = worktree;
+  executeSyncForBranch(targetWorktreePath, branch);
+}
+
+// src/commands/validate.ts
 var VALIDATE_RESOLVE_MESSAGES = {
   noWorktrees: MESSAGES.VALIDATE_NO_WORKTREES,
   selectBranch: MESSAGES.VALIDATE_SELECT_BRANCH,
@@ -2343,9 +2466,10 @@ function migrateChangesViaPatch(targetWorktreePath, mainWorktreePath, branchName
       } catch (error) {
         logger.warn(`patch apply \u5931\u8D25: ${error}`);
         printWarning(MESSAGES.VALIDATE_PATCH_APPLY_FAILED(branchName));
-        throw error;
+        return { success: false };
       }
     }
+    return { success: true };
   } finally {
     if (didTempCommit) {
       try {
@@ -2361,6 +2485,18 @@ function migrateChangesViaPatch(targetWorktreePath, mainWorktreePath, branchName
     }
   }
 }
+async function handlePatchApplyFailure(targetWorktreePath, branchName) {
+  const confirmed = await confirmAction(MESSAGES.VALIDATE_CONFIRM_AUTO_SYNC(branchName));
+  if (!confirmed) {
+    printWarning(MESSAGES.VALIDATE_AUTO_SYNC_DECLINED(branchName));
+    return;
+  }
+  printInfo(MESSAGES.VALIDATE_AUTO_SYNC_START(branchName));
+  const syncResult = executeSyncForBranch(targetWorktreePath, branchName);
+  if (syncResult.hasConflict) {
+    printWarning(MESSAGES.VALIDATE_AUTO_SYNC_CONFLICT(targetWorktreePath));
+  }
+}
 function saveCurrentSnapshotTree(mainWorktreePath, projectName, branchName) {
   gitAddAll(mainWorktreePath);
   const treeHash = gitWriteTree(mainWorktreePath);
@@ -2394,18 +2530,26 @@ async function handleValidateClean(options) {
   removeSnapshot(projectName, branchName);
   printSuccess(MESSAGES.VALIDATE_CLEANED(branchName));
 }
-function handleFirstValidate(targetWorktreePath, mainWorktreePath, projectName, branchName, hasUncommitted) {
-  migrateChangesViaPatch(targetWorktreePath, mainWorktreePath, branchName, hasUncommitted);
+async function handleFirstValidate(targetWorktreePath, mainWorktreePath, projectName, branchName, hasUncommitted) {
+  const result = migrateChangesViaPatch(targetWorktreePath, mainWorktreePath, branchName, hasUncommitted);
+  if (!result.success) {
+    await handlePatchApplyFailure(targetWorktreePath, branchName);
+    return;
+  }
   saveCurrentSnapshotTree(mainWorktreePath, projectName, branchName);
   printSuccess(MESSAGES.VALIDATE_SUCCESS(branchName));
 }
-function handleIncrementalValidate(targetWorktreePath, mainWorktreePath, projectName, branchName, hasUncommitted) {
+async function handleIncrementalValidate(targetWorktreePath, mainWorktreePath, projectName, branchName, hasUncommitted) {
   const { treeHash: oldTreeHash, headCommitHash: oldHeadCommitHash } = readSnapshot(projectName, branchName);
   if (!isWorkingDirClean(mainWorktreePath)) {
     gitResetHard(mainWorktreePath);
     gitCleanForce(mainWorktreePath);
   }
-  migrateChangesViaPatch(targetWorktreePath, mainWorktreePath, branchName, hasUncommitted);
+  const result = migrateChangesViaPatch(targetWorktreePath, mainWorktreePath, branchName, hasUncommitted);
+  if (!result.success) {
+    await handlePatchApplyFailure(targetWorktreePath, branchName);
+    return;
+  }
   saveCurrentSnapshotTree(mainWorktreePath, projectName, branchName);
   try {
     const currentHeadCommitHash = getHeadCommitHash(mainWorktreePath);
@@ -2508,12 +2652,12 @@ async function handleValidate(options) {
     if (!isWorkingDirClean(mainWorktreePath)) {
       await handleDirtyMainWorktree(mainWorktreePath);
     }
-    handleIncrementalValidate(targetWorktreePath, mainWorktreePath, projectName, branchName, hasUncommitted);
+    await handleIncrementalValidate(targetWorktreePath, mainWorktreePath, projectName, branchName, hasUncommitted);
   } else {
     if (!isWorkingDirClean(mainWorktreePath)) {
       await handleDirtyMainWorktree(mainWorktreePath);
     }
-    handleFirstValidate(targetWorktreePath, mainWorktreePath, projectName, branchName, hasUncommitted);
+    await handleFirstValidate(targetWorktreePath, mainWorktreePath, projectName, branchName, hasUncommitted);
   }
   if (options.run) {
     await executeRunCommand(options.run, mainWorktreePath);
@@ -2726,60 +2870,6 @@ function handleConfigGet(key) {
   printInfo(MESSAGES.CONFIG_GET_VALUE(key, String(value)));
 }
 
-// src/commands/sync.ts
-function registerSyncCommand(program2) {
-  program2.command("sync").description("\u5C06\u4E3B\u5206\u652F\u6700\u65B0\u4EE3\u7801\u540C\u6B65\u5230\u76EE\u6807 worktree").option("-b, --branch <branchName>", "\u8981\u540C\u6B65\u7684\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 handleSync(options);
-  });
-}
-var SYNC_RESOLVE_MESSAGES = {
-  noWorktrees: MESSAGES.SYNC_NO_WORKTREES,
-  selectBranch: MESSAGES.SYNC_SELECT_BRANCH,
-  multipleMatches: MESSAGES.SYNC_MULTIPLE_MATCHES,
-  noMatch: MESSAGES.SYNC_NO_MATCH
-};
-function autoSaveChanges(worktreePath, branch) {
-  gitAddAll(worktreePath);
-  gitCommit(AUTO_SAVE_COMMIT_MESSAGE, worktreePath);
-  printInfo(MESSAGES.SYNC_AUTO_COMMITTED(branch));
-  logger.info(`\u5DF2\u81EA\u52A8\u4FDD\u5B58 ${branch} \u5206\u652F\u7684\u672A\u63D0\u4EA4\u53D8\u66F4`);
-}
-function mergeMainBranch(worktreePath, mainBranch) {
-  try {
-    gitMerge(mainBranch, worktreePath);
-    return false;
-  } catch {
-    if (hasMergeConflict(worktreePath)) {
-      return true;
-    }
-    throw new ClawtError(`\u5408\u5E76 ${mainBranch} \u5931\u8D25`);
-  }
-}
-async function handleSync(options) {
-  validateMainWorktree();
-  logger.info(`sync \u547D\u4EE4\u6267\u884C\uFF0C\u5206\u652F: ${options.branch ?? "(\u672A\u6307\u5B9A)"}`);
-  const worktrees = getProjectWorktrees();
-  const worktree = await resolveTargetWorktree(worktrees, SYNC_RESOLVE_MESSAGES, options.branch);
-  const { path: targetWorktreePath, branch } = worktree;
-  const mainWorktreePath = getGitTopLevel();
-  const mainBranch = getCurrentBranch(mainWorktreePath);
-  if (!isWorkingDirClean(targetWorktreePath)) {
-    autoSaveChanges(targetWorktreePath, branch);
-  }
-  printInfo(MESSAGES.SYNC_MERGING(branch, mainBranch));
-  const hasConflict = mergeMainBranch(targetWorktreePath, mainBranch);
-  if (hasConflict) {
-    printWarning(MESSAGES.SYNC_CONFLICT(targetWorktreePath));
-    return;
-  }
-  const projectName = getProjectName();
-  if (hasSnapshot(projectName, branch)) {
-    removeSnapshot(projectName, branch);
-    logger.info(`\u5DF2\u6E05\u9664\u5206\u652F ${branch} \u7684 validate \u5FEB\u7167`);
-  }
-  printSuccess(MESSAGES.SYNC_SUCCESS(branch, mainBranch));
-}
-
 // src/commands/reset.ts
 function registerResetCommand(program2) {
   program2.command("reset").description("\u91CD\u7F6E\u4E3B worktree \u5DE5\u4F5C\u533A\u548C\u6682\u5B58\u533A\uFF08\u4FDD\u7559 validate \u5FEB\u7167\uFF09").action(async () => {
@@ -2849,15 +2939,17 @@ function collectWorktreeDetailedStatus(worktree, projectName) {
   const changeStatus = detectChangeStatus(worktree);
   const { commitsAhead, commitsBehind } = countCommitDivergence(worktree.branch);
   const { insertions, deletions } = countDiffStat(worktree.path);
+  const createdAt = resolveBranchCreatedAt(worktree.branch);
   return {
     path: worktree.path,
     branch: worktree.branch,
     changeStatus,
     commitsAhead,
     commitsBehind,
-    hasSnapshot: hasSnapshot(projectName, worktree.branch),
+    snapshotTime: resolveSnapshotTime(projectName, worktree.branch),
     insertions,
-    deletions
+    deletions,
+    createdAt
   };
 }
 function detectChangeStatus(worktree) {
@@ -2893,13 +2985,28 @@ function countDiffStat(worktreePath) {
     return { insertions: 0, deletions: 0 };
   }
 }
+function resolveBranchCreatedAt(branchName) {
+  try {
+    return getBranchCreatedAt(branchName);
+  } catch {
+    return null;
+  }
+}
+function resolveSnapshotTime(projectName, branchName) {
+  try {
+    return getSnapshotModifiedTime(projectName, branchName);
+  } catch {
+    return null;
+  }
+}
 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)
-  }));
+  const orphaned = snapshotBranches.filter((branch) => !worktreeBranchSet.has(branch)).length;
+  return {
+    total: snapshotBranches.length,
+    orphaned
+  };
 }
 function printStatusAsJson(result) {
   console.log(JSON.stringify(result, null, 2));
@@ -2942,21 +3049,30 @@ function printWorktreesSection(worktrees, total) {
 function printWorktreeItem(wt) {
   const statusLabel = formatChangeStatusLabel(wt.changeStatus);
   printInfo(`  ${chalk8.bold("\u25CF")} ${chalk8.bold(wt.branch)}   [${statusLabel}]`);
-  const parts = [];
   if (wt.insertions > 0 || wt.deletions > 0) {
-    parts.push(`${chalk8.green(`+${wt.insertions}`)} ${chalk8.red(`-${wt.deletions}`)}`);
+    printInfo(`    ${chalk8.green(`+${wt.insertions}`)} ${chalk8.red(`-${wt.deletions}`)}`);
   }
   if (wt.commitsAhead > 0) {
-    parts.push(chalk8.yellow(`${wt.commitsAhead} \u4E2A\u672C\u5730\u63D0\u4EA4`));
+    printInfo(`    ${chalk8.yellow(`${wt.commitsAhead} \u4E2A\u672C\u5730\u63D0\u4EA4`)}`);
   }
   if (wt.commitsBehind > 0) {
-    parts.push(chalk8.yellow(`\u843D\u540E\u4E3B\u5206\u652F ${wt.commitsBehind} \u4E2A\u63D0\u4EA4`));
+    printInfo(`    ${chalk8.yellow(`\u843D\u540E\u4E3B\u5206\u652F ${wt.commitsBehind} \u4E2A\u63D0\u4EA4`)}`);
   } else {
-    parts.push(chalk8.green("\u4E0E\u4E3B\u5206\u652F\u540C\u6B65"));
+    printInfo(`    ${chalk8.green("\u4E0E\u4E3B\u5206\u652F\u540C\u6B65")}`);
+  }
+  if (wt.createdAt) {
+    const relativeTime = formatRelativeTime(wt.createdAt);
+    if (relativeTime) {
+      printInfo(`    ${chalk8.gray(MESSAGES.STATUS_CREATED_AT(relativeTime))}`);
+    }
   }
-  printInfo(`    ${parts.join("   ")}`);
-  if (wt.hasSnapshot) {
-    printInfo(`    ${chalk8.blue("\u6709 validate \u5FEB\u7167")}`);
+  if (wt.snapshotTime) {
+    const relativeTime = formatRelativeTime(wt.snapshotTime);
+    if (relativeTime) {
+      printInfo(`    ${chalk8.green(MESSAGES.STATUS_LAST_VALIDATED(relativeTime))}`);
+    }
+  } else {
+    printInfo(`    ${chalk8.red(MESSAGES.STATUS_NOT_VALIDATED)}`);
   }
   printInfo("");
 }
@@ -2973,17 +3089,9 @@ function formatChangeStatusLabel(status) {
   }
 }
 function printSnapshotsSection(snapshots) {
-  printInfo(`  ${chalk8.bold("\u25C6")} ${chalk8.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 ? "" : `  ${chalk8.yellow(MESSAGES.STATUS_SNAPSHOT_ORPHANED)}`;
-    const icon = snap.worktreeExists ? chalk8.blue("\u25CF") : chalk8.yellow("\u26A0");
-    printInfo(`  ${icon} ${snap.branch}${orphanLabel}`);
+  printInfo(`  ${chalk8.bold("\u25C6")} ${chalk8.bold(MESSAGES.STATUS_SNAPSHOTS_SECTION)} (${snapshots.total} \u4E2A)`);
+  if (snapshots.orphaned > 0) {
+    printInfo(`    ${chalk8.yellow(MESSAGES.STATUS_SNAPSHOT_ORPHANED(snapshots.orphaned))}`);
   }
   printInfo("");
 }

package/dist/postinstall.js

@@ -203,7 +203,16 @@ ${branches.map((b) => `    - ${b}`).join("\n")}`,
   /** 并行执行中单个命令失败 */
   VALIDATE_PARALLEL_CMD_FAILED: (command, exitCode) => `  \u2717 ${command}\uFF08\u9000\u51FA\u7801: ${exitCode}\uFF09`,
   /** 并行执行中单个命令启动失败 */
-  VALIDATE_PARALLEL_CMD_ERROR: (command, errorMessage) => `  \u2717 ${command}\uFF08\u9519\u8BEF: ${errorMessage}\uFF09`
+  VALIDATE_PARALLEL_CMD_ERROR: (command, errorMessage) => `  \u2717 ${command}\uFF08\u9519\u8BEF: ${errorMessage}\uFF09`,
+  /** patch apply 失败后询问用户是否执行 sync */
+  VALIDATE_CONFIRM_AUTO_SYNC: (branch) => `\u662F\u5426\u7ACB\u5373\u6267\u884C sync \u540C\u6B65\u4E3B\u5206\u652F\u5230 ${branch}\uFF1F`,
+  /** 自动 sync 开始提示 */
+  VALIDATE_AUTO_SYNC_START: (branch) => `\u6B63\u5728\u81EA\u52A8\u540C\u6B65\u4E3B\u5206\u652F\u5230 ${branch} ...`,
+  /** 自动 sync 存在冲突，无法重试 */
+  VALIDATE_AUTO_SYNC_CONFLICT: (worktreePath) => `\u540C\u6B65\u5B58\u5728\u51B2\u7A81\uFF0C\u8BF7\u8FDB\u5165\u76EE\u6807 worktree \u624B\u52A8\u89E3\u51B3\u51B2\u7A81\u540E\u91CD\u8BD5
+  cd ${worktreePath}`,
+  /** 用户拒绝自动 sync */
+  VALIDATE_AUTO_SYNC_DECLINED: (branch) => `\u8BF7\u624B\u52A8\u6267\u884C clawt sync -b ${branch} \u540C\u6B65\u4E3B\u5206\u652F\u540E\u91CD\u8BD5`
 };
 
 // src/constants/messages/sync.ts
@@ -314,7 +323,7 @@ var STATUS_MESSAGES = {
   /** status worktrees 区块标题 */
   STATUS_WORKTREES_SECTION: "Worktree \u5217\u8868",
   /** status 快照区块标题 */
-  STATUS_SNAPSHOTS_SECTION: "\u672A\u6E05\u7406\u7684 Validate \u5FEB\u7167",
+  STATUS_SNAPSHOTS_SECTION: "Validate \u5FEB\u7167",
   /** status 无 worktree */
   STATUS_NO_WORKTREES: "(\u65E0\u6D3B\u8DC3 worktree)",
   /** status 无未清理快照 */
@@ -328,7 +337,15 @@ var STATUS_MESSAGES = {
   /** status 变更状态：无变更 */
   STATUS_CHANGE_CLEAN: "\u65E0\u53D8\u66F4",
   /** status 快照对应 worktree 已不存在 */
-  STATUS_SNAPSHOT_ORPHANED: "(\u5BF9\u5E94 worktree \u5DF2\u4E0D\u5B58\u5728)"
+  STATUS_SNAPSHOT_ORPHANED: (count) => `\u5176\u4E2D ${count} \u4E2A\u5FEB\u7167\u5BF9\u5E94\u7684 worktree \u5DF2\u4E0D\u5B58\u5728`,
+  /** status 分支创建时间标签 */
+  STATUS_CREATED_AT: (relativeTime) => `\u521B\u5EFA\u4E8E ${relativeTime}`,
+  /** status 分支无分叉提交时的提示 */
+  STATUS_NO_DIVERGED_COMMITS: "\u5C1A\u65E0\u5206\u53C9\u63D0\u4EA4",
+  /** status 上次验证时间标签 */
+  STATUS_LAST_VALIDATED: (relativeTime) => `\u4E0A\u6B21\u9A8C\u8BC1: ${relativeTime}`,
+  /** status 未验证警示 */
+  STATUS_NOT_VALIDATED: "\u2717 \u672A\u9A8C\u8BC1"
 };
 
 // src/constants/messages/alias.ts