Refuse turns, discard and subtasks while a merge is finalizing

2026-10-16 12:46:28 -07:00
parent 0e52253d07
commit ecfae97d97
11 changed files with 287 additions and 233 deletions
@@ -987,7 +987,7 @@ export interface components {
             * @enum {string}
             */
            state: "running" | "idle" | "review_pending" | "reviewing" | "merging" | "discarding" | "merged" | "discarded" | "no_agent";
-            /** @description Whether a Merge was started and its turn hasn't ended yet. */
+            /** @description Whether a Merge was started and hasn't finished: its turn is running, or the turn ended and byre is squashing, pushing and closing the task. */
            merging: boolean;
            /** @description Whether a Discard was started and the task isn't closed yet: its summary turn is waiting for the running turn, running, or done and the task is being removed. */
            discarding: boolean;