tumwater 0.4.0 → 0.4.2

package/dist/src/ui/gui/gui-client-pending.js

@@ -74,10 +74,10 @@ export const GUI_CLIENT_PENDING_JS = String.raw `  let pendingTeam = null;
   // optional merge label, and summary. Shared by the Merge queue card and the role drawer so
   // the two cannot drift; a malformed entry renders stand-ins rather than undefined/NaN.
   function queueEntryLineHtml(e, position, now, label, cancel, top) {
-    const sec = Number.isFinite(e.enqueuedAt) ? Math.max(0, Math.round((now - e.enqueuedAt) / 1000)) : 0;
+    const sec = Number.isFinite(e.enqueuedAt) ? secsSince(e.enqueuedAt, now) : 0;
     const run = Number.isFinite(e.run) ? e.run : "?";
     const note = Number.isFinite(e.revisionRound) ? " · revision " + e.revisionRound + (Number.isFinite(e.priorObjections) && e.priorObjections > 0 ? " · " + plural(e.priorObjections, "prior objection") : "") : "";
-    const retry = typeof e.retry === "string" ? " · re-queued after " + e.retry + (Number.isFinite(e.retryCount) && e.retryCount > 1 ? " · ×" + e.retryCount : "") + (Number.isFinite(e.notBefore) && e.notBefore > now ? " · eligible in " + humanSeconds(Math.max(0, Math.round((e.notBefore - now) / 1000))) : "") : "";
+    const retry = typeof e.retry === "string" ? " · re-queued after " + e.retry + (Number.isFinite(e.retryCount) && e.retryCount > 1 ? " · ×" + e.retryCount : "") + (Number.isFinite(e.notBefore) && e.notBefore > now ? " · eligible in " + humanSeconds(secsUntil(e.notBefore, now)) : "") : "";
     let line = "<div class='mono clamp1' style='padding:3px 0'>" + position + ". " + esc(e.role ? roleLabel(e.role) : "?") +
       " run #" + esc(run) + " · " + esc(shortSha(e.sha)) + " · " + esc(humanSeconds(sec)) +
       " ago" + (label && typeof label === "string" ? " · [" + esc(label) + "]" : "") +
@@ -238,7 +238,7 @@ export const GUI_CLIENT_PENDING_JS = String.raw `  let pendingTeam = null;
   // verdict-less failed-review-run count when positive, else "". Hand-kept copy because the
   // script cannot import the server renderer; pinned by the client test against the CLI wording.
   const squashText = (s, max) => {
-    const t = String(s).replace(/\s+/g, " ").trim();
+    const t = squash(s);
     if (t.length <= max) return t;
     return t.slice(0, max - 1).trimEnd() + "…";
   };
@@ -297,7 +297,7 @@ export const GUI_CLIENT_PENDING_JS = String.raw `  let pendingTeam = null;
     const lines = kept.map((e) => {
       const label = postReviewStatusLabel(e);
       const age = typeof e.enqueuedAt === "number" && Number.isFinite(now)
-        ? " · " + esc(humanSeconds(Math.max(0, Math.round((now - e.enqueuedAt) / 1000)))) + " ago"
+        ? " · " + esc(humanSeconds(secsSince(e.enqueuedAt, now))) + " ago"
         : "";
       let line = "<div class='queue-entry mono clamp1'>" + esc(e.role ? roleLabel(e.role) : "?") + " " + esc(shortSha(e.commit)) +
         age +

package/dist/src/ui/gui/gui-client-report-chart.js

@@ -1,10 +1,12 @@
 /** The dashboard Usage view's chart builders, browser-side: the report-chart region. Pure
  * functions from /api/report's day series to SVG strings — the per-day bar and stacked charts,
  * their role/provider/model orderings, the shared role palette, the has-data predicates that
- * decide which charts draw, and the merge-share line's wording — with no DOM access, so the
- * tests exercise them in isolation.
+ * decide which charts draw, the merge-share line's wording, and the cost-per-commit /
+ * estimated-per-commit lines (costPerCommitParts, costPerCommitText, estimatedPerCommitText) —
+ * with no DOM access, so the tests exercise them in isolation.
  * Spliced into gui-client.ts's script ahead of gui-client-report.ts's hover chip, Role picker,
  * and view code, which call them through that concatenation. */
+import { INSTANCE_ID_SOURCE } from "../../roles/runner-ids.js";
 export const GUI_CLIENT_REPORT_CHART_JS = String.raw `
 // report-chart:start
   // One color per role, assigned in the report's role order so a role keeps its color across
@@ -12,6 +14,12 @@ export const GUI_CLIENT_REPORT_CHART_JS = String.raw `
   const REPORT_PALETTE = ["#6366f1", "#f59e0b", "#10b981", "#ef4444", "#0ea5e9", "#a855f7", "#f97316", "#14b8a6",
     "#ec4899", "#84cc16", "#06b6d4", "#eab308", "#64748b", "#d946ef"];
 
+  // A [key, number][] ordering by total desc then key asc — the shared shape of every
+  // role/provider/model ordering (tallyAcross's role/provider/model rows and costPerCommitParts's
+  // mergeDone and idle pairs each spelled the b[1]-a[1] || a[0].localeCompare(b[0]) comparator
+  // inline), so none of them can drift on the count-then-name rule.
+  const byTotalThenName = (a, b) => b[1] - a[1] || a[0].localeCompare(b[0]);
+
   // One [key, total][] for a day series, ordered by total desc then name asc — the shared
   // shape of the role/provider/model orderings. sumFields are the fields that contribute a
   // running total (runsByRole, costByProvider, runsByModel); seedFields are fields whose
@@ -31,7 +39,7 @@ export const GUI_CLIENT_REPORT_CHART_JS = String.raw `
         for (const k of Object.keys(d[field] || {})) if (!Object.hasOwn(by, k)) by[k] = 0;
       }
     }
