@jevitate/cli 0.22.0 → 0.24.0

package/dist/bin.js

@@ -10,16 +10,36 @@ import { mkdir, stat } from "node:fs/promises";
 
 // ../domain/dist/content-hash.js
 import { createHash } from "node:crypto";
-function canonical(value) {
+function compareUtf16CodeUnits(a, b2) {
+  const length = Math.min(a.length, b2.length);
+  for (let index = 0; index < length; index += 1) {
+    const difference = a.charCodeAt(index) - b2.charCodeAt(index);
+    if (difference !== 0)
+      return difference < 0 ? -1 : 1;
+  }
+  return a.length === b2.length ? 0 : a.length < b2.length ? -1 : 1;
+}
+function canonicalJson(value) {
   if (value === null || typeof value !== "object")
     return JSON.stringify(value);
   if (Array.isArray(value))
-    return `[${value.map(canonical).join(",")}]`;
+    return `[${value.map(canonicalJson).join(",")}]`;
+  const entries = Object.entries(value).sort(([a], [b2]) => compareUtf16CodeUnits(a, b2));
+  return `{${entries.map(([k, v]) => `${JSON.stringify(k)}:${canonicalJson(v)}`).join(",")}}`;
+}
+function legacyCanonicalJson(value) {
+  if (value === null || typeof value !== "object")
+    return JSON.stringify(value);
+  if (Array.isArray(value))
+    return `[${value.map(legacyCanonicalJson).join(",")}]`;
   const entries = Object.entries(value).sort(([a], [b2]) => a.localeCompare(b2));
-  return `{${entries.map(([k, v]) => `${JSON.stringify(k)}:${canonical(v)}`).join(",")}}`;
+  return `{${entries.map(([k, v]) => `${JSON.stringify(k)}:${legacyCanonicalJson(v)}`).join(",")}}`;
 }
 function contentHash(value) {
-  return createHash("sha256").update(canonical(value)).digest("hex");
+  return createHash("sha256").update(canonicalJson(value)).digest("hex");
+}
+function legacyContentHash(value) {
+  return createHash("sha256").update(legacyCanonicalJson(value)).digest("hex");
 }
 function sha256(text2) {
   return createHash("sha256").update(text2, "utf8").digest("hex");
@@ -33945,18 +33965,18 @@ function stepIdsOf(rec) {
         ids.add(s3.stepId);
   return ids;
 }
-function canonicalJson(v) {
+function canonicalJson2(v) {
   if (Array.isArray(v))
-    return `[${v.map(canonicalJson).join(",")}]`;
+    return `[${v.map(canonicalJson2).join(",")}]`;
   if (v !== null && typeof v === "object") {
     const o = v;
-    return `{${Object.keys(o).filter((k) => o[k] !== void 0).sort().map((k) => `${JSON.stringify(k)}:${canonicalJson(o[k])}`).join(",")}}`;
+    return `{${Object.keys(o).filter((k) => o[k] !== void 0).sort().map((k) => `${JSON.stringify(k)}:${canonicalJson2(o[k])}`).join(",")}}`;
   }
   return JSON.stringify(v) ?? "null";
 }
 function seededRandom(rec) {
   let h = 2166136261;
-  const text2 = canonicalJson(rec);
+  const text2 = canonicalJson2(rec);
   for (let i = 0; i < text2.length; i++) {
     h ^= text2.charCodeAt(i);
     h = Math.imul(h, 16777619) >>> 0;
@@ -35260,9 +35280,9 @@ async function confineFixture(raw, root2) {
   }
   if (!isFile)
     throw fixtureNotFound(candidate, root2);
-  const sensitive = fixtureSensitiveReason(real, realRoot) ?? (isInsideRoot(candidate, resolve3(root2)) ? fixtureSensitiveReason(candidate, resolve3(root2)) : null);
-  if (sensitive !== null)
-    throw fixtureSensitive(candidate, root2, sensitive);
+  const sensitive2 = fixtureSensitiveReason(real, realRoot) ?? (isInsideRoot(candidate, resolve3(root2)) ? fixtureSensitiveReason(candidate, resolve3(root2)) : null);
+  if (sensitive2 !== null)
+    throw fixtureSensitive(candidate, root2, sensitive2);
   return real;
 }
 function fixtureEscapesRoot(raw, root2) {
@@ -39592,6 +39612,59 @@ async function clockBounded(work, ms, onTimeout) {
   }
 }
 
+// ../explore/dist/request-body-values.js
+var MIN_VALUE_CHARS = 3;
+var MAX_VALUES = 50;
+var MAX_BODY_CHARS = 64e3;
+var SENSITIVE_WORDS = /* @__PURE__ */ new Set(["pass", "password", "passwd", "pwd", "secret", "token", "auth", "authorization", "apikey", "key", "otp", "pin", "cvv", "cvc", "card", "ssn", "session", "cookie", "signature", "credential", "credentials"]);
+function sensitive(key2) {
+  return key2.split(/[^A-Za-z0-9]+|(?<=[a-z0-9])(?=[A-Z])/).some((w) => SENSITIVE_WORDS.has(w.toLowerCase()));
+}
+function keep(out, key2, value) {
+  if (out.length >= MAX_VALUES)
+    return;
+  if (key2 !== null && sensitive(key2))
+    return;
+  const v = value.replace(/\s+/g, " ").trim();
+  if (v.length >= MIN_VALUE_CHARS)
+    out.push(v);
+}
+function walk(out, key2, node2) {
+  if (out.length >= MAX_VALUES)
+    return;
+  if (typeof node2 === "string")
+    keep(out, key2, node2);
+  else if (Array.isArray(node2))
+    for (const item of node2)
+      walk(out, key2, item);
+  else if (node2 !== null && typeof node2 === "object") {
+    for (const [k, v] of Object.entries(node2)) {
+      if (sensitive(k))
+        continue;
+      walk(out, k, v);
+    }
+  }
+}
+function bodyValues(body, contentType) {
+  if (body === null || body === "" || body.length > MAX_BODY_CHARS)
+    return [];
+  const type = (contentType ?? "").toLowerCase();
+  const out = [];
+  if (type.includes("application/x-www-form-urlencoded")) {
+    for (const [k, v] of new URLSearchParams(body))
+      keep(out, k, v);
+    return out;
+  }
+  if (type === "" || type.includes("json")) {
+    try {
+      walk(out, null, JSON.parse(body));
+    } catch {
+      return [];
+    }
+  }
+  return out;
+}
+
 // ../explore/dist/page-monitor.js
 var RPC_TRAILER_READ_MS = 2e3;
 var INTERACTIVE_SELECTOR2 = "a[href],button,input:not([type=hidden]),select,textarea,[role=button],[role=link],[role=textbox],[role=checkbox],[role=combobox],[contenteditable=true]";
@@ -39797,6 +39870,8 @@ function pathOf3(url2) {
     return url2.split(/[?#]/)[0] ?? url2;
   }
 }
+var BODY_METHODS = /* @__PURE__ */ new Set(["POST", "PUT", "PATCH"]);
+var MAX_WRITE_BODIES = 200;
 function requestContentTypeOf(r) {
   try {
     const v = r.headers()["content-type"];
@@ -39809,6 +39884,8 @@ var RECENT_REQUESTS_MS = 6e4;
 var PageMonitor = class {
   #page;
   #inflight = /* @__PURE__ */ new Map();
+  /** #649: the string values recent writes sent in their bodies (memory only; never persisted). */
+  #writeBodies = [];
   #completed = [];
   #wakers = /* @__PURE__ */ new Set();
   #statuses = /* @__PURE__ */ new WeakMap();
@@ -39846,6 +39923,18 @@ var PageMonitor = class {
         startedAt,
         ...requestContentType2 === void 0 ? {} : { requestContentType: requestContentType2 }
       });
+      if (BODY_METHODS.has(r.method().toUpperCase())) {
+        let values2 = [];
+        try {
+          values2 = bodyValues(r.postData(), requestContentType2);
+        } catch {
+        }
+        if (values2.length > 0) {
+          this.#writeBodies.push({ startedAt, url: r.url(), values: values2 });
+          if (this.#writeBodies.length > MAX_WRITE_BODIES)
+            this.#writeBodies.shift();
+        }
+      }
       for (const c of this.#captures) {
         c.began(r, {
           method: r.method().toUpperCase(),
@@ -40097,6 +40186,10 @@ var PageMonitor = class {
         clock.clearTimeout(timer);
     }
   }
+  /** #649: the string values the writes started since `sinceMs` sent, from URLs `keep` accepts. */
+  writeBodyValuesSince(sinceMs, keep2) {
+    return this.#writeBodies.filter((w) => w.startedAt >= sinceMs && keep2(w.url)).flatMap((w) => w.values);
+  }
   /** Requests that ended since `sinceMs` (wall clock). */
   completedSince(sinceMs) {
     return this.#completed.filter((r) => r.endedAt >= sinceMs);
@@ -41129,8 +41222,8 @@ function boundCandidates(candidates, opts) {
     return s3;
   };
   const ranked = candidates.map((c, i) => ({ c, i, s: score2(c, i) })).sort((a, b2) => b2.s - a.s || a.i - b2.i).slice(0, Math.max(0, opts.limit));
-  const keep = new Set(ranked.map((r) => r.i));
-  return { kept: candidates.filter((_, i) => keep.has(i)), omitted: candidates.length - keep.size };
+  const keep2 = new Set(ranked.map((r) => r.i));
+  return { kept: candidates.filter((_, i) => keep2.has(i)), omitted: candidates.length - keep2.size };
 }
 
 // ../explore/dist/stuck-actions.js
@@ -41415,7 +41508,8 @@ var SideEffectGuard = class {
     const own2 = requests.filter((r) => this.#ours(r));
     const settled = !inflightAny && own2.every((r) => r.status !== null && r.status >= 200 && r.status < 300);
     const completedOk = own2.length > 0 && settled;
-    this.#lastClick = { requestSent: requests.length > 0 || inflightAny, writes: [...done, ...pending], completedOk, settled };
+    const sentValues = this.#monitor.writeBodyValuesSince(o.at, (url2) => this.#ours({ url: url2 }));
+    this.#lastClick = { requestSent: requests.length > 0 || inflightAny, writes: [...done, ...pending], completedOk, settled, sentValues };
     if (done.length + pending.length === 0)
       return;
     this.#fired.set(o.key, {
@@ -41921,6 +42015,7 @@ var UnsubmittedTypeTracker = class {
 var GOAL_MET_THRESHOLD = 0.75;
 var GOAL_CHECK_TRIGGER = 0.5;
 var WRITES_DONE_NOTE = "the job's writes succeeded; the page shows no change (repeat data?)";
+var READ_BACK_DONE_NOTE = "the job's writes succeeded and a page loaded from the server shows what they sent";
 function groundDone(e) {
   if (e.unsubmitted.length > 0) {
     return { accept: false, reason: `typed text in ${e.unsubmitted.map((l2) => `"${l2}"`).join(", ")} was never submitted` };
@@ -41946,6 +42041,9 @@ function groundDone(e) {
   if (w !== void 0 && writesAllSucceeded(w) && w.goalIsWrites !== null && w.goalIsWrites >= GOAL_MET_THRESHOLD) {
     return { accept: true, outcome: { status: "completed", verifiedBy: "succeeded-writes", note: WRITES_DONE_NOTE } };
   }
+  if (w !== void 0 && writesAllSucceeded(w) && e.readBack === true && p >= GOAL_CHECK_TRIGGER) {
+    return { accept: true, outcome: { status: "completed", verifiedBy: "succeeded-writes", note: READ_BACK_DONE_NOTE } };
+  }
   const notMet = `the goal is not observably achieved on this page (p=${p.toFixed(2)})`;
   if (w !== void 0 && writesAllSucceeded(w) && w.goalIsWrites !== null) {
     return { accept: false, reason: `${notMet}; the job's writes succeeded, but they are not judged to be the whole goal (p=${w.goalIsWrites.toFixed(2)})` };
@@ -42094,6 +42192,7 @@ async function judgeGoalCompletion(judge, input2) {
       ...input2.signInFacts === void 0 ? [] : [`SIGN-IN (observed by code, trusted): ${input2.signInFacts}`],
       ...input2.saveFacts === void 0 ? [] : [`SAVE (observed by code, trusted): ${input2.saveFacts}`],
       ...input2.writeFacts === void 0 ? [] : [`WRITES (observed by code, trusted): ${input2.writeFacts}`],
+      ...input2.readBackFacts === void 0 ? [] : [`READ-BACK (observed by code, trusted): ${input2.readBackFacts}`],
       ...input2.pageStatus === void 0 || input2.pageStatus === "" ? [] : [`PAGE STATUS (untrusted): ${input2.pageStatus}`],
       `VISIBLE PAGE TEXT (untrusted): ${input2.pageText.replace(/\s+/g, " ").slice(0, GOAL_TEXT_CHARS)}`,
       ...input2.fieldValues === void 0 || input2.fieldValues.length === 0 ? [] : [
@@ -45529,6 +45628,7 @@ var OBSERVED_PAGE_CHARS = 2e4;
 var MIN_QUOTE_CHARS = 3;
 var MAX_OBSERVED_FIELDS = 40;
 var OBSERVED_FIELD_CHARS = 500;
+var MAX_READ_BACK_VALUES = 50;
 var MAX_OBSERVED_CONTROLS = 120;
 var HEADING_CHARS = 200;
 function controlFields(controls) {
@@ -45583,6 +45683,56 @@ var ObservedPages = class {
     if (document2 !== void 0)
       this.#writeDocument = document2;
   }
+  /**
+   * #649: a sent value the run did not type (a write's request body: a prefilled import's rows) that
+   * a page on the write's own route already showed before the write — its source, not a copy the app
+   * kept. Only a page on another route reads it back: reloading the source shows it either way.
+   */
+  #sourceRoute = /* @__PURE__ */ new Map();
+  /** #649: a write's body values the run did not type, decided on the next page seen (see `add`). */
+  #pendingSent = null;
+  /**
+   * #649: a successful write the run fired sent `values` in its body, from a page on `url`. One the run
+   * did not type awaits read-back like a typed one only when the next page shows it as NEW text — text
+   * no earlier page on that route showed (an import's rows listed from its CSV; never a form's
+   * untouched prefilled fields, still only in their fields). Decided when that page is added.
+   */
+  noteSentValues(values2, url2) {
+    const own2 = /* @__PURE__ */ new Set([...this.#ownInputs, ...this.#unread]);
+    const fresh = values2.map((value) => fold(redactContext(value, this.secrets).slice(0, OBSERVED_FIELD_CHARS))).filter((v) => v !== "" && !own2.has(v));
+    this.#pendingSent = fresh.length === 0 ? null : { route: routeOf(url2), values: fresh };
+  }
+  /** #649: the pending body values `text` (the page after the write) newly shows await read-back. */
+  #settleSent(text2) {
+    const pending = this.#pendingSent;
+    if (pending === null)
+      return;
+    this.#pendingSent = null;
+    const now2 = fold(text2);
+    const before = this.#pages.filter((p) => routeOf(p.url) === pending.route);
+    for (const v of pending.values) {
+      if (!now2.includes(v) || before.some((p) => fold(p.text).includes(v)))
+        continue;
+      this.#unread.add(v);
+      if (before.some((p) => (p.fields ?? []).some((f2) => fold(f2.value).includes(v))))
+        this.#sourceRoute.set(v, pending.route);
+    }
+  }
+  /**
+   * #671: values the run typed into a field on one document load. A field holding one shows the run's
+   * own entry, never what the app kept: retyping a sent message into its composer after a reload is
+   * not a read-back.
+   */
+  #typedOn = null;
+  /** #671: the run typed `value` into a field (a message composer too) on document load `document`. */
+  noteTypedOn(value, document2) {
+    const v = fold(redactContext(value, this.secrets).slice(0, OBSERVED_FIELD_CHARS));
+    if (document2 === void 0 || v === "")
+      return;
+    if (this.#typedOn?.document !== document2)
+      this.#typedOn = { document: document2, values: /* @__PURE__ */ new Set() };
+    this.#typedOn.values.add(v);
+  }
   /** #647: the run's sent values (folded) that no page loaded from the server since has shown. */
   unreadWrites() {
     return this.#unread;
@@ -45596,15 +45746,37 @@ var ObservedPages = class {
    * #647: a page from a later document load than the write shows `shown` (its visible text, or field
    * values): the sent values it contains are read back from the app. Returns those values.
    */
-  readBack(document2, shown2) {
+  readBack(document2, shown2, url2) {
     if (this.#unread.size === 0 || document2 === void 0 || document2 === this.#writeDocument)
       return [];
     const text2 = fold(shown2);
-    const back = [...this.#unread].filter((v) => text2.includes(v));
-    for (const v of back)
+    const route = url2 === void 0 ? void 0 : routeOf(url2);
+    const back = [...this.#unread].filter((v) => text2.includes(v) && (route === void 0 || this.#sourceRoute.get(v) !== route));
+    for (const v of back) {
       this.#unread.delete(v);
+      this.#sourceRoute.delete(v);
+    }
+    this.#readBackCount += back.length;
+    for (const v of back)
+      if (this.#readBackValues.length < MAX_READ_BACK_VALUES)
+        this.#readBackValues.push(v);
     return back;
   }
+  /** #645: how many sent values a page loaded from the server has shown again. */
+  #readBackCount = 0;
+  /** #667: the sent values (folded) read back so far, bounded. */
+  #readBackValues = [];
+  /** #667: the sent values (folded) a page loaded from the server has shown again. */
+  readBackValues() {
+    return this.#readBackValues;
+  }
+  /**
+   * #645: the app was seen to keep what the run's writes sent — at least one value was read back and
+   * none is still unread. Code evidence the page judgment lacks (see `groundDone`).
+   */
+  readBackConfirmed() {
+    return this.#readBackCount > 0 && this.#unread.size === 0;
+  }
   /** #239: the run's own typed, not-yet-saved values (folded). */
   ownInputs() {
     return this.#ownInputs;
@@ -45617,9 +45789,9 @@ var ObservedPages = class {
     const clip5 = (h) => redactContext((h ?? "").replace(/\s+/g, " ").trim(), this.secrets).slice(0, HEADING_CHARS);
     const heading = clip5(headings2.heading);
     const title = clip5(headings2.title);
-    const keep = (xs) => (xs ?? []).slice(0, MAX_OBSERVED_CONTROLS).map((n3) => redactContext(n3.replace(/\s+/g, " ").trim(), this.secrets).slice(0, OBSERVED_FIELD_CHARS)).filter((n3) => n3 !== "");
-    const names = keep(headings2.controlNames);
-    const links = keep(headings2.contentLinks);
+    const keep2 = (xs) => (xs ?? []).slice(0, MAX_OBSERVED_CONTROLS).map((n3) => redactContext(n3.replace(/\s+/g, " ").trim(), this.secrets).slice(0, OBSERVED_FIELD_CHARS)).filter((n3) => n3 !== "");
+    const names = keep2(headings2.controlNames);
+    const links = keep2(headings2.contentLinks);
     const capped = (headings2.controlNames ?? []).length > MAX_OBSERVED_CONTROLS || (headings2.contentLinks ?? []).length > MAX_OBSERVED_CONTROLS;
     const incomplete = [headings2.inventoryIncomplete ?? "", capped ? `more than ${MAX_OBSERVED_CONTROLS} controls were kept` : ""].filter((x) => x !== "").join("; ");
     const status = headings2.status;
@@ -45639,7 +45811,10 @@ var ObservedPages = class {
       if (nav.length > 0)
         this.#topNav = nav;
     }
-    this.readBack(headings2.document, [page.text, ...kept.map((f2) => f2.value)].join("\n"));
+    this.#settleSent(page.text);
+    const typed = this.#typedOn !== null && this.#typedOn.document === headings2.document ? [...this.#typedOn.values] : [];
+    const appFields = kept.map((f2) => f2.value).filter((value) => !typed.some((t) => fold(value).includes(t)));
+    this.readBack(headings2.document, [page.text, ...appFields].join("\n"), url2);
     if (page.text.trim() === "" && kept.length === 0)
       return;
     const same = (p) => JSON.stringify(p.fields ?? []) === JSON.stringify(page.fields ?? []) && p.heading === page.heading && p.title === page.title && p.status === page.status && JSON.stringify(p.controls ?? []) === JSON.stringify(page.controls ?? []) && JSON.stringify(p.contentLinks ?? []) === JSON.stringify(page.contentLinks ?? []) && p.inventoryIncomplete === page.inventoryIncomplete;
@@ -45655,6 +45830,13 @@ var ObservedPages = class {
     return [...this.#pages].reverse();
   }
 };
+function routeOf(url2) {
+  try {
+    return new URL(url2).pathname;
+  } catch {
+    return url2.split(/[?#]/)[0] ?? url2;
+  }
+}
 function pathOf6(url2) {
   try {
     const u = new URL(url2);
@@ -46297,7 +46479,7 @@ var ABSENCE_GOAL = /\bwhether\b|\b(?:is|are) there\b|\bthere (?:is|are) (?:no|no
 function goalAdmitsAbsence(goal) {
   return ABSENCE_GOAL.test(goal);
 }
-var WRITE_GOAL = /(?:^\s*|[.!?;:]\s+|\b(?:then|and|please)\s+)(?:record|save|create|add|invite|submit|send|post|publish|register|book|schedule)\b/i;
+var WRITE_GOAL = /(?:^\s*|[.!?;:]\s+|\b(?:then|and|please)\s+)(?:record|save|create|add|invite|submit|send|post|publish|register|book|schedule|import|upload|update|change|edit|rename|delete|remove)\b/i;
 function goalAsksToWrite(goal) {
   return WRITE_GOAL.test(goal);
 }
@@ -48141,6 +48323,7 @@ function newStep(ctx, input2) {
         if (proposedDone)
           writes = jobWritesOf(ctx);
         const writeFacts = writes !== void 0 && saved === null && writesAllSucceeded(writes) ? writes.facts : void 0;
+        const readBackFacts = ctx.observed.readBackConfirmed() ? readBackFactsOf(ctx.observed.readBackValues(), pageText) : void 0;
         const judged = await judgeGoalCompletion(cfg.judge, {
           goal: cfg.goal,
           url: snap.url,
@@ -48151,6 +48334,7 @@ function newStep(ctx, input2) {
           ...signIn === null ? {} : { signInFacts: signIn.facts },
           ...saved === null ? {} : { saveFacts: saved.facts },
           ...writeFacts === void 0 ? {} : { writeFacts },
+          ...readBackFacts === void 0 ? {} : { readBackFacts },
           fieldValues: fieldValuesOf(snap.controls, ctx.isBound)
         }).catch(() => ({ goalMet: null, goalIsSignIn: null, goalIsSave: null, goalIsWrites: null }));
         goalMet = judged.goalMet;
@@ -48165,7 +48349,8 @@ function newStep(ctx, input2) {
       ...goalMet === void 0 ? {} : { goalMetProbability: goalMet },
       ...signIn === null || goalMet === void 0 ? {} : { signIn: { completed: signIn.completed, goalIsSignIn } },
       ...saved === null || goalMet === void 0 ? {} : { save: { completed: saved.completed, goalIsSave } },
-      ...writes === void 0 || goalMet === void 0 ? {} : { writes: { ...writes, goalIsWrites } }
+      ...writes === void 0 || goalMet === void 0 ? {} : { writes: { ...writes, goalIsWrites } },
+      ...writes === void 0 ? {} : { readBack: ctx.observed.readBackConfirmed() }
     });
     const judgments = {};
     if (goalMet !== void 0 && goalMet !== null)
@@ -48180,6 +48365,11 @@ function newStep(ctx, input2) {
   };
   return { ...input2, record: record2, signIn, pendingNote, acceptedBy, groundGoal };
 }
+function readBackFactsOf(values2, pageText) {
+  const text2 = pageText.toLowerCase();
+  const shown2 = values2.filter((v) => text2.includes(v)).length;
+  return `every value this run's writes sent (${values2.length}) was shown again on a page loaded from the server after the write \u2014 the app kept them; this page shows ${shown2} of them`;
+}
 
 // ../explore/dist/goal-loop/min-effort.js
 function deferEnding(ctx, step, ending) {
@@ -48218,7 +48408,7 @@ async function readBackProbe(ctx, step) {
     return [];
   const text2 = await readPageText(ctx.page, ctx.secrets).catch(() => "");
   const values2 = await ctx.page.evaluate(() => Array.from(document.querySelectorAll("input, textarea, select")).filter((e) => e.type !== "password").map((e) => e.value ?? "")).catch(() => []);
-  const back = ctx.observed.readBack(await documentOf(ctx.page), redactPageText([text2, ...values2].join("\n"), ctx.secrets));
+  const back = ctx.observed.readBack(await documentOf(ctx.page), redactPageText([text2, ...values2].join("\n"), ctx.secrets), ctx.page.url());
   const listed2 = (vs) => vs.map((v) => `"${v}"`).join(", ");
   const missing = unread.filter((v) => !back.includes(v));
   ctx.history.push(missing.length === 0 ? `read back after a reload: the page loaded from the server shows what the run sent (${listed2(back)})` : `after a reload, the page loaded from the server no longer shows what the run sent (${listed2(missing)})`);
@@ -48309,6 +48499,7 @@ async function handleReport(ctx, step) {
 }
 
 // ../explore/dist/goal-loop/handle-done.js
+var NO_WRITE_YET = "no write of this run has succeeded yet \u2014 the goal asks for a change the app must receive: go back and press the control that submits it (Import, Save, Send\u2026)";
 async function unreadWriteHold(ctx, step, outcome) {
   if (outcome.status === "completed" && outcome.verifiedBy === "success-condition")
     return null;
@@ -48400,12 +48591,13 @@ async function handleDone(ctx, step) {
       }
     }
     ctx.doneRejections += 1;
-    ctx.history.push(`done rejected: ${verdict.reason} \u2014 keep working toward the goal`);
-    record2(false, `done rejected (${ctx.doneRejections}/${MAX_DONE_REJECTIONS}): ${verdict.reason}`, {
+    const why = ctx.writeGoal && !ctx.wroteOk ? `${verdict.reason}; ${NO_WRITE_YET}` : verdict.reason;
+    ctx.history.push(`done rejected: ${why} \u2014 keep working toward the goal`);
+    record2(false, `done rejected (${ctx.doneRejections}/${MAX_DONE_REJECTIONS}): ${why}`, {
       ...judgments === void 0 ? {} : { judgments }
     });
     if (ctx.doneRejections >= MAX_DONE_REJECTIONS) {
-      ctx.incomplete = `the model proposed done ${ctx.doneRejections} times, but ${verdict.reason}`;
+      ctx.incomplete = `the model proposed done ${ctx.doneRejections} times, but ${why}`;
       ctx.endedOnRejectedDone = true;
       ctx.stop = "done";
       return "stop";
@@ -48787,6 +48979,7 @@ async function handleCodeTypedField(ctx, step) {
       ctx.valueLog.typed(control.name || control.summary, value);
       ctx.save.noteTyped(control.name || control.summary, value);
       ctx.observed.noteOwnInput(value);
+      ctx.observed.noteTypedOn(value, await documentOf(ctx.page));
       ctx.noteMutation(`type ${control.name}`, control.descriptor, snap.signature, at3, { field: keyOf(control), value });
       ctx.tracker.countAction();
       ctx.cleared(control);
@@ -49349,6 +49542,7 @@ async function handleFill(ctx, step) {
       ctx.typeProbe = { key: keyOf(control), label: quote(control.name || control.summary, 60), at: typedAt, background: typedBackground, state: typedState };
       ctx.recorder.fill(control.descriptor, text2, at3);
       ctx.valueLog.typed(control.name || control.summary, text2);
+      ctx.observed.noteTypedOn(text2, await documentOf(ctx.page));
       if (!ctx.isBound(control) && !isCredentialField(control) && !sendable(control)) {
         ctx.save.noteTyped(control.name || control.summary, text2);
         ctx.observed.noteOwnInput(text2);
@@ -49396,6 +49590,7 @@ async function perceiveStep(ctx) {
     if (lc !== null && lc !== ctx.settledClick) {
       ctx.settledClick = lc;
       if (lc.writes.length > 0 && lc.writes.every((w) => w.status !== null && w.status >= 200 && w.status < 300)) {
+        ctx.observed.noteSentValues(lc.sentValues, ctx.page.url());
         ctx.observed.confirmOwnInputs(await documentOf(ctx.page));
         ctx.wroteOk = true;
       }
@@ -49947,6 +50142,7 @@ async function viewPage(ctx, step) {
   } catch {
   }
   const document2 = await documentOf(ctx.page);
+  const unreadBefore = [...ctx.observed.unreadWrites()];
   ctx.observed.add(snap.url, visibleText, [...controlFields(snap.controls), ...richFields], {
     ...await readPageHeadings(ctx.page, ctx.secrets),
     // #647: which document load this is — a later one that shows a sent value reads it back.
@@ -49963,6 +50159,13 @@ async function viewPage(ctx, step) {
     navLinks: snap.controls.filter((c) => c.role === "link" && (c.landmark === "navigation" || c.landmark === "banner")).flatMap((c) => typeof c.href === "string" && c.href !== "" ? [c.href] : []),
     ...ctx.documentStatus.has(ctx.docKey(ctx.page.url())) ? { status: ctx.documentStatus.get(ctx.docKey(ctx.page.url())) } : {}
   });
+  {
+    const now2 = ctx.observed.unreadWrites();
+    const back = unreadBefore.filter((v) => !now2.has(v));
+    if (back.length > 0) {
+      ctx.history.push(`read back: this page, loaded from the server, shows what the run sent (${back.map((v) => `"${v}"`).join(", ")}) \u2014 the app kept it`);
+    }
+  }
   ctx.noteReplyText(snap.url, visibleText);
   ctx.depth.noteState(snap.signature, snap.url);
   {
@@ -52889,14 +53092,14 @@ function ownAssertion(s3) {
     return { field: "resume", assertion: s3.resume };
   return "expect" in s3 ? { field: "expect", assertion: s3.expect } : null;
 }
-function canonical2(d) {
+function canonical(d) {
   const sort = (v) => v !== null && typeof v === "object" && !Array.isArray(v) ? Object.fromEntries(Object.entries(v).sort(([a], [b2]) => a.localeCompare(b2)).map(([k, x]) => [k, sort(x)])) : v;
   return JSON.stringify(sort(d));
 }
 function isOwnTargetVisible(step) {
   if (!("expect" in step) || !("target" in step))
     return false;
-  return step.expect.kind === "visible" && canonical2(step.expect.target) === canonical2(step.target);
+  return step.expect.kind === "visible" && canonical(step.expect.target) === canonical(step.target);
 }
 function isNoClaimExpect(step) {
   if (!("expect" in step))
@@ -53257,13 +53460,13 @@ function lintUploadFixtures(journey, baseDir) {
       });
       continue;
     }
-    const sensitive = fixtureSensitiveReason(real, realRootOf(baseDir)) ?? fixtureSensitiveReason(candidate, resolve5(baseDir));
-    if (sensitive !== null) {
+    const sensitive2 = fixtureSensitiveReason(real, realRootOf(baseDir)) ?? fixtureSensitiveReason(candidate, resolve5(baseDir));
+    if (sensitive2 !== null) {
       findings.push({
         rule: "upload-sensitive-file",
         level: "error",
         step: i + 1,
-        message: `step ${i + 1}: upload fixture ${candidate} looks sensitive (${sensitive})`,
+        message: `step ${i + 1}: upload fixture ${candidate} looks sensitive (${sensitive2})`,
         fix: "use a dedicated test fixture file"
       });
       continue;
@@ -53388,7 +53591,7 @@ function lintJourney(journey, opts = {}) {
   const refsBound = (a) => assertionRefsBound(journey, a);
   const effects = sites.filter((site) => isEffectSite(site, site.where === "step" ? stepOf(site.step) : void 0, refsBound));
   const endEffects = effects.filter((site) => site.where === "end-state");
-  const effectAt = (n3) => effects.some((site) => (site.where === "step" || site.where === "step-request") && site.step === n3);
+  const effectAt = (n3) => recorded[n3 - 1]?.step.kind === "waitFor" || effects.some((site) => (site.where === "step" || site.where === "step-request") && site.step === n3);
   const writeRequests = recorded.map((r) => writeRequestsOf(r, classify2));
   const isWrite2 = recorded.map((r, i) => isWriteStep(r, classify2, writeRequests[i]));
   const lastWrite = isWrite2.lastIndexOf(true) + 1;
@@ -53591,9 +53794,9 @@ function splitBudget(total, stops) {
 var CLAIM_KEYS = /* @__PURE__ */ new Set(["expect", "check", "resume", "waitFor"]);
 function actionRefs(step) {
   const out = /* @__PURE__ */ new Set();
-  const walk = (v) => {
+  const walk2 = (v) => {
     if (Array.isArray(v)) {
-      v.forEach(walk);
+      v.forEach(walk2);
       return;
     }
     if (v === null || typeof v !== "object")
@@ -53608,9 +53811,9 @@ function actionRefs(step) {
         out.add(n3);
     for (const [k, x] of Object.entries(o))
       if (!CLAIM_KEYS.has(k))
-        walk(x);
+        walk2(x);
   };
-  walk(step);
+  walk2(step);
   return [...out];
 }
 function sitePageAssertion(site) {
@@ -54786,10 +54989,10 @@ function bindParams(inputs, record2, request) {
   return params;
 }
 function recordFingerprint(outputs, record2) {
-  const canonical7 = {};
+  const canonical6 = {};
   for (const name of Object.keys(outputs.fields).sort())
-    canonical7[name] = record2[name] ?? null;
-  return `sha256:${createHash5("sha256").update(JSON.stringify(canonical7)).digest("hex")}`;
+    canonical6[name] = record2[name] ?? null;
+  return `sha256:${createHash5("sha256").update(JSON.stringify(canonical6)).digest("hex")}`;
 }
 function extractedNames(journey) {
   const names = /* @__PURE__ */ new Set();
@@ -57407,7 +57610,7 @@ function seedPath(seedUrl) {
 }
 
 // ../explore/dist/adversarial/scope.js
-function routeOf(url2) {
+function routeOf2(url2) {
   const path2 = new URL(url2).pathname;
   return path2.length > 1 && path2.endsWith("/") ? path2.slice(0, -1) : path2;
 }
@@ -57427,7 +57630,7 @@ function startRouteGlobs(startUrl) {
   if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
     throw new ScopeUnderivableError(`a ${parsed.protocol} URL has no route`);
   }
-  const route = routeOf(startUrl);
+  const route = routeOf2(startUrl);
   return route === "/" ? ["/", "/**"] : [route, `${route}/`, `${route}/**`];
 }
 function scopeGlobs(startUrl, extra = []) {
@@ -59559,7 +59762,7 @@ var CoverageTracker = class {
       if (this.#counts(c))
         this.#controls.add(key2);
     }
-    const route = routeOf(snapshot2.url);
+    const route = routeOf2(snapshot2.url);
     const formControls = this.#region === void 0 ? snapshot2.controls : snapshot2.controls.filter((c) => c.inRegion === true);
     for (const f2 of detectForms(formControls, this.#inScope))
       this.#forms.add(`${route}|${f2.key}`);
@@ -59592,7 +59795,7 @@ var CoverageTracker = class {
   submitted(url2, formKey) {
     if (!this.#inScope(url2))
       return;
-    this.#submitted.add(`${routeOf(url2)}|${formKey}`);
+    this.#submitted.add(`${routeOf2(url2)}|${formKey}`);
   }
   /**
    * A submit of `formKey` (on page `url`) never reached the server, so it never counts toward
@@ -59603,7 +59806,7 @@ var CoverageTracker = class {
   blocked(url2, formKey, message2, why = "validation") {
     if (!this.#inScope(url2))
       return;
-    const form = `${routeOf(url2)}|${formKey}`;
+    const form = `${routeOf2(url2)}|${formKey}`;
     const key2 = `${form}|${why}`;
     const cur = this.#blocked.get(key2);
     this.#blocked.set(key2, { form, why, count: (cur?.count ?? 0) + 1, message: cur?.message ?? message2 });
@@ -60407,6 +60610,16 @@ function submitRequestSent(monitor, sinceMs) {
     return true;
   return false;
 }
+var SUBMIT_REQUEST_POLL_MS = 50;
+async function submitRequestSentWithin(monitor, sinceMs, boundMs) {
+  const deadline = clock.now() + boundMs;
+  while (!submitRequestSent(monitor, sinceMs)) {
+    if (clock.now() >= deadline)
+      return false;
+    await clock.sleep(SUBMIT_REQUEST_POLL_MS);
+  }
+  return true;
+}
 async function nativeValidationMessage(page) {
   return page.evaluate(() => {
     const fields = Array.from(document.querySelectorAll("input,select,textarea"));
@@ -61626,6 +61839,7 @@ async function refuseMisuseStep(ctx, ep, turn, s3) {
 }
 
 // ../explore/dist/missions/adversarial-hunt/episode.js
+var SUBMIT_REQUEST_GRACE_MS = 1e3;
 async function runEpisode(ctx, overlay, turn) {
   const ep = {};
   const { ran, planning, episode } = turn;
@@ -61708,10 +61922,12 @@ async function runEpisode(ctx, overlay, turn) {
     if (result.ok)
       ctx.cov.acted(ep.stepSnap.url, s3.control);
     if (result.ok && s3.submitsForm !== void 0) {
-      if (submitRequestSent(monitorFor(ctx.sessions.page), at3)) {
+      const monitor = monitorFor(ctx.sessions.page);
+      const invalid = submitRequestSent(monitor, at3) ? void 0 : await nativeValidationMessage(ctx.sessions.page);
+      if (invalid === void 0 && await submitRequestSentWithin(monitor, at3, SUBMIT_REQUEST_GRACE_MS)) {
         ctx.cov.submitted(ep.stepSnap.url, s3.submitsForm);
       } else {
-        ctx.cov.blocked(ep.stepSnap.url, s3.submitsForm, await nativeValidationMessage(ctx.sessions.page));
+        ctx.cov.blocked(ep.stepSnap.url, s3.submitsForm, invalid);
       }
     }
     if (ran === "visit-route" && s3.control !== null)
@@ -62902,9 +63118,9 @@ function hostStarvedFailure(failure3, health) {
 }
 
 // src/build-info.generated.ts
-var GENERATED_COMMIT = "58694b9";
-var GENERATED_TREE = "3e51f17";
-var GENERATED_BUILT_AT = "2026-10-23T15:47:25.272Z";
+var GENERATED_COMMIT = "e0f6f96";
+var GENERATED_TREE = "d0b472e";
+var GENERATED_BUILT_AT = "2026-10-24T16:37:57.792Z";
 
 // src/version.ts
 import { readFileSync as readFileSync5 } from "node:fs";
@@ -62926,13 +63142,13 @@ function readCliVersion() {
 
 // src/engine.ts
 function bundledCommit() {
-  return true ? "58694b9" : void 0;
+  return true ? "e0f6f96" : void 0;
 }
 function bundledBuiltAt() {
-  return true ? "2026-10-23T15:47:25.272Z" : void 0;
+  return true ? "2026-10-24T16:37:57.792Z" : void 0;
 }
 function bundledTree() {
-  return true ? "3e51f17" : void 0;
+  return true ? "d0b472e" : void 0;
 }
 function currentBuildTree() {
   return bundledTree() ?? GENERATED_TREE;
@@ -63575,12 +63791,12 @@ function substituteDeep(v, sub) {
   return v;
 }
 function fixtureSpecHash(spec, hooks) {
-  return sha256(canonical3({ spec: spec ?? null, hooks: hooks ?? null })).slice(0, 16);
+  return sha256(canonical2({ spec: spec ?? null, hooks: hooks ?? null })).slice(0, 16);
 }
-function canonical3(v) {
-  if (Array.isArray(v)) return `[${v.map(canonical3).join(",")}]`;
+function canonical2(v) {
+  if (Array.isArray(v)) return `[${v.map(canonical2).join(",")}]`;
   if (isRecord(v)) {
-    return `{${Object.keys(v).sort().filter((k) => v[k] !== void 0).map((k) => `${JSON.stringify(k)}:${canonical3(v[k])}`).join(",")}}`;
+    return `{${Object.keys(v).sort().filter((k) => v[k] !== void 0).map((k) => `${JSON.stringify(k)}:${canonical2(v[k])}`).join(",")}}`;
   }
   return JSON.stringify(v);
 }
@@ -63702,7 +63918,7 @@ var MissionFixtures = class {
     return redactUrl(redactText(text2, [...this.#opts.secrets ?? [], ...bound2, ...this.secrets()]));
   }
   identity() {
-    return `fx-${sha256(canonical3({ spec: this.#specHash, outputs: this.publicOutputs(), secret: [...this.#secretNames].sort() })).slice(0, 16)}`;
+    return `fx-${sha256(canonical2({ spec: this.#specHash, outputs: this.publicOutputs(), secret: [...this.#secretNames].sort() })).slice(0, 16)}`;
   }
   record() {
     return {
@@ -78800,14 +79016,14 @@ var GitSourceManager = class {
 
 // ../sources/dist/hash.js
 import { createHash as createHash9 } from "node:crypto";
-function canonicalJson2(value) {
+function canonicalJson3(value) {
   if (value === null)
     return "null";
   if (Array.isArray(value))
-    return `[${value.map(canonicalJson2).join(",")}]`;
+    return `[${value.map(canonicalJson3).join(",")}]`;
   if (typeof value === "object") {
     const entries = Object.entries(value).filter(([, v]) => v !== void 0).sort(([a], [b2]) => a < b2 ? -1 : a > b2 ? 1 : 0);
-    return `{${entries.map(([k, v]) => `${JSON.stringify(k)}:${canonicalJson2(v)}`).join(",")}}`;
+    return `{${entries.map(([k, v]) => `${JSON.stringify(k)}:${canonicalJson3(v)}`).join(",")}}`;
   }
   if (typeof value === "number") {
     if (!Number.isFinite(value))
@@ -78818,7 +79034,7 @@ function canonicalJson2(value) {
 }
 function canonicalJourneyHash(file2) {
   const validated = SharedJourneyFileSchema.parse(file2);
-  const hex3 = createHash9("sha256").update(canonicalJson2(validated), "utf8").digest("hex");
+  const hex3 = createHash9("sha256").update(canonicalJson3(validated), "utf8").digest("hex");
   return `sha256:${hex3}`;
 }
 
@@ -80524,6 +80740,15 @@ function journeyReviewHash(journey) {
   for (const k of BOOKKEEPING) delete metadata[k];
   return contentHash({ metadata, recording: journey.recording });
 }
+function journeyLegacyReviewHash(journey) {
+  const metadata = { ...journey.metadata };
+  for (const k of BOOKKEEPING) delete metadata[k];
+  return legacyContentHash({ metadata, recording: journey.recording });
+}
+function journeyApprovalMatches(journey) {
+  const approved = journey.metadata.approval?.contentHash;
+  return approved !== void 0 && (approved === journeyReviewHash(journey) || approved === journeyLegacyReviewHash(journey));
+}
 function targetOf3(step) {
   if (step.kind === "forEach") return step.items;
   return "target" in step ? step.target : void 0;
@@ -80730,7 +80955,7 @@ function buildChange(journey, hash3, snapshot2, stepIdOnly) {
   const idOnly = stepIdOnly ? { stepIdOnly: true } : {};
   if (snapshot2 === null || snapshot2 === void 0) {
     if (approval !== void 0) {
-      return { kind: "snapshot-missing", approvedHash: approval.contentHash, approvedAt: approval.at, changed: approval.contentHash !== hash3, ...idOnly };
+      return { kind: "snapshot-missing", approvedHash: approval.contentHash, approvedAt: approval.at, changed: !journeyApprovalMatches(journey), ...idOnly };
     }
     return journey.metadata.promoted ? { kind: "no-record" } : { kind: "first-approval" };
   }
@@ -81084,9 +81309,9 @@ var UnknownCatalogItemError = class extends Error {
     return this.kind === "persona" ? "E_UNKNOWN_PERSONA" : "E_UNKNOWN_JOB";
   }
 };
-function statusOf3(approval, hash3) {
+function statusOf3(approval, hash3, legacyHash) {
   if (approval === void 0) return "draft";
-  return approval.contentHash === hash3 ? "approved" : "stale";
+  return approval.contentHash === hash3 || approval.contentHash === legacyHash ? "approved" : "stale";
 }
 async function readJsonFile(path2) {
   const raw = await readFile8(path2, "utf8");
@@ -81151,7 +81376,7 @@ function catalogPersona(p, path2) {
     hasLogin: p.fields.login !== void 0,
     ...approval === void 0 ? {} : { approval },
     contentHash: hash3,
-    status: statusOf3(approval, hash3)
+    status: statusOf3(approval, hash3, personaLegacyContentHash(p.id, p.fields))
   };
 }
 function personaContentHash(id, fields) {
@@ -81159,6 +81384,11 @@ function personaContentHash(id, fields) {
   for (const [k, v] of Object.entries(fields)) if (k !== "approval" && !SESSION_KEYS.has(k)) described[k] = v;
   return contentHash(described);
 }
+function personaLegacyContentHash(id, fields) {
+  const described = { id };
+  for (const [k, v] of Object.entries(fields)) if (k !== "approval" && !SESSION_KEYS.has(k)) described[k] = v;
+  return legacyContentHash(described);
+}
 function jobList(raw, path2) {
   if (Array.isArray(raw)) return raw;
   if (isRecord(raw) && Array.isArray(raw.jobs)) return raw.jobs;
@@ -81181,13 +81411,17 @@ function catalogJobOf(job) {
     personas: [.../* @__PURE__ */ new Set([...job.personas ?? [], ...job.persona === void 0 ? [] : [job.persona]])],
     ...job.approval === void 0 ? {} : { approval: job.approval },
     contentHash: hash3,
-    status: statusOf3(job.approval, hash3)
+    status: statusOf3(job.approval, hash3, jobLegacyContentHash(job))
   };
 }
 function jobContentHash(job) {
   const { approval: _a3, ...rest } = job;
   return contentHash(rest);
 }
+function jobLegacyContentHash(job) {
+  const { approval: _a3, ...rest } = job;
+  return legacyContentHash(rest);
+}
 function catalogJourney(journey) {
   const m = journey.metadata;
   const hash3 = journeyReviewHash(journey);
@@ -81200,7 +81434,7 @@ function catalogJourney(journey) {
     ...m.persona === void 0 ? {} : { personaText: m.persona },
     ...m.approval === void 0 ? {} : { approval: m.approval },
     contentHash: hash3,
-    changedSinceApproval: m.promoted && m.approval !== void 0 && m.approval.contentHash !== hash3
+    changedSinceApproval: m.promoted && m.approval !== void 0 && !journeyApprovalMatches(journey)
   };
 }
 var CatalogLoader = class {
@@ -82703,12 +82937,12 @@ function healFloor(recorded, riskOf) {
   }
   return { floor: "healable", reason: "" };
 }
-function canonical4(v) {
+function canonical3(v) {
   if (Array.isArray(v))
-    return `[${v.map(canonical4).join(",")}]`;
+    return `[${v.map(canonical3).join(",")}]`;
   if (v !== null && typeof v === "object") {
     const o = v;
-    return `{${Object.keys(o).filter((k) => o[k] !== void 0).sort().map((k) => `${JSON.stringify(k)}:${canonical4(o[k])}`).join(",")}}`;
+    return `{${Object.keys(o).filter((k) => o[k] !== void 0).sort().map((k) => `${JSON.stringify(k)}:${canonical3(o[k])}`).join(",")}}`;
   }
   return JSON.stringify(v) ?? "undefined";
 }
@@ -82730,7 +82964,7 @@ function assertProofUntouched(before, after) {
   for (const k of /* @__PURE__ */ new Set([...Object.keys(b2), ...Object.keys(a)])) {
     if (free.has(k))
       continue;
-    if (canonical4(b2[k]) !== canonical4(a[k]))
+    if (canonical3(b2[k]) !== canonical3(a[k]))
       return { code: "proof-field-changed", detail: `the candidate changes the step's \`${k}\`` };
   }
   return null;
@@ -82741,15 +82975,15 @@ function assertRecordedProofUntouched(before, after) {
   for (const k of /* @__PURE__ */ new Set([...Object.keys(b2), ...Object.keys(a)])) {
     if (k === "step")
       continue;
-    if (canonical4(b2[k]) !== canonical4(a[k]))
+    if (canonical3(b2[k]) !== canonical3(a[k]))
       return { code: "proof-field-changed", detail: `the candidate changes the recorded step's \`${k}\`` };
   }
-  return canonical4(before.step) === canonical4(after.step) ? null : assertProofUntouched(before.step, after.step);
+  return canonical3(before.step) === canonical3(after.step) ? null : assertProofUntouched(before.step, after.step);
 }
 function assertRecordingProofUntouched(base, proposed) {
   const { pages: bp, ...bRest } = base;
   const { pages: pp, ...pRest } = proposed;
-  if (canonical4(bRest) !== canonical4(pRest))
+  if (canonical3(bRest) !== canonical3(pRest))
     return { code: "proof-field-changed", detail: "the revision changes the recording's own fields" };
   if (bp.length !== pp.length)
     return { code: "shape-changed", detail: `the revision has ${pp.length} pages; the Journey has ${bp.length}` };
@@ -82757,7 +82991,7 @@ function assertRecordingProofUntouched(base, proposed) {
   for (let i = 0; i < bp.length; i++) {
     const { steps: bs, ...bPage } = bp[i];
     const { steps: ps, ...pPage } = pp[i];
-    if (canonical4(bPage) !== canonical4(pPage))
+    if (canonical3(bPage) !== canonical3(pPage))
       return { code: "proof-field-changed", detail: `the revision changes page ${i + 1}` };
     if (bs.length !== ps.length)
       return { code: "shape-changed", detail: `the revision has ${ps.length} steps on page ${i + 1}; the Journey has ${bs.length}` };
@@ -84343,11 +84577,11 @@ async function removeFile(path2) {
   await assertNoSymlink(path2);
   await rm4(path2, { force: true });
 }
-function canonical5(v) {
-  if (Array.isArray(v)) return `[${v.map(canonical5).join(",")}]`;
+function canonical4(v) {
+  if (Array.isArray(v)) return `[${v.map(canonical4).join(",")}]`;
   if (v !== null && typeof v === "object") {
     const o = v;
-    return `{${Object.keys(o).filter((k) => o[k] !== void 0).sort().map((k) => `${JSON.stringify(k)}:${canonical5(o[k])}`).join(",")}}`;
+    return `{${Object.keys(o).filter((k) => o[k] !== void 0).sort().map((k) => `${JSON.stringify(k)}:${canonical4(o[k])}`).join(",")}}`;
   }
   return JSON.stringify(v) ?? "undefined";
 }
@@ -84372,7 +84606,7 @@ function proposalFloorViolation(stored, proposed) {
   for (let i = 0; i < after.length; i++) {
     const b2 = before[i];
     const a = after[i];
-    if (b2 !== void 0 && canonical5(b2.step) === canonical5(a.step)) continue;
+    if (b2 !== void 0 && canonical4(b2.step) === canonical4(a.step)) continue;
     for (const [which, rec] of [["before", b2?.recorded], ["after", a.recorded]]) {
       if (rec === void 0) return `step ${i + 1} is not in the stored Journey`;
       const floor = healFloor(rec, riskOf);
@@ -86065,7 +86299,7 @@ var FINGERPRINT_MS = 1e4;
 function oneLine2(s3) {
   return s3.replace(/\s+/g, " ").trim();
 }
-function routeOf2(url2) {
+function routeOf3(url2) {
   try {
     const u = new URL(url2);
     return u.pathname + (u.search === "" ? "" : u.search);
@@ -86142,7 +86376,7 @@ var RunScreenshots = class {
     this.#entries.push({
       n: n3,
       step: at3.step,
-      route: this.#redact(redactUrl(routeOf2(url2))),
+      route: this.#redact(redactUrl(routeOf3(url2))),
       what: this.#redact(oneLine2(at3.what)).slice(0, 300),
       path: path2
     });
@@ -86466,7 +86700,7 @@ function invariantSetupTexts(spec) {
   return Object.fromEntries(specStrings(spec, "", []).filter(([, s3]) => s3.includes("${setup.")).map(([p, s3]) => [`--invariants ${p}`, s3]));
 }
 function substituteSpecSetupRefs(spec, b2, baseUrl) {
-  const walk = (v, path2) => {
+  const walk2 = (v, path2) => {
     if (typeof v === "string") {
       if (!v.includes("${setup.")) return v;
       const where = `--invariants ${path2}`;
@@ -86481,11 +86715,11 @@ function substituteSpecSetupRefs(spec, b2, baseUrl) {
       if (before !== after) throw new UnboundSetupRefError(`${where}: a \${setup.*} value may fill the path or query, never the origin`);
       return out;
     }
-    if (Array.isArray(v)) return v.map((x, i) => walk(x, `${path2}[${i}]`));
-    if (v !== null && typeof v === "object") return Object.fromEntries(Object.entries(v).map(([k, x]) => [k, walk(x, path2 === "" ? k : `${path2}.${k}`)]));
+    if (Array.isArray(v)) return v.map((x, i) => walk2(x, `${path2}[${i}]`));
+    if (v !== null && typeof v === "object") return Object.fromEntries(Object.entries(v).map(([k, x]) => [k, walk2(x, path2 === "" ? k : `${path2}.${k}`)]));
     return v;
   };
-  return walk(spec, "");
+  return walk2(spec, "");
 }
 function fixtureSetupFailedResult(err, fx) {
   const reason = err instanceof FixtureSetupError ? err.message : `fixture setup failed: ${err.message}`;
@@ -87785,6 +88019,7 @@ var ServerLogRuntime = class {
     };
   }
 };
+var NON_ACTING_OPS = /* @__PURE__ */ new Set(["done", "blocked", null]);
 function stepWindows(transcript, stepEpoch, missionStartEpochMs, drainMs) {
   const windows = [];
   let prevEnd = missionStartEpochMs;
@@ -87793,7 +88028,9 @@ function stepWindows(transcript, stepEpoch, missionStartEpochMs, drainMs) {
     const settle2 = stepEpoch.get(entry.step) ?? prevEnd;
     const isLast = i === transcript.length - 1;
     const endMs = isLast ? settle2 + drainMs : settle2;
-    windows.push({ step: entry.step, startMs: prevEnd, endMs });
+    const acting = windows[windows.length - 1];
+    if (NON_ACTING_OPS.has(entry.op) && acting !== void 0) acting.endMs = endMs;
+    else windows.push({ step: entry.step, startMs: prevEnd, endMs });
     prevEnd = settle2;
   }
   return windows;
@@ -88690,7 +88927,7 @@ function findingIdentity(f2) {
 function str2(v, fallback = "") {
   return typeof v === "string" ? v : fallback;
 }
-function routeOf3(item) {
+function routeOf4(item) {
   if (typeof item.route === "string") return item.route;
   if (typeof item.url === "string") return normalizeRoute(item.url);
   return "/";
@@ -88702,7 +88939,7 @@ function extractRunFindings(data) {
     if (!Array.isArray(list2)) return;
     for (const item of list2) {
       if (!isRecord(item) || typeof item.fingerprint !== "string") continue;
-      out.push({ kind: kindOf(item), fingerprint: item.fingerprint, route: routeOf3(item), title: str2(item.title, item.fingerprint) });
+      out.push({ kind: kindOf(item), fingerprint: item.fingerprint, route: routeOf4(item), title: str2(item.title, item.fingerprint) });
     }
   };
   fingerprinted(data.defects, (d) => d.kind === "invariant" ? "invariant" : `defect/${str2(d.kind, "unknown")}`);
@@ -88711,14 +88948,14 @@ function extractRunFindings(data) {
   if (isRecord(data.coverage) && Array.isArray(data.coverage.defects)) {
     for (const d of data.coverage.defects) {
       if (!isRecord(d) || typeof d.stateFingerprint !== "string") continue;
-      out.push({ kind: "coverage-defect", fingerprint: d.stateFingerprint, route: routeOf3(d), title: str2(d.reason, "looks broken") });
+      out.push({ kind: "coverage-defect", fingerprint: d.stateFingerprint, route: routeOf4(d), title: str2(d.reason, "looks broken") });
     }
   }
   if (isRecord(data.report) && Array.isArray(data.report.findings)) {
     for (const f2 of data.report.findings) {
       if (!isRecord(f2) || typeof f2.rubricItemId !== "string") continue;
       const controls = Array.isArray(f2.controls) ? f2.controls.filter((c) => typeof c === "string") : [];
-      out.push({ kind: "ux", route: routeOf3(f2), title: str2(f2.observation, f2.rubricItemId), rubricItemId: f2.rubricItemId, controls });
+      out.push({ kind: "ux", route: routeOf4(f2), title: str2(f2.observation, f2.rubricItemId), rubricItemId: f2.rubricItemId, controls });
     }
   }
   return out;
@@ -91803,18 +92040,18 @@ function rebaseRecording(recording, env) {
     if (mustBeAllowed && !env.allowedOrigins.includes(u.origin)) refusals.push(`${where} is on ${u.origin}`);
     return raw;
   };
-  const walk = (v, where) => {
-    if (Array.isArray(v)) return v.map((x, i) => walk(x, `${where}[${i}]`));
+  const walk2 = (v, where) => {
+    if (Array.isArray(v)) return v.map((x, i) => walk2(x, `${where}[${i}]`));
     if (v === null || typeof v !== "object") return v;
     const o = v;
     const out = {};
-    for (const [k, x] of Object.entries(o)) out[k] = walk(x, `${where}.${k}`);
+    for (const [k, x] of Object.entries(o)) out[k] = walk2(x, `${where}.${k}`);
     if (o.kind === "navigate" && typeof o.url === "string") out.url = move(o.url, `${where} (navigate ${o.url})`, true);
     if (o.kind === "urlIncludes" && typeof o.text === "string") out.text = move(o.text, `${where}.text`, false);
     return out;
   };
   const pages = recording.pages.map((p, i) => ({
-    ...walk(p, `pages[${i}]`),
+    ...walk2(p, `pages[${i}]`),
     url: move(p.url, `pages[${i}] (${p.url})`, true)
   }));
   if (refusals.length > 0) {
@@ -94586,7 +94823,7 @@ function classifyTarget(d, testIdAttributes, via) {
 function kebabCase(s3) {
   return s3.normalize("NFKD").replace(/[̀-ͯ]/g, "").replace(/([a-z0-9])([A-Z])/g, "$1-$2").toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 40).replace(/-+$/g, "");
 }
-function routeOf4(url2) {
+function routeOf5(url2) {
   if (url2 === void 0 || url2 === "") return void 0;
   try {
     return new URL(url2).pathname;
@@ -94684,7 +94921,7 @@ function dedupeSuggestions(lists) {
   return [...byKey.values()].sort((a, b2) => b2.occurrences.length - a.occurrences.length || a.key.localeCompare(b2.key));
 }
 function flatWithRoute(rec) {
-  return rec.pages.flatMap((p) => p.steps.map((recorded) => ({ recorded, route: routeOf4(p.url) })));
+  return rec.pages.flatMap((p) => p.steps.map((recorded) => ({ recorded, route: routeOf5(p.url) })));
 }
 function healthLine(h) {
   const total = h.stable + h.brittle;
@@ -97454,7 +97691,7 @@ function controlKey2(c) {
 }
 
 // ../ux/dist/route.js
-function routeOf5(url2) {
+function routeOf6(url2) {
   try {
     return urlTemplate(new URL(url2).pathname || "/");
   } catch {
@@ -97603,7 +97840,7 @@ function a11yChecks(evidence, rubric) {
     const q = rubric.get(id)?.questions[0];
     return q?.severity ?? "minor";
   };
-  const route = routeOf5(evidence.url);
+  const route = routeOf6(evidence.url);
   const controlByRef = new Map(evidence.controls.map((c) => [`control:${c.index}`, c]));
   const labelOf2 = (refId) => {
     const c = controlByRef.get(refId);
@@ -97946,7 +98183,7 @@ function makeSignalFinding(input2) {
     recommendation: input2.recommendation.trim(),
     tier: "signal",
     screenId: input2.screenId,
-    route: routeOf5(input2.url),
+    route: routeOf6(input2.url),
     controls: [...input2.controls ?? []],
     quotes: [...input2.quotes ?? []],
     occurrences: input2.occurrences ?? 1,
@@ -98183,7 +98420,7 @@ function detectInternalIds(capture2) {
         if (typed.includes(id))
           continue;
         const line2 = quoteLine(screen.visibleText, id);
-        const key2 = `${routeOf5(screen.url)}|${pattern.name}`;
+        const key2 = `${routeOf6(screen.url)}|${pattern.name}`;
         const g = groups.get(key2) ?? { pattern, ids: /* @__PURE__ */ new Set(), lines: /* @__PURE__ */ new Set(), screens: [], intentional: true };
         g.ids.add(id);
         g.lines.add(line2);
@@ -98292,7 +98529,7 @@ var PASSIVE_OPS = /* @__PURE__ */ new Set(["wait", "scroll_down", "scroll_up"]);
 function advanced(capture2, s3) {
   const before = capture2.screens.filter((x) => x.step === s3.step).pop();
   const after = capture2.screens.find((x) => x.step > s3.step);
-  if (before === void 0 || after === void 0 || routeOf5(after.url) !== routeOf5(before.url))
+  if (before === void 0 || after === void 0 || routeOf6(after.url) !== routeOf6(before.url))
     return void 0;
   return after.visibleText !== before.visibleText ? after : void 0;
 }
@@ -98315,7 +98552,7 @@ function detectRepeatedAdvances(capture2) {
       close();
       continue;
     }
-    const k = `${routeOf5(s3.url)}|${label2.toLowerCase()}`;
+    const k = `${routeOf6(s3.url)}|${label2.toLowerCase()}`;
     if (key2 !== null && k !== key2)
       close();
     key2 = k;
@@ -98343,7 +98580,7 @@ function detectRepeatedAdvances(capture2) {
         steps,
         requests: [],
         ...last.after.screenshot === void 0 ? {} : { screenshot: last.after.screenshot },
-        detail: `${n3} consecutive successful "${label2}" clicks on ${routeOf5(last.after.url)} with no input between them, each changing the page text`
+        detail: `${n3} consecutive successful "${label2}" clicks on ${routeOf6(last.after.url)} with no input between them, each changing the page text`
       }
     });
   });
@@ -98395,7 +98632,7 @@ function detectStuckJobs(capture2, opts = {}) {
     const label2 = labelOf(start);
     if (label2 === null)
       continue;
-    const route = routeOf5(start.url);
+    const route = routeOf6(start.url);
     const key2 = `${route}|${normLine(label2)}`;
     if (reported.has(key2))
       continue;
@@ -98404,7 +98641,7 @@ function detectStuckJobs(capture2, opts = {}) {
       continue;
     const window2 = [];
     for (const s3 of capture2.steps.filter((x) => x.step > start.step)) {
-      if (routeOf5(s3.url) !== route)
+      if (routeOf6(s3.url) !== route)
         break;
       const other = s3.op !== null && START_OPS.has(s3.op) && controlKey3(s3) !== controlKey3(start);
       if (other && capture2.requests.some((r) => r.step === s3.step && isWrite(r) && okStatus(r)))
@@ -98412,7 +98649,7 @@ function detectStuckJobs(capture2, opts = {}) {
       window2.push(s3);
     }
     const lastStep = window2.length > 0 ? window2[window2.length - 1].step : start.step;
-    const screens = capture2.screens.filter((s3) => s3.step > start.step && s3.step <= lastStep + 1 && routeOf5(s3.url) === route);
+    const screens = capture2.screens.filter((s3) => s3.step > start.step && s3.step <= lastStep + 1 && routeOf6(s3.url) === route);
     if (screens.length === 0)
       continue;
     const reclicks = window2.filter((s3) => s3.op === start.op && s3.actOk && controlKey3(s3) === controlKey3(start));
@@ -98613,7 +98850,7 @@ function detectFailedSubmits(capture2) {
     const after = screenAfter(capture2, s3.step);
     if (after === void 0)
       continue;
-    if (before !== void 0 && routeOf5(after.url) !== routeOf5(before.url))
+    if (before !== void 0 && routeOf6(after.url) !== routeOf6(before.url))
       continue;
     const lines = linesOf(`${after.visibleText}
 ${s3.reply ?? ""}`);
@@ -98682,15 +98919,15 @@ function headingOf(s3) {
 function detectUrlMismatches(capture2) {
   const hits = /* @__PURE__ */ new Map();
   capture2.screens.forEach((b2, i) => {
-    const route = routeOf5(b2.url);
+    const route = routeOf6(b2.url);
     const heading = headingOf(b2);
     if (heading.length < 3)
       return;
     const { words: words3, known } = routeWords2(route);
     if (words3.length === 0 || relates(heading, words3))
       return;
-    const other = capture2.screens.find((s3) => routeOf5(s3.url) !== route && normLine(headingOf(s3)) === normLine(heading) && relates(heading, routeWords2(routeOf5(s3.url)).words));
-    const prior = capture2.screens.slice(0, i).reverse().find((s3) => routeOf5(s3.url) === route && normLine(headingOf(s3)) !== normLine(heading));
+    const other = capture2.screens.find((s3) => routeOf6(s3.url) !== route && normLine(headingOf(s3)) === normLine(heading) && relates(heading, routeWords2(routeOf6(s3.url)).words));
+    const prior = capture2.screens.slice(0, i).reverse().find((s3) => routeOf6(s3.url) === route && normLine(headingOf(s3)) !== normLine(heading));
     const transitioned = known && prior !== void 0 && relates(headingOf(prior), words3);
     if (other === void 0 && !transitioned)
       return;
@@ -98701,7 +98938,7 @@ function detectUrlMismatches(capture2) {
       route,
       known,
       ...transitioned ? { was: headingOf(prior) } : {},
-      ...other === void 0 ? {} : { elsewhere: routeOf5(other.url) }
+      ...other === void 0 ? {} : { elsewhere: routeOf6(other.url) }
     };
     g.screens.push(b2);
     hits.set(k, g);
@@ -98806,7 +99043,7 @@ function detectFriction(capture2, outcome) {
   };
   const routesAt = (nums) => {
     const set2 = new Set(nums);
-    return [.../* @__PURE__ */ new Set([...steps.filter((s3) => set2.has(s3.step)).map((s3) => routeOf5(s3.url)), ...capture2.screens.filter((s3) => set2.has(s3.step)).map((s3) => routeOf5(s3.url))])];
+    return [.../* @__PURE__ */ new Set([...steps.filter((s3) => set2.has(s3.step)).map((s3) => routeOf6(s3.url)), ...capture2.screens.filter((s3) => set2.has(s3.step)).map((s3) => routeOf6(s3.url))])];
   };
   const add = (kind, impact, nums, detail) => {
     const sorted2 = [...new Set(nums)].filter((n3) => n3 > 0).sort((a, b2) => a - b2);
@@ -98897,7 +99134,7 @@ function detectFriction(capture2, outcome) {
     const blocking = reqs.some((r) => WRITE_METHODS3.has(r.method.toUpperCase()) && (r.failed === true || (r.status ?? 0) >= 500));
     add("error", blocking ? "blocked" : "slowed", [step], `${reqs.map((r) => `${r.endpoint} \u2192 ${r.failed === true ? "failed" : r.status}`).join(", ")} after step ${step}`);
   }
-  const seq = capture2.screens.map((s3) => ({ route: routeOf5(s3.url), step: s3.step }));
+  const seq = capture2.screens.map((s3) => ({ route: routeOf6(s3.url), step: s3.step }));
   for (let x = 2; x < seq.length; x++) {
     const here = seq[x];
     if (seq[x - 1].route === here.route)
@@ -98924,7 +99161,7 @@ function detectFriction(capture2, outcome) {
       continue;
     if (between.some((r) => r.actOk && (r.op === "click" || r.op === "send" || r.op === "select")))
       continue;
-    add("abandoned", "confused", [s3.step, rest[leftAt].step], `a value typed at step ${s3.step} was left unsubmitted when the run moved to ${routeOf5(rest[leftAt].url)}`);
+    add("abandoned", "confused", [s3.step, rest[leftAt].step], `a value typed at step ${s3.step} was left unsubmitted when the run moved to ${routeOf6(rest[leftAt].url)}`);
   }
   if (outcome?.status === "incomplete" && steps.length > 0) {
     const tail = steps.slice(-3).map((s3) => s3.step);
@@ -99502,8 +99739,8 @@ function boundTargetOptions(controls, point, steps, limit = MAX_CHOICE_OPTIONS -
   const acted = steps.filter((s3) => point.steps.includes(s3.step));
   const words3 = new Set(normalizeText(point.detail).split(" ").filter((w) => w.length >= 3));
   const score2 = (c) => (acted.some((s3) => stepNames(s3, c)) ? 400 : 0) + (normalizeText(c.name).split(" ").some((w) => words3.has(w)) ? 60 : 0) + (c.enabled ? 10 : 0);
-  const keep = new Set(controls.map((c, i) => ({ c, i, s: score2(c) })).sort((a, b2) => b2.s - a.s || a.i - b2.i).slice(0, limit).map((x) => x.c.index));
-  return controls.filter((c) => keep.has(c.index));
+  const keep2 = new Set(controls.map((c, i) => ({ c, i, s: score2(c) })).sort((a, b2) => b2.s - a.s || a.i - b2.i).slice(0, limit).map((x) => x.c.index));
+  return controls.filter((c) => keep2.has(c.index));
 }
 function frictionText(p) {
   return `${p.kind} (steps ${p.steps.join(", ")}): ${p.detail}`.slice(0, 600);
@@ -99532,7 +99769,7 @@ async function analyzeClaims(request, deps) {
   for (const raw of request.screens) {
     try {
       const red = redactEvidence(raw, secrets, deps.redactor);
-      screens.push({ raw, red, route: routeOf5(red.url) });
+      screens.push({ raw, red, route: routeOf6(red.url) });
     } catch (cause) {
       return { kind: "failed", reason: `redaction failed: ${message(cause)}`, screenId: raw.screenId };
     }
@@ -100022,7 +100259,7 @@ ${f2.route}
 ${element}`, "utf8").digest("hex").slice(0, 16);
 }
 function contractRouteTemplate(urlOrRoute) {
-  return routeOf5(urlOrRoute).split("/").map((seg) => /^:[A-Za-z][A-Za-z0-9_]{0,63}$/.test(seg) ? `{${seg.slice(1)}}` : seg).join("/");
+  return routeOf6(urlOrRoute).split("/").map((seg) => /^:[A-Za-z][A-Za-z0-9_]{0,63}$/.test(seg) ? `{${seg.slice(1)}}` : seg).join("/");
 }
 
 // ../ux/dist/rubric/schema.js
@@ -100651,14 +100888,14 @@ var CREDENTIAL_KEY2 = /pass|secret|token|otp|totp|pin|cvc|cvv|card|auth|session|
 var MAX_DIGEST_BODY = 64e3;
 var CredentialBody = class extends Error {
 };
-function canonical6(v) {
-  if (Array.isArray(v)) return v.map(canonical6);
+function canonical5(v) {
+  if (Array.isArray(v)) return v.map(canonical5);
   if (v !== null && typeof v === "object") {
     const out = {};
     for (const k of Object.keys(v).sort()) {
       if (CREDENTIAL_KEY2.test(k)) throw new CredentialBody();
       if (VOLATILE_KEY.test(k)) continue;
-      out[k] = canonical6(v[k]);
+      out[k] = canonical5(v[k]);
     }
     return out;
   }
@@ -100675,7 +100912,7 @@ function payloadDigest(method, endpoint2, body, secrets) {
     value = Object.fromEntries(new URLSearchParams(body));
   }
   try {
-    const canon = JSON.stringify(canonical6(value));
+    const canon = JSON.stringify(canonical5(value));
     return createHash12("sha256").update(`${method.toUpperCase()} ${endpoint2}
 ${canon}`).digest("hex").slice(0, 32);
   } catch {
@@ -101364,7 +101601,7 @@ function planGuardProbes(screens, secrets, safety) {
   const refused = [];
   for (const screen of screens) {
     const red = redactEvidence(screen, secrets);
-    const route = routeOf5(red.url);
+    const route = routeOf6(red.url);
     screen.controls.forEach((c, i) => {
       if (controlRisk(c.name, c.role)?.risk !== "destructive") return;
       const rc = red.controls[i];
@@ -102123,11 +102360,11 @@ var MAX_SCAN_DEPTH = 8;
 function scanRuns(dirs) {
   const seen = /* @__PURE__ */ new Set();
   const runs = [];
-  const walk = (dir, depth) => {
+  const walk2 = (dir, depth) => {
     for (const entry of readdirSync8(dir, { withFileTypes: true }).sort((a, b2) => a.name.localeCompare(b2.name))) {
       const path2 = resolve13(dir, entry.name);
       if (entry.isDirectory()) {
-        if (depth < MAX_SCAN_DEPTH && !entry.name.startsWith(".") && entry.name !== "node_modules") walk(path2, depth + 1);
+        if (depth < MAX_SCAN_DEPTH && !entry.name.startsWith(".") && entry.name !== "node_modules") walk2(path2, depth + 1);
         continue;
       }
       if (!entry.isFile() || !isResultName(entry.name) || seen.has(path2)) continue;
@@ -102139,7 +102376,7 @@ function scanRuns(dirs) {
   };
   for (const dir of dirs) {
     if (!existsSync23(dir) || !statSync9(dir).isDirectory()) continue;
-    walk(dir, 0);
+    walk2(dir, 0);
   }
   return runs.sort((a, b2) => (a.startedAt ?? "").localeCompare(b2.startedAt ?? "") || a.runId.localeCompare(b2.runId));
 }
@@ -104104,10 +104341,17 @@ import { existsSync as existsSync25 } from "node:fs";
 import { copyFile as copyFile4, lstat as lstat4, mkdir as mkdir25, open as open3, readdir as readdir9, readFile as readFile24, rename as rename4, rm as rm10, writeFile as writeFile29 } from "node:fs/promises";
 import { basename as basename15, dirname as dirname24, join as join56, resolve as resolve18, sep as sep7 } from "node:path";
 
+// src/catalog-contract-identity.ts
+var CATALOG_CONTRACT_IDENTITY = {
+  "kind": "jevitate.catalog-contract",
+  "version": "2.0.0",
+  "manifestSha256": "c1292a8727d7dc0dbe1d63dc768d34b6cc94ae60fab3a67aeb0a53837e1735ad"
+};
+
 // src/catalog-bundle.ts
 var BUNDLE_KIND = "journeeze.catalog-bundle";
 var BUNDLE_VERSION = 1;
-var BUNDLE_MINOR = 1;
+var BUNDLE_MINOR = 2;
 var CatalogBundleInputError = class extends CatalogInputError {
   constructor(issues) {
     super(`the catalog cannot be exported as a Journeeze bundle (${issues.length} problem(s)): ${issues.join("; ")}`);
@@ -104472,7 +104716,7 @@ function bundleChecks(input2, journeys, warn) {
         if (outcome.outcome !== "clean") why = `the run was ${outcome.outcome}, and a baseline comes only from a clean run`;
         else if (journeyId === void 0 || journeyHash === void 0) why = "the item names no Journey review hash";
         else if (cj === void 0) why = `Journey ${journeyId} is not in the bundle`;
-        else if (cj.approval?.contentHash !== journeyHash || cj.contentHash !== journeyHash) why = `it was measured on a Journey revision (${journeyHash.slice(0, 12)}\u2026) that is not ${journeyId}'s approved one`;
+        else if (cj.approval?.contentHash !== journeyHash || cj.changedSinceApproval) why = `it was measured on a Journey revision (${journeyHash.slice(0, 12)}\u2026) that is not ${journeyId}'s approved one`;
         else {
           const b2 = bundleBaseline(item.baseline, cj.journey);
           if ("drop" in b2) why = b2.drop;
@@ -104526,13 +104770,13 @@ function bundleDemos(input2, journeys, warn) {
       warn.push(`${where}: its Journey is not in the bundle (not promoted, or left out) \u2014 the demo is left out`);
       continue;
     }
-    const approved = ex.cj.approval !== void 0 && ex.cj.approval.contentHash === ex.cj.contentHash;
+    const approved = ex.cj.approval !== void 0 && !ex.cj.changedSinceApproval;
     if (!approved) {
       warn.push(`${where}: its Journey changed since it was approved \u2014 the demo is left out (approve the Journey and its demo again)`);
       continue;
     }
-    if (d.renderedFrom !== ex.cj.contentHash) {
-      warn.push(`${where}: rendered from another version of its Journey (${d.renderedFrom.slice(0, 12)}, approved ${ex.cj.contentHash.slice(0, 12)}) \u2014 the demo is left out (run \`jevitate demo approve\` again)`);
+    if (d.renderedFrom !== ex.cj.approval.contentHash) {
+      warn.push(`${where}: rendered from another version of its Journey (${d.renderedFrom.slice(0, 12)}, approved ${ex.cj.approval.contentHash.slice(0, 12)}) \u2014 the demo is left out (run \`jevitate demo approve\` again)`);
       continue;
     }
     if (d.steps.length === 0 || d.steps.length > MEDIA_LIMITS.demoSteps) {
@@ -104618,8 +104862,8 @@ function bundleDemos(input2, journeys, warn) {
   if (demos.length > LIMITS.demos) {
     warn.push(`${demos.length} demos: only the first ${LIMITS.demos} are exported`);
     const kept = new Set(demos.slice(0, LIMITS.demos).map((d) => `media/${d.journey}/`));
-    const keep = (p) => [...kept].some((k) => p.startsWith(k));
-    return { demos: demos.slice(0, LIMITS.demos), files: files.filter((f2) => keep(f2.path)), media: media.filter((m) => keep(m.path)) };
+    const keep2 = (p) => [...kept].some((k) => p.startsWith(k));
+    return { demos: demos.slice(0, LIMITS.demos), files: files.filter((f2) => keep2(f2.path)), media: media.filter((m) => keep2(m.path)) };
   }
   return { demos, files, media };
 }
@@ -104684,6 +104928,7 @@ function buildCatalogBundle(input2) {
       version: BUNDLE_VERSION,
       minor: BUNDLE_MINOR,
       producer: { tool: "jevitate", version: input2.producer.version, ...commit === void 0 ? {} : { commit } },
+      catalogContract: CATALOG_CONTRACT_IDENTITY,
       product: { name: input2.productName },
       catalog: { personas, jobs, journeys: journeys.map((j) => j.entry) },
       ...shown2.demos.length === 0 ? {} : { demos: shown2.demos },
@@ -105315,7 +105560,7 @@ function findingDropWarning(fingerprint2, kind, issues) {
 function bundleFindings(src) {
   const warnings = [];
   const latest = /* @__PURE__ */ new Map();
-  const keep = (m) => {
+  const keep2 = (m) => {
     if (m === null) return;
     if ("drop" in m) {
       warnings.push(`${m.drop} \u2014 left out of the bundle`);
@@ -105330,10 +105575,10 @@ function bundleFindings(src) {
     if (prev === void 0 || prev.at <= m.finding.at) latest.set(m.finding.fingerprint, m.finding);
   };
   const byPath = new Map(src.runs.map((r) => [r.path, r]));
-  for (const d of consolidate(src.runs)) keep(defectFinding(d, byPath));
+  for (const d of consolidate(src.runs)) keep2(defectFinding(d, byPath));
   for (const { report: report2, run } of src.uxReports) {
     if (!isRecord(report2) || !Array.isArray(report2.findings)) continue;
-    for (const f2 of report2.findings) if (isRecord(f2)) keep(uxFinding(f2, run));
+    for (const f2 of report2.findings) if (isRecord(f2)) keep2(uxFinding(f2, run));
   }
   let findings = [...latest.values()].sort((a, b2) => a.at.localeCompare(b2.at) || a.fingerprint.localeCompare(b2.fingerprint));
   if (findings.length > MAX_FINDINGS) {
@@ -109647,8 +109892,8 @@ var jevReadinessAnalyzer = {
 // src/journey-stale-api.ts
 function isStepIdOnlyStale(journey, snapshot2) {
   const approval = journey.metadata.approval;
-  if (approval === void 0 || approval.contentHash === journeyReviewHash(journey)) return false;
-  if (snapshot2 !== null && journeyReviewHash(snapshot2) === approval.contentHash) return isStepIdOnlyChange(snapshot2, journey);
+  if (approval === void 0 || journeyApprovalMatches(journey)) return false;
+  if (snapshot2 !== null && [journeyReviewHash(snapshot2), journeyLegacyReviewHash(snapshot2)].includes(approval.contentHash)) return isStepIdOnlyChange(snapshot2, journey);
   return isStepIdOnlyChange(approval.contentHash, journey);
 }
 async function listStaleJourneys(req) {
@@ -109662,7 +109907,7 @@ async function listStaleJourneys(req) {
     const approval = journey.metadata.approval;
     if (approval === void 0) continue;
     const contentHash2 = journeyReviewHash(journey);
-    const hashStale = approval.contentHash !== contentHash2;
+    const hashStale = !journeyApprovalMatches(journey);
     const links = journeyLinks(catalog, catalogJourney(journey));
     const catalogStale = !hashStale && links.linked && [links.job?.status, links.persona?.status].includes("stale");
     if (!hashStale && !catalogStale) continue;
@@ -116748,8 +116993,8 @@ function confineSweepFixture(raw, root2) {
     realRoot = realpathSync5(root2);
   } catch {
   }
-  const sensitive = fixtureSensitiveReason(real, realRoot) ?? fixtureSensitiveReason(absolute, resolve23(root2));
-  if (sensitive !== null) throw fixtureSensitive(absolute, root2, sensitive);
+  const sensitive2 = fixtureSensitiveReason(real, realRoot) ?? fixtureSensitiveReason(absolute, resolve23(root2));
+  if (sensitive2 !== null) throw fixtureSensitive(absolute, root2, sensitive2);
   return absolute;
 }
 function tsvTags(cell2, where, problems) {
@@ -120101,17 +120346,17 @@ function isDefectStatus(v) {
   return typeof v === "string" && DEFECT_OUTCOME_STATUSES.includes(v);
 }
 function parseResultOutcome(missionOutcome, goalOutcome, defectStatus) {
-  const canonical7 = parseMissionOutcome(missionOutcome);
-  if (canonical7 !== null) {
+  const canonical6 = parseMissionOutcome(missionOutcome);
+  if (canonical6 !== null) {
     if (goalOutcome === void 0)
-      return { outcome: canonical7 };
+      return { outcome: canonical6 };
     if (!isGoalOutcome(goalOutcome))
       return null;
     if (defectStatus === void 0)
-      return foldGoalOutcome(goalOutcome) === canonical7 ? { outcome: canonical7, goalOutcome } : null;
+      return foldGoalOutcome(goalOutcome) === canonical6 ? { outcome: canonical6, goalOutcome } : null;
     if (!isDefectStatus(defectStatus))
       return null;
-    return goalMissionOutcome(goalOutcome, defectStatus) === canonical7 ? { outcome: canonical7, goalOutcome } : null;
+    return goalMissionOutcome(goalOutcome, defectStatus) === canonical6 ? { outcome: canonical6, goalOutcome } : null;
   }
   if (goalOutcome === void 0 && typeof missionOutcome === "string" && Object.hasOwn(LEGACY_GOAL_OUTCOMES, missionOutcome)) {
     return { outcome: LEGACY_GOAL_OUTCOMES[missionOutcome], goalOutcome: missionOutcome };