clawt 3.9.6 → 3.9.8

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
@@ -722,6 +724,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) {

package/docs/config-file.md

@@ -35,7 +35,7 @@
 | 配置项             | 类型      | 默认值    | 说明                                               |
 | ------------------ | --------- | --------- | -------------------------------------------------- |
 | `autoDeleteBranch` | `boolean` | `false`   | 移除 worktree 时是否自动删除对应本地分支（无需每次确认）；merge 成功后是否自动清理 worktree 和分支；run 任务被中断（Ctrl+C）后是否自动清理本次创建的 worktree 和分支 |
-| `claudeCodeCommand` | `string` | `"claude"` | Claude Code CLI 启动指令，用于 `clawt run` 不传 `--tasks` 时和 `clawt resume` 在 worktree 中打开交互式界面 |
+| `claudeCodeCommand` | `string` | `"claude"` | Claude Code CLI 启动指令，用于 `clawt run` 不传 `--tasks` 时和 `clawt resume` 在 worktree 中打开交互式界面。可被项目级配置 `claudeCodeCommand` 覆盖（优先级：项目级 > 全局级，详见 [project-config.md](./project-config.md)） |
 | `autoPullPush` | `boolean` | `false` | merge 成功后是否自动执行 git pull 和 git push |
 | `confirmDestructiveOps` | `boolean` | `true` | 执行破坏性操作（reset、validate --clean）前是否提示确认 |
 | `maxConcurrency` | `number` | `0` | run 命令默认最大并发数，`0` 表示不限制 |

package/docs/init.md

@@ -26,7 +26,7 @@ clawt init show --json
 
 **功能说明：**
 
-初始化项目级配置，将指定分支记录为该项目的主工作分支（`clawtMainWorkBranch`）。该配置用于 `create` / `run` 时检测当前分支是否为主工作分支，并在偏离时提醒用户。`init show` 子命令提供交互式面板，可查看和修改所有项目配置项（如 `validateRunCommand`、`postCreate`）。项目级配置的完整说明见 [project-config.md](./project-config.md)。
+初始化项目级配置，将指定分支记录为该项目的主工作分支（`clawtMainWorkBranch`）。该配置用于 `create` / `run` 时检测当前分支是否为主工作分支，并在偏离时提醒用户。`init show` 子命令提供交互式面板，可查看和修改所有项目配置项（如 `validateRunCommand`、`postCreate`、`claudeCodeCommand`）。项目级配置的完整说明见 [project-config.md](./project-config.md)。
 
 **运行流程（设置模式）：**
 
@@ -53,7 +53,7 @@ clawt init show --json
 3. **交互式配置编辑**：调用 `interactiveConfigEditor`（`src/utils/config-strategy.ts`），基于 `PROJECT_CONFIG_DEFINITIONS` 构建配置项列表（详见 [project-config.md](./project-config.md)）
    - 列出所有项目配置项，显示名称、当前值和描述
    - 用户选择配置项后，根据值类型自动选择输入方式（与全局配置的交互式编辑逻辑一致）
-4. **持久化修改**：将修改后的值合并到当前配置并写入配置文件
+4. **持久化修改**：将修改后的值合并到当前配置，经 `normalizeProjectConfig` 归一化处理后写入配置文件（可选字段的空字符串会被移除，等同于未设置）
 5. **输出成功提示**：`✓ 项目配置 <key> 已设置为 <value>`
 
 **输出格式：**
@@ -85,5 +85,6 @@ clawt init show --json
 - `init show` 子命令从 JSON 展示改为交互式面板，调用 `interactiveConfigEditor`（`src/utils/config-strategy.ts`）实现通用交互式配置编辑
 - 配置项定义来自 `PROJECT_CONFIG_DEFINITIONS`（`src/constants/project-config.ts`），详见 [项目级配置文档](./project-config.md)
 - 消息常量：`MESSAGES.INIT_SELECT_PROMPT`（选择配置项提示语）、`MESSAGES.INIT_SET_SUCCESS`（修改成功提示），定义在 `src/constants/messages/init.ts`
+- `handleInitShow` 使用 `normalizeProjectConfig` 对修改后的配置进行归一化处理：可选字段（如 `validateRunCommand`、`postCreate`、`claudeCodeCommand`）设为空字符串时自动移除该键，避免 JSON 文件中出现冗余的 `"field": ""` 条目
 
 ---

package/docs/project-config.md

@@ -18,7 +18,8 @@
 {
   "clawtMainWorkBranch": "main",
   "validateRunCommand": "npm test",
-  "postCreate": "npm install"
+  "postCreate": "npm install",
+  "claudeCodeCommand": "claude --model opus"
 }
 ```
 
@@ -27,6 +28,7 @@
 | `clawtMainWorkBranch` | `string` | 是 | `""` | 项目的主工作分支名，用于 create 时检测当前分支是否为主分支，以及 sync、merge 等命令获取主分支名 |
 | `validateRunCommand` | `string` | 否 | `undefined` | validate 成功后自动执行的命令（作为 `-r` 选项的默认值）。不传 `-r` 时，validate 命令会自动从此项读取 |
 | `postCreate` | `string` | 否 | `undefined` | worktree 创建后自动执行的初始化命令（如安装依赖、生成配置文件、编译资源等）。详见 [post-create-hook.md](./post-create-hook.md) |
+| `claudeCodeCommand` | `string` | 否 | `undefined` | Claude Code CLI 启动指令，项目级覆盖全局配置。未设置时回退到全局配置 `claudeCodeCommand`（详见 [config-file.md](./config-file.md)）。优先级：项目级 > 全局级 |
 
 #### 配置项定义数据源
 
@@ -48,6 +50,10 @@ export const PROJECT_CONFIG_DEFINITIONS: ProjectConfigDefinitions = {
     defaultValue: undefined as unknown as string | undefined,
     description: 'worktree 创建后自动执行的命令，用于安装依赖等初始化操作',
   },
+  claudeCodeCommand: {
+    defaultValue: undefined as unknown as string | undefined,
+    description: 'Claude Code CLI 启动指令（未设置时回退到全局配置）',
+  },
 };
 
 /** 项目默认配置（从 PROJECT_CONFIG_DEFINITIONS 自动派生） */
@@ -63,7 +69,7 @@ export const PROJECT_CONFIG_DESCRIPTIONS: Record<keyof Required<ProjectConfig>,
 
 | 类型 | 说明 |
 | --- | --- |
-| `ProjectConfig` | 项目级配置接口，包含 `clawtMainWorkBranch`（必填）、`validateRunCommand`（可选）和 `postCreate`（可选） |
+| `ProjectConfig` | 项目级配置接口，包含 `clawtMainWorkBranch`（必填）、`validateRunCommand`（可选）、`postCreate`（可选）和 `claudeCodeCommand`（可选） |
 | `ProjectConfigItemDefinition<T>` | 单个配置项定义，含 `defaultValue`（默认值）、`description`（描述）、可选 `allowedValues`（枚举值列表，仅对 string 类型有效） |
 | `ProjectConfigDefinitions` | 所有配置项的完整定义映射，键为 `ProjectConfig` 的所有属性名，值为对应的 `ProjectConfigItemDefinition` |
 
@@ -74,6 +80,7 @@ export interface ProjectConfig {
   clawtMainWorkBranch: string;
   validateRunCommand?: string;
   postCreate?: string;
+  claudeCodeCommand?: string;
 }
 
 export interface ProjectConfigItemDefinition<T> {
@@ -99,6 +106,8 @@ export type ProjectConfigDefinitions = {
 | `requireProjectConfig` | `() => ProjectConfig` | 获取当前项目配置，不存在或缺少 `clawtMainWorkBranch` 时抛出 `ClawtError` |
 | `getMainWorkBranch` | `() => string` | 从项目配置中获取主工作分支名（内部调用 `requireProjectConfig`） |
 | `getValidateRunCommand` | `() => string \| undefined` | 从项目配置中获取 validate 自动执行命令，未配置时返回 `undefined` |
+| `resolveClaudeCodeCommand` | `() => string` | 解析当前项目生效的 Claude Code 启动指令，优先级：项目级配置 > 全局配置 |
+| `normalizeProjectConfig` | `(config: ProjectConfig, key: string, value: unknown) => ProjectConfig` | 归一化项目配置：可选字段的空字符串等同于未设置，从对象中删除该键以保持 JSON 文件整洁 |
 
 #### 设置方式
 

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.6",
+  "version": "3.9.8",
   "description": "本地并行执行多个Claude Code Agent任务，融合 Git Worktree 与 Claude Code CLI 的命令行工具",
   "type": "module",
   "main": "dist/index.js",

package/src/commands/init.ts

@@ -13,6 +13,7 @@ import {
   printSuccess,
   interactiveConfigEditor,
   safeStringify,
+  normalizeProjectConfig,
 } from '../utils/index.js';
 
 /**
@@ -62,7 +63,8 @@ async function handleInitShow(options: InitShowOptions): Promise<void> {
   );
 
   // 合并修改后的值并持久化
-  const updatedConfig: ProjectConfig = { ...config, [key]: newValue };
+  const mergedConfig: ProjectConfig = { ...config, [key]: newValue };
+  const updatedConfig = normalizeProjectConfig(mergedConfig, key as string, newValue);
   saveProjectConfig(updatedConfig);
 
   printSuccess(MESSAGES.INIT_SET_SUCCESS(key as string, String(newValue)));

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/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/project-config.ts

@@ -17,6 +17,10 @@ export const PROJECT_CONFIG_DEFINITIONS: ProjectConfigDefinitions = {
     defaultValue: undefined as unknown as string | undefined,
     description: 'worktree 创建后自动执行的命令，用于安装依赖等初始化操作',
   },
+  claudeCodeCommand: {
+    defaultValue: undefined as unknown as string | undefined,
+    description: 'Claude Code CLI 启动指令（未设置时回退到全局配置）',
+  },
 };
 
 /**

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/types/projectConfig.ts

@@ -6,6 +6,8 @@ export interface ProjectConfig {
   validateRunCommand?: string;
   /** worktree 创建后自动执行的命令，用于安装依赖等初始化操作 */
   postCreate?: string;
+  /** Claude Code CLI 启动指令（项目级覆盖全局配置，未设置时回退到全局配置） */
+  claudeCodeCommand?: string;
 }
 
 /** 单个项目配置项的完整定义（默认值 + 描述） */

package/src/utils/claude.ts

@@ -3,7 +3,7 @@ import { existsSync, readdirSync } from 'node:fs';
 import { join } from 'node:path';
 import { ClawtError } from '../errors/index.js';
 import { APPEND_SYSTEM_PROMPT, CLAUDE_PROJECTS_DIR } from '../constants/index.js';
-import { getConfigValue } from './config.js';
+import { resolveClaudeCodeCommand } from './project-config.js';
 import { printInfo, printWarning } from './formatter.js';
 import { openCommandInNewTerminalTab } from './terminal.js';
 import type { WorktreeInfo } from '../types/index.js';
@@ -51,7 +51,7 @@ interface LaunchClaudeOptions {
 }
 
 export function launchInteractiveClaude(worktree: WorktreeInfo, options: LaunchClaudeOptions = {}): void {
-  const commandStr = getConfigValue('claudeCodeCommand');
+  const commandStr = resolveClaudeCodeCommand();
   const parts = commandStr.split(/\s+/).filter(Boolean);
   const cmd = parts[0];
   const args = [
@@ -107,7 +107,7 @@ function escapeShellSingleQuote(str: string): string {
  * @returns {string} 完整的 shell 命令字符串
  */
 export function buildClaudeCommand(worktree: WorktreeInfo, hasPreviousSession: boolean): string {
-  const commandStr = getConfigValue('claudeCodeCommand');
+  const commandStr = resolveClaudeCodeCommand();
   const systemPrompt = APPEND_SYSTEM_PROMPT;
 
   const escapedPath = escapeShellSingleQuote(worktree.path);

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,
@@ -82,7 +86,7 @@ export { truncateTaskDesc, printDryRunPreview } from './dry-run.js';
 export { applyAliases } from './alias.js';
 export { isValidConfigKey, getValidConfigKeys, parseConfigValue, promptConfigValue, formatConfigValue, interactiveConfigEditor } from './config-strategy.js';
 export { checkForUpdates } from './update-checker.js';
-export { getProjectConfigPath, loadProjectConfig, saveProjectConfig, requireProjectConfig, getMainWorkBranch, guardMainWorkBranchExists, getValidateRunCommand } from './project-config.js';
+export { getProjectConfigPath, loadProjectConfig, saveProjectConfig, requireProjectConfig, getMainWorkBranch, guardMainWorkBranchExists, getValidateRunCommand, resolveClaudeCodeCommand, normalizeProjectConfig } from './project-config.js';
 export { getValidateBranchName, createValidateBranch, deleteValidateBranch, rebuildValidateBranch, ensureOnMainWorkBranch, handleDirtyWorkingDir } from './validate-branch.js';
 export { safeStringify } from './json.js';
 export { isNonInteractive, setNonInteractive } from './interactive.js';

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;