clawt 3.9.6 → 3.9.8

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

@@ -1,10 +1,12 @@
 import { existsSync, readFileSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
-import { PROJECTS_CONFIG_DIR, MESSAGES } from '../constants/index.js';
+import { PROJECTS_CONFIG_DIR, MESSAGES, PROJECT_CONFIG_DEFINITIONS } from '../constants/index.js';
 import { ClawtError } from '../errors/index.js';
 import { logger } from '../logger/index.js';
 import { getProjectName, checkBranchExists } from './git.js';
 import { ensureDir } from './fs.js';
+import { getConfigValue } from './config.js';
+import { safeStringify } from './json.js';
 import type { ProjectConfig } from '../types/index.js';
 
 /**
@@ -47,7 +49,7 @@ export function saveProjectConfig(config: ProjectConfig): void {
   // 确保项目子目录存在
   const projectDir = join(PROJECTS_CONFIG_DIR, projectName);
   ensureDir(projectDir);
-  writeFileSync(configPath, JSON.stringify(config, null, 2), 'utf-8');
+  writeFileSync(configPath, safeStringify({ ...config }, 2), 'utf-8');
   logger.info(`项目配置已保存: ${configPath}`);
 }
 
@@ -99,3 +101,36 @@ export function getValidateRunCommand(): string | undefined {
   const config = loadProjectConfig();
   return config?.validateRunCommand || undefined;
 }
+
+/**
+ * 解析当前项目生效的 Claude Code 启动指令
+ * 优先级：项目级配置 > 全局配置
+ * @returns {string} 生效的 Claude Code 启动指令
+ */
+export function resolveClaudeCodeCommand(): string {
+  const projectConfig = loadProjectConfig();
+  if (projectConfig?.claudeCodeCommand) {
+    return projectConfig.claudeCodeCommand;
+  }
+  return getConfigValue('claudeCodeCommand');
+}
+
+/**
+ * 归一化项目配置：可选字段的空字符串等同于未设置，从对象中删除该键
+ * 保持 JSON 文件整洁，避免出现 "field": "" 的冗余条目
+ * @param {ProjectConfig} config - 原始项目配置
+ * @param {string} key - 被修改的配置项键名
+ * @param {unknown} value - 被修改的配置项新值
+ * @returns {ProjectConfig} 归一化后的项目配置
+ */
+export function normalizeProjectConfig(config: ProjectConfig, key: string, value: unknown): ProjectConfig {
+  if (value === '') {
+    const def = PROJECT_CONFIG_DEFINITIONS[key as keyof typeof PROJECT_CONFIG_DEFINITIONS];
+    if (def?.defaultValue === undefined) {
+      const normalized = { ...config };
+      delete (normalized as unknown as Record<string, unknown>)[key];
+      return normalized;
+    }
+  }
+  return config;
+}

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/init.test.ts

@@ -34,6 +34,7 @@ vi.mock('../../../src/utils/index.js', () => ({
   interactiveConfigEditor: vi.fn(),
   guardMainWorkBranch: vi.fn().mockResolvedValue(undefined),
   guardMainWorkBranchExists: vi.fn(),
+  normalizeProjectConfig: vi.fn((config: unknown) => config),
 }));
 
 import { registerInitCommand } from '../../../src/commands/init.js';

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(() => {});
 

package/tests/unit/utils/project-config.test.ts

@@ -42,6 +42,16 @@ vi.mock('../../../src/utils/fs.js', () => ({
   ensureDir: vi.fn(),
 }));
 
+// mock config
+vi.mock('../../../src/utils/config.js', () => ({
+  getConfigValue: vi.fn().mockReturnValue('claude'),
+}));
+
+// mock json
+vi.mock('../../../src/utils/json.js', () => ({
+  safeStringify: (value: unknown, indent: number = 2) => JSON.stringify(value, null, indent),
+}));
+
 import { existsSync, readFileSync, writeFileSync } from 'node:fs';
 import {
   getProjectConfigPath,
@@ -50,7 +60,9 @@ import {
   requireProjectConfig,
   getMainWorkBranch,
   getValidateRunCommand,
+  resolveClaudeCodeCommand,
 } from '../../../src/utils/project-config.js';
+import { getConfigValue } from '../../../src/utils/config.js';
 
 const mockedExistsSync = vi.mocked(existsSync);
 const mockedReadFileSync = vi.mocked(readFileSync);
@@ -166,3 +178,41 @@ describe('getValidateRunCommand', () => {
     expect(getValidateRunCommand()).toBeUndefined();
   });
 });
+
+describe('resolveClaudeCodeCommand', () => {
+  const mockedGetConfigValue = vi.mocked(getConfigValue);
+
+  beforeEach(() => {
+    mockedGetConfigValue.mockReset();
+    mockedGetConfigValue.mockReturnValue('claude');
+  });
+
+  it('项目配置中有 claudeCodeCommand 时返回项目级值', () => {
+    mockedExistsSync.mockReturnValue(true);
+    mockedReadFileSync.mockReturnValue(JSON.stringify({
+      clawtMainWorkBranch: 'main',
+      claudeCodeCommand: 'claude --model opus',
+    }));
+    expect(resolveClaudeCodeCommand()).toBe('claude --model opus');
+  });
+
+  it('项目配置中无 claudeCodeCommand 时回退到全局配置', () => {
+    mockedExistsSync.mockReturnValue(true);
+    mockedReadFileSync.mockReturnValue(JSON.stringify({ clawtMainWorkBranch: 'main' }));
+    expect(resolveClaudeCodeCommand()).toBe('claude');
+  });
+
+  it('项目配置中 claudeCodeCommand 为空字符串时回退到全局配置', () => {
+    mockedExistsSync.mockReturnValue(true);
+    mockedReadFileSync.mockReturnValue(JSON.stringify({
+      clawtMainWorkBranch: 'main',
+      claudeCodeCommand: '',
+    }));
+    expect(resolveClaudeCodeCommand()).toBe('claude');
+  });
+
+  it('项目配置文件不存在时回退到全局配置', () => {
+    mockedExistsSync.mockReturnValue(false);
+    expect(resolveClaudeCodeCommand()).toBe('claude');
+  });
+});