clawt 3.9.5 → 3.9.7

package/dist/index.js

@@ -574,8 +574,10 @@ var TASKS_CMD_MESSAGES = {
   TASK_INIT_FILE_EXISTS: (path2) => `\u6587\u4EF6\u5DF2\u5B58\u5728: ${path2}\uFF0C\u5982\u9700\u8986\u76D6\u8BF7\u5148\u5220\u9664`,
   /** 任务模板生成成功 */
   TASK_INIT_SUCCESS: (path2) => `\u2713 \u4EFB\u52A1\u6A21\u677F\u5DF2\u751F\u6210: ${path2}`,
-  /** 任务模板使用提示 */
-  TASK_INIT_HINT: (path2) => `\u4F7F\u7528 clawt run -f ${path2} \u6267\u884C\u4EFB\u52A1`
+  /** 任务模板使用提示（分行列出 run 和 resume 两种用法） */
+  TASK_INIT_HINT: (path2) => `\u6267\u884C\u4EFB\u52A1:
+  clawt run -f ${path2}     # \u521B\u5EFA worktree \u5E76\u6267\u884C\uFF08\u5206\u652F\u540D\u9700\u4E0D\u5B58\u5728\uFF09
+  clawt resume -f ${path2}  # \u5728\u5DF2\u6709 worktree \u4E2D\u8FFD\u95EE\uFF08\u5206\u652F\u540D\u9700\u5DF2\u5B58\u5728\uFF09`
 };
 
 // src/constants/messages/post-create.ts
@@ -804,7 +806,7 @@ var GIT_INDEX_LOCK_RETRY = {
   /** 重试次数（用户反馈"重试一下就可以了"，单次重试足够） */
   MAX_RETRIES: 1,
   /** 重试延迟毫秒数（让锁文件有时间被释放） */
-  DELAY_MS: 150
+  DELAY_MS: 1e3
 };
 
 // src/constants/logger.ts
