@fenfill/mcp 0.2.1 → 0.2.2

package/dist/index.js

@@ -136506,6 +136506,14 @@ function mapInternal(schema, input2, loadImage2) {
   }
   return out;
 }
+function mapAgentValues(schema, input2, opts) {
+  const { values: values2, rowCounts, filled, skipped, warnings } = mapInternal(
+    schema,
+    input2,
+    opts.loadImage
+  );
+  return { values: values2, rowCounts, filled, skipped, warnings };
+}
 async function verifyImages(m) {
   if (m.images.length === 0) return;
   const { PDFDocument: PDFDocument2 } = await Promise.resolve().then(() => __toESM(require_cjs()));
@@ -136627,15 +136635,15 @@ var CheckCopyError = class extends Error {
     this.at = { ...at };
   }
 };
-async function buildCheckPdf(stamped, entries, status, fonts, banner = true) {
+async function buildCheckPdf(stamped, entries, status, fonts, banner = true, tags = true) {
   const at = { stage: "load" };
   try {
-    return await drawCheckPdf(stamped, entries, status, fonts, banner, at);
+    return await drawCheckPdf(stamped, entries, status, fonts, banner, tags, at);
   } catch (e4) {
     throw new CheckCopyError(at, e4);
   }
 }
-async function drawCheckPdf(stamped, entries, status, fonts, banner, at) {
+async function drawCheckPdf(stamped, entries, status, fonts, banner, tags, at) {
   const step = (stage, id) => {
     at.stage = stage;
     at.id = id;
@@ -136684,7 +136692,7 @@ async function drawCheckPdf(stamped, entries, status, fonts, banner, at) {
   const headColor = rgb3(0.15, 0.35, 0.75);
   const wanted = [];
   for (const e4 of entries) {
-    if (e4.kind !== "table") continue;
+    if (!tags || e4.kind !== "table") continue;
     step("table headers", e4.id);
     const g = e4.group;
     const texts = (v) => Array.isArray(v) ? v : [];
@@ -136783,7 +136791,7 @@ async function drawCheckPdf(stamped, entries, status, fonts, banner, at) {
       opacity: 0,
       borderOpacity: 0.9
     });
-    if (!b.tagged) continue;
+    if (!tags || !b.tagged) continue;
     step("tag", b.id);
     const tag = asciiOnly(short.get(b.id) ?? b.id);
     const tw = helv.widthOfTextAtSize(tag, SIZE) + 1.6;
@@ -136874,7 +136882,8 @@ async function fillAgentPdf(a) {
         m.entries,
         (id) => skippedIds.has(id) ? "skipped" : warned.has(id) ? "warned" : m.filledIds.has(id) ? "filled" : "empty",
         a.fonts,
-        a.checkBanner !== false
+        a.checkBanner !== false,
+        a.checkTags !== false
       );
       res.checkPdf = built.pdf;
       warnings.push(...built.notes);
@@ -137478,19 +137487,24 @@ function listedPages(agent, requested) {
   return have.filter((p4) => want.has(p4));
 }
 function nestBySection(entries) {
-  const blocks = /* @__PURE__ */ new Map();
+  const blocks = [];
+  let run = null;
   for (const e4 of entries) {
-    const sid = e4.section?.id ?? "";
-    const key = `${String(e4.page)}\0${sid}`;
-    let b = blocks.get(key);
-    if (!b) {
+    const sid = e4.section?.id;
+    const key = `${String(e4.page)}\0${sid ?? ""}`;
+    if (key !== run) {
       const title = e4.section?.title;
-      b = { page: e4.page, ...title ? { title } : {}, fields: [] };
-      blocks.set(key, b);
+      blocks.push({
+        page: e4.page,
+        ...sid ? { section_id: sid } : {},
+        ...title ? { title } : {},
+        fields: []
+      });
+      run = key;
     }
-    b.fields.push(compactEntry(e4));
+    blocks[blocks.length - 1].fields.push(compactEntry(e4));
   }
-  return [...blocks.values()];
+  return blocks;
 }
 function compactView(agent, requested, next, maxChars = COMPACT_MAX_CHARS) {
   const entries = selectEntries(agent, requested);
@@ -137784,7 +137798,7 @@ function loadFonts(dir = defaultFontsDir()) {
 }
 
 // src/version.ts
-var VERSION = true ? "0.2.1" : "0.0.0-dev";
+var VERSION = true ? "0.2.2" : "0.0.0-dev";
 var USER_AGENT = `fenfill-mcp/${VERSION}`;
 
 // src/fill.ts
@@ -139307,67 +139321,208 @@ var ECHO_CONTAINS_MIN = 6;
 var MAX_REMEMBERED = 5e3;
 var MAX_LEN = 2e3;
 var FREE_TEXT = /* @__PURE__ */ new Set(["text", "multiline", "date", "comb"]);
-var norm = (s) => s.trim().replace(/\s+/g, " ").toLowerCase();
+var norm = (s) => s.normalize("NFC").trim().replace(/\s+/g, " ").toLowerCase();
+var isRec = (x2) => typeof x2 === "object" && x2 !== null && !Array.isArray(x2);
+var NO_IMAGE = () => {
+  throw new Error("not read by the echo guard");
+};
+function inPrintedFormat(digits2, fmt3) {
+  const d = Array.from(digits2);
+  const cells = Array.from(fmt3);
+  const isLetter = (c2) => HAS_LETTER.test(c2);
+  if (!d.length || !d.every((c2) => new RegExp("^\\p{Nd}$", "u").test(c2))) return "";
+  if (d.length !== cells.filter(isLetter).length) return "";
+  let i2 = 0;
+  return cells.map((c2) => isLetter(c2) ? d[i2++] : c2).join("");
+}
+var LETTER = "[\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{M}]";
+var HAS_LETTER = new RegExp(LETTER, "u");
+var DIGIT = "\\p{Nd}";
+var ENDS = [new RegExp(`${LETTER}$`, "u"), new RegExp(`${DIGIT}$`, "u")];
+var STARTS = [new RegExp(`^${LETTER}`, "u"), new RegExp(`^${DIGIT}`, "u")];
+var runsOn = (left, right) => ENDS.some((end, i2) => end.test(left) && STARTS[i2].test(right));
+function holds(n, v) {
+  if (v.includes(" ") || !HAS_LETTER.test(v)) return true;
+  for (let i2 = n.indexOf(v); i2 !== -1; i2 = n.indexOf(v, i2 + 1)) {
+    if (!runsOn(n.slice(0, i2), v) && !runsOn(v, n.slice(i2 + v.length))) return true;
+  }
+  return false;
+}
+var entryKey = (w) => w.page === void 0 ? w.id : `${w.id}\0${String(w.page)}`;
+var keyOf = (r) => `${r.prop}\0${norm(r.text)}`;
+var placeOf = (r) => `${r.scope ?? ""}\0${entryKey(r)}\0${keyOf(r)}`;
+function keep(set2, key) {
+  set2.delete(key);
+  set2.add(key);
+  if (set2.size > MAX_REMEMBERED) {
+    const oldest = set2.values().next().value;
+    if (oldest !== void 0) set2.delete(oldest);
+  }
+}
 var EchoGuard = class {
   seen = /* @__PURE__ */ new Set();
+  /** Refused wording the agent has been told about (property + text), and the
+   *  entries it was named on (working copy + entry + property + text). */
+  told = /* @__PURE__ */ new Set();
+  toldAt = /* @__PURE__ */ new Set();
+  /** Wording the agent confirmed as the form's own (property + text: an id
+   *  does not survive group / ungroup, and the wording is what was vouched). */
+  vouched = /* @__PURE__ */ new Set();
   add(v) {
     if (typeof v === "number" && Number.isFinite(v)) v = String(v);
     if (typeof v !== "string") return;
     const n = norm(v);
     if (!n || n.length > MAX_LEN) return;
-    this.seen.delete(n);
-    this.seen.add(n);
-    if (this.seen.size > MAX_REMEMBERED) {
-      const oldest = this.seen.values().next().value;
-      if (oldest !== void 0) this.seen.delete(oldest);
+    keep(this.seen, n);
+    if (!/[\r\n]/.test(v)) return;
+    for (const line of v.split(/\r\n|\r|\n/)) {
+      const l = norm(line);
+      if (l.length >= ECHO_REFUSE_MIN && l.length <= MAX_LEN) keep(this.seen, l);
+    }
+  }
+  /** Every text in `v`, whatever it was meant for (no entry tells a free-text
+   *  answer from a choice here), from the length a match refuses at. */
+  addAny(v, depth = 0) {
+    if (depth > 4) return;
+    if (Array.isArray(v)) for (const x2 of v) this.addAny(x2, depth + 1);
+    else if (isRec(v)) for (const x2 of Object.values(v)) this.addAny(x2, depth + 1);
+    else {
+      const s = typeof v === "number" && Number.isFinite(v) ? String(v) : v;
+      if (typeof s === "string" && norm(s).length >= ECHO_REFUSE_MIN) this.add(s);
     }
   }
+  /** Remember the values of a call that failed before its form was read (so
+   *  `remember` never saw them): the agent has typed them all the same, and one
+   *  can come back as wording on its next call. */
+  rememberUnread(values2) {
+    this.addAny(values2);
+  }
+  /** The same answers as the page shows them: the text of every mark the core
+   *  would stamp for these values (a date in its field's format, text as
+   *  normalized), a comb's cells joined into one answer. */
+  addShown(schema, entries, values2) {
+    const shown = /* @__PURE__ */ new Map();
+    try {
+      const mapped = mapAgentValues(schema, values2, { loadImage: NO_IMAGE });
+      const marks = buildMarks({
+        fields: schema.fields,
+        groups: schema.groups,
+        values: mapped.values,
+        rowCounts: mapped.rowCounts
+      });
+      for (const page of marks.values()) {
+        for (const m of page) {
+          if (m.image || m.checkbox) continue;
+          const key = m.key.split("#")[0];
+          shown.set(key, (shown.get(key) ?? "") + m.text);
+        }
+      }
+    } catch {
+      return;
+    }
+    for (const e4 of entries) {
+      if (e4.kind !== "comb") continue;
+      let cells = "";
+      for (const s of e4.slots) {
+        cells += shown.get(s.key) ?? "";
+        shown.delete(s.key);
+      }
+      this.add(cells);
+      if (e4.dateFormat) this.add(inPrintedFormat(cells, e4.dateFormat));
+    }
+    for (const [, text] of shown) this.add(text);
+  }
   /** Remember the free-text values of one fill/preview call. */
   remember(render, values2) {
+    let schema;
     let entries;
     try {
-      entries = agentEntries(normalizeSchema(render));
+      schema = normalizeSchema(render);
+      entries = agentEntries(schema);
     } catch {
+      this.addAny(values2);
       return;
     }
-    const isRec3 = (x2) => typeof x2 === "object" && x2 !== null && !Array.isArray(x2);
+    this.addShown(schema, entries, values2);
     for (const e4 of entries) {
       const v = values2[e4.id];
       if (v === void 0) continue;
       if (e4.kind === "field" || e4.kind === "comb") {
         if (FREE_TEXT.has(e4.type)) this.add(v);
-      } else if (e4.kind === "table" && isRec3(v)) {
+      } else if (e4.kind === "table" && isRec(v)) {
         for (const c2 of e4.cells) if (FREE_TEXT.has(c2.type)) this.add(v[c2.id]);
       } else if (e4.kind === "table_rows" && Array.isArray(v)) {
+        const ids = new Set(e4.columns.map((c2) => c2.id));
         for (const row of v) {
-          if (!isRec3(row)) continue;
+          if (!isRec(row)) continue;
           for (const c2 of e4.columns) if (FREE_TEXT.has(c2.type)) this.add(row[c2.id]);
+          for (const [k4, cell] of Object.entries(row)) if (!ids.has(k4)) this.add(cell);
         }
       }
     }
   }
-  /** Wording that repeats a remembered answer: refusals (it contains one of
-   *  6+ chars, or equals one of 4+) and warnings (equals a shorter one). */
-  check(wording) {
+  /** Wording that repeats a remembered answer: refusals (it holds one of 6+
+   *  chars, or equals one of 4+) and warnings (equals a shorter one). Wording
+   *  the agent confirmed is listed apart and refuses nothing. `scope` is the
+   *  working copy the wording is in: an entry named in one copy is not thereby
+   *  named in another (section ids, and a copied template's ids, repeat). */
+  check(wording, scope = "") {
     const refuse = /* @__PURE__ */ new Set();
     const warn = /* @__PURE__ */ new Set();
-    if (this.seen.size === 0) return { refuse: [], warn: [] };
+    const refused = [];
+    const confirmed = [];
+    if (this.seen.size === 0) return { refuse: [], warn: [], refused, confirmed };
     for (const w of wording) {
       const n = norm(w.text);
       if (!n) continue;
+      let hit = false;
       if (this.seen.has(n)) {
-        (n.length >= ECHO_REFUSE_MIN ? refuse : warn).add(w.id);
-        continue;
-      }
-      if (n.length < ECHO_CONTAINS_MIN) continue;
-      for (const v of this.seen) {
-        if (v.length >= ECHO_CONTAINS_MIN && n.includes(v)) {
-          refuse.add(w.id);
-          break;
+        if (n.length < ECHO_REFUSE_MIN) {
+          warn.add(w.id);
+          continue;
         }
+        hit = true;
+      } else if (n.length >= ECHO_CONTAINS_MIN) {
+        for (const v of this.seen) {
+          if (v.length >= ECHO_CONTAINS_MIN && n.includes(v) && holds(n, v)) {
+            hit = true;
+            break;
+          }
+        }
+      }
+      if (!hit) continue;
+      const r = {
+        id: w.id,
+        ...w.page === void 0 ? {} : { page: w.page },
+        prop: w.prop ?? "",
+        text: w.text,
+        ...scope ? { scope } : {}
+      };
+      const key = keyOf(r);
+      if (this.vouched.has(key)) confirmed.push({ ...r, shown: true, listed: true });
+      else {
+        refuse.add(w.id);
+        refused.push({ ...r, shown: this.told.has(key), listed: this.toldAt.has(placeOf(r)) });
       }
     }
-    return { refuse: [...refuse], warn: [...warn].filter((id) => !refuse.has(id)) };
+    return {
+      refuse: [...refuse],
+      warn: [...warn].filter((id) => !refuse.has(id)),
+      refused,
+      confirmed
+    };
+  }
+  /** The agent has now been told about these refusals (an op's rejection, a
+   *  save's answer_in_template): from here on it can confirm them. */
+  tell(refused) {
+    for (const r of refused) {
+      keep(this.told, keyOf(r));
+      keep(this.toldAt, placeOf(r));
+    }
+  }
+  /** The agent confirmed these as the form's own wording. */
+  confirm(refused) {
+    for (const r of refused) keep(this.vouched, keyOf(r));
   }
   get size() {
     return this.seen.size;
@@ -139377,13 +139532,121 @@ var EchoGuard = class {
 // src/edits.ts
 import { randomUUID as randomUUID2 } from "node:crypto";
 
+// ../../app/t/[template_id]/readOrder.ts
+var LINE_OVERLAP_FRAC = 0.5;
+var LEFT_OF_SLACK_PCT = 0.5;
+function boxEdges(box) {
+  return {
+    left: box.xpct,
+    top: box.ypct,
+    right: box.xpct + box.wpct,
+    bottom: box.ypct + box.hpct
+  };
+}
+function membersEdges(members3) {
+  if (members3.length === 0) return null;
+  let x0 = Infinity;
+  let y0 = Infinity;
+  let x1 = -Infinity;
+  let y1 = -Infinity;
+  for (const m of members3) {
+    x0 = Math.min(x0, m.xpct);
+    y0 = Math.min(y0, m.ypct);
+    x1 = Math.max(x1, m.xpct + m.wpct);
+    y1 = Math.max(y1, m.ypct + m.hpct);
+  }
+  return boxEdges({ xpct: x0, ypct: y0, wpct: x1 - x0, hpct: y1 - y0 });
+}
+function sameLine(a, b) {
+  const overlap2 = Math.min(a.bottom, b.bottom) - Math.max(a.top, b.top);
+  const small = Math.min(a.bottom - a.top, b.bottom - b.top);
+  return small > 0 && overlap2 >= LINE_OVERLAP_FRAC * small;
+}
+function leftOf(a, b) {
+  return a.left < b.left && a.right <= b.left + LEFT_OF_SLACK_PCT;
+}
+function readingLines(blocks) {
+  const lines = [];
+  let latest;
+  for (const b of [...blocks].sort((p4, q) => p4.top - q.top || p4.left - q.left)) {
+    if (latest?.every((o) => sameLine(b, o))) {
+      latest.push(b);
+    } else {
+      latest = [b];
+      lines.push(latest);
+    }
+  }
+  return lines.map((ln2) => {
+    const row = [];
+    for (const b of ln2) {
+      const at = row.findIndex((o) => leftOf(b, o));
+      row.splice(at < 0 ? row.length : at, 0, b);
+    }
+    return row;
+  });
+}
+function orderBlocks(blocks) {
+  if (!blocks.some((b) => b.order != null)) return readingLines(blocks).flat();
+  return [...blocks].sort((a, b) => {
+    const oa = a.order ?? Number.POSITIVE_INFINITY;
+    const ob = b.order ?? Number.POSITIVE_INFINITY;
+    if (oa !== ob) return oa - ob;
+    return a.top - b.top || a.left - b.left;
+  });
+}
+
+// ../../app/t/[template_id]/pageLayout.ts
+var orderOf = (b) => b.kind === "field" ? b.field.order : b.group.order;
+function buildPageItems(page, pageFields, pageGroups, resolve3) {
+  const placed = [];
+  const place = (block, edges) => {
+    placed.push({ ...edges, block, order: orderOf(block) });
+  };
+  for (const f3 of pageFields) {
+    place({ kind: "field", top: f3.ypct, left: f3.xpct, key: `f${f3.id}`, field: f3 }, boxEdges(f3));
+  }
+  for (const g of pageGroups) {
+    const members3 = resolve3(g);
+    const edges = membersEdges(members3);
+    if (!edges) continue;
+    const { top, left } = edges;
+    place({ kind: "group", top, left, key: `g${g.id}`, group: g, members: members3 }, edges);
+  }
+  const sectionOf2 = (b) => b.kind === "field" ? b.field.section_id : b.members[0]?.section_id ?? null;
+  const sorted = orderBlocks(placed).map((p4) => p4.block);
+  const secById = new Map(page.sections.map((s) => [s.id, s]));
+  const units = [];
+  const sectionUnit = /* @__PURE__ */ new Map();
+  for (const b of sorted) {
+    const sid = sectionOf2(b);
+    const sec = sid != null ? secById.get(sid) : void 0;
+    if (!sec) {
+      units.push({ section: null, blocks: [b] });
+      continue;
+    }
+    let u = sectionUnit.get(sec.id);
+    if (!u) {
+      u = { section: sec, blocks: [] };
+      sectionUnit.set(sec.id, u);
+      units.push(u);
+    }
+    u.blocks.push(b);
+  }
+  const items2 = [];
+  for (const u of units) {
+    if (u.section) items2.push({ kind: "header", key: `h${u.section.id}`, section: u.section });
+    for (const b of u.blocks) items2.push(b);
+  }
+  return { page, items: items2 };
+}
+
 // src/doc.ts
 var OpError = class extends Error {
 };
 var bad = (msg) => {
   throw new OpError(msg);
 };
-var isRec = (x2) => typeof x2 === "object" && x2 !== null && !Array.isArray(x2);
+var isRec2 = (x2) => typeof x2 === "object" && x2 !== null && !Array.isArray(x2);
 var isNum = (x2) => typeof x2 === "number" && Number.isFinite(x2);
 var round = (n, d = 4) => Math.round(n * 10 ** d) / 10 ** d;
 function index(s) {
@@ -139497,7 +139760,7 @@ function checkBoxOnPage(b) {
   if (!onPage(b)) bad(ON_PAGE);
 }
 function boxArg(v, name = "box") {
-  if (!isRec(v)) return bad(`${name} {x, y, w, h} is required (fractions of the page, top-left)`);
+  if (!isRec2(v)) return bad(`${name} {x, y, w, h} is required (fractions of the page, top-left)`);
   const b = {
     x: checkFraction(v.x, `${name}.x`),
     y: checkFraction(v.y, `${name}.y`),
@@ -139575,7 +139838,7 @@ function patchForDataType(t, dateFormat) {
 }
 var DEFAULT_TEXT = { type: "text", format: { variant: "any" } };
 function variantOf(f3) {
-  return isRec(f3.format) && typeof f3.format.variant === "string" ? f3.format.variant : "any";
+  return isRec2(f3.format) && typeof f3.format.variant === "string" ? f3.format.variant : "any";
 }
 function isDefaultText2(f3) {
   return f3.type === "text" && variantOf(f3) === "any";
@@ -139687,7 +139950,7 @@ function lineType(d, v, i2) {
   const w = cells.find((c2) => !isDefaultText2(c2)) ?? cells[0];
   return {
     type: String(w.type),
-    ...isRec(w.format) ? { format: structuredClone(w.format) } : {}
+    ...isRec2(w.format) ? { format: structuredClone(w.format) } : {}
   };
 }
 var axisWord = (a) => a === "col" ? "column" : "row";
@@ -139962,7 +140225,7 @@ function tableInsert(d, op, w) {
   }
   let at;
   if (op.box !== void 0) {
-    if (!isRec(op.box)) return bad("box must be an object");
+    if (!isRec2(op.box)) return bad("box must be an object");
     const b = op.box;
     const [p4, s] = axis === "row" ? ["y", "h"] : ["x", "w"];
     const pos = b[p4];
@@ -140033,8 +140296,8 @@ function tableDelete(d, op, w) {
   }
   if (v.cols === 0) v.grid = [];
   v.rows = v.grid.length;
-  const keep = op.keep_cells === true;
-  if (keep) {
+  const keep2 = op.keep_cells === true;
+  if (keep2) {
     for (const id of ids) {
       const f3 = d.field.get(id);
       if (f3) f3.group = null;
@@ -140043,9 +140306,9 @@ function tableDelete(d, op, w) {
   } else removeFields(d, ids);
   const alive = commit(d, v, hc, hr);
   if (!alive) w.push(`that was the last line of table ${v.g.id}, so the table was removed`);
-  const deleted = [...keep ? [] : ids, ...alive ? [] : [v.g.id]];
+  const deleted = [...keep2 ? [] : ids, ...alive ? [] : [v.g.id]];
   return {
-    touched: [...alive ? [v.g.id] : [], ...keep ? ids : []],
+    touched: [...alive ? [v.g.id] : [], ...keep2 ? ids : []],
     deleted,
     tables: alive ? [v.g.id] : []
   };
@@ -140096,7 +140359,7 @@ function tableAdopt(d, op, w) {
   const { r, c: c2 } = slotArgs(v, op);
   const tf = slotType(d, v, r, c2, {
     type: String(f3.type),
-    ...isRec(f3.format) ? { format: f3.format } : {}
+    ...isRec2(f3.format) ? { format: f3.format } : {}
   });
   if (!sameType(f3, tf)) {
     w.push(
@@ -140335,7 +140598,7 @@ var FORMAT_KEYS = {
   date: /* @__PURE__ */ new Set(["date_format", "font_size", "text_anchor"]),
   signature: /* @__PURE__ */ new Set(["scale", "text_anchor"])
 };
-var isRec2 = (x2) => typeof x2 === "object" && x2 !== null && !Array.isArray(x2);
+var isRec3 = (x2) => typeof x2 === "object" && x2 !== null && !Array.isArray(x2);
 var isNum2 = (x2) => typeof x2 === "number" && Number.isFinite(x2);
 var isInt = (x2) => isNum2(x2) && Number.isInteger(x2);
 function checkStr(out, v, max2, at, optional2) {
@@ -140368,7 +140631,7 @@ function checkAnchor(out, v, at) {
 function formatIssues(type, fmt3, id, path) {
   const out = [];
   if (fmt3 === void 0 || fmt3 === null) return out;
-  if (!isRec2(fmt3)) return [{ id, path, reason: "format must be an object" }];
+  if (!isRec3(fmt3)) return [{ id, path, reason: "format must be an object" }];
   const allowed = typeof type === "string" ? FORMAT_KEYS[type] : void 0;
   if (!allowed) return out;
   for (const k4 of Object.keys(fmt3)) {
@@ -140405,7 +140668,7 @@ function formatIssues(type, fmt3, id, path) {
   return out;
 }
 function fieldIssues(f3, path) {
-  if (!isRec2(f3)) return [{ path, reason: "must be an object" }];
+  if (!isRec3(f3)) return [{ path, reason: "must be an object" }];
   const id = typeof f3.id === "string" ? f3.id : void 0;
   const out = [];
   const at = (k4) => ({ id, path: `${path}.${k4}` });
@@ -140428,7 +140691,7 @@ function fieldIssues(f3, path) {
     else {
       f3.cells.forEach((c2, i2) => {
         const cp = { id, path: `${path}.cells.${String(i2)}` };
-        if (!isRec2(c2)) {
+        if (!isRec3(c2)) {
           out.push({ ...cp, reason: "must be an object" });
           return;
         }
@@ -140454,7 +140717,7 @@ function fieldIssues(f3, path) {
   return out;
 }
 function groupIssues(g, path) {
-  if (!isRec2(g)) return [{ path, reason: "must be an object" }];
+  if (!isRec3(g)) return [{ path, reason: "must be an object" }];
   const id = typeof g.id === "string" ? g.id : void 0;
   const out = [];
   const at = (k4) => ({ id, path: `${path}.${k4}` });
@@ -140512,7 +140775,7 @@ function groupIssues(g, path) {
   return out;
 }
 function sectionIssues(s, path) {
-  if (!isRec2(s)) return [{ path, reason: "must be an object" }];
+  if (!isRec3(s)) return [{ path, reason: "must be an object" }];
   const id = typeof s.id === "string" ? s.id : void 0;
   const out = [];
   const at = (k4) => ({ id, path: `${path}.${k4}` });
@@ -140537,7 +140800,7 @@ function schemaIssues(schema, limit = 50) {
   if (!Array.isArray(s.pages)) out.push({ path: "pages", reason: "must be a list" });
   pages.forEach((p4, i2) => {
     const path = `pages.${String(i2)}`;
-    if (!isRec2(p4)) {
+    if (!isRec3(p4)) {
       out.push({ path, reason: "must be an object" });
       return;
     }
@@ -140638,7 +140901,9 @@ var OP_NAMES = [
   "set_orientation",
   "set_header",
   "set_headers",
-  "reorder"
+  "reorder",
+  "set_section",
+  "set_section_title"
 ];
 function placeBox(fs, bb, nb) {
   if (nb.w <= 0 || nb.h <= 0) bad("the box must have a positive width and height");
@@ -140664,25 +140929,25 @@ function sectionIds(d, page) {
   return out;
 }
 function typeAndFormat(t, prev) {
-  const prevFmt = isRec(prev?.format) ? prev.format : {};
-  const keep = (keys) => Object.fromEntries(keys.filter((k4) => prevFmt[k4] != null).map((k4) => [k4, prevFmt[k4]]));
+  const prevFmt = isRec2(prev?.format) ? prev.format : {};
+  const keep2 = (keys) => Object.fromEntries(keys.filter((k4) => prevFmt[k4] != null).map((k4) => [k4, prevFmt[k4]]));
   switch (t) {
     case "text":
       return {
         type: "text",
-        format: { ...keep(["font_size", "text_anchor", "uppercase"]), variant: "any" }
+        format: { ...keep2(["font_size", "text_anchor", "uppercase"]), variant: "any" }
       };
     case "multiline":
       return {
         type: "text",
-        format: { ...keep(["font_size", "uppercase"]), variant: "multiline" }
+        format: { ...keep2(["font_size", "uppercase"]), variant: "multiline" }
       };
     case "date":
       return {
         type: "date",
         format: {
           date_format: typeof prevFmt.date_format === "string" ? prevFmt.date_format : "DD/MM/YYYY",
-          ...keep(["font_size", "text_anchor"])
+          ...keep2(["font_size", "text_anchor"])
         }
       };
     case "checkbox":
@@ -140710,7 +140975,7 @@ function entryType(d, id) {
   }
   const f3 = d.field.get(id);
   if (!f3) return "?";
-  if (f3.type === "text" && isRec(f3.format) && f3.format.variant === "multiline") return "multiline";
+  if (f3.type === "text" && isRec2(f3.format) && f3.format.variant === "multiline") return "multiline";
   if ((f3.type === "text" || f3.type === "date") && Array.isArray(f3.cells) && f3.cells.length > 1)
     return "comb";
   return String(f3.type);
@@ -140758,7 +141023,7 @@ function checkSnapTarget(g, op) {
   if (op.snap !== void 0 && g) bad("snap applies to a single field, not a group");
 }
 function applyOne(d, op, warnings, opts) {
-  if (!isRec(op) || typeof op.op !== "string") return bad("each op needs an `op` name");
+  if (!isRec2(op) || typeof op.op !== "string") return bad("each op needs an `op` name");
   const raw = op;
   const table = (r) => r;
   switch (op.op) {
@@ -140916,29 +141181,36 @@ function applyOne(d, op, warnings, opts) {
     }
     case "set_format": {
       const { f: f3, g } = needId(d, op.id);
-      if (!isRec(op.format)) return bad("format must be an object");
+      if (!isRec2(op.format)) return bad("format must be an object");
       if (g) {
         if (g.kind !== "comb") {
           return bad(
             g.kind === "table" ? "a table's formats live on its cells: set_format a cell (it applies to the cell's whole column or row), or set_column_type" : "set_format applies to a field, or to a comb group (cell_type, date_format)"
           );
         }
+        const comb = g;
+        const dated = op.format.date_format !== void 0 && op.format.date_format !== null;
         for (const [k4, v] of Object.entries(op.format)) {
           if (k4 !== "cell_type" && k4 !== "date_format")
             bad(`a comb group's format keys are cell_type and date_format, not ${k4}`);
           if (k4 === "date_format" && v !== null) checkCombDateFormat(d, g, v);
-          if (v === null) delete g[k4];
-          else g[k4] = v;
+          if (v === null) delete comb[k4];
+          else comb[k4] = v;
         }
-        return { touched: [g.id] };
+        if (dated) {
+          if (op.format.cell_type !== void 0 && op.format.cell_type !== "date")
+            bad('date_format needs cell_type "date": leave cell_type out, or pass "date"');
+          comb.cell_type = "date";
+        }
+        return { touched: [g.id], comb: g.id };
       }
       const fld = f3;
       const own2 = d.owner.get(fld.id);
       if (own2 && (own2.kind === "comb" || own2.kind === "choice")) {
         bad(`this is a member of ${String(own2.kind)} group ${own2.id}, whose kind fixes its format`);
       }
-      if (fld.type === "signature" && !isRec(fld.format)) fld.format = {};
-      const next = { ...isRec(fld.format) ? fld.format : {} };
+      if (fld.type === "signature" && !isRec2(fld.format)) fld.format = {};
+      const next = { ...isRec2(fld.format) ? fld.format : {} };
       for (const [k4, v] of Object.entries(op.format)) {
         if (k4 === "date_format" && v !== null && !DATE_FORMATS.includes(v))
           bad(`date_format must be one of ${DATE_FORMATS.join(", ")}`);
@@ -140953,7 +141225,7 @@ function applyOne(d, op, warnings, opts) {
         delete fld.format;
       else fld.format = next;
       if (own2?.kind === "table") {
-        applyFormatToLine(d, own2, fld, isRec(fld.format) ? fld.format : void 0, warnings);
+        applyFormatToLine(d, own2, fld, isRec2(fld.format) ? fld.format : void 0, warnings);
         return { touched: [fld.id, own2.id], tables: [own2.id] };
       }
       return { touched: [fld.id] };
@@ -141040,7 +141312,7 @@ function applyOne(d, op, warnings, opts) {
         });
       } else {
         for (const o of op.options) {
-          if (!isRec(o) || typeof o.id !== "string" || typeof o.label !== "string") {
+          if (!isRec2(o) || typeof o.id !== "string" || typeof o.label !== "string") {
             return bad("options must be all strings, or all {id, label} pairs");
           }
           const oid = resolveId(d, o.id, ["field"], "option id");
@@ -141061,7 +141333,7 @@ function applyOne(d, op, warnings, opts) {
       const n = ms.length;
       if (op.index !== void 0 && (!Number.isInteger(op.index) || op.index < 0 || op.index > n))
         return bad(`index must be 0\u2013${String(n)} (${String(n)} = last)`);
-      const sib = ms.find((m) => m.type === "checkbox" && isRec(m.format));
+      const sib = ms.find((m) => m.type === "checkbox" && isRec2(m.format));
       const f3 = {
         id: randomUUID2(),
         label: op.label.trim(),
@@ -141141,29 +141413,31 @@ function applyOne(d, op, warnings, opts) {
     case "set_headers":
       return table(setHeaders(d, raw, warnings));
     case "reorder":
-      return reorder(d, raw);
+      return reorder(d, raw, warnings);
+    case "set_section":
+      return setSection(d, raw);
+    case "set_section_title":
+      return setSectionTitle(d, raw);
     default:
       return bad(`unknown op "${String(op.op)}"; ops: ${OP_NAMES.join(", ")}`);
   }
 }
-function reorder(d, op) {
+function reorder(d, op, warnings) {
   const page = pageOf(d, op.page);
   if (!Array.isArray(op.ids) || op.ids.length === 0)
     return bad("ids must list the entries to order");
-  const blocks = [];
+  const orderOf2 = (item) => typeof item.order === "number" ? item.order : void 0;
+  const unordered = [];
   for (const f3 of d.s.fields) {
-    if (f3.page === page && !d.owner.has(f3.id)) blocks.push({ item: f3, top: f3.ypct, left: f3.xpct });
+    if (f3.page === page && !d.owner.has(f3.id))
+      unordered.push({ ...boxEdges(f3), item: f3, order: orderOf2(f3) });
   }
   for (const g of d.s.groups) {
     if (g.page !== page) continue;
-    const bb = bbox(members2(d, g));
-    if (bb) blocks.push({ item: g, top: bb.y, left: bb.x });
+    const edges = membersEdges(members2(d, g));
+    if (edges) unordered.push({ ...edges, item: g, order: orderOf2(g) });
   }
-  const orderOf = (b) => typeof b.item.order === "number" ? b.item.order : void 0;
-  const hasOrder = blocks.some((b) => orderOf(b) !== void 0);
-  blocks.sort(
-    (a, b) => (hasOrder ? (orderOf(a) ?? Infinity) - (orderOf(b) ?? Infinity) || 0 : 0) || a.top - b.top || a.left - b.left
-  );
+  const blocks = orderBlocks(unordered);
   const byId = new Map(blocks.map((b) => [b.item.id, b]));
   const want = op.ids.map((raw) => {
     const id = resolveId(d, raw, ["field", "group"], "ids entry");
@@ -141184,10 +141458,132 @@ function reorder(d, op) {
     ...want.map((id) => byId.get(id)),
     ...rest.slice(before)
   ];
+  const was = listedOrder(d, page);
   next.forEach((b, i2) => {
     b.item.order = i2;
   });
-  return { touched: want };
+  const listed = listedOrder(d, page);
+  const from = listed.indexOf(want[0]);
+  const asAsked = from !== -1 && want.every((id, k4) => listed[from + k4] === id);
+  if (!asAsked) {
+    const why = `a section is listed as one run, standing where its first entry stands, and these ids span several (${sectionsOf(d, page, want)})`;
+    const fix = "set_section {ids, section_id} moves an entry to another section; inside one section any order works";
+    if (listed.every((id, k4) => id === was[k4])) {
+      return bad(
+        `this order would change nothing in the listing: ${why}. ${fix[0].toUpperCase()}${fix.slice(1)}`
+      );
+    }
+    warnings.push(
+      `reorder on page ${String(page)}: the ids are not all listed in the order asked, because ${why}. diff_summary.ops shows the order now listed; ${fix}`
+    );
+  }
+  return { touched: want, order: listed };
+}
+function pageSections(d, page) {
+  const pg = d.s.pages.find((p4) => p4.page === page);
+  return (Array.isArray(pg?.sections) ? pg.sections : []).flatMap(
+    (s) => isRec2(s) && typeof s.id === "string" ? [{ id: s.id, title: typeof s.title === "string" ? s.title : "" }] : []
+  );
+}
+function readingMembers(d, g) {
+  if (!Array.isArray(g.members)) return [];
+  const byId = buildFieldById(d.s.fields);
+  return resolveMembers(
+    g,
+    byId
+  );
+}
+function listedOrder(d, page) {
+  const info = d.s.pages.find((p4) => p4.page === page);
+  const fields = d.s.fields.filter((f3) => f3.page === page && !d.owner.has(f3.id));
+  const groups = d.s.groups.filter((g) => g.page === page && Array.isArray(g.members));
+  const byId = buildFieldById(d.s.fields);
+  const layout = buildPageItems(
+    { ...info, page, sections: pageSections(d, page) },
+    fields,
+    groups,
+    (g) => resolveMembers(g, byId)
+  );
+  return layout.items.flatMap(
+    (it) => it.kind === "header" ? [] : [it.kind === "field" ? it.field.id : it.group.id]
+  );
+}
+function sectionOf(d, page, id) {
+  const g = d.group.get(id);
+  const sid = g ? readingMembers(d, g)[0]?.section_id : d.field.get(id)?.section_id;
+  if (typeof sid !== "string") return null;
+  return pageSections(d, page).find((s) => s.id === sid) ?? null;
+}
+function sectionsOf(d, page, ids) {
+  const by = /* @__PURE__ */ new Map();
+  for (const id of ids) {
+    const sec = sectionOf(d, page, id);
+    const key = sec ? sec.id : "";
+    const row = by.get(key) ?? {
+      name: sec ? `section ${JSON.stringify(sec.title)} (${sec.id})` : "no section",
+      ids: []
+    };
+    row.ids.push(id);
+    by.set(key, row);
+  }
+  return [...by.values()].map(
+    (r) => `${r.name}: ${r.ids.slice(0, 3).join(", ")}${r.ids.length > 3 ? ` and ${String(r.ids.length - 3)} more` : ""}`
+  ).join("; ");
+}
+function setSection(d, op) {
+  if (!Array.isArray(op.ids) || op.ids.length === 0)
+    return bad("ids must list the fields or groups to move");
+  const ids = [
+    ...new Set(
+      op.ids.map((raw) => {
+        const id = resolveId(d, raw, ["field", "group"], "ids entry");
+        const own2 = d.owner.get(id);
+        if (own2) return bad(`${id} is an option/cell of group ${own2.id}; move the group`);
+        return id;
+      })
+    )
+  ];
+  const pageOfEntry = (id) => (d.group.get(id) ?? d.field.get(id))?.page;
+  const page = pageOfEntry(ids[0]);
+  if (typeof page !== "number" || ids.some((id) => pageOfEntry(id) !== page))
+    return bad("all ids must be on one page: a section belongs to one page");
+  let section = null;
+  if (op.section_id === void 0) {
+    return bad("section_id is required (null takes the entries out of every section)");
+  }
+  if (op.section_id !== null) {
+    const sid = resolveId(d, op.section_id, ["section"], "section_id");
+    const found = pageSections(d, page).find((s) => s.id === sid);
+    if (!found) {
+      const have = pageSections(d, page).map((s) => `${s.id} ${JSON.stringify(s.title)}`);
+      return bad(
+        `section_id ${sid} is not a section of page ${String(page)} (${have.length ? `its sections: ${have.join(", ")}` : "the page has no sections"})`
+      );
+    }
+    section = found;
+  }
+  for (const id of ids) {
+    const g = d.group.get(id);
+    for (const f3 of g ? members2(d, g) : [d.field.get(id)]) {
+      f3.section_id = section ? section.id : null;
+    }
+  }
+  return { touched: ids, section };
+}
+function setSectionTitle(d, op) {
+  const page = pageOf(d, op.page);
+  const sid = resolveId(d, op.section_id, ["section"], "section_id");
+  const pg = d.s.pages.find((p4) => p4.page === page);
+  const sec = (Array.isArray(pg?.sections) ? pg.sections : []).find(
+    (s) => isRec2(s) && s.id === sid
+  );
+  if (!sec) return bad(`section_id ${sid} is not a section of page ${String(page)}`);
+  if (typeof op.title !== "string" || !op.title.trim())
+    return bad("title is required: the heading the form prints over these fields");
+  sec.title = op.title.trim();
+  const issues = sectionIssues(sec, `section ${sid}`);
+  if (issues.length) return bad(issues.map((i2) => `${i2.path} ${i2.reason}`).join("; "));
+  return { touched: [], section: { id: sid, title: sec.title } };
 }
 function checkCombDateFormat(d, g, v) {
   const slots = members2(d, g).reduce(
@@ -141200,6 +141596,18 @@ function checkCombDateFormat(d, g, v) {
     );
   }
 }
+function combFormat(render, id) {
+  try {
+    const schema = normalizeSchema(
+      structuredClone(render)
+    );
+    const e4 = agentEntries(schema).find((x2) => x2.id === id);
+    if (e4?.kind !== "comb") return null;
+    return { cell_type: e4.cellType, date_format: e4.dateFormat, max_length: e4.maxLength };
+  } catch {
+    return null;
+  }
+}
 function touchedIssues(d, ids, tables = []) {
   const out = [];
   const seen = /* @__PURE__ */ new Set();
@@ -141241,6 +141649,8 @@ function applyPass(render, ops, excluded, screen, opts) {
   const touchedIds = /* @__PURE__ */ new Set();
   const warnings = [];
   const outcomes = [];
+  const told = [];
+  const confirmed = [];
   let applied = 0;
   ops.forEach((raw, i2) => {
     const skip = excluded.get(i2);
@@ -141259,30 +141669,46 @@ function applyPass(render, ops, excluded, screen, opts) {
           issues.slice(0, 5).map((x2) => `${x2.path} ${x2.reason}`).join("; ")
         );
       }
+      let vouched = [];
       if (screen) {
         const changed = changedWording(cur, draft);
-        const echo = changed.length ? screen(changed) : { refuse: [], warn: [] };
-        if (echo.refuse.length) {
-          bad(
-            `${describeWording(changed, echo.refuse)} matches an answer filled in this session. Labels, descriptions, placeholders, options and formats hold the form's own wording, never an answer: answers go only in fill values`
-          );
+        const echo = changed.length ? screen(changed) : null;
+        if (echo?.refused.length) {
+          const known = index(cur);
+          const name2 = (id) => known.field.has(id) || known.group.has(id) || known.section.has(id) ? id : "the new entry";
+          if (opts.confirmWording === true && echo.refused.every((x2) => x2.shown)) {
+            vouched = echo.refused;
+            w.push(
+              `${describeWording(echo.refused, name2)}: matches an answer filled in this session; applied because confirm_wording says it is the form's own wording`
+            );
+          } else {
+            told.push(...echo.refused);
+            bad(
+              `${describeWording(echo.refused, name2)} matches an answer filled in this session. Labels, descriptions, placeholders, options and formats hold the form's own wording, never an answer: answers go only in fill values. If this is the form's printed wording, send the op again with confirm_wording: true on the call`
+            );
+          }
         }
-        for (const id of echo.warn) {
+        for (const id of echo?.warn ?? []) {
           w.push(
-            `${describeWording(changed, [id])}: short wording that matches a short answer from this session (allowed under 4 characters); check it is the form's own text`
+            `${describeWording(changed.filter((x2) => x2.id === id))}: short wording that matches a short answer from this session (allowed under 4 characters); check it is the form's own text`
           );
         }
       }
       const name = raw.op;
       const noop = JSON.stringify(draft) === JSON.stringify(cur);
+      const comb = r.comb !== void 0 ? combFormat(draft, r.comb) : null;
       outcomes.push({
         op_index: i2,
         op: name,
         ...r.snapped !== void 0 ? { snapped: r.snapped } : {},
+        ...comb ? { comb } : {},
+        ...r.order ? { order: r.order } : {},
+        ...r.section !== void 0 ? { section: r.section } : {},
         ...noop ? { noop: true } : {}
       });
       cur = draft;
       applied++;
+      confirmed.push(...vouched);
       counts[name] = (counts[name] ?? 0) + 1;
       if (r.added) added.push({ op_index: i2, id: r.added });
       if (r.geometry) placed.set(i2, r.geometry);
@@ -141324,16 +141750,17 @@ function applyPass(render, ops, excluded, screen, opts) {
       applied,
       rejected,
       diff_summary: { counts, added, deleted, touched, ops: outcomes },
-      warnings
+      warnings,
+      screened: { told, confirmed }
     },
     offPage
   };
 }
 function wordingOf(s) {
   const out = [];
-  const add = (id, prop, v) => {
+  const add = (id, prop, v, page) => {
     if (typeof v === "string" && v.trim() && typeof id === "string")
-      out.push({ id, prop, text: v });
+      out.push({ id, ...typeof page === "number" ? { page } : {}, prop, text: v });
   };
   const rec = (x2) => typeof x2 === "object" && x2 !== null && !Array.isArray(x2) ? x2 : null;
   for (const f3 of s.fields) {
@@ -141353,26 +141780,36 @@ function wordingOf(s) {
   for (const p4 of s.pages) {
     const secs = Array.isArray(p4.sections) ? p4.sections : [];
     for (const sec of secs)
-      for (const k4 of ["title", "description", "placeholder"]) add(sec.id, k4, sec[k4]);
+      for (const k4 of ["title", "description", "placeholder"]) add(sec.id, k4, sec[k4], p4.page);
   }
   return out;
 }
 function changedWording(prev, next) {
-  const before = new Set(wordingOf(prev).map((w) => `${w.id}\0${w.prop}\0${w.text}`));
-  return wordingOf(next).filter((w) => !before.has(`${w.id}\0${w.prop}\0${w.text}`));
+  const at = (w) => `${entryKey(w)}\0${w.prop}\0${w.text}`;
+  const before = new Set(wordingOf(prev).map(at));
+  return wordingOf(next).filter((w) => !before.has(at(w)));
 }
 function wordingChanges(changed) {
   const by = /* @__PURE__ */ new Map();
   for (const w of changed) {
-    const set2 = by.get(w.id) ?? /* @__PURE__ */ new Set();
-    set2.add(w.prop);
-    by.set(w.id, set2);
-  }
-  return [...by].map(([id, props]) => ({ id, properties: [...props].sort() }));
+    const key = entryKey(w);
+    const entry = by.get(key) ?? {
+      id: w.id,
+      ...w.page === void 0 ? {} : { page: w.page },
+      props: /* @__PURE__ */ new Set()
+    };
+    entry.props.add(w.prop);
+    by.set(key, entry);
+  }
+  return [...by.values()].map(({ props, ...entry }) => ({
+    ...entry,
+    properties: [...props].sort()
+  }));
 }
-function describeWording(changed, ids) {
-  const want = new Set(ids);
-  return wordingChanges(changed.filter((w) => want.has(w.id))).map((c2) => `the ${c2.properties.join("/")} of ${c2.id}`).join(", ");
+function describeWording(wording, name = (id) => id) {
+  return wordingChanges(wording).map(
+    (c2) => `the ${c2.properties.join("/")} of ${name(c2.id)}${c2.page === void 0 ? "" : ` on page ${String(c2.page)}`}`
+  ).join(", ");
 }
 
 // src/render.ts
@@ -141453,14 +141890,14 @@ async function withPage(pdf, page, fn5) {
     p4.wasmExports.free(ptr);
   }
 }
-async function renderPage(pdf, page, dpi, crop) {
+async function renderPage(pdf, page, dpi, crop, maxSide = MAX_SIDE_PX) {
   return withPage(pdf, page, (m, pg, heap) => {
     const wPt = m.FPDF_GetPageWidthF(pg);
     const hPt = m.FPDF_GetPageHeightF(pg);
     const c2 = crop ?? { x: 0, y: 0, w: 1, h: 1 };
     let scale2 = dpi / 72;
     const longest = Math.max(wPt * c2.w, hPt * c2.h) * scale2;
-    if (longest > MAX_SIDE_PX) scale2 *= MAX_SIDE_PX / longest;
+    if (longest > maxSide) scale2 *= maxSide / longest;
     const fullW = Math.max(1, Math.round(wPt * scale2));
     const fullH = Math.max(1, Math.round(hPt * scale2));
     const x0 = Math.round(c2.x * fullW);
@@ -141489,7 +141926,7 @@ async function renderPage(pdf, page, dpi, crop) {
         const row = buf + y * stride;
         rgba.set(h8.subarray(row, row + width * 4), y * width * 4);
       }
-      return { width, height, rgba };
+      return { width, height, rgba, scale: scale2 };
     } finally {
       m.FPDFBitmap_Destroy(bmp);
     }
@@ -141926,10 +142363,10 @@ var FONT_MIN_PT = 3;
 var OVERLAP_MIN_CHARS = 2;
 var CELL_TOL = 25e-4;
 var BLANK_CHARS = /^[_.\-‐-―…·•‧⋯─━┄┅┈┉＿]$/u;
-var multiline = (f3) => isRec(f3.format) && f3.format.variant === "multiline";
+var multiline = (f3) => isRec2(f3.format) && f3.format.variant === "multiline";
 var singleLine = (f3) => f3.type === "text" && !multiline(f3) || f3.type === "date" && !(f3.cells && f3.cells.length > 1);
 function pinned(f3) {
-  const s = isRec(f3.format) ? f3.format.font_size : void 0;
+  const s = isRec2(f3.format) ? f3.format.font_size : void 0;
   return typeof s === "number" ? s : null;
 }
 function stampedSize(f3, pageHeightPt) {
@@ -142055,7 +142492,9 @@ async function placementWarnings2(pdf, render, ids, opts = {}) {
 }
 
 // src/preview.ts
+var OVERLAYS = ["full", "outline", "none"];
 var MAX_ZOOM = 8;
+var PREVIEW_MAX_SIDE_PX = 2e3;
 var r4 = (n) => Math.round(n * 1e4) / 1e4;
 function boxOf(fs) {
   if (!fs.length) return null;
@@ -142066,6 +142505,16 @@ function boxOf(fs) {
   return { x: r4(x0 / 100), y: r4(y0 / 100), w: r4((x1 - x0) / 100), h: r4((y1 - y0) / 100) };
 }
 var topId2 = (id) => id.split(/[.[]/, 1)[0];
+function idPages(entries) {
+  const pages = /* @__PURE__ */ new Map();
+  for (const e4 of entries) {
+    const page = e4.kind === "field" ? e4.field.page : e4.group.page;
+    pages.set(e4.id, page);
+    const inner = e4.kind === "choice" ? e4.options : e4.kind === "table" ? e4.cells : e4.kind === "table_rows" ? e4.columns : [];
+    for (const x2 of inner) if (!pages.has(x2.id)) pages.set(x2.id, page);
+  }
+  return pages;
+}
 function legendRows(render, page) {
   const schema = normalizeSchema(render);
   const entries = agentEntries(schema);
@@ -142201,6 +142650,7 @@ function legendChanges(before, now) {
 }
 async function previewPage(a) {
   const dpi = Math.min(MAX_DPI, Math.max(MIN_DPI, Math.round(a.dpi ?? DEFAULT_DPI)));
+  const overlay = a.overlay ?? "full";
   const schema = normalizeSchema(a.render);
   const pages = schema.pages.map((p4) => p4.page);
   if (!pages.includes(a.page)) {
@@ -142218,17 +142668,20 @@ async function previewPage(a) {
       branding: null,
       logoBytes: null,
       loadImage,
-      check: true,
+      // "none" shows the stamped PDF itself: no check copy is built, so none can fail.
+      check: overlay !== "none",
       // preview_page's JSON carries the colour key; the banner would only
       // cover the top of page 1.
-      checkBanner: false
+      checkBanner: false,
+      checkTags: overlay === "full"
     });
   } catch (e4) {
     if (isPasswordError(e4)) throw passwordError();
     if (isFillForbiddenError(e4)) throw fillForbiddenError();
     throw e4;
   }
-  if (!res.checkPdf) {
+  const shown = overlay === "none" ? res.pdf : res.checkPdf;
+  if (!shown) {
     const err2 = res.checkError;
     throw new ToolError("check_copy_failed", checkCopyFailed(err2), {
       hint: err2?.id ? `Fix or remove ${err2.id} with edit_template, then preview again.` : "Preview again; if it persists, fill_form / fill_template still write the filled PDF, without a check copy.",
@@ -142237,14 +142690,19 @@ async function previewPage(a) {
   }
   const legend = legendRows(a.render, a.page);
   const ids = new Set(legend.map((r) => r.id));
-  const skipped = res.skipped.filter((s) => ids.has(topId2(s.id)));
+  const where = idPages(agentEntries(schema));
+  const skipped = res.skipped.filter((s) => {
+    const top = topId2(s.id);
+    const page = where.get(top);
+    return ids.has(top) || page === void 0 || page === a.page;
+  });
   const warnings = res.warnings.filter((w) => {
     const head = w.slice(0, Math.max(0, w.indexOf(":")));
     return head.split(" and ").some((id) => ids.has(topId2(id.trim())));
   });
   const zoom = a.crop ? Math.min(MAX_ZOOM, Math.max(1, a.zoom ?? 2)) : 1;
-  const raster = await renderPage(res.checkPdf, a.page, dpi * zoom, a.crop);
-  const shown = a.crop ? legend.filter((r) => {
+  const raster = await renderPage(shown, a.page, dpi * zoom, a.crop, PREVIEW_MAX_SIDE_PX);
+  const listed = a.crop ? legend.filter((r) => {
     const c2 = a.crop;
     return r.box.x < c2.x + c2.w && c2.x < r.box.x + r.box.w && r.box.y < c2.y + c2.h && c2.y < r.box.y + r.box.h;
   }) : legend;
@@ -142252,8 +142710,10 @@ async function previewPage(a) {
     png: encodePng2(raster),
     width: raster.width,
     height: raster.height,
-    dpi: dpi * zoom,
-    legend: shown,
+    // What was rendered, not what was asked: a capped image is coarser, and
+    // an agent reads sizes off it.
+    dpi: Math.round(raster.scale * 72 * 10) / 10,
+    legend: listed,
     filled: res.filled,
     skipped,
     warnings
@@ -142818,6 +143278,52 @@ async function sweepCache(cache3, now) {
   return removed;
 }
 
+// src/values.ts
+function expandKeys(values2, pool3) {
+  const given = Object.keys(values2);
+  const taken = /* @__PURE__ */ new Set();
+  const pairs = [];
+  for (const key of given) {
+    let id = key;
+    if (!pool3.includes(key) && key.length >= MIN_ID_PREFIX) {
+      const hits2 = pool3.filter((p4) => p4.startsWith(key));
+      if (hits2.length === 1 && !given.includes(hits2[0]) && !taken.has(hits2[0])) id = hits2[0];
+    }
+    taken.add(id);
+    pairs.push([id, values2[key]]);
+  }
+  return Object.fromEntries(pairs);
+}
+function expandNested(e4, v) {
+  if (e4.kind === "table" && isRec2(v)) {
+    return expandKeys(
+      v,
+      e4.cells.map((c2) => c2.id)
+    );
+  }
+  if (e4.kind === "table_rows" && Array.isArray(v)) {
+    const columns = e4.columns.map((c2) => c2.id);
+    return v.map((row) => isRec2(row) ? expandKeys(row, columns) : row);
+  }
+  return v;
+}
+function expandValueKeys(render, values2) {
+  let entries;
+  try {
+    entries = agentEntries(normalizeSchema(render));
+  } catch {
+    return values2;
+  }
+  const byId = new Map(entries.map((e4) => [e4.id, e4]));
+  const top = expandKeys(values2, [...byId.keys()]);
+  return Object.fromEntries(
+    Object.entries(top).map(([id, v]) => {
+      const e4 = byId.get(id);
+      return [id, e4 ? expandNested(e4, v) : v];
+    })
+  );
+}
+
 // src/server.ts
 var VALUE_SHAPES = `values maps field ids to: text/multiline = string, stamped exactly as given (a date in a text field goes in the format its label or placeholder asks, e.g. "mmddyyyy" \u2192 "10042026"); date = "YYYY-MM-DD", printed in the field's date_format (shown on the field, e.g. DD/MM/YYYY); comb = string, one character per cell; checkbox = boolean; radio = option id or label, or the bare option text ("No" for "Smoke? No"); multiselect = array of those; table = {cellId: value}; table_rows = [{columnId: value}, \u2026]; signature = {"image_path": "/abs/sig.png"} (PNG or JPG). A signature with signing_requirement "external" is signed outside fenfill (on paper or by e-sign) and stays blank.`;
 var INSTRUCTIONS = [
@@ -142830,7 +143336,9 @@ var INSTRUCTIONS = [
 ].join(" ");
 var TEMPLATE_ID = external_exports.string().regex(/^[A-Za-z0-9-]{1,64}$/, "a fenfill template id").describe("Template id (from list_templates).");
 var PAGES = external_exports.string().max(2e3).optional().describe('1-based pages, e.g. "1-3,5". Omit for all.');
-var VALUES = external_exports.record(external_exports.string(), external_exports.unknown()).describe("Field id \u2192 value (see description).");
+var VALUES = external_exports.record(external_exports.string(), external_exports.unknown()).describe(
+  "Field id \u2192 value (see description). An id may be shortened to an unambiguous prefix of 6+ characters (the preview tags), a table's cell or column id inside its value too; a key that matches nothing is listed in skipped."
+);
 var OUTPUT_PATH = external_exports.string().min(1).max(4096).describe("Absolute path (or ~/\u2026) of the new .pdf to write.");
 var OVERWRITE = external_exports.boolean().optional().describe("Replace output_path if it exists.");
 var TARGET_PATH = external_exports.string().min(1).max(4096).optional().describe(
@@ -142877,7 +143385,14 @@ async function refreshSavedAnalyses(cache3, templateId, render, saved, who) {
       const agent = saved.result && Array.isArray(saved.result.fields) ? saved.result : e4.agent;
       await cache3.saveAnalysis({
         ...e4,
-        render: { ...render, pages: e4.render.pages },
+        // The cached pages keep their own images; the sections are the saved ones.
+        render: {
+          ...render,
+          pages: e4.render.pages.map((p4) => {
+            const saved2 = render.pages.find((x2) => x2.page === p4.page);
+            return saved2?.sections !== void 0 ? { ...p4, sections: saved2.sections } : p4;
+          })
+        },
         agent: { ...agent, template_id: templateId, updated_at: saved.updated_at }
       }).catch(() => void 0);
     }
@@ -142934,6 +143449,19 @@ function createFenfillServer(opts = {}) {
   };
   maybeSweep();
   const echo = new EchoGuard();
+  const takenInputs = /* @__PURE__ */ new WeakSet();
+  const taken = (render, values2) => {
+    takenInputs.add(values2);
+    const answers = expandValueKeys(render, values2);
+    echo.remember(render, answers);
+    return answers;
+  };
+  const untaken = (args) => {
+    const given = args?.values;
+    if (typeof given !== "object" || given === null || Array.isArray(given)) return;
+    if (!takenInputs.has(given)) echo.rememberUnread(given);
+  };
+  const listedForeign = /* @__PURE__ */ new Map();
   const lastLegend = /* @__PURE__ */ new Map();
   const fileForm = async (path) => {
     const { abs: abs2, bytes } = await readInputPdf(path);
@@ -143009,6 +143537,7 @@ function createFenfillServer(opts = {}) {
       log("info", "tool ok", { tool: name, ms: Date.now() - t0 });
       return ok(result);
     } catch (e4) {
+      untaken(args);
       const err2 = asToolError(e4);
       log("warn", "tool failed", { tool: name, code: err2.code, ms: Date.now() - t0 });
       return fail(err2);
@@ -143109,11 +143638,11 @@ function createFenfillServer(opts = {}) {
       const templateId = soleTemplateId(merged, null, await identity2(false));
       const wc = await fileEdits({ sha, templateId });
       const render = wc ? wc.render : merged.render;
-      echo.remember(render, values2);
+      const answers = taken(render, values2);
       const res = await stampAndWrite({
         pdfBytes: bytes,
         render,
-        agentInput: values2,
+        agentInput: answers,
         fonts: loadFonts(opts.fontsDir),
         branding: null,
         logoBytes: null,
@@ -143171,7 +143700,7 @@ function createFenfillServer(opts = {}) {
           }
           render = tpl.render;
         }
-        echo.remember(render, values2);
+        const answers = taken(render, values2);
         const { body: account } = await client.getJson("/account", { signal, deadline });
         const blank = await templateBlank(template_id, signal, deadline);
         let logo = null;
@@ -143187,7 +143716,7 @@ function createFenfillServer(opts = {}) {
         const res = await stampAndWrite({
           pdfBytes: blank,
           render,
-          agentInput: values2,
+          agentInput: answers,
           fonts: loadFonts(opts.fontsDir),
           branding,
           logoBytes: logo ? toArrayBuffer(logo) : null,
@@ -143303,24 +143832,31 @@ function createFenfillServer(opts = {}) {
     "preview_page",
     {
       title: "Preview a page with its field boxes",
-      description: `Render one page as a PNG with every field box outlined (green filled, orange warning, red skipped, grey empty) and tagged with its id prefix, plus a legend: tag \u2192 id, type, label, box (page fractions, top-left origin, as edit_template uses), format and font_pt; options, table cells (row, col) and table_rows columns with their own boxes. placement_warnings ([] = checked, clean) covers every box shown: much larger text than the page's other fields, a box over printed text (not on scans), a box past its ruled cell. Use it as a read-only placement audit. values (see that parameter) stamp test values. crop + zoom magnify a region; legend: "changed" lists only what changed since your last preview of the page (moved_into: fields now inside a table or group). It renders the local working copy (edit_template) when one exists, else the saved or analyzed version (edited: true/false). Rendered on this machine: nothing is written to disk and the values are never sent anywhere.`,
+      description: `Render one page as a PNG with every field box outlined (green filled, orange warning, red skipped, grey empty) and tagged with its id prefix, plus a legend: tag \u2192 id, type, label, box (page fractions, top-left origin, as edit_template uses), format and font_pt; options, table cells (row, col) and table_rows columns with their own boxes. placement_warnings ([] = checked, clean) covers every box shown: much larger text than the page's other fields, a box over printed text (not on scans), a box past its ruled cell. Use it as a read-only placement audit. values (see that parameter) stamp test values. overlay: "outline" drops the tags, "none" shows the page with only the stamped values (to read print under a tag, or after check_copy_failed). crop + zoom magnify a region; legend: "changed" lists only what changed since your last preview of the page (moved_into: fields now inside a table or group). It renders the local working copy (edit_template) when one exists, else the saved or analyzed version (edited: true/false). Rendered on this machine: nothing is written to disk and the values are never sent anywhere.`,
       inputSchema: {
         path: TARGET_PATH,
         template_id: TARGET_TEMPLATE,
         page: external_exports.number().int().min(1).max(1e5).describe("1-based page number."),
-        values: VALUES.optional().describe(`Optional, exactly as for fill_form: ${VALUE_SHAPES}`),
-        dpi: external_exports.number().int().min(36).max(MAX_DPI).optional().describe(`Resolution (default ${String(DEFAULT_DPI)}, max ${String(MAX_DPI)}).`),
+        values: VALUES.optional().describe(
+          `Optional, exactly as for fill_form (ids may be shortened the same way): ${VALUE_SHAPES} Test values count as answers for the wording check of edit_template and save_template: prefer ones that are not words printed on the form (a caption that repeats one has to be confirmed there).`
+        ),
+        dpi: external_exports.number().int().min(36).max(MAX_DPI).optional().describe(
+          `Resolution (default ${String(DEFAULT_DPI)}, max ${String(MAX_DPI)}). The image's longest side is capped at ${String(PREVIEW_MAX_SIDE_PX)} px; the result's dpi is what was rendered (use crop + zoom for more detail).`
+        ),
         crop: external_exports.object({
           x: external_exports.number().min(0).max(1),
           y: external_exports.number().min(0).max(1),
           w: external_exports.number().gt(0).max(1),
           h: external_exports.number().gt(0).max(1)
         }).optional().describe(
-          "Optional: render only this region of the page (fractions, top-left origin, like the legend boxes), magnified by zoom. The legend then lists only what the region shows."
+          "Optional: render only this region of the page (fractions, top-left origin, like the legend boxes), magnified by zoom. The legend then lists only what the region shows. Convert a position read off the image by proportion (x = crop.x + crop.w \xD7 pixel x / image width, the same for y), not by pixel count: a client may show the image smaller than width \xD7 height."
         ),
         zoom: external_exports.number().min(1).max(MAX_ZOOM).optional().describe(`With crop: magnification (default 2, max ${String(MAX_ZOOM)}).`),
         legend: external_exports.enum(["all", "changed", "none"]).optional().describe(
           `Which legend rows to return: "all" (default), "changed" (only what changed since your last preview of this page, or, the first time, since fenfill's version; plus removed ids), or "none".`
+        ),
+        overlay: external_exports.enum(OVERLAYS).optional().describe(
+          'What is drawn over the page: "full" (default) = every box outlined and tagged, table headers printed; "outline" = the boxes only, no id tags and no table header texts; "none" = nothing, the page as a fill stamps it. Use "outline" or "none" when a tag covers a caption, a tick box or a stamped value. The legend and placement_warnings are the same in all three.'
         )
       },
       annotations: { readOnlyHint: true, openWorldHint: true }
@@ -143350,16 +143886,17 @@ function createFenfillServer(opts = {}) {
           render = wc ? wc.render : (await fetchTemplate(id, signal)).render;
           bytes = await templateBlank(id, signal);
         }
-        echo.remember(render, values2);
+        const answers = taken(render, values2);
         const pv = await previewPage({
           pdfBytes: bytes,
           render,
           page: args.page,
-          values: values2,
+          values: answers,
           dpi: args.dpi,
           fonts: loadFonts(opts.fontsDir),
           crop: args.crop,
-          zoom: args.zoom
+          zoom: args.zoom,
+          overlay: args.overlay
         });
         const placement = await placementWarnings2(
           bytes,
@@ -143392,7 +143929,13 @@ function createFenfillServer(opts = {}) {
             edited: false,
             source: args.path ? "analysis (no local edits)" : "saved template (no local edits)"
           },
-          colours: "green = filled, orange = filled with a warning, red = skipped, grey dashed = empty; a radio/multiselect option has a thin box tagged below it",
+          // The colour key of what is drawn: nothing with overlay "none".
+          ...args.overlay === "none" ? { overlay: "none" } : args.overlay === "outline" ? {
+            overlay: "outline",
+            colours: "green = filled, orange = filled with a warning, red = skipped, grey dashed = empty; a radio/multiselect option has a thin box"
+          } : {
+            colours: "green = filled, orange = filled with a warning, red = skipped, grey dashed = empty; a radio/multiselect option has a thin box tagged below it"
+          },
           ...args.crop ? { crop: args.crop } : {},
           ...mode === "none" ? {} : changes ? {
             legend: changes.changed,
@@ -143414,6 +143957,7 @@ function createFenfillServer(opts = {}) {
           ]
         };
       } catch (e4) {
+        untaken(args);
         const err2 = asToolError(e4);
         log("warn", "tool failed", { tool: "preview_page", code: err2.code, ms: Date.now() - t0 });
         return fail(err2);
@@ -143428,10 +143972,15 @@ function createFenfillServer(opts = {}) {
       inputSchema: {
         path: TARGET_PATH,
         template_id: TARGET_TEMPLATE,
-        ops: external_exports.array(external_exports.record(external_exports.string(), external_exports.unknown())).max(MAX_OPS).describe(
-          `Edit ops, applied in order (max ${String(MAX_OPS)}), each all-or-nothing; a box only has to lie on the page after the whole batch (so move then resize is fine). Fields: set_box {id, x, y, w, h, snap?} (absolute top-left + size; a group scales its members); move {id, dx, dy} or {id, x, y, snap?} (new top-left); resize {id, w, h}; add {page, type: text|multiline|date|checkbox|signature, box: {x, y, w, h}, label, description?, placeholder?, required?, section_id?, snap?} (diff_summary.added gives the new id); snap: "underline" fits the box onto the printed rule under it, "cell" into the ruled box around it, "answer" into that cell's blank part below (or after) its printed caption (read from the page on this machine; a miss keeps your box and warns); relabel {id, label}; retype {id, type} (a radio/multiselect group: radio|multiselect); delete {id}; set_format {id, format: {...}} (font_size, text_anchor, variant, date_format: DD/MM/YYYY|MM/DD/YYYY|YYYY-MM-DD|DD.MM.YYYY|DD-MM-YYYY; null removes a key; on a table cell it applies to the cell's whole column/row; a comb group: cell_type, date_format with one D/M/Y letter per cell); set_required {id, required}; set_description {id, description}; set_placeholder {id, placeholder} (null clears); set_autofill {id, autofill: a browser token (name, given-name, family-name, email, tel, street-address, postal-code, bday, \u2026) or null}. Groups: group {ids, kind: "choice"|"comb", label, multiple?} (standalone fields on one page; choice turns them into checkbox options); ungroup {id}; set_options {id, options: ["label", \u2026] in listed order, or [{id, label}]}; add_option {id: group, label, box, index?} and remove_option {id: group, option} keep the group's id. Tables: group {kind: "table", label, cells: [[id|null, \u2026], \u2026] (rows \xD7 columns) or ids (laid out from their boxes), header_cols?, header_rows?, orientation?: "col"|"row" (the axis whose lines carry the types; default col), format?: classic|expandable|checkbox_matrix}; table_insert {id, axis: "row"|"col", index, box?: {y, h} for a row / {x, w} for a column (default: one pitch past the edge, or centred in the gap), header?, type?}; table_delete {id, axis, index, keep_cells?}; table_add_cell {id, row, col, box?} (fills an empty slot); table_adopt {id, field, row, col} (moves a loose field into an empty slot); set_column_type {id, index, type: text|number|currency|date|checkbox, date_format?} (index along the typed axis); set_orientation {id, orientation} (resets every cell to text); set_header {id, axis, index, text}; set_headers {id, axis, texts: [...], start?} (several at once). Order: reorder {page, ids} moves those top-level entries together, in that order, to where the first sat (stamps order; geometry no longer decides). Every cell of one column (or row, when orientation is row) has one type.`
+        ops: external_exports.array(external_exports.record(external_exports.string(), external_exports.unknown())).max(MAX_OPS).optional().describe(
+          `Edit ops, applied in order (max ${String(MAX_OPS)}), each all-or-nothing; a box only has to lie on the page after the whole batch (so move then resize is fine). Fields: set_box {id, x, y, w, h, snap?} (absolute top-left + size; a group scales its members); move {id, dx, dy} or {id, x, y, snap?} (new top-left); resize {id, w, h}; add {page, type: text|multiline|date|checkbox|signature, box: {x, y, w, h}, label, description?, placeholder?, required?, section_id?, snap?} (diff_summary.added gives the new id); snap: "underline" fits the box onto the printed rule under it, "cell" into the ruled box around it, "answer" into that cell's blank part below (or after) its printed caption (read from the page on this machine; a miss keeps your box and warns); relabel {id, label}; retype {id, type} (a radio/multiselect group: radio|multiselect); delete {id}; set_format {id, format: {...}} (font_size, text_anchor, variant, date_format: DD/MM/YYYY|MM/DD/YYYY|YYYY-MM-DD|DD.MM.YYYY|DD-MM-YYYY; null removes a key; on a table cell it applies to the cell's whole column/row; a comb group: cell_type char|integer|date, or date_format with one D/M/Y letter per cell, e.g. DDMMYYYY, which makes it a date comb; diff_summary.ops shows the comb's cell_type, date_format and max_length); set_required {id, required}; set_description {id, description}; set_placeholder {id, placeholder} (null clears); set_autofill {id, autofill: a browser token (name, given-name, family-name, email, tel, street-address, postal-code, bday, \u2026) or null}. Groups: group {ids, kind: "choice"|"comb", label, multiple?} (standalone fields on one page; choice turns them into checkbox options); ungroup {id}; set_options {id, options: ["label", \u2026] in listed order, or [{id, label}]}; add_option {id: group, label, box, index?} and remove_option {id: group, option} keep the group's id. Tables: group {kind: "table", label, cells: [[id|null, \u2026], \u2026] (rows \xD7 columns) or ids (laid out from their boxes), header_cols?, header_rows?, orientation?: "col"|"row" (the axis whose lines carry the types; default col), format?: classic|expandable|checkbox_matrix}; table_insert {id, axis: "row"|"col", index, box?: {y, h} for a row / {x, w} for a column (default: one pitch past the edge, or centred in the gap), header?, type?}; table_delete {id, axis, index, keep_cells?}; table_add_cell {id, row, col, box?} (fills an empty slot); table_adopt {id, field, row, col} (moves a loose field into an empty slot); set_column_type {id, index, type: text|number|currency|date|checkbox, date_format?} (index along the typed axis); set_orientation {id, orientation} (resets every cell to text); set_header {id, axis, index, text}; set_headers {id, axis, texts: [...], start?} (several at once). Order: reorder {page, ids} moves those top-level entries together, in that order, to where the first sat (stamps order; geometry no longer decides); diff_summary.ops shows the order now listed. A section is listed as one run where its first entry stands, so entries of different sections never stand together: set_section {ids, section_id | null} moves fields or groups of one page to another of its sections (get_template shows each section's section_id; null = no section), and set_section_title {page, section_id, title} renames one. A reorder whose ids cannot come out as asked and that would change nothing in the listing is rejected. Every cell of one column (or row, when orientation is row) has one type.`
         ),
-        discard: external_exports.boolean().optional().describe("Drop the local working copy first (any ops then apply to fenfill's version).")
+        discard: external_exports.boolean().optional().describe(
+          "Drop the local working copy first (any ops then apply to fenfill's version). ops may be left out with it."
+        ),
+        confirm_wording: external_exports.boolean().optional().describe(
+          "Only after an op was rejected because its wording matches an answer of this session: true confirms the rejected wording is the form's own printed text, not an answer, so the same op applies. It covers only wording a rejection has already named (that text in that property); new wording is rejected and named first."
+        )
       },
       annotations: {
         readOnlyHint: false,
@@ -143440,8 +143989,15 @@ function createFenfillServer(opts = {}) {
         openWorldHint: true
       }
     },
-    run("edit_template", async ({ path, template_id, ops, discard }, _extra, signal) => {
+    run("edit_template", async (args, _extra, signal) => {
+      const { path, template_id, ops: given, discard, confirm_wording } = args;
       oneTarget({ path, template_id });
+      if (given === void 0 && discard !== true) {
+        throw new ToolError("invalid_argument", "Pass ops, or discard: true (or both).", {
+          hint: "ops: the edits to apply ([] only reports whether local edits exist); discard: true drops the local working copy."
+        });
+      }
+      const ops = given ?? [];
       const who = await identity2(false);
       let key;
       let saveTarget;
@@ -143472,6 +144028,7 @@ function createFenfillServer(opts = {}) {
       if (discard === true) discarded = await cache3.deleteEdits(key);
       let wc = await cache3.readEdits(key);
       if (wc && saveTarget && !sameAccount(wc, who)) wc = null;
+      const had = wc !== null;
       const nowIso = new Date(now()).toISOString();
       if (!wc && ops.length === 0) {
         return {
@@ -143513,7 +144070,10 @@ function createFenfillServer(opts = {}) {
           snap = () => ({ none: `no page render (${why})` });
         }
       }
-      const r = applyOps(wc.render, ops, (w) => echo.check(w), { snap });
+      const r = applyOps(wc.render, ops, (w) => echo.check(w, key), {
+        snap,
+        confirmWording: confirm_wording === true
+      });
       let placement = [];
       if (r.applied > 0) {
         const ids = [
@@ -143531,14 +144091,16 @@ function createFenfillServer(opts = {}) {
         writer,
         ...inherited ? { inherited_wording: true } : {}
       };
-      const existed = await cache3.readEdits(key) !== null;
-      if (r.applied > 0) {
+      const changed = r.applied > 0 && JSON.stringify(r.render) !== JSON.stringify(wc.render);
+      if (changed) {
         await cache3.writeEdits(out);
-        if (saveTarget && !existed) {
+        if (saveTarget && !had) {
           await dropFileCopies(saveTarget, fileSha).catch(() => void 0);
         }
       }
-      const hasEdits = r.applied > 0 || existed;
+      echo.tell(r.screened.told);
+      echo.confirm(r.screened.confirmed);
+      const hasEdits = changed || had;
       const left = hasEdits ? schemaIssues(out.render, 10) : [];
       return {
         target: saveTarget ? { template_id: saveTarget } : { path },
@@ -143554,7 +144116,7 @@ function createFenfillServer(opts = {}) {
           )
         ],
         has_edits: hasEdits,
-        ops_applied_total: out.ops_applied,
+        ops_applied_total: changed ? out.ops_applied : wc.ops_applied,
         saveable: !!saveTarget,
         next: saveTarget ? "Check with preview_page (or fill_form with check_pdf), then save_template to keep the edits in the saved template." : "These edits stay on this machine (fill_form and preview_page use them). This is an unsaved analysis, so save_template can't keep them: to keep corrections, analyze_form with save_as_template: true and edit that template."
       };
@@ -143564,11 +144126,11 @@ function createFenfillServer(opts = {}) {
     "save_template",
     {
       title: "Save local edits to a template",
-      description: "Save edit_template's local working copy of a saved template to fenfill (only the layout and the form's wording are sent; never fill values). Fails safely if the template changed in fenfill since the edits began (template_conflict: the local edits are kept; discard and re-apply them), and refuses wording that repeats an answer given to fill_form / fill_template / preview_page in this session (answers never go into a template). Wording edited in an earlier session can't be checked that way: save_template then answers confirm_wording_needed with the changed ids and properties; review that wording (preview_page shows labels) and call again with confirm_wording: true. An unsaved analysis can't be saved: analyze it again with save_as_template: true (free on a native-field PDF; otherwise it costs scans again), then edit that template.",
+      description: "Save edit_template's local working copy of a saved template to fenfill (only the layout and the form's wording are sent; never fill values). Fails safely if the template changed in fenfill since the edits began (template_conflict: the local edits are kept; discard and re-apply them), and refuses wording that repeats an answer given to fill_form / fill_template / preview_page in this session (answers never go into a template): answer_in_template lists the matched ids and properties. An answer: fix it with edit_template. The form's own wording (a caption that shares a word with a test value): call again with confirm_wording: true. Wording edited in an earlier session can't be checked that way: save_template then answers confirm_wording_needed with the changed ids and properties; review that wording (preview_page shows labels) and call again with confirm_wording: true. An unsaved analysis can't be saved: analyze it again with save_as_template: true (free on a native-field PDF; otherwise it costs scans again), then edit that template.",
       inputSchema: {
         template_id: TEMPLATE_ID,
         confirm_wording: external_exports.boolean().optional().describe(
-          "Only after a confirm_wording_needed error: true confirms you reviewed the listed wording (edited in an earlier session) and it is the form's own text, not an answer."
+          "Only after an answer_in_template or confirm_wording_needed error: true confirms you compared the listed wording with the printed form and it is the form's own text, not an answer. An entry no error has listed yet is refused and listed first, on a copy from an earlier session too."
         )
       },
       annotations: {
@@ -143589,19 +144151,29 @@ function createFenfillServer(opts = {}) {
         };
       }
       const changed = changedWording(wc.base, wc.render);
-      const echoed = echo.check(changed);
-      if (echoed.refuse.length) {
+      const echoed = echo.check(changed, wc.key);
+      const foreign = wc.writer?.owner !== owner || wc.inherited_wording === true;
+      const listing = sha256Hex(JSON.stringify(changed));
+      const unvouched = foreign && changed.length > 0;
+      const confirmable = confirm_wording === true && echoed.refused.every((x2) => x2.listed);
+      if (echoed.refused.length && !confirmable) {
+        echo.tell(echoed.refused);
+        if (unvouched) listedForeign.set(wc.key, listing);
         throw new ToolError(
           "answer_in_template",
-          "Some edited wording matches an answer you filled in this session, so it was not sent.",
+          "Some edited wording matches an answer you filled or previewed in this session, so it was not sent.",
           {
-            hint: "Labels, descriptions, placeholders and options hold the form's own wording, never an answer. Fix those items with edit_template (relabel / set_description / set_placeholder / set_options), then save again.",
-            details: { ids: echoed.refuse }
+            hint: "Compare each property listed in `matched` with the printed form (preview_page's legend shows the wording). An answer: put the form's own wording back with edit_template (relabel / set_description / set_placeholder / set_options / set_section_title). The form's own text: call save_template again with confirm_wording: true.",
+            details: {
+              ids: echoed.refuse,
+              matched: wordingChanges(echoed.refused),
+              ...unvouched ? { changed: wordingChanges(changed) } : {}
+            }
           }
         );
       }
-      const foreign = wc.writer?.owner !== owner || wc.inherited_wording === true;
-      if (foreign && changed.length && confirm_wording !== true) {
+      if (unvouched && !(confirm_wording === true && listedForeign.get(wc.key) === listing)) {
+        listedForeign.set(wc.key, listing);
         throw new ToolError(
           "confirm_wording_needed",
           "This working copy has wording edited in an earlier session, which this session's answer check can't cover, so it was not sent.",
@@ -143631,7 +144203,13 @@ function createFenfillServer(opts = {}) {
           }
         );
       }
-      const schema = { ...wc.render, pages: wc.base.pages };
+      const schema = {
+        ...wc.render,
+        pages: wc.base.pages.map((p4, i2) => {
+          const edited = wc.render.pages[i2];
+          return edited?.page === p4.page && edited.sections !== void 0 ? { ...p4, sections: edited.sections } : p4;
+        })
+      };
       let saved;
       try {
         saved = await api().patchJson(
@@ -143673,6 +144251,7 @@ function createFenfillServer(opts = {}) {
         throw e4;
       }
       await cache3.deleteEdits(wc.key);
+      listedForeign.delete(wc.key);
       await dropFileCopies(template_id, wc.sha256).catch(() => void 0);
       await refreshSavedAnalyses(cache3, template_id, schema, saved, await identity2(false));
       return {
@@ -143690,11 +144269,18 @@ function createFenfillServer(opts = {}) {
             return {};
           }
         })(),
-        ...echoed.warn.length ? {
-          warnings: [
-            `${echoed.warn.join(", ")}: short wording that matches a short answer from this session (allowed under 4 characters); check it is the form's own text`
-          ]
-        } : {},
+        ...(() => {
+          const vouched = [...echoed.confirmed, ...echoed.refused];
+          const warnings = [
+            ...vouched.length ? [
+              `${describeWording(vouched)}: matches an answer filled in this session; saved because you confirmed it is the form's own wording`
+            ] : [],
+            ...echoed.warn.length ? [
+              `${echoed.warn.join(", ")}: short wording that matches a short answer from this session (allowed under 4 characters); check it is the form's own text`
+            ] : []
+          ];
+          return warnings.length ? { warnings } : {};
+        })(),
         next: "fill_template, get_template and recipient links now use the saved layout."
       };
     })