clawt 3.9.6 → 3.9.8

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
@@ -780,6 +782,10 @@ var PROJECT_CONFIG_DEFINITIONS = {
   postCreate: {
     defaultValue: void 0,
     description: "worktree \u521B\u5EFA\u540E\u81EA\u52A8\u6267\u884C\u7684\u547D\u4EE4\uFF0C\u7528\u4E8E\u5B89\u88C5\u4F9D\u8D56\u7B49\u521D\u59CB\u5316\u64CD\u4F5C"
+  },
+  claudeCodeCommand: {
+    defaultValue: void 0,
+    description: "Claude Code CLI \u542F\u52A8\u6307\u4EE4\uFF08\u672A\u8BBE\u7F6E\u65F6\u56DE\u9000\u5230\u5168\u5C40\u914D\u7F6E\uFF09"
   }
 };
 function deriveDefaultConfig2(definitions) {
@@ -912,7 +918,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 +1007,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 +1074,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 +1103,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 +1279,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 +1336,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 +1447,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) {
@@ -1638,7 +1666,7 @@ function validateBranchesNotExist(branchNames) {
 }
 
 // src/utils/project-config.ts
-import { existsSync as existsSync3, readFileSync, writeFileSync } from "fs";
+import { existsSync as existsSync4, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "fs";
 import { join as join4 } from "path";
 
 // src/utils/fs.ts
@@ -1680,6 +1708,101 @@ function calculateDirSize(dirPath) {
   return totalSize;
 }
 
+// src/utils/config.ts
+import { existsSync as existsSync3, readFileSync, writeFileSync } from "fs";
+function loadConfig() {
+  if (!existsSync3(CONFIG_PATH)) {
+    return { ...DEFAULT_CONFIG };
+  }
+  try {
+    const raw = readFileSync(CONFIG_PATH, "utf-8");
+    return { ...DEFAULT_CONFIG, ...JSON.parse(raw) };
+  } catch {
+    logger.warn(MESSAGES.CONFIG_CORRUPTED);
+    writeDefaultConfig();
+    return { ...DEFAULT_CONFIG };
+  }
+}
+function writeConfig(config2) {
+  writeFileSync(CONFIG_PATH, JSON.stringify(config2, null, 2), "utf-8");
+}
+function writeDefaultConfig() {
+  writeConfig(DEFAULT_CONFIG);
+}
+function saveConfig(config2) {
+  writeFileSync(CONFIG_PATH, JSON.stringify(config2, null, 2), "utf-8");
+}
+function getConfigValue(key) {
+  const config2 = loadConfig();
+  return config2[key];
+}
+function ensureClawtDirs() {
+  ensureDir(CLAWT_HOME);
+  ensureDir(LOGS_DIR);
+  ensureDir(WORKTREES_DIR);
+  ensureDir(PROJECTS_CONFIG_DIR);
+}
+function parseConcurrency(optionValue, configValue) {
+  if (optionValue === void 0) {
+    return configValue;
+  }
+  const parsed = parseInt(optionValue, 10);
+  if (Number.isNaN(parsed) || parsed < 0) {
+    throw new ClawtError(MESSAGES.CONCURRENCY_INVALID);
+  }
+  return parsed;
+}
+
+// src/utils/json.ts
+function primitiveToString(value) {
+  if (value === void 0) {
+    return "undefined";
+  }
+  if (value === null) {
+    return "null";
+  }
+  if (typeof value === "symbol") {
+    return value.toString();
+  }
+  if (typeof value === "function") {
+    return `[Function: ${value.name || "anonymous"}]`;
+  }
+  return String(value);
+}
+function safeStringify(value, indent = 2) {
+  if (value === null || typeof value !== "object") {
+    return primitiveToString(value);
+  }
+  try {
+    const seen = /* @__PURE__ */ new WeakSet();
+    return JSON.stringify(
+      value,
+      (_key, val) => {
+        if (typeof val === "bigint") {
+          return val.toString();
+        }
+        if (typeof val === "undefined" || typeof val === "function" || typeof val === "symbol") {
+          return primitiveToString(val);
+        }
+        if (typeof val === "object" && val !== null) {
+          if (seen.has(val)) {
+            return "[Circular]";
+          }
+          seen.add(val);
+        }
+        return val;
+      },
+      indent
+    );
+  } catch {
+    try {
+      return JSON.stringify(String(value), null, indent);
+    } catch {
+      return "[Unserializable]";
+    }
+  }
+}
+
 // src/utils/project-config.ts
 function getProjectConfigPath(projectName) {
   return join4(PROJECTS_CONFIG_DIR, projectName, "config.json");
@@ -1687,11 +1810,11 @@ function getProjectConfigPath(projectName) {
 function loadProjectConfig() {
   const projectName = getProjectName();
   const configPath = getProjectConfigPath(projectName);
-  if (!existsSync3(configPath)) {
+  if (!existsSync4(configPath)) {
     return null;
   }
   try {
-    const raw = readFileSync(configPath, "utf-8");
+    const raw = readFileSync2(configPath, "utf-8");
     return JSON.parse(raw);
   } catch (error) {
     logger.warn(`\u9879\u76EE\u914D\u7F6E\u6587\u4EF6\u89E3\u6790\u5931\u8D25: ${error}`);
@@ -1703,7 +1826,7 @@ function saveProjectConfig(config2) {
   const configPath = getProjectConfigPath(projectName);
   const projectDir = join4(PROJECTS_CONFIG_DIR, projectName);
   ensureDir(projectDir);
-  writeFileSync(configPath, JSON.stringify(config2, null, 2), "utf-8");
+  writeFileSync2(configPath, safeStringify({ ...config2 }, 2), "utf-8");
   logger.info(`\u9879\u76EE\u914D\u7F6E\u5DF2\u4FDD\u5B58: ${configPath}`);
 }
 function requireProjectConfig() {
@@ -1731,6 +1854,24 @@ function getValidateRunCommand() {
   const config2 = loadProjectConfig();
   return config2?.validateRunCommand || void 0;
 }
+function resolveClaudeCodeCommand() {
+  const projectConfig = loadProjectConfig();
+  if (projectConfig?.claudeCodeCommand) {
+    return projectConfig.claudeCodeCommand;
+  }
+  return getConfigValue("claudeCodeCommand");
+}
+function normalizeProjectConfig(config2, key, value) {
+  if (value === "") {
+    const def = PROJECT_CONFIG_DEFINITIONS[key];
+    if (def?.defaultValue === void 0) {
+      const normalized = { ...config2 };
+      delete normalized[key];
+      return normalized;
+    }
+  }
+  return config2;
+}
 
 // src/utils/validate-branch.ts
 import Enquirer from "enquirer";
@@ -1897,7 +2038,7 @@ async function runPreChecks(options) {
 
 // src/utils/worktree.ts
 import { join as join5 } from "path";
-import { existsSync as existsSync4, readdirSync as readdirSync2 } from "fs";
+import { existsSync as existsSync5, readdirSync as readdirSync2 } from "fs";
 function getProjectWorktreeDir() {
   const projectName = getProjectName();
   return join5(WORKTREES_DIR, projectName);
@@ -1934,7 +2075,7 @@ function createWorktreesByBranches(branchNames) {
 }
 function getProjectWorktrees() {
   const projectDir = getProjectWorktreeDir();
-  if (!existsSync4(projectDir)) {
+  if (!existsSync5(projectDir)) {
     return [];
   }
   const worktreeListOutput = gitWorktreeList();
@@ -1984,51 +2125,6 @@ function getWorktreeStatus(worktree) {
   }
 }
 
-// src/utils/config.ts
-import { existsSync as existsSync5, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "fs";
-function loadConfig() {
-  if (!existsSync5(CONFIG_PATH)) {
-    return { ...DEFAULT_CONFIG };
-  }
-  try {
-    const raw = readFileSync2(CONFIG_PATH, "utf-8");
-    return { ...DEFAULT_CONFIG, ...JSON.parse(raw) };
-  } catch {
-    logger.warn(MESSAGES.CONFIG_CORRUPTED);
-    writeDefaultConfig();
-    return { ...DEFAULT_CONFIG };
-  }
-}
-function writeConfig(config2) {
-  writeFileSync2(CONFIG_PATH, JSON.stringify(config2, null, 2), "utf-8");
-}
-function writeDefaultConfig() {
-  writeConfig(DEFAULT_CONFIG);
-}
-function saveConfig(config2) {
-  writeFileSync2(CONFIG_PATH, JSON.stringify(config2, null, 2), "utf-8");
-}
-function getConfigValue(key) {
-  const config2 = loadConfig();
-  return config2[key];
-}
-function ensureClawtDirs() {
-  ensureDir(CLAWT_HOME);
-  ensureDir(LOGS_DIR);
-  ensureDir(WORKTREES_DIR);
-  ensureDir(PROJECTS_CONFIG_DIR);
-}
-function parseConcurrency(optionValue, configValue) {
-  if (optionValue === void 0) {
-    return configValue;
-  }
-  const parsed = parseInt(optionValue, 10);
-  if (Number.isNaN(parsed) || parsed < 0) {
-    throw new ClawtError(MESSAGES.CONCURRENCY_INVALID);
-  }
-  return parsed;
-}
-
 // src/utils/prompt.ts
 import Enquirer2 from "enquirer";
 async function promptCommitMessage(promptMessage, nonInteractiveErrorMessage) {
@@ -2200,7 +2296,7 @@ function hasClaudeSessionHistory(worktreePath) {
   return entries.some((entry) => entry.endsWith(".jsonl"));
 }
 function launchInteractiveClaude(worktree, options = {}) {
-  const commandStr = getConfigValue("claudeCodeCommand");
+  const commandStr = resolveClaudeCodeCommand();
   const parts = commandStr.split(/\s+/).filter(Boolean);
   const cmd = parts[0];
   const args = [
@@ -2235,7 +2331,7 @@ function escapeShellSingleQuote(str) {
   return str.replace(/'/g, "'\\''");
 }
 function buildClaudeCommand(worktree, hasPreviousSession) {
-  const commandStr = getConfigValue("claudeCodeCommand");
+  const commandStr = resolveClaudeCodeCommand();
   const systemPrompt = APPEND_SYSTEM_PROMPT;
   const escapedPath = escapeShellSingleQuote(worktree.path);
   const escapedPrompt = escapeShellSingleQuote(systemPrompt);
@@ -3562,56 +3658,6 @@ async function checkForUpdates(currentVersion) {
   }
 }
 
-// src/utils/json.ts
-function primitiveToString(value) {
-  if (value === void 0) {
-    return "undefined";
-  }
-  if (value === null) {
-    return "null";
-  }
-  if (typeof value === "symbol") {
-    return value.toString();
-  }
-  if (typeof value === "function") {
-    return `[Function: ${value.name || "anonymous"}]`;
-  }
-  return String(value);
-}
-function safeStringify(value, indent = 2) {
-  if (value === null || typeof value !== "object") {
-    return primitiveToString(value);
-  }
-  try {
-    const seen = /* @__PURE__ */ new WeakSet();
-    return JSON.stringify(
-      value,
-      (_key, val) => {
-        if (typeof val === "bigint") {
-          return val.toString();
-        }
-        if (typeof val === "undefined" || typeof val === "function" || typeof val === "symbol") {
-          return primitiveToString(val);
-        }
-        if (typeof val === "object" && val !== null) {
-          if (seen.has(val)) {
-            return "[Circular]";
-          }
-          seen.add(val);
-        }
-        return val;
-      },
-      indent
-    );
-  } catch {
-    try {
-      return JSON.stringify(String(value), null, indent);
-    } catch {
-      return "[Unserializable]";
-    }
-  }
-}
-
 // src/utils/validate-runner.ts
 function handleErrorClipboard(clipboardContent) {
   const success = copyToClipboard(clipboardContent);
@@ -3795,7 +3841,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 +3852,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 +4048,11 @@ var PanelStateManager = class {
   displayOrder = [];
   /** 滚动偏移（基于行数） */
   scrollOffset = 0;
+  /** 缓存的面板行列表，在 updateData 和导航时更新 */
+  cachedPanelLines = [];
   /**
    * 更新状态数据
+   * 一次性计算 displayOrder 和 cachedPanelLines，后续 adjustScrollForSelection 和 render 复用缓存
    * @param {StatusResult} newStatus - 新的状态数据
    * @param {string} [previousBranch] - 刷新前选中的分支名
    */
@@ -4022,6 +4071,7 @@ var PanelStateManager = class {
     } else {
       this.selectedDisplayIndex = 0;
     }
+    this.rebuildCachedPanelLines();
   }
   /** 获取当前状态数据 */
   getStatusResult() {
@@ -4035,6 +4085,13 @@ var PanelStateManager = class {
   getScrollOffset() {
     return this.scrollOffset;
   }
+  /**
+   * 获取缓存的面板行列表
+   * @returns {PanelLine[]} 缓存的面板行列表
+   */
+  getCachedPanelLines() {
+    return this.cachedPanelLines;
+  }
   /**
    * 向上导航
    * @returns {boolean} 是否发生变化
@@ -4043,6 +4100,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 +4114,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 +4131,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 +4162,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 +4198,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 +4221,7 @@ var InteractivePanel = class {
     this.resizeHandler = null;
     this.exitHandler = null;
     this.isOperating = false;
+    this.isRefreshing = false;
     this.resolveStart = null;
     this.collectStatusFn = collectStatusFn;
   }
@@ -4153,14 +4230,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 +4367,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 +4386,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 +4417,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 +4427,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 +4463,7 @@ var InteractivePanel = class {
     this.initTerminal();
     this.keyboardController.start();
     this.isOperating = false;
-    this.refreshData();
+    await this.refreshData();
     this.startAutoRefresh();
     this.render();
   }
@@ -5507,7 +5607,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 +5615,7 @@ async function handleStatus(options) {
   }
   printStatusAsText(statusResult);
 }
-function collectStatus() {
+async function collectStatus() {
   const projectName = getProjectName();
   const currentBranch = getCurrentBranch();
   const isClean = isWorkingDirClean();
@@ -5533,7 +5633,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 +5644,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);
@@ -6189,7 +6303,8 @@ async function handleInitShow(options) {
     PROJECT_CONFIG_DEFINITIONS,
     { selectPrompt: MESSAGES.INIT_SELECT_PROMPT }
   );
-  const updatedConfig = { ...config2, [key]: newValue };
+  const mergedConfig = { ...config2, [key]: newValue };
+  const updatedConfig = normalizeProjectConfig(mergedConfig, key, newValue);
   saveProjectConfig(updatedConfig);
   printSuccess(MESSAGES.INIT_SET_SUCCESS(key, String(newValue)));
 }