-    return Object.entries(by).sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0]));
+    return Object.entries(by).sort(byTotalThenName);
   }
 
   // Window totals per role — runs desc, then name — so the legend and the stack order match
@@ -40,7 +48,7 @@ export const GUI_CLIENT_REPORT_CHART_JS = String.raw `
   // Object.prototype key whose inherited value would otherwise seed the counter and satisfy
   // the membership test (the browser twin of addTo's fix; BUGS.md 2026-10-10).
   function reportRoleOrder(data) {
-    return tallyAcross(data.series, ["runsByRole"], ["costByRole", "notionalByRole", "rejectionsByRole", "revisionsByRole", "refusalsByRole", "fallbacksByRole", "imageReroutesByRole", "failedRunsByRole", "mergeFailedByRole", "commitsByRole", "mergedByRole"]);
+    return tallyAcross(data.series, ["runsByRole"], ["costByRole", "notionalByRole", "rejectionsByRole", "revisionsByRole", "refusalsByRole", "fallbacksByRole", "failedRunsByRole", "mergeFailedByRole", "commitsByRole", "mergedByRole"]);
   }
 
   // X-axis labels: MM-DD, thinned to at most seven, counted back from the newest day so today
@@ -155,8 +163,8 @@ export const GUI_CLIENT_REPORT_CHART_JS = String.raw `
       countAxis, true);
   }
   // Main's red wall-clock per day, from mainRedMs (the same main_check/main_red_hold rule G1
