Make merge dialog Enter follow the task's offered merge action

2026-10-21 11:59:52 -07:00
parent abe4d7c9d5
commit c7d0a1722a
7 changed files with 240 additions and 198 deletions
@@ -50,10 +50,11 @@ final class MergeModel {
 }

@MainActor
-func confirmMerge(_ taskId: String, _ store: Store, _ overlays: Overlays, keepOpen: Bool = false) async {
+func confirmMerge(_ taskId: String, _ store: Store, _ overlays: Overlays, keepOpen: Bool? = nil) async {
    guard let task = store.findTask(taskId), task.status == .active else {
        return
    }
+    let keepOpen = keepOpen ?? (task.readyMerge == ._continue)
    if store.taskBusy(taskId) {
        overlays.showAlert("Agent is mid-turn; merge when it's idle")
        return