clawt 3.9.12 → 3.9.13

package/dist/index.js

@@ -4495,6 +4495,7 @@ var InteractivePanel = class {
     this.initTerminal();
     this.keyboardController.start();
     this.isOperating = false;
+    this.render();
     await this.refreshData();
     this.startAutoRefresh();
     this.render();

package/docs/status.md

@@ -280,7 +280,7 @@ Worktree 按创建日期分组（复用 `groupWorktreesByDate()`），每组前
 3. 以继承 stdio 的方式执行对应的 clawt 子命令（如 `clawt validate -b <branch>`）。其中 `c`（cover）命令不需要指定分支，直接执行 `clawt cover`
 4. 命令完成后，输出 `按 Enter 返回面板...` 提示
 5. 等待用户按 Enter 键
-6. 重新进入备选屏幕，刷新数据，恢复面板
+6. 重新进入备选屏幕，立即用旧数据渲染一帧（消除白屏等待），再异步刷新数据，恢复面板
 
 执行操作期间设置操作锁（`isOperating`），阻止其他按键响应。
 
@@ -303,6 +303,7 @@ Worktree 按创建日期分组（复用 `groupWorktreesByDate()`），每组前
 - 使用同步输出序列（`SYNC_OUTPUT_START` / `SYNC_OUTPUT_END`）防止闪烁
 - 隐藏光标、禁用行换行，确保渲染效果整洁
 - 注册 `exit` 事件兜底处理器，确保异常退出时终端状态被恢复
+- 操作返回面板时，先立即用旧数据渲染一帧（消除备选屏幕进入后的白屏），再异步刷新数据并重新渲染
 - 每行通过 `truncateToTerminalWidth()` 截断以适配终端宽度
 
 **实现要点：**

package/package.json

@@ -1,12 +1,21 @@
 {
   "name": "clawt",
-  "version": "3.9.12",
+  "version": "3.9.13",
   "description": "本地并行执行多个Claude Code Agent任务，融合 Git Worktree 与 Claude Code CLI 的命令行工具",
   "type": "module",
   "main": "dist/index.js",
   "bin": {
     "clawt": "dist/index.js"
   },
+  "scripts": {
+    "build": "tsup",
+    "dev": "tsup --watch",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "test:coverage": "vitest run --coverage",
+    "postinstall": "node dist/postinstall.js",
+    "release": "bash scripts/release.sh"
+  },
   "keywords": [
     "claude",
     "worktree",
@@ -30,16 +39,8 @@
     "typescript": "^5.7.3",
     "vitest": "^4.0.18"
   },
+  "packageManager": "pnpm@10.14.0",
   "engines": {
     "node": ">=18"
-  },
-  "scripts": {
-    "build": "tsup",
-    "dev": "tsup --watch",
-    "test": "vitest run",
-    "test:watch": "vitest",
-    "test:coverage": "vitest run --coverage",
-    "postinstall": "node dist/postinstall.js",
-    "release": "bash scripts/release.sh"
   }
-}
+}

package/scripts/release.sh

@@ -202,9 +202,9 @@ print_success "tag 已创建: ${TAG}"
 # ────────────────────────────────────────
 
 print_step "发布到 npm..."
-# 临时关闭 set -e，手动捕获 pnpm publish 的退出码
+# 临时关闭 set -e，手动捕获 npm publish 的退出码
 set +e