-  // uses): the span every code role was held. A day without one keeps its empty slot, like the
-  // median charts; the red color reads beside the red-check-count chart it follows.
+  // uses): the span main had no passing full check; a day without one keeps its empty slot,
+  // like the median charts; the red color reads beside the red-check-count chart it follows.
   function chartMainRedMs(data) {
     return reportSvg(data.series, (d) => [{ value: Number(d.mainRedMs) || 0, color: "#dc2626", title: d.date + ": " + fmtSpan(Number(d.mainRedMs) || 0) + " main red" }],
       (v) => fmtSpan(v), false);
@@ -280,6 +288,21 @@ export const GUI_CLIENT_REPORT_CHART_JS = String.raw `
     return roleStackChart(data, "tokensByRole", (n) => fmtTokens(Number(n) || 0) + " output tokens", (v) => fmtTokens(Math.round(v)), true);
   }
 
+  // The day's prompt tokens, per role, the browser twin of the report's "Prompt tokens by
+  // role" line — same roleStackChart shape, palette, legend order and integer count axis as
+  // chartTokensByRole, so a role keeps its palette color and legend order from
+  // reportRoleOrder.
+  function chartPromptTokensByRole(data) {
+    return roleStackChart(data, "promptTokensByRole", (n) => fmtTokens(Number(n) || 0) + " prompt tokens", (v) => fmtTokens(Math.round(v)), true);
+  }
+
+  // The day's cache-read prompt tokens, per role, the browser twin of the report's "Prompt
+  // tokens by role" line's cache-read share — the same shape over cacheReadTokensByRole with
+  // the " cached prompt tokens" label, keeping the same palette order and count axis.
+  function chartCacheReadTokensByRole(data) {
+    return roleStackChart(data, "cacheReadTokensByRole", (n) => fmtTokens(Number(n) || 0) + " cached prompt tokens", (v) => fmtTokens(Math.round(v)), true);
+  }
+
   // The API-equivalent (notional) spend of subscription runs, per role, on the same axis as
   // the cap spend.
   function chartNotionalByRole(data) {
@@ -353,10 +376,6 @@ export const GUI_CLIENT_REPORT_CHART_JS = String.raw `
   function chartFallbacksByRole(data) {
     return roleStackChart(data, "fallbacksByRole", (n) => plural(n, "fallback"), countAxis, true);
   }
-  // Image reroutes per role, drawn the same way: one segment per (day, role) with a reroute.
-  function chartImageReroutesByRole(data) {
-    return roleStackChart(data, "imageReroutesByRole", (n) => plural(n, "image reroute"), countAxis, true);
-  }
   // Runs that ended in an error, per role, drawn the same way.
   function chartFailedRunsByRole(data) {
     return roleStackChart(data, "failedRunsByRole", (n) => plural(n, "failed run"), countAxis, true);
@@ -385,6 +404,32 @@ export const GUI_CLIENT_REPORT_CHART_JS = String.raw `
   function chartValidationGaps(data) {
     return stackChart(data, reportValidationGapOrder(data), "validationGapsByTag", (n) => plural(n, "validation gap"), countAxis, true);
   }
+  // Window tallies per main-red failing test, count desc then name asc — the browser twin of
+  // the day report's "Main red by test" line. Test keys are dynamic, so reads and seeds go
+  // through tallyAcross's Object.hasOwn checks as its siblings do; a test no day recorded
+  // still gets a row only if some day carries it.
+  function reportMainRedTestOrder(data) {
+    return tallyAcross(data.series, ["mainRedByTest"], []);
+  }
+  // The team's main-red failing tests, per day, stacked by test: each segment one (day, test),
+  // the dashboard twin of the day report's "Main red by test" line. Sparse like the model
+  // chart; test names are the legend labels.
+  function chartMainRedByTest(data) {
+    return stackChart(data, reportMainRedTestOrder(data), "mainRedByTest", (n) => plural(n, "red check"), countAxis, true);
+  }
+  // Window tallies per main-red blamed merge (the report's "<role> <shortSha>" label), count
+  // desc then name asc — the browser twin of the day report's "Main red by merge" line.
+  // Culprit keys are dynamic, so reads and seeds go through tallyAcross's Object.hasOwn checks
+  // as its siblings do; a culprit no day recorded still gets a row only if some day carries it.
+  function reportMainRedCulpritOrder(data) {
+    return tallyAcross(data.series, ["mainRedByCulprit"], []);
+  }
+  // The team's main-red blamed merges, per day, stacked by culprit: each segment one
+  // (day, culprit), the dashboard twin of the day report's "Main red by merge" line. Sparse
+  // like the model chart; the culprit labels are the legend labels.
+  function chartMainRedByMerge(data) {
+    return stackChart(data, reportMainRedCulpritOrder(data), "mainRedByCulprit", (n) => plural(n, "blame"), countAxis, true);
+  }
   // The day's merged outcomes per role, the success sibling of chartMergeFailuresByRole,
   // drawn exactly like it (same roleStackChart shape, palette, legend order and integer count
   // axis) so the two read as one pair.
@@ -415,6 +460,62 @@ export const GUI_CLIENT_REPORT_CHART_JS = String.raw `
   function mergeShareText(t) {
     return "of which merge runs: " + t.mergeRuns + " runs" + ((t.mergeFailed || 0) > 0 ? " (" + t.mergeFailed + " failed)" : "") + " · " + fmtTokens(t.mergeTokens || 0) + " tokens · " + fmtUsd(t.mergeCostUsd || 0) + " (reviewer + conflict resolution)";
   }
+
+  // The instance-id matcher for the cost-per-commit lines below, the same pattern
+  // gui-client-labels.ts uses, named distinctly from that region's INSTANCE_ID so the
+  // concatenated script has no duplicate const. Interpolated from the server's
+  // INSTANCE_ID_SOURCE so the base-role fold cannot drift from baseRoleOf.
+  const COST_INSTANCE_ID = new RegExp(${JSON.stringify(INSTANCE_ID_SOURCE)});
+
+  // Cost per merged commit by base role, the browser twin of report-render.ts's
+  // costPerCommitPairs: spend folded to its base role (feature-2 joins feature), commits read
+  // as-is (already base-keyed). mergeDone is [role, cost per commit, commits] for roles with
+  // both, ranked by cost per commit desc then name asc; idle is [role, cost] for roles that
+  // spent and merged nothing, ranked by spend. pick selects another per-role-id spend map
+  // (e.g. notionalByRole); a role with commits but no spend in the picked map appears in
+  // neither list.
+  function costPerCommitParts(series, pick) {
+    const cost = {};
+    const commits = {};
+    for (const d of series) {
+      const pickSpend = pick || ((day) => day.costByRole);
+      for (const [id, c] of Object.entries(pickSpend(d) || {})) {
+        const m = COST_INSTANCE_ID.exec(id);
+        const base = m ? m[1] : id;
+        cost[base] = (Object.hasOwn(cost, base) ? cost[base] : 0) + c;
+      }
+      for (const [role, n] of Object.entries(d.commitsByRole || {})) {
+        commits[role] = (Object.hasOwn(commits, role) ? commits[role] : 0) + n;
+      }
+    }
+    const mergeDone = [];
+    const idle = [];
+    for (const [role, c] of Object.entries(cost)) {
+      if (!(c > 0)) continue;
+      const n = commits[role] || 0;
+      if (n > 0) mergeDone.push([role, c / n, n]);
+      else idle.push([role, c]);
+    }
+    mergeDone.sort(byTotalThenName);
+    idle.sort(byTotalThenName);
+    return { mergeDone, idle };
+  }
+
+  // One "label: role — cost (n) · role — cost, no commits" line from costPerCommitParts, the
+  // browser twin of report-render.ts's costPerCommitLine; "-" when nothing to show.
+  function costPerCommitText(label, series, pick) {
+    const parts = costPerCommitParts(series, pick);
+    const lines = [];
+    for (const [r, per, n] of parts.mergeDone) lines.push(r + " — " + fmtUsd(per) + " (" + n + ")");
+    for (const [r, c] of parts.idle) lines.push(r + " — " + fmtUsd(c) + ", no commits");
+    return label + ": " + (lines.length === 0 ? "-" : lines.join(" · "));
+  }
+
+  // The Estimated per commit line, over notionalByRole, the browser twin of
+  // renderReportMarkdown's notional-gated line; the caller decides when it prints.
+  function estimatedPerCommitText(series) {
+    return costPerCommitText("Estimated per commit", series, (d) => d.notionalByRole);
+  }
   // The per-day filing-stamp twin of chartBacklogItems: plans added and bugs filed, the same
   // two colors as the done chart so the opened and done charts read as a pair. A day with
   // neither carries an empty slot, and zero segments draw no rect.

package/dist/src/ui/gui/gui-client-report.js

@@ -9,8 +9,8 @@
  * CLI; the since shape draws the returned Markdown instead of the charts. Failures renders
  * the failure digest (/api/failures, the Markdown `tumwater report --failures` prints) through
  * the page's Markdown renderer, over the same kind of window and Role pickers. The Failures view
- * also paints the current flake quarantine below the digest, the read twin of the amber quarantine
- * alert. Both fetch when
+ * also paints the current flake quarantine below the digest, the interactive release twin of
+ * `tumwater quarantine --release <n>` (each row's Release button). Both fetch when
  * their view opens, on Refresh, and — Usage only, throttled — when new events arrive while it
  * is open. On a trailing window, ◀ Earlier / Later ▶ step it back by its own length through
  * `?sinceMs=&untilMs=`, the twin of `report --since --until`. The chart builders are pure and
@@ -206,6 +206,12 @@ export const GUI_CLIENT_REPORT_JS = String.raw `// report-tip:start
     async function fetchView(throttled) {
       if (throttled && Date.now() - fetchedAt < 60000) return;
       fetchedAt = Date.now();
+      // A re-render replaces every Release button with a fresh "Release" label, so the armed
+      // state (whichever button previously carried "Click again to release") no longer refers
+      // to a live button — clear it just before the rebuild, or a single post-render click
+      // would pass for the second. Only a fetch that actually rebuilds does this: a throttled
+      // fetch that returns early above must not clear a button the user has armed.
+      disarmQuarantineRelease();
       buildOnce(o.panelId, viewHead(o.title, o.blurb, o.pickerId, o.choices, days, o.refreshId, o.rolePickerId, o.sinceChoices) +
         "<div id='" + o.bodyId + "'><div class='empty'>Loading…</div></div>");
       // Exactly one of the two controls is active: a live since window clears the day buttons
@@ -235,6 +241,17 @@ export const GUI_CLIENT_REPORT_JS = String.raw `// report-tip:start
         fetchView();
       });
       container.addEventListener("click", (ev) => {
+        // The flake-quarantine card's Release buttons (Failures view): the first click arms,
+        // the second posts and re-fetches only after the post resolves (quarantineReleaseClick)
+        // so the released row disappears; any other click disarms.
+        const rel = clickClosest(ev, "[data-action='quarantine-release']");
+        if (rel) {
+          quarantineReleaseClick(rel,
+            (test) => postAction("/api/quarantine-release", { test }, (d) => d && d.message),
+            fetchView);
+          return;
+        }
+        disarmQuarantineRelease();
         const st = clickClosest(ev, "[data-step]");
         if (st) {
           if (st.dataset.step === "earlier") {
@@ -310,16 +327,15 @@ export const GUI_CLIENT_REPORT_JS = String.raw `// report-tip:start
         "</h2><span class='muted'>" + esc(sub || "per day") + "</span></header><div class='chart'>" + svg + "</div></section>";
       // A scoped report drops to the four scoped tiles and says what it left out, mirroring the
       // CLI's --role report. The team-wide render is unchanged.
-      return "<div class='stats" + (d.role ? "" : " six") + "'>" + reportSummary(d) + "</div>" + (d.totals.mergeRuns > 0 ? "<p class='muted merge-share'>" + esc(mergeShareText(d.totals)) + "</p>" : "") + "<div class='grid-2 even'>" +
+      return "<div class='stats" + (d.role ? "" : " six") + "'>" + reportSummary(d) + "</div>" + (d.totals.mergeRuns > 0 ? "<p class='muted merge-share'>" + esc(mergeShareText(d.totals)) + "</p>" : "") + "<p class='muted cost-per-commit'>" + esc(costPerCommitText("Cost per commit", d.series)) + "</p>" + (d.totals.notionalCostUsd > 0 ? "<p class='muted cost-per-commit'>" + esc(estimatedPerCommitText(d.series)) + "</p>" : "") + "<div class='grid-2 even'>" +
         block("Work vs maintenance commits", chartCommitTiers(d), "per day · work + maintenance") + block("Merged commits", chartCommits(d)) + block("Commits by role", chartCommitsByRole(d)) + (seriesHasBacklogAdded(d) ? block("Backlog items opened", chartBacklogItemsOpened(d), "per day · plans added + bugs filed") : "") + (seriesHasBacklogItems(d) ? block("Backlog items done", chartBacklogItems(d), "per day · features done + bugs fixed") : "") + (seriesHasBacklogLagMedian(d) ? block("Backlog lag median", chartBacklogLagMedian(d), "per day · filing to done") : "") + block("Runs by role", chartRunsByRole(d)) +
-        block("Output tokens", chartTokens(d)) + block("Tokens by role", chartTokensByRole(d)) + block("Spend by role", chartCostByRole(d)) +
+        block("Output tokens", chartTokens(d)) + block("Tokens by role", chartTokensByRole(d)) + (seriesHasAny(d, "promptTokensByRole") ? block("Prompt tokens by role", chartPromptTokensByRole(d)) : "") + (seriesHasAny(d, "cacheReadTokensByRole") ? block("Cached prompt tokens by role", chartCacheReadTokensByRole(d)) : "") + block("Spend by role", chartCostByRole(d)) +
         (!d.role && seriesHasAny(d, "costByProvider") ? block("Spend by provider", chartCostByProvider(d)) : "") +
         block("Rejections by role", chartRejectionsByRole(d)) +
         (seriesHasAny(d, "postMergeRejectionsByRole") ? block("Post-merge rejections by role", chartPostMergeRejectionsByRole(d)) : "") +
         (seriesHasAny(d, "revisionsByRole") ? block("Revisions by role", chartRevisionsByRole(d)) : "") +
         (seriesHasAny(d, "refusalsByRole") ? block("Refusals by role", chartRefusalsByRole(d)) : "") +
         (seriesHasAny(d, "fallbacksByRole") ? block("Fallbacks by role", chartFallbacksByRole(d)) : "") +
-        (seriesHasAny(d, "imageReroutesByRole") ? block("Image reroutes by role", chartImageReroutesByRole(d)) : "") +
         (seriesHasAny(d, "failedRunsByRole") ? block("Failed runs by role", chartFailedRunsByRole(d)) : "") +
         (seriesHasAny(d, "mergedByRole") ? block("Merged by role", chartMergedByRole(d)) : "") +
         (!d.role && seriesHasAny(d, "runsByModel") ? block("Runs by model", chartRunsByModel(d)) : "") +
@@ -330,6 +346,8 @@ export const GUI_CLIENT_REPORT_JS = String.raw `// report-tip:start
         (seriesHasCheckMedian(d) ? block("Merge check median", chartCheckMedian(d), "per day · passing full-suite checks") : "") +
         (seriesHasCheckFailures(d) ? block("Red merge checks", chartCheckFailures(d), "per day · failed full-suite checks") : "") +
         (seriesHasMainRedMs(d) ? block("Main red time", chartMainRedMs(d), "per day · no passing full check") : "") +
+        (!d.role && seriesHasAny(d, "mainRedByTest") ? block("Main red by test", chartMainRedByTest(d), "per day · failing tests main's red checks named") : "") +
+        (!d.role && seriesHasAny(d, "mainRedByCulprit") ? block("Main red by merge", chartMainRedByMerge(d), "per day · merges the main watch blamed") : "") +
         (seriesHasMergeWaitMedian(d) ? block("Merge wait median", chartMergeWaitMedian(d), "per day · enqueue to merged on main") : "") +
         (seriesHasMergeSlotMedian(d) ? block("Merge slot median", chartMergeSlotMedian(d), "per day · verification start to outcome") : "") +
         (seriesHasRunMedian(d) ? block("Run duration median", chartRunMedian(d), "per day · run_start to run_end") : "") +
@@ -350,12 +368,53 @@ export const GUI_CLIENT_REPORT_JS = String.raw `// report-tip:start
 
   // report-quarantine:start
   // The Failures view's flake-quarantine list, painted as its own card below the digest: the
-  // read twin of the amber quarantine alert (whose See-failures action lands here). An empty
-  // or absent section (a clean quarantine) renders nothing, so a window with a digest but no
-  // quarantine is unchanged. Built over the same renderQuarantineSection the server serves.
-  function quarantineCardHtml(md) {
-    const q = String(md || "").trim();
-    return q ? "<article class='card md'>" + renderMarkdown(q, true) + "</article>" : "";
+  // interactive twin of the doctor's flaky-checks row (whose Release buttons land here). An
+  // empty or absent section (a clean quarantine) renders nothing, so a window with a digest
+  // but no quarantine is unchanged. The card is structured ({ warning, rows } from
+  // /api/failures) rather than Markdown, so each entry carries a Release button that runs the
+  // same releaseQuarantinedTest core as tumwater quarantine --release <n>.
+  let quarantineReleaseArmed = null;
+  // Restore the armed button's label and clear the arm. Safe when nothing is armed, and safe
+  // after a re-render rebuilds the Failures body (the armed element is detached then, so its
+  // label is moot); keeps the card from showing a stale "Click again to release" on a button
+  // the user no longer intends to commit.
+  function disarmQuarantineRelease() {
+    if (quarantineReleaseArmed) {
+      quarantineReleaseArmed.textContent = "Release";
+      quarantineReleaseArmed = null;
+    }
+  }
+  function quarantineCardHtml(q) {
+    const rows = (q && q.rows) || [];
+    if (!rows || rows.length === 0) return "";
+    return "<article class='card md'><h2>Flake quarantine</h2>" +
+      (q.warning ? "<p>" + esc(q.warning) + "</p>" : "") +
+      "<ul>" + rows.map((r) =>
+        "<li>" + esc(r.test) + " — " + esc(r.detail) +
+        "<button type='button' class='btn btn-sm' data-action='quarantine-release' data-test='" +
+        esc(r.test) + "'>Release</button></li>",
+      ).join("") + "</ul></article>";
+  }
+  // A Release click on the card: the first click on a row arms it (relabelling to confirm,
+  // like the other committing reaps); a second click on that same row posts the release and
+  // only then re-fetches, so the released row disappears once the server has released it; any
+  // other click, or a re-render, disarms and restores the armed button's label. Module state
+  // plus the injected post/refetch, so the browser's wireClicks and the test drive one
+  // decision. Returns "armed" / "released" / "disarmed".
+  async function quarantineReleaseClick(rel, post, refetch) {
+    const test = rel.dataset.test || "";
+    if (!test) return "disarmed";
+    if (quarantineReleaseArmed !== rel) {
+      disarmQuarantineRelease();
+      quarantineReleaseArmed = rel;
+      rel.textContent = "Click again to release";
+      return "armed";
+    }
+    quarantineReleaseArmed = null;
+    rel.textContent = "Release";
+    await post(test);
+    refetch();
+    return "released";
   }
   // report-quarantine:end
 

package/dist/src/ui/gui/gui-client-roles.js

@@ -30,6 +30,14 @@ export const GUI_CLIENT_ROLES_JS = String.raw `
   // abort fires, while a first click on another role's abort re-arms instead of posting.
   const confirmAbortSlot = confirmSlot(rerender);
   const abortConfirming = (role) => confirmAbortSlot.armed(role);
+  // The abort-all slot: keyed "all" (no role id), so a first click on any other action's
+  // button disarms a pending abort-all — the same per-key arming as the per-role slot above.
+  const confirmAbortAllSlot = confirmSlot(rerender);
+  const abortAllConfirming = () => confirmAbortAllSlot.armed("all");
+  // The Roles card header's Abort all button (inserted into the card head at script load):
+  // one click arms it, a second within 5 s hits POST /api/abort-all. Danger tone; the title
+  // names the confirm-again contract, like the per-row stop's.
+  const rolesAbortAllButton = () => "<button type='button' class='btn btn-sm btn-danger' id='abortall' data-action='abort-all' title='Click again to stop every running role&#39;s run'>" + icon("stop") + "<span>Abort all</span></button>";
   // The drawer's Disable slot: a second click on the same role's Disable fires, a first click
   // on another role's re-arms — the same per-role keying as the abort slot it sits beside.
   const confirmDisableSlot = confirmSlot(rerender);
@@ -44,6 +52,21 @@ export const GUI_CLIENT_ROLES_JS = String.raw `
   // wake, pause/resume (the target state is always explicit), and abort, which discards the
   // run's work — the first click arms it, a second within 5 s fires it.
   async function rowAction(action, role, forSeconds) {
+    if (action === "abort-all") {
+      if (!abortAllConfirming()) {
+        // First click arms it; any other click (handled below) disarms it.
+        confirmAbortAllSlot.arm("all");
+        confirmAbortSlot.disarm();
+        confirmDisableSlot.disarm();
+        roleChooser = null;
+        return;
+      }
+      confirmAbortAllSlot.disarm();
+      await postAction("/api/abort-all", {}, (d) =>
+        (d && typeof d.message === "string" ? d.message : "abort requested for every running role"));
+      return;
+    }
+    confirmAbortAllSlot.disarm();
     if (action === "prompt") {
       setTarget(role);
       focusComposer();
@@ -105,7 +128,7 @@ export const GUI_CLIENT_ROLES_JS = String.raw `
     const detail = phaseDetailBase(l, info, d);
     const w = scheduledWakeFor(l, d);
     if (!w) return detail;
-    return (detail ? detail + " · " : "") + "your wake in " + humanSeconds(Math.max(0, Math.round((w.atMs - Date.now()) / 1000)));
+    return (detail ? detail + " · " : "") + "your wake in " + humanSeconds(secsUntil(w.atMs, Date.now()));
   }
   function phaseDetailBase(l, info, d) {
     const raw = fmtNextRun(l, d.running);
@@ -114,18 +137,22 @@ export const GUI_CLIENT_ROLES_JS = String.raw `
     const backoff = next.startsWith("sleeping ") ? "sleeping — next check in " + next.slice(9) : "";
     // A yield-scaled clock: the role's recent runs merged nothing, so it runs less often.
     const note = slowed ? " · slowed ×" + slowed[1] + ", nothing merged lately" : "";
-    // The consecutive no-change streak (status-payload noChangeStreak, mirrored from
-    // status-model rolePhase's · no change ×N suffix): how many completed runs in a row
-    // returned nothing to do. Shown only on a resting idle cell (sleeping/queued/idle/
-    // deferred) — never on live work, a pause, a failure, or main-red, which the status
-    // label likewise leaves bare. Observational only: a legitimately idle maintenance role
-    // can hold a long streak.
-    const noChange = ["sleeping", "queued", "idle", "deferred"].includes(info.key) && (l.noChangeStreak || 0) >= 2
+    // The consecutive cut-off and no-change streaks (status-payload cutOffStreak/noChangeStreak,
+    // mirrored from status-model rolePhase's suffix): how many completed runs in a row hit the
+    // context ceiling or returned nothing to do. Shown only on a resting idle cell
+    // (sleeping/queued/idle/deferred) — never on live work, a pause, a failure, or main-red,
+    // which the status label likewise leaves bare. A cut-off run is also a no_change, so the
+    // cut-off streak wins when both read 2+ — it names the costly cause the plain suffix would
+    // bury. Observational only, like the phase text.
+    const cutOff = ["sleeping", "queued", "idle", "deferred"].includes(info.key) && (l.cutOffStreak || 0) >= 2
+      ? " · cut off ×" + l.cutOffStreak : "";
+    const noChange = !cutOff && ["sleeping", "queued", "idle", "deferred"].includes(info.key) && (l.noChangeStreak || 0) >= 2
       ? " · no change ×" + l.noChangeStreak : "";
-    if (info.key === "sleeping") return (backoff || (next === "-" ? "" : next === "now" ? "wakes now" : "wakes in " + next)) + note + noChange;
-    if (info.key === "queued") return (backoff || info.detail) + note + noChange;
-    if (info.key === "paused" && d.pausedRolesUntil && !d.paused && (d.pausedLoops || []).includes(l.role)) return info.detail + " · resumes in " + humanSeconds(Math.max(0, Math.round((d.pausedRolesUntil - Date.now()) / 1000))); // retired-name-ok: serialized /api key
-    return info.detail + noChange;
+    const streak = cutOff || noChange;
+    if (info.key === "sleeping") return (backoff || (next === "-" ? "" : next === "now" ? "wakes now" : "wakes in " + next)) + note + streak;
+    if (info.key === "queued") return (backoff || info.detail) + note + streak;
+    if (info.key === "paused" && d.pausedRolesUntil && !d.paused && (d.pausedLoops || []).includes(l.role)) return info.detail + " · resumes in " + humanSeconds(secsUntil(d.pausedRolesUntil, Date.now())); // retired-name-ok: serialized /api key
+    return info.detail + streak;
   }
   function roleCells(l, d) {
     const info = phaseInfo(l.phase);
@@ -231,6 +258,19 @@ export const GUI_CLIENT_ROLES_JS = String.raw `
     postAction("/api/reset-counters", {}, (d) => (d && typeof d.message === "string" ? d.message : "counters reset")));
   $("wakeall").addEventListener("click", () =>
     postAction("/api/wake", {}, (d) => (d && typeof d.message === "string" ? d.message : "every role woken")));
+  // Insert the Abort all button into the Roles card header beside the card title/refresh
+  // control (the same card head that holds Reset counters / Wake later / Wake all), and arm
+  // its two-click confirm through the shared rowAction abort-all branch. One insert on load;
+  // re-renders leave the header alone.
+  (function () {
+    const head = $("roles-title") && $("roles-title").parentElement;
+    if (!head || document.getElementById("abortall")) return;
+    head.insertAdjacentHTML("beforeend", rolesAbortAllButton());
+    document.getElementById("abortall").addEventListener("click", (ev) => {
+      ev.preventDefault();
+      rowAction("abort-all", "all");
+    });
+  })();
   // wake-later:start
   const WAKE_LATER_CHOICES = [[1800, "In 30 minutes"], [3600, "In 1 hour"], [7200, "In 2 hours"], [28800, "In 8 hours"]];
   function openWakeLaterMenu() {

package/dist/src/ui/gui/gui-client-settings.js

@@ -11,9 +11,9 @@
  * gui-client.ts's script, reaching its helpers (esc, $, getJson, postJson, showFlash) through
  * that concatenation. A second card, "Health check", runs the same checks as `tumwater doctor`
  * through GET /api/doctor on each open (and on its Re-run button) and paints the report (its
- * Re-probe models button POSTs /api/doctor-reprobe instead, spending the image probes; its
  * Commit backlog button POSTs /api/doctor-commit-backlog instead, the same commitUncommittedBacklog
- * `tumwater doctor --commit-backlog` runs); a
+ * `tumwater doctor --commit-backlog` runs; its Archive backlog button POSTs
+ * /api/doctor-archive-backlog instead, the same archiveFinishedOnMain `tumwater archive` runs); a
  * third, "Disabled roles", lists every disabled role (GET /api/retire), each with an Enable
  * button (POST /api/role-enable) and — for a role that still keeps worktree/branch leftovers — a
  * two-click Retire button (POST /api/retire). */
@@ -73,12 +73,12 @@ export const GUI_CLIENT_SETTINGS_JS = String.raw `  // settings-view:start
       "<span>The same checks as <code>tumwater doctor</code>.</span>" +
       "<label><input type='checkbox' data-action='doctor-problems'> Problems only</label>" +
       "<button type='button' class='btn btn-sm' data-action='doctor-rerun'>Re-run</button>" +
-      "<button type='button' class='btn btn-sm' data-action='doctor-reprobe' title='Re-probe every image-input model (spends one model call each), like tumwater doctor --reprobe'>Re-probe models</button>" +
       "<button type='button' class='btn btn-sm' data-action='doctor-kill-orphans'>Kill orphans</button>" +
       "<button type='button' class='btn btn-sm' data-action='doctor-drop-broken-pins' title=\"Drops each refs/tumwater/ pin whose commit is gone - the manual git update-ref -d the tumwater pins row names, like tumwater doctor --drop-broken-pins\">Drop broken pins</button>" +
       "<button type='button' class='btn btn-sm' data-action='doctor-commit-backlog' title='Commit each uncommitted tracked backlog or brief file on main, like tumwater doctor --commit-backlog'>Commit backlog</button>" +
       "<button type='button' class='btn btn-sm' data-action='doctor-resync-install' title=\"Re-sync the root checkout's install after a failed post-merge re-sync, like tumwater doctor --resync-install\">Re-sync install</button>" +
-      "<button type='button' class='btn btn-sm' data-action='doctor-retire-leftovers' title=\"Retire every disabled role's leftover worktree, branch and merge ref in one pass, like tumwater doctor --retire-leftovers (or tumwater retire --role <id> per role)\">Retire leftovers</button></div>" +
+      "<button type='button' class='btn btn-sm' data-action='doctor-retire-leftovers' title=\"Retire every disabled role's leftover worktree, branch and merge ref in one pass, like tumwater doctor --retire-leftovers (or tumwater retire --role <id> per role)\">Retire leftovers</button>" +
+      "<button type='button' class='btn btn-sm' data-action='doctor-archive-backlog' title=\"Move the finished entries under PLANS.md ## Done and BUGS.md ## Fixed into the archive files and commit them on main, like tumwater archive\">Archive backlog</button></div>" +
       "<div id='doctorbody'><div class='empty'>Checking…</div></div></div>" +
       "<div class='card' id='retirecard'><div class='empty'>Loading…</div></div>" +
       "<div class='card' id='briefcard'><div class='empty'>Loading…</div></div>");
@@ -97,7 +97,7 @@ export const GUI_CLIENT_SETTINGS_JS = String.raw `  // settings-view:start
       "<div class='settings-row'><span class='pill t-" + (tones[c.level] || "amber") + "'>" + esc(c.level) + "</span>" +
       "<strong>" + esc(c.name) + "</strong><span>" + esc(c.detail) + "</span></div>").join("");
     return "<p>" + esc(d.header) + "</p>" + rows +
-      (problems && hidden > 0 ? "<p class='empty'>" + hidden + " " + (hidden === 1 ? "ok check" : "ok checks") + " hidden</p>" : "") +
+      (problems && hidden > 0 ? "<p class='empty'>" + plural(hidden, "ok check") + " hidden</p>" : "") +
       "<p>" + esc(d.verdict) + "</p>";
   }
   // The last resolved doctor report and whether the card paints only its problems; the
@@ -117,27 +117,6 @@ export const GUI_CLIENT_SETTINGS_JS = String.raw `  // settings-view:start
       body.innerHTML = errorPanel("Health checks could not run", err, "empty");
     }
   }
-  let doctorReprobing = false;
-  async function reprobeDoctorClick() {
-    if (doctorReprobing) return;
-    doctorReprobing = true;
-    try {
-      buildSettingsView();
-      const body = $("doctorbody");
-      body.innerHTML = "<div class='empty'>Re-probing…</div>";
-      showFlash("Re-probing image-input models…");
-      try {
-        const report = await postJson("/api/doctor-reprobe", {});
-        lastDoctor = report;
-        body.innerHTML = renderDoctorReport(report, doctorProblems);
-      } catch (err) {
-        body.innerHTML = errorPanel("Health checks could not run", err, "empty");
-        showFlash("error: " + clientErrorMessage(err));
-      }
-    } finally {
-      doctorReprobing = false;
-    }
-  }
   function toggleDoctorProblems(checked) {
     doctorProblems = checked;
     const body = $("doctorbody");
@@ -280,6 +259,32 @@ export const GUI_CLIENT_SETTINGS_JS = String.raw `  // settings-view:start
     }
     await fetchDoctor();
   }
