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

fix: skip merger agent when squash merge stages nothing

Browse Source
This commit is contained in:
Dustin Byrne
2026-03-28 10:54:50 -04:00
parent 00954f2bbc
commit 0e0643a99e
4 changed files with 171 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
packages/engine/src/restart.integration.test.ts
View File

@@ -291,10 +291,11 @@ describe("In-review merge handling after restart", () => {
// Branch exists, merge succeeds, no conflicts
mockedExecSync.mockImplementation((cmd: any) => {
// git diff --cached --quiet check: return "0" (clean)
if (typeof cmd === "string" && cmd.includes("git diff --cached")) {
return "0" as any;
}
const cmdStr = String(cmd);
// Post-squash check: squash staged changes → "1"
if (cmdStr.includes("diff --cached --quiet")) return "1" as any;
// Post-agent check: agent committed → "0"
if (cmdStr.includes("diff --cached")) return "0" as any;
return Buffer.from("");
});
@@ -317,9 +318,9 @@ describe("In-review merge handling after restart", () => {
store.moveTask.mockResolvedValue(makeTask(taskId, "done"));
mockedExecSync.mockImplementation((cmd: any) => {
if (typeof cmd === "string" && cmd.includes("git diff --cached")) {
return "0" as any;
}
const cmdStr = String(cmd);
if (cmdStr.includes("diff --cached --quiet")) return "1" as any;
if (cmdStr.includes("diff --cached")) return "0" as any;
return Buffer.from("");
});
mockAgentSuccess();
@@ -336,9 +337,9 @@ describe("In-review merge handling after restart", () => {
// Branch exists, merge starts, agent creates but prompt fails
mockedExecSync.mockImplementation((cmd: any) => {
if (typeof cmd === "string" && cmd.includes("git diff --cached")) {
return "0" as any;
}
const cmdStr = String(cmd);
if (cmdStr.includes("diff --cached --quiet")) return "1" as any;
if (cmdStr.includes("diff --cached")) return "0" as any;
return Buffer.from("");
});
@@ -616,7 +617,12 @@ describe("Crash scenario edge cases", () => {
const store = createMockStore();
store.getTask.mockResolvedValue(makeTaskDetail("KB-091", "in-review"));
mockedExecSync.mockReturnValue(Buffer.from(""));
mockedExecSync.mockImplementation((cmd: any) => {
const cmdStr = String(cmd);
// Post-squash check: squash staged changes → "1"
if (cmdStr.includes("diff --cached --quiet")) return "1" as any;
return Buffer.from("");
});
// Agent prompt rejects (simulating kill during merge)
mockedCreateHaiAgent.mockResolvedValue({