2 files changed, 22 insertions, 2 deletions
diff --git a/src/features/cache-warming/logic/view-model.test.ts b/src/features/cache-warming/logic/view-model.test.ts
index 3d6f6d0..d5ea901 100644
--- a/src/features/cache-warming/logic/view-model.test.ts
+++ b/src/features/cache-warming/logic/view-model.test.ts
@@ -215,6 +215,14 @@ describe("secondsUntilNext (authoritative, from nextWarmAt)", () => {
 		expect(secondsUntilNext(10_000, 10_000)).toBe(0);
 		expect(secondsUntilNext(250_000, 10_000)).toBe(240);
 		expect(secondsUntilNext(70_000, 10_000)).toBe(60);
-		expect(secondsUntilNext(5_000, 999_999)).toBe(0); // already past
+	});
+
+	it("treats a nextWarmAt past the stale grace as not scheduled (belt-and-braces)", () => {
+		// Within the 3s grace an on-time warm may briefly read "0s"…
+		expect(secondsUntilNext(10_000, 11_000)).toBe(0);
+		expect(secondsUntilNext(10_000, 13_000)).toBe(0);
+		// …but beyond it the value is stale → null (the "waiting…" state).
+		expect(secondsUntilNext(10_000, 13_001)).toBeNull();
+		expect(secondsUntilNext(5_000, 999_999)).toBeNull();
 	});
 });
diff --git a/src/features/cache-warming/logic/view-model.ts b/src/features/cache-warming/logic/view-model.ts
index f7740d7..eb105f6 100644
--- a/src/features/cache-warming/logic/view-model.ts
+++ b/src/features/cache-warming/logic/view-model.ts
@@ -232,11 +232,23 @@ export function observeWarm(
 }
 
 /**
+ * Grace before a PAST `nextWarmAt` is treated as "not scheduled" (→ the
+ * "waiting…" state instead of a perpetual "0s"). The backend pushes the FUTURE
+ * `nextWarmAt` after every warm (CR-4b) and `null` while generating/disabled, so
+ * this is a belt-and-braces guard that should never trigger — it only matters
+ * against a stale/buggy emitter, and the small window lets an on-time warm show
+ * "0s" for the second it takes to complete.
+ */
+const STALE_NEXT_WARM_MS = 3000;
+
+/**
  * Seconds until the next automatic warm, AUTHORITATIVE: derived straight from the
  * backend's `nextWarmAt` epoch-ms (never FE-anchored/guessed). `null` when nothing
- * is scheduled (disabled, or a turn is generating so the timer is cancelled).
+ * is scheduled (disabled, or a turn is generating so the timer is cancelled) — or
+ * when `nextWarmAt` is stale (further than the grace into the past).
  */
 export function secondsUntilNext(nextWarmAt: number | null, now: number): number | null {
 	if (nextWarmAt === null) return null;
+	if (now - nextWarmAt > STALE_NEXT_WARM_MS) return null;
 	return Math.max(0, Math.ceil((nextWarmAt - now) / 1000));
 }