opentakeoff-mcp 0.9.44 → 0.9.45

package/dist/server-core.js

@@ -2678,7 +2678,7 @@ function clusterRows(spans) {
 }
 var rowY = (r) => r.reduce((s, t) => s + t.y, 0) / r.length;
 var ROOM_HEADERS = ["ROOM", "NO", "NUMBER", "NAME", "FLOOR", "BASE", "WALL", "WALLS", "NORTH", "SOUTH", "EAST", "WEST", "CEILING", "WAINSCOT", "REMARKS", "CLG", "HT", "BLDG", "BUILDING"];
-var FINISH_HEADERS = ["CODE", "MARK", "MATERIAL", "MANUFACTURER", "PRODUCT", "STYLE", "COLOR", "SIZE", "REMARKS", "DESCRIPTION", "PATTERN"];
+var FINISH_HEADERS = ["CODE", "MARK", "SYMBOL", "MATERIAL", "MANUFACTURER", "PRODUCT", "STYLE", "COLOR", "SIZE", "REMARKS", "DESCRIPTION", "PATTERN", "COMMENTS"];
 var headerLabel = (s, vocab) => {
   for (const w of norm(s).split(/[^A-Z]+/)) if (w && vocab.includes(w)) return w;
   return null;
@@ -2695,10 +2695,57 @@ function findHeaderRow(rows, vocab, required, minHits) {
       }
     }
     if (anchors.length < minHits || !required.some((r) => seen.has(r))) continue;
-    return { anchors: anchors.sort((a, b) => a.x - b.x), rowIndex: i };
+    return { anchors: subTierAnchors(rows, i, anchors.sort((a, b) => a.x - b.x), vocab), rowIndex: i };
   }
   return null;
 }
+var SUB_LABEL_RE = /^[A-Z0-9][A-Z0-9.\/-]{0,5}$/;
+function parentLabelOver(rows, hdrIdx, gx0, gx1, vocab) {
+  const width = Math.max(gx1 - gx0, 1);
+  for (let j = hdrIdx - 1; j >= 0 && j >= hdrIdx - 2; j--) {
+    for (const t of rows[j]) {
+      if (Math.min(t.x + (t.w || 0), gx1) - Math.max(t.x, gx0) <= width * 0.3) continue;
+      const lbl = headerLabel(t.str, vocab);
+      if (lbl) return lbl;
+    }
+  }
+  return null;
+}
+function subTierAnchors(rows, hdrIdx, anchors, vocab) {
+  const lo = anchors[0].x, hi = anchors[anchors.length - 1].x;
+  const loose = rows[hdrIdx].filter((t) => !headerLabel(t.str, vocab) && SUB_LABEL_RE.test(norm(t.str))).filter((t) => t.x + (t.w || 0) / 2 > lo && t.x + (t.w || 0) / 2 < hi).sort((a, b) => a.x - b.x);
+  if (loose.length < 2) return anchors;
+  const mid = (t) => t.x + (t.w || 0) / 2;
+  const gaps = loose.slice(1).map((t, i) => mid(t) - mid(loose[i])).sort((a, b) => a - b);
+  const med = gaps[gaps.length >> 1] || 1;
+  const runs = [];
+  let run2 = [loose[0]];
+  for (let i = 1; i < loose.length; i++) {
+    if (mid(loose[i]) - mid(loose[i - 1]) > med * 3) {
+      runs.push(run2);
+      run2 = [];
+    }
+    run2.push(loose[i]);
+  }
+  runs.push(run2);
+  const out = anchors.slice();
+  const used = new Set(anchors.map((a) => a.label));
+  for (const r of runs) {
+    if (r.length < 2) continue;
+    const last = r[r.length - 1];
+    const parent = parentLabelOver(rows, hdrIdx, r[0].x, last.x + (last.w || 0), vocab);
+    if (!parent) continue;
+    const pitch = r.length > 1 ? r.slice(1).map((t, i) => mid(t) - mid(r[i])).sort((a, b) => a - b)[r.length - 1 >> 1] : 0;
+    for (const t of r) {
+      const label = `${parent} ${norm(t.str)}`;
+      if (used.has(label)) continue;
+      used.add(label);
+      const c = mid(t);
+      out.push(pitch > 0 ? { label, x: c, x0: c - pitch / 2, x1: c + pitch / 2 } : { label, x: c });
+    }
+  }
+  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);
   let band = [];
@@ -2733,18 +2780,35 @@ function findRotatedHeader(vert, vocab, required, minHits) {
   return band.length ? flush() : null;
 }
 var nearestAnchor = (x, anchors) => {
-  let best = anchors[0];
-  for (const a of anchors) if (Math.abs(a.x - x) < Math.abs(best.x - x)) best = a;
-  return best.label;
+  let inside2 = null;
+  for (const a of anchors) {
+    if (a.x0 == null || a.x1 == null || x < a.x0 || x > a.x1) continue;
+    if (!inside2 || Math.abs(a.x - x) < Math.abs(inside2.x - x)) inside2 = a;
+  }
+  if (inside2) return inside2.label;
+  let best = null;
+  for (const a of anchors) {
+    if (a.x0 != null) continue;
+    if (!best || Math.abs(a.x - x) < Math.abs(best.x - x)) best = a;
+  }
+  return (best ?? anchors[0]).label;
 };
