@intentius/behold 0.29.13 → 0.29.15

package/dist/cli.js

@@ -2465,6 +2465,9 @@ function discoverTerragruntUnits(repo) {
     };
   }).sort((a, b) => a.dir < b.dir ? -1 : 1);
 }
+function hasTerragruntUnits(dir) {
+  return discoverTerragruntUnits(dir).length > 0;
+}
 function terragruntPicture(repo, units, decl) {
   const onDisk = new Set(units.map((u) => u.dir));
   const declaredOnly = [];
@@ -11199,7 +11202,7 @@ var init_declaration = __esm({
 
 // src/cli.ts
 import { resolve as resolve35, dirname as dirname21, join as join53 } from "node:path";
-import { realpathSync as realpathSync3, existsSync as existsSync32, readFileSync as readFileSync40, rmSync as rmSync4 } from "node:fs";
+import { realpathSync as realpathSync3, existsSync as existsSync32, readFileSync as readFileSync41, rmSync as rmSync4 } from "node:fs";
 import { fileURLToPath as fileURLToPath12 } from "node:url";
 import { spawn as spawn9, spawnSync as spawnSync4 } from "node:child_process";
 
@@ -11257,7 +11260,7 @@ import { serve } from "@hono/node-server";
 import { fileURLToPath as fileURLToPath10 } from "node:url";
 import { execFile as execFile5 } from "node:child_process";
 import { promisify as promisify3 } from "node:util";
-import { existsSync as existsSync29, readFileSync as readFileSync36 } from "node:fs";
+import { existsSync as existsSync29, readFileSync as readFileSync37 } from "node:fs";
 import { basename as basename5, dirname as dirname18, join as join49, relative as relative11, resolve as resolve32, sep as sep10 } from "node:path";
 
 // src/recents.ts
@@ -15148,6 +15151,7 @@ function resourcesByRoot(ir, rootOf2) {
 
 // src/server.ts
 init_terragucci_components();
+init_terragrunt_units();
 
 // src/reconcile.ts
 var DISRUPTION_SEVERITY = {
@@ -24944,7 +24948,7 @@ function terragucciRoutes(app, opts, dirs) {
 
 // src/view-repos.ts
 import { AsyncLocalStorage as AsyncLocalStorage2 } from "node:async_hooks";
-import { existsSync as existsSync23, readdirSync as readdirSync13 } from "node:fs";
+import { existsSync as existsSync23, readdirSync as readdirSync13, readFileSync as readFileSync30 } from "node:fs";
 import { join as join42, resolve as resolve26 } from "node:path";
 var NAME2 = /^[A-Za-z0-9][A-Za-z0-9._-]{0,99}$/;
 function repoName(value) {
@@ -24997,10 +25001,37 @@ function viewReposMiddleware(app, repos) {
     return scope.run(target, () => next());
   });
 }
+var SHA = /^[0-9a-f]{40}([0-9a-f]{24})?$/;
+function checkoutCommit(dir) {
+  const read = (f) => {
+    try {
+      return readFileSync30(join42(dir, ".git", f), "utf8");
+    } catch {
+      return void 0;
+    }
+  };
+  const head = read("HEAD")?.trim();
+  if (!head) return void 0;
+  if (SHA.test(head)) return head;
+  const ref2 = /^ref: (refs\/[^\s]+)$/.exec(head)?.[1];
+  if (!ref2 || ref2.split("/").includes("..")) return void 0;
+  const loose = read(ref2)?.trim();
+  if (loose && SHA.test(loose)) return loose;
+  for (const line of (read("packed-refs") ?? "").split("\n")) {
+    const [sha, name] = line.trim().split(" ");
+    if (name === ref2 && sha && SHA.test(sha)) return sha;
+  }
+  return void 0;
+}
 function viewRepoFacts(repos, servedDir) {
   if (!repos) return {};
   const here = [...repos.repos].find(([, t2]) => t2.projectDir === servedDir)?.[0];
-  return { ...here ? { viewRepo: here } : {}, viewRepos: [...repos.repos.keys()] };
+  const commits = {};
+  for (const [name, t2] of repos.repos) {
+    const sha = checkoutCommit(t2.projectDir);
+    if (sha) commits[name] = sha;
+  }
+  return { ...here ? { viewRepo: here } : {}, viewRepos: [...repos.repos.keys()], ...Object.keys(commits).length ? { viewCommits: commits } : {} };
 }
 
 // node_modules/@intentius/chant/src/lifecycle/gate-audit.ts
@@ -25455,7 +25486,7 @@ function lifecycleHistoryRoute(app, base, opts = {}) {
 }
 
 // src/lifecycle-releases.ts
-import { existsSync as existsSync24, readFileSync as readFileSync30 } from "node:fs";
+import { existsSync as existsSync24, readFileSync as readFileSync31 } from "node:fs";
 import { join as join43 } from "node:path";
 
 // node_modules/@intentius/chant/src/lifecycle/legacy-digest.ts
@@ -25572,7 +25603,7 @@ function waveOrder(checkout) {
   const p = join43(checkout, WAVES_SPEC_FILE);
   if (!existsSync24(p)) return void 0;
   try {
-    const doc = JSON.parse(readFileSync30(p, "utf8"));
+    const doc = JSON.parse(readFileSync31(p, "utf8"));
     const names = (doc.waves ?? []).map((w) => w?.name).filter((n) => typeof n === "string" && n.length > 0);
     return names.length ? [...new Set(names)] : void 0;
   } catch {
@@ -25725,7 +25756,7 @@ function releasesRoutes(app, base, opts = {}) {
 }
 
 // src/sql-yodeler-lane.ts
-import { existsSync as existsSync25, readdirSync as readdirSync14, readFileSync as readFileSync31 } from "node:fs";
+import { existsSync as existsSync25, readdirSync as readdirSync14, readFileSync as readFileSync32 } from "node:fs";
 import { join as join44 } from "node:path";
 var YODEL_APPLY_OP = "yodel-apply";
 var YODEL_HEAD_PLANS_DIR = headPlansPath(YODEL_APPLY_OP, "").dir;
@@ -25761,7 +25792,7 @@ function readYodelWaves(checkout) {
   const p = join44(checkout, WAVES_SPEC_FILE);
   if (!existsSync25(p)) return void 0;
   try {
-    return parseYodelWaves(readFileSync31(p, "utf8"));
+    return parseYodelWaves(readFileSync32(p, "utf8"));
   } catch (e) {
     return { path: WAVES_SPEC_FILE, waves: [], error: e instanceof Error ? e.message : String(e) };
   }
@@ -25890,7 +25921,7 @@ function sqlYodelerLaneRoute(app, checkout, opts = {}) {
 
 // src/terragucci-estate.ts
 init_yaml();
-import { existsSync as existsSync26, readFileSync as readFileSync32, statSync as statSync14 } from "node:fs";
+import { existsSync as existsSync26, readFileSync as readFileSync33, statSync as statSync14 } from "node:fs";
 import { createRequire as createRequire7 } from "node:module";
 import { dirname as dirname14, extname, join as join45, resolve as resolve28 } from "node:path";
 import { fileURLToPath as fileURLToPath8 } from "node:url";
@@ -25899,7 +25930,7 @@ var RUN_SCHEMA2 = "terragucci.run/v1";
 function configProjects(file) {
   let text2;
   try {
-    text2 = readFileSync32(file, "utf8");
+    text2 = readFileSync33(file, "utf8");
   } catch {
     return void 0;
   }
@@ -25968,8 +25999,8 @@ function runViewValidator(dirs = []) {
     if (hit) return hit;
     let v;
     try {
-      const version = JSON.parse(readFileSync32(join45(dist, "..", "package.json"), "utf8")).version ?? "";
-      const validate = new Ajv20204({ strict: false, allErrors: false }).compile(JSON.parse(readFileSync32(schema, "utf8")));
+      const version = JSON.parse(readFileSync33(join45(dist, "..", "package.json"), "utf8")).version ?? "";
+      const validate = new Ajv20204({ strict: false, allErrors: false }).compile(JSON.parse(readFileSync33(schema, "utf8")));
       v = {
         validation: { by: "schema", terragucci: version },
         check(doc) {
@@ -26232,7 +26263,7 @@ function controlRepoInfo(dirs) {
 }
 
 // src/yodel-report.ts
-import { readdirSync as readdirSync15, readFileSync as readFileSync33, statSync as statSync15 } from "node:fs";
+import { readdirSync as readdirSync15, readFileSync as readFileSync34, statSync as statSync15 } from "node:fs";
 import { createRequire as createRequire8 } from "node:module";
 import { basename as basename4, dirname as dirname15, join as join46, resolve as resolve29 } from "node:path";
 import { fileURLToPath as fileURLToPath9 } from "node:url";
@@ -26669,7 +26700,7 @@ function packageRoot(from) {
   }
   for (let d = dirname15(entry); d !== dirname15(d); d = dirname15(d)) {
     try {
-      const pkg = JSON.parse(readFileSync33(join46(d, "package.json"), "utf8"));
+      const pkg = JSON.parse(readFileSync34(join46(d, "package.json"), "utf8"));
       if (pkg.name === "@intentius/sql-yodeler") return d;
     } catch {
     }
@@ -26681,11 +26712,11 @@ function yodelValidator(dirs = []) {
     const root = packageRoot(from);
     if (!root) continue;
     try {
-      const version = JSON.parse(readFileSync33(join46(root, "package.json"), "utf8")).version ?? "";
+      const version = JSON.parse(readFileSync34(join46(root, "package.json"), "utf8")).version ?? "";
       const key = `${root}\0${version}`;
       let v = installed.get(key);
       if (!v) {
-        const load2 = (n) => JSON.parse(readFileSync33(join46(root, "schemas", `${n}.schema.json`), "utf8"));
+        const load2 = (n) => JSON.parse(readFileSync34(join46(root, "schemas", `${n}.schema.json`), "utf8"));
         v = compile({ common: load2("common"), report: load2("report"), drift: load2("drift") }, { by: "schema", from: "package", sqlYodeler: version });
         installed.set(key, v);
       }
@@ -26719,7 +26750,7 @@ function readYodelReport(source2, validator2) {
   for (const file of files) {
     let doc;
     try {
-      doc = JSON.parse(readFileSync33(file, "utf8"));
+      doc = JSON.parse(readFileSync34(file, "utf8"));
     } catch (e) {
       if (file === named) refuse14(`${basename4(file)} is not JSON: ${e instanceof Error ? e.message : String(e)}`, remedy);
       ignored.push(basename4(file));
@@ -26806,7 +26837,7 @@ function yodelReportRoute(app, source2, dirs) {
 
 // src/demo-pins.ts
 init_terraform_member();
-import { existsSync as existsSync27, lstatSync as lstatSync2, mkdirSync as mkdirSync7, readFileSync as readFileSync34, readlinkSync as readlinkSync2, symlinkSync as symlinkSync2, writeFileSync as writeFileSync6 } from "node:fs";
+import { existsSync as existsSync27, lstatSync as lstatSync2, mkdirSync as mkdirSync7, readFileSync as readFileSync35, readlinkSync as readlinkSync2, symlinkSync as symlinkSync2, writeFileSync as writeFileSync6 } from "node:fs";
 import { dirname as dirname16, join as join47, resolve as resolve30 } from "node:path";
 var isRecord21 = (v) => v !== null && typeof v === "object" && !Array.isArray(v);
 function linkDemoPins(work, probes = {}) {
@@ -26814,7 +26845,7 @@ function linkDemoPins(work, probes = {}) {
   if (!existsSync27(file)) return { ok: true, linked: [] };
   let decl;
   try {
-    decl = JSON.parse(readFileSync34(file, "utf8"));
+    decl = JSON.parse(readFileSync35(file, "utf8"));
   } catch {
     return { ok: true, linked: [] };
   }
@@ -26872,13 +26903,13 @@ function linksTo(link, target) {
 }
 
 // src/demos.ts
-import { readFileSync as readFileSync35, existsSync as existsSync28, cpSync, mkdirSync as mkdirSync8 } from "node:fs";
+import { readFileSync as readFileSync36, existsSync as existsSync28, cpSync, mkdirSync as mkdirSync8 } from "node:fs";
 import { dirname as dirname17, isAbsolute as isAbsolute5, join as join48, relative as relative10, resolve as resolve31, sep as sep9 } from "node:path";
 import { spawn as spawn8, spawnSync as spawnSync3 } from "node:child_process";
 function readCatalog(file, catalog) {
   let raw;
   try {
-    raw = JSON.parse(readFileSync35(file, "utf8"));
+    raw = JSON.parse(readFileSync36(file, "utf8"));
   } catch {
     return [];
   }
@@ -27080,7 +27111,7 @@ function tierFailure(tier, message2) {
 function beholdVersion() {
   try {
     const here = dirname18(fileURLToPath10(import.meta.url));
-    return JSON.parse(readFileSync36(join49(here, "..", "package.json"), "utf8")).version ?? "unknown";
+    return JSON.parse(readFileSync37(join49(here, "..", "package.json"), "utf8")).version ?? "unknown";
   } catch {
     return "unknown";
   }
@@ -27127,7 +27158,7 @@ async function captureFrame(projectDir, env, frames, broadcaster) {
   }
 }
 function carveRoutes(app, reportPath, demo) {
-  const load2 = () => readCarveReport(reportPath, (p) => readFileSync36(p, "utf8"));
+  const load2 = () => readCarveReport(reportPath, (p) => readFileSync37(p, "utf8"));
   const carveDirs = [dirname18(reportPath), ...demo ? [demo.out] : []];
   const carveStates = () => readCarveStates(carveDirs, nodeCarveIo, 0);
   const emittedNodes = async (states) => {
@@ -27559,7 +27590,7 @@ function createApp(cfg, broadcaster = new Broadcaster(), frames = new FrameBuffe
     const dirs = [];
     const declared = [];
     for (const f of discoverOpIrs(estateDirs)) {
-      const parsed = readOpIr(f.path, (p) => readFileSync36(p, "utf8"));
+      const parsed = readOpIr(f.path, (p) => readFileSync37(p, "utf8"));
       if (!parsed.ok) continue;
       const mine = declaredConvergeOps([parsed.ir]);
       if (!mine.length) continue;
@@ -28135,7 +28166,8 @@ function createApp(cfg, broadcaster = new Broadcaster(), frames = new FrameBuffe
     const titles = waveTitles(ir, decl);
     const { svg } = renderGraph(ir, { waveTitles: titles });
     const waves = Object.keys(ir.groups.byWave ?? {}).length;
-    const note = `${ir.nodes.length} root${ir.nodes.length === 1 ? "" : "s"} in ${waves} wave${waves === 1 ? "" : "s"}, from ${TERRAGUCCI_COMPONENTS_FILE}`;
+    const noun = hasTerragruntUnits(cfg.projectDir) ? "unit" : "root";
+    const note = `${ir.nodes.length} ${noun}${ir.nodes.length === 1 ? "" : "s"} in ${waves} wave${waves === 1 ? "" : "s"}, from ${TERRAGUCCI_COMPONENTS_FILE}`;
     return {
       ir,
       svg,
@@ -28213,7 +28245,7 @@ function createApp(cfg, broadcaster = new Broadcaster(), frames = new FrameBuffe
         }
         const parsedOps = [];
         for (const f of files) {
-          const parsed = readOpIr(f.path, (p) => readFileSync36(p, "utf8"));
+          const parsed = readOpIr(f.path, (p) => readFileSync37(p, "utf8"));
           if (!parsed.ok) return c.json(parsed.refusal, 422);
           parsedOps.push(parsed.ir);
         }
@@ -29197,7 +29229,7 @@ init_chant();
 
 // src/workspace-convert.ts
 init_chant();
-import { existsSync as existsSync30, mkdirSync as mkdirSync9, readFileSync as readFileSync37, renameSync as renameSync2, writeFileSync as writeFileSync7 } from "node:fs";
+import { existsSync as existsSync30, mkdirSync as mkdirSync9, readFileSync as readFileSync38, renameSync as renameSync2, writeFileSync as writeFileSync7 } from "node:fs";
 import { basename as basename6, dirname as dirname19, join as join50, relative as relative12, resolve as resolve33, sep as sep11 } from "node:path";
 import { shortStackNames as shortStackNames2 } from "@intentius/pinhole";
 init_project();
@@ -29219,7 +29251,7 @@ function installedVersion(pkg, dir) {
     const manifest = join50(at2, "node_modules", ...pkg.split("/"), "package.json");
     if (existsSync30(manifest)) {
       try {
-        const v = JSON.parse(readFileSync37(manifest, "utf8")).version;
+        const v = JSON.parse(readFileSync38(manifest, "utf8")).version;
         return typeof v === "string" ? v : void 0;
       } catch {
         return void 0;
@@ -29319,7 +29351,7 @@ function applyConversion(plan) {
 }
 
 // src/export.ts
-import { mkdirSync as mkdirSync10, writeFileSync as writeFileSync8, copyFileSync, cpSync as cpSync2, readFileSync as readFileSync38, readdirSync as readdirSync16, existsSync as existsSync31, realpathSync as realpathSync2 } from "node:fs";
+import { mkdirSync as mkdirSync10, writeFileSync as writeFileSync8, copyFileSync, cpSync as cpSync2, readFileSync as readFileSync39, readdirSync as readdirSync16, existsSync as existsSync31, realpathSync as realpathSync2 } from "node:fs";
 import { homedir as homedir3 } from "node:os";
 import { join as join51, dirname as dirname20, basename as basename7, relative as relative13, resolve as resolve34, sep as sep12 } from "node:path";
 import { createHash as createHash11 } from "node:crypto";
@@ -29452,7 +29484,7 @@ async function runExport(cfg, outDir, opts = {}) {
     keyToFile
   };
   writeFileSync8(join51(outDir, "manifest.json"), JSON.stringify(manifest, null, 2));
-  const html = readFileSync38(join51(webDir(), "index.html"), "utf8").replace(
+  const html = readFileSync39(join51(webDir(), "index.html"), "utf8").replace(
     /<\/head>/i,
     `  <script>window.__BEHOLD_STATIC__ = true;</script>
   </head>`
@@ -29586,7 +29618,7 @@ async function publishBundle(outDir, target, client) {
   }
   const last = ["manifest.json", "index.html"];
   const order = [...files.filter((f) => !last.includes(f)), ...last.filter((f) => files.includes(f))];
-  for (const f of order) await client.put(at2(f), readFileSync38(join51(outDir, f)), contentType(f), CONTENT_ADDRESSED.test(f) ? IMMUTABLE : NO_CACHE);
+  for (const f of order) await client.put(at2(f), readFileSync39(join51(outDir, f)), contentType(f), CONTENT_ADDRESSED.test(f) ? IMMUTABLE : NO_CACHE);
   const wrote = new Set(files);
   const removed = [];
   for (const f of previous) {
@@ -29638,7 +29670,7 @@ It's just files \u2014 GitHub Pages, S3, nginx, or Cloudflare Pages
 
 // src/publish-snapshots.ts
 import { execFileSync as execFileSync4 } from "node:child_process";
-import { readFileSync as readFileSync39 } from "node:fs";
+import { readFileSync as readFileSync40 } from "node:fs";
 import { join as join52 } from "node:path";
 var DEFAULT_KEEP = 30;
 var SNAPSHOT_REPORTS_BASE = "../../../";
@@ -29727,7 +29759,7 @@ async function publishSnapshot(outDir, target, commit, client, opts = {}) {
   const keep = opts.keep ?? DEFAULT_KEEP;
   if (!Number.isInteger(keep) || keep < 1) throw new Error(`--keep takes a whole number of at least 1, not ${keep}`);
   const at2 = (f) => `${target.prefix}/${f}`;
-  const local = JSON.parse(readFileSync39(join52(outDir, "manifest.json"), "utf8"));
+  const local = JSON.parse(readFileSync40(join52(outDir, "manifest.json"), "utf8"));
   const generated = local.capturedAt ?? (/* @__PURE__ */ new Date()).toISOString();
   const entry = { commit: sha, at: commit.at ?? generated, project: opts.project ?? local.projectDir ?? "", generated };
   const bundle = await publishBundle(outDir, { bucket: target.bucket, prefix: at2(sha) }, client);
@@ -30264,7 +30296,7 @@ async function runCarve(rest) {
     process.exit(2);
   }
   const reportPath = resolve35(fileArg);
-  const parsed = readCarveReport(reportPath, (p) => readFileSync40(p, "utf8"));
+  const parsed = readCarveReport(reportPath, (p) => readFileSync41(p, "utf8"));
   if (!parsed.ok) {
     process.stderr.write(`behold carve: ${parsed.refusal.error}
   ${parsed.refusal.remedy}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intentius/behold",
-  "version": "0.29.13",
+  "version": "0.29.15",
   "license": "Apache-2.0",
   "type": "module",
   "description": "behold — a live control plane on chant. See your whole estate (every substrate in one graph), coloured by drift; act through delegated, gated Ops.",

package/web/app.js

@@ -4173,7 +4173,7 @@ function kioskGlow() {
   };
   style.textContent = hoverCss(links, { root: boxes, wave: (w) => `#graph rect[data-group-id="wave-${w}"]` }, "filter: drop-shadow(0 0 2px var(--focus)) drop-shadow(0 0 7px var(--focus));");
 }
-/** The dots by each root's name: on its box's title (Resources) or its card (Roots by wave). */
+/** The dots by each root's name: on its box's title (Resources) or its card (Components). */
 function kioskDots(svg) {
   for (const d of svg.querySelectorAll("[data-k-dot]")) d.remove();
   const roots = kioskRootList();

package/web/kiosk-popover.js

@@ -1,7 +1,7 @@
 // behold#571: the kiosk frame's popover. In the kiosk the graph is framed
 // bare (`?embed=1&bare=1`), with no Inspect pane, so a visitor pointing at a
 // card sees what the plan does to it here instead: in the Resources view, the
-// resource's planned change one attribute a line; in Roots by wave, the
+// resource's planned change one attribute a line; in Components, the
 // root's resources and which of them change. Pure logic: what the popover
 // says, where it goes, and when it stays open. app.js draws it.
 //
@@ -148,7 +148,7 @@ export function resourceCardId(answer, root, resourceId) {
 }
 
 /**
- * What the popover says about one root's card (Roots by wave): its
+ * What the popover says about one root's card (Components): its
  * resources, each "changes", "no change" or "known after apply", and how
  * many change. `resources` is the components zoom's resources facet for the
  * card (`[{ kind, id }]`).

package/web/kiosk-popover.test.js

@@ -95,7 +95,7 @@ describe("what the popover says about a resource (behold#571)", () => {
   });
 });
 
-describe("what the popover says about a root, in Roots by wave (behold#571)", () => {
+describe("what the popover says about a root, in Components (behold#571)", () => {
   it("lists its resources, each changes, no change or known after apply, and counts the changes", () => {
     const resources = [
       { kind: "terraform_remote_state", id: "app/data.terraform_remote_state.network" },

package/web/kiosk-repo.js

@@ -23,3 +23,21 @@ export function repoUrl(url, repo) {
   q.set("repo", repo);
   return `${path}?${q.toString()}`;
 }
+
+const sameCommit = (a, b) => typeof a === "string" && typeof b === "string" && !!a && !!b && (a.startsWith(b) || b.startsWith(a));
+
+/**
+ * The checkout that holds the step's commit (behold#571). A step names the
+ * commit it is about (demo.json's `commit`: a pull request's head, then its
+ * merge); the repo's own checkout may sit on another one. Of `name` and the
+ * served checkouts named `<name>.<anything>`, the one whose commit
+ * (`/api/project`'s viewCommits) is the step's; `name` when none is, at the
+ * reset and on the base, which draw the base.
+ */
+export function stepCheckout(name, demo, served, commits) {
+  if (!name || !demo || !demo.commit || !commits || !Array.isArray(served)) return name;
+  if (demo.scenario === "base" || demo.step === "reset") return name;
+  const at = (n) => sameCommit(commits[n], demo.commit);
+  if (at(name)) return name;
+  return served.find((n) => n.startsWith(`${name}.`) && at(n)) || name;
+}

package/web/kiosk-repo.test.js

@@ -1,6 +1,6 @@
 // behold#571: the kiosk asks for its repo's checkout by name, on a behold that serves several.
 import { describe, expect, it } from "vitest";
-import { repoParam, repoUrl } from "./kiosk-repo.js";
+import { repoParam, repoUrl, stepCheckout } from "./kiosk-repo.js";
 import { frameSrc } from "./kiosk.js";
 import { pageRepo, withRepo } from "./view-repo.js";
 
@@ -26,6 +26,33 @@ describe("repoUrl", () => {
   });
 });
 
+describe("stepCheckout (behold#571)", () => {
+  const served = ["demo", "demo.change", "demo-terragrunt", "demo-terragrunt.change"];
+  const HEAD = "9eec25f7aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+  const MERGE = "12f512fcbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb";
+  const BASE = "0d14834dcccccccccccccccccccccccccccccccc";
+  const commits = { demo: BASE, "demo.change": HEAD, "demo-terragrunt": BASE };
+  const step = (step, commit) => ({ scenario: "b-waves", step, commit });
+  it("draws the checkout at the pull request's head while the step is about it", () => {
+    expect(stepCheckout("demo", step("pull-request", HEAD), served, commits)).toBe("demo.change");
+    expect(stepCheckout("demo", step("planned", HEAD.slice(0, 8)), served, commits)).toBe("demo.change");
+  });
+  it("follows the merge once the driver checked it out, and draws the repo's checkout until then", () => {
+    expect(stepCheckout("demo", step("merged", MERGE), served, commits)).toBe("demo");
+    expect(stepCheckout("demo", step("merged", MERGE), served, { ...commits, "demo.change": MERGE })).toBe("demo.change");
+  });
+  it("draws the repo's own checkout at the reset, on the base, and with no commit or commits", () => {
+    expect(stepCheckout("demo", step("reset", HEAD), served, commits)).toBe("demo");
+    expect(stepCheckout("demo", { scenario: "base", step: "applied", commit: HEAD }, served, commits)).toBe("demo");
+    expect(stepCheckout("demo", step("pull-request", null), served, commits)).toBe("demo");
+    expect(stepCheckout("demo", step("pull-request", HEAD), served, null)).toBe("demo");
+    expect(stepCheckout(null, step("pull-request", HEAD), served, commits)).toBe(null);
+  });
+  it("picks only the repo's own checkouts", () => {
+    expect(stepCheckout("demo-terragrunt", step("pull-request", HEAD), served, commits)).toBe("demo-terragrunt");
+  });
+});
+
 describe("the frame", () => {
   it("names the repo it draws, and nothing without one", () => {
     expect(frameSrc("http://h", "resources")).toBe("/?embed=1&bare=1&zoom=resources&host=http%3A%2F%2Fh");

package/web/kiosk-vendor.js

@@ -361,8 +361,14 @@ export function notRunRepo(tool, served) {
   return name && Array.isArray(served) && served.includes(name) ? name : null;
 }
 
+/** What a tool calls the thing with its own state: a Terragrunt unit, a root otherwise (behold#571). */
+export function rootNoun(tool) {
+  return tool === "terragrunt" ? { one: "unit", many: "units" } : { one: "root", many: "roots" };
+}
+
 /** The legend's words, without naming a competing engine on an engine's page. */
 export function rootWord(tool) {
+  if (tool === "terragrunt") return "a Terragrunt unit";
   return namesOther("Terraform", tool) ? "a root" : "a Terraform root";
 }
 

package/web/kiosk-vendor.test.js

@@ -183,7 +183,8 @@ describe("the branding table (behold#571)", () => {
     expect(namesOther("runs on choudoufu", "terraform")).toBe(true);
     expect(namesOther("works with OpenTofu", "terraform")).toBe(false);
     expect(rootWord("choudoufu")).toBe("a root");
-    expect(rootWord("terragrunt")).toBe("a Terraform root");
+    expect(rootWord("terragrunt")).toBe("a Terragrunt unit");
+    expect(rootWord("terraform")).toBe("a Terraform root");
   });
   it("never counts a resource address, a bucket or a path as a brand", () => {
     for (const t of ["terraform_data.app", "data.terraform_remote_state.network", "state in demo-terraform-state", "s3://demo-terraform-state/edge.tfstate", "developer.hashicorp.com/terraform", ".terraform.lock.hcl", "terragrunt-cache"]) {

package/web/kiosk.js

@@ -17,8 +17,8 @@ import { PICK_HOLD_MS, annMark, mergeRun, startRuns } from "./kiosk-runs.js";
 import { PANEL_STEPS, PANEL_TITLE, approvalModel, cycleRuns, rowFacts, shortDigest } from "./kiosk-approval.js";
 import { getThemeName, mountThemePicker, onThemeChange } from "./theme.js";
 import { cssString, hoverCss, hoverFromMessage, hoverLinks, hoverMessage, isLightBg, rootSegments, rootText } from "./kiosk-roots.js";
-import { creditLines, filterIndex, keepRun, liveEstimate, liveFor, namesOther, notRunRepo, notRunWords, replayAt, replayBanner, replayIndex, rootWord, runAsOf, scrubDemo, servesRepo, vendorOf } from "./kiosk-vendor.js";
-import { repoParam, repoUrl } from "./kiosk-repo.js";
+import { creditLines, filterIndex, keepRun, liveEstimate, liveFor, namesOther, notRunRepo, notRunWords, replayAt, replayBanner, replayIndex, rootNoun, rootWord, runAsOf, scrubDemo, servesRepo, vendorOf } from "./kiosk-vendor.js";
+import { repoParam, repoUrl, stepCheckout } from "./kiosk-repo.js";
 import { STATE_WORDS, changingRoots, costLine, pinsCommit, planFitsPin, pullPin, readEdges, rootsCount, totalsLine, waveRows, blastRows } from "./terragucci-change.js";
 
 /** The scenarios terragucci#1014 numbers. An id not here is shown by the title demo.json carries. */
@@ -353,30 +353,29 @@ export function frameSrc(origin, zoom = "resources", repo = null, theme = null)
 }
 
 // ---------------------------------------------------------------------------
-// #571: which of behold's two views the frame shows. Before the merge, the
-// resources zoom: what the pull request changes and the reads it plans
-// before their values are known. From the merge on, the components zoom of a
-// terragucci repo (`terragucci.components.json`): one card per root in a box
-// per wave, titled with the job that applies it, in step with the jobs pane.
-// A viewer's click on the toggle holds a view for PICK_HOLD_MS after their
-// last click, as a run picked in the sidebar does; then the step leads again.
-
-/** The two views the toggle offers, with behold's zoom for each. */
+// #571: which of behold's two views the frame shows. On a terragucci repo
+// (`terragucci.components.json`) every step leads to the components zoom:
+// one card per root in a box per wave, titled with the job that applies it,
+// in step with the jobs pane. Before the merge it draws the pull request's
+// planned waves, and from the merge on the run's. Resources, what the change
+// touches resource by resource, is one click away. A viewer's click on the
+// toggle holds a view for PICK_HOLD_MS after their last click, as a run
+// picked in the sidebar does; then the step leads again.
+
+/** The two views the toggle offers, with behold's zoom for each, and what each shows. */
 export const VIEWS = [
-  { id: "resources", words: "Resources", zoom: "resources" },
-  { id: "components", words: "Roots by wave", zoom: "components" },
+  { id: "resources", words: "Resources", zoom: "resources", shows: "each resource the change touches" },
+  { id: "components", words: "Components", zoom: "components", shows: "the pipeline's jobs and waves" },
 ];
 
 /**
- * The view a step shows: the pull request's steps the resources (what
- * changes, the unknown reads), every step from the merge on the components
- * (the jobs running), and the reset the components at rest. A step behold
- * doesn't know, and `stalled`, keep the components: the jobs pane says where
- * the pipeline stopped.
+ * The view a step shows: the components at every step (behold#571), the
+ * pull request's planned waves before the merge and the run's from it on.
+ * A step behold doesn't know keeps the components too.
  */
 export const STEP_VIEW = {
-  "pull-request": "resources",
-  planned: "resources",
+  "pull-request": "components",
+  planned: "components",
   merged: "components",
   applying: "components",
   waiting: "components",
@@ -406,16 +405,26 @@ export function kioskView(demo, { components = false, pick = null, now = Date.no
     const left = pick.at + PICK_HOLD_MS - now;
     if (left > 0) return { view: pick.view, pinned: true, secs: Math.ceil(left / 1000) };
   }
-  return { view: demo ? stepView(demo.step) : "resources", pinned: false, secs: null };
+  return { view: demo ? stepView(demo.step) : "components", pinned: false, secs: null };
 }
 
 /** The line under the view saying how to read it, for the view shown. */
 export function legendWords(view, tool = null) {
   const root = rootWord(tool);
+  const n = rootNoun(tool);
+  const rest = `an arrow is one ${n.one} reading another's outputs, dashed while it reads planned values. A wave applies its ${n.many} together, after the waves it reads.`;
   if (view === "components") {
-    return `Each card is ${root} with its own state, in a box per wave titled with the pipeline job that applies it; an arrow is one root reading another's outputs, dashed while it reads planned values. A wave applies its roots together, after the waves it reads.`;
+    return `Components shows the pipeline's jobs and waves. Each card is ${root} with its own state, in a box per wave titled with the job that applies it; ${rest}`;
   }
-  return `Each box is ${root} with its own state; an arrow is one root reading another's outputs, dashed while it reads planned values. A wave applies its roots together, after the waves it reads.`;
+  return `Each box is ${root} with its own state; ${rest}`;
+}
+
+
+/** The tool the page shows: its own on a tool's page, else the running scenario's (demo.json `tool`). */
+export function nounTool(s) {
+  if (s.vendor) return s.vendor;
+  const d = s.demo && s.demo.demo;
+  return d && typeof d.tool === "string" ? d.tool : null;
 }
 
 /** The behold zoom for a view. */
@@ -425,7 +434,7 @@ export function viewZoom(view) {
 }
 
 /**
- * The toggle, "Resources | Roots by wave", over the frame: the view shown
+ * The toggle, "Resources | Components", over the frame: the view shown
  * pressed, and a line saying whether the step leads or a click holds it.
  * Not drawn at all when the repo offers no components zoom.
  */
@@ -440,21 +449,24 @@ export function renderViewToggle(host, shown, { components = false, onPick = ()
   for (const v of VIEWS) {
     const b = el("button", `k-view${v.id === shown.view ? " k-view-on" : ""}`, v.words);
     b.type = "button";
+    b.setAttribute("title", v.shows);
     b.setAttribute("aria-pressed", String(v.id === shown.view));
     b.addEventListener("click", () => onPick(v.id));
     group.appendChild(b);
   }
   host.appendChild(group);
-  host.appendChild(el("span", "k-view-note", shown.pinned ? `held by a click; the step leads again in ${shown.secs} s` : "follows the step"));
+  const on = VIEWS.find((v) => v.id === shown.view);
+  const lead = shown.pinned ? `held by a click; the step leads again in ${shown.secs} s` : "follows the step";
+  host.appendChild(el("span", "k-view-note", on ? `${on.shows} · ${lead}` : lead));
 }
 
 /** The one-line facts under the view: the pull request's totals, cost and blast radius, as #568 has them. */
-export function factLines(demo, answer) {
+export function factLines(demo, answer, tool = null) {
   const pr = demo ? matchingPull(answer, demo) : null;
   if (!pr) return [];
   const out = [];
   const totals = totalsLine(pr.totals);
-  if (totals) out.push(`pull request #${pr.run.pull_request} changes ${rootsCount(pr.totals_roots) || "across roots"}: ${totals}`);
+  if (totals) out.push(`pull request #${pr.run.pull_request} changes ${rootsCount(pr.totals_roots, rootNoun(tool)) || `across ${rootNoun(tool).many}`}: ${totals}`);
   const b = blastRows(answer);
   if (b && b.changed.length) out.push(`blast radius: ${b.changed.join(", ")}${b.downstream.length ? `; downstream, nearest first: ${b.downstream.join(", ")}` : ""}`);
   if (b && b.unplanned.length) out.push(`unchanged: ${b.unplanned.join(", ")}`);
@@ -526,7 +538,9 @@ function drawBar(bar, s, now, foot) {
   const left = el("div", "k-left");
   const titleBox = box("title", "k-box-title");
   const title = el("h1", "k-title");
-  if (vendor) title.appendChild(brandEl(vendor));
+  // behold#571: /kiosk names the tool each scenario runs on, as its own page does.
+  const shownTool = vendor || (demo.scenario !== "base" ? vendorOf(demo.tool) : null);
+  if (shownTool) title.appendChild(brandEl(shownTool));
   title.append(el("span", "k-kicker", head.kicker), el("span", "k-title-text", head.title));
   if (title.setAttribute) title.setAttribute("title", `${head.kicker} · ${head.title || ""}`);
   titleBox.appendChild(title);
@@ -591,9 +605,9 @@ function drawBar(bar, s, now, foot) {
 
   if (foot) {
     // The legend reads the graph; with no graph shown there is nothing for it to explain.
-    if (!s.noReports) foot.appendChild(el("span", "k-legend", legendWords(s.view || "resources", s.vendor || null)));
+    if (!s.noReports) foot.appendChild(el("span", "k-legend", legendWords(s.view || "resources", nounTool(s))));
     // behold#571: no line on where the narration was read from: a viewer new to the demo reads the facts.
-    if (!s.noReports) for (const f of factLines(demo, s.answer)) foot.appendChild(elRoots("span", "k-fact", f, s));
+    if (!s.noReports) for (const f of factLines(demo, s.answer, nounTool(s))) foot.appendChild(elRoots("span", "k-fact", f, s));
   }
 }
 
@@ -737,7 +751,10 @@ export function startKiosk({ bar, frame, foot, side, main, views, tools = null }
   // name. `viewRepos` is what it serves, `aimed` the repo the reads are for.
   s.viewRepos = null;
   s.aimed = null;
-  const wantRepo = () => repoParam(s.repo, s.viewRepos) || (vendor && s.mode === "none" ? notRunRepo(tool, s.viewRepos) : null);
+  s.viewCommits = null;
+  const repoNamed = () => repoParam(s.repo, s.viewRepos) || (vendor && s.mode === "none" ? notRunRepo(tool, s.viewRepos) : null);
+  // behold#571: the checkout at the step's commit, so a pull request's new roots and resources are drawn.
+  const wantRepo = () => stepCheckout(repoNamed(), s.demo && s.demo.demo, s.viewRepos, s.viewCommits);
   const fetchServed = fetchJson;
   fetchJson = (url) => fetchServed(repoUrl(url, wantRepo()));
   /** When the page moves to another served repo, read its project, reports and run view again, and point the frame at it. */
@@ -837,6 +854,8 @@ export function startKiosk({ bar, frame, foot, side, main, views, tools = null }
       const stage = d ? demoStage(d) : "none";
       if (stage === "pull-request" || stage === "either") void reports(true);
       if (stage === "apply" || stage === "either") void progress(true);
+      // behold#571: a commit no served checkout was on when last asked; the driver may have checked it out since.
+      if (d && d.commit && s.viewRepos && !Object.values(s.viewCommits || {}).some((c) => c.startsWith(d.commit) || d.commit.startsWith(c))) void readCommits();
     }
   };
   // behold#571: the replay's clock, read on every draw.
@@ -1032,10 +1051,19 @@ export function startKiosk({ bar, frame, foot, side, main, views, tools = null }
     frameSrcNow = src;
     frame.src = src;
   };
+  /** behold#571: the commit each served checkout holds, read again when a step names a new one. */
+  const readCommits = () => fetchJson("/api/project").then((p) => {
+    if (p && !p.error && Array.isArray(p.viewRepos)) {
+      s.viewRepos = p.viewRepos;
+      s.viewCommits = p.viewCommits || null;
+      draw();
+    }
+  });
   const readProject = () => fetchJson("/api/project").then((p) => {
     // behold#571: the repos this behold serves, and which one this answer is.
     if (p && !p.error && Array.isArray(p.viewRepos)) {
       s.viewRepos = p.viewRepos;
+      s.viewCommits = p.viewCommits || null;
       if (s.aimed === null && p.viewRepo) s.aimed = p.viewRepo;
     }
     s.components = !!(p && !p.error && p.terragucciComponents);

package/web/kiosk.test.js

@@ -50,6 +50,7 @@ describe("frameSrc (#569)", () => {
 describe("factLines (#569)", () => {
   it("says the pull request's totals and blast radius", () => {
     expect(factLines(demo("planned"), answer)).toEqual(["pull request #7 changes across 3 roots: 3 update", "blast radius: app, edge, network", "unchanged: other"]);
+    expect(factLines(demo("planned"), answer, "terragrunt")[0]).toBe("pull request #7 changes across 3 units: 3 update");
   });
 });
 
@@ -207,18 +208,19 @@ describe("the approval panel's drawing (behold#571)", () => {
 });
 
 describe("which view the frame shows (#571)", () => {
-  it("shows the resources for the pull request's steps and the roots by wave from the merge on", () => {
-    for (const step of ["pull-request", "planned"]) expect(stepView(step)).toBe("resources");
-    for (const step of ["merged", "applying", "waiting", "approved", "failed", "resumed", "applied", "reset"]) expect(stepView(step)).toBe("components");
+  it("shows the components at every step, the pull request's planned waves included", () => {
+    for (const step of ["pull-request", "planned", "merged", "applying", "waiting", "approved", "failed", "resumed", "applied", "reset"]) expect(stepView(step)).toBe("components");
     expect(Object.keys(STEP_VIEW).sort()).toEqual(Object.keys(STEP_WORDS).sort());
   });
 
   it("follows the step, and only the resources when the repo offers no components zoom", () => {
-    expect(kioskView(demo("planned"), { components: true })).toEqual({ view: "resources", pinned: false, secs: null });
+    expect(kioskView(demo("planned"), { components: true })).toEqual({ view: "components", pinned: false, secs: null });
+    expect(kioskView(demo("planned"), { components: true, pick: { view: "resources", at: 0 }, now: 1000 }).view).toBe("resources");
     expect(kioskView(demo("waiting"), { components: true })).toEqual({ view: "components", pinned: false, secs: null });
     expect(kioskView(demo("waiting"), { components: false })).toEqual({ view: "resources", pinned: false, secs: null });
     expect(kioskView(demo("waiting"), { components: false, pick: { view: "components", at: 0 }, now: 1000 }).view).toBe("resources");
-    expect(kioskView(null, { components: true }).view).toBe("resources");
+    expect(kioskView(null, { components: true }).view).toBe("components");
+    expect(kioskView(null, { components: false }).view).toBe("resources");
   });
 
   it("holds a clicked view for 90 s after the last click, then follows the step again", () => {
@@ -242,8 +244,15 @@ describe("which view the frame shows (#571)", () => {
   });
 
   it("says how to read the view shown", () => {
-    expect(legendWords("components")).toMatch(/^Each card is a Terraform root .* titled with the pipeline job that applies it/);
+    expect(legendWords("components")).toMatch(/^Components shows the pipeline's jobs and waves\. Each card is a Terraform root .* titled with the job that applies it/);
     expect(legendWords("resources")).toMatch(/^Each box is a Terraform root/);
+    // behold#571: a Terragrunt scenario names its units.
+    for (const v of ["components", "resources"]) {
+      const words = legendWords(v, "terragrunt");
+      expect(words).toMatch(/is a Terragrunt unit with its own state/);
+      expect(words).toMatch(/one unit reading another's outputs.*applies its units together/);
+      expect(words).not.toMatch(/\broots?\b/);
+    }
   });
 
   // A DOM for the toggle: elements with attributes and click listeners.
@@ -267,13 +276,14 @@ describe("which view the frame shows (#571)", () => {
       renderViewToggle(host, { view: "components", pinned: false, secs: null }, { components: true, onPick: (v) => picked.push(v) });
       expect(host.hidden).toBe(false);
       const buttons = host.children[0].children;
-      expect(buttons.map((b) => [b.textContent, b.attrs["aria-pressed"]])).toEqual([["Resources", "false"], ["Roots by wave", "true"]]);
-      expect(host.children[1].textContent).toBe("follows the step");
+      expect(buttons.map((b) => [b.textContent, b.attrs["aria-pressed"]])).toEqual([["Resources", "false"], ["Components", "true"]]);
+      expect(host.children[1].textContent).toBe("the pipeline's jobs and waves · follows the step");
+      expect(buttons[1].attrs.title).toBe("the pipeline's jobs and waves");
       buttons[0].listeners.click();
       expect(picked).toEqual(["resources"]);
 
       renderViewToggle(host, { view: "resources", pinned: true, secs: 42 }, { components: true });
-      expect(host.children[1].textContent).toBe("held by a click; the step leads again in 42 s");
+      expect(host.children[1].textContent).toBe("each resource the change touches · held by a click; the step leads again in 42 s");
 
       renderViewToggle(host, { view: "resources", pinned: false, secs: null }, { components: false });
       expect(host.hidden).toBe(true);

package/web/terragucci-change.js

@@ -129,9 +129,9 @@ export function totalsLine(totals) {
 }
 
 /** #568 step 2: "across 3 roots", from `totals_roots` (report minor 35); null on an older report, which has no count. */
-export function rootsCount(n) {
+export function rootsCount(n, noun = { one: "root", many: "roots" }) {
   if (n === undefined || n === null) return null;
-  return `across ${n} ${n === 1 ? "root" : "roots"}`;
+  return `across ${n} ${n === 1 ? noun.one : noun.many}`;
 }
 
 const money = (n) => (n === null || n === undefined ? "no figure" : n.toFixed(2));

package/web/terragucci-components-live.js

@@ -62,16 +62,36 @@ export function runsCommit(pin, progress) {
 export function jobStatus(index, commit, jobName) {
   const runs = index && index.doc && Array.isArray(index.doc.runs) ? index.doc.runs : [];
   let skipped = null;
+  // behold#571: a newer run on the commit that skipped this job but ran
+  // another (a /terragucci apply re-run applies every wave in its
+  // apply-comment job) is the latest run for the wave.
+  let later = null;
   for (const run of runs) {
     if (!sameSha(run.commit, commit)) continue;
     const job = (run.jobs || []).find((j) => j.name === jobName);
     if (!job) continue;
-    if (job.status !== "skipped") return { status: job.status, words: JOB_WORDS[job.status] || job.status, tone: JOB_TONE[job.status] || "idle", run: run.id };
+    if (job.status !== "skipped") {
+      return { status: job.status, words: JOB_WORDS[job.status] || job.status, tone: JOB_TONE[job.status] || "idle", run: run.id, ...(later ? { superseded: later } : {}) };
+    }
+    if (!later && (run.jobs || []).some((j) => j.status !== "skipped")) later = run.id;
     skipped = skipped || { status: "skipped", words: JOB_WORDS.skipped, tone: "idle", run: run.id };
   }
   return skipped;
 }
 
+/** A wave's state from the run view, as a box's title says it after a re-run. */
+export const WAVE_WORDS = { waiting: "held at the gate", applying: "running", applied: "applied", failed: "failed", refused: "refused" };
+
+/**
+ * The status a wave's box shows: its job's, unless a later run on the commit
+ * took the wave over (`superseded`); then the run view's state for the wave,
+ * which is the latest run's.
+ */
+export function waveStatus(status, state) {
+  if (!status || !status.superseded || !state || !WAVE_WORDS[state]) return status;
+  return { status: state, words: WAVE_WORDS[state], tone: toneOf(state), run: status.superseded };
+}
+
 /** "apply-wave-2 · held at the gate", or the job alone without a status. */
 export function waveTitle(jobName, status) {
   return status ? `${jobName} · ${status.words}` : jobName;
@@ -122,9 +142,9 @@ export function componentMarks(answer, progress, facets, { runs = null, pin = nu
   const waveNumbers = [...new Set(jobs.map((j) => j.wave).filter((n) => typeof n === "number"))].sort((a, b) => a - b);
   for (const n of waveNumbers) {
     const jobName = jobs.find((j) => j.wave === n).jobName;
-    const status = commit ? jobStatus(runs, commit, jobName) : null;
     const members = jobs.filter((j) => j.wave === n).map((j) => cards[j.component]).filter(Boolean);
     const w = waveState(answer, progress, stage, n);
+    const status = commit ? waveStatus(jobStatus(runs, commit, jobName), w) : null;
     const facts = [];
     for (const m of members) for (const f of m.facts) if (!facts.includes(f)) facts.push(f);
     // The plan a waiting wave is approved for first, as it's what the approval

package/web/terragucci-components-live.test.js

@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { JOB_WORDS, componentMarks, jobStatus, runsCommit, waveOfKey, waveTitle } from "./terragucci-components-live.js";
+import { JOB_WORDS, componentMarks, jobStatus, runsCommit, waveOfKey, waveStatus, waveTitle } from "./terragucci-components-live.js";
 
 // #571: the live marks on a terragucci repo's components zoom. The facets are
 // the components graph's (src/__fixtures__/terragucci-components: network and
@@ -53,8 +53,8 @@ describe("a wave job's status from the pipeline's runs (#571)", () => {
       run(10, "0000000", [job("apply-wave-2", "failure")]),
     );
     expect(jobStatus(index, MERGE, "apply-wave-2")).toEqual({ status: "running", words: "running", tone: "busy", run: 12 });
-    // The resume skipped wave 1: the merge's run says how it went.
-    expect(jobStatus(index, MERGE, "apply-wave-1")).toEqual({ status: "success", words: "succeeded", tone: "ok", run: 11 });
+    // The resume skipped wave 1: the merge's run says how it went, and that a later run went on from it.
+    expect(jobStatus(index, MERGE, "apply-wave-1")).toEqual({ status: "success", words: "succeeded", tone: "ok", run: 11, superseded: 12 });
     // A short sha names the same commit.
     expect(jobStatus(index, MERGE.slice(0, 8), "apply-wave-2").run).toBe(12);
   });
@@ -116,6 +116,32 @@ describe("the component marks (#571)", () => {
     expect(m.waves[3].title).toBe("apply-wave-3 · skipped");
   });
 
+  it("titles a wave a re-run applied with the latest run's state, not the merge's failure (behold#571)", () => {
+    // As the demo's failure scenario has them: the merge's run fails wave 2; each
+    // /terragucci apply re-run applies the waves in its apply-comment job and skips the wave jobs.
+    const comment = (id, status) => run(id, MERGE, [job("apply-comment", status), job("apply-wave-1", "skipped"), job("apply-wave-2", "skipped"), job("apply-wave-3", "skipped")]);
+    const merge = run(11, MERGE, [job("apply-comment", "skipped"), job("apply-wave-1", "success"), job("apply-wave-2", "failure"), job("apply-wave-3", "queued")]);
+    const applied = { ...progress("applied"), states: progress("applied").states.map((w) => ({ ...w, state: "applied" })) };
+    const m = componentMarks(answer, applied, facets, { runs: runs(comment(13, "success"), comment(12, "waiting"), merge), pin: MERGE });
+    expect(m.cards.app).toMatchObject({ state: "applied" });
+    expect(m.waves[2]).toMatchObject({ state: "applied", tone: "ok", title: "apply-wave-2 · applied" });
+    expect(m.waves[3].title).toBe("apply-wave-3 · applied");
+    // While the re-run waits at the gate, the box says so.
+    const held = componentMarks(answer, progress("waiting"), facets, { runs: runs(comment(12, "waiting"), merge), pin: MERGE });
+    expect(held.waves[2].title).toBe("apply-wave-2 · held at the gate");
+    // Before any re-run, the merge's own failure.
+    const failed = componentMarks(answer, progress("failed"), facets, { runs: runs(merge), pin: MERGE });
+    expect(failed.waves[2].title).toBe("apply-wave-2 · failed");
+  });
+
+  it("keeps the job's status when no later run took the wave over, or the run view has no state for it", () => {
+    const st = { status: "failure", words: "failed", tone: "bad", run: 11 };
+    expect(waveStatus(st, "applied")).toBe(st);
+    expect(waveStatus({ ...st, superseded: 12 }, null)).toMatchObject({ status: "failure" });
+    expect(waveStatus({ ...st, superseded: 12 }, "applied")).toEqual({ status: "applied", words: "applied", tone: "ok", run: 12 });
+    expect(waveStatus(null, "applied")).toBe(null);
+  });
+
   it("draws the pull request's plan before the merge, with no job status", () => {
     const m = componentMarks(answer, null, facets, { runs: runs(run(11, MERGE, [job("apply-wave-2", "waiting")])), pin: `pull-41-a1b2c3d4` });
     expect(m.stage).toBe("pull-request");