opentakeoff-mcp 0.9.47 → 0.9.48

package/dist/server-core.js

@@ -618,6 +618,7 @@ var ARC_CUSP_SPAN_MULT = 8;
 var MASK_NODOOR_BIT = 8;
 var DOOR_R_MIN_FT = 1.5;
 var DOOR_R_MAX_FT = 4.5;
+var DOOR_R_LEAF_MAX_FT = 7;
 var CLUSTER_FIT_TOL_FRAC = 0.05;
 var CLUSTER_FIT_TOL_PX = 1.5;
 var HATCH_ANGLE_TOL = 2;
@@ -2065,9 +2066,10 @@ function wedgeRimPx(maskPxPerFt) {
   if (!Number.isFinite(maskPxPerFt) || maskPxPerFt <= 0) return 3;
   return Math.max(3, Math.round(WEDGE_RIM_FT * maskPxPerFt));
 }
-function wedgeAllowance(fit, mppf, wedgeCapPx) {
+function wedgeAllowance(fit, mppf, wedgeCapPx, leafFound = false) {
   if (fit.noDoorFrac > 0.5 && !fit.good) return 0;
-  if (fit.good && mppf > 0 && fit.r / mppf > DOOR_R_MAX_FT) return 0;
+  const rMax = leafFound ? DOOR_R_LEAF_MAX_FT : DOOR_R_MAX_FT;
+  if (fit.good && mppf > 0 && fit.r / mppf > rMax) return 0;
   const rim = wedgeRimPx(mppf);
   const bu = fit.good ? fit.buH : fit.bu, bn = fit.good ? fit.bnH : fit.bn;
   let area = bu * bn;
@@ -2075,12 +2077,13 @@ function wedgeAllowance(fit, mppf, wedgeCapPx) {
   area += 2 * rim * (bu + bn) + 4 * rim * rim;
   return Math.min(2 * wedgeCapPx, Math.round(area * WEDGE_SLACK));
 }
-function doorLikeness(fit, mppf) {
+function doorLikeness(fit, mppf, leafFound = false) {
   let s = 1 - fit.noDoorFrac;
   const swDeg = fit.sweep * 180 / Math.PI;
   if (fit.good) {
     s += 1;
-    if (mppf > 0 && fit.r / mppf >= DOOR_R_MIN_FT && fit.r / mppf <= DOOR_R_MAX_FT) s += 4;
+    const rMax = leafFound ? DOOR_R_LEAF_MAX_FT : DOOR_R_MAX_FT;
+    if (mppf > 0 && fit.r / mppf >= DOOR_R_MIN_FT && fit.r / mppf <= rMax) s += 4;
     if (swDeg >= 45 && swDeg <= 190) s += 2;
   }
   return s;
@@ -2211,19 +2214,21 @@ function floodRegionSealedInner(mo, ix, iy, sensitivity, radii, wedgeCapPx, minP
   const { mw, mh } = mo;
   let region = null;
   let count = r1.count;
-  let wedges = 0, ringWedges = 0;
+  let wedges = 0, ringWedges = 0, refused = 0;
   let hatchFiltered = !!r1.hatchFiltered;
   let hatchTier = r1.hatchTier;
   let sealedPx = r1.sealedPx, virtualFrac = r1.virtualFrac;
   let minPassPxOut = r1.minPassPx, minPassDelta = r1.minPassDelta;
-  const entry = (cl, pass, fit) => {
+  const entry = (cl, pass, fit, leafFound = false) => {
     const f = fit ?? arcClusterFit(cl, mw, mo.mask);
     const ideal = 0.5 * f.r * f.r * f.sweep;
+    const allow = wedgeAllowance(f, mo.mppf || 0, wedgeCapPx, leafFound);
+    if (!allow && f.good && (mo.mppf || 0) > 0 && f.r / mo.mppf > (leafFound ? DOOR_R_LEAF_MAX_FT : DOOR_R_MAX_FT)) refused++;
     return {
       cl,
       fit: f,
-      allow: wedgeAllowance(f, mo.mppf || 0, wedgeCapPx),
-      rank: doorLikeness(f, mo.mppf || 0),
+      allow,
+      rank: doorLikeness(f, mo.mppf || 0, leafFound),
       at: cl[0],
       pass,
       minGrow: pass === 2 ? Math.max(1, Math.round(LEAF_MIN_SECTOR_FRAC * ideal)) : 0
@@ -2232,15 +2237,16 @@ function floodRegionSealedInner(mo, ix, iy, sensitivity, radii, wedgeCapPx, minP
   const ranked = [];
   for (const cl of clusters) {
     const fit = arcClusterFit(cl, mw, mo.mask);
-    ranked.push(entry(cl, 0, fit));
     const parts = splitMergedArcs(cl, mw, mo.mask, mo.mppf || 0);
     const pieces = parts.length > 1 ? parts : [cl];
-    if (parts.length > 1) for (const p of parts) ranked.push(entry(p, 1));
-    for (const p of pieces) {
+    const leaves = pieces.map((p) => {
       const pf = p === cl ? fit : arcClusterFit(p, mw, mo.mask);
-      const leaf = doorLeafCells(pf, p, mw, mh, mo.mask, mo.mppf || 0);
-      if (leaf) ranked.push({ ...entry(leaf, 2, pf), cl: leaf });
-    }
+      return { p, pf, leaf: doorLeafCells(pf, p, mw, mh, mo.mask, mo.mppf || 0) };
+    });
+    const anyLeaf = leaves.some((l) => !!l.leaf);
+    ranked.push(entry(cl, 0, fit, anyLeaf));
+    if (parts.length > 1) for (const { p, pf, leaf } of leaves) ranked.push(entry(p, 1, pf, !!leaf));
+    for (const { pf, leaf } of leaves) if (leaf) ranked.push({ ...entry(leaf, 2, pf, true), cl: leaf });
   }
   ranked.splice(0, ranked.length, ...ranked.filter((c) => c.allow >= 1).sort((a, b) => a.pass - b.pass || b.rank - a.rank || a.at - b.at));
   let m2mask = null, m2dt = null;
@@ -2317,7 +2323,10 @@ function floodRegionSealedInner(mo, ix, iy, sensitivity, radii, wedgeCapPx, minP
     if (r2.minPassPx && (!minPassPxOut || r2.minPassPx > minPassPxOut)) minPassPxOut = r2.minPassPx;
     if (r2.minPassDelta != null && (minPassDelta == null || r2.minPassDelta > minPassDelta)) minPassDelta = r2.minPassDelta;
   }
-  if (!wedges || !region) return r1;
+  if (!wedges || !region) {
+    if (refused) r1.wedgesRefused = refused;
+    return r1;
+  }
   const out = {
     status: "ok",
     region,
@@ -2334,7 +2343,8 @@ function floodRegionSealedInner(mo, ix, iy, sensitivity, radii, wedgeCapPx, minP
     virtualFrac,
     minPassPx: minPassPxOut,
     minPassDelta,
-    ...ringWedges ? { ringWedges } : {}
+    ...ringWedges ? { ringWedges } : {},
+    ...refused ? { wedgesRefused: refused } : {}
   };
   const reg = region, reg1 = r1.region, mask = mo.mask;
   const isDelta = (i) => reg[i] && !reg1[i];
@@ -11119,7 +11129,7 @@ function applyStagedTools(server, registered) {
 // package.json
 var package_default = {
   name: "opentakeoff-mcp",
-  version: "0.9.47",
+  version: "0.9.48",
   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.47",
+  "version": "0.9.48",
   "mcpName": "io.github.Kentucky-ai/opentakeoff",
   "type": "module",
   "description": "OpenTakeoff MCP server — drive the takeoff engine from your MCP client over stdio.",