+  // The Health card's Archive backlog button: a two-click confirm, then POST
+  // /api/doctor-archive-backlog runs the same archive as "tumwater archive" (holding the merge
+  // lock) and the card re-runs its checks so the backlog archive row repaints. ok is false
+  // when the archive was skipped (an off-base checkout or uncommitted backlog/archive files),
+  // and its reason still flashes so the operator sees why nothing moved.
+  function paintArchiveBacklogButton() {
+    const btn = document.querySelector("button[data-action='doctor-archive-backlog']");
+    if (btn) btn.textContent = archiveBacklogSlot.armed("archive-backlog") ? "Confirm archive" : "Archive backlog";
+  }
+  const archiveBacklogSlot = confirmSlot(paintArchiveBacklogButton);
+  async function archiveBacklogClick() {
+    if (!archiveBacklogSlot.armed("archive-backlog")) {
+      archiveBacklogSlot.arm("archive-backlog");
+      return;
+    }
+    archiveBacklogSlot.disarm();
+    paintArchiveBacklogButton();
+    showFlash("Archiving the finished backlog entries…");
+    try {
+      const d = await postJson("/api/doctor-archive-backlog", {});
+      showFlash((d.ok ? "" : "error: ") + d.message);
+    } catch (err) {
+      showFlash("error: " + clientErrorMessage(err));
+    }
+    await fetchDoctor();
+  }
   // The Health card's Commit backlog button: a single click, because the commit is the doctor's
   // own recommended repair and is reversible (unlike the two-click Kill orphans arm), POSTing
   // /api/doctor-commit-backlog — the same commitUncommittedBacklog "tumwater doctor

