@fenfill/mcp 0.2.0 → 0.2.1

package/README.md

@@ -138,7 +138,8 @@ workspace, free native-field (AcroForm) ones included.
 a text/date field's stored `format` and `font_pt` (the size its value starts at; `font_auto`
 when that follows the box height); a choice's options with their own boxes; a table's cells by
 `(row, col)`, its `orientation` and headers (also printed on the image inside, or beside, the
-first cell of each line as `R: …` / `C: …`); a `table_rows` table's columns and printed cells
+first cell of each line as `R: …` / `C: …`; a character the bundled fonts lack is shown as `?`
+there, with a warning, and the legend keeps the full text); a `table_rows` table's columns and printed cells
 with their boxes (fill values still go by column id). `warnings` and `placement_warnings` are
 always present (`[]` = checked and clean): placement covers every box shown, so a plain preview
 is a read-only placement audit (see the checks under `edit_template`). `crop`
@@ -314,6 +315,7 @@ fenfill web app for that workspace (for example, your logo if you have set one u
 | `too_many_active_jobs`                | Other analyses in the workspace (free native-field ones too) are still running; try again in a minute, or analyze fewer at once.                               |
 | `template_conflict`                   | The template changed in fenfill since your edits began. Your local edits are kept: `edit_template` with `discard: true`, re-apply the ops, save again.         |
 | `invalid_schema`                      | fenfill (or the local check before it) refused the edited layout; `details` lists each item and reason. Fix them with `edit_template`.                         |
+| `check_copy_failed`                   | `preview_page` could not build its outlined copy; `stage` and `id` say where. Fix or remove that field or group with `edit_template`, then preview again.      |
 | `request_too_large`                   | The edited template is too large to save in one request.                                                                                                       |
 | `answer_in_template`                  | Edited wording matches an answer from this session, so nothing was sent. Put the form's own wording back with `edit_template`.                                 |
 | `confirm_wording_needed`              | The working copy has wording edited in an earlier session. Review the ids and properties in `changed`, then `save_template` with `confirm_wording: true`.      |

package/THIRD_PARTY_NOTICES

@@ -1,4 +1,4 @@
-@fenfill/mcp 0.2.0 bundles the following third-party software.
+@fenfill/mcp 0.2.1 bundles the following third-party software.
 
 @cantoo/pdf-lib@2.11.1 (MIT)
 ------------------------------------------------------------------------

package/dist/index.js

@@ -135572,6 +135572,37 @@ function layoutMultiline({
 }
 
 // ../../app/t/[template_id]/stampPdf.ts
+async function embedStampFaces(pdfDoc, fontkit, fonts) {
+  const interFont = await pdfDoc.embedFont(fonts.inter, { subset: true });
+  const dejaFont = await pdfDoc.embedFont(fonts.deja, { subset: true });
+  const interKit = fontkit.create(new Uint8Array(fonts.inter));
+  const covers = (cp) => {
+    try {
+      return interKit.hasGlyphForCodePoint(cp);
+    } catch {
+      return false;
+    }
+  };
+  const splitRuns = (t) => splitByCoverage(t, (cp) => covers(cp) ? interFont : dejaFont).map((r) => ({
+    font: r.key,
+    text: r.text
+  }));
+  const measure = (t, s) => splitRuns(t).reduce((sum2, r) => sum2 + r.font.widthOfTextAtSize(r.text, s), 0);
+  const draw = (page, t, x2, y, s, color) => {
+    let cx2 = x2;
+    for (const r of splitRuns(t)) {
+      page.drawText(r.text, { x: cx2, y, size: s, font: r.font, color });
+      cx2 += r.font.widthOfTextAtSize(r.text, s);
+    }
+  };
+  let dejaSet;
+  const hasGlyph = (cp) => {
+    if (covers(cp)) return true;
+    dejaSet ??= new Set(dejaFont.getCharacterSet());
+    return dejaSet.has(cp);
+  };
+  return { measure, draw, hasGlyph };
+}
 async function stampPdf({
   pdfBytes,
   marksByPage,
@@ -135605,29 +135636,12 @@ async function stampPdf({
       return r.arrayBuffer();
     })
   ]);
-  const interFont = await pdfDoc.embedFont(interBytes, { subset: true });
-  const dejaFont = await pdfDoc.embedFont(dejaBytes, { subset: true });
+  const faces = await embedStampFaces(pdfDoc, fontkit, { inter: interBytes, deja: dejaBytes });
   const pdfPages = pdfDoc.getPages();
   const INK = rgb3(0.1, 0.1, 0.1);
-  const interKit = fontkit.create(new Uint8Array(interBytes));
-  const covers = (cp) => {
-    try {
-      return interKit.hasGlyphForCodePoint(cp);
-    } catch {
-      return false;
-    }
-  };
-  const splitRuns = (t) => splitByCoverage(t, (cp) => covers(cp) ? interFont : dejaFont).map((r) => ({
-    font: r.key,
-    text: r.text
-  }));
-  const measure = (t, s) => splitRuns(t).reduce((sum2, r) => sum2 + r.font.widthOfTextAtSize(r.text, s), 0);
+  const { measure } = faces;
   const drawMixed = (page, t, x2, y, s) => {
-    let cx2 = x2;
-    for (const r of splitRuns(t)) {
-      page.drawText(r.text, { x: cx2, y, size: s, font: r.font, color: INK });
-      cx2 += r.font.widthOfTextAtSize(r.text, s);
-    }
+    faces.draw(page, t, x2, y, s, INK);
   };
   const drawMarkPdf = (page, shape, r, sizePt, overflow) => {
     const fit = Math.min(r.w, r.h);
@@ -136602,9 +136616,34 @@ function checkTagIds(entries) {
   return ids;
 }
 var hits = (a, b) => a.x < b.x + b.w && b.x < a.x + a.w && a.y < b.y + b.h && b.y < a.y + a.h;
-async function buildCheckPdf(stamped, entries, status, banner = true) {
+var causeOf = (e4) => e4 instanceof Error && e4.message ? e4.message : String(e4);
+var oneLine = (s) => s.replace(/[\s\p{Cc}]+/gu, " ").trim();
+var asciiOnly = (s) => s.replace(/[^\x20-\x7e]/g, "?");
+var CheckCopyError = class extends Error {
+  at;
+  constructor(at, cause) {
+    super(causeOf(cause));
+    this.name = "CheckCopyError";
+    this.at = { ...at };
+  }
+};
+async function buildCheckPdf(stamped, entries, status, fonts, banner = true) {
+  const at = { stage: "load" };
+  try {
+    return await drawCheckPdf(stamped, entries, status, fonts, banner, at);
+  } catch (e4) {
+    throw new CheckCopyError(at, e4);
+  }
+}
+async function drawCheckPdf(stamped, entries, status, fonts, banner, at) {
+  const step = (stage, id) => {
+    at.stage = stage;
+    at.id = id;
+  };
+  const notes = [];
   const { PDFDocument: PDFDocument2, StandardFonts: StandardFonts2, rgb: rgb3 } = await Promise.resolve().then(() => __toESM(require_cjs()));
   const doc = await PDFDocument2.load(stamped, { updateMetadata: false });
+  step("fonts");
   const helv = await doc.embedFont(StandardFonts2.Helvetica);
   const pages = doc.getPages();
   const COLORS = {
@@ -136615,6 +136654,7 @@ async function buildCheckPdf(stamped, entries, status, banner = true) {
   };
   const boxes = [];
   for (const e4 of entries) {
+    step("outline", e4.id);
     const st = status(e4.id);
     if (e4.kind === "field") {
       boxes.push({ id: e4.id, page: e4.field.page, box: e4.field, st, thin: false, tagged: true });
@@ -136631,6 +136671,7 @@ async function buildCheckPdf(stamped, entries, status, banner = true) {
         boxes.push({ id: c2.id, page: c2.field.page, box: c2.field, st, thin: true, tagged: false });
     }
   }
+  step("tag");
   const short = shortIds(checkTagIds(entries));
   const SIZE = 5;
   const rectOf = (b, pw, ph) => {
@@ -136640,47 +136681,92 @@ async function buildCheckPdf(stamped, entries, status, banner = true) {
   };
   const placedTags = /* @__PURE__ */ new Map();
   const HEAD = 4;
-  const heads = [];
   const headColor = rgb3(0.15, 0.35, 0.75);
+  const wanted = [];
   for (const e4 of entries) {
     if (e4.kind !== "table") continue;
+    step("table headers", e4.id);
     const g = e4.group;
     const texts = (v) => Array.isArray(v) ? v : [];
+    const lineOf = (raw) => typeof raw === "string" ? oneLine(raw) : "";
     const firstOf = (key, k4) => e4.cells.filter((c2) => c2[key] === k4).sort((a, b) => key === "row" ? a.col - b.col : a.row - b.row).at(0);
-    const draw = (prefix, raw, cell, below) => {
-      if (typeof raw !== "string" || !raw.trim() || !cell) return;
+    const want = (axis, index2, raw, cell, below) => {
+      const text = lineOf(raw);
+      if (!text || !cell) return;
       const page = pages[cell.field.page - 1];
-      if (!page) return;
-      const { width: pw, height: ph } = page.getSize();
-      const cx2 = cell.field.xpct / 100 * pw;
-      const top = ph - cell.field.ypct / 100 * ph;
-      const w = cell.field.wpct / 100 * pw;
-      const h = cell.field.hpct / 100 * ph;
-      const inside = w >= 40 && h >= HEAD + 1;
-      const room = inside ? w - 1 : prefix === "R" ? Math.min(120, cx2 - 1) : Math.max(2 * w, 30);
-      let text = `${prefix}: ${raw.trim()}`;
-      while (text.length > 4 && helv.widthOfTextAtSize(text, HEAD) > room) {
-        text = `${text.slice(0, -2)}\u2026`;
-      }
-      const tw = helv.widthOfTextAtSize(text, HEAD);
-      const x2 = inside ? cx2 + 0.6 : prefix === "R" ? cx2 - tw - 0.8 : cx2;
-      const y = inside ? top - HEAD - 0.4 - below : prefix === "R" ? top - h / 2 - HEAD / 2 : top + 0.6;
-      heads.push({ page, text, opts: { x: x2, y, size: HEAD, font: helv, color: headColor } });
-      const taken = placedTags.get(cell.field.page) ?? [];
-      taken.push({ x: x2, y, w: tw, h: HEAD + 0.6 });
-      placedTags.set(cell.field.page, taken);
+      if (page) wanted.push({ gid: e4.id, axis, index: index2, text, cell, page, below });
     };
     texts(g.header_rows).forEach((t, r) => {
-      draw("R", t, firstOf("row", r), 0);
+      want("row", r, t, firstOf("row", r), 0);
     });
     texts(g.header_cols).forEach((t, c2) => {
       const cell = firstOf("col", c2);
       const shared = cell !== void 0 && cell.col === firstOf("row", cell.row)?.col;
-      const rowHead = cell ? texts(g.header_rows)[cell.row] : void 0;
-      draw("C", t, cell, shared && typeof rowHead === "string" && rowHead.trim() ? HEAD + 0.6 : 0);
+      const rowHead = cell ? lineOf(texts(g.header_rows)[cell.row]) : "";
+      want("column", c2, t, cell, shared && rowHead ? HEAD + 0.6 : 0);
     });
   }
+  const heads = [];
+  const dropped = (h, e4) => `${h.gid}: ${h.axis} header ${String(h.index)} could not be drawn in the check copy: ${causeOf(e4)}`;
+  if (wanted.length > 0) {
+    step("fonts");
+    const { default: fontkit } = await Promise.resolve().then(() => __toESM(require_fontkit_umd()));
+    doc.registerFontkit(fontkit);
+    const faces = await embedStampFaces(doc, fontkit, fonts);
+    const unreadable = /* @__PURE__ */ new Set();
+    for (const h of wanted) {
+      step("table headers", h.gid);
+      try {
+        const { cell, page } = h;
+        const prefix = h.axis === "row" ? "R" : "C";
+        const { width: pw, height: ph } = page.getSize();
+        const cx2 = cell.field.xpct / 100 * pw;
+        const top = ph - cell.field.ypct / 100 * ph;
+        const w = cell.field.wpct / 100 * pw;
+        const ht = cell.field.hpct / 100 * ph;
+        const inside = w >= 40 && ht >= HEAD + 1;
+        const room = inside ? w - 1 : prefix === "R" ? Math.min(120, cx2 - 1) : Math.max(2 * w, 30);
+        const chars3 = Array.from(
+          `${prefix}: ${h.text}`,
+          (ch) => faces.hasGlyph(ch.codePointAt(0) ?? 0) ? ch : "?"
+        );
+        if (chars3.join("") !== `${prefix}: ${h.text}` && !unreadable.has(h.gid)) {
+          unreadable.add(h.gid);
+          notes.push(
+            `${h.gid}: the check copy cannot draw some header characters (shown as "?"); the legend's header_rows / header_cols hold the full text`
+          );
+        }
+        const cut = (n) => `${chars3.slice(0, n).join("")}\u2026`;
+        let text = chars3.join("");
+        if (chars3.length > 4 && faces.measure(text, HEAD) > room) {
+          let lo = 3;
+          let hi = chars3.length - 2;
+          while (lo < hi) {
+            const mid = Math.ceil((lo + hi) / 2);
+            if (faces.measure(cut(mid), HEAD) <= room) lo = mid;
+            else hi = mid - 1;
+          }
+          text = cut(lo);
+        }
+        const tw = faces.measure(text, HEAD);
+        const x2 = inside ? cx2 + 0.6 : prefix === "R" ? cx2 - tw - 0.8 : cx2;
+        const y = inside ? top - HEAD - 0.4 - h.below : prefix === "R" ? top - ht / 2 - HEAD / 2 : top + 0.6;
+        heads.push({
+          head: h,
+          draw: () => {
+            faces.draw(page, text, x2, y, HEAD, headColor);
+          }
+        });
+        const taken = placedTags.get(cell.field.page) ?? [];
+        taken.push({ x: x2, y, w: tw, h: HEAD + 0.6 });
+        placedTags.set(cell.field.page, taken);
+      } catch (e4) {
+        notes.push(dropped(h, e4));
+      }
+    }
+  }
   for (const b of boxes) {
+    step("outline", b.id);
     const page = pages[b.page - 1];
     if (!page) continue;
     const { width: pw, height: ph } = page.getSize();
@@ -136698,7 +136784,8 @@ async function buildCheckPdf(stamped, entries, status, banner = true) {
       borderOpacity: 0.9
     });
     if (!b.tagged) continue;
-    const tag = short.get(b.id) ?? b.id;
+    step("tag", b.id);
+    const tag = asciiOnly(short.get(b.id) ?? b.id);
     const tw = helv.widthOfTextAtSize(tag, SIZE) + 1.6;
     const th = SIZE + 1.2;
     const right = x2 + w - tw;
@@ -136730,14 +136817,23 @@ async function buildCheckPdf(stamped, entries, status, banner = true) {
     });
     page.drawText(tag, { x: spot.x + 0.8, y: spot.y + 0.8, size: SIZE, font: helv, color });
   }
-  for (const h of heads) h.page.drawText(h.text, h.opts);
+  for (const h of heads) {
+    step("table headers", h.head.gid);
+    try {
+      h.draw();
+    } catch (e4) {
+      notes.push(dropped(h.head, e4));
+    }
+  }
+  step("banner");
   const first = pages[0];
   if (first && banner) {
     const legend = "fenfill check copy: green = filled, orange = filled with a warning, red = skipped, grey = left empty. Tags are field-id prefixes.";
     const { height: ph } = first.getSize();
     first.drawText(legend, { x: 6, y: ph - 7, size: SIZE, font: helv, color: rgb3(0.3, 0.3, 0.35) });
   }
-  return doc.save();
+  step("save");
+  return { pdf: await doc.save(), notes };
 }
 async function fillAgentPdf(a) {
   if (!isRecord(a.render)) throw new TypeError("render must be the template's schema object");
@@ -136772,12 +136868,20 @@ async function fillAgentPdf(a) {
     const warned = new Set(
       placed.flatMap((w) => w.slice(0, w.indexOf(":")).split(" and ").map(topId))
     );
-    res.checkPdf = await buildCheckPdf(
-      pdf,
-      m.entries,
-      (id) => skippedIds.has(id) ? "skipped" : warned.has(id) ? "warned" : m.filledIds.has(id) ? "filled" : "empty",
-      a.checkBanner !== false
-    );
+    try {
+      const built = await buildCheckPdf(
+        pdf,
+        m.entries,
+        (id) => skippedIds.has(id) ? "skipped" : warned.has(id) ? "warned" : m.filledIds.has(id) ? "filled" : "empty",
+        a.fonts,
+        a.checkBanner !== false
+      );
+      res.checkPdf = built.pdf;
+      warnings.push(...built.notes);
+    } catch (e4) {
+      const at = e4 instanceof CheckCopyError ? e4.at : { stage: "build" };
+      res.checkError = { stage: at.stage, ...at.id ? { id: at.id } : {}, message: causeOf(e4) };
+    }
   }
   return res;
 }
@@ -137680,7 +137784,7 @@ function loadFonts(dir = defaultFontsDir()) {
 }
 
 // src/version.ts
-var VERSION = true ? "0.2.0" : "0.0.0-dev";
+var VERSION = true ? "0.2.1" : "0.0.0-dev";
 var USER_AGENT = `fenfill-mcp/${VERSION}`;
 
 // src/fill.ts
@@ -137864,6 +137968,11 @@ function fillForbiddenError() {
     hint: "fenfill can't fill this file; use a copy whose permissions allow form filling."
   });
 }
+function checkCopyFailed(err2) {
+  const what = "The check copy could not be built";
+  if (!err2) return `${what}.`;
+  return `${what} (${[err2.stage, err2.id].filter(Boolean).join(", ")}): ${err2.message}`;
+}
 async function checkPathFor(outputAbs, opts) {
   return resolveOutputPath(outputAbs.replace(/\.pdf$/i, ".check.pdf"), opts);
 }
@@ -137889,17 +137998,22 @@ async function stampAndWrite(a) {
   await writeOutputAtomic(a.outputAbs, res.pdf, a.overwrite);
   await a.cache.registerOutput(sha256Hex(res.pdf));
   let checkPath;
+  const warnings = [...res.warnings];
   if (a.checkAbs && res.checkPdf) {
     await writeOutputAtomic(a.checkAbs, res.checkPdf, a.overwrite);
     await a.cache.registerOutput(sha256Hex(res.checkPdf));
     checkPath = a.checkAbs;
+  } else if (a.checkAbs) {
+    warnings.push(
+      `No check copy was written; the filled PDF is complete. ${checkCopyFailed(res.checkError)}`
+    );
   }
   return {
     output_path: a.outputAbs,
     ...checkPath ? { check_path: checkPath } : {},
     filled: res.filled,
     skipped: res.skipped,
-    warnings: res.warnings
+    warnings
   };
 }
 
@@ -142114,7 +142228,13 @@ async function previewPage(a) {
     if (isFillForbiddenError(e4)) throw fillForbiddenError();
     throw e4;
   }
-  if (!res.checkPdf) throw new ToolError("internal_error", "The check copy could not be built.");
+  if (!res.checkPdf) {
+    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.",
+      details: { stage: err2?.stage, id: err2?.id }
+    });
+  }
   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)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fenfill/mcp",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "fenfill MCP server: analyze blank PDF forms with fenfill and fill them locally, so your answers never leave your machine.",
   "license": "MIT",
   "author": "fenfill",