@@ -912,7 +914,7 @@ var TASK_TEMPLATE_CONTENT = `# Clawt \u4EFB\u52A1\u6587\u4EF6
 # \u683C\u5F0F\u8BF4\u660E: \u6807\u7B7E\u5916\u7684\u6587\u672C\u4F1A\u88AB\u5FFD\u7565\uFF0C\u6BCF\u4E2A\u4EFB\u52A1\u7528 START/END \u6807\u7B7E\u5305\u88F9
 #
 # \u89C4\u5219:
-#   1. \u6BCF\u4E2A\u4EFB\u52A1\u5757\u7528 <!-- CLAWT-TASKS:START --> \u548C <!-- CLAWT-TASKS:END --> \u5305\u88F9
+#   1. \u6BCF\u4E2A\u4EFB\u52A1\u5757\u7528 <START> \u548C <END> \u6807\u7B7E\u5305\u88F9\uFF08\u5B9E\u9645\u6807\u7B7E\u89C1\u4E0B\u65B9\u793A\u4F8B\uFF09
 #   2. \u5757\u5185 # branch: <\u5206\u652F\u540D> \u58F0\u660E\u5206\u652F\u540D\uFF08\u4F7F\u7528 -b \u53C2\u6570\u65F6\u53EF\u7701\u7565\uFF09
 #   3. \u5757\u5185\u5176\u4F59\u884C\u4E3A\u4EFB\u52A1\u63CF\u8FF0\uFF08\u652F\u6301\u591A\u884C\uFF09
 
@@ -1001,7 +1003,8 @@ function enableConsoleTransport() {
 }
 
 // src/utils/shell.ts
-import { execSync as execSync2, execFileSync, spawn, spawnSync } from "child_process";
+import { exec, execSync as execSync2, execFileSync, spawn, spawnSync } from "child_process";
+import { promisify } from "util";
 
 // src/utils/git-lock.ts
 import { join as join2, isAbsolute } from "path";
@@ -1067,6 +1070,7 @@ function waitForGitIndexLockRetrySync() {
 }
 
 // src/utils/shell.ts
+var execPromise = promisify(exec);
 function getEnvWithoutNestedSessionFlag() {
   const { CLAUDECODE: _, ...env } = process.env;
   return { ...env, CLAUDE_CODE_ENTRYPOINT: CLAUDE_CODE_ENTRYPOINT_VALUE };
@@ -1095,6 +1099,15 @@ function execCommand(command, options) {
     }
   }
 }
+async function execCommandAsync(command, options) {
+  logger.debug(`\u6267\u884C\u5F02\u6B65\u547D\u4EE4: ${command}${options?.cwd ? ` (cwd: ${options.cwd})` : ""}`);
+  const { stdout } = await execPromise(command, {
+    cwd: options?.cwd,
+    encoding: "utf-8",
+    maxBuffer: EXEC_MAX_BUFFER
+  });
+  return stdout.trim();
+}
 function spawnProcess(command, args, options) {
   logger.debug(`\u542F\u52A8\u5B50\u8FDB\u7A0B: ${command} ${args.join(" ")}${options?.cwd ? ` (cwd: ${options.cwd})` : ""}`);
   return spawn(command, args, {
@@ -1262,6 +1275,9 @@ function getProjectName(cwd) {
 function getStatusPorcelain(cwd) {
   return execCommand("git status --porcelain", { cwd });
 }
+async function getStatusPorcelainAsync(cwd) {
+  return execCommandAsync("git status --porcelain", { cwd });
+}
 function isWorkingDirClean(cwd) {
   return getStatusPorcelain(cwd) === "";
 }
@@ -1316,6 +1332,10 @@ function getDiffStat(worktreePath) {
   const output = execCommand("git diff --shortstat HEAD", { cwd: worktreePath });
   return parseShortStat(output);
 }
+async function getDiffStatAsync(worktreePath) {
+  const output = await execCommandAsync("git diff --shortstat HEAD", { cwd: worktreePath });
+  return parseShortStat(output);
+}
 function gitApplyCachedFromStdin(patchContent, cwd) {
   execCommandWithInput("git", ["apply", "--cached"], { input: patchContent, cwd });
 }
@@ -1423,12 +1443,16 @@ function getCommitCountAhead(branchName, cwd) {
   const output = execCommand(`git rev-list --count HEAD..${branchName}`, { cwd });
   return parseInt(output, 10) || 0;
 }
-function getCommitCountBehind(branchName, cwd) {
+function parseDivergenceOutput(output) {
+  const [leftStr, rightStr] = output.trim().split(/\s+/);
+  return { ahead: parseInt(rightStr, 10) || 0, behind: parseInt(leftStr, 10) || 0 };
+}
+async function getCommitDivergenceAsync(branchName, cwd) {
   try {
-    const output = execCommand(`git rev-list --count ${branchName}..HEAD`, { cwd });
-    return parseInt(output, 10) || 0;
+    const output = await execCommandAsync(`git rev-list --left-right --count HEAD...${branchName}`, { cwd });
+    return parseDivergenceOutput(output);
   } catch {
-    return 0;
+    return { ahead: 0, behind: 0 };
   }
 }
 function getCurrentBranch(cwd) {
@@ -3795,7 +3819,7 @@ function buildSeparatorWithHint(cols, hint) {
   const rightLen = remaining - leftLen;
   return `${chalk9.gray("\u2500".repeat(leftLen))} ${hint} ${chalk9.gray("\u2500".repeat(rightLen))}`;
 }
-function buildPanelFrame(statusResult, selectedIndex, scrollOffset, rows, cols, countdown) {
+function buildPanelFrame(statusResult, selectedIndex, scrollOffset, rows, cols, countdown, cachedPanelLines) {
   const lines = [];
   lines.push(PANEL_TITLE(statusResult.main.projectName));
   lines.push(renderConfiguredBranchLine(statusResult.main));
@@ -3806,7 +3830,7 @@ function buildPanelFrame(statusResult, selectedIndex, scrollOffset, rows, cols,
     lines.push(PANEL_NO_WORKTREES);
     lines.push(buildSeparatorWithHint(cols, ""));
   } else {
-    const panelLines = buildGroupedWorktreeLines(statusResult.worktrees, selectedIndex);
+    const panelLines = cachedPanelLines ?? buildGroupedWorktreeLines(statusResult.worktrees, selectedIndex);
     const hasOverflowUp = scrollOffset > 0;
     const hasOverflowDown = scrollOffset + visibleRows < panelLines.length;
     lines.push(buildSeparatorWithHint(cols, hasOverflowUp ? PANEL_OVERFLOW_UP_HINT : ""));
@@ -4002,8 +4026,11 @@ var PanelStateManager = class {
   displayOrder = [];
   /** 滚动偏移（基于行数） */
   scrollOffset = 0;
+  /** 缓存的面板行列表，在 updateData 和导航时更新 */
+  cachedPanelLines = [];
   /**
    * 更新状态数据
+   * 一次性计算 displayOrder 和 cachedPanelLines，后续 adjustScrollForSelection 和 render 复用缓存
    * @param {StatusResult} newStatus - 新的状态数据
    * @param {string} [previousBranch] - 刷新前选中的分支名
    */
@@ -4022,6 +4049,7 @@ var PanelStateManager = class {
     } else {
       this.selectedDisplayIndex = 0;
     }
+    this.rebuildCachedPanelLines();
   }
   /** 获取当前状态数据 */
   getStatusResult() {
@@ -4035,6 +4063,13 @@ var PanelStateManager = class {
   getScrollOffset() {
     return this.scrollOffset;
   }
+  /**
+   * 获取缓存的面板行列表
+   * @returns {PanelLine[]} 缓存的面板行列表
+   */
+  getCachedPanelLines() {
+    return this.cachedPanelLines;
+  }
   /**
    * 向上导航
    * @returns {boolean} 是否发生变化
@@ -4043,6 +4078,7 @@ var PanelStateManager = class {
     if (!this.statusResult || this.displayOrder.length === 0) return false;
     if (this.selectedDisplayIndex > 0) {
       this.selectedDisplayIndex--;
+      this.rebuildCachedPanelLines();
       this.adjustScrollForSelection();
       return true;
     }
@@ -4056,6 +4092,7 @@ var PanelStateManager = class {
     if (!this.statusResult || this.displayOrder.length === 0) return false;
     if (this.selectedDisplayIndex < this.displayOrder.length - 1) {
       this.selectedDisplayIndex++;
+      this.rebuildCachedPanelLines();
       this.adjustScrollForSelection();
       return true;
     }
@@ -4072,13 +4109,14 @@ var PanelStateManager = class {
   }
   /**
    * 调整滚动位置以确保选中项在可见区域内
+   * 复用 cachedPanelLines，不再重新调用 buildGroupedWorktreeLines
    */
   adjustScrollForSelection() {
     if (!this.statusResult || this.displayOrder.length === 0) return;
     const originalIndex = this.getSelectedOriginalIndex();
     const rows = process.stdout.rows || 24;
     const visibleRows = calculateVisibleRows(rows);
-    const panelLines = buildGroupedWorktreeLines(this.statusResult.worktrees, originalIndex);
+    const panelLines = this.cachedPanelLines;
     let firstLine = -1;
     let lastLine = -1;
     for (let i = 0; i < panelLines.length; i++) {
@@ -4102,6 +4140,18 @@ var PanelStateManager = class {
       this.scrollOffset = groupStart;
     }
   }
+  /**
+   * 重建缓存的 panelLines
+   * 在数据更新或导航变化时调用
+   */
+  rebuildCachedPanelLines() {
+    if (!this.statusResult) {
+      this.cachedPanelLines = [];
+      return;
+    }
+    const originalIndex = this.getSelectedOriginalIndex();
+    this.cachedPanelLines = buildGroupedWorktreeLines(this.statusResult.worktrees, originalIndex);
+  }
 };
 
 // src/utils/interactive-panel.ts
@@ -4126,13 +4176,17 @@ var InteractivePanel = class {
   exitHandler;
   /** 操作锁（防止操作期间响应按键） */
   isOperating;
+  /** 刷新锁（防止异步刷新期间触发重复刷新） */
+  isRefreshing;
   /** Promise resolve 函数（stop 时调用以完成 start 返回的 Promise） */
   resolveStart;
-  /** 数据收集函数引用 */
+  /** 数据收集函数引用（异步，支持并行收集 worktree 数据） */
   collectStatusFn;
+  /** 上一帧的总行数，用于 footer-only 渲染时定位最后一行 */
+  lastFrameLineCount = 0;
   /**
    * 创建交互式面板
-   * @param {() => StatusResult} collectStatusFn - 数据收集函数
+   * @param {() => Promise<StatusResult>} collectStatusFn - 异步数据收集函数
    */
   constructor(collectStatusFn) {
     this.stateManager = new PanelStateManager();
@@ -4145,6 +4199,7 @@ var InteractivePanel = class {
     this.resizeHandler = null;
     this.exitHandler = null;
     this.isOperating = false;
+    this.isRefreshing = false;
     this.resolveStart = null;
     this.collectStatusFn = collectStatusFn;
   }
@@ -4153,14 +4208,14 @@ var InteractivePanel = class {
    * 非 TTY 时打印提示并退出
    * @returns {Promise<void>} 面板关闭时 resolve
    */
-  start() {
+  async start() {
     if (!this.isTTY) {
       console.log(PANEL_NOT_TTY);
-      return Promise.resolve();
+      return;
     }
+    this.stateManager.updateData(await this.collectStatusFn());
     return new Promise((resolve4) => {
       this.resolveStart = resolve4;
-      this.stateManager.updateData(this.collectStatusFn());
       this.initTerminal();
       this.keyboardController.start();
       this.startAutoRefresh();
@@ -4290,7 +4345,7 @@ var InteractivePanel = class {
       if (this.refreshCountdown > 0) {
         this.refreshCountdown--;
       }
-      this.render();
+      this.renderFooterOnly();
     }, PANEL_COUNTDOWN_INTERVAL_MS);
     if (this.refreshTimer.unref) this.refreshTimer.unref();
     if (this.countdownTimer.unref) this.countdownTimer.unref();
@@ -4309,19 +4364,25 @@ var InteractivePanel = class {
     }
   }
   /**
-   * 刷新数据：记录当前选中分支 → 重新收集 → 恢复选中位置 → 重置倒计时 → 重绘
+   * 刷新数据：记录当前选中分支 → 异步重新收集 → 恢复选中位置 → 重置倒计时 → 重绘
+   * 使用 isRefreshing 锁防止异步刷新期间触发重复刷新
    */
-  refreshData() {
-    if (this.stopped || this.isOperating) return;
-    const previousBranch = this.stateManager.getSelectedBranch();
-    this.stateManager.updateData(this.collectStatusFn(), previousBranch || void 0);
-    this.stateManager.adjustScrollForSelection();
-    this.refreshCountdown = PANEL_REFRESH_INTERVAL_MS / 1e3;
-    this.render();
+  async refreshData() {
+    if (this.stopped || this.isOperating || this.isRefreshing) return;
+    this.isRefreshing = true;
+    try {
+      const previousBranch = this.stateManager.getSelectedBranch();
+      this.stateManager.updateData(await this.collectStatusFn(), previousBranch || void 0);
+      this.stateManager.adjustScrollForSelection();
+      this.refreshCountdown = PANEL_REFRESH_INTERVAL_MS / 1e3;
+      this.render();
+    } finally {
+      this.isRefreshing = false;
+    }
   }
   /**
    * 渲染一帧面板内容
-   * 使用同步输出防止闪烁
+   * 使用同步输出防止闪烁，复用缓存的 panelLines 避免重复 groupWorktreesByDate 计算
    */
   render() {
     const statusResult = this.stateManager.getStatusResult();
@@ -4334,7 +4395,8 @@ var InteractivePanel = class {
       this.stateManager.getScrollOffset(),
       rows,
       cols,
-      this.refreshCountdown
+      this.refreshCountdown,
+      this.stateManager.getCachedPanelLines()
     );
     process.stdout.write(SYNC_OUTPUT_START);
     process.stdout.write(CLEAR_SCREEN);
@@ -4343,6 +4405,22 @@ var InteractivePanel = class {
       const suffix = i < frameLines.length - 1 ? "\n" : "";
       process.stdout.write(`${truncateToTerminalWidth(frameLines[i], cols)}${suffix}`);
     }
+    this.lastFrameLineCount = frameLines.length;
+    process.stdout.write(SYNC_OUTPUT_END);
+  }
+  /**
+   * 仅更新 footer 行（倒计时文本）
+   * 使用 ANSI 光标定位直接覆写最后一行，避免全量重绘
+   */
+  renderFooterOnly() {
+    if (this.stopped || this.isOperating || this.lastFrameLineCount === 0) return;
+    const cols = process.stdout.columns || DEFAULT_TERMINAL_COLUMNS;
+    const footerText = renderFooter(this.refreshCountdown);
+    const truncated = truncateToTerminalWidth(footerText, cols);
+    process.stdout.write(SYNC_OUTPUT_START);
+    process.stdout.write(`\x1B[${this.lastFrameLineCount};1H`);
+    process.stdout.write("\x1B[2K");
+    process.stdout.write(truncated);
     process.stdout.write(SYNC_OUTPUT_END);
   }
   /**
@@ -4363,7 +4441,7 @@ var InteractivePanel = class {
     this.initTerminal();
     this.keyboardController.start();
     this.isOperating = false;
-    this.refreshData();
+    await this.refreshData();
     this.startAutoRefresh();
     this.render();
   }
@@ -5507,7 +5585,7 @@ async function handleStatus(options) {
     await panel.start();
     return;
   }
-  const statusResult = collectStatus();
+  const statusResult = await 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);
@@ -5515,7 +5593,7 @@ async function handleStatus(options) {
   }
   printStatusAsText(statusResult);
 }
-function collectStatus() {
+async function collectStatus() {
   const projectName = getProjectName();
   const currentBranch = getCurrentBranch();
   const isClean = isWorkingDirClean();
@@ -5533,7 +5611,9 @@ function collectStatus() {
     deletions
   };
   const worktrees = getProjectWorktrees();
-  const worktreeStatuses = worktrees.map((wt) => collectWorktreeDetailedStatus(wt, projectName));
+  const worktreeStatuses = await Promise.all(
+    worktrees.map((wt) => collectWorktreeDetailedStatusAsync(wt, projectName))
+  );
   const snapshots = collectSnapshots(projectName, worktrees);
   return {
     main: main2,
@@ -5542,49 +5622,61 @@ function collectStatus() {
     totalWorktrees: worktrees.length
   };
 }
-function collectWorktreeDetailedStatus(worktree, projectName) {
-  const changeStatus = detectChangeStatus(worktree);
-  const { commitsAhead, commitsBehind } = countCommitDivergence(worktree.branch);
-  const { insertions, deletions } = countDiffStat(worktree.path);
+async function collectWorktreeDetailedStatusAsync(worktree, projectName) {
+  const [divergence, porcelain, diffStat] = await Promise.all([
+    countCommitDivergenceAsync(worktree.branch),
+    detectStatusPorcelainAsync(worktree.path),
+    countDiffStatAsync(worktree.path)
+  ]);
+  const changeStatus = detectChangeStatusFromPorcelain(porcelain, divergence.commitsAhead);
   const createdAt = getWorktreeCreatedTime(worktree.path);
   return {
     path: worktree.path,
     branch: worktree.branch,
     changeStatus,
-    commitsAhead,
-    commitsBehind,
+    commitsAhead: divergence.commitsAhead,
+    commitsBehind: divergence.commitsBehind,
     snapshotTime: resolveSnapshotTime(projectName, worktree.branch),
-    insertions,
-    deletions,
+    insertions: diffStat.insertions,
+    deletions: diffStat.deletions,
     createdAt
   };
 }
-function detectChangeStatus(worktree) {
+function detectChangeStatusFromPorcelain(porcelain, commitsAhead) {
+  const hasConflict = porcelain.split("\n").some((line) => /^(UU|AA|DD|DU|UD|AU|UA)/.test(line));
+  if (hasConflict) {
+    return "conflict";
+  }
+  if (porcelain !== "") {
+    return "uncommitted";
+  }
+  if (commitsAhead > 0) {
+    return "committed";
+  }
+  return "clean";
+}
+async function detectStatusPorcelainAsync(worktreePath) {
   try {
-    if (hasMergeConflict(worktree.path)) {
-      return "conflict";
-    }
-    if (!isWorkingDirClean(worktree.path)) {
-      return "uncommitted";
-    }
-    if (hasLocalCommits(worktree.branch)) {
-      return "committed";
-    }
-    return "clean";
+    return await getStatusPorcelainAsync(worktreePath);
   } catch {
-    return "clean";
+    return "";
   }
 }
-function countCommitDivergence(branchName) {
+async function countCommitDivergenceAsync(branchName) {
   try {
-    return {
-      commitsAhead: getCommitCountAhead(branchName),
-      commitsBehind: getCommitCountBehind(branchName)
-    };
+    const { ahead, behind } = await getCommitDivergenceAsync(branchName);
+    return { commitsAhead: ahead, commitsBehind: behind };
   } catch {
     return { commitsAhead: 0, commitsBehind: 0 };
   }
 }
+async function countDiffStatAsync(worktreePath) {
+  try {
+    return await getDiffStatAsync(worktreePath);
+  } catch {
+    return { insertions: 0, deletions: 0 };
+  }
+}
 function countDiffStat(worktreePath) {
   try {
     return getDiffStat(worktreePath);

package/dist/postinstall.js

@@ -551,8 +551,10 @@ var TASKS_CMD_MESSAGES = {
   TASK_INIT_FILE_EXISTS: (path) => `\u6587\u4EF6\u5DF2\u5B58\u5728: ${path}\uFF0C\u5982\u9700\u8986\u76D6\u8BF7\u5148\u5220\u9664`,
   /** 任务模板生成成功 */
   TASK_INIT_SUCCESS: (path) => `\u2713 \u4EFB\u52A1\u6A21\u677F\u5DF2\u751F\u6210: ${path}`,
-  /** 任务模板使用提示 */
-  TASK_INIT_HINT: (path) => `\u4F7F\u7528 clawt run -f ${path} \u6267\u884C\u4EFB\u52A1`
+  /** 任务模板使用提示（分行列出 run 和 resume 两种用法） */
+  TASK_INIT_HINT: (path) => `\u6267\u884C\u4EFB\u52A1:
+  clawt run -f ${path}     # \u521B\u5EFA worktree \u5E76\u6267\u884C\uFF08\u5206\u652F\u540D\u9700\u4E0D\u5B58\u5728\uFF09
+  clawt resume -f ${path}  # \u5728\u5DF2\u6709 worktree \u4E2D\u8FFD\u95EE\uFF08\u5206\u652F\u540D\u9700\u5DF2\u5B58\u5728\uFF09`
 };
 
 // src/constants/messages/post-create.ts

