opentakeoff-mcp 0.9.86 → 0.9.87

package/dist/server-core.js

@@ -6096,6 +6096,73 @@ function labelPlacements(placements, spans, segs, lum) {
   return out;
 }
 
+// ../web/src/lib/arc.js
+var TAU = Math.PI * 2;
+var norm2 = (a) => (a % TAU + TAU) % TAU;
+function circleThrough(a, m, b) {
+  const [ax, ay] = a, [mx, my] = m, [bx, by] = b;
+  const d = 2 * (ax * (my - by) + mx * (by - ay) + bx * (ay - my));
+  if (!Number.isFinite(d) || Math.abs(d) < 1e-9) return null;
+  const a2 = ax * ax + ay * ay, m2 = mx * mx + my * my, b2 = bx * bx + by * by;
+  const cx = (a2 * (my - by) + m2 * (by - ay) + b2 * (ay - my)) / d;
+  const cy = (a2 * (bx - mx) + m2 * (ax - bx) + b2 * (mx - ax)) / d;
+  const r = Math.hypot(ax - cx, ay - cy);
+  if (!Number.isFinite(r) || r > 1e7) return null;
+  const a0 = Math.atan2(ay - cy, ax - cx);
+  const a1 = Math.atan2(by - cy, bx - cx);
+  const am = Math.atan2(my - cy, mx - cx);
+  const fwd = norm2(a1 - a0);
+  const fwdM = norm2(am - a0);
+  const sweep = fwdM <= fwd ? fwd : fwd - TAU;
+  return { cx, cy, r, a0, a1, am, sweep };
+}
+function stepsFor(r, sweep) {
+  const len = Math.abs(sweep) * r;
+  const bySpan = Math.abs(sweep) / (4 * Math.PI / 180);
+  return Math.max(8, Math.min(96, Math.ceil(Math.max(len / 4, bySpan))));
+}
+function flattenArc(a, m, b) {
+  const c = circleThrough(a, m, b);
+  if (!c) return [];
+  const total = stepsFor(c.r, c.sweep);
+  const toM = c.sweep >= 0 ? norm2(c.am - c.a0) : -norm2(c.a0 - c.am);
+  const f = Math.abs(c.sweep) > 1e-12 ? Math.min(1, Math.abs(toM) / Math.abs(c.sweep)) : 0;
+  const n1 = Math.max(1, Math.min(total - 1, Math.round(total * f)));
+  const n2 = Math.max(1, total - n1);
+  const at = (t) => [c.cx + c.r * Math.cos(t), c.cy + c.r * Math.sin(t)];
+  const out = [];
+  for (let i = 1; i < n1; i++) out.push(at(c.a0 + toM * (i / n1)));
+  out.push([m[0], m[1]]);
+  for (let i = 1; i < n2; i++) out.push(at(c.am + (c.sweep - toM) * (i / n2)));
+  return out;
+}
+function flattenArcRing(pts, throughAt, closed2 = true) {
+  const src = pts || [];
+  const n = src.length;
+  const copy = () => src.map((p) => [p[0], p[1]]);
+  const marks = throughAt instanceof Set ? throughAt : new Set(throughAt || []);
+  if (n < 3 || !marks.size) return copy();
+  const live = new Array(n).fill(false);
+  for (let i = 0; i < n; i++) {
+    if (!marks.has(i)) continue;
+    const hasPrev = closed2 || i > 0;
+    const hasNext = closed2 || i < n - 1;
+    if (!hasPrev || !hasNext) continue;
+    const pi = (i - 1 + n) % n, ni = (i + 1) % n;
+    if (marks.has(pi) || marks.has(ni)) continue;
+    live[i] = true;
+  }
+  const out = [];
+  for (let i = 0; i < n; i++) {
+    if (!live[i]) {
+      out.push([src[i][0], src[i][1]]);
+      continue;
+    }
+    for (const p of flattenArc(src[(i - 1 + n) % n], src[i], src[(i + 1) % n])) out.push(p);
+  }
+  return out;
+}
+
 // ../web/src/lib/shapeMetrics.js
 function computeShapeMetrics(s, dims, upp, cond) {
   const pts = (s.verts_norm || []).map(([nx, ny]) => [nx * dims.w, ny * dims.h]);
@@ -8840,24 +8907,53 @@ var Session = class _Session {
       ...s.upp == null ? { warning: `No scale set for ${s.key} \u2014 quantities unavailable. Call set_scale${s.detected ? ` (detected: ${s.detected.label})` : ""}.` } : {}
     };
   }
