opentakeoff-mcp 0.9.62 → 0.9.63

package/dist/server-core.js

@@ -4638,6 +4638,64 @@ function sharedRuns(ringA, ringB, opts) {
   }
   return runs;
 }
+var TRANSITION_DEFAULTS = { max_gap_in: 12, min_run_in: 12 };
+var round22 = (n) => +n.toFixed(2);
+var round12 = (n) => +n.toFixed(1);
+function dropCollinear(path5, tol = 1e-6) {
+  if (path5.length < 3) return path5.map((p) => [p[0], p[1]]);
+  const out = [[path5[0][0], path5[0][1]]];
+  for (let i = 1; i < path5.length - 1; i++) {
+    const a = out[out.length - 1], b = path5[i], c = path5[i + 1];
+    const abx = b[0] - a[0], aby = b[1] - a[1];
+    const acx = c[0] - a[0], acy = c[1] - a[1];
+    const len = Math.hypot(acx, acy);
+    const off = len > 0 ? Math.abs(abx * acy - aby * acx) / len : Infinity;
+    if (off > tol) out.push([b[0], b[1]]);
+  }
+  out.push([path5[path5.length - 1][0], path5[path5.length - 1][1]]);
+  return out;
+}
+function deriveTransitionRuns(a, b, sheets, opts = {}) {
+  const maxGapIn = opts.max_gap_in ?? TRANSITION_DEFAULTS.max_gap_in;
+  const minRunIn = opts.min_run_in ?? TRANSITION_DEFAULTS.min_run_in;
+  const runs = [], withheld = [];
+  if (!(maxGapIn > 0) || !(minRunIn > 0)) return { runs, withheld };
+  for (const [key, frame] of sheets) {
+    if (!(frame.upp > 0) || !(frame.widthPx > 0) || !(frame.heightPx > 0)) continue;
+    const onA = a.shapes.filter((s) => s.sheet_id === key);
+    const onB = b.shapes.filter((s) => s.sheet_id === key);
+    if (!onA.length || !onB.length) continue;
+    const pxPerFt = 1 / frame.upp;
+    const toPx = (s) => s.verts_norm.map(([x, y]) => [x * frame.widthPx, y * frame.heightPx]);
+    const runOpts = {
+      step_px: Math.max(1, pxPerFt * 0.25),
+      // a quarter-foot walk — finer than any transition matters
+      touch_px: pxPerFt * (1 / 12),
+      // within an inch: one open space, not two rooms
+      max_gap_px: pxPerFt * (maxGapIn / 12),
+      min_len_px: pxPerFt * (minRunIn / 12)
+    };
+    for (const ra of onA) {
+      for (const rb of onB) {
+        if (ra.id === rb.id) continue;
+        for (const r of sharedRuns(toPx(ra), toPx(rb), runOpts)) {
+          const row = {
+            sheet_id: key,
+            between_shape_ids: [ra.id, rb.id],
+            between: [a.tag, b.tag],
+            length_lf: round22(r.length_px * frame.upp),
+            gap_in: round12(r.gap_px * frame.upp * 12),
+            at: [Math.round(r.at[0]), Math.round(r.at[1])],
+            verts_norm: dropCollinear(r.path).map(([x, y]) => [x / frame.widthPx, y / frame.heightPx])
+          };
+          if (r.kind === "wall") withheld.push({ ...row, reason: "wall_separated" });
+          else runs.push(row);
+        }
+      }
+    }
+  }
+  return { runs, withheld };
+}
 
 // ../web/src/lib/cutout.js
 import { polygon as turfPolygon, featureCollection } from "@turf/helpers";
@@ -4950,7 +5008,7 @@ function applyApprovalCommand(approvals, cmd) {
 }
 
 // ../web/src/lib/num.js
-var round22 = (n) => Math.round((n + Number.EPSILON) * 100) / 100;
+var round23 = (n) => Math.round((n + Number.EPSILON) * 100) / 100;
 
 // ../web/src/lib/conditionColumns.js
 var visible = (v) => typeof v === "string" && v.trim() ? v : "";
@@ -5025,8 +5083,8 @@ function conditionTotals(conditions, shapes, ctx = null) {
       const per = Math.max(0, Number(m.per) || 0);
       const basisVal = m.basis === "linear" ? lf : m.basis === "count" ? ea : m.basis === "seam_lf" ? seam : total;
       let qty = per > 0 ? basisVal / per : 0;
-      qty = m.round === false ? round22(qty) : Math.ceil(qty - 1e-9);
-      return { name: m.name, unit: m.unit || "", per, basis: m.basis || "area", round: m.round !== false, note: m.note || "", basis_qty: round22(basisVal), qty };
+      qty = m.round === false ? round23(qty) : Math.ceil(qty - 1e-9);
+      return { name: m.name, unit: m.unit || "", per, basis: m.basis || "area", round: m.round !== false, note: m.note || "", basis_qty: round23(basisVal), qty };
     });
     return {
       id: c.id,
@@ -5037,19 +5095,19 @@ function conditionTotals(conditions, shapes, ctx = null) {
       multiplier: mult,
       waste_pct: waste,
       shape_count: cs.length,
-      floor_sf: round22(floor),
-      wall_sf: round22(wall),
-      border_sf: round22(border),
-      lf: round22(lf),
+      floor_sf: round23(floor),
+      wall_sf: round23(wall),
+      border_sf: round23(border),
+      lf: round23(lf),
       ea,
-      total_sf: round22(total),
+      total_sf: round23(total),
       // waste-adjusted (order quantities)
-      floor_sf_net: round22(floor * w),
-      wall_sf_net: round22(wall * w),
-      border_sf_net: round22(border * w),
-      lf_net: round22(lf * w),
-      total_sf_net: round22(total * w),
-      sy_net: round22(total * w / 9),
+      floor_sf_net: round23(floor * w),
+      wall_sf_net: round23(wall * w),
+      border_sf_net: round23(border * w),
+      lf_net: round23(lf * w),
+      total_sf_net: round23(total * w),
+      sy_net: round23(total * w / 9),
       materials
     };
   });
