merge completion on click

2026-10-19 12:00:05 -07:00
parent 7965e9025a
commit 6672127373
1 changed files with 2 additions and 1 deletions
@@ -305,7 +305,8 @@ final class ChatModel {
            return []
        }
        let latest = latestReview(store.transcript)
-        let active = store.findTask(taskId)?.status == .active
+        let task = store.findTask(taskId)
+        let active = task.map { $0.status == .active && !$0.merging && !$0.mergingIntoParent && $0.mergeQueuedAt == nil && !$0.mergeAfterReview } ?? false
        var questions: [Int] = []
        var open: [Int] = []
        var ready: [Int] = []