From 36918e0432d1c27f4063ca4825a6b88cc329d248 Mon Sep 17 00:00:00 2001
From: atlas <atlas@pr1ma.darkest.space>
Date: Mon, 27 Jul 2026 14:33:24 +0200
Subject: [PATCH] fix(#2756): a cancelled DAG must not read back as Queued
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Review catch from argus on #2770: with the terminal hook gone, cancel
spares the DAG's tail node so it can report the cancellation — which
leaves that node `Pending` until the scheduler's next pass.
`post_rebuild_queue_cancel` emits its snapshot synchronously, and
`rollup_state` ranked `Queued` above `Cancelled`, so the operator who
just cancelled a DAG saw it go back to **Queued**: "the cancel didn't
take". Asserted in `cancel_clears_queued_dag`, which failed before this.

Fixing it surfaced an older disagreement. `builds.js::rollupState` has
always been `failed > cancelled > running > queued`; the Rust was
`failed > running > queued > cancelled`. The two had silently diverged
under a doc-comment claiming they agree. Harmless until now only because
cancelled nodes never coexisted with live ones — a spared tail running
over cancelled work would have rendered `Running` host-side and
`Cancelled` in the dashboard.

The JS was the correct side, so the Rust moves to match it exactly:
`Failed > Cancelled > Running > Queued > Done`. No frontend change.
---
 hive-c0re/src/job_queue/tests.rs |  5 +++++
 hive-host-sock/src/jobs.rs       | 21 ++++++++++++++++-----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/hive-c0re/src/job_queue/tests.rs b/hive-c0re/src/job_queue/tests.rs
index e1a5e9fc..40251fd7 100644
--- a/hive-c0re/src/job_queue/tests.rs
+++ b/hive-c0re/src/job_queue/tests.rs
@@ -934,6 +934,11 @@ fn cancel_clears_queued_dag() {
     let q = JobQueue::new(1);
     let id = submit(&q, rebuild("agent-a", "r"));
     assert!(q.cancel(id), "fully-queued dag cancels");
+    // The operator sees `Cancelled` the moment the cancel returns — the spared
+    // tail is still `Pending`, and a DAG must not read `Queued` back to the
+    // operator who just cancelled it (the dashboard renders this roll-up from
+    // the snapshot `post_rebuild_queue_cancel` emits synchronously).
+    assert_eq!(state_of(&q, id), State::Cancelled, "no stale Queued gap");
     // Every work node is `Cancelled`, but the tail is spared so it can still
     // report the cancellation — so it is the one thing left to claim.
     let tail = claim_one(&q);
diff --git a/hive-host-sock/src/jobs.rs b/hive-host-sock/src/jobs.rs
index 1f41ea87..5fa5d24b 100644
--- a/hive-host-sock/src/jobs.rs
+++ b/hive-host-sock/src/jobs.rs
@@ -170,10 +170,21 @@ impl DagView {
     /// Roll-up state derived from the node set — the shared derivation every
     /// Rust consumer (hivectl, the wait loops, tests) uses so the dashboard's
     /// JS render and the host agree: `Failed` if any node failed, else
-    /// `Running` if any running, else `Queued` if any queued, else
-    /// `Cancelled` if any cancelled, else `Done`. `Done` nodes are excluded
+    /// **`Cancelled` if any cancelled**, else `Running` if any running, else
+    /// `Queued` if any queued, else `Done`. `Done` nodes are excluded
     /// from the wire, so a DAG that is *entirely* done isn't sent at all —
     /// its absence from the snapshot is what signals completion.
+    ///
+    /// `Cancelled` outranks both `Running` and `Queued` because a cancelled DAG
+    /// still has its weak-edged tail node to run (it reports the cancellation),
+    /// so `Queued`-then-`Running` would flicker back at the operator who just
+    /// cancelled it and read as "the cancel didn't take". Outside that window
+    /// the states barely co-occur: a cancel *cascade* originates at a `Failed`
+    /// node, which returns early above.
+    ///
+    /// This ordering matches `frontend/packages/dashboard/src/builds.js`'s
+    /// `rollupState`, which has always ranked cancelled second — the two had
+    /// silently disagreed, and this is the side that was wrong.
     #[must_use]
     pub fn rollup_state(&self) -> State {
         let mut any_running = false;
@@ -188,12 +199,12 @@ impl DagView {
                 State::Done => {}
             }
         }
-        if any_running {
+        if any_cancelled {
+            State::Cancelled
+        } else if any_running {
             State::Running
         } else if any_queued {
             State::Queued
-        } else if any_cancelled {
-            State::Cancelled
         } else {
             State::Done
         }