clawt 3.10.5 → 3.10.6

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

@@ -110,7 +110,7 @@ describe('registerSyncCommand', () => {
 
 describe('handleSync', () => {
   it('目标 worktree 干净时直接合并', async () => {
-    const worktree = { path: '/path/feature', branch: 'feature' };
+    const worktree = { path: '/path/feature', branch: 'feature', baseBranch: null };
     mockedGetProjectWorktrees.mockReturnValue([worktree]);
     mockedResolveTargetWorktree.mockResolvedValue(worktree);
     mockedIsWorkingDirClean.mockReturnValue(true);
@@ -126,7 +126,7 @@ describe('handleSync', () => {
   });
 
   it('目标 worktree 有未提交变更时自动保存后合并', async () => {
-    const worktree = { path: '/path/feature', branch: 'feature' };
+    const worktree = { path: '/path/feature', branch: 'feature', baseBranch: null };
     mockedGetProjectWorktrees.mockReturnValue([worktree]);
     mockedResolveTargetWorktree.mockResolvedValue(worktree);
     mockedIsWorkingDirClean.mockReturnValue(false);
@@ -145,7 +145,7 @@ describe('handleSync', () => {
   });
 
   it('合并冲突时输出警告并返回', async () => {
-    const worktree = { path: '/path/feature', branch: 'feature' };
+    const worktree = { path: '/path/feature', branch: 'feature', baseBranch: null };
     mockedGetProjectWorktrees.mockReturnValue([worktree]);
     mockedResolveTargetWorktree.mockResolvedValue(worktree);
     mockedIsWorkingDirClean.mockReturnValue(true);
@@ -162,7 +162,7 @@ describe('handleSync', () => {
   });
 
   it('合并失败（非冲突错误）时向上抛出', async () => {
-    const worktree = { path: '/path/feature', branch: 'feature' };
+    const worktree = { path: '/path/feature', branch: 'feature', baseBranch: null };
     mockedGetProjectWorktrees.mockReturnValue([worktree]);
     mockedResolveTargetWorktree.mockResolvedValue(worktree);
     mockedIsWorkingDirClean.mockReturnValue(true);

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

@@ -155,7 +155,7 @@ const mockedSwitchToValidateBranch = vi.mocked(switchToValidateBranch);
 const mockedExecuteRunCommand = vi.mocked(executeRunCommand);
 const mockedGetValidateRunCommand = vi.mocked(getValidateRunCommand);
 
-const worktree = { path: '/path/feature', branch: 'feature' };
+const worktree = { path: '/path/feature', branch: 'feature', baseBranch: null };
 
 beforeEach(() => {
   mockedGetGitTopLevel.mockReturnValue('/repo');

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

@@ -0,0 +1,124 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+
+// mock 常量模块
+vi.mock('../../../src/constants/index.js', () => ({
+  SELECTED_INDICATOR: '▶',
+  UNSELECTED_INDICATOR: '  ',
+  PANEL_DATE_SEPARATOR_PREFIX: '─',
+  PANEL_SEPARATOR_MAX_WIDTH: 60,
+  PANEL_DATE_COLOR: '#FF8C00',
+  UNKNOWN_DATE_GROUP: 'UNKNOWN',
+  VALIDATE_BRANCH_PREFIX: 'clawt-validate-',
+  MESSAGES: {
+    STATUS_CHANGE_COMMITTED: '已提交',
+    STATUS_CHANGE_UNCOMMITTED: '未提交',
+    STATUS_CHANGE_CONFLICT: '冲突',
+    STATUS_CHANGE_CLEAN: '干净',
+    STATUS_CREATED_AT: (relativeTime: string) => `创建于 ${relativeTime}`,
+    STATUS_LAST_VALIDATED: (relativeTime: string) => `上次验证: ${relativeTime}`,
+    STATUS_NOT_VALIDATED: '✗ 未验证',
+  },
+}));
+
+// mock i18n 模块
+vi.mock('../../../src/utils/i18n.js', () => ({
+  getCurrentLanguage: vi.fn(() => 'zh'),
+}));
+
+// mock 消息常量
+vi.mock('../../../src/constants/messages/index.js', () => ({
+  PANEL_COMMITS_AHEAD: (count: number) => `${count} 个本地提交`,
+  PANEL_COMMITS_BEHIND: (count: number) => `落后主分支 ${count} 个提交`,
+  PANEL_SYNCED_WITH_MAIN: '与主分支同步',
+  PANEL_FOOTER_SHORTCUTS: 'footer shortcuts',
+  PANEL_FOOTER_COUNTDOWN: (s: number) => `${s}s`,
+  PANEL_OVERFLOW_DOWN_HINT: '↓ more',
+  PANEL_OVERFLOW_UP_HINT: '↑ more',
+  PANEL_SNAPSHOT_SUMMARY: (total: number, orphaned: number) => `快照 ${total}/${orphaned}`,
+  PANEL_NO_WORKTREES_MSG: 'no worktrees',
+  PANEL_TITLE: (name: string) => `Title: ${name}`,
+  PANEL_CONFIGURED_BRANCH: (branch: string) => `配置分支: ${branch}`,
+  PANEL_CONFIGURED_BRANCH_DELETED: (branch: string) => `配置分支已删除: ${branch}`,
+  PANEL_CONFIGURED_BRANCH_MISMATCH: (branch: string) => `配置分支不匹配: ${branch}`,
+  PANEL_NOT_INITIALIZED: '未初始化',
+  PANEL_UNKNOWN_DATE: '未知日期',
+}));
+
+// mock utils/index.js（仅 mock renderWorktreeBlock 用到的函数）
+vi.mock('../../../src/utils/index.js', () => ({
+  formatRelativeTime: vi.fn((iso: string) => iso ? '3 天前' : null),
+  groupWorktreesByDate: vi.fn(() => new Map()),
+  formatRelativeDate: vi.fn(() => '3 天前'),
+  formatBaseBranchLine: vi.fn((baseBranch: string | null | undefined) => `来源分支: ${baseBranch ?? '未记录'}`),
+}));
+
+import { renderWorktreeBlock } from '../../../src/utils/interactive-panel-render.js';
+import type { WorktreeDetailedStatus } from '../../../src/types/index.js';
+
+describe('renderWorktreeBlock', () => {
+  it('渲染包含来源分支行（baseBranch 有值）', () => {
+    const wt: WorktreeDetailedStatus = {
+      path: '/path/feature',
+      branch: 'feature',
+      baseBranch: 'test',
+      changeStatus: 'clean',
+      commitsAhead: 0,
+      commitsBehind: 0,
+      snapshotTime: null,
+      insertions: 0,
+      deletions: 0,
+      createdAt: null,
+    };
+
+    const lines = renderWorktreeBlock(wt, false);
+    const joined = lines.join('\n');
+    expect(joined).toContain('来源分支: test');
+  });
+
+  it('渲染包含来源分支行（baseBranch 为 null 时显示未记录）', () => {
+    const wt: WorktreeDetailedStatus = {
+      path: '/path/feature',
+      branch: 'feature',
+      baseBranch: null,
+      changeStatus: 'clean',
+      commitsAhead: 0,
+      commitsBehind: 0,
+      snapshotTime: null,
+      insertions: 0,
+      deletions: 0,
+      createdAt: null,
+    };
+
+    const lines = renderWorktreeBlock(wt, false);
+    const joined = lines.join('\n');
+    expect(joined).toContain('来源分支: 未记录');
+  });
+
+  it('来源分支行位于同步状态行之后、创建时间行之前', () => {
+    const wt: WorktreeDetailedStatus = {
+      path: '/path/feature',
+      branch: 'feature',
+      baseBranch: 'main',
+      changeStatus: 'clean',
+      commitsAhead: 0,
+      commitsBehind: 0,
+      snapshotTime: null,
+      insertions: 0,
+      deletions: 0,
+      createdAt: '2026-02-20T14:30:00+08:00',
+    };
+
+    const lines = renderWorktreeBlock(wt, false);
+    const joined = lines.join('\n');
+
+    // 来源分支在同步状态之后
+    const syncIdx = joined.indexOf('与主分支同步');
+    const baseBranchIdx = joined.indexOf('来源分支: main');
+    expect(syncIdx).toBeGreaterThanOrEqual(0);
+    expect(baseBranchIdx).toBeGreaterThan(syncIdx);
+
+    // 来源分支在创建时间之前
+    const createdAtIdx = joined.indexOf('创建于');
+    expect(createdAtIdx).toBeGreaterThan(baseBranchIdx);
+  });
+});

package/tests/unit/utils/worktree-matcher.test.ts

@@ -272,7 +272,7 @@ describe('groupWorktreesByDate', () => {
 
 describe('buildGroupedChoices', () => {
   it('构建的 choices 包含全局全选、分隔线、组全选和分支', () => {
-    const groups = new Map<string, Array<{ path: string; branch: string }>>([
+    const groups = new Map<string, Array<{ path: string; branch: string; baseBranch: string | null }>>([
       ['2026-02-26', [
         createWorktreeInfo({ branch: 'feature-auth' }),
         createWorktreeInfo({ branch: 'feature-login' }),
@@ -317,7 +317,7 @@ describe('buildGroupedChoices', () => {
 
 describe('buildGroupMembershipMap', () => {
   it('构建组全选 name 到分支 name 列表的正确映射', () => {
-    const groups = new Map<string, Array<{ path: string; branch: string }>>([
+    const groups = new Map<string, Array<{ path: string; branch: string; baseBranch: string | null }>>([
       ['2026-02-26', [
         createWorktreeInfo({ branch: 'feature-auth' }),
         createWorktreeInfo({ branch: 'feature-login' }),

package/tests/unit/utils/worktree-metadata.test.ts

@@ -0,0 +1,91 @@
+import { describe, expect, it, vi, beforeEach } from 'vitest';
+
+vi.mock('node:fs', () => ({
+  existsSync: vi.fn(),
+  mkdirSync: vi.fn(),
+  readFileSync: vi.fn(),
+  rmSync: vi.fn(),
+  writeFileSync: vi.fn(),
+}));
+
+vi.mock('../../../src/constants/index.js', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../../../src/constants/index.js')>();
+  return {
+    ...actual,
+    PROJECTS_CONFIG_DIR: '/tmp/clawt-projects',
+  };
+});
+
+import { existsSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import {
+  getWorktreeMetadataPath,
+  loadWorktreeMetadata,
+  removeWorktreeMetadata,
+  saveWorktreeMetadata,
+} from '../../../src/utils/worktree-metadata.js';
+
+beforeEach(() => {
+  vi.clearAllMocks();
+});
+
+describe('worktree metadata', () => {
+  it('生成项目 worktree 元数据路径', () => {
+    expect(getWorktreeMetadataPath('demo', 'feature')).toBe('/tmp/clawt-projects/demo/worktrees/feature.json');
+  });
+
+  it('保存并读取来源分支元数据', () => {
+    vi.mocked(existsSync).mockReturnValue(true);
+    vi.mocked(readFileSync).mockReturnValue(JSON.stringify({
+      branch: 'feature',
+      baseBranch: 'test',
+      createdAt: '2026-06-09T10:30:00.000Z',
+    }));
+
+    saveWorktreeMetadata('demo', {
+      branch: 'feature',
+      baseBranch: 'test',
+      createdAt: '2026-06-09T10:30:00.000Z',
+    });
+
+    expect(writeFileSync).toHaveBeenCalledWith(
+      '/tmp/clawt-projects/demo/worktrees/feature.json',
+      expect.stringContaining('"baseBranch": "test"'),
+      'utf-8',
+    );
+    expect(loadWorktreeMetadata('demo', 'feature')?.baseBranch).toBe('test');
+  });
+
+  it('元数据不存在时返回 null', () => {
+    vi.mocked(existsSync).mockReturnValue(false);
+    expect(loadWorktreeMetadata('demo', 'missing')).toBeNull();
+  });
+
+  it('removeWorktreeMetadata 正常删除文件', () => {
+    vi.mocked(existsSync).mockReturnValue(true);
+    removeWorktreeMetadata('demo', 'feature');
+    expect(rmSync).toHaveBeenCalledWith('/tmp/clawt-projects/demo/worktrees/feature.json');
+  });
+
+  it('removeWorktreeMetadata 文件不存在时不报错且不调用 rmSync', () => {
+    vi.mocked(existsSync).mockReturnValue(false);
+    // 不应抛出异常
+    expect(() => removeWorktreeMetadata('demo', 'missing')).not.toThrow();
+    expect(rmSync).not.toHaveBeenCalled();
+  });
+
+  it('loadWorktreeMetadata JSON 损坏时返回 null', () => {
+    vi.mocked(existsSync).mockReturnValue(true);
+    vi.mocked(readFileSync).mockReturnValue('{ invalid json !!!');
+    expect(loadWorktreeMetadata('demo', 'corrupt')).toBeNull();
+  });
+
+  it('loadWorktreeMetadata 元数据格式无效（缺少 baseBranch）时返回 null', () => {
+    vi.mocked(existsSync).mockReturnValue(true);
+    vi.mocked(readFileSync).mockReturnValue(JSON.stringify({
+      branch: 'feature',
+      // 缺少 baseBranch 字段
+      createdAt: '2026-06-09T10:30:00.000Z',
+    }));
+    expect(loadWorktreeMetadata('demo', 'feature')).toBeNull();
+  });
+});

package/tests/unit/utils/worktree.test.ts

@@ -54,6 +54,18 @@ vi.mock('../../../src/utils/validate-branch.js', () => ({
   deleteValidateBranch: vi.fn(),
 }));
 
+// mock git-branch
+vi.mock('../../../src/utils/git-branch.js', () => ({
+  getCurrentBranch: vi.fn().mockReturnValue('main'),
+}));
+
+// mock worktree-metadata
+vi.mock('../../../src/utils/worktree-metadata.js', () => ({
+  saveWorktreeMetadata: vi.fn(),
+  loadWorktreeMetadata: vi.fn().mockReturnValue(null),
+  removeWorktreeMetadata: vi.fn(),
+}));
+
 import { existsSync, readdirSync } from 'node:fs';
 import {
   getProjectName,
@@ -68,6 +80,8 @@ import {
 } from '../../../src/utils/git.js';
 import { sanitizeBranchName, validateBranchesNotExist } from '../../../src/utils/branch.js';
 import { ensureDir, removeEmptyDir } from '../../../src/utils/fs.js';
+import { getCurrentBranch } from '../../../src/utils/git-branch.js';
+import { saveWorktreeMetadata, loadWorktreeMetadata, removeWorktreeMetadata } from '../../../src/utils/worktree-metadata.js';
 import { createWorktrees, createWorktreesByBranches, getProjectWorktrees, cleanupWorktrees, getWorktreeStatus } from '../../../src/utils/worktree.js';
 import { createWorktreeInfo } from '../../helpers/fixtures.js';
 
@@ -80,6 +94,10 @@ const mockedDeleteBranch = vi.mocked(deleteBranch);
 const mockedGetCommitCountAhead = vi.mocked(getCommitCountAhead);
 const mockedGetDiffStat = vi.mocked(getDiffStat);
 const mockedIsWorkingDirClean = vi.mocked(isWorkingDirClean);
+const mockedGetCurrentBranch = vi.mocked(getCurrentBranch);
+const mockedSaveWorktreeMetadata = vi.mocked(saveWorktreeMetadata);
+const mockedLoadWorktreeMetadata = vi.mocked(loadWorktreeMetadata);
+const mockedRemoveWorktreeMetadata = vi.mocked(removeWorktreeMetadata);
 
 describe('createWorktrees', () => {
   it('单个 worktree 创建', () => {
@@ -105,6 +123,17 @@ describe('createWorktrees', () => {
     expect(validateBranchesNotExist).toHaveBeenCalled();
     expect(ensureDir).toHaveBeenCalled();
   });
+
+  it('创建 worktree 时记录当前分支为来源分支', () => {
+    mockedGetCurrentBranch.mockReturnValue('test');
+    const result = createWorktrees('feature', 1);
+    expect(result[0].baseBranch).toBe('test');
+    expect(mockedSaveWorktreeMetadata).toHaveBeenCalledWith('my-project', {
+      branch: 'feature',
+      baseBranch: 'test',
+      createdAt: expect.any(String),
+    });
+  });
 });
 
 describe('createWorktreesByBranches', () => {
@@ -152,6 +181,36 @@ describe('getProjectWorktrees', () => {
     expect(result).toHaveLength(1);
     expect(result[0].branch).toBe('feature');
   });
+
+  it('获取 worktree 时读取来源分支', () => {
+    mockedExistsSync.mockReturnValue(true);
+    mockedGitWorktreeList.mockReturnValue(
+      '/repo  abc [main]\n/tmp/test-worktrees/my-project/feature  def [feature]',
+    );
+    mockedReaddirSync.mockReturnValue([
+      { name: 'feature', isDirectory: () => true },
+    ] as any);
+    mockedLoadWorktreeMetadata.mockReturnValue({
+      branch: 'feature',
+      baseBranch: 'test',
+      createdAt: '2026-06-09T10:30:00.000Z',
+    });
+    const result = getProjectWorktrees();
+    expect(result[0].baseBranch).toBe('test');
+  });
+
+  it('获取 worktree 时无元数据则 baseBranch 为 null', () => {
+    mockedExistsSync.mockReturnValue(true);
+    mockedGitWorktreeList.mockReturnValue(
+      '/repo  abc [main]\n/tmp/test-worktrees/my-project/feature  def [feature]',
+    );
+    mockedReaddirSync.mockReturnValue([
+      { name: 'feature', isDirectory: () => true },
+    ] as any);
+    mockedLoadWorktreeMetadata.mockReturnValue(null);
+    const result = getProjectWorktrees();
+    expect(result[0].baseBranch).toBeNull();
+  });
 });
 
 describe('cleanupWorktrees', () => {
@@ -176,6 +235,12 @@ describe('cleanupWorktrees', () => {
     // 不应抛出异常
     expect(() => cleanupWorktrees(worktrees)).not.toThrow();
   });
+
+  it('清理 worktree 时删除元数据', () => {
+    const worktrees = [createWorktreeInfo({ branch: 'a', path: '/path/a' })];
+    cleanupWorktrees(worktrees);
+    expect(mockedRemoveWorktreeMetadata).toHaveBeenCalledWith('my-project', 'a');
+  });
 });
 
 describe('getWorktreeStatus', () => {