+var WIDE_LAST = /* @__PURE__ */ new Set(["REMARKS", "DESCRIPTION", "NOTES"]);
 function bandLimits(anchors) {
   const gaps = anchors.slice(1).map((a, i) => a.x - anchors[i].x).sort((a, b) => a - b);
   const medGap = gaps.length ? gaps[gaps.length >> 1] : 150;
-  return { x0: anchors[0].x - Math.max(80, medGap / 2), x1: anchors[anchors.length - 1].x + Math.max(300, medGap * 3), medGap };
+  const last = anchors[anchors.length - 1];
+  const rightMargin = WIDE_LAST.has(last.label) ? Math.max(300, medGap * 3) : Math.max(120, medGap);
+  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 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 OTHER_FAMILY_RE = /\b(DOOR|WINDOW|PARTITION|EQUIPMENT|HARDWARE|LOUVER|SIGNAGE|LIGHTING|LUMINAIRE|PLUMBING|MECHANICAL|ELECTRICAL|STOREFRONT|GLAZING|CASEWORK|MILLWORK|APPLIANCE)S?\b/;
+var isNonFinishSchedule = (title) => {
+  const u = norm(title);
+  return OTHER_FAMILY_RE.test(u) && !/\b(FINISH|MATERIAL)S?\b/.test(u);
+};
 function rowKeyOf(raw, kind, buildings) {
   const key = norm(raw).replace(/[^A-Z0-9-]/g, "");
   if (kind === "finish") return CODE_RE.test(key) ? { key } : null;
@@ -2833,7 +2897,7 @@ function extractTable(sheet, kind, opts = {}) {
   const vert = sheet.spans.filter(isVertical);
   const rows = clusterRows(horiz);
   const vocab = kind === "room-finish" ? ROOM_HEADERS : FINISH_HEADERS;
-  const required = kind === "room-finish" ? ["FLOOR", "BASE"] : ["CODE", "MARK"];
+  const required = kind === "room-finish" ? ["FLOOR", "BASE"] : ["CODE", "MARK", "SYMBOL"];
   const minHits = kind === "room-finish" ? 4 : 3;
   let anchors;
   let headerSpans;
@@ -2943,7 +3007,7 @@ function roomTags(sheet, opts = {}) {
       const dy = b[1] - cb[3];
       if (dy < -hgt * 0.2 || dy > hgt * 2.2) continue;
       if (cb[2] < b[0] - hgt || cb[0] > b[2] + hgt) continue;
-      if (!/^[A-Z][A-Z .\/&-]{2,}$/.test(norm(cand.str))) continue;
+      if (!/^[A-Z][A-Z .'’\/&-]{2,}$/.test(norm(cand.str))) continue;
       if (dy < best) {
         best = dy;
         name = cand.str.trim();
@@ -3022,6 +3086,10 @@ function buildSheetGraph(sheets) {
     for (const kind of ["room-finish", "finish"]) {
       const t = extractTable(s, kind, { buildings, deltas: deltasBySheet.get(s.key) });
       if (!t) continue;
+      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;
@@ -3103,6 +3171,7 @@ function buildSheetGraph(sheets) {
   return { available: true, sheets: outSheets, rooms, tables, callouts, buildings: [...buildings].sort(), revisions, notes };
 }
 var SURFACE_HEADERS = ["FLOOR", "BASE", "WALL", "WALLS", "NORTH", "SOUTH", "EAST", "WEST", "CEILING", "WAINSCOT"];
+var surfaceRank = (label) => SURFACE_HEADERS.indexOf(label.split(" ")[0]);
 function resolveTag(graph, tag) {
   const t = norm(tag).replace(/\s+/g, "");
   const q = t.match(QUALIFIED_KEY_RE);
@@ -3171,7 +3240,8 @@ function resolveTag(graph, tag) {
   const finishes = [];
   const sources = [{ sheet: r.sheet, text: `${tab.title?.text || "room-finish schedule"} row ${r.key}`, bbox: r.cells[Object.keys(r.cells)[0]]?.bbox || tab.region }];
   if (room) sources.unshift({ sheet: room.sheet, text: `${room.name ? room.name + " " : ""}${room.tag}`.trim(), bbox: room.bbox });
-  for (const surface of SURFACE_HEADERS) {
+  const surfaces = Object.keys(r.cells).filter((k) => surfaceRank(k) >= 0).sort((a, b) => surfaceRank(a) - surfaceRank(b) || a.localeCompare(b));
+  for (const surface of surfaces) {
     const cell = r.cells[surface];
     if (!cell || !cell.text.trim()) continue;
     const code = norm(cell.text).replace(/[^A-Z0-9-]/g, "");
@@ -10848,7 +10918,7 @@ function applyStagedTools(server, registered) {
 // package.json
 var package_default = {
   name: "opentakeoff-mcp",
-  version: "0.9.44",
+  version: "0.9.45",
   mcpName: "io.github.Kentucky-ai/opentakeoff",
   type: "module",
   description: "OpenTakeoff MCP server \u2014 drive the takeoff engine from your MCP client over stdio.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opentakeoff-mcp",
-  "version": "0.9.44",
+  "version": "0.9.45",
   "mcpName": "io.github.Kentucky-ai/opentakeoff",
   "type": "module",
   "description": "OpenTakeoff MCP server — drive the takeoff engine from your MCP client over stdio.",