-NPM_OUTPUT=$(pnpm publish --access public --registry https://registry.npmjs.org/ --no-git-checks 2>&1)
+NPM_OUTPUT=$(npm publish --access public --registry https://registry.npmjs.org/ 2>&1)
 NPM_EXIT_CODE=$?
 set -e
 

package/src/utils/interactive-panel.ts

@@ -425,11 +425,13 @@ export class InteractivePanel {
 
     this.isOperating = false;
 
+    // 立即用旧数据渲染一帧，消除备选屏幕进入后的白屏
+    this.render();
+
     // 异步刷新数据并重新启动自动刷新
     await this.refreshData();
     this.startAutoRefresh();
 
-    // 渲染
     this.render();
   }
 

package/tests/unit/utils/interactive-panel.test.ts

@@ -0,0 +1,191 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+
+// mock 所有依赖，避免真实 git 命令执行
+vi.mock('../../../src/constants/index.js', () => ({
+  CURSOR_HIDE: '',
+  CURSOR_SHOW: '',
+  LINE_WRAP_DISABLE: '',
+  LINE_WRAP_ENABLE: '',
+  SYNC_OUTPUT_START: '',
+  SYNC_OUTPUT_END: '',
+  ALT_SCREEN_ENTER: '',
+  ALT_SCREEN_LEAVE: '',
+  CLEAR_SCREEN: '',
+  CURSOR_HOME: '',
+  DEFAULT_TERMINAL_COLUMNS: 80,
+  PANEL_REFRESH_INTERVAL_MS: 5000,
+  PANEL_COUNTDOWN_INTERVAL_MS: 1000,
+  KEY_ARROW_UP: '\x1b[A',
+  KEY_ARROW_DOWN: '\x1b[B',
+  KEY_CTRL_C: 3,
+  PANEL_SHORTCUT_KEYS: {
+    VALIDATE: 'v',
+    MERGE: 'm',
+    DELETE: 'd',
+    RESUME: 'r',
+    SYNC: 's',
+    COVER: 'c',
+    REFRESH: 'f',
+    QUIT: 'q',
+  },
+}));
+
+vi.mock('../../../src/constants/messages/index.js', () => ({
+  PANEL_NOT_TTY: 'not tty',
+  PANEL_PRESS_ENTER_TO_RETURN: 'press enter',
+}));
+
+vi.mock('../../../src/utils/shell.js', () => ({
+  runCommandInherited: vi.fn(),
+}));
+
+vi.mock('../../../src/utils/interactive-panel-render.js', () => ({
+  buildPanelFrame: vi.fn(() => ['line1', 'line2']),
+  renderFooter: vi.fn(() => 'footer'),
+}));
+
+vi.mock('../../../src/utils/progress-render.js', () => ({
+  truncateToTerminalWidth: vi.fn((s: string) => s),
+}));
+
+vi.mock('../../../src/utils/keyboard-controller.js', () => ({
+  KeyboardController: vi.fn(function () {
+    return {
+      start: vi.fn(),
+      stop: vi.fn(),
+    };
+  }),
+}));
+
+vi.mock('../../../src/utils/interactive-panel-state.js', () => ({
+  PanelStateManager: vi.fn(function () {
+    return {
+      updateData: vi.fn(),
+      getStatusResult: vi.fn(() => ({ main: {}, worktrees: [], snapshots: {}, totalWorktrees: 0 })),
+      getSelectedOriginalIndex: vi.fn(() => 0),
+      getSelectedBranch: vi.fn(() => 'feat-test'),
+      getScrollOffset: vi.fn(() => 0),
+      getCachedPanelLines: vi.fn(() => []),
+      adjustScrollForSelection: vi.fn(),
+      navigateUp: vi.fn(() => false),
+      navigateDown: vi.fn(() => false),
+    };
+  }),
+}));
+
+vi.mock('../../../src/logger/index.js', () => ({
+  logger: { debug: vi.fn(), info: vi.fn(), warn: vi.fn(), error: vi.fn() },
+}));
+
+import { InteractivePanel } from '../../../src/utils/interactive-panel.js';
+import type { StatusResult } from '../../../src/types/index.js';
+
+/**
+ * 构造最小可用的 StatusResult mock
+ */
+function makeStatusResult(): StatusResult {
+  return {
+    main: {
+      branch: 'main',
+      isClean: true,
+      projectName: 'test-project',
+      configuredMainBranch: 'main',
+      configuredBranchExists: true,
+      insertions: 0,
+      deletions: 0,
+    },
+    worktrees: [],
+    snapshots: { total: 0, orphaned: 0 },
+    totalWorktrees: 0,
+  };
+}
+
+describe('InteractivePanel.executeOperation()', () => {
+  let panel: InteractivePanel;
+  let collectStatusMock: ReturnType<typeof vi.fn>;
+  let renderSpy: ReturnType<typeof vi.spyOn>;
+  let refreshDataSpy: ReturnType<typeof vi.spyOn>;
+
+  beforeEach(() => {
+    // 模拟 TTY 环境
+    Object.defineProperty(process.stdout, 'isTTY', { value: true, configurable: true });
+    Object.defineProperty(process.stdout, 'columns', { value: 80, configurable: true });
+    Object.defineProperty(process.stdout, 'rows', { value: 24, configurable: true });
+    vi.spyOn(process.stdout, 'write').mockImplementation(() => true);
+
+    collectStatusMock = vi.fn().mockResolvedValue(makeStatusResult());
+    panel = new InteractivePanel(collectStatusMock);
+
+    // 监视 render 和 refreshData，记录调用顺序
+    renderSpy = vi.spyOn(panel as any, 'render');
+    refreshDataSpy = vi.spyOn(panel as any, 'refreshData').mockResolvedValue(undefined);
+  });
+
+  it('应在 refreshData 之前调用一次 render（立即渲染旧数据消除白屏）', async () => {
+    const callOrder: string[] = [];
+    renderSpy.mockImplementation(() => { callOrder.push('render'); });
+    refreshDataSpy.mockImplementation(async () => { callOrder.push('refreshData'); });
+
+    // 直接调用私有方法 executeOperation
+    const action = vi.fn();
+    // 绕过 waitForEnter，直接 resolve
+    vi.spyOn(panel as any, 'waitForEnter').mockResolvedValue(undefined);
+    vi.spyOn(panel as any, 'initTerminal').mockImplementation(() => {});
+    vi.spyOn(panel as any, 'restoreTerminal').mockImplementation(() => {});
+    vi.spyOn(panel as any, 'removeTerminalListeners').mockImplementation(() => {});
+    vi.spyOn(panel as any, 'startAutoRefresh').mockImplementation(() => {});
+    vi.spyOn(panel as any, 'clearTimers').mockImplementation(() => {});
+
+    // stateManager.getStatusResult() 需要返回非 null 才能让 render 不被 guard 拦截
+    // executeOperation 顶部也检查 statusResult 非 null
+    await (panel as any).executeOperation(action);
+
+    // render 必须在 refreshData 之前被调用至少一次
+    const firstRenderIdx = callOrder.indexOf('render');
+    const refreshDataIdx = callOrder.indexOf('refreshData');
+    expect(firstRenderIdx).toBeGreaterThanOrEqual(0);
+    expect(refreshDataIdx).toBeGreaterThanOrEqual(0);
+    expect(firstRenderIdx).toBeLessThan(refreshDataIdx);
+  });
+
+  it('应在 refreshData 之后再调用一次 render（刷新为最新数据）', async () => {
+    const callOrder: string[] = [];
+    renderSpy.mockImplementation(() => { callOrder.push('render'); });
+    refreshDataSpy.mockImplementation(async () => { callOrder.push('refreshData'); });
+
+    vi.spyOn(panel as any, 'waitForEnter').mockResolvedValue(undefined);
+    vi.spyOn(panel as any, 'initTerminal').mockImplementation(() => {});
+    vi.spyOn(panel as any, 'restoreTerminal').mockImplementation(() => {});
+    vi.spyOn(panel as any, 'removeTerminalListeners').mockImplementation(() => {});
+    vi.spyOn(panel as any, 'startAutoRefresh').mockImplementation(() => {});
+    vi.spyOn(panel as any, 'clearTimers').mockImplementation(() => {});
+
+    await (panel as any).executeOperation(vi.fn());
+
+    // refreshData 之后必须还有一次 render
+    const refreshDataIdx = callOrder.lastIndexOf('refreshData');
+    const lastRenderIdx = callOrder.lastIndexOf('render');
+    expect(lastRenderIdx).toBeGreaterThan(refreshDataIdx);
+  });
+
+  it('isOperating 应在 render 之前被设为 false', async () => {
+    const isOperatingAtRender: boolean[] = [];
+
+    renderSpy.mockImplementation(() => {
+      isOperatingAtRender.push((panel as any).isOperating);
+    });
+    refreshDataSpy.mockResolvedValue(undefined);
+
+    vi.spyOn(panel as any, 'waitForEnter').mockResolvedValue(undefined);
+    vi.spyOn(panel as any, 'initTerminal').mockImplementation(() => {});
+    vi.spyOn(panel as any, 'restoreTerminal').mockImplementation(() => {});
+    vi.spyOn(panel as any, 'removeTerminalListeners').mockImplementation(() => {});
+    vi.spyOn(panel as any, 'startAutoRefresh').mockImplementation(() => {});
+    vi.spyOn(panel as any, 'clearTimers').mockImplementation(() => {});
+
+    await (panel as any).executeOperation(vi.fn());
+
+    // 第一次 render 调用时 isOperating 必须为 false
+    expect(isOperatingAtRender[0]).toBe(false);
+  });
+});