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

feat(FN-5440): test merger cwd-fallback guards for fn-5440

Browse Source 
Test coverage hardening for FN-5440: adds stronger interaction tests across three steps covering the cwd-integration-fallback-removed path and the merge-reuse-task-worktree early fast-path, including expanded fallback audit tripwires and hardened metadata literal guards. No production code changes.

Fusion-Task-Id: FN-5440
This commit is contained in:
Fusion (runfusion.ai)
2026-05-21 15:55:27 -07:00
committed by gsxdsm
parent 216c32bfe5
commit a3ace52995
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
packages/engine/src/__tests__/merger-cwd-fallback-removed.test.ts
View File

@@ -1,4 +1,4 @@
import { readFileSync } from "node:fs";
import { readFileSync, readdirSync } from "node:fs";
import { join } from "node:path";
import { describe, expect, it, vi } from "vitest";
@@ -65,7 +65,9 @@ describe("FN-5348 cwd integration fallback removed", () => {
expect(refused).toHaveLength(1);
expect(refused[0]?.metadata).toMatchObject({ gate: "working-tree-dirty", reason: "dirty-worktree" });
expect(refused[0]?.metadata?.integrationBranch).toBeUndefined();
expect(JSON.stringify(refused[0]?.metadata ?? {})).not.toContain("\"main\"");
const metadataJson = JSON.stringify(refused[0]?.metadata ?? {});
expect(metadataJson).not.toMatch(/"(integrationBranch|branch|mergeMode|mode)"\s*:\s*"main"/);
expect(metadataJson).not.toContain("\"cwd-main\"");
const latest = await store.getTask(task.id);
expect(latest?.column).toBe("in-review");
// aiMergeTask rethrows refusal; upstream project-engine catch maps this to status=failed.
@@ -124,8 +126,22 @@ describe("FN-5348 cwd integration fallback removed", () => {
it.todo("Scenario E: reserved tripwire — no production emit site after Step 3; future regression would add one");
it("Scenario E: no production code path assigns integrationRoot.mode = cwd-main", () => {
it("Scenario E: no production code path assigns integrationRoot.mode to a cwd-* mode (cwd-main or cwd-integration-branch)", () => {
// FN-5440: start-of-line anchoring intentionally targets real assignments, not prose comments.
const cwdModeAssignmentRegex = /^\s*integrationRoot\.mode\s*=\s*"(cwd-main|cwd-integration-branch)"/m;
const merger = readFileSync(new URL("../merger.ts", import.meta.url), "utf-8");
expect(merger).not.toMatch(/^\s*integrationRoot\.mode\s*=\s*\"cwd-main\"/m);
expect(merger).not.toMatch(cwdModeAssignmentRegex);
const autoRecoveryRoot = new URL("../", import.meta.url);
const autoRecovery = readFileSync(new URL("../auto-recovery.ts", import.meta.url), "utf-8");
expect(autoRecovery).not.toMatch(cwdModeAssignmentRegex);
const autoRecoveryHandlersDir = new URL("../auto-recovery-handlers/", import.meta.url);
for (const file of readdirSync(autoRecoveryHandlersDir, { withFileTypes: true })) {
if (!file.isFile() || !file.name.endsWith(".ts")) continue;
const source = readFileSync(new URL(file.name, autoRecoveryHandlersDir), "utf-8");
expect(source).not.toMatch(cwdModeAssignmentRegex);
}
});
});

4
packages/engine/src/__tests__/reliability-interactions/merge-reuse-task-worktree.test.ts
View File

@@ -676,6 +676,8 @@ describe("FN-5279 reliability interactions: merge reuse task worktree", () => {
expect(auditTypes).toContain("merge:reuse-fallback-new-worktree");
expect(auditTypes).toContain("merge:reuse-handoff-acquired");
expect(auditTypes).not.toContain("merge:reuse-fallback-cwd-main");
expect(auditTypes).not.toContain("merge:reuse-fallback-cwd-integration-branch");
expect(auditTypes).not.toContain("merge:cwd-integration-fallback-removed");
const fallback = audits.find((event) => event.mutationType === "merge:reuse-fallback-new-worktree");
expect(fallback?.metadata).toMatchObject({
reason: "missing-task-worktree",
@@ -686,7 +688,7 @@ describe("FN-5279 reliability interactions: merge reuse task worktree", () => {
}
}, 30_000);
it.skipIf(!hasGit)("cwd-main mode stays on the legacy path and emits no reuse handoff events", async () => {
it.skipIf(!hasGit)("cwd-main legacy alias is normalized to cwd-integration-branch and stays on the opt-in path with no reuse handoff events", async () => {
const fixture = await makeReliabilityFixture({
taskId: "FN-5279-RI-CWD-MAIN",
settings: {