+  /** Bend a trace the way the canvas's Curve mode does (#284): `arcThrough`
+   * lists the indices of points that are the MIDDLE of a three-point arc —
+   * the boundary runs pts[i-1] → pts[i] → pts[i+1] as the unique circle
+   * through those three instead of two chords. The arc is baked to ordinary
+   * vertices here (the canvas's flattenArcRing, same steps, same budget), so
+   * SF/LF, the marked set, edit_shape and every export keep seeing a plain
+   * polygon — and the shape's origin carries `curved: true`, the canvas's own
+   * stamp. Refusal over guessing: an index off the trace, a bow point at the
+   * end of an open run (no far corner to bend to), or two bows in a row (no
+   * clean triple) refuse whole rather than silently demoting to a corner. */
+  bend(pts, arcThrough, closed2, tool) {
+    if (!arcThrough?.length) return { pts, arcs: 0 };
+    const n = pts.length;
+    const marks = [...new Set(arcThrough)].sort((a, b) => a - b);
+    for (const i of marks) {
+      if (!Number.isInteger(i) || i < 0 || i >= n) throw new UserError(`${tool}: arc_through index ${i} is off the trace (${n} points, indices 0\u2013${n - 1}).`);
+      if (!closed2 && (i === 0 || i === n - 1)) throw new UserError(`${tool}: arc_through ${i} is an END of the open run \u2014 a bow needs a corner on both sides. State the arc's start, its bow, and its far end as three consecutive points and mark the middle one.`);
+    }
+    for (let k = 1; k < marks.length; k++) {
+      if (marks[k] - marks[k - 1] === 1 || closed2 && marks[0] === 0 && marks[marks.length - 1] === n - 1) {
+        throw new UserError(`${tool}: arc_through marks ${marks[k - 1]} and ${marks[k]} are adjacent \u2014 every arc needs a corner between it and the next. Put a plain vertex where one arc ends and the next begins.`);
+      }
+    }
+    if (n < 3) throw new UserError(`${tool}: an arc needs three points (start, bow, far end); got ${n}.`);
+    const flat = flattenArcRing(pts, marks, closed2);
+    return { pts: flat, arcs: marks.length };
+  }
   measurePolygon(name, verts, opts) {
     const s = this.sheet(name);
     if (s.upp == null) throw new UserError(this.scaleGate(s));
-    const { area_sf = 0, perimeter_lf = 0 } = this.quantify(s, opts.role, verts);
+    const { pts: ring, arcs } = this.bend(verts, opts.arc_through, true, "measure_polygon");
+    const { area_sf = 0, perimeter_lf = 0 } = this.quantify(s, opts.role, ring);
     let shape_id;
-    if (opts.condition) shape_id = this.commit(s, opts.condition, opts.role, verts, { area_sf, perimeter_lf }, { method: "manual", actor: "agent" }).id;
+    if (opts.condition) shape_id = this.commit(s, opts.condition, opts.role, ring, { area_sf, perimeter_lf }, { method: "manual", actor: "agent", ...arcs ? { curved: true } : {} }).id;
     this.flushCommits("measure_polygon");
-    const mixed = this.scaleWarningFor(s, verts);
-    return { area_sf, perimeter_lf, nverts: verts.length, ...shape_id ? { shape_id } : {}, ...mixed ? { warning: mixed } : {} };
+    const mixed = this.scaleWarningFor(s, ring);
+    return { area_sf, perimeter_lf, nverts: ring.length, ...arcs ? { arcs } : {}, ...shape_id ? { shape_id } : {}, ...mixed ? { warning: mixed } : {} };
   }
   measureLine(name, pts, opts) {
     const s = this.sheet(name);
     if (s.upp == null) throw new UserError(this.scaleGate(s));
-    const { perimeter_lf: length_lf = 0 } = this.quantify(s, "linear", pts);
+    const { pts: run2, arcs } = this.bend(pts, opts.arc_through, false, "measure_line");
+    const { perimeter_lf: length_lf = 0 } = this.quantify(s, "linear", run2);
     let shape_id;
-    if (opts.condition) shape_id = this.commit(s, opts.condition, "linear", pts, { area_sf: 0, perimeter_lf: length_lf }, { method: "manual", actor: "agent" }).id;
+    if (opts.condition) shape_id = this.commit(s, opts.condition, "linear", run2, { area_sf: 0, perimeter_lf: length_lf }, { method: "manual", actor: "agent", ...arcs ? { curved: true } : {} }).id;
     this.flushCommits("measure_line");
-    return { length_lf, npts: pts.length, ...shape_id ? { shape_id } : {} };
+    return { length_lf, npts: run2.length, ...arcs ? { arcs } : {}, ...shape_id ? { shape_id } : {} };
   }
   /** Surface Area — the canvas's Surface tool (commitSurface): an OPEN run
    * traced along the wall in plan view, quantified as traced LF × height.
@@ -8868,6 +8964,8 @@ var Session = class _Session {
   measureSurface(name, pts, opts) {
     const s = this.sheet(name);
     if (s.upp == null) throw new UserError(this.scaleGate(s));
+    const bent = this.bend(pts, opts.arc_through, false, "measure_surface");
+    pts = bent.pts;
     const existing = this.conditions.find((x) => x.finish_tag === opts.condition);
     const h = opts.height_ft ?? (Number(existing?.height_ft) || 0);
     if (!(h > 0)) {
@@ -8881,8 +8979,9 @@ var Session = class _Session {
     const LF = openLen(pts) * s.upp;
     const shape = this.commit(s, opts.condition, "surface_area", pts, { area_sf: round2(LF * h), perimeter_lf: round2(LF) }, { method: "manual", actor: "agent" });
     shape.height_ft = h;
+    if (bent.arcs && shape.origin) shape.origin = { ...shape.origin, curved: true };
     this.flushCommits("measure_surface");
-    return { condition: c.finish_tag, height_ft: h, length_lf: round2(LF), area_sf: round2(LF * h), npts: pts.length, shape_id: shape.id };
+    return { condition: c.finish_tag, height_ft: h, length_lf: round2(LF), area_sf: round2(LF * h), npts: pts.length, ...bent.arcs ? { arcs: bent.arcs } : {}, shape_id: shape.id };
   }
   // ── Proposals (#365) ──────────────────────────────────────────────────────
   // A shape an agent commits lands reviewed:false and the estimator accepts
@@ -9535,10 +9634,10 @@ var Session = class _Session {
     const base = chain[0].origin.parent_prev;
     const r = recomposeCutouts(px(base.verts_norm), (base.verts_norm_holes ?? []).map(px), rest.map((x) => px(x.verts_norm)));
     if (!r) return null;
-    const norm2 = (ring) => ring.map(([x, y]) => [x / s.widthPx, y / s.heightPx]);
+    const norm3 = (ring) => ring.map(([x, y]) => [x / s.widthPx, y / s.heightPx]);
     return {
-      verts_norm: norm2(r.outer),
-      ...r.holes.length ? { verts_norm_holes: r.holes.map(norm2) } : {},
+      verts_norm: norm3(r.outer),
+      ...r.holes.length ? { verts_norm_holes: r.holes.map(norm3) } : {},
       computed: { area_sf: round2(r.area * upp * upp), perimeter_lf: round2(r.perim * upp) }
     };
   }
@@ -11955,6 +12054,7 @@ var measurePolygonOutput = {
   area_sf: z.number(),
   perimeter_lf: z.number(),
   nverts: z.number().int(),
+  arcs: z.number().int().optional().describe("How many arc_through bows were laid \u2014 present only when the trace was bent; the vertices reported are the baked arc, not the three points you gave"),
   shape_id: z.string().optional().describe("Present when condition was passed and the shape committed"),
   warning: z.string().optional().describe("Mixed-scale warning (#153): a scale note disagreeing with the sheet's sits in the measured region \u2014 verify before trusting these numbers")
 };
@@ -11964,6 +12064,7 @@ var measureSurfaceOutput = {
   length_lf: z.number().describe("The traced run's open length"),
   area_sf: z.number().describe("length_lf \xD7 height_ft \u2014 the wall SF committed"),
   npts: z.number().int(),
+  arcs: z.number().int().optional().describe("How many arc_through bows were laid \u2014 present only when the trace was bent; the vertices reported are the baked arc, not the three points you gave"),
   shape_id: z.string()
 };
 var placeCountOutput = {
@@ -12064,6 +12165,7 @@ var symbolSweepOutput = {
 var measureLineOutput = {
   length_lf: z.number(),
   npts: z.number().int(),
+  arcs: z.number().int().optional().describe("How many arc_through bows were laid \u2014 present only when the trace was bent; the vertices reported are the baked arc, not the three points you gave"),
   shape_id: z.string().optional().describe("Present when condition was passed and the shape committed")
 };
 var summaryRow = z.object({
@@ -13360,6 +13462,78 @@ function boostForDark(hex2) {
   return "#" + toHex2(nr) + toHex2(ng) + toHex2(nb);
 }
 
+// ../web/src/lib/markupText.js
+var NOTE_PT = 8.5;
+var NOTE_MAX_W_PT = 216;
+var LINE_PITCH = 1.28;
+var NOTE_PAD_PT = 3;
+function ptToImg(pt) {
+  return pt * RENDER_SCALE;
+}
+function wrapLines(text, maxW, measure) {
+  const src = String(text ?? "");
+  if (!src.trim()) return [];
+  const out = [];
+  for (const para of src.split(/\r?\n/)) {
+    const words = para.trim().split(/\s+/).filter(Boolean);
+    if (!words.length) {
+      out.push("");
+      continue;
+    }
+    let line = "";
+    for (const w of words) {
+      const cand = line ? `${line} ${w}` : w;
+      if (measure(cand) <= maxW || !line && measure(w) <= maxW) {
+        line = cand;
+        continue;
+      }
+      if (line) {
+        out.push(line);
+        line = "";
+      }
+      if (measure(w) <= maxW) {
+        line = w;
+        continue;
+      }
+      let piece = "";
+      for (const ch of w) {
+        if (measure(piece + ch) > maxW && piece) {
+          out.push(piece);
+          piece = ch;
+        } else piece += ch;
+      }
+      line = piece;
+    }
+    out.push(line);
+  }
+  return out;
+}
+function layoutNote({ text, fontPx, measure, maxWPx, padPx }) {
+  const ratio = fontPx / ptToImg(NOTE_PT);
+  const maxW = maxWPx > 0 ? maxWPx : ptToImg(NOTE_MAX_W_PT) * ratio;
+  const pad = padPx >= 0 ? padPx : ptToImg(NOTE_PAD_PT) * ratio;
+  const lines = wrapLines(text, maxW - 2 * pad, measure);
+  const lineH = fontPx * LINE_PITCH;
+  const widest = lines.reduce((m, l) => Math.max(m, measure(l)), 0);
+  return {
+    lines,
+    fontPx,
+    lineH,
+    padX: pad,
+    padY: pad,
+    w: lines.length ? widest + 2 * pad : 0,
+    h: lines.length ? lines.length * lineH + 2 * pad : 0
+  };
+}
+function noteBox(ax, ay, L) {
+  const x0 = ax - L.padX;
+  const y0 = ay - L.fontPx - L.padY;
+  return { x0, y0, x1: x0 + L.w, y1: y0 + L.h };
+}
+function lineBaseline(ay, L, i) {
+  return ay + i * L.lineH;
+}
+
 // ../web/src/lib/markedsetSource.js
 function sourcePageMode({ dark = false, encrypted = false } = {}) {
   if (dark) return "raster-inverted";
@@ -13896,6 +14070,28 @@ async function buildMarkedSetPdf({ projectName, dark, sheets, shapes, markups, a
       const [px, py] = toPage(x, y);
       pg.drawText(winAnsiSafe(t), { x: px, y: py, size, font: fnt, color: colorRgb, rotate: chipRot });
     };
+    const noteBlock = (raw, ax, ay, colorRgb, backing) => {
+      const t = winAnsiSafe(raw);
+      const fs = NOTE_PT / ptScale;
+      const L = layoutNote({ text: t, fontPx: fs, measure: (str) => bold.widthOfTextAtSize(str, NOTE_PT) / ptScale });
+      if (!L.lines.length) return;
+      const b = noteBox(ax, ay, L);
+      const dp = imageDrawParams(toPage, b.x0, b.y0, L.w, L.h);
+      pg.drawRectangle({
+        x: dp.x,
+        y: dp.y,
+        width: dp.width,
+        height: dp.height,
+        rotate: degrees(dp.rotateDeg),
+        color: backing,
+        opacity: 0.92,
+        borderColor: colorRgb,
+        borderWidth: 0.7
+      });
+      L.lines.forEach((ln, i) => {
+        if (ln) text(ln, ax, lineBaseline(ay, L, i), NOTE_PT, colorRgb, bold);
+      });
+    };
     const chip = (raw, x, y, borderRgb) => {
       const t = winAnsiSafe(raw);
       const size = 7.5;
@@ -14040,7 +14236,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 });
         }
-        text(lbl(m.text), m.at[0] * W, m.at[1] * H, 8.5, mcol, bold);
+        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));
+      } 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));
       } 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) {
@@ -14591,15 +14789,16 @@ function registerTools(realServer, session, opts = {}) {
     outputSchema: proposeTakeoffOutput
   }, run("propose_takeoff", (a) => session.proposeTakeoff(a.label, a.rationale)));
   server.registerTool("measure_polygon", {
-    description: `Measure a closed polygon you supply (min 3 vertices, image px): area_sf and perimeter_lf at the sheet's scale. Requires the scale to be set. Pass condition to commit it; role "deduct" subtracts. A room ring belongs on the innermost wall-face strokes from get_sheet_vectors, crossing each door opening on the wall centerline and wrapping columns and stubs; never on a hatch edge, casework or a door leaf. Check it with view_sheet overlay:true on a tight crop and fix it with edit_shape. ${COORDS}`,
+    description: `Measure a closed polygon you supply (min 3 vertices, image px): area_sf and perimeter_lf at the sheet's scale. Requires the scale to be set. Pass condition to commit it; role "deduct" subtracts. A room ring belongs on the innermost wall-face strokes from get_sheet_vectors, crossing each door opening on the wall centerline and wrapping columns and stubs; never on a hatch edge, casework or a door leaf. Check it with view_sheet overlay:true on a tight crop and fix it with edit_shape. A CURVED wall is a circle: do not chord it and do not hand-tessellate it \u2014 give the bow one point on the wall and list its index in arc_through. ${COORDS}`,
     inputSchema: {
       sheet: z2.string(),
       verts: z2.array(pointSchema).min(3),
       condition: z2.string().optional(),
-      role: roleSchema
+      role: roleSchema,
+      arc_through: z2.array(z2.number().int().nonnegative()).optional().describe("Indices of points that are the MIDDLE of an arc: the trace runs the point before \u2192 this point \u2192 the point after as the unique circle through the three (the canvas's Curve mode). For a curved wall put one point anywhere ON the bow between its two ends and mark it. The arc is baked to ordinary vertices on commit and origin.curved is stamped; a mark on an end of an open run, or two marks in a row, refuses.")
     },
     outputSchema: measurePolygonOutput
-  }, run("measure_polygon", (a) => session.measurePolygon(a.sheet, a.verts, { condition: a.condition, role: a.role })));
+  }, run("measure_polygon", (a) => session.measurePolygon(a.sheet, a.verts, { condition: a.condition, role: a.role, arc_through: a.arc_through })));
   server.registerTool("cut_out", {
     description: `Cut a REAL hole in a committed floor_area shape (#206) \u2014 the way the canvas cuts one (#137): the same lib/cutout.js boolean subtract, so the two surfaces can never disagree about what a hole holds. The parent keeps its outer ring plus the reconciled hole(s) (verts_norm_holes), its computed nets for real \u2014 N cuts compose, overlap between cuts never double-deducts (set subtraction), a hole ADDS perimeter \u2014 and the deduct commits carrying cuts_shape_id so the report and legend read the reconciled number, never a second arithmetic pass. This is the verb for a column, a floor drain, an island of casework INSIDE a room; an independent measure_polygon role:"deduct" stays the tool for a deduction that isn't a hole in one parent. Refusal over guessing: the ring must sit FULLY inside the parent's outer ring (an edge-crossing cut is a boundary correction \u2014 edit_shape the parent instead), and a cut that would erase the parent or split it in two refuses whole (trace the pieces as rooms). One journal entry \u2014 undo_last restores parent and hole together; delete_shape on the deduct later reverts the cut too (a multi-cut parent rebuilds from the chain's pristine snapshot minus the survivors). AN OPEN RUN IS CLIPPED, NOT SUBTRACTED: wall tile (surface_area) and base/transitions (linear) are polylines traced in plan, so the ring removes the stretch it covers, the run keeps its id and takes what survives, and a cut through the MIDDLE leaves the far side as its own shape (same condition, same height) \u2014 quantities ride the surviving length, which is exact, since wall SF is LF \xD7 height and a border's SF is LF \xD7 thickness. No deduct is minted for a run: there is no area for one to sit on, and a deduct's SF counts against the FLOOR total a run never fills. A ring that misses the run, one that swallows it whole (delete_shape it), and a curved run (its verts are control points) all refuse. A derived base with numeric openings also refuses: those deductions have no stored location; use measure_line for installed runs so a geometric cut cannot erase the numeric allowance. ${COORDS}`,
     inputSchema: {
@@ -14609,24 +14808,26 @@ function registerTools(realServer, session, opts = {}) {
     outputSchema: cutOutOutput
   }, run("cut_out", (a) => session.cutOut(a)));
   server.registerTool("measure_line", {
-    description: `Measure an open polyline (min 2 points, image px): length_lf at the sheet's scale. Requires the scale to be set. Pass condition to commit it as a linear shape (base, transitions, feature strips). ${COORDS}`,
+    description: `Measure an open polyline (min 2 points, image px): length_lf at the sheet's scale. Requires the scale to be set. Pass condition to commit it as a linear shape (base, transitions, feature strips). A curved run (base along a radius wall, a curved feature strip) takes arc_through: one point on the bow, marked. ${COORDS}`,
     inputSchema: {
       sheet: z2.string(),
       pts: z2.array(pointSchema).min(2),
-      condition: z2.string().optional()
+      condition: z2.string().optional(),
+      arc_through: z2.array(z2.number().int().nonnegative()).optional().describe("Indices of points that are the MIDDLE of an arc: the trace runs the point before \u2192 this point \u2192 the point after as the unique circle through the three (the canvas's Curve mode). For a curved wall put one point anywhere ON the bow between its two ends and mark it. The arc is baked to ordinary vertices on commit and origin.curved is stamped; a mark on an end of an open run, or two marks in a row, refuses.")
     },
     outputSchema: measureLineOutput
-  }, run("measure_line", (a) => session.measureLine(a.sheet, a.pts, { condition: a.condition })));
+  }, run("measure_line", (a) => session.measureLine(a.sheet, a.pts, { condition: a.condition, arc_through: a.arc_through })));
   server.registerTool("measure_surface", {
     description: `Surface Area \u2014 wall SF (#146): trace an OPEN run along the wall in plan view (min 2 points, image px) and the quantity is traced LF \xD7 height. This is how wall tile, wainscot, and wall systems are taken off \u2014 the quantity family ${oneClick ? "one_click and " : ""}measure_polygon cannot produce. Height lives on the CONDITION (the canvas's H knob): pass height_ft to set it on this call (journals as its own undo step, like typing H before tracing), or set it once with edit_condition; with neither, this refuses and mints nothing. The shape snapshots the height it was quantified at. Requires the sheet's scale. ${COORDS}`,
     inputSchema: {
       sheet: z2.string(),
       pts: z2.array(pointSchema).min(2).describe("The wall run, an open polyline (image px)"),
       condition: z2.string().describe("Finish tag to commit under (minted on first use), e.g. 'CT-W1'"),
-      height_ft: z2.number().positive().optional().describe("Wall height in feet \u2014 written to the condition's H knob first, then used")
+      height_ft: z2.number().positive().optional().describe("Wall height in feet \u2014 written to the condition's H knob first, then used"),
+      arc_through: z2.array(z2.number().int().nonnegative()).optional().describe("Indices of points that are the MIDDLE of an arc: the trace runs the point before \u2192 this point \u2192 the point after as the unique circle through the three (the canvas's Curve mode). For a curved wall put one point anywhere ON the bow between its two ends and mark it. The arc is baked to ordinary vertices on commit and origin.curved is stamped; a mark on an end of an open run, or two marks in a row, refuses.")
     },
     outputSchema: measureSurfaceOutput
-  }, run("measure_surface", (a) => session.measureSurface(a.sheet, a.pts, { condition: a.condition, height_ft: a.height_ft })));
+  }, run("measure_surface", (a) => session.measureSurface(a.sheet, a.pts, { condition: a.condition, height_ft: a.height_ft, arc_through: a.arc_through })));
   server.registerTool("place_count", {
     description: `Count markers \u2014 EA (#146): one point, one each. Thresholds, stair nosings, floor boxes, entrance mats \u2014 the scale-free quantity family. Commits one count shape per point (computed {count: 1}, exactly the canvas's Count tool), NO scale required, and the whole call is ONE undo step${oneClick ? " like a detect_rooms sweep" : ""}. takeoff_summary reports them as ea; the marked set draws each marker. ${COORDS}`,
     inputSchema: {
@@ -15138,7 +15339,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.86";
+var WIKI_VERSION = "0.9.87";
 var WIKI_PAGES = [
   {
     "key": "index",
@@ -15177,8 +15378,8 @@ var WIKI_PAGES = [
     "uri": "takeoff://wiki/workflows",
     "title": "Workflows",
     "source": "docs/wiki/workflows.md",
-    "source_sha256": "75afa0b82f7163038164851e49f9c63c8ed6c7a69eb2dc1e084423ad8424cc4a",
-    "text": "# Workflows\n\n## Human: open, stitch and measure\n\nOpen the plans and check their revision. Press **G** (or choose **Sheets \u2192 Open\ngallery\u2026**) to open the sheet gallery, then select the\n2\u20134 split sheets in left-to-right order and click **Stitch N into one surface**.\nOn the composite, choose **Align**, click a recognizable point near the joint,\nthen click the same drawn point on the other sheet. Check a second recognizable\npoint and the scale before tracing. Align translates a member; it does not\nrotate or resize it. Once shapes exist on a stitch, alignment is locked.\n\nIf the controls seem missing, **Stitch N into one surface** is in the gallery\nfooter and requires 2\u20134 selected sheets; **Align** appears only on an open\nstitched surface. Create a fresh stitch if Align refuses because takeoffs\nalready exist; deleting a stitch also refuses while takeoffs or markups exist.\n\nUse the composite as one measuring surface. Its marked-set page is labeled as\na composite, not an architect-issued sheet. Save the editable project archive\nwhen preserving the composite is required. MCP has no stitch/alignment tool and\nits current import/export path omits stitches: it cannot be used as a lossless\nhandoff for that document. Have an MCP agent measure source sheets individually\nwith explicit scope boundaries instead.\n\nSource: [Human stitching instructions](https://github.com/Kentucky-ai/opentakeoff/blob/main/docs/USER_GUIDE.md#stitching-a-floor-split-at-a-match-line),\n[stitch records](https://github.com/Kentucky-ai/opentakeoff/blob/main/web/src/lib/stitches.ts),\n[compatibility evidence](https://github.com/Kentucky-ai/opentakeoff/blob/main/protocol/COMPATIBILITY.md).\n\n## Agent: source to reviewed handoff\n\n1. `load_plan` \u2192 inspect sheets/revisions \u2192 `set_scale` on each measured sheet.\n   Confirm the relevant detail's scale, which may differ from the overall plan.\n2. Read source text and vectors; inspect the matching region with `view_sheet`.\n   Use each room's schedule evidence for its finish. Missing/ambiguous evidence\n   is a qualification or RFI, not an inferred assignment.\n3. `propose_takeoff` names a batch; it creates no geometry. Measure small batches\n   with the appropriate area, run, surface or count tool.\n4. Inspect overlays and actual boundaries, openings, jambs and deductions.\n   `edit_shape` corrects pending shapes. Physical base gaps use explicit runs;\n   stepped wall faces use separate height bands. See the [geometry workflow](https://github.com/Kentucky-ai/opentakeoff/blob/main/docs/GEOMETRY_WORKFLOW.md).\n\n### Trace a room the way an estimator does\n\nBlind agent runs against reviewed references showed that the ring, not the\ntotal, is what fails. These rules are what the references are drawn to:\n\n1. The boundary is the **innermost interior wall face**. Never the wall\n   centerline, never the far face, never under a wall. Casework, counters,\n   fixtures, equipment, hatch patterns, dimension strings, text and leaders\n   never define the boundary; the finish runs under casework and fixtures.\n2. Corners sit where two adjacent wall-face strokes meet. Read the strokes with\n   `get_sheet_vectors` over a tight region and put each vertex on a stroke; do\n   not trace a hatch edge or a raster guess.\n3. At every **door or cased opening** the ring follows the face to the jamb,\n   turns into the opening, runs across it on the **wall centerline** (midway\n   between that wall's two faces, the full wall on a composite wall), and\n   returns along the far jamb. Both rooms sharing the door share that segment.\n   A door leaf and its swing arc are never part of the boundary; a leaf drawn\n   standing open looks like a wall line and is not one.\n4. **Windows** and other non-passable openings do not break the ring.\n5. Columns, chases, pilasters and wall stubs that project into the room are\n   traced around; an enclosed cell drawn with wall-weight lines is not floor.\n6. A **finish split** inside one room is two rings sharing the drawn\n   transition line exactly, no overlap and no gap. Where two rooms meet with no\n   wall, split on the drawn transition line or the partition's centerline.\n7. Take the finish from the schedule row; a plan tag alone is a cross-check.\n8. After each ring, `view_sheet` a tight crop with `overlay: true` at a high\n   `px` and look at every corner and notch before the next room; `edit_shape`\n   fixes what the crop shows. A full-sheet render cannot audit a ring.\n\nWhen something is genuinely ambiguous, follow the rule most literally, carry it,\nand say so in the shape's label or an annotation. Do not stop.\n5. `takeoff_summary` and `export_report` check quantities and material coverage.\n   Shorten notes through `list_annotations` \u2192 `edit_annotation` where permitted.\n6. Export editable takeoff JSON and a marked-set PDF, reopen the JSON against\n   the same source, and check the handoff. Leave agent work pending for the\n   human's review; exported files and agent verdicts do not create approval.\n\nThe [MCP route map](takeoff://wiki/mcp) gives the next tool at each step. The\n[agent guide](https://github.com/Kentucky-ai/opentakeoff/blob/main/docs/AGENT_GUIDE.md) covers staging and refusal recovery.\n\n## Evidence that another person can review\n\nKeep source/revision identifiers, calibration choices, measured geometry,\nexpected-versus-observed checks and an overlay or marked-set view. Compare\nspatial agreement as well as quantities. Disclose reference-assisted work;\nit is not a blind accuracy benchmark. Public PRs include screenshots, video or\nreproducible stats, using publishable fixtures. Private drawings and pricing stay\noutside the public repository. See the [repository guide](takeoff://wiki/repo-guide).\n"
+    "source_sha256": "0281270b8f1a87532b6bf1aa1add8e4f39f4adb750a3676398d93b1ac4ee51c8",
+    "text": "# Workflows\n\n## Human: open, stitch and measure\n\nOpen the plans and check their revision. Press **G** (or choose **Sheets \u2192 Open\ngallery\u2026**) to open the sheet gallery, then select the\n2\u20134 split sheets in left-to-right order and click **Stitch N into one surface**.\nOn the composite, choose **Align**, click a recognizable point near the joint,\nthen click the same drawn point on the other sheet. Check a second recognizable\npoint and the scale before tracing. Align translates a member; it does not\nrotate or resize it. Once shapes exist on a stitch, alignment is locked.\n\nIf the controls seem missing, **Stitch N into one surface** is in the gallery\nfooter and requires 2\u20134 selected sheets; **Align** appears only on an open\nstitched surface. Create a fresh stitch if Align refuses because takeoffs\nalready exist; deleting a stitch also refuses while takeoffs or markups exist.\n\nUse the composite as one measuring surface. Its marked-set page is labeled as\na composite, not an architect-issued sheet. Save the editable project archive\nwhen preserving the composite is required. MCP has no stitch/alignment tool and\nits current import/export path omits stitches: it cannot be used as a lossless\nhandoff for that document. Have an MCP agent measure source sheets individually\nwith explicit scope boundaries instead.\n\nSource: [Human stitching instructions](https://github.com/Kentucky-ai/opentakeoff/blob/main/docs/USER_GUIDE.md#stitching-a-floor-split-at-a-match-line),\n[stitch records](https://github.com/Kentucky-ai/opentakeoff/blob/main/web/src/lib/stitches.ts),\n[compatibility evidence](https://github.com/Kentucky-ai/opentakeoff/blob/main/protocol/COMPATIBILITY.md).\n\n## Agent: source to reviewed handoff\n\n1. `load_plan` \u2192 inspect sheets/revisions \u2192 `set_scale` on each measured sheet.\n   Confirm the relevant detail's scale, which may differ from the overall plan.\n2. Read source text and vectors; inspect the matching region with `view_sheet`.\n   Use each room's schedule evidence for its finish. Missing/ambiguous evidence\n   is a qualification or RFI, not an inferred assignment.\n3. `propose_takeoff` names a batch; it creates no geometry. Measure small batches\n   with the appropriate area, run, surface or count tool.\n4. Inspect overlays and actual boundaries, openings, jambs and deductions.\n   `edit_shape` corrects pending shapes. Physical base gaps use explicit runs;\n   stepped wall faces use separate height bands. See the [geometry workflow](https://github.com/Kentucky-ai/opentakeoff/blob/main/docs/GEOMETRY_WORKFLOW.md).\n\n### Trace a room the way an estimator does\n\nBlind agent runs against reviewed references showed that the ring, not the\ntotal, is what fails. These rules are what the references are drawn to:\n\n1. The boundary is the **innermost interior wall face**. Never the wall\n   centerline, never the far face, never under a wall. Casework, counters,\n   fixtures, equipment, hatch patterns, dimension strings, text and leaders\n   never define the boundary; the finish runs under casework and fixtures.\n2. Corners sit where two adjacent wall-face strokes meet. Read the strokes with\n   `get_sheet_vectors` over a tight region and put each vertex on a stroke; do\n   not trace a hatch edge or a raster guess.\n3. At every **door or cased opening** the ring follows the face to the jamb,\n   turns into the opening, runs across it on the **wall centerline** (midway\n   between that wall's two faces, the full wall on a composite wall), and\n   returns along the far jamb. Both rooms sharing the door share that segment.\n   A door leaf and its swing arc are never part of the boundary; a leaf drawn\n   standing open looks like a wall line and is not one.\n4. **Windows** and other non-passable openings do not break the ring.\n5. Columns, chases, pilasters and wall stubs that project into the room are\n   traced around; an enclosed cell drawn with wall-weight lines is not floor.\n6. A **finish split** inside one room is two rings sharing the drawn\n   transition line exactly, no overlap and no gap. Where two rooms meet with no\n   wall, split on the drawn transition line or the partition's centerline.\n7. Take the finish from the schedule row; a plan tag alone is a cross-check.\n8. After each ring, `view_sheet` a tight crop with `overlay: true` at a high\n   `px` and look at every corner and notch before the next room; `edit_shape`\n   fixes what the crop shows. A full-sheet render cannot audit a ring.\n9. A **curved wall is a circle**: the architect drew it with a center and a\n   radius. Never chord it and never hand-place a run of points along it. Give\n   the bow one point anywhere on the wall face between the arc's two ends and\n   list that point's index in `arc_through` on `measure_polygon`,\n   `measure_line` or `measure_surface`; the server lays the unique circle\n   through the three and bakes it to vertices, exactly as the canvas's Curve\n   mode does. `get_sheet_vectors` flags curve chords in its `meta` byte (bit 1)\n   \u2014 a window full of them is a radius wall, so read the bow from a render.\n\nWhen something is genuinely ambiguous, follow the rule most literally, carry it,\nand say so in the shape's label or an annotation. Do not stop.\n5. `takeoff_summary` and `export_report` check quantities and material coverage.\n   Shorten notes through `list_annotations` \u2192 `edit_annotation` where permitted.\n6. Export editable takeoff JSON and a marked-set PDF, reopen the JSON against\n   the same source, and check the handoff. Leave agent work pending for the\n   human's review; exported files and agent verdicts do not create approval.\n\nThe [MCP route map](takeoff://wiki/mcp) gives the next tool at each step. The\n[agent guide](https://github.com/Kentucky-ai/opentakeoff/blob/main/docs/AGENT_GUIDE.md) covers staging and refusal recovery.\n\n## Evidence that another person can review\n\nKeep source/revision identifiers, calibration choices, measured geometry,\nexpected-versus-observed checks and an overlay or marked-set view. Compare\nspatial agreement as well as quantities. Disclose reference-assisted work;\nit is not a blind accuracy benchmark. Public PRs include screenshots, video or\nreproducible stats, using publishable fixtures. Private drawings and pricing stay\noutside the public repository. See the [repository guide](takeoff://wiki/repo-guide).\n"
   },
   {
     "key": "mcp",
@@ -15576,7 +15777,7 @@ function nameTheStageInRefusals(server) {
 // package.json
 var package_default = {
   name: "opentakeoff-mcp",
-  version: "0.9.86",
+  version: "0.9.87",
   mcpName: "io.github.Kentucky-ai/opentakeoff",
   type: "module",
   description: "OpenTakeoff MCP server \u2014 drive the takeoff engine from your MCP client over stdio.",
@@ -15596,7 +15797,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/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/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/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/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.86",
+  "version": "0.9.87",
   "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/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/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/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/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",