Give each workflow run a parent task with no agent

2026-10-21 09:02:09 -07:00
parent d062d7ccae
commit a130b9556d
23 changed files with 661 additions and 474 deletions
@@ -661,7 +661,7 @@ private struct MergeButton: View {
            ? "Waiting for the merge in progress in this project to finish"
            : task.mergeAfterReview
            ? "Merges when the running review finishes with no findings; open to merge now instead (⌘S)"
-            : task.parentTaskId != nil
+            : task.parentTaskId != nil && task.workflowStage == nil
            ? "Merge this subtask into its parent task's branch, or into \(target) (⌘S)"
            : "The agent merges \(target) in, then byre squashes into one commit on \(target) and pushes it to origin; held while another task in the project is merging (⌘S)"
        Button(intoParent ? "Merging into parent" : held ? "Merge held" : task.mergeAfterReview ? "Merge after review" : keepOpen == false ? "Merge & complete" : "Merge") {