refactor(merge): single IMergeCoordinator replaces the 5 conflict seams

The RequestConflictResolution Func was declared on 5 VMs and hand-threaded shell->details->merge-section->diff->merge-modal. Replaced with a DI-singleton IMergeCoordinator (MergeCoordinator holder; shell wires its Handler at composition, breaking the shell<->island cycle). Invokers (MergeModal, DetailsIsland, WorktreesOverview) depend on the interface; the two pass-through VMs (DiffModal, MergeSection) drop the seam entirely. No behavior change; conflict-seam + batch tests rewired to assert via the coordinator.
This commit is contained in:
Mika Kuns
2026-06-22 17:18:57 +02:00
parent 3f9f047955
commit 5be4b5c5fb
15 changed files with 79 additions and 75 deletions

View File

@@ -87,8 +87,6 @@ public sealed class WindowDialogService : IDialogService
var mergeDlg = new MergeModalView { DataContext = mergeVm };
await mergeDlg.ShowDialog(_owner);
};
vm.RequestConflictResolution = (taskId, target) =>
shell.RequestConflictResolutionAsync(taskId, target);
}
await dlg.ShowDialog(_owner);
}