clawt 2.10.0 → 2.11.0

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

@@ -1,15 +1,18 @@
 import { describe, it, expect, vi } from 'vitest';
-import { findExactMatch, findFuzzyMatches, resolveTargetWorktree } from '../../../src/utils/worktree-matcher.js';
+import { findExactMatch, findFuzzyMatches, resolveTargetWorktree, resolveTargetWorktrees } from '../../../src/utils/worktree-matcher.js';
 import { createWorktreeInfo, createWorktreeList } from '../../helpers/fixtures.js';
 import { ClawtError } from '../../../src/errors/index.js';
-import type { WorktreeResolveMessages } from '../../../src/utils/worktree-matcher.js';
+import type { WorktreeResolveMessages, WorktreeMultiResolveMessages } from '../../../src/utils/worktree-matcher.js';
 
 // mock enquirer
 vi.mock('enquirer', () => ({
   default: {
-    Select: vi.fn().mockImplementation(({ choices }: { choices: Array<{ name: string }> }) => ({
-      run: vi.fn().mockResolvedValue(choices[0].name),
-    })),
+    Select: vi.fn().mockImplementation(function({ choices }: { choices: Array<{ name: string }> }) {
+      this.run = vi.fn().mockResolvedValue(choices[0].name);
+    }),
+    MultiSelect: vi.fn().mockImplementation(function({ choices }: { choices: Array<{ name: string }> }) {
+      this.run = vi.fn().mockResolvedValue(choices.map((c: { name: string }) => c.name));
+    }),
   },
 }));
 
@@ -114,3 +117,76 @@ describe('resolveTargetWorktree', () => {
     await expect(resolveTargetWorktree(worktrees, testMessages, 'xyz')).rejects.toThrow(ClawtError);
   });
 });
+
+/** 多选场景测试用消息配置 */
+const testMultiMessages: WorktreeMultiResolveMessages = {
+  noWorktrees: '无可用 worktree',
+  selectBranch: '请选择要移除的分支',
+  multipleMatches: (keyword: string) => `"${keyword}" 匹配到多个分支`,
+  noMatch: (keyword: string, branches: string[]) =>
+    `未找到匹配 "${keyword}"，可用：${branches.join(', ')}`,
+};
+
+describe('resolveTargetWorktrees', () => {
+  it('空列表抛出 ClawtError', async () => {
+    await expect(resolveTargetWorktrees([], testMultiMessages, 'any')).rejects.toThrow(ClawtError);
+    await expect(resolveTargetWorktrees([], testMultiMessages, 'any')).rejects.toThrow('无可用 worktree');
+  });
+
+  it('单个 worktree 且不传分支名时直接返回数组', async () => {
+    const worktrees = [createWorktreeInfo({ branch: 'only-one' })];
+    const result = await resolveTargetWorktrees(worktrees, testMultiMessages);
+    expect(result).toHaveLength(1);
+    expect(result[0].branch).toBe('only-one');
+  });
+
+  it('精确匹配优先，返回单元素数组', async () => {
+    const worktrees = [
+      createWorktreeInfo({ branch: 'feat' }),
+      createWorktreeInfo({ branch: 'feature' }),
+    ];
+    const result = await resolveTargetWorktrees(worktrees, testMultiMessages, 'feat');
+    expect(result).toHaveLength(1);
+    expect(result[0].branch).toBe('feat');
+  });
+
+  it('模糊匹配唯一结果直接返回单元素数组', async () => {
+    const worktrees = [
+      createWorktreeInfo({ branch: 'feature-login' }),
+      createWorktreeInfo({ branch: 'bugfix-auth' }),
+    ];
+    const result = await resolveTargetWorktrees(worktrees, testMultiMessages, 'login');
+    expect(result).toHaveLength(1);
+    expect(result[0].branch).toBe('feature-login');
+  });
+
+  it('模糊匹配多个结果时调用多选交互', async () => {
+    const worktrees = [
+      createWorktreeInfo({ branch: 'feature-login' }),
+      createWorktreeInfo({ branch: 'feature-logout' }),
+      createWorktreeInfo({ branch: 'bugfix-auth' }),
+    ];
+    const result = await resolveTargetWorktrees(worktrees, testMultiMessages, 'log');
+    // mock 的 MultiSelect 返回所有 choices，因此应返回匹配到的 2 个
+    expect(result).toHaveLength(2);
+    expect(result.map((w) => w.branch)).toEqual(['feature-login', 'feature-logout']);
+  });
+
+  it('不传分支名时多个 worktree 调用多选交互', async () => {
+    const worktrees = [
+      createWorktreeInfo({ branch: 'feature-a' }),
+      createWorktreeInfo({ branch: 'feature-b' }),
+    ];
+    const result = await resolveTargetWorktrees(worktrees, testMultiMessages);
+    // mock 的 MultiSelect 返回所有 choices
+    expect(result).toHaveLength(2);
+  });
+
+  it('无匹配抛出 ClawtError 并包含可用分支', async () => {
+    const worktrees = [
+      createWorktreeInfo({ branch: 'feature-a' }),
+      createWorktreeInfo({ branch: 'feature-b' }),
+    ];
+    await expect(resolveTargetWorktrees(worktrees, testMultiMessages, 'xyz')).rejects.toThrow(ClawtError);
+  });
+});

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

@@ -62,7 +62,7 @@ import {
 } from '../../../src/utils/git.js';
 import { sanitizeBranchName, validateBranchesNotExist } from '../../../src/utils/branch.js';
 import { ensureDir, removeEmptyDir } from '../../../src/utils/fs.js';
-import { createWorktrees, getProjectWorktrees, cleanupWorktrees, getWorktreeStatus } from '../../../src/utils/worktree.js';
+import { createWorktrees, createWorktreesByBranches, getProjectWorktrees, cleanupWorktrees, getWorktreeStatus } from '../../../src/utils/worktree.js';
 import { createWorktreeInfo } from '../../helpers/fixtures.js';
 
 const mockedExistsSync = vi.mocked(existsSync);
@@ -101,6 +101,31 @@ describe('createWorktrees', () => {
   });
 });
 
+describe('createWorktreesByBranches', () => {
+  it('根据分支名列表创建 worktree', () => {
+    const result = createWorktreesByBranches(['feat-login', 'fix-bug']);
+    expect(result).toHaveLength(2);
+    expect(result[0].branch).toBe('feat-login');
+    expect(result[1].branch).toBe('fix-bug');
+    expect(mockedGitCreateWorktree).toHaveBeenCalledTimes(2);
+  });
+
+  it('调用存在性校验但不调用分支名清理', () => {
+    createWorktreesByBranches(['feat-a', 'feat-b']);
+    // 不使用 sanitizeBranchName（调用方负责清理）
+    expect(sanitizeBranchName).not.toHaveBeenCalled();
+    expect(validateBranchesNotExist).toHaveBeenCalledWith(['feat-a', 'feat-b']);
+    expect(ensureDir).toHaveBeenCalled();
+  });
+
+  it('单个分支名也能正常创建', () => {
+    const result = createWorktreesByBranches(['single-branch']);
+    expect(result).toHaveLength(1);
+    expect(result[0].branch).toBe('single-branch');
+    expect(mockedGitCreateWorktree).toHaveBeenCalledTimes(1);
+  });
+});
+
 describe('getProjectWorktrees', () => {
   it('项目目录不存在时返回空数组', () => {
     mockedExistsSync.mockReturnValue(false);