clawt 3.10.4 → 3.10.6

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

@@ -45,8 +45,8 @@ vi.mock('../../../src/utils/index.js', () => ({
   getProjectName: vi.fn().mockReturnValue('test-project'),
   getGitTopLevel: vi.fn().mockReturnValue('/repo'),
   getCurrentBranch: vi.fn().mockReturnValue('clawt-validate-feature'),
-  getProjectWorktrees: vi.fn().mockReturnValue([{ path: '/path/feature', branch: 'feature' }]),
-  findExactMatch: vi.fn().mockReturnValue({ path: '/path/feature', branch: 'feature' }),
+  getProjectWorktrees: vi.fn().mockReturnValue([{ path: '/path/feature', branch: 'feature', baseBranch: null }]),
+  findExactMatch: vi.fn().mockReturnValue({ path: '/path/feature', branch: 'feature', baseBranch: null }),
   hasSnapshot: vi.fn().mockReturnValue(true),
   readSnapshot: vi.fn().mockReturnValue({ treeHash: 'snapshot-tree-hash', headCommitHash: '', stagedTreeHash: '' }),
   writeSnapshot: vi.fn(),
@@ -103,8 +103,8 @@ beforeEach(() => {
   vi.clearAllMocks();
   // 恢复默认 mock 值
   mockedGetCurrentBranch.mockReturnValue('clawt-validate-feature');
-  mockedGetProjectWorktrees.mockReturnValue([{ path: '/path/feature', branch: 'feature' }]);
-  mockedFindExactMatch.mockReturnValue({ path: '/path/feature', branch: 'feature' });
+  mockedGetProjectWorktrees.mockReturnValue([{ path: '/path/feature', branch: 'feature', baseBranch: null }]);
+  mockedFindExactMatch.mockReturnValue({ path: '/path/feature', branch: 'feature', baseBranch: null });
   mockedHasSnapshot.mockReturnValue(true);
   mockedReadSnapshot.mockReturnValue({ treeHash: 'snapshot-tree-hash', headCommitHash: '', stagedTreeHash: '' });
   mockedIsWorkingDirClean.mockReturnValue(false);

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

@@ -67,7 +67,7 @@ describe('registerCreateCommand', () => {
 describe('handleCreate', () => {
   it('成功创建 worktree', async () => {
     mockedCreateWorktrees.mockReturnValue([
-      { path: '/path/feature', branch: 'feature' },
+      { path: '/path/feature', branch: 'feature', baseBranch: null },
     ]);
 
     const program = new Command();
@@ -82,8 +82,8 @@ describe('handleCreate', () => {
 
   it('支持 -n 指定创建数量', async () => {
     mockedCreateWorktrees.mockReturnValue([
-      { path: '/path/feature-1', branch: 'feature-1' },
-      { path: '/path/feature-2', branch: 'feature-2' },
+      { path: '/path/feature-1', branch: 'feature-1', baseBranch: null },
+      { path: '/path/feature-2', branch: 'feature-2', baseBranch: null },
     ]);
 
     const program = new Command();

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

@@ -24,8 +24,17 @@ vi.mock('../../../src/utils/index.js', () => ({
   formatWorktreeStatus: vi.fn(),
   isWorktreeIdle: vi.fn(),
   printInfo: vi.fn(),
+  formatBaseBranchInline: vi.fn((baseBranch: string | null | undefined) => `<- ${baseBranch ?? '未记录'}`),
 }));
 
+vi.mock('../../../src/utils/i18n.js', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../../../src/utils/i18n.js')>();
+  return {
+    ...actual,
+    getCurrentLanguage: vi.fn(() => 'zh'),
+  };
+});
+
 import { registerListCommand } from '../../../src/commands/list.js';
 import { runPreChecks, getProjectName, getProjectWorktrees, getWorktreeStatus, printInfo } from '../../../src/utils/index.js';
 
@@ -69,7 +78,7 @@ describe('handleList', () => {
   it('有 worktree 时文本输出', async () => {
     mockedGetProjectName.mockReturnValue('test-project');
     mockedGetProjectWorktrees.mockReturnValue([
-      { path: '/path/feature', branch: 'feature' },
+      { path: '/path/feature', branch: 'feature', baseBranch: null },
     ]);
     mockedGetWorktreeStatus.mockReturnValue({
       commitCount: 3, insertions: 10, deletions: 5, hasDirtyFiles: false,
@@ -86,7 +95,7 @@ describe('handleList', () => {
   it('--json 输出 JSON 格式', async () => {
     mockedGetProjectName.mockReturnValue('test-project');
     mockedGetProjectWorktrees.mockReturnValue([
-      { path: '/path/feature', branch: 'feature' },
+      { path: '/path/feature', branch: 'feature', baseBranch: null },
     ]);
     const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
 
@@ -108,7 +117,7 @@ describe('handleList', () => {
   it('worktree 状态不可用时显示提示', async () => {
     mockedGetProjectName.mockReturnValue('test-project');
     mockedGetProjectWorktrees.mockReturnValue([
-      { path: '/path/feature', branch: 'feature' },
+      { path: '/path/feature', branch: 'feature', baseBranch: null },
     ]);
     mockedGetWorktreeStatus.mockReturnValue(null);
 
@@ -119,4 +128,58 @@ describe('handleList', () => {
 
     expect(mockedGetWorktreeStatus).toHaveBeenCalled();
   });
+
+  it('--json 输出包含 baseBranch 字段', async () => {
+    mockedGetProjectName.mockReturnValue('test-project');
+    mockedGetProjectWorktrees.mockReturnValue([
+      { path: '/path/feature', branch: 'feature', baseBranch: 'test' },
+    ]);
+    const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
+
+    const program = new Command();
+    program.exitOverride();
+    registerListCommand(program);
+    await program.parseAsync(['list', '--json'], { from: 'user' });
+
+    const jsonCall = consoleSpy.mock.calls.find((call) => {
+      try { JSON.parse(call[0]); return true; } catch { return false; }
+    });
+    expect(jsonCall).toBeDefined();
+    const parsed = JSON.parse(jsonCall![0]);
+    expect(parsed.worktrees[0].baseBranch).toBe('test');
+  });
+
+  it('文本输出包含来源分支（有元数据时）', async () => {
+    mockedGetProjectName.mockReturnValue('test-project');
+    mockedGetProjectWorktrees.mockReturnValue([
+      { path: '/path/feature', branch: 'feature', baseBranch: 'test' },
+    ]);
+    mockedGetWorktreeStatus.mockReturnValue({
+      commitCount: 3, insertions: 10, deletions: 5, hasDirtyFiles: false,
+    });
+
+    const program = new Command();
+    program.exitOverride();
+    registerListCommand(program);
+    await program.parseAsync(['list'], { from: 'user' });
+
+    expect(mockedPrintInfo).toHaveBeenCalledWith(expect.stringContaining('<- test'));
+  });
+
+  it('文本输出包含"未记录"（无元数据时）', async () => {
+    mockedGetProjectName.mockReturnValue('test-project');
+    mockedGetProjectWorktrees.mockReturnValue([
+      { path: '/path/feature', branch: 'feature', baseBranch: null },
+    ]);
+    mockedGetWorktreeStatus.mockReturnValue({
+      commitCount: 3, insertions: 10, deletions: 5, hasDirtyFiles: false,
+    });
+
+    const program = new Command();
+    program.exitOverride();
+    registerListCommand(program);
+    await program.parseAsync(['list'], { from: 'user' });
+
+    expect(mockedPrintInfo).toHaveBeenCalledWith(expect.stringContaining('未记录'));
+  });
 });

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

@@ -149,7 +149,7 @@ const mockedHandleMergeConflict = vi.mocked(handleMergeConflict);
 const mockedPromptCommitMessage = vi.mocked(promptCommitMessage);
 const mockedIsNonInteractive = vi.mocked(isNonInteractive);
 
-const worktree = { path: '/path/feature', branch: 'feature' };
+const worktree = { path: '/path/feature', branch: 'feature', baseBranch: null };
 
 beforeEach(() => {
   mockedGetGitTopLevel.mockReturnValue('/repo');

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

@@ -57,6 +57,7 @@ vi.mock('../../../src/utils/index.js', () => ({
   guardMainWorkBranch: vi.fn().mockResolvedValue(undefined),
   guardMainWorkBranchExists: vi.fn(),
   isNonInteractive: vi.fn().mockReturnValue(false),
+  removeWorktreeMetadata: vi.fn(),
 }));
 
 import { registerRemoveCommand } from '../../../src/commands/remove.js';
@@ -75,6 +76,7 @@ import {
   printHint,
   resolveTargetWorktrees,
   getCurrentBranch,
+  removeWorktreeMetadata,
 } from '../../../src/utils/index.js';
 
 const mockedGetProjectName = vi.mocked(getProjectName);
@@ -90,6 +92,7 @@ const mockedPrintError = vi.mocked(printError);
 const mockedPrintHint = vi.mocked(printHint);
 const mockedResolveTargetWorktrees = vi.mocked(resolveTargetWorktrees);
 const mockedGetCurrentBranch = vi.mocked(getCurrentBranch);
+const mockedRemoveWorktreeMetadata = vi.mocked(removeWorktreeMetadata);
 
 beforeEach(() => {
   vi.mocked(runPreChecks).mockReset();
@@ -107,6 +110,7 @@ beforeEach(() => {
   mockedResolveTargetWorktrees.mockReset();
   mockedGetCurrentBranch.mockReset();
   mockedGetCurrentBranch.mockReturnValue('main');
+  mockedRemoveWorktreeMetadata.mockReset();
 });
 
 describe('registerRemoveCommand', () => {
@@ -121,8 +125,8 @@ describe('registerRemoveCommand', () => {
 describe('handleRemove', () => {
   it('--all 移除所有 worktree（autoDeleteBranch=true）', async () => {
     mockedGetProjectWorktrees.mockReturnValue([
-      { path: '/path/feature-1', branch: 'feature-1' },
-      { path: '/path/feature-2', branch: 'feature-2' },
+      { path: '/path/feature-1', branch: 'feature-1', baseBranch: null },
+      { path: '/path/feature-2', branch: 'feature-2', baseBranch: null },
     ]);
     mockedGetConfigValue.mockReturnValue(true);
 
@@ -133,16 +137,18 @@ describe('handleRemove', () => {
 
     expect(mockedRemoveWorktreeByPath).toHaveBeenCalledTimes(2);
     expect(mockedDeleteBranch).toHaveBeenCalledTimes(2);
+    expect(mockedRemoveWorktreeMetadata).toHaveBeenCalledWith('test-project', 'feature-1');
+    expect(mockedRemoveWorktreeMetadata).toHaveBeenCalledWith('test-project', 'feature-2');
     expect(mockedRemoveProjectSnapshots).toHaveBeenCalledWith('test-project');
   });
 
   it('-b 精确匹配时通过 resolveTargetWorktrees 解析并移除', async () => {
     mockedGetProjectWorktrees.mockReturnValue([
-      { path: '/path/feature', branch: 'feature' },
-      { path: '/path/other', branch: 'other' },
+      { path: '/path/feature', branch: 'feature', baseBranch: null },
+      { path: '/path/other', branch: 'other', baseBranch: null },
     ]);
     mockedResolveTargetWorktrees.mockResolvedValue([
-      { path: '/path/feature', branch: 'feature' },
+      { path: '/path/feature', branch: 'feature', baseBranch: null },
     ]);
     mockedGetConfigValue.mockReturnValue(true);
 
@@ -158,14 +164,14 @@ describe('handleRemove', () => {
 
   it('-b 模糊匹配多个时通过 resolveTargetWorktrees 解析并批量移除', async () => {
     mockedGetProjectWorktrees.mockReturnValue([
-      { path: '/path/feature-1', branch: 'feature-1' },
-      { path: '/path/feature-2', branch: 'feature-2' },
-      { path: '/path/other', branch: 'other' },
+      { path: '/path/feature-1', branch: 'feature-1', baseBranch: null },
+      { path: '/path/feature-2', branch: 'feature-2', baseBranch: null },
+      { path: '/path/other', branch: 'other', baseBranch: null },
     ]);
     // 模拟用户多选了两个
     mockedResolveTargetWorktrees.mockResolvedValue([
-      { path: '/path/feature-1', branch: 'feature-1' },
-      { path: '/path/feature-2', branch: 'feature-2' },
+      { path: '/path/feature-1', branch: 'feature-1', baseBranch: null },
+      { path: '/path/feature-2', branch: 'feature-2', baseBranch: null },
     ]);
     mockedGetConfigValue.mockReturnValue(true);
 
@@ -179,11 +185,11 @@ describe('handleRemove', () => {
 
   it('未指定 --all 或 -b 时通过 resolveTargetWorktrees 展示多选列表', async () => {
     mockedGetProjectWorktrees.mockReturnValue([
-      { path: '/path/feature-1', branch: 'feature-1' },
-      { path: '/path/feature-2', branch: 'feature-2' },
+      { path: '/path/feature-1', branch: 'feature-1', baseBranch: null },
+      { path: '/path/feature-2', branch: 'feature-2', baseBranch: null },
     ]);
     mockedResolveTargetWorktrees.mockResolvedValue([
-      { path: '/path/feature-1', branch: 'feature-1' },
+      { path: '/path/feature-1', branch: 'feature-1', baseBranch: null },
     ]);
     mockedGetConfigValue.mockReturnValue(true);
 
@@ -203,10 +209,10 @@ describe('handleRemove', () => {
 
   it('autoDeleteBranch=false 时询问用户是否删除分支', async () => {
     mockedGetProjectWorktrees.mockReturnValue([
-      { path: '/path/feature', branch: 'feature' },
+      { path: '/path/feature', branch: 'feature', baseBranch: null },
     ]);
     mockedResolveTargetWorktrees.mockResolvedValue([
-      { path: '/path/feature', branch: 'feature' },
+      { path: '/path/feature', branch: 'feature', baseBranch: null },
     ]);
     mockedGetConfigValue.mockReturnValue(false);
     mockedConfirmAction.mockResolvedValue(false);
@@ -225,7 +231,7 @@ describe('handleRemove', () => {
 
   it('-b 指定不存在的分支时 resolveTargetWorktrees 抛出错误', async () => {
     mockedGetProjectWorktrees.mockReturnValue([
-      { path: '/path/other', branch: 'other' },
+      { path: '/path/other', branch: 'other', baseBranch: null },
     ]);
     mockedResolveTargetWorktrees.mockRejectedValue(new Error('未找到与 "nonexistent" 匹配的分支'));
 
@@ -240,8 +246,8 @@ describe('handleRemove', () => {
 
   it('移除过程中部分失败时汇报并抛出错误', async () => {
     mockedGetProjectWorktrees.mockReturnValue([
-      { path: '/path/feature-1', branch: 'feature-1' },
-      { path: '/path/feature-2', branch: 'feature-2' },
+      { path: '/path/feature-1', branch: 'feature-1', baseBranch: null },
+      { path: '/path/feature-2', branch: 'feature-2', baseBranch: null },
     ]);
     mockedGetConfigValue.mockReturnValue(true);
     // 第一个成功，第二个失败

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

@@ -125,7 +125,7 @@ describe('registerResumeCommand', () => {
 
 describe('handleResume', () => {
   it('传 -b 时走标准解析流程', async () => {
-    const worktree = { path: '/path/feature', branch: 'feature' };
+    const worktree = { path: '/path/feature', branch: 'feature', baseBranch: null };
     mockedGetProjectWorktrees.mockReturnValue([worktree]);
     mockedResolveTargetWorktrees.mockResolvedValue([worktree]);
     mockedGetConfigValue.mockReturnValue(true);
@@ -143,8 +143,8 @@ describe('handleResume', () => {
 
   it('不传 -b 且多个 worktree 时默认使用分组多选', async () => {
     const worktrees = [
-      { path: '/path/feature-a', branch: 'feature-a' },
-      { path: '/path/feature-b', branch: 'feature-b' },
+      { path: '/path/feature-a', branch: 'feature-a', baseBranch: null },
+      { path: '/path/feature-b', branch: 'feature-b', baseBranch: null },
     ];
     mockedGetProjectWorktrees.mockReturnValue(worktrees);
     mockedPromptGroupedMultiSelectBranches.mockResolvedValue([worktrees[0]]);
@@ -163,7 +163,7 @@ describe('handleResume', () => {
   });
 
   it('仅 1 个 worktree 时走标准流程', async () => {
-    const worktree = { path: '/path/feature', branch: 'feature' };
+    const worktree = { path: '/path/feature', branch: 'feature', baseBranch: null };
     mockedGetProjectWorktrees.mockReturnValue([worktree]);
     mockedResolveTargetWorktrees.mockResolvedValue([worktree]);
     mockedGetConfigValue.mockReturnValue(true);
@@ -180,7 +180,7 @@ describe('handleResume', () => {
 
 describe('handleResume — resumeInPlace 配置', () => {
   it('resumeInPlace 为 true 时，单选在当前终端就地恢复', async () => {
-    const worktree = { path: '/path/feature', branch: 'feature' };
+    const worktree = { path: '/path/feature', branch: 'feature', baseBranch: null };
     mockedGetProjectWorktrees.mockReturnValue([worktree]);
     mockedResolveTargetWorktrees.mockResolvedValue([worktree]);
     mockedGetConfigValue.mockReturnValue(true);
@@ -196,7 +196,7 @@ describe('handleResume — resumeInPlace 配置', () => {
   });
 
   it('resumeInPlace 为 false 时，单选在新终端 Tab 中恢复', async () => {
-    const worktree = { path: '/path/feature', branch: 'feature' };
+    const worktree = { path: '/path/feature', branch: 'feature', baseBranch: null };
     mockedGetProjectWorktrees.mockReturnValue([worktree]);
     mockedResolveTargetWorktrees.mockResolvedValue([worktree]);
     mockedGetConfigValue.mockReturnValue(false);
@@ -214,7 +214,7 @@ describe('handleResume — resumeInPlace 配置', () => {
   });
 
   it('resumeInPlace 为 false 且无历史会话时，传 false 给新终端启动', async () => {
-    const worktree = { path: '/path/feature', branch: 'feature' };
+    const worktree = { path: '/path/feature', branch: 'feature', baseBranch: null };
     mockedGetProjectWorktrees.mockReturnValue([worktree]);
     mockedResolveTargetWorktrees.mockResolvedValue([worktree]);
     mockedGetConfigValue.mockReturnValue(false);
@@ -230,8 +230,8 @@ describe('handleResume — resumeInPlace 配置', () => {
 
   it('多选时不受 resumeInPlace 影响，始终在新 Tab 中打开', async () => {
     const worktrees = [
-      { path: '/path/feature-a', branch: 'feature-a' },
-      { path: '/path/feature-b', branch: 'feature-b' },
+      { path: '/path/feature-a', branch: 'feature-a', baseBranch: null },
+      { path: '/path/feature-b', branch: 'feature-b', baseBranch: null },
     ];
     mockedGetProjectWorktrees.mockReturnValue(worktrees);
     mockedPromptGroupedMultiSelectBranches.mockResolvedValue(worktrees);
@@ -251,8 +251,8 @@ describe('handleResume — resumeInPlace 配置', () => {
 
   it('用户未选择任何分支时直接退出', async () => {
     const worktrees = [
-      { path: '/path/feature-a', branch: 'feature-a' },
-      { path: '/path/feature-b', branch: 'feature-b' },
+      { path: '/path/feature-a', branch: 'feature-a', baseBranch: null },
+      { path: '/path/feature-b', branch: 'feature-b', baseBranch: null },
     ];
     mockedGetProjectWorktrees.mockReturnValue(worktrees);
     mockedPromptGroupedMultiSelectBranches.mockResolvedValue([]);
@@ -270,7 +270,7 @@ describe('handleResume — resumeInPlace 配置', () => {
 
 describe('handleResume — 非交互式追问', () => {
   it('--prompt + -b 有历史会话时传 [true]', async () => {
-    const worktree = { path: '/path/feature', branch: 'feature' };
+    const worktree = { path: '/path/feature', branch: 'feature', baseBranch: null };
     mockedGetProjectWorktrees.mockReturnValue([worktree]);
     mockedFindExactMatch.mockReturnValue(worktree);
     mockedHasClaudeSessionHistory.mockReturnValue(true);
@@ -296,7 +296,7 @@ describe('handleResume — 非交互式追问', () => {
   });
 
   it('--prompt + -b 无历史会话时传 [false]', async () => {
-    const worktree = { path: '/path/feature', branch: 'feature' };
+    const worktree = { path: '/path/feature', branch: 'feature', baseBranch: null };
     mockedGetProjectWorktrees.mockReturnValue([worktree]);
     mockedFindExactMatch.mockReturnValue(worktree);
     mockedHasClaudeSessionHistory.mockReturnValue(false);
@@ -339,7 +339,7 @@ describe('handleResume — 非交互式追问', () => {
 
   it('--prompt 指定的分支不存在时报错', async () => {
     mockedGetProjectWorktrees.mockReturnValue([
-      { path: '/path/other', branch: 'other' },
+      { path: '/path/other', branch: 'other', baseBranch: null },
     ]);
     mockedFindExactMatch.mockReturnValue(undefined);
 
@@ -354,8 +354,8 @@ describe('handleResume — 非交互式追问', () => {
 
   it('-f 批量追问模式', async () => {
     const worktrees = [
-      { path: '/path/feat-a', branch: 'feat-a' },
-      { path: '/path/feat-b', branch: 'feat-b' },
+      { path: '/path/feat-a', branch: 'feat-a', baseBranch: null },
+      { path: '/path/feat-b', branch: 'feat-b', baseBranch: null },
     ];
     mockedLoadTaskFile.mockReturnValue([
       { branch: 'feat-a', task: '追问任务A' },
@@ -390,7 +390,7 @@ describe('handleResume — 非交互式追问', () => {
       { branch: 'nonexistent', task: '追问任务' },
     ]);
     mockedGetProjectWorktrees.mockReturnValue([
-      { path: '/path/feat-a', branch: 'feat-a' },
+      { path: '/path/feat-a', branch: 'feat-a', baseBranch: null },
     ]);
     mockedFindExactMatch.mockReturnValue(undefined);
 
@@ -404,7 +404,7 @@ describe('handleResume — 非交互式追问', () => {
   });
 
   it('-f + -c 传递并发数', async () => {
-    const worktree = { path: '/path/feat-a', branch: 'feat-a' };
+    const worktree = { path: '/path/feat-a', branch: 'feat-a', baseBranch: null };
     mockedLoadTaskFile.mockReturnValue([
       { branch: 'feat-a', task: '追问' },
     ]);
@@ -429,9 +429,9 @@ describe('handleResume — 非交互式追问', () => {
 
   it('-f 批量追问按 worktree 独立检查会话历史', async () => {
     const worktrees = [
-      { path: '/path/feat-a', branch: 'feat-a' },
-      { path: '/path/feat-b', branch: 'feat-b' },
-      { path: '/path/feat-c', branch: 'feat-c' },
+      { path: '/path/feat-a', branch: 'feat-a', baseBranch: null },
+      { path: '/path/feat-b', branch: 'feat-b', baseBranch: null },
+      { path: '/path/feat-c', branch: 'feat-c', baseBranch: null },
     ];
     mockedLoadTaskFile.mockReturnValue([
       { branch: 'feat-a', task: '任务A' },

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

@@ -263,7 +263,7 @@ describe('handleRun', () => {
   it('未传 --tasks 时创建单个 worktree 并打开交互式界面', async () => {
     mockedSanitizeBranchName.mockReturnValue('feature');
     mockedCheckBranchExists.mockReturnValue(false);
-    const worktree = { path: '/path/feature', branch: 'feature' };
+    const worktree = { path: '/path/feature', branch: 'feature', baseBranch: null };
     mockedCreateWorktrees.mockReturnValue([worktree]);
 
     const program = new Command();
@@ -290,8 +290,8 @@ describe('handleRun', () => {
 
   it('传 --tasks 时创建对应数量 worktree 并并行执行', async () => {
     const worktrees = [
-      { path: '/path/feat-1', branch: 'feat-1' },
-      { path: '/path/feat-2', branch: 'feat-2' },
+      { path: '/path/feat-1', branch: 'feat-1', baseBranch: null },
+      { path: '/path/feat-2', branch: 'feat-2', baseBranch: null },
     ];
     mockedCreateWorktrees.mockReturnValue(worktrees);
 
@@ -314,7 +314,7 @@ describe('handleRun', () => {
   });
 
   it('任务执行失败时在通知中报告', async () => {
-    const worktrees = [{ path: '/path/feat-1', branch: 'feat-1' }];
+    const worktrees = [{ path: '/path/feat-1', branch: 'feat-1', baseBranch: null }];
     mockedCreateWorktrees.mockReturnValue(worktrees);
 
     const jsonOutput = JSON.stringify({
@@ -334,7 +334,7 @@ describe('handleRun', () => {
   });
 
   it('子进程发生错误时返回失败结果', async () => {
-    const worktrees = [{ path: '/path/feat-1', branch: 'feat-1' }];
+    const worktrees = [{ path: '/path/feat-1', branch: 'feat-1', baseBranch: null }];
     mockedCreateWorktrees.mockReturnValue(worktrees);
 
     // 创建会触发 error 事件的子进程
@@ -359,9 +359,9 @@ describe('handleRun', () => {
   it('传 --concurrency 限制并发数', async () => {
     mockedParseConcurrency.mockReturnValue(1);
     const worktrees = [
-      { path: '/path/feat-1', branch: 'feat-1' },
-      { path: '/path/feat-2', branch: 'feat-2' },
-      { path: '/path/feat-3', branch: 'feat-3' },
+      { path: '/path/feat-1', branch: 'feat-1', baseBranch: null },
+      { path: '/path/feat-2', branch: 'feat-2', baseBranch: null },
+      { path: '/path/feat-3', branch: 'feat-3', baseBranch: null },
     ];
     mockedCreateWorktrees.mockReturnValue(worktrees);
 
@@ -389,8 +389,8 @@ describe('handleRun', () => {
 
   it('--concurrency 为 0 时不限制并发', async () => {
     const worktrees = [
-      { path: '/path/feat-1', branch: 'feat-1' },
-      { path: '/path/feat-2', branch: 'feat-2' },
+      { path: '/path/feat-1', branch: 'feat-1', baseBranch: null },
+      { path: '/path/feat-2', branch: 'feat-2', baseBranch: null },
     ];
     mockedCreateWorktrees.mockReturnValue(worktrees);
 
@@ -418,9 +418,9 @@ describe('handleRun', () => {
     mockedParseConcurrency.mockReturnValue(2);
 
     const worktrees = [
-      { path: '/path/feat-1', branch: 'feat-1' },
-      { path: '/path/feat-2', branch: 'feat-2' },
-      { path: '/path/feat-3', branch: 'feat-3' },
+      { path: '/path/feat-1', branch: 'feat-1', baseBranch: null },
+      { path: '/path/feat-2', branch: 'feat-2', baseBranch: null },
+      { path: '/path/feat-3', branch: 'feat-3', baseBranch: null },
     ];
     mockedCreateWorktrees.mockReturnValue(worktrees);
 
@@ -450,8 +450,8 @@ describe('handleRun', () => {
       { branch: 'fix-bug', task: '修复问题' },
     ]);
     const worktrees = [
-      { path: '/path/feat-login', branch: 'feat-login' },
-      { path: '/path/fix-bug', branch: 'fix-bug' },
+      { path: '/path/feat-login', branch: 'feat-login', baseBranch: null },
+      { path: '/path/fix-bug', branch: 'fix-bug', baseBranch: null },
     ];
     mockedCreateWorktreesByBranches.mockReturnValue(worktrees);
 
@@ -480,8 +480,8 @@ describe('handleRun', () => {
       { task: '任务2' },
     ]);
     const worktrees = [
-      { path: '/path/feat-1', branch: 'feat-1' },
-      { path: '/path/feat-2', branch: 'feat-2' },
+      { path: '/path/feat-1', branch: 'feat-1', baseBranch: null },
+      { path: '/path/feat-2', branch: 'feat-2', baseBranch: null },
     ];
     mockedCreateWorktrees.mockReturnValue(worktrees);