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

feat(FN-4067): add squash audit gate to merger with integration tests

Browse Source 
Adds a squash-merge audit gate that verifies duplicate-cherry-pick commits and file-overlap losses after any squash merge into main, restoring the post-squash audit step to the merge workflow with test coverage for both the audit logic and the broader merger lifecycle.

Fusion-Task-Id: FN-4067

Fusion-Task-Lineage: 593aa917-5640-495b-b1ae-80c3eaa09d01
This commit is contained in:
Fusion
2026-05-12 05:22:14 -07:00
committed by gsxdsm
parent 50c8ab35d7
commit fc863f6e96
10 changed files with 665 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
scripts/audit-squash-merge.mjs
View File

@@ -23,7 +23,7 @@
// Example:
// node scripts/audit-squash-merge.mjs 7c1a1c36c
import { execSync } from "node:child_process";
import { tsImport } from "tsx/esm/api";
const args = process.argv.slice(2);
const squashSha = args.find((a) => !a.startsWith("--"));
@@ -36,74 +36,18 @@ if (!squashSha) {
process.exit(2);
}
const sh = (cmd) => execSync(cmd, { encoding: "utf8" }).trim();
const moduleUrl = new globalThis.URL("../packages/engine/src/merger-squash-audit.ts", import.meta.url).href;
const { auditSquashMerge, formatSquashAuditReport } = await tsImport(moduleUrl, import.meta.url);
const parent = sh(`git rev-parse ${squashSha}^`);
const subject = sh(`git log -1 --format=%s ${squashSha}`);
const branchSubjects = sh(`git log -1 --format=%b ${squashSha}`)
.split("\n")
.map((l) => l.replace(/^- /, "").trim())
.filter(Boolean);
console.log(`Auditing squash: ${squashSha} — ${subject}`);
console.log(`Parent (main before squash): ${parent}`);
console.log(`Lookback window on main: ${lookback} commits\n`);
// --- 1. Duplicate-cherry-pick detection ---
const recentMainSubjects = sh(
`git log --format=%s ${parent}~${lookback}..${parent}`,
).split("\n");
const dupes = branchSubjects.filter((s) => recentMainSubjects.includes(s));
console.log("=== Duplicate-cherry-pick risk ===");
if (dupes.length === 0) {
console.log("(none — no branch commit subjects match recent main commits)\n");
} else {
console.log("WARN: branch contains commits whose subjects match recent main commits.");
console.log("Auto-resolve may have picked the older side, dropping refinements.");
console.log("Action: diff each main commit below against HEAD and confirm its");
console.log("net contribution survived. Restore anything dropped as a follow-up.\n");
for (const s of dupes) {
console.log(` - ${s}`);
}
console.log();
try {
const findings = await auditSquashMerge({
rootDir: process.cwd(),
squashSha,
lookback,
});
console.log(formatSquashAuditReport(findings));
process.exit(findings.clean ? 0 : 1);
} catch (error) {
console.error(error instanceof Error ? error.message : String(error));
process.exit(1);
}
// --- 2. Touched-file overlap ---
const touched = sh(`git diff --name-only ${parent} ${squashSha}`)
.split("\n")
.filter(Boolean);
console.log(`=== Touched-file overlap (${touched.length} files in squash) ===`);
const overlaps = [];
for (const file of touched) {
const recent = sh(
`git log --format=%h~%s ${parent}~${lookback}..${parent} -- ${JSON.stringify(file)}`,
)
.split("\n")
.filter(Boolean);
if (recent.length > 0) {
overlaps.push({ file, recent });
}
}
if (overlaps.length === 0) {
console.log("(none — squash touches files no recent main commit touched)\n");
} else {
console.log("Files the squash touched that also have recent main activity.");
console.log("Action: for each commit below, verify its changes still appear");
console.log("in HEAD. Reapply any silently dropped changes on the same branch.\n");
for (const { file, recent } of overlaps) {
console.log(` ${file}`);
for (const entry of recent) {
const [sha, ...subj] = entry.split("~");
console.log(` - ${sha} ${subj.join("~")}`);
}
}
console.log();
}
const issues = dupes.length + overlaps.length;
console.log(`Audit complete. ${issues} item(s) for the calling agent to review.`);
process.exit(issues === 0 ? 0 : 1);