opentakeoff-mcp 0.9.90 → 0.9.93

package/dist/server-core.js

@@ -3434,6 +3434,38 @@ function isLabelBubblePx(ring, b) {
   return rh <= BUBBLE_RATIO * lh && rw <= BUBBLE_WIDE_RATIO * lw;
 }
 
+// ../web/src/lib/finishSections.ts
+var FINISH_SECTION_HEADINGS = [
+  "FLOORING",
+  "FLOORS",
+  "FLOOR",
+  "FLOOR FINISHES",
+  "BASE",
+  "BASES",
+  "WALL BASE",
+  "WALLS",
+  "WALL",
+  "WALL FINISHES",
+  "WALL PROTECTION",
+  "TRANSITIONS",
+  "TRANSITION",
+  "TRIM",
+  "CEILINGS",
+  "CEILING",
+  "MILLWORK",
+  "MISC",
+  "ACCESSORIES"
+];
+var PHRASES = FINISH_SECTION_HEADINGS.filter((h) => h.includes(" ")).map((h) => ({ h, words: h.split(" ") })).sort((a, b) => b.words.length - a.words.length || b.h.length - a.h.length);
+var WORDS = new Set(FINISH_SECTION_HEADINGS.filter((h) => !h.includes(" ")));
+function finishSectionOf(text) {
+  const words = (text || "").trim().toUpperCase().split(/\s+/);
+  if (!words[0] || /[-\d]/.test(words[0])) return null;
+  const clean = words.map((w) => w.replace(/[^A-Z]/g, ""));
+  for (const p of PHRASES) if (p.words.every((w, i) => clean[i] === w)) return p.h;
+  return WORDS.has(clean[0]) ? clean[0] : null;
+}
+
 // ../web/src/lib/sheetgraph.ts
 var bboxOf = (s) => [s.x, s.y, s.x + (s.w || 0), s.y + (s.h || 0)];
 var merge = (a, b) => [Math.min(a[0], b[0]), Math.min(a[1], b[1]), Math.max(a[2], b[2]), Math.max(a[3], b[3])];
