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

fix(FN-4436): complete Step 3 — harden aggregation and in-progress patches

Browse Source 
Fusion-Task-Id: FN-4436
Fusion-Task-Lineage: df683800-0108-4415-a496-81481082284d
This commit is contained in:
Fusion
2026-05-13 23:00:34 -07:00
committed by gsxdsm
parent 2a5d7f323d
commit 5cd5cb4e4c
2 changed files with 122 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
packages/dashboard/src/__tests__/routes-diff.test.ts
View File

@@ -160,6 +160,12 @@ describe("FN-4308 multi-commit done task aggregation", () => {
"rev-list --parents -n 1 c3": "c3 p3",
"diff --name-status -M p3..c3": "A\td.txt",
"diff -M p3..c3 -- d.txt": "+d\n",
"rev-parse c1^": "p1",
"diff --name-status -M p1..c3": "A\ta.txt\nM\tb.txt\nA\tc.txt\nA\td.txt",
"diff -M p1..c3 -- a.txt": "+a\n",
"diff -M p1..c3 -- b.txt": "+bb\n-b\n",
"diff -M p1..c3 -- c.txt": "+c\n",
"diff -M p1..c3 -- d.txt": "+d\n",
});
const app = createServer(store as any);
@@ -248,6 +254,10 @@ describe("FN-4308 multi-commit done task aggregation", () => {
"rev-list --parents -n 1 rev-2": "rev-2 p2",
"diff --name-status -M p2..rev-2": "A\trevision.ts",
"diff -M p2..rev-2 -- revision.ts": "+r\n",
"rev-parse rev-1^": "p1",
"diff --name-status -M p1..rev-2": "A\tinitial.ts\nA\trevision.ts",
"diff -M p1..rev-2 -- initial.ts": "+i\n",
"diff -M p1..rev-2 -- revision.ts": "+r\n",
});
const app = createServer(store as any);
@@ -294,6 +304,83 @@ describe("FN-4308 multi-commit done task aggregation", () => {
expect(response.body.stats.filesChanged).toBe(2);
});
it("falls back to commitSha enumeration when aggregation under-counts mergeDetails", async () => {
const store = new MockStore();
store.addTask(createTask({ column: "done", lineageId: "lin-1", mergeDetails: { commitSha: "merge", filesChanged: 3 } }));
store.setAssociations("lin-1", [makeAssociation("assoc", "2026-04-01T00:00:00.000Z")]);
let mergeNameStatusCalls = 0;
runGitCommandMock.mockImplementation(async (args: string[]) => {
const key = args.join(" ");
if (key === "merge-base --is-ancestor assoc HEAD") return "";
if (key === "merge-base --is-ancestor merge HEAD") return "";
if (key === "rev-list --parents -n 1 assoc") return "assoc pa";
if (key === "diff --name-status -M pa..assoc") return "M\ta.txt";
if (key === "diff -M pa..assoc -- a.txt") return "+a\n";
if (key === "rev-list --parents -n 1 merge") return "merge pm";
if (key === "diff --name-status -M pm..merge") {
mergeNameStatusCalls += 1;
return mergeNameStatusCalls === 1 ? "M\tb.txt" : "A\tone.ts\nA\ttwo.ts\nA\tthree.ts";
}
if (key === "diff -M pm..merge -- b.txt") return "+b\n";
if (key === "rev-parse assoc^") return "pa";
if (key === "diff --name-status -M pa..merge") return "M\ta.txt";
if (key === "diff -M pa..merge -- a.txt") return "+a\n";
if (key === "diff -M pm..merge -- one.ts") return "+1\n";
if (key === "diff -M pm..merge -- two.ts") return "+2\n";
if (key === "diff -M pm..merge -- three.ts") return "+3\n";
throw new Error(`Unexpected git command: ${key}`);
});
const app = createServer(store as any);
const response = await requestDiff(app);
expect(response.status).toBe(200);
expect(response.body.files.map((f: any) => f.path).sort()).toEqual(["one.ts", "three.ts", "two.ts"]);
expect(response.body.files.length).toBe(response.body.stats.filesChanged);
});
it("uses empty tree fallback for root commit done tasks", async () => {
const store = new MockStore();
store.addTask(createTask({ column: "done", mergeDetails: { commitSha: "root" } }));
gitResponses({
"merge-base --is-ancestor root HEAD": "",
"rev-list --parents -n 1 root": "root",
"diff --name-status -M 4b825dc642cb6eb9a060e54bf8d69288fbee4904..root": "A\tinitial.ts",
"diff -M 4b825dc642cb6eb9a060e54bf8d69288fbee4904..root -- initial.ts": "+init\n",
});
const app = createServer(store as any);
const response = await requestDiff(app);
expect(response.status).toBe(200);
expect(response.body.files[0].path).toBe("initial.ts");
expect(response.body.files.length).toBe(response.body.stats.filesChanged);
});
it("uses diffBase-to-worktree patching for in-progress committed/staged/unstaged files", async () => {
const store = new MockStore();
store.addTask(createTask({ column: "in-progress", worktree: process.cwd() }));
gitResponses({
"diff --name-status origin/main..HEAD": "M\tcommitted.ts",
"diff --cached --name-status": "A\tstaged.ts",
"diff --name-status": "M\tunstaged.ts",
"diff origin/main -- committed.ts": "+c\n",
"diff origin/main -- staged.ts": "+s\n",
"diff origin/main -- unstaged.ts": "+u\n",
});
const app = createServer(store as any);
const response = await requestDiff(app);
expect(response.status).toBe(200);
expect(response.body.files).toHaveLength(3);
for (const file of response.body.files) {
expect(file.patch.length).toBeGreaterThan(0);
expect(file.additions + file.deletions).toBeGreaterThan(0);
}
expect(response.body.files.length).toBe(response.body.stats.filesChanged);
});
it("includes mergeDetails.commitSha even when missing from associations", async () => {
const store = new MockStore();
store.addTask(createTask({ column: "done", lineageId: "lin-1", mergeDetails: { commitSha: "merge-only" } }));

53
packages/dashboard/src/routes/register-session-diff-routes.ts
View File

@@ -337,7 +337,7 @@ async function collectDoneTaskFiles(task: DoneTaskAggregationTask, scopedStore:
};
}
const byPath = new Map<string, AggregatedDoneTaskFile>();
const byPath = new Map<string, DoneTaskFileStatus>();
for (const sha of reachableShas) {
let diffSpec: Awaited<ReturnType<typeof resolveCommitDiffSpec>>;
@@ -356,21 +356,32 @@ async function collectDoneTaskFiles(task: DoneTaskAggregationTask, scopedStore:
for (const file of filesForSha) {
const existing = byPath.get(file.path);
if (!existing) {
byPath.set(file.path, file);
continue;
}
existing.additions += file.additions;
existing.deletions += file.deletions;
existing.patch = `${existing.patch}${existing.patch && file.patch ? "\n" : ""}${file.patch}`;
if (statusPriority(file.status) > statusPriority(existing.status)) {
existing.status = file.status;
if (!existing || statusPriority(file.status) > statusPriority(existing)) {
byPath.set(file.path, file.status);
}
}
}
const files = Array.from(byPath.values());
const earliestSha = reachableShas[0];
const latestSha = reachableShas[reachableShas.length - 1];
if (!earliestSha || !latestSha) {
return {
files: [],
stats: { filesChanged: 0, additions: 0, deletions: 0 },
usedAggregation: false,
};
}
let earliestParent = EMPTY_TREE_SHA;
try {
earliestParent = (await runGitCommand(["rev-parse", `${earliestSha}^`], rootDir, 5000)).trim() || EMPTY_TREE_SHA;
} catch {
earliestParent = EMPTY_TREE_SHA;
}
const netRange = `${earliestParent}..${latestSha}`;
const netFiles = await collectDoneRangeFiles(netRange, rootDir).catch(() => []);
const files = netFiles.map((file) => ({ ...file, status: byPath.get(file.path) ?? file.status }));
return {
files,
stats: {
@@ -507,8 +518,10 @@ export function registerSessionDiffRoutes(router: Router, deps: SessionDiffRoute
if (task.column === "done" && task.mergeDetails?.commitSha) {
const aggregated = await collectDoneTaskFiles(task, scopedStore);
const expectedFilesChanged = task.mergeDetails?.filesChanged ?? 0;
const aggregationLooksComplete = expectedFilesChanged <= 0 || aggregated.files.length >= expectedFilesChanged;
if (aggregated.usedAggregation && aggregated.files.length > 0) {
if (aggregated.usedAggregation && aggregated.files.length > 0 && aggregationLooksComplete) {
res.json({
files: aggregated.files.map((file) => ({
...file,
@@ -604,7 +617,6 @@ export function registerSessionDiffRoutes(router: Router, deps: SessionDiffRoute
const cwd = resolvedWorktree;
const diffBase = await resolveDiffBase(task, cwd, "HEAD", undefined, { enableDisplayRecovery: true });
const diffRange = diffBase ? `${diffBase}..HEAD` : "HEAD";
// Only count files actually changed by the task: committed (base..HEAD)
// + staged + unstaged. Untracked files are intentionally excluded — at
@@ -668,7 +680,9 @@ export function registerSessionDiffRoutes(router: Router, deps: SessionDiffRoute
let patch = "";
try {
patch = await runGitCommand(["diff", diffRange, "--", filePath], cwd, 10000);
patch = diffBase
? await runGitCommand(["diff", diffBase, "--", filePath], cwd, 10000)
: await runGitCommand(["diff", "HEAD", "--", filePath], cwd, 10000);
} catch {
// ignore individual file errors
}
@@ -705,8 +719,10 @@ export function registerSessionDiffRoutes(router: Router, deps: SessionDiffRoute
if (task.column === "done" && task.mergeDetails?.commitSha) {
const aggregated = await collectDoneTaskFiles(task, scopedStore);
const expectedFilesChanged = task.mergeDetails?.filesChanged ?? 0;
const aggregationLooksComplete = expectedFilesChanged <= 0 || aggregated.files.length >= expectedFilesChanged;
if (aggregated.usedAggregation && aggregated.files.length > 0) {
if (aggregated.usedAggregation && aggregated.files.length > 0 && aggregationLooksComplete) {
res.json(aggregated.files.map((file) => ({ path: file.path, status: file.status, diff: file.patch })));
return;
}
@@ -842,7 +858,6 @@ export function registerSessionDiffRoutes(router: Router, deps: SessionDiffRoute
// ignore unstaged diff failures
}
const diffRange = diffBase ? `${diffBase}..HEAD` : "HEAD";
const files = [];
for (const [filePath, { statusCode, oldPath }] of fileMap.entries()) {
@@ -858,7 +873,9 @@ export function registerSessionDiffRoutes(router: Router, deps: SessionDiffRoute
let diff = "";
try {
diff = await runGitCommand(["diff", diffRange, "--", filePath], cwd, 5000);
diff = diffBase
? await runGitCommand(["diff", diffBase, "--", filePath], cwd, 5000)
: await runGitCommand(["diff", "HEAD", "--", filePath], cwd, 5000);
} catch {
diff = "";
}