@@ -5098,11 +5156,11 @@ function hasMultipliers(bySheet) {
 function roundSheetRow(r) {
   return {
     ...r,
-    floor_sf: round22(r.floor_sf),
-    wall_sf: round22(r.wall_sf),
-    border_sf: round22(r.border_sf),
-    lf: round22(r.lf),
-    ea: round22(r.ea)
+    floor_sf: round23(r.floor_sf),
+    wall_sf: round23(r.wall_sf),
+    border_sf: round23(r.border_sf),
+    lf: round23(r.lf),
+    ea: round23(r.ea)
   };
 }
 function materialsSummary(rows) {
@@ -5113,17 +5171,17 @@ function materialsSummary(rows) {
     cur.qty += m.qty;
     map.set(key, cur);
   }
-  return [...map.values()].map((x) => ({ ...x, qty: round22(x.qty) }));
+  return [...map.values()].map((x) => ({ ...x, qty: round23(x.qty) }));
 }
 function grandTotals(rows) {
   const sum = (k) => rows.reduce((n, r) => n + (r[k] || 0), 0);
   return {
-    total_sf: round22(sum("total_sf")),
-    total_sf_net: round22(sum("total_sf_net")),
-    lf: round22(sum("lf")),
-    lf_net: round22(sum("lf_net")),
+    total_sf: round23(sum("total_sf")),
+    total_sf_net: round23(sum("total_sf_net")),
+    lf: round23(sum("lf")),
+    lf_net: round23(sum("lf_net")),
     ea: sum("ea"),
-    sy_net: round22(sum("sy_net"))
+    sy_net: round23(sum("sy_net"))
   };
 }
 function reportJson({ projectName = "", rows = [], bySheet = [], scaleInfo = [], markups = [], rfis = [], sheetLabel = null, conditionColumns = [], attrsByCond = null, shapeLabels = [], byLabel = [], displayUnits = "imperial", rollGoods = [] }) {
@@ -5621,7 +5679,7 @@ function computeRollTakeoff(conditions, shapes, dimsFor, uppFor) {
       orderFt,
       rollCount: rollLayoutRollCount(layout.strips),
       oversize: layout.strips.some((s) => s.overRoll),
-      qty: round22(rollQtyForUnit(orderFt, config.rollWidthFt, unit)),
+      qty: round23(rollQtyForUnit(orderFt, config.rollWidthFt, unit)),
       unit,
       cutCount: layout.strips.length,
       seamLf: seamLfForStrips(layout.strips),
@@ -5674,16 +5732,16 @@ function rollReportRows(rollByCond, rows) {
       roll_length_ft: ri.config.rollLengthFt,
       direction: ri.direction,
       cuts: ri.cutCount,
-      order_lf: round22(ri.orderFt * mult),
+      order_lf: round23(ri.orderFt * mult),
       rolls: ri.rollCount * mult,
-      order_qty: round22(ri.qty * mult),
+      order_qty: round23(ri.qty * mult),
       order_unit: ri.unit,
       oversize: ri.oversize,
       // seam_lf APPENDS last (the additive-only convention the roll_goods
       // block already follows): the figured weld-rod / seam-tape length, ×N
       // like every other reported quantity. 0 is a real answer — a layout
       // whose rooms each fit one strip has no seams to weld.
-      seam_lf: round22((ri.seamLf || 0) * mult)
+      seam_lf: round23((ri.seamLf || 0) * mult)
     });
   }
   return out;
@@ -7153,26 +7211,40 @@ var Session = class _Session {
       const s = this.sheet(key);
       if (s.upp == null) throw new UserError(`${key} has no scale \u2014 a transition is a real length, so set_scale first (${this.scaleGate(s)})`);
     }
-    const committed = [], withheld = [];
+    const frames = /* @__PURE__ */ new Map();
     for (const key of sheetsInPlay) {
       const s = this.sheet(key);
-      const upp = s.upp;
-      const pxPerFt = 1 / upp;
-      const toPx = (sh) => sh.verts_norm.map(([x, y]) => [x * s.widthPx, y * s.heightPx]);
-      const onSheetA = fa.filter((x) => x.sheet_id === key), onSheetB = fb.filter((x) => x.sheet_id === key);
-      for (const ra of onSheetA) {
-        for (const rb of onSheetB) {
-          const runs = sharedRuns(toPx(ra), toPx(rb), {
-            step_px: Math.max(1, pxPerFt * 0.25),
-            // a quarter-foot walk — finer than any transition matters
-            touch_px: pxPerFt * (1 / 12),
-            // within an inch: one open space, not two rooms
-            max_gap_px: pxPerFt * (maxGapIn / 12),
-            min_len_px: pxPerFt * (minRunIn / 12)
-          });
-          for (const r of runs) this.recordRun(s, r, upp, opts.condition, ra.id, rb.id, a.finish_tag, b.finish_tag, committed, withheld);
-        }
-      }
+      frames.set(key, { widthPx: s.widthPx, heightPx: s.heightPx, upp: s.upp });
+    }
+    const src = (sh) => ({ id: sh.id, sheet_id: sh.sheet_id, verts_norm: sh.verts_norm });
+    const derived = deriveTransitionRuns(
+      { tag: a.finish_tag, shapes: fa.map(src) },
+      { tag: b.finish_tag, shapes: fb.map(src) },
+      frames,
+      { max_gap_in: maxGapIn, min_run_in: minRunIn }
+    );
+    const committed = [], withheld = [];
+    for (const w of derived.withheld) {
+      withheld.push({
+        sheet: w.sheet_id,
+        between_shape_ids: w.between_shape_ids,
+        length_lf: w.length_lf,
+        gap_in: w.gap_in,
+        at: w.at,
+        reason: "wall_separated",
+        detail: `${a.finish_tag} and ${b.finish_tag} run ${w.length_lf} LF apart across ${w.gap_in}" of wall \u2014 adjacent rooms, not a butt joint. If a door opens here the transition is a threshold at the door, which this cannot see.`
+      });
+    }
+    for (const r of derived.runs) {
+      const s = this.sheet(r.sheet_id);
+      const pathPx = r.verts_norm.map(([x, y]) => [x * s.widthPx, y * s.heightPx]);
+      const shape = this.commit(s, opts.condition, "linear", pathPx, { area_sf: 0, perimeter_lf: r.length_lf }, {
+        method: "agent_v1",
+        actor: "agent",
+        reviewed: false,
+        derived: { between_shape_ids: r.between_shape_ids, between: [a.finish_tag, b.finish_tag], case: "butt", gap_in: r.gap_in }
+      });
+      committed.push({ sheet: r.sheet_id, between_shape_ids: r.between_shape_ids, length_lf: r.length_lf, gap_in: r.gap_in, at: r.at, shape_id: shape.id });
     }
     if (committed.length) this.flushCommits("derive_transitions");
     return {
@@ -7186,23 +7258,6 @@ var Session = class _Session {
       note: withheld.length ? `${withheld.length} run(s) are adjacency ACROSS A WALL, not a butt joint \u2014 the transition there is a threshold in the doorway, and the trace record does not say where the doorway is. view_sheet each \`at\` and place them with measure_line / place_count.` : "Every run was a butt joint inside one open space. Verify with view_sheet overlay:true before trusting the total."
     };
   }
-  /** One shared run → committed transition, or a disclosed question. */
-  recordRun(s, r, upp, condition, aId, bId, aTag, bTag, committed, withheld) {
-    const length_lf = round2(r.length_px * upp);
-    const gap_in = round1(r.gap_px * upp * 12);
-    const row = { sheet: s.key, between_shape_ids: [aId, bId], length_lf, gap_in, at: [Math.round(r.at[0]), Math.round(r.at[1])] };
-    if (r.kind === "wall") {
-      withheld.push({ ...row, reason: "wall_separated", detail: `${aTag} and ${bTag} run ${length_lf} LF apart across ${gap_in}" of wall \u2014 adjacent rooms, not a butt joint. If a door opens here the transition is a threshold at the door, which this cannot see.` });
-      return;
-    }
-    const shape = this.commit(s, condition, "linear", r.path, { area_sf: 0, perimeter_lf: length_lf }, {
-      method: "agent_v1",
-      actor: "agent",
-      reviewed: false,
-      derived: { between_shape_ids: [aId, bId], between: [aTag, bTag], case: "butt", gap_in }
-    });
-    committed.push({ ...row, shape_id: shape.id });
-  }
   /** Count markers — the canvas's Count tool (commitCount): one point, one EA,
    * computed {count: 1}, NO scale required (EA is scale-free; the canvas's
    * recompute skips count shapes for the same reason). One shape per point,
@@ -12156,7 +12211,7 @@ function nameTheStageInRefusals(server) {
 // package.json
 var package_default = {
   name: "opentakeoff-mcp",
-  version: "0.9.62",
+  version: "0.9.63",
   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.62",
+  "version": "0.9.63",
   "mcpName": "io.github.Kentucky-ai/opentakeoff",
   "type": "module",
   "description": "OpenTakeoff MCP server — drive the takeoff engine from your MCP client over stdio.",