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

feat(FN-5419): add stash conflict modal gating and smart pull routing for m

Browse Source 
Implements a pull-based merge workflow by wiring the merger pull helpers from the engine, extending the git pull and stash routes, and aligning the `MergeAdvanceNotice` and `StashConflictModal` components to gate dismissal on stash drop. The `run-audit` module is updated with pull mutation documenta

Fusion-Task-Id: FN-5419

Co-authored-by: Fusion (runfusion.ai) <noreply@runfusion.ai>
Fusion-Task-Id: FN-5419
This commit is contained in:
gsxdsm
2026-05-23 12:59:49 -07:00
parent 7a20b95502
commit 14bc63e813
15 changed files with 603 additions and 742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
packages/engine/src/__tests__/run-audit.test.ts
View File

@@ -88,16 +88,51 @@ describe("run-audit provisioning mutation types", () => {
]);
});
it("accepts smart-pull git mutation types", async () => {
it("accepts pull:fast-forward metadata shape", async () => {
const store = new AuditStoreStub();
const auditor = createRunAuditor(store as unknown as TaskStore, { runId: "r1", agentId: "a1", taskId: "FN-5358" });
const auditor = createRunAuditor(store as unknown as TaskStore, { runId: "r1", agentId: "a1", taskId: "FN-5419" });
const types: GitMutationType[] = ["pull:fast-forward", "stash:pop-conflict", "push:origin"];
for (const type of types) {
await auditor.git({ type, target: "feature/worktree", metadata: { taskId: "FN-5358" } });
}
const type: GitMutationType = "pull:fast-forward";
await auditor.git({
type,
target: "/repo/.worktrees/integration",
metadata: {
taskId: "FN-5419",
worktreePath: "/repo/.worktrees/integration",
integrationBranch: "main",
remote: "origin",
fromSha: "1111111",
toSha: "2222222",
durationMs: 12,
succeeded: true,
behind: 0,
ahead: 0,
},
});
expect(store.events.map((event) => event.mutationType)).toEqual(types);
expect(store.events[0]?.mutationType).toBe(type);
});
it("accepts stash:pop-conflict metadata shape", async () => {
const store = new AuditStoreStub();
const auditor = createRunAuditor(store as unknown as TaskStore, { runId: "r1", agentId: "a1", taskId: "FN-5419" });
const type: GitMutationType = "stash:pop-conflict";
await auditor.git({
type,
target: "/repo/.worktrees/integration",
metadata: {
taskId: "FN-5419",
worktreePath: "/repo/.worktrees/integration",
stashSha: "abc123",
stashLabel: "fusion-autostash-FN-5419",
conflictedFiles: ["README.md"],
autostashOutcome: "conflict-needs-manual",
advice: "Resolve conflicts and drop stash when complete",
},
});
expect(store.events[0]?.mutationType).toBe(type);
});
it("records merge:scope:auto-widen git events", async () => {