package/docs/tasks.md

@@ -46,7 +46,7 @@ clawt tasks init [path]
 # 格式说明: 标签外的文本会被忽略，每个任务用 START/END 标签包裹
 #
 # 规则:
-#   1. 每个任务块用 <!-- CLAWT-TASKS:START --> 和 <!-- CLAWT-TASKS:END --> 包裹
+#   1. 每个任务块用 <START> 和 <END> 标签包裹（实际标签见下方示例）
 #   2. 块内 # branch: <分支名> 声明分支名（使用 -b 参数时可省略）
 #   3. 块内其余行为任务描述（支持多行）
 

package/package.json

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

package/src/commands/status.ts

@@ -9,11 +9,10 @@ import {
   getCurrentBranch,
   isWorkingDirClean,
   getProjectWorktrees,
-  getCommitCountAhead,
-  getCommitCountBehind,
+  getCommitDivergenceAsync,
+  getDiffStatAsync,
+  getStatusPorcelainAsync,
   getDiffStat,
-  hasMergeConflict,
-  hasLocalCommits,
   getSnapshotModifiedTime,
   getProjectSnapshotBranches,
   getWorktreeCreatedTime,
@@ -55,7 +54,7 @@ async function handleStatus(options: StatusOptions): Promise<void> {
     return;
   }
 
-  const statusResult = collectStatus();
+  const statusResult = await collectStatus();
 
   logger.info(`status 命令执行，项目: ${statusResult.main.projectName}，共 ${statusResult.totalWorktrees} 个 worktree`);
 
@@ -69,9 +68,10 @@ async function handleStatus(options: StatusOptions): Promise<void> {
 
 /**
  * 收集项目全局状态信息
- * @returns {StatusResult} 完整的状态数据
+ * 各 worktree 的数据通过 Promise.all 并行收集，避免串行阻塞
+ * @returns {Promise<StatusResult>} 完整的状态数据
  */
-export function collectStatus(): StatusResult {
+export async function collectStatus(): Promise<StatusResult> {
   const projectName = getProjectName();
   const currentBranch = getCurrentBranch();
   const isClean = isWorkingDirClean();
@@ -95,9 +95,11 @@ export function collectStatus(): StatusResult {
     deletions,
   };
 
-  // 各 worktree 详细状态
+  // 各 worktree 详细状态（异步并行收集）
   const worktrees = getProjectWorktrees();
-  const worktreeStatuses = worktrees.map((wt) => collectWorktreeDetailedStatus(wt, projectName));
+  const worktreeStatuses = await Promise.all(
+    worktrees.map((wt) => collectWorktreeDetailedStatusAsync(wt, projectName)),
+  );
 
   // 未清理的 validate 快照
   const snapshots = collectSnapshots(projectName, worktrees);
@@ -111,70 +113,100 @@ export function collectStatus(): StatusResult {
 }
 
 /**
- * 收集单个 worktree 的详细状态
- * 变更状态判断优先级：冲突 > 未提交 > 已提交 > 干净
+ * 异步收集单个 worktree 的详细状态
+ * 内部 3 个 git 命令通过 Promise.all 并行执行，每个 worktree 内部也是并行的
  * @param {WorktreeInfo} worktree - worktree 信息
  * @param {string} projectName - 项目名
- * @returns {WorktreeDetailedStatus} 详细状态
+ * @returns {Promise<WorktreeDetailedStatus>} 详细状态
  */
-function collectWorktreeDetailedStatus(worktree: WorktreeInfo, projectName: string): WorktreeDetailedStatus {
-  const changeStatus = detectChangeStatus(worktree);
-  const { commitsAhead, commitsBehind } = countCommitDivergence(worktree.branch);
-  const { insertions, deletions } = countDiffStat(worktree.path);
+async function collectWorktreeDetailedStatusAsync(worktree: WorktreeInfo, projectName: string): Promise<WorktreeDetailedStatus> {
+  // 3 个 git 命令并行执行：提交差异、工作区状态、diff 统计
+  const [divergence, porcelain, diffStat] = await Promise.all([
+    countCommitDivergenceAsync(worktree.branch),
+    detectStatusPorcelainAsync(worktree.path),
+    countDiffStatAsync(worktree.path),
+  ]);
+
+  const changeStatus = detectChangeStatusFromPorcelain(porcelain, divergence.commitsAhead);
   const createdAt = getWorktreeCreatedTime(worktree.path);
 
   return {
     path: worktree.path,
     branch: worktree.branch,
     changeStatus,
-    commitsAhead,
-    commitsBehind,
+    commitsAhead: divergence.commitsAhead,
+    commitsBehind: divergence.commitsBehind,
     snapshotTime: resolveSnapshotTime(projectName, worktree.branch),
-    insertions,
-    deletions,
+    insertions: diffStat.insertions,
+    deletions: diffStat.deletions,
     createdAt,
   };
 }
 
 /**
- * 检测 worktree 的变更状态
+ * 从 porcelain 输出判断变更状态
  * 优先级：冲突 > 未提交 > 已提交 > 干净
- * @param {WorktreeInfo} worktree - worktree 信息
+ * @param {string} porcelain - git status --porcelain 输出
+ * @param {number} commitsAhead - 领先提交数
  * @returns {WorktreeDetailedStatus['changeStatus']} 变更状态
  */
-function detectChangeStatus(worktree: WorktreeInfo): WorktreeDetailedStatus['changeStatus'] {
+function detectChangeStatusFromPorcelain(porcelain: string, commitsAhead: number): WorktreeDetailedStatus['changeStatus'] {
+  // 检测合并冲突（UU/AA/DD/DU/UD/AU/UA 开头的行）
+  const hasConflict = porcelain.split('\n').some((line) => /^(UU|AA|DD|DU|UD|AU|UA)/.test(line));
+  if (hasConflict) {
+    return 'conflict';
+  }
+  // 检测未提交修改（porcelain 非空即有未提交变更）
+  if (porcelain !== '') {
+    return 'uncommitted';
+  }
+  // 用 commitsAhead > 0 判断是否有本地提交
+  if (commitsAhead > 0) {
+    return 'committed';
+  }
+  return 'clean';
+}
+
+/**
+ * 异步获取工作区 porcelain 状态，出错时返回空字符串
+ * @param {string} worktreePath - worktree 目录路径
+ * @returns {Promise<string>} porcelain 格式输出
+ */
+async function detectStatusPorcelainAsync(worktreePath: string): Promise<string> {
   try {
-    if (hasMergeConflict(worktree.path)) {
-      return 'conflict';
-    }
-    if (!isWorkingDirClean(worktree.path)) {
-      return 'uncommitted';
-    }
-    if (hasLocalCommits(worktree.branch)) {
-      return 'committed';
-    }
-    return 'clean';
+    return await getStatusPorcelainAsync(worktreePath);
   } catch {
-    return 'clean';
+    return '';
   }
 }
 
 /**
- * 统计分支与主分支的提交差异（领先/落后数）
+ * 异步统计分支与主分支的提交差异（领先/落后数）
  * @param {string} branchName - 分支名
- * @returns {{ commitsAhead: number; commitsBehind: number }} 领先和落后的提交数
+ * @returns {Promise<{ commitsAhead: number; commitsBehind: number }>} 领先和落后的提交数
  */
-function countCommitDivergence(branchName: string): { commitsAhead: number; commitsBehind: number } {
+async function countCommitDivergenceAsync(branchName: string): Promise<{ commitsAhead: number; commitsBehind: number }> {
   try {
-    return {
-      commitsAhead: getCommitCountAhead(branchName),
-      commitsBehind: getCommitCountBehind(branchName),
-    };
+    const { ahead, behind } = await getCommitDivergenceAsync(branchName);
+    return { commitsAhead: ahead, commitsBehind: behind };
   } catch {
     return { commitsAhead: 0, commitsBehind: 0 };
   }
 }
 
+/**
+ * 异步统计 worktree 的差异行数
+ * @param {string} worktreePath - worktree 目录路径
+ * @returns {Promise<{ insertions: number; deletions: number }>} 新增和删除行数
+ */
+async function countDiffStatAsync(worktreePath: string): Promise<{ insertions: number; deletions: number }> {
+  try {
+    return await getDiffStatAsync(worktreePath);
+  } catch {
+    return { insertions: 0, deletions: 0 };
+  }
+}
+
 /**
  * 统计 worktree 的差异行数
  * @param {string} worktreePath - worktree 路径

package/src/constants/git.ts

@@ -12,5 +12,5 @@ export const GIT_INDEX_LOCK_RETRY = {
   /** 重试次数（用户反馈"重试一下就可以了"，单次重试足够） */
   MAX_RETRIES: 1,
   /** 重试延迟毫秒数（让锁文件有时间被释放） */
-  DELAY_MS: 150,
+  DELAY_MS: 1000,
 } as const;

package/src/constants/messages/tasks.ts

@@ -4,6 +4,7 @@ export const TASKS_CMD_MESSAGES = {
   TASK_INIT_FILE_EXISTS: (path: string) => `文件已存在: ${path}，如需覆盖请先删除`,
   /** 任务模板生成成功 */
   TASK_INIT_SUCCESS: (path: string) => `✓ 任务模板已生成: ${path}`,
-  /** 任务模板使用提示 */
-  TASK_INIT_HINT: (path: string) => `使用 clawt run -f ${path} 执行任务`,
+  /** 任务模板使用提示（分行列出 run 和 resume 两种用法） */
+  TASK_INIT_HINT: (path: string) =>
+    `执行任务:\n  clawt run -f ${path}     # 创建 worktree 并执行（分支名需不存在）\n  clawt resume -f ${path}  # 在已有 worktree 中追问（分支名需已存在）`,
 } as const;

package/src/constants/tasks-template.ts

@@ -11,7 +11,7 @@ export const TASK_TEMPLATE_CONTENT = `# Clawt 任务文件
 # 格式说明: 标签外的文本会被忽略，每个任务用 START/END 标签包裹
 #
 # 规则:
-#   1. 每个任务块用 <!-- CLAWT-TASKS:START --> 和 <!-- CLAWT-TASKS:END --> 包裹
+#   1. 每个任务块用 <START> 和 <END> 标签包裹（实际标签见下方示例）
 #   2. 块内 # branch: <分支名> 声明分支名（使用 -b 参数时可省略）
 #   3. 块内其余行为任务描述（支持多行）
 

package/src/utils/git-branch.ts

@@ -1,4 +1,4 @@
-import { execCommand } from './shell.js';
+import { execCommand, execCommandAsync } from './shell.js';
 import { logger } from '../logger/index.js';
 
 /**
@@ -68,6 +68,51 @@ export function getCommitCountBehind(branchName: string, cwd?: string): number {
   }
 }
 
+/**
+ * 解析 git rev-list --left-right --count 的输出
+ * 输出格式：<left_count>\t<right_count>
+ * left = HEAD 侧独有提交数（即 behind），right = branch 侧独有提交数（即 ahead）
+ * @param {string} output - rev-list 命令输出
+ * @returns {{ ahead: number; behind: number }} 领先和落后的提交数
+ */
+function parseDivergenceOutput(output: string): { ahead: number; behind: number } {
+  const [leftStr, rightStr] = output.trim().split(/\s+/);
+  return { ahead: parseInt(rightStr, 10) || 0, behind: parseInt(leftStr, 10) || 0 };
+}
+
+/**
+ * 获取当前分支与目标分支的双向提交差异
+ * 使用单条 git rev-list --left-right --count 命令同时获取领先和落后提交数，
+ * 替代分别调用 getCommitCountAhead 和 getCommitCountBehind 两条命令
+ * @param {string} branchName - 目标分支名
+ * @param {string} [cwd] - 工作目录
+ * @returns {{ ahead: number; behind: number }} 领先和落后的提交数
+ */
+export function getCommitDivergence(branchName: string, cwd?: string): { ahead: number; behind: number } {
+  try {
+    const output = execCommand(`git rev-list --left-right --count HEAD...${branchName}`, { cwd });
+    return parseDivergenceOutput(output);
+  } catch {
+    return { ahead: 0, behind: 0 };
+  }
+}
+
+/**
+ * 异步获取当前分支与目标分支的双向提交差异
+ * 用于并行收集多个 worktree 的提交差异时避免串行阻塞
+ * @param {string} branchName - 目标分支名
+ * @param {string} [cwd] - 工作目录
+ * @returns {Promise<{ ahead: number; behind: number }>} 领先和落后的提交数
+ */
+export async function getCommitDivergenceAsync(branchName: string, cwd?: string): Promise<{ ahead: number; behind: number }> {
+  try {
+    const output = await execCommandAsync(`git rev-list --left-right --count HEAD...${branchName}`, { cwd });
+    return parseDivergenceOutput(output);
+  } catch {
+    return { ahead: 0, behind: 0 };
+  }
+}
+
 /**
  * 获取当前分支名
  * @param {string} [cwd] - 工作目录

package/src/utils/git-core.ts

@@ -1,6 +1,6 @@
 import { basename } from 'node:path';
 import { execSync, execFileSync } from 'node:child_process';
-import { execCommand, execCommandWithInput } from './shell.js';
+import { execCommand, execCommandAsync, execCommandWithInput } from './shell.js';
 import { logger } from '../logger/index.js';
 import { EXEC_MAX_BUFFER, AUTO_SAVE_COMMIT_MESSAGE_PREFIX } from '../constants/git.js';
 
@@ -81,6 +81,16 @@ export function getStatusPorcelain(cwd?: string): string {
   return execCommand('git status --porcelain', { cwd });
 }
 
+/**
+ * 异步获取工作区状态（git status --porcelain）
+ * 用于并行收集多个 worktree 状态时避免串行阻塞
+ * @param {string} cwd - 工作目录
+ * @returns {Promise<string>} porcelain 格式输出，为空表示干净
+ */
+export async function getStatusPorcelainAsync(cwd?: string): Promise<string> {
+  return execCommandAsync('git status --porcelain', { cwd });
+}
+
 /**
  * 判断工作区是否干净
  * @param {string} cwd - 工作目录
@@ -256,6 +266,17 @@ export function getDiffStat(worktreePath: string): { insertions: number; deletio
   return parseShortStat(output);
 }
 
+/**
+ * 异步获取 worktree 中工作区和暂存区的变更统计
+ * 用于并行收集多个 worktree 的 diff 统计时避免串行阻塞
+ * @param {string} worktreePath - worktree 目录路径
+ * @returns {Promise<{ insertions: number; deletions: number }>} 新增和删除行数
+ */
+export async function getDiffStatAsync(worktreePath: string): Promise<{ insertions: number; deletions: number }> {
+  const output = await execCommandAsync('git diff --shortstat HEAD', { cwd: worktreePath });
+  return parseShortStat(output);
+}
+
 /**
  * 获取暂存区相对于 HEAD 的完整 diff（含二进制文件）
  * 注意：返回原始输出不做 trim，保留 patch 格式完整性

package/src/utils/index.ts

@@ -1,4 +1,4 @@
-export { execCommand, spawnProcess, killAllChildProcesses, execCommandWithInput, runCommandInherited, parseParallelCommands, runParallelCommands, runCommandWithStderrCapture, runParallelCommandsWithStderrCapture } from './shell.js';
+export { execCommand, execCommandAsync, spawnProcess, killAllChildProcesses, execCommandWithInput, runCommandInherited, parseParallelCommands, runParallelCommands, runCommandWithStderrCapture, runParallelCommandsWithStderrCapture } from './shell.js';
 export type { ParallelCommandResult, CommandResultWithStderr, ParallelCommandResultWithStderr } from './shell.js';
 export { copyToClipboard } from './clipboard.js';
 export {
@@ -13,6 +13,7 @@ export {
   removeWorktreeByPath,
   deleteBranch,
   getStatusPorcelain,
+  getStatusPorcelainAsync,
   isWorkingDirClean,
   gitAddAll,
   gitCommit,
@@ -34,7 +35,10 @@ export {
   hasLocalCommits,
   getCommitCountAhead,
   getCommitCountBehind,
+  getCommitDivergence,
+  getCommitDivergenceAsync,
   getDiffStat,
+  getDiffStatAsync,
   gitDiffCachedBinary,
   gitApplyCachedFromStdin,
   getCurrentBranch,

package/src/utils/interactive-panel-render.ts

@@ -69,6 +69,7 @@ function buildSeparatorWithHint(cols: number, hint: string): string {
  * @param {number} rows - 终端行数
  * @param {number} cols - 终端列数
  * @param {number} countdown - 刷新倒计时秒数
+ * @param {PanelLine[]} [cachedPanelLines] - 缓存的面板行列表（传入时复用，不传则重新构建）
  * @returns {string[]} 帧内容行数组
  */
 export function buildPanelFrame(
@@ -78,6 +79,7 @@ export function buildPanelFrame(
   rows: number,
   cols: number,
   countdown: number,
+  cachedPanelLines?: PanelLine[],
 ): string[] {
   const lines: string[] = [];
 
@@ -100,8 +102,8 @@ export function buildPanelFrame(
     // 底部分隔线（无溢出提示）
     lines.push(buildSeparatorWithHint(cols, ''));
   } else {
-    // 构建分组的 worktree 行列表
-    const panelLines = buildGroupedWorktreeLines(statusResult.worktrees, selectedIndex);
+    // 构建分组的 worktree 行列表（优先使用缓存）
+    const panelLines = cachedPanelLines ?? buildGroupedWorktreeLines(statusResult.worktrees, selectedIndex);
 
     // 判断溢出状态
     const hasOverflowUp = scrollOffset > 0;

package/src/utils/interactive-panel-state.ts

@@ -1,9 +1,11 @@
 import type { StatusResult } from '../types/index.js';
 import { buildDisplayOrder, calculateVisibleRows, buildGroupedWorktreeLines } from './interactive-panel-render.js';
+import type { PanelLine } from './interactive-panel-render.js';
 
 /**
  * 面板状态管理器
  * 负责维护面板的数据状态、滚动偏移和选中项
+ * 缓存 panelLines 和 displayOrder 避免重复计算 groupWorktreesByDate
  */
 export class PanelStateManager {
   /** 当前状态数据 */
@@ -14,16 +16,19 @@ export class PanelStateManager {
   private displayOrder: number[] = [];
   /** 滚动偏移（基于行数） */
   private scrollOffset: number = 0;
+  /** 缓存的面板行列表，在 updateData 和导航时更新 */
+  private cachedPanelLines: PanelLine[] = [];
 
   /**
    * 更新状态数据
+   * 一次性计算 displayOrder 和 cachedPanelLines，后续 adjustScrollForSelection 和 render 复用缓存
    * @param {StatusResult} newStatus - 新的状态数据
    * @param {string} [previousBranch] - 刷新前选中的分支名
    */
   updateData(newStatus: StatusResult, previousBranch?: string): void {
     this.statusResult = newStatus;
     this.displayOrder = buildDisplayOrder(this.statusResult.worktrees);
-    
+
     if (previousBranch && this.displayOrder.length > 0) {
       const newDisplayIndex = this.displayOrder.findIndex(
         (origIdx) => this.statusResult!.worktrees[origIdx]?.branch === previousBranch,
@@ -36,6 +41,9 @@ export class PanelStateManager {
     } else {
       this.selectedDisplayIndex = 0;
     }
+
+    // 一次性构建缓存的 panelLines
+    this.rebuildCachedPanelLines();
   }
 
   /** 获取当前状态数据 */
@@ -53,6 +61,14 @@ export class PanelStateManager {
     return this.scrollOffset;
   }
 
+  /**
+   * 获取缓存的面板行列表
+   * @returns {PanelLine[]} 缓存的面板行列表
+   */
+  getCachedPanelLines(): PanelLine[] {
+    return this.cachedPanelLines;
+  }
+
   /**
    * 向上导航
    * @returns {boolean} 是否发生变化
@@ -62,6 +78,8 @@ export class PanelStateManager {
 
     if (this.selectedDisplayIndex > 0) {
       this.selectedDisplayIndex--;
+      // 导航后重建缓存（选中标记变化）
+      this.rebuildCachedPanelLines();
       this.adjustScrollForSelection();
       return true;
     }
@@ -77,6 +95,8 @@ export class PanelStateManager {
 
     if (this.selectedDisplayIndex < this.displayOrder.length - 1) {
       this.selectedDisplayIndex++;
+      // 导航后重建缓存（选中标记变化）
+      this.rebuildCachedPanelLines();
       this.adjustScrollForSelection();
       return true;
     }
@@ -95,6 +115,7 @@ export class PanelStateManager {
 
   /**
    * 调整滚动位置以确保选中项在可见区域内
+   * 复用 cachedPanelLines，不再重新调用 buildGroupedWorktreeLines
    */
   adjustScrollForSelection(): void {
     if (!this.statusResult || this.displayOrder.length === 0) return;
@@ -102,7 +123,7 @@ export class PanelStateManager {
     const originalIndex = this.getSelectedOriginalIndex();
     const rows = process.stdout.rows || 24;
     const visibleRows = calculateVisibleRows(rows);
-    const panelLines = buildGroupedWorktreeLines(this.statusResult.worktrees, originalIndex);
+    const panelLines = this.cachedPanelLines;
 
     // 找到选中 worktree 对应的第一行和最后一行
     let firstLine = -1;
@@ -134,4 +155,17 @@ export class PanelStateManager {
       this.scrollOffset = groupStart;
     }
   }
+
+  /**
+   * 重建缓存的 panelLines
+   * 在数据更新或导航变化时调用
+   */
+  private rebuildCachedPanelLines(): void {
+    if (!this.statusResult) {
+      this.cachedPanelLines = [];
+      return;
+    }
+    const originalIndex = this.getSelectedOriginalIndex();
+    this.cachedPanelLines = buildGroupedWorktreeLines(this.statusResult.worktrees, originalIndex);
+  }
 }

package/src/utils/interactive-panel.ts

@@ -20,7 +20,7 @@ import {
 } from '../constants/index.js';
 import { PANEL_NOT_TTY, PANEL_PRESS_ENTER_TO_RETURN } from '../constants/messages/index.js';
 import { runCommandInherited } from './shell.js';
-import { buildPanelFrame } from './interactive-panel-render.js';
+import { buildPanelFrame, renderFooter } from './interactive-panel-render.js';
 import { truncateToTerminalWidth } from './progress-render.js';
 import type { StatusResult } from '../types/index.js';
 import { KeyboardController } from './keyboard-controller.js';
@@ -53,16 +53,20 @@ export class InteractivePanel {
   private exitHandler: (() => void) | null;
   /** 操作锁（防止操作期间响应按键） */
   private isOperating: boolean;
+  /** 刷新锁（防止异步刷新期间触发重复刷新） */
+  private isRefreshing: boolean;
   /** Promise resolve 函数（stop 时调用以完成 start 返回的 Promise） */
   private resolveStart: (() => void) | null;
-  /** 数据收集函数引用 */
-  private collectStatusFn: () => StatusResult;
+  /** 数据收集函数引用（异步，支持并行收集 worktree 数据） */
+  private collectStatusFn: () => Promise<StatusResult>;
+  /** 上一帧的总行数，用于 footer-only 渲染时定位最后一行 */
+  private lastFrameLineCount: number = 0;
 
   /**
    * 创建交互式面板
-   * @param {() => StatusResult} collectStatusFn - 数据收集函数
+   * @param {() => Promise<StatusResult>} collectStatusFn - 异步数据收集函数
    */
-  constructor(collectStatusFn: () => StatusResult) {
+  constructor(collectStatusFn: () => Promise<StatusResult>) {
     this.stateManager = new PanelStateManager();
     this.keyboardController = new KeyboardController(this.handleKeypress.bind(this));
     this.refreshTimer = null;
@@ -73,6 +77,7 @@ export class InteractivePanel {
     this.resizeHandler = null;
     this.exitHandler = null;
     this.isOperating = false;
+    this.isRefreshing = false;
     this.resolveStart = null;
     this.collectStatusFn = collectStatusFn;
   }
@@ -82,19 +87,19 @@ export class InteractivePanel {
    * 非 TTY 时打印提示并退出
    * @returns {Promise<void>} 面板关闭时 resolve
    */
-  start(): Promise<void> {
+  async start(): Promise<void> {
     // 非 TTY 降级
     if (!this.isTTY) {
       console.log(PANEL_NOT_TTY);
-      return Promise.resolve();
+      return;
     }
 
+    // 异步收集初始数据（在创建 Promise 之前完成，避免 async executor 反模式）
+    this.stateManager.updateData(await this.collectStatusFn());
+
     return new Promise<void>((resolve) => {
       this.resolveStart = resolve;
 
-      // 收集初始数据
-      this.stateManager.updateData(this.collectStatusFn());
-
       // 初始化终端
       this.initTerminal();
 
@@ -270,12 +275,12 @@ export class InteractivePanel {
       this.refreshData();
     }, PANEL_REFRESH_INTERVAL_MS);
 
-    // 倒计时定时器（每秒更新显示）
+    // 倒计时定时器（每秒仅更新 footer 行，不触发全量重绘）
     this.countdownTimer = setInterval(() => {
       if (this.refreshCountdown > 0) {
         this.refreshCountdown--;
       }
-      this.render();
+      this.renderFooterOnly();
     }, PANEL_COUNTDOWN_INTERVAL_MS);
 
     // 确保定时器不阻止进程退出
@@ -298,29 +303,35 @@ export class InteractivePanel {
   }
 
   /**
-   * 刷新数据：记录当前选中分支 → 重新收集 → 恢复选中位置 → 重置倒计时 → 重绘
+   * 刷新数据：记录当前选中分支 → 异步重新收集 → 恢复选中位置 → 重置倒计时 → 重绘
+   * 使用 isRefreshing 锁防止异步刷新期间触发重复刷新
    */
-  private refreshData(): void {
-    if (this.stopped || this.isOperating) return;
+  private async refreshData(): Promise<void> {
+    if (this.stopped || this.isOperating || this.isRefreshing) return;
 
-    // 记录当前选中分支名
-    const previousBranch = this.stateManager.getSelectedBranch();
+    this.isRefreshing = true;
+    try {
+      // 记录当前选中分支名
+      const previousBranch = this.stateManager.getSelectedBranch();
 
-    // 重新收集数据并更新状态
-    this.stateManager.updateData(this.collectStatusFn(), previousBranch || undefined);
+      // 异步重新收集数据并更新状态
+      this.stateManager.updateData(await this.collectStatusFn(), previousBranch || undefined);
 
-    // 在重绘前必须确保滚动状态正常
-    this.stateManager.adjustScrollForSelection();
+      // 在重绘前必须确保滚动状态正常
+      this.stateManager.adjustScrollForSelection();
 
-    // 重置倒计时
-    this.refreshCountdown = PANEL_REFRESH_INTERVAL_MS / 1000;
+      // 重置倒计时
+      this.refreshCountdown = PANEL_REFRESH_INTERVAL_MS / 1000;
 
-    this.render();
+      this.render();
+    } finally {
+      this.isRefreshing = false;
+    }
   }
 
   /**
    * 渲染一帧面板内容
-   * 使用同步输出防止闪烁
+   * 使用同步输出防止闪烁，复用缓存的 panelLines 避免重复 groupWorktreesByDate 计算
    */
   private render(): void {
     const statusResult = this.stateManager.getStatusResult();
@@ -336,6 +347,7 @@ export class InteractivePanel {
       rows,
       cols,
       this.refreshCountdown,
+      this.stateManager.getCachedPanelLines(),
     );
 
     // 同步输出开始
@@ -349,10 +361,34 @@ export class InteractivePanel {
       process.stdout.write(`${truncateToTerminalWidth(frameLines[i], cols)}${suffix}`);
     }
 
+    // 记录帧行数，供 renderFooterOnly 定位最后一行
+    this.lastFrameLineCount = frameLines.length;
+
     // 同步输出结束
     process.stdout.write(SYNC_OUTPUT_END);
   }
 
+  /**
+   * 仅更新 footer 行（倒计时文本）
+   * 使用 ANSI 光标定位直接覆写最后一行，避免全量重绘
+   */
+  private renderFooterOnly(): void {
+    if (this.stopped || this.isOperating || this.lastFrameLineCount === 0) return;
+
+    const cols = process.stdout.columns || DEFAULT_TERMINAL_COLUMNS;
+    const footerText = renderFooter(this.refreshCountdown);
+    const truncated = truncateToTerminalWidth(footerText, cols);
+
+    // 使用 ANSI 转义序列定位到最后一行并覆写
+    // \x1b[<row>;1H 移动光标到第 <row> 行第 1 列
+    // \x1b[2K 清除当前行
+    process.stdout.write(SYNC_OUTPUT_START);
+    process.stdout.write(`\x1b[${this.lastFrameLineCount};1H`);
+    process.stdout.write('\x1b[2K');
+    process.stdout.write(truncated);
+    process.stdout.write(SYNC_OUTPUT_END);
+  }
+
   /**
    * 执行操作：暂停面板 → 恢复终端 → 执行命令 → 等待回车 → 恢复面板
    * @param {() => void} action - 要执行的操作
@@ -389,8 +425,8 @@ export class InteractivePanel {
 
     this.isOperating = false;
 
-    // 刷新数据并重新启动自动刷新
-    this.refreshData();
+    // 异步刷新数据并重新启动自动刷新
+    await this.refreshData();
     this.startAutoRefresh();
 
     // 渲染

package/src/utils/shell.ts

@@ -1,9 +1,13 @@
-import { execSync, execFileSync, spawn, spawnSync, type ChildProcess, type SpawnSyncReturns, type StdioOptions } from 'node:child_process';
+import { exec, execSync, execFileSync, spawn, spawnSync, type ChildProcess, type SpawnSyncReturns, type StdioOptions } from 'node:child_process';
+import { promisify } from 'node:util';
 import { logger } from '../logger/index.js';
 import { EXEC_MAX_BUFFER } from '../constants/git.js';
 import { CLAUDE_CODE_ENTRYPOINT_VALUE } from '../constants/index.js';
 import { throwIfGitIndexLockError, shouldRetryGitIndexLockError, waitForGitIndexLockRetrySync } from './git-lock.js';
 
+/** promisified 版本的 exec */
+const execPromise = promisify(exec);
+
 /**
  * 获取移除了 CLAUDECODE 嵌套会话标记的环境变量副本，并注入 CLAUDE_CODE_ENTRYPOINT 标识
  * 仅用于 claude -p 等非交互式子进程：
@@ -81,6 +85,26 @@ export function execCommand(command: string, options?: { cwd?: string }): string
   }
 }
 
+/**
+ * 异步执行 shell 命令并返回 stdout
+ * 基于 child_process.exec 的 promisified 版本，适用于只读 git 命令的并行执行场景
+ * 不包含 index.lock 重试逻辑（只读命令不触发 index.lock）
+ * @param {string} command - 要执行的命令
+ * @param {object} options - 可选配置
+ * @param {string} options.cwd - 工作目录
+ * @returns {Promise<string>} 命令的标准输出（已 trim）
+ * @throws {Error} 命令执行失败时抛出
+ */
+export async function execCommandAsync(command: string, options?: { cwd?: string }): Promise<string> {
+  logger.debug(`执行异步命令: ${command}${options?.cwd ? ` (cwd: ${options.cwd})` : ''}`);
+  const { stdout } = await execPromise(command, {
+    cwd: options?.cwd,
+    encoding: 'utf-8',
+    maxBuffer: EXEC_MAX_BUFFER,
+  });
+  return (stdout as string).trim();
+}
+
 /**
  * 以子进程方式异步执行命令
  * @param {string} command - 要执行的命令

package/tests/unit/commands/status.test.ts

@@ -39,11 +39,10 @@ vi.mock('../../../src/utils/index.js', () => ({
   getCurrentBranch: vi.fn(),
   isWorkingDirClean: vi.fn(),
   getProjectWorktrees: vi.fn(),
-  getCommitCountAhead: vi.fn(),
-  getCommitCountBehind: vi.fn(),
+  getCommitDivergenceAsync: vi.fn(),
   getDiffStat: vi.fn(),
-  hasMergeConflict: vi.fn(),
-  hasLocalCommits: vi.fn(),
+  getDiffStatAsync: vi.fn(),
+  getStatusPorcelainAsync: vi.fn(),
   getSnapshotModifiedTime: vi.fn(),
   getProjectSnapshotBranches: vi.fn(),
   getWorktreeCreatedTime: vi.fn(),
@@ -61,11 +60,10 @@ import {
   getCurrentBranch,
   isWorkingDirClean,
   getProjectWorktrees,
-  getCommitCountAhead,
-  getCommitCountBehind,
+  getCommitDivergenceAsync,
   getDiffStat,
-  hasMergeConflict,
-  hasLocalCommits,
+  getDiffStatAsync,
+  getStatusPorcelainAsync,
   getSnapshotModifiedTime,
   getProjectSnapshotBranches,
   getWorktreeCreatedTime,
@@ -77,11 +75,10 @@ const mockedGetProjectName = vi.mocked(getProjectName);
 const mockedGetCurrentBranch = vi.mocked(getCurrentBranch);
 const mockedIsWorkingDirClean = vi.mocked(isWorkingDirClean);
 const mockedGetProjectWorktrees = vi.mocked(getProjectWorktrees);
-const mockedGetCommitCountAhead = vi.mocked(getCommitCountAhead);
-const mockedGetCommitCountBehind = vi.mocked(getCommitCountBehind);
+const mockedGetCommitDivergenceAsync = vi.mocked(getCommitDivergenceAsync);
 const mockedGetDiffStat = vi.mocked(getDiffStat);
-const mockedHasMergeConflict = vi.mocked(hasMergeConflict);
-const mockedHasLocalCommits = vi.mocked(hasLocalCommits);
+const mockedGetDiffStatAsync = vi.mocked(getDiffStatAsync);
+const mockedGetStatusPorcelainAsync = vi.mocked(getStatusPorcelainAsync);
 const mockedGetSnapshotModifiedTime = vi.mocked(getSnapshotModifiedTime);
 const mockedGetProjectSnapshotBranches = vi.mocked(getProjectSnapshotBranches);
 const mockedGetWorktreeCreatedTime = vi.mocked(getWorktreeCreatedTime);
@@ -94,11 +91,10 @@ beforeEach(() => {
   mockedIsWorkingDirClean.mockReturnValue(true);
   mockedGetProjectWorktrees.mockReturnValue([]);
   mockedGetProjectSnapshotBranches.mockReturnValue([]);
-  mockedGetCommitCountAhead.mockReturnValue(0);
-  mockedGetCommitCountBehind.mockReturnValue(0);
+  mockedGetCommitDivergenceAsync.mockResolvedValue({ ahead: 0, behind: 0 });
   mockedGetDiffStat.mockReturnValue({ insertions: 0, deletions: 0 });
-  mockedHasMergeConflict.mockReturnValue(false);
-  mockedHasLocalCommits.mockReturnValue(false);
+  mockedGetDiffStatAsync.mockResolvedValue({ insertions: 0, deletions: 0 });
+  mockedGetStatusPorcelainAsync.mockResolvedValue('');
   mockedGetSnapshotModifiedTime.mockReturnValue(null);
   mockedGetWorktreeCreatedTime.mockReturnValue(null);
   mockedFormatRelativeTime.mockReturnValue('3 天前');
@@ -128,9 +124,8 @@ describe('handleStatus', () => {
     mockedGetProjectWorktrees.mockReturnValue([
       { path: '/path/feature', branch: 'feature' },
     ]);
-    mockedGetCommitCountAhead.mockReturnValue(2);
-    mockedGetDiffStat.mockReturnValue({ insertions: 10, deletions: 5 });
-    mockedHasLocalCommits.mockReturnValue(true);
+    mockedGetCommitDivergenceAsync.mockResolvedValue({ ahead: 2, behind: 0 });
+    mockedGetDiffStatAsync.mockResolvedValue({ insertions: 10, deletions: 5 });
 
     const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
 
@@ -155,8 +150,8 @@ describe('handleStatus', () => {
     mockedGetProjectWorktrees.mockReturnValue([
       { path: '/path/feature', branch: 'feature' },
     ]);
-    // 模拟冲突状态
-    mockedHasMergeConflict.mockReturnValue(true);
+    // 模拟冲突状态：porcelain 输出包含 UU 前缀的行
+    mockedGetStatusPorcelainAsync.mockResolvedValue('UU src/conflict-file.ts');
 
     const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
 
@@ -214,10 +209,8 @@ describe('handleStatus', () => {
     mockedGetProjectWorktrees.mockReturnValue([
       { path: '/path/feature', branch: 'feature' },
     ]);
-    mockedHasMergeConflict.mockReturnValue(false);
-    mockedIsWorkingDirClean
-      .mockReturnValueOnce(true)   // 主 worktree
-      .mockReturnValueOnce(false); // 目标 worktree 不干净
+    // 模拟未提交修改：porcelain 输出包含修改但非冲突的行
+    mockedGetStatusPorcelainAsync.mockResolvedValue(' M src/file.ts');  // 目标 worktree 有未提交修改
 
     const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => {});