feat(FN-5438): add manual merge blocker bypass mode for queued tasks
Adds a manual merge blocker mode (FN-5438) that prevents automatic merging and provides a bypass mechanism to resume, wired through the merger, project engine, and task workflow API routes. Includes tests across core, engine route registration, and project engine layers, plus a changeset and documen Fusion-Task-Id: FN-5438
This commit is contained in:
committed by
gsxdsm
parent
854045f430
commit
025683ca60
@@ -1127,6 +1127,39 @@ describe("ProjectEngine shutdown merge handling", () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe("ProjectEngine manual merge plumbing", () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks();
|
||||
const mockStore = createMockStore({ ...baseSettings, autoMerge: true });
|
||||
mockStore.store.getTask.mockResolvedValue({
|
||||
id: "FN-5438",
|
||||
column: "in-review",
|
||||
paused: false,
|
||||
mergeRetries: 0,
|
||||
status: "queued",
|
||||
} as any);
|
||||
mocks.currentStore = mockStore.store;
|
||||
});
|
||||
|
||||
it("passes manual=true to aiMergeTask for onMerge requests", async () => {
|
||||
mocks.aiMergeTask.mockResolvedValue({ merged: true, task: { id: "FN-5438" } } as any);
|
||||
|
||||
const engine = createEngine();
|
||||
await engine.start();
|
||||
|
||||
await engine.onMerge("FN-5438");
|
||||
|
||||
expect(mocks.aiMergeTask).toHaveBeenCalledWith(
|
||||
expect.anything(),
|
||||
expect.any(String),
|
||||
"FN-5438",
|
||||
expect.objectContaining({ manual: true }),
|
||||
);
|
||||
|
||||
await engine.stop();
|
||||
});
|
||||
});
|
||||
|
||||
describe("ProjectEngine merge queue priority ordering", () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks();
|
||||
|
||||
Reference in New Issue
Block a user