@@ -3746,16 +3778,26 @@ var EQUIPMENT_ONLY = /* @__PURE__ */ new Set([
 var EQUIP_KEY_RE = /^[A-Z]{1,4}(?:-\d{1,3}|\d{1,2})[A-Z]?$/;
 var TYPE_KEY_RE = /^[A-Z]{1,2}\d{0,2}[A-Z]?$/;
 var headerLabel = (s, vocab) => headerLabels(s, vocab)[0] ?? null;
-var headerLabels = (s, vocab) => {
+var headerLabels = (s, vocab, wholeWords = false) => {
   const out = [];
-  for (const w of norm(s).split(/[^A-Z]+/)) if (w && vocab.includes(w) && !out.includes(w)) out.push(w);
+  const words = norm(s).split(/[^A-Z]+/);
+  for (const w of words) if (w && vocab.includes(w) && !out.includes(w)) out.push(w);
+  if (vocab === FINISH_HEADERS && !wholeWords) {
+    for (const w of words) {
+      if (!w) continue;
+      for (const l of vocab) if (w.startsWith(l.slice(0, 5)) && !out.includes(l)) {
+        out.push(l);
+        break;
+      }
+    }
+  }
   return out;
 };
-function headerHits(row, vocab) {
+function headerHits(row, vocab, wholeWords = false) {
   const out = [];
   const used = /* @__PURE__ */ new Set();
   for (const t of row) {
-    const words = headerLabels(t.str, vocab);
+    const words = headerLabels(t.str, vocab, wholeWords);
     if (!words.length) continue;
     const all = norm(t.str).split(/[^A-Z]+/).filter(Boolean);
     if (all.length >= 2 && all.every((w2) => SURFACE_WORDS.has(w2))) {
@@ -3778,15 +3820,15 @@ var qualifies = (hits, required, minHits) => {
 };
 function findHeaderRow(rows, vocab, required, minHits) {
   for (let i = 0; i < rows.length; i++) {
+    if (!qualifies(headerHits(rows[i], vocab, true), required, minHits)) continue;
     let hits = headerHits(rows[i], vocab);
-    if (!qualifies(hits, required, minHits)) continue;
     let idx = i;
     for (; ; ) {
       let next = -1;
       for (let j = idx + 1; j < Math.min(idx + 4, rows.length); j++) {
         const h = headerHits(rows[j], vocab);
         const ratio = h.length / Math.max(1, rows[j].length);
-        if (qualifies(h, [], minHits) && h.length > hits.length && ratio >= 0.6) {
+        if (qualifies(headerHits(rows[j], vocab, true), [], minHits) && h.length > hits.length && ratio >= 0.6) {
           next = j;
           break;
         }
@@ -3839,7 +3881,7 @@ function findHeaderRow(rows, vocab, required, minHits) {
         }
       }
     }
-    return { anchors: subTierAnchors(rows, idx, anchors.sort((a, b) => a.x - b.x), vocab), rowIndex: idx };
+    return { anchors: subTierAnchors(rows, idx, anchors.sort((a, b) => a.x - b.x), vocab), rowIndex: idx, top: i };
   }
   return null;
 }
@@ -3899,7 +3941,7 @@ function subTierAnchors(rows, hdrIdx, anchors, vocab) {
   return out.sort((a, b) => a.x - b.x);
 }
 function findRotatedHeader(vert, vocab, required, minHits) {
-  const cands = vert.map((sp) => ({ sp, label: headerLabel(sp.str, vocab) })).filter((c) => !!c.label).sort((a, b) => a.sp.x - b.sp.x);
+  const cands = vert.map((sp) => ({ sp, label: headerLabels(sp.str, vocab, true)[0] ?? null })).filter((c) => !!c.label).sort((a, b) => a.sp.x - b.sp.x);
   let band = [];
   let y0 = 0, y1 = 0;
   const flush = () => {
@@ -3954,6 +3996,7 @@ function bandLimits(anchors) {
   return { x0: anchors[0].x - Math.max(80, medGap / 2), x1: last.x + rightMargin, medGap };
 }
 var CODE_RE = /^[A-Z]{1,4}(-?[A-Z0-9]{1,4})?$/;
+var finishCodeOk = (p) => !/^[A-Z]{4,}$/.test(p) && CODE_RE.test(p);
 var ROW_KEY_RE = /^\d{1,3}[A-Z]{0,2}$/;
 var QUALIFIED_KEY_RE = /^([A-Z]{1,2})-(\d{1,3}[A-Z]{0,2})$/;
 var CORRIDOR_KEY_RE = /^[A-Z]{1,3}(?:\d{1,3}-\d{1,3}|\d{3})[A-Z]?$/;
@@ -3973,8 +4016,8 @@ function rowKeyOf(raw, kind, buildings, typeKeyed = false) {
   }
   if (kind === "finish") {
     const parts = kept.split("/").filter(Boolean);
-    if (parts.length > 1 && parts.every((p) => CODE_RE.test(p))) return { key: parts.join("/") };
-    return CODE_RE.test(key) ? { key } : null;
+    if (parts.length > 1 && parts.every(finishCodeOk)) return { key: parts.join("/") };
+    return finishCodeOk(key) ? { key } : null;
   }
   if (ROW_KEY_RE.test(key)) return { key };
   if (CORRIDOR_KEY_RE.test(key)) return { key };
@@ -3990,15 +4033,33 @@ var rowKeyAnswersFor = (key, want) => {
 var numOf = (key) => key.match(QUALIFIED_KEY_RE)?.[2] ?? key;
 var centerX = (t) => t.x + (t.w || 0) / 2;
 var PLACEHOLDER_RE = /^[-–—]{1,3}$/;
-function columnMapFor(rows, anchors, cfg, x0, x1, coord) {
+function columnMapFor(rows, anchors, cfg, x0, x1, coord, kind) {
   const at = (t) => coord === "left" ? t.x : t.x + (t.w || 0) / 2;
   const xs = [];
   const hs = [];
   const dashes = [];
+  let keyCellX = -Infinity;
+  if (kind === "finish") {
+    const kx = [];
+    for (let i = Math.max(cfg.fromIdx, 0); i < rows.length; i++) {
+      if (rowY(rows[i]) <= cfg.belowY) continue;
+      const first = rows[i].filter((t) => t.x >= x0 && t.x <= x1).reduce((m, t) => !m || t.x < m.x ? t : m, null);
+      if (first && rowKeyOf(first.str, kind)) kx.push(first.x);
+    }
+    kx.sort((p, q) => p - q);
+    if (kx.length) keyCellX = kx[kx.length >> 1];
+  }
   for (let i = Math.max(cfg.fromIdx, 0); i < rows.length; i++) {
     if (rowY(rows[i]) <= cfg.belowY) continue;
+    let lead = null;
+    if (kind === "finish") {
+      const inb = rows[i].filter((t) => t.x >= x0 && t.x <= x1);
+      if (inb.length === 1 && finishSectionOf(inb[0].str) && ((inb[0].w || 0) > 0 || inb[0].x < keyCellX + 4)) continue;
+      const first = inb.reduce((m, t) => !m || t.x < m.x ? t : m, null);
+      if (first && (first.w || 0) > 0 && finishSectionOf(first.str)) lead = first;
+    }
     for (const t of rows[i]) {
-      if (t.x < x0 || t.x > x1 || revisionOf(t.str) != null) continue;
+      if (t === lead || t.x < x0 || t.x > x1 || revisionOf(t.str) != null) continue;
       if (PLACEHOLDER_RE.test(t.str.trim())) {
         dashes.push(at(t));
         continue;
@@ -4022,13 +4083,48 @@ function columnMapFor(rows, anchors, cfg, x0, x1, coord) {
   }
   const maxN = Math.max(...clusters.map((c) => c.n));
   const kept = clusters.filter((c) => c.n >= Math.max(2, maxN * 0.25));
-  if (kept.length < anchors.length) return null;
+  const widthless = rows.every((r) => r.every((t) => !((t.w || 0) > 0)));
+  const hMed = hs[hs.length >> 1];
+  const contWord = (c) => kind === "finish" && widthless && kept.some((k) => k.start < c.start && c.start - k.start < 5 * hMed);
+  const ownerOf = (c) => anchors.find((a) => a.x >= c.start);
+  const rescued = [];
+  const block = (cfg.hdrBand ?? cfg.hdrSpans ?? []).filter((t) => cfg.hdrSpans?.includes(t) || !/\b(LEGEND|ABBREVIATIONS?|SYMBOLS?|KEY|NOTES?)\b/.test(norm(t.str)));
+  const named = (cfg.hdrSpans ?? []).filter((t) => anchors.some((a) => t.x - 0.5 <= a.x && a.x <= t.x + (t.w || 0) + 0.5));
+  const unnamed = block.some((t) => t.x >= x0 && t.x <= x1 && !named.some((n) => t.x <= n.x + (n.w || 0) && n.x <= t.x + (t.w || 0)));
+  const spanOf = (a) => cfg.hdrSpans?.find((t) => t.x - 0.5 <= a.x && a.x <= t.x + (t.w || 0) + 0.5);
+  const fromHeader = kind === "finish" && coord === "left" && !!cfg.hdrSpans && !unnamed;
+  if (fromHeader && !widthless) {
+    const owned = /* @__PURE__ */ new Set();
+    for (const c of kept) {
+      const own = ownerOf(c);
+      if (own && !contWord(c)) owned.add(own.label);
+    }
+    for (const c of clusters) {
+      if (kept.includes(c)) continue;
+      const k = anchors.findIndex((a) => a.x >= c.start);
+      if (k <= 0 || owned.has(anchors[k].label)) continue;
+      owned.add(anchors[k].label);
+      rescued.push(c);
+    }
+  }
+  const cols0 = [...kept, ...rescued];
+  if (cols0.length < anchors.length && !fromHeader) return null;
   const byLabel = /* @__PURE__ */ new Map();
-  for (const c of kept) {
-    const own = anchors.find((a) => a.x >= c.start);
+  const byLabelCont = /* @__PURE__ */ new Map();
+  for (const c of cols0) {
+    const own = ownerOf(c);
     if (!own) continue;
-    const cur = byLabel.get(own.label);
-    if (cur == null || c.start < cur) byLabel.set(own.label, c.start);
+    const m = contWord(c) ? byLabelCont : byLabel;
+    const cur = m.get(own.label);
+    if (cur == null || c.start < cur) m.set(own.label, c.start);
+  }
+  const keyStart = byLabel.get(anchors[0].label);
+  const flushHeaders = keyStart != null && Math.abs(anchors[0].x - keyStart) <= tol;
+  for (const [l, st] of byLabelCont) {
+    if (byLabel.has(l)) continue;
+    const a = anchors.find((q) => q.label === l);
+    const contMax = Math.max(...cols0.filter((c) => contWord(c) && ownerOf(c) === a).map((c) => c.start));
+    byLabel.set(l, widthless && flushHeaders && a.x > contMax + tol ? a.x : st);
   }
   if (byLabel.size < anchors.length && dashes.length) {
     dashes.sort((a, b) => a - b);
@@ -4048,19 +4144,53 @@ function columnMapFor(rows, anchors, cfg, x0, x1, coord) {
       byLabel.set(own.label, real ? real.start : c.start);
     }
   }
+  let filled = false;
+  if (fromHeader && !widthless && byLabel.size < anchors.length) {
+    for (let k = 1; k < anchors.length; k++) {
+      const own = spanOf(anchors[k]);
+      if (byLabel.has(anchors[k].label) || !own) continue;
+      byLabel.set(anchors[k].label, own.x);
+      filled = true;
+    }
+  }
   if (byLabel.size !== anchors.length) return null;
   const cols = [...byLabel.entries()].map(([label, start]) => ({ label, start })).sort((a, b) => a.start - b.start);
   if (cols.map((c) => c.label).join("|") !== anchors.map((a) => a.label).join("|")) return null;
-  const starts = kept.map((c) => c.start);
+  if (rescued.length || filled) {
+    for (let k = 1; k < anchors.length; k++) {
+      const own = spanOf(anchors[k]), prev = spanOf(anchors[k - 1]);
+      if (!own || !prev) return null;
+      const st = cols[k].start;
+      const lo = prev === own ? anchors[k - 1].x : prev.x + (prev.w || 0);
+      if (st < lo - tol || st > Math.min(own.x, anchors[k].x) + tol) return null;
+    }
+  }
+  const starts = cols0.map((c) => c.start);
   let on = 0;
   for (const x of xs) if (starts.some((st) => Math.abs(x - st) <= tol)) on++;
-  return { coord, cols, score: on / xs.length };
+  let capX;
+  const lastHdr = cfg.hdrSpans ? cfg.hdrSpans.find((t) => t.x - 0.5 <= anchors[anchors.length - 1].x && anchors[anchors.length - 1].x <= t.x + (t.w || 0) + 0.5) : void 0;
+  if (kind === "finish" && lastHdr) {
+    const lastR = lastHdr.x + (lastHdr.w || 0);
+    const band = block;
+    const ps = cols.slice(1).map((c, k) => c.start - cols[k].start).sort((p, q) => p - q);
+    const clear = Math.max(tol, 0.5 * (ps.length ? ps[ps.length - 1 >> 1] : 0));
+    const foreign = kept.filter((c) => c.start > lastR + clear && !contWord(c)).map((c) => c.start).sort((a, b) => a - b);
+    const right = (t) => t.x + (t.w || 0);
+    const heads = band.filter((t) => t !== lastHdr && right(t) > lastR).map((t) => ({
+      lo: Math.max(lastR, ...band.filter((u) => u !== t && right(u) <= t.x).map(right)),
+      hi: right(t)
+    }));
+    const free = foreign.filter((st) => !heads.some((h) => st >= h.lo - tol && st <= h.hi + tol));
+    if (free.length) capX = free[0];
+  }
+  return { coord, cols, score: on / xs.length, tol, ...capX != null ? { capX } : {} };
 }
-function columnStarts(rows, anchors, cfg, x0, x1) {
+function columnStarts(rows, anchors, cfg, x0, x1, kind) {
   const FIT_FLOOR = 0.7;
   const fits = (m) => m && m.score >= FIT_FLOOR ? m : null;
-  const left = fits(columnMapFor(rows, anchors, cfg, x0, x1, "left"));
-  const center = fits(columnMapFor(rows, anchors, cfg, x0, x1, "center"));
+  const left = fits(columnMapFor(rows, anchors, cfg, x0, x1, "left", kind));
+  const center = fits(columnMapFor(rows, anchors, cfg, x0, x1, "center", kind));
   if (!left) return center;
   if (!center) return left;
   return center.score > left.score + 0.05 ? center : left;
@@ -4068,10 +4198,59 @@ function columnStarts(rows, anchors, cfg, x0, x1) {
 function bandDataRows(rows, anchors, kind, sheetKey, buildings, cfg) {
   const { x0, x1, medGap } = bandLimits(anchors);
   const typeKeyed = kind === "equipment" && (anchors[0]?.label === "TYPE" || anchors[0]?.label === "FIXTURE");
-  const cols = columnStarts(rows, anchors, cfg, x0, x1);
+  const cols = columnStarts(rows, anchors, cfg, x0, x1, kind);
+  const xCap = cols?.capX;
+  const inBand = (t) => t.x >= x0 && t.x <= x1 && (xCap == null || t.x < xCap);
+  const finish = kind === "finish";
+  let curSection;
+  const halfGap = anchors.length > 1 ? (anchors[1].x - anchors[0].x) / 2 : 40;
+  const keyLo = cols ? cols.cols[0].start : anchors[0].x - halfGap;
+  const keyHi = cols ? cols.cols.length > 1 ? cols.cols[1].start : Infinity : anchors[0].x + halfGap;
+  const colTol = cols?.tol ?? 4;
+  const atOf = (t) => cols && cols.coord === "center" ? centerX(t) : t.x;
+  const inKey = (t) => {
+    const a = atOf(t);
+    return a >= Math.min(x0, keyLo - colTol) && a < keyHi;
+  };
+  let tLeft = 0, tRight = 0, medPitch = 0;
+  let prevBandY = null;
+  if (finish) {
+    let ys = rows.slice(Math.max(cfg.fromIdx, 0)).filter((r) => r.some(inBand)).map(rowY);
+    const med = (v) => {
+      const d = v.slice(1).map((y, k) => y - v[k]).sort((p, q) => p - q);
+      return d.length ? d[d.length >> 1] : 0;
+    };
+    const p0 = med(ys);
+    const cut = p0 > 0 ? ys.findIndex((y, k) => k > 0 && y - ys[k - 1] > 8 * p0) : -1;
+    if (cut > 0) ys = ys.slice(0, cut);
+    const lastTableY = ys.length ? ys[ys.length - 1] : Infinity;
+    if (cols) {
+      const cs = cols.cols;
+      const pitch2 = cs.length > 1 ? cs.slice(1).map((c, k) => c.start - cs[k].start).sort((p, q) => p - q)[cs.length - 1 >> 1] : medGap;
+      tLeft = cs[0].start;
+      tRight = cs[cs.length - 1].start + pitch2;
+    } else {
+      tLeft = Infinity;
+      tRight = -Infinity;
+      for (let i = Math.max(cfg.fromIdx - 1, 0); i < rows.length && rowY(rows[i]) <= lastTableY; i++) for (const t of rows[i]) {
+        if (!inBand(t)) continue;
+        tLeft = Math.min(tLeft, t.x);
+        tRight = Math.max(tRight, t.x + (t.w || 0));
+      }
+    }
+    medPitch = med(ys);
+  }
+  const headings = [];
+  const headLines = [];
+  const consumeHeading = (banded, y) => {
+    let hb = null;
+    for (const t of banded) hb = hb ? merge(hb, bboxOf(t)) : bboxOf(t);
+    headings.push({ bbox: hb, y });
+  };
   const keyTol = cols && cols.cols.length > 1 ? Math.max(8, (cols.cols[1].start - cols.cols[0].start) * 0.5) : 40;
   const out = [];
   const outY = [];
+  const everRows = [];
   let region = null;
   const columnOf = (t) => {
     if (!cols) return nearestAnchor(centerX(t), anchors);
@@ -4117,9 +4296,36 @@ function bandDataRows(rows, anchors, kind, sheetKey, buildings, cfg) {
         if (centerX(t) >= x0 - 2.5 * medGap && centerX(t) <= x1 + medGap) markers.push({ rev, span: t, ...tri ? { drawn: true, tri } : {} });
         continue;
       }
-      if (t.x >= x0 && t.x <= x1) banded.push(t);
+      if (inBand(t)) banded.push(t);
     }
     if (!banded.length) continue;
+    const bandYBefore = prevBandY;
+    prevBandY = rowY(rows[i]);
+    if (finish) {
+      const h = finishSectionOf(banded[0].str);
+      const joinedLen = banded.map((t) => t.str.trim()).join(" ").length;
+      const inKeyColumn = inKey(banded[0]) && banded.every((t) => t.x + (t.w || 0) <= keyHi);
+      const one = banded.length === 1 ? banded[0] : null;
+      const straddles = !!one && !!cols && cols.cols.slice(1).some((c) => one.x < c.start - colTol && one.x + (one.w || 0) > c.start + colTol);
+      const hugs = bandYBefore != null && rowY(rows[i]) - bandYBefore < 0.6 * medPitch;
+      const tMid = (tLeft + tRight) / 2;
+      const centered = !!one && !hugs && (Math.abs(centerX(one) - tMid) <= Math.max(0.1 * (tRight - tLeft), 3 * (one.h || 8)) || straddles);
+      if (h && (inKeyColumn || centered) && joinedLen < 24) {
+        curSection = h;
+        consumeHeading(banded, rowY(rows[i]));
+        continue;
+      }
+      if (h && !hugs) headLines.push(rowY(rows[i]));
+      if (banded.length <= 2 && inKey(banded[0]) && /^\d{2} ?\d{2} ?\d{2}(\.\d+)?\b/.test(norm(banded[0].str)) && !rowKeyOf(banded[0].str, kind, buildings, typeKeyed)) {
+        curSection = void 0;
+        consumeHeading(banded, rowY(rows[i]));
+        continue;
+      }
+      if (one && inKey(one) && !rowKeyOf(one.str, kind, buildings, typeKeyed)) {
+        curSection = void 0;
+        if (!hugs && joinedLen < 24 && !/\d/.test(one.str)) continue;
+      }
+    }
     if (kind === "equipment" && out.length) {
       if (rows[i].some((t) => /SCHEDULE/.test(norm(t.str)) && !EQUIP_KEY_RE.test(norm(t.str).replace(/[^A-Z0-9-]/g, "")))) break;
       const hh = headerHits(rows[i], EQUIPMENT_HEADERS);
@@ -4138,11 +4344,13 @@ function bandDataRows(rows, anchors, kind, sheetKey, buildings, cfg) {
     if (cfg.keyAlign && Math.abs(centerX(banded[0]) - cfg.keyAlign.x) > cfg.keyAlign.tol) continue;
     const row = { key: keyed.key, sheet: sheetKey, cells: {} };
     if (keyed.building) row.building = keyed.building;
+    if (curSection) row.section = curSection;
     add(row, banded);
     out.push(row);
     outY.push(rowY(rows[i]));
+    everRows.push(row);
   }
-  if (out.length > 2) {
+  if (out.length > 2 && !(finish && cfg.marquee)) {
     const d = outY.slice(1).map((y, i) => y - outY[i]).filter((g) => g > 0).sort((a, b) => a - b);
     const pitch0 = d.length ? d[d.length >> 1] : 0;
     if (pitch0 > 0) {
@@ -4157,7 +4365,9 @@ function bandDataRows(rows, anchors, kind, sheetKey, buildings, cfg) {
       }
     }
   }
-  const gaps = outY.slice(1).map((y, i) => y - outY[i]).filter((d) => d > 0).sort((a, b) => a - b);
+  const headY = [...headings.map((h) => h.y), ...headLines];
+  const ly2 = outY.length > 1 ? [...outY, ...headY].filter((y) => y <= outY[outY.length - 1]).sort((a, b) => a - b) : [];
+  const gaps = ly2.slice(1).map((y, i) => y - ly2[i]).filter((d) => d > 0).sort((a, b) => a - b);
   const pitch = gaps.length ? gaps[gaps.length >> 1] : 0;
   const nearest = (y) => {
     let bi = -1, bd = Infinity;
@@ -4171,9 +4381,11 @@ function bandDataRows(rows, anchors, kind, sheetKey, buildings, cfg) {
     return { i: bi, d: bd };
   };
   const radius = (h) => pitch ? pitch * 0.6 : Math.max(h, 8) * 1.6;
+  const headYs = [...headY].sort((p, q) => p - q);
   for (const o of orphans) {
     const { i, d } = nearest(o.y);
     if (i < 0 || d > radius(Math.max(...o.toks.map((t) => t.h || 8)))) continue;
+    if (headYs.some((hy) => hy !== o.y && (Math.abs(o.y - hy) < d || Math.abs(o.y - hy) === d && hy < outY[i]))) continue;
     add(out[i], o.toks);
   }
   for (const m of markers) {
@@ -4182,17 +4394,45 @@ function bandDataRows(rows, anchors, kind, sheetKey, buildings, cfg) {
     const ebox = m.tri ? merge(bboxOf(m.span), m.tri) : bboxOf(m.span);
     out[i].revision = { rev: m.rev, source: { sheet: sheetKey, text: m.span.str.trim(), bbox: ebox }, ...m.drawn ? { drawn: true } : {} };
   }
+  if (kind === "finish") {
+    const keyCol = cols ? cols.cols[0].label : anchors[0].label;
+    const dropped = /* @__PURE__ */ new Set();
+    for (let i = out.length - 1; i >= 0; i--) {
+      const r = out[i];
+      if (!/^[A-Z]{1,3}$/.test(r.key)) continue;
+      const keyRest = norm(r.cells[keyCol]?.text ?? r.key).replace(/[^A-Z0-9 ]/g, "").trim().replace(new RegExp("^" + r.key + "\\b"), "").trim();
+      const texts = [...keyRest ? [keyRest] : [], ...Object.entries(r.cells).filter(([k]) => k !== keyCol).map(([, c]) => norm(c.text))];
+      if (texts.length && !texts.some((x) => /^\d{2} ?\d{2}[ .]?\d{2}\b/.test(x))) continue;
+      if (out.slice(i + 1, i + 4).some((n) => n.key.startsWith(r.key + "-") || new RegExp("^" + r.key + "\\d").test(n.key))) {
+        dropped.add(r);
+        out.splice(i, 1);
+        outY.splice(i, 1);
+      }
+    }
+    if (dropped.size) {
+      region = null;
+      for (const r of everRows) if (!dropped.has(r)) for (const c of Object.values(r.cells)) region = region ? merge(region, c.bbox) : c.bbox;
+    }
+  }
   for (const row of out) {
     if (row.building) continue;
     const cellB = norm(row.cells.BLDG?.text || row.cells.BUILDING?.text || "");
     if (DESIGNATOR_RE.test(cellB)) row.building = cellB;
   }
+  const lastY = outY.length ? outY[outY.length - 1] : -Infinity;
+  for (const hd of headings) if (hd.y <= lastY) region = region ? merge(region, hd.bbox) : hd.bbox;
   return { out, region };
 }
 function extractTable(sheet, kind, opts = {}) {
   const r = extractTableCore(sheet, kind, opts);
   return r && "table" in r ? r.table : null;
 }
+function readFinishTable(sheet, opts = {}) {
+  const r = extractTableCore(sheet, "finish", opts);
+  if (!r || !("table" in r)) return null;
+  if (r.table.title && isNonFinishSchedule(r.table.title.text)) return { refused: "other-family", table: r.table };
+  return { table: r.table, headerWords: r.headerWords };
+}
 function extractTables(sheet, kind, opts = {}) {
   const out = [];
   let spans = sheet.spans;
@@ -4222,6 +4462,7 @@ function extractTableCore(sheet, kind, opts = {}) {
   const minHits = kind === "room-finish" ? 4 : 3;
   let anchors;
   let headerSpans;
+  let hdrBlock;
   let dataFrom;
   let dataBelowY = -Infinity;
   let titleFrom;
@@ -4230,6 +4471,14 @@ function extractTableCore(sheet, kind, opts = {}) {
   if (flat) {
     anchors = flat.anchors;
     headerSpans = rows[flat.rowIndex];
+    const hy = rowY(rows[flat.rowIndex]);
+    const hhs = headerSpans.map((t) => t.h || 8).sort((a, b) => a - b);
+    const hh = hhs[hhs.length >> 1];
+    const band = /* @__PURE__ */ new Set();
+    for (let k = flat.top; k <= flat.rowIndex; k++) band.add(k);
+    for (let k = flat.rowIndex + 1; k < rows.length && rowY(rows[k]) - hy <= 1.5 * hh; k++) band.add(k);
+    for (let k = flat.top, n = 0; n < 2 && k > 0 && rowY(rows[k]) - rowY(rows[k - 1]) <= 3 * hh; n++) band.add(--k);
+    hdrBlock = [...band].flatMap((k) => rows[k]);
     dataFrom = flat.rowIndex + 1;
     titleFrom = flat.rowIndex - 1;
   } else {
@@ -4254,7 +4503,7 @@ function extractTableCore(sheet, kind, opts = {}) {
     if (centerX(t) < hdrBand.x0 || centerX(t) > hdrBand.x1) continue;
     region = region ? merge(region, bboxOf(t)) : bboxOf(t);
   }
-  const banded = bandDataRows(rows, anchors, kind, sheet.key, opts.buildings, { fromIdx: dataFrom, belowY: dataBelowY, deltas: opts.deltas, sheetNumbers: opts.sheetNumbers });
+  const banded = bandDataRows(rows, anchors, kind, sheet.key, opts.buildings, { fromIdx: dataFrom, belowY: dataBelowY, deltas: opts.deltas, sheetNumbers: opts.sheetNumbers, hdrSpans: headerSpans, hdrBand: hdrBlock, marquee: opts.marquee });
   const out = banded.out;
   if (banded.region) region = region ? merge(region, banded.region) : banded.region;
   if (!out.length) {
@@ -4269,7 +4518,8 @@ function extractTableCore(sheet, kind, opts = {}) {
   }
   const table = { kind, sheet: sheet.key, title, headers: anchors.map((a) => a.label), rows: out, region, anchors };
   if (rotated) table.rotated_headers = true;
-  return { table };
+  const headerWords = headerSpans.flatMap((t) => t.str.toUpperCase().split(/[^A-Z]+/)).filter(Boolean);
+  return { table, headerWords };
 }
 var CONT_TAIL_RE = /[\s\-–—:.,(]*(?:CONTINUATION|CONTINUED|CONT['’]?D?)[\s.)]*$/;
 var isContinuationTitle = (text) => {
@@ -4427,17 +4677,15 @@ function buildSheetGraph(sheets) {
     roles.set(s.key, classifySheetRole(s));
     const sheetFrags = [];
     const found2 = [];
-    for (const kind of ["room-finish", "finish"]) {
-      const t = extractTable(s, kind, { buildings, deltas: deltasBySheet.get(s.key), sheetNumbers: sheetNumberSet });
-      if (t) found2.push(t);
-    }
-    found2.push(...extractTables(s, "equipment", { buildings, deltas: deltasBySheet.get(s.key), sheetNumbers: sheetNumberSet }));
+    const xo = { buildings, deltas: deltasBySheet.get(s.key), sheetNumbers: sheetNumberSet };
+    const rf = extractTable(s, "room-finish", xo);
+    if (rf) found2.push(rf);
+    const fin = readFinishTable(s, xo);
+    if (fin && "refused" in fin) {
+      notes.push(`${s.key}: "${fin.table.title.text}" names another schedule family, not a finish/material schedule \u2014 its ${fin.table.rows.length} rows are NOT indexed as finish definitions`);
+    } else if (fin) found2.push(fin.table);
+    found2.push(...extractTables(s, "equipment", xo));
     for (const t of found2) {
-      const kind = t.kind;
-      if (kind === "finish" && t.title && isNonFinishSchedule(t.title.text)) {
-        notes.push(`${s.key}: "${t.title.text}" names another schedule family, not a finish/material schedule \u2014 its ${t.rows.length} rows are NOT indexed as finish definitions`);
-        continue;
-      }
       const titleB = t.title ? buildingMentions(t.title.text) : [];
       const b = titleB.length === 1 ? titleB[0] : ctxBySheet.get(s.key);
       if (b) t.building = b;
@@ -7028,6 +7276,11 @@ function attrValue(attrs, colId) {
 
 // ../web/src/lib/units.ts
 var M_PER_FT = 0.3048;
+var M2_PER_SF = 0.09290304;
+var areaVal = (sf, units) => units === "metric" ? sf * M2_PER_SF : sf;
+var areaUnit = (units) => units === "metric" ? "m\xB2" : "SF";
+var lenVal = (lf, units) => units === "metric" ? lf * M_PER_FT : lf;
+var lenUnit = (units) => units === "metric" ? "m" : "LF";
 function dimLabel(feet, units = "imperial") {
   if (!Number.isFinite(feet)) return "";
   if (units === "metric") return `${(feet * M_PER_FT).toFixed(2)} m`;
@@ -7041,6 +7294,49 @@ function dimLabel(feet, units = "imperial") {
   return `${sign}${ft}'-${inch}"`;
 }
 
+// ../web/src/lib/liveCounter.js
+function fmtQty(n) {
+  const v = Math.round((Number(n) || 0) * 100) / 100;
+  return v.toLocaleString("en-US", { maximumFractionDigits: 2 });
+}
+
+// ../web/src/lib/noteFields.ts
+var FIELD_RE = /\{\{\s*([^{}]*?)\s*\}\}/g;
+var FIELD_WARN_INK = "#b03a26";
+var FIELD_WARN_INK_DARK = "#ff6b57";
+function hasFields(text) {
+  return typeof text === "string" && text.includes("{{") && new RegExp(FIELD_RE.source).test(text);
+}
+function qtyLabels(totals, units = "imperial") {
+  const out = /* @__PURE__ */ new Map();
+  for (const t of totals || []) {
+    if (!t || !t.shape_count) continue;
+    const parts = [];
+    if (t.total_sf) parts.push(`${fmtQty(areaVal(t.total_sf, units))} ${areaUnit(units)}`);
+    if (t.lf) parts.push(`${fmtQty(lenVal(t.lf, units))} ${lenUnit(units)}`);
+    if (t.ea) parts.push(`${fmtQty(t.ea)} EA`);
+    if (parts.length) out.set(t.id, parts.join(" \xB7 "));
+  }
+  return out;
+}
+function resolveNote(text, conditionId, labels) {
+  const s = typeof text === "string" ? text : "";
+  if (!hasFields(s)) return { text: s, unresolved: [] };
+  const unresolved = [];
+  const label = typeof conditionId === "string" && conditionId ? labels.get(conditionId) : void 0;
+  const out = s.replace(new RegExp(FIELD_RE.source, "g"), (whole, name) => {
+    if (name.toLowerCase() === "qty" && label) return label;
+    unresolved.push(whole);
+    return whole;
+  });
+  return { text: out, unresolved };
+}
+function resolveMarkup(m, labels) {
+  if (!m || !hasFields(m.text)) return { m, unresolved: [] };
+  const r = resolveNote(m.text, m.condition_id, labels);
+  return { m: r.unresolved.length ? { ...m, text: r.text, field_warn: true } : { ...m, text: r.text }, unresolved: r.unresolved };
+}
+
 // ../web/src/lib/totals.js
 function accumulateRole(acc, s) {
   const cp = s.computed || {};
@@ -7196,6 +7492,7 @@ function grandTotals(rows) {
 }
 function reportJson({ projectName = "", rows = [], bySheet = [], scaleInfo = [], markups = [], rfis = [], sheetLabel = null, conditionColumns = [], attrsByCond = null, shapeLabels = [], byLabel = [], displayUnits = "imperial", rollGoods = [], proposedConditionEdits = [] }) {
   const label = (id) => sheetLabel ? sheetLabel(id) : id;
+  const noteQty = qtyLabels(rows || [], displayUnits === "metric" ? "metric" : "imperial");
   const colDefs = (Array.isArray(conditionColumns) ? conditionColumns : []).filter((cc) => cc && typeof cc === "object" && typeof cc.id === "string");
   const attrs = attrsByCond instanceof Map ? attrsByCond : /* @__PURE__ */ new Map();
   return {
@@ -7232,9 +7529,14 @@ function reportJson({ projectName = "", rows = [], bySheet = [], scaleInfo = [],
     // resolved finish_tag rather than only the id, so a reader of the export
     // can see WHICH scope an annotation is about without joining two arrays;
     // the id stays authoritative. Unattached markups: "" for both.
+    // text_resolved APPENDS (same rule), and only on a note that carries a
+    // {{field}} — omit-when-empty, so every other markup row is unchanged.
+    // `text` stays the stored note, template and all; text_resolved is what the
+    // sheet shows, {{qty}} filled from the linked condition's measured quantity
+    // (noteFields, #474). An unresolved field stays literal in both.
     markups: markups.map((m) => {
       const c = m.condition_id ? (rows || []).find((r) => r.id === m.condition_id) : null;
-      return { type: m.type, sheet_id: m.sheet_id, sheet: label(m.sheet_id), text: m.text || "", id: m.id ?? null, rfi_id: m.rfi_id || "", condition_id: m.condition_id || "", condition: c?.finish_tag || "" };
+      return { type: m.type, sheet_id: m.sheet_id, sheet: label(m.sheet_id), text: m.text || "", id: m.id ?? null, rfi_id: m.rfi_id || "", condition_id: m.condition_id || "", condition: c?.finish_tag || "", ...hasFields(m.text) ? { text_resolved: resolveNote(m.text, m.condition_id, noteQty).text } : {} };
     }),
     // rfis APPENDS after markups (additive-only v1 — old exports had no RFI
     // register). linked_markups/linked_sheets are DERIVED from markup.rfi_id,
@@ -11547,6 +11849,12 @@ var Session = class _Session {
       seals = seals.filter((a) => a.shape_id !== void 0 && shapeById.get(a.shape_id)?.condition_id === c.id);
     }
     const s0 = this.sheets;
+    const qtyL = rows.some((m) => hasFields(m.text)) ? qtyLabels(conditionTotals(this.conditions, this.shapes)) : /* @__PURE__ */ new Map();
+    const fields = (m) => {
+      if (!hasFields(m.text)) return {};
+      const r = resolveNote(m.text, m.condition_id, qtyL);
+      return { text_resolved: r.text, ...r.unresolved.length ? { unresolved_fields: r.unresolved } : {} };
+    };
     const px = (m, p) => {
       const sh = s0.get(m.sheet_id);
       if (!p || !sh) return void 0;
@@ -11566,7 +11874,8 @@ var Session = class _Session {
         ...m.from ? { from: px(m, m.from) } : {},
         ...m.to ? { to: px(m, m.to) } : {},
         ...m.r != null ? { r: round1(m.r * (s0.get(m.sheet_id)?.widthPx ?? 0)) } : {},
-        ...m.len_ft != null ? { length_lf: m.len_ft } : {}
+        ...m.len_ft != null ? { length_lf: m.len_ft } : {},
+        ...fields(m)
       })),
       count: rows.length,
       unattached: rows.filter((m) => !m.condition_id).length,
@@ -13083,7 +13392,9 @@ var annotationRow = z.object({
   from: z.tuple([z.number(), z.number()]).optional().describe("Arrow tail / dimension start (image px)"),
   to: z.tuple([z.number(), z.number()]).optional().describe("Arrow head / dimension end (image px)"),
   r: z.number().optional().describe("Bubble radius (image px)"),
-  length_lf: z.number().optional().describe("Dimension only: the measured length in real feet, snapshotted at annotate time from the sheet scale")
+  length_lf: z.number().optional().describe("Dimension only: the measured length in real feet, snapshotted at annotate time from the sheet scale"),
+  text_resolved: z.string().optional().describe("Only when text carries a {{qty}} field: the note as the sheet shows it, {{qty}} filled with the linked condition's measured quantity (multiplier applied, no waste)"),
+  unresolved_fields: z.array(z.string()).optional().describe("Fields that could not fill (no linked condition, nothing measured yet, or an unknown name) \u2014 they stay literal and print in the warning ink; link_annotation fixes the first case")
 });
 var editAnnotationOutput = { id: z.string(), text: z.string(), note: z.string() };
 var annotateOutput = {
@@ -13293,7 +13604,7 @@ function annotationScene(m, W, H, pixelScale = 2) {
     const width = Math.max(45 * pixelScale, ...lines.map((l) => l.length * font * 0.62)) + pad * 2;
     const height = Math.max(1, lines.length) * font * 1.35 + pad * 2;
     add([...path3([at, [at[0] + width, at[1]], [at[0] + width, at[1] + height], [at[0], at[1] + height]]), ["Z"]], { fill: "#ffffff" });
-    lines.forEach((text, i) => texts.push({ text, x: at[0] + pad, y: at[1] + pad + font * (1 + i * 1.35), size: font, color: "#172033" }));
+    lines.forEach((text, i) => texts.push({ text, x: at[0] + pad, y: at[1] + pad + font * (1 + i * 1.35), size: font, color: m.field_warn ? FIELD_WARN_INK : "#172033" }));
     return [[at[0], at[1]], [at[0] + width, at[1] + height]];
   };
   let noteBox2 = null;
@@ -14099,6 +14410,15 @@ function invertPixels(cv) {
 }
 async function buildMarkedSetPdf({ projectName, dark, sheets, shapes, markups, approvals = [], rfis: rfisIn = [], conditions, getPage, loadPdfData, company, clientInfo, credit = null, provenance = null, coverTitle = "Marked Set", units = "imperial" }) {
   markups = (markups || []).filter((m) => !m.reference_only);
+  const fieldWarn = /* @__PURE__ */ new Set();
+  {
+    const qtyL = qtyLabels(conditionTotals(conditions || [], shapes || []), units);
+    markups = markups.map((m0) => {
+      const r = resolveMarkup(m0, qtyL);
+      if (r.unresolved.length) fieldWarn.add(m0.id);
+      return r.m;
+    });
+  }
   const rfis = liveRfis(rfisIn);
   const M = units === "metric";
   const uA = (sf) => M ? sf * 0.09290304 : sf;
@@ -14516,6 +14836,7 @@ async function buildMarkedSetPdf({ projectName, dark, sheets, shapes, markups, a
       const mCond = m.condition_id ? (conditions || []).find((c) => c.id === m.condition_id) : null;
       const mbase = m.color || mCond?.color || (m.rfi_id ? COBALT : "#c47a10");
       const mcol = rgb(...hex(dark ? boostForDark(mbase) : mbase));
+      const tcol = fieldWarn.has(m.id) ? rgb(...hex(dark ? FIELD_WARN_INK_DARK : FIELD_WARN_INK)) : mcol;
       const mdash = pdfDashFor(m.line_style || "solid");
       const mw = clampWeight(m.weight);
       if (m.annotation_style && ["arrow", "highlight", "callout", "cloud", "text"].includes(m.type)) {
@@ -14560,7 +14881,7 @@ async function buildMarkedSetPdf({ projectName, dark, sheets, shapes, markups, a
         const r = [[nx0 * W, ny0 * H], [nx1 * W, ny0 * H], [nx1 * W, ny1 * H], [nx0 * W, ny1 * H]];
         pg.drawSvgPath(svgPath(r), { x: 0, y: 0, color: mcol, opacity: 0.18 + alphaBoost / 2, borderColor: mcol, borderWidth: 1 * mw, borderOpacity: 0.9, ...mdash ? { borderDashArray: mdash } : {} });
         const t = lbl(m.text);
-        if (t) text(t, Math.min(nx0, nx1) * W, Math.min(ny0, ny1) * H - 10 / ptScale, 8, mcol, bold);
+        if (t) text(t, Math.min(nx0, nx1) * W, Math.min(ny0, ny1) * H - 10 / ptScale, 8, tcol, bold);
       } else if (m.type === "cloud" && m.rect) {
         const [[nx0, ny0], [nx1, ny1]] = m.rect;
         const cb = cloudBezier(nx0 * W, ny0 * H, nx1 * W, ny1 * H);
@@ -14572,7 +14893,7 @@ async function buildMarkedSetPdf({ projectName, dark, sheets, shapes, markups, a
         for (const [c1, c2, end] of cb.segments) d += ` C${P(c1)} ${P(c2)} ${P(end)}`;
         pg.drawSvgPath(d + " Z", { x: 0, y: 0, borderColor: mcol, borderWidth: 1.3 * mw, borderOpacity: 0.95, ...mdash ? { borderDashArray: mdash } : {} });
         const t = lbl(m.text);
-        if (t) text(t, Math.min(nx0, nx1) * W, Math.min(ny0, ny1) * H - 10 / ptScale, 8, mcol, bold);
+        if (t) text(t, Math.min(nx0, nx1) * W, Math.min(ny0, ny1) * H - 10 / ptScale, 8, tcol, bold);
         if (Number.isFinite(m.rev) && m.rev > 0) {
           const cxImg = Math.max(nx0, nx1) * W, cyImg = Math.min(ny0, ny1) * H, s = 9 / ptScale;
           const tri = [[cxImg, cyImg - s], [cxImg + s, cyImg + s], [cxImg - s, cyImg + s]];
@@ -14586,7 +14907,7 @@ async function buildMarkedSetPdf({ projectName, dark, sheets, shapes, markups, a
         const [ptx, pty] = toPage(m.to[0] * W, m.to[1] * H);
         pg.drawSvgPath(arrowheadPath(pfx, -pfy, ptx, -pty, 6 * mw), { x: 0, y: 0, color: mcol, opacity: 0.95 });
         const t = lbl(m.text);
-        if (t) text(t, (m.from[0] + m.to[0]) / 2 * W, (m.from[1] + m.to[1]) / 2 * H - 6 / ptScale, 8, mcol, bold);
+        if (t) text(t, (m.from[0] + m.to[0]) / 2 * W, (m.from[1] + m.to[1]) / 2 * H - 6 / ptScale, 8, tcol, bold);
       } else if (m.type === "dimension" && m.from && m.to) {
         const fx = m.from[0] * W, fy = m.from[1] * H, dxq = m.to[0] * W, dyq = m.to[1] * H;
         line(fx, fy, dxq, dyq, mcol, 1.1 * mw, 0.95, mdash);
@@ -14600,7 +14921,7 @@ async function buildMarkedSetPdf({ projectName, dark, sheets, shapes, markups, a
           const size = 8;
           const tw = bold.widthOfTextAtSize(winAnsiSafe(t), size);
           const [pmx, pmy] = toPage((fx + dxq) / 2 + dnx * (14 / ptScale), (fy + dyq) / 2 + dny * (14 / ptScale));
-          pg.drawText(winAnsiSafe(t), { x: pmx - tw / 2, y: pmy - size / 2.7, size, font: bold, color: mcol, rotate: chipRot });
+          pg.drawText(winAnsiSafe(t), { x: pmx - tw / 2, y: pmy - size / 2.7, size, font: bold, color: tcol, rotate: chipRot });
         }
       } else if (m.type === "bubble" && m.at) {
         const cxImg = m.at[0] * W, cyImg = m.at[1] * H;
@@ -14611,7 +14932,7 @@ async function buildMarkedSetPdf({ projectName, dark, sheets, shapes, markups, a
         if (t) {
           const size = 8;
           const tw = bold.widthOfTextAtSize(winAnsiSafe(t), size);
-          pg.drawText(winAnsiSafe(t), { x: pcx - tw / 2, y: pcy - size / 2.7, size, font: bold, color: mcol, rotate: chipRot });
+          pg.drawText(winAnsiSafe(t), { x: pcx - tw / 2, y: pcy - size / 2.7, size, font: bold, color: tcol, rotate: chipRot });
         }
       } else if (m.type === "callout" && m.at) {
         if (m.target) {
@@ -14620,9 +14941,9 @@ async function buildMarkedSetPdf({ projectName, dark, sheets, shapes, markups, a
           const [ptx, pty] = toPage(m.target[0] * W, m.target[1] * H);
           pg.drawSvgPath(arrowheadPath(pax, -pay, ptx, -pty, 5), { x: 0, y: 0, color: mcol, opacity: 0.9 });
         }
-        noteBlock(lbl(m.text), m.at[0] * W, m.at[1] * H, mcol, dark ? rgb(0.08, 0.1, 0.12) : rgb(1, 1, 1));
+        noteBlock(lbl(m.text), m.at[0] * W, m.at[1] * H, tcol, dark ? rgb(0.08, 0.1, 0.12) : rgb(1, 1, 1));
       } else if (m.type === "text" && m.at) {
-        noteBlock(lbl(m.text), m.at[0] * W, m.at[1] * H, mcol, dark ? rgb(0.08, 0.1, 0.12) : rgb(1, 0.97, 0.93));
+        noteBlock(lbl(m.text), m.at[0] * W, m.at[1] * H, tcol, dark ? rgb(0.08, 0.1, 0.12) : rgb(1, 0.97, 0.93));
       } else if (m.type === "svg" && m.at && Array.isArray(m.vb) && typeof m.path === "string") {
         const { s: sx, bw, bh } = svgPlacedBox(m.vb, m.w, W);
         if (sx > 0) {
@@ -14634,7 +14955,7 @@ async function buildMarkedSetPdf({ projectName, dark, sheets, shapes, markups, a
           const fillOn = m.fill && m.fill !== "none";
           if (d) pg.drawSvgPath(d, { x: 0, y: 0, borderColor: mcol, borderWidth: 1.2 * mw, borderOpacity: 0.95, ...fillOn ? { color: rgb(...hex(dark ? boostForDark(m.fill) : m.fill)), opacity: 0.9 } : {} });
           const t = lbl(m.text);
-          if (t) text(t, m.at[0] * W - bw / 2, y0 - 6 / ptScale, 8, mcol, bold);
+          if (t) text(t, m.at[0] * W - bw / 2, y0 - 6 / ptScale, 8, tcol, bold);
         }
       } else if (m.type === "image" && m.at && m.src) {
         const fmt3 = pickEmbedFormat(m.src);
@@ -15640,7 +15961,7 @@ All-or-nothing, like derive_base: an unknown tag, a transition landing on either
   server.registerTool("annotate", {
     description: `Place an annotation on a sheet \u2014 a note ABOUT the work, never a measurement of it. Types: cloud and highlight take rect:[[x0,y0],[x1,y1]] (a revision cloud around an area, a highlight box over it), text takes at:[x,y], callout takes at:[x,y] plus target:[x,y] (the point its leader aims at), arrow takes from:[x,y] and to:[x,y] (tail and head \u2014 plank/seam direction, the markup flooring drawings use most; #150), bubble takes at:[x,y] plus optional r (a keynote/detail circle carrying centered text), dimension takes from:[x,y] and to:[x,y] (its two measured endpoints) and labels itself with the length between them at the sheet's scale \u2014 drawn as a dimension line with end ticks and the measurement centered. A dimension states a REAL length, so it is the one annotation the scale gate applies to: on an unscaled sheet it refuses exactly like the measure tools (set_scale first) rather than dressing a px figure up as feet. It still touches no quantity \u2014 a dimension is a note about a distance, not a takeoff line item.
 
-Pass condition to attach the note to a finish tag, which is what makes it part of that SCOPE rather than a floating remark: it then wears the condition's colour on the canvas and in the marked-set PDF, and travels with it into the report. The tag is minted on first touch like ${oneClick ? "one_click/" : ""}measure_polygon, so you can annotate CPT-1 before anything is traced for it. Omit condition for a note about the sheet itself. 
+Pass condition to attach the note to a finish tag, which is what makes it part of that SCOPE rather than a floating remark: it then wears the condition's colour on the canvas and in the marked-set PDF, and travels with it into the report. The tag is minted on first touch like ${oneClick ? "one_click/" : ""}measure_polygon, so you can annotate CPT-1 before anything is traced for it. Omit condition for a note about the sheet itself. Write {{qty}} in the text to quote the linked condition's live measured quantity (multiplier applied, no waste): "x{{qty}} fixtures" reads "x6 EA fixtures" on the sheet and follows every later count; the stored text keeps the field, and list_annotations reports text_resolved.
 
 No review gate: the pencil-not-ink rule exists to stop an agent inventing geometry, and a cloud reading "verify substrate" is not geometry. It touches no quantity. ${COORDS}`,
     inputSchema: {
@@ -15741,7 +16062,7 @@ No review gate: the pencil-not-ink rule exists to stop an agent inventing geomet
 import { ResourceTemplate } from "@modelcontextprotocol/sdk/server/mcp.js";
 
 // src/wiki.generated.ts
-var WIKI_VERSION = "0.9.90";
+var WIKI_VERSION = "0.9.93";
 var WIKI_PAGES = [
   {
     "key": "index",
@@ -16352,7 +16673,7 @@ function nameTheStageInRefusals(server) {
 // package.json
 var package_default = {
   name: "opentakeoff-mcp",
-  version: "0.9.90",
+  version: "0.9.93",
   mcpName: "io.github.Kentucky-ai/opentakeoff",
   type: "module",
   description: "OpenTakeoff MCP server \u2014 drive the takeoff engine from your MCP client over stdio.",
@@ -16372,7 +16693,7 @@ var package_default = {
     "check:wiki": "node scripts/check-wiki.mjs",
     "check:versions": "node ../scripts/check-version-consistency.mjs",
     "check:tool-count": "node --import tsx scripts/check-tool-count.mjs",
-    test: "node --import tsx --test test/arc.test.ts test/checkers.test.ts test/conformance.test.ts test/constants.test.ts test/context.test.ts test/document.test.ts test/dxf.test.ts test/e2e.test.ts test/gate.test.ts test/graphEvalRowsym.test.ts test/labels.test.ts test/mep.test.ts test/overlap.test.ts test/parity.test.ts test/proposals.test.ts test/raster.test.ts test/resources.test.ts test/safewrite.test.ts test/scalewarn.test.ts test/scope.test.ts test/session.test.ts test/splittags.test.ts test/staging.test.ts test/sweepguard.test.ts test/tools.test.ts test/transitions.test.ts test/twins.test.ts test/view.test.ts test/wiki.test.ts"
+    test: "node --import tsx --test test/arc.test.ts test/checkers.test.ts test/conformance.test.ts test/constants.test.ts test/context.test.ts test/document.test.ts test/dxf.test.ts test/e2e.test.ts test/finishSchedule.test.ts test/gate.test.ts test/graphEvalRowsym.test.ts test/labels.test.ts test/mep.test.ts test/overlap.test.ts test/pageSpans.test.ts test/parity.test.ts test/proposals.test.ts test/raster.test.ts test/resources.test.ts test/safewrite.test.ts test/scalewarn.test.ts test/scheduleImport.test.ts test/scope.test.ts test/session.test.ts test/splittags.test.ts test/staging.test.ts test/sweepguard.test.ts test/tools.test.ts test/transitions.test.ts test/twins.test.ts test/view.test.ts test/wiki.test.ts"
   },
   dependencies: {
     "@modelcontextprotocol/sdk": "^1.12.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opentakeoff-mcp",
-  "version": "0.9.90",
+  "version": "0.9.93",
   "mcpName": "io.github.Kentucky-ai/opentakeoff",
   "type": "module",
   "description": "OpenTakeoff MCP server — drive the takeoff engine from your MCP client over stdio.",
@@ -20,7 +20,7 @@
     "check:wiki": "node scripts/check-wiki.mjs",
     "check:versions": "node ../scripts/check-version-consistency.mjs",
     "check:tool-count": "node --import tsx scripts/check-tool-count.mjs",
-    "test": "node --import tsx --test test/arc.test.ts test/checkers.test.ts test/conformance.test.ts test/constants.test.ts test/context.test.ts test/document.test.ts test/dxf.test.ts test/e2e.test.ts test/gate.test.ts test/graphEvalRowsym.test.ts test/labels.test.ts test/mep.test.ts test/overlap.test.ts test/parity.test.ts test/proposals.test.ts test/raster.test.ts test/resources.test.ts test/safewrite.test.ts test/scalewarn.test.ts test/scope.test.ts test/session.test.ts test/splittags.test.ts test/staging.test.ts test/sweepguard.test.ts test/tools.test.ts test/transitions.test.ts test/twins.test.ts test/view.test.ts test/wiki.test.ts"
+    "test": "node --import tsx --test test/arc.test.ts test/checkers.test.ts test/conformance.test.ts test/constants.test.ts test/context.test.ts test/document.test.ts test/dxf.test.ts test/e2e.test.ts test/finishSchedule.test.ts test/gate.test.ts test/graphEvalRowsym.test.ts test/labels.test.ts test/mep.test.ts test/overlap.test.ts test/pageSpans.test.ts test/parity.test.ts test/proposals.test.ts test/raster.test.ts test/resources.test.ts test/safewrite.test.ts test/scalewarn.test.ts test/scheduleImport.test.ts test/scope.test.ts test/session.test.ts test/splittags.test.ts test/staging.test.ts test/sweepguard.test.ts test/tools.test.ts test/transitions.test.ts test/twins.test.ts test/view.test.ts test/wiki.test.ts"
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.12.0",