package/dist/src/ui/gui/gui-client-team.js

@@ -29,7 +29,7 @@ export const GUI_CLIENT_TEAM_JS = String.raw `  // ---- sidebar: project, team s
   // label style. One home for the rule, so the preformatted badges the payload ships to the
   // sidebar (disk, bootstrap, main check) cannot drift in how the row presents them.
   const stripBadge = (badge) => String(badge || "").replace(/^ · /, "");
-  const badgeLabel = (badge) => stripBadge(badge).replace(/^./, (c) => c.toUpperCase());
+  const badgeLabel = (badge) => capitalize(stripBadge(badge));
   function renderSidebar(d) {
     const project = $("project");
     const name = d && d.project ? d.project : "";
@@ -49,7 +49,7 @@ export const GUI_CLIENT_TEAM_JS = String.raw `  // ---- sidebar: project, team s
         // decoration.
         const lead = stale ? restartButton(icon("refresh")) : icon("refresh");
         rows += row(stale ? (d.build.restartBlocked ? "amber" : "blue") : "", lead,
-          "Version <span class='mono'>" + esc(shortSha(d.build.sha)) + "</span>" + (stale ? " · " + esc(d.build.aheadCommits || 0) + " behind" : ""),
+          "Version <span class='mono'>" + esc(shortSha(d.build.sha)) + "</span>" + (stale ? " · " + esc(plural(d.build.aheadCommits || 0, "commit")) + " behind" : ""),
           localizeInstants(("Running version" + (d.buildBadge || "").replace(/^, build/, "")).trim()));
       }
       if (d.mainCheck) {
@@ -150,6 +150,7 @@ export const GUI_CLIENT_TEAM_JS = String.raw `  // ---- sidebar: project, team s
   // sidebar:end
 
   // ---- alerts ----
+  // alerts:start
   // Alerts are patched by key, and only their text is rewritten in place: a stall alert's
   // "no pi output for 9m47s" updates every second, and rebuilding it would swap its buttons out
   // from under a click in progress.
@@ -171,6 +172,9 @@ export const GUI_CLIENT_TEAM_JS = String.raw `  // ---- sidebar: project, team s
     const alerts = pageAlerts(d, offline);
     const box = $("alerts");
     const keep = new Set(alerts.map((a) => a.key));
+    // doctor-band is managed below, not by the alert-patch loop (its key would not survive a
+    // keep pass built only from the feed's alert keys).
+    keep.add("doctor-band");
     for (const el of Array.from(box.children)) if (!keep.has(el.dataset.key)) el.remove();
     alerts.forEach((a, i) => {
       const parts = alertParts(a, a.key === "build" && d && d.build && d.build.stale);
@@ -190,6 +194,27 @@ export const GUI_CLIENT_TEAM_JS = String.raw `  // ---- sidebar: project, team s
       detail.hidden = !a.detail;
       if (box.children[i] !== el) box.insertBefore(el, box.children[i] || null);
     });
+    // The band's one link to where every alert's detail lives: the Settings view's Health check
+    // card (#doctorcard), which runs the same checks as tumwater doctor. It rides the existing
+    // view/hash routing (data-act='view' data-arg='settings' -> location.hash; gui-client-boot).
+    // It appears only while the band has alerts — an empty feed paints nothing, so there is no
+    // "0 alerts" copy.
+    const doctorEl = box.querySelector("[data-key='doctor-band']");
+    if (alerts.length > 0) {
+      if (!doctorEl) {
+        const band = document.createElement("div");
+        band.dataset.key = "doctor-band";
+        band.className = "alert t-blue";
+        band.innerHTML = "<span class='alert-icon'>" + icon("settings") + "</span>" +
+          "<div class='alert-body'><div class='alert-title'>Details in Doctor</div>" +
+          "<div class='alert-detail'>The Settings view's Health check card keeps each alert's detail.</div></div>" +
+          "<div class='alert-actions'><button type='button' class='btn btn-sm' data-act='view' data-arg='settings' " +
+          "title='Open the Health check card'>Open Health check</button></div>";
+        box.appendChild(band);
+      }
+    } else if (doctorEl) {
+      doctorEl.remove();
+    }
     const n = needsYou(alerts);
     const title = (n ? "(" + n + ") " : "") + (d && d.project ? d.project + " · " : "") + "tumwater";
     if (document.title !== title) document.title = title;
@@ -198,6 +223,7 @@ export const GUI_CLIENT_TEAM_JS = String.raw `  // ---- sidebar: project, team s
     if (badge.textContent !== String(n)) badge.textContent = String(n);
     badge.title = plural(n, "thing needs", "things need") + " you";
   }
+  // alerts:end
 
   // ---- today's progress ----
   // /api/report?days=1, re-read when new events arrive (throttled) — never on a timer.