root/fusion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(KB-144): exclude in-review worktrees from maxWorktrees limit

Browse Source 
- Change activeWorktrees filter to only count in-progress tasks, not in-review with worktree
- Update existing scheduler test to reflect in-progress-only counting
- Add 3 new tests covering in-review tasks not blocking scheduling
- Update maxWorktrees JSDoc to reflect new semantics
- Add changeset for patch release
This commit is contained in:
Dustin Byrne
2026-03-28 00:31:36 -04:00
parent 7c685f2138
commit a59fb5b857
3 changed files with 94 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
packages/engine/src/scheduler.test.ts
View File

@@ -175,11 +175,11 @@ describe("Scheduler dynamic settings reload", () => {
it("reads maxWorktrees from store settings on each schedule() call", async () => {
const tasks = [
makeTask({ id: "KB-001", column: "in-progress" }),
makeTask({ id: "KB-002", column: "in-review", worktree: "/tmp/wt" }),
makeTask({ id: "KB-002", column: "in-progress" }),
makeTask({ id: "KB-003", column: "todo" }),
];
const store = createMockStore(tasks);
// Start with maxWorktrees: 2 — no room (2 active worktrees)
// Start with maxWorktrees: 2 — no room (2 in-progress worktrees)
store.getSettings.mockResolvedValue({
maxConcurrent: 4,
maxWorktrees: 2,
@@ -787,3 +787,85 @@ describe("Scheduler worktree limit logging", () => {
logSpy.mockRestore();
});
});
describe("Scheduler in-review worktrees do not count against maxWorktrees", () => {
beforeEach(() => {
vi.clearAllMocks();
});
async function runSchedule(scheduler: Scheduler): Promise<void> {
(scheduler as any).running = true;
await scheduler.schedule();
}
it("in-review task with worktree does NOT count against maxWorktrees", async () => {
const tasks = [
makeTask({ id: "KB-001", column: "in-review", worktree: "/tmp/wt/kb-001" }),
makeTask({ id: "KB-002", column: "in-review", worktree: "/tmp/wt/kb-002" }),
makeTask({ id: "KB-003", column: "in-review", worktree: "/tmp/wt/kb-003" }),
makeTask({ id: "KB-004", column: "todo" }),
];
const store = createMockStore(tasks);
store.getSettings.mockResolvedValue({
maxConcurrent: 4,
maxWorktrees: 2,
pollIntervalMs: 15000,
groupOverlappingFiles: false,
autoMerge: false,
});
const scheduler = new Scheduler(store);
await runSchedule(scheduler);
// 3 in-review worktrees should NOT block KB-004 — only in-progress counts
expect(store.moveTask).toHaveBeenCalledWith("KB-004", "in-progress");
});
it("in-review tasks with worktrees do NOT block scheduling even when many exist", async () => {
const tasks = [
makeTask({ id: "KB-001", column: "in-review", worktree: "/tmp/wt/kb-001" }),
makeTask({ id: "KB-002", column: "in-review", worktree: "/tmp/wt/kb-002" }),
makeTask({ id: "KB-003", column: "in-review", worktree: "/tmp/wt/kb-003" }),
makeTask({ id: "KB-004", column: "in-review", worktree: "/tmp/wt/kb-004" }),
makeTask({ id: "KB-005", column: "in-review", worktree: "/tmp/wt/kb-005" }),
makeTask({ id: "KB-006", column: "in-progress" }),
makeTask({ id: "KB-007", column: "todo" }),
];
const store = createMockStore(tasks);
store.getSettings.mockResolvedValue({
maxConcurrent: 4,
maxWorktrees: 2,
pollIntervalMs: 15000,
groupOverlappingFiles: false,
autoMerge: false,
});
const scheduler = new Scheduler(store);
await runSchedule(scheduler);
// 5 in-review + 1 in-progress = only 1 active worktree, room for KB-007
expect(store.moveTask).toHaveBeenCalledWith("KB-007", "in-progress");
});
it("maxWorktrees correctly limits only in-progress tasks", async () => {
const tasks = [
makeTask({ id: "KB-001", column: "in-progress" }),
makeTask({ id: "KB-002", column: "in-progress" }),
makeTask({ id: "KB-003", column: "todo" }),
];
const store = createMockStore(tasks);
store.getSettings.mockResolvedValue({
maxConcurrent: 4,
maxWorktrees: 2,
pollIntervalMs: 15000,
groupOverlappingFiles: false,
autoMerge: false,
});
const scheduler = new Scheduler(store);
await runSchedule(scheduler);
// 2 in-progress = 2 active worktrees, maxWorktrees: 2 — no room for KB-003
expect(store.moveTask).not.toHaveBeenCalled();
});
});