opentakeoff-mcp 0.3.0 → 0.5.0

package/README.md

@@ -108,6 +108,7 @@ includes document text, shape vertices, or result payload content.
 | `sheet_info` | One sheet's dims, vector segment count, scale status, detected suggestion, committed shape count. |
 | `set_scale` | Set a sheet's scale — exactly one of `label`, `upp`, `calibrate {p1, p2, feet}`, `use_detected`. |
 | `one_click` | One-Click Area at (x, y): flood fill bounded by the plan linework, traced, vertices snapped. Pass `condition` to commit; `role: "deduct"` subtracts. |
+| `detect_rooms` | Batch One-Click: reads every room-number label off the sheet's text layer and floods each — one call instead of `read_sheet_text` + reasoning + N `one_click` calls. Only cleanly-traced rooms come back; a leaked/dense-linework label is silently withheld. Pass `condition` to commit every detected room. |
 | `measure_polygon` | Area + perimeter of a polygon you supply (min 3 verts). Requires scale. |
 | `measure_line` | Length of an open polyline (min 2 points). Requires scale. |
 | `takeoff_summary` | Per-condition totals + grand totals, computed by the Report's rules. |

package/dist/server-core.js

@@ -740,6 +740,27 @@ function ringArea(pts) {
   return Math.abs(a) / 2;
 }
 
+// ../web/src/lib/detectRooms.ts
+var ROOM_LABEL_RE = /^\d{2,3}[A-Z]?$/;
+function roomLabelSeeds(items) {
+  const out = [];
+  for (const it of items) {
+    const num = (it.str || "").trim().split(/\s+/).find((tok) => ROOM_LABEL_RE.test(tok));
+    if (!num) continue;
+    out.push({ str: num, seed: [it.x, it.y] });
+  }
+  return out;
+}
+function detectRegions(maskObj, seeds, sensitivity = SENS_BALANCED) {
+  const out = [];
+  for (const s of seeds) {
+    const f = floodRegion(maskObj, s.seed[0], s.seed[1], sensitivity);
+    if (f.status !== "ok") continue;
+    out.push({ str: s.str, seed: s.seed, flood: f });
+  }
+  return out;
+}
+
 // ../web/src/lib/geometry.js
 function buildSnapGrid(points, cell) {
   const map = /* @__PURE__ */ new Map();
@@ -884,8 +905,8 @@ var SNAP_CELL = 24;
 var SNAP_TOL = 7;
 var PALETTE = ["#c96442", "#2f7d54", "#2563eb", "#9333ea", "#b8860b", "#0d9488", "#be185d", "#1f2937", "#dc2626", "#0891b2"];
 var HATCH_IDS = ["solid", "diag", "diag2", "cross", "diagdense", "horiz", "vert", "grid", "brick", "plank", "herring", "basket", "checker", "wave", "fleur", "speckle"];
-var _idn = 0;
-var uid = (p) => `${p}-${Date.now().toString(36)}-${(_idn++).toString(36)}`;
+var mintUuid = () => globalThis.crypto && typeof globalThis.crypto.randomUUID === "function" ? globalThis.crypto.randomUUID() : `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}`;
+var uid = (p) => `${p}-${mintUuid()}`;
 var ANN_SCHEMA = "opentakeoff.takeoff_canvas.v1";
 var IMAGE_MAX_EDGE = 1568;
 var sheetSummary = (s) => ({
@@ -1115,13 +1136,64 @@ var Session = class {
     if (opts.condition) {
       shape_id = this.commit(s, opts.condition, opts.role, ring, { area_sf, perimeter_lf }, {
         method: "one_click_v1",
+        actor: "agent",
         seed_norm: [x / s.widthPx, y / s.heightPx],
-        reviewed: true,
+        reviewed: false,
         ...f.hatchFiltered ? { hatch_filtered: true } : {}
       }).id;
     }
     return { ...common, area_sf, perimeter_lf, ...shape_id ? { shape_id } : {} };
   }
+  /** Batch room detection: read every room-number label off the sheet's text
+   *  layer, seed the existing One-Click flood at each, and trace/commit
+   *  exactly like oneClick — just N of them from one call instead of N
+   *  reasoning-heavy round-trips. Same contract as oneClick: no scale → a
+   *  px-only preview per room; no condition → nothing commits (a review
+   *  pass, not a proposal-acceptance gate — this server has none). A region
+   *  that traces to a degenerate ring (<3 verts) is dropped from the batch
+   *  rather than failing the whole call — one bad label must not sink every
+   *  other clean detection on the sheet. */
+  async detectRooms(name, opts) {
+    const s = this.sheet(name);
+    const mask = await this.ensureMask(name);
+    if (!mask) throw new UserError("This sheet has no vector linework (likely a scan); raster fallback not yet available in the MCP server.");
+    const seeds = roomLabelSeeds(s.text);
+    const regions = detectRegions(mask, seeds);
+    const rooms = regions.map((r) => {
+      const ring = snapVertices(traceRegion(r.flood), (px, py, d) => s.snap ? nearestSnap(s.snap, px, py, d) : null, SNAP_TOL);
+      if (ring.length < 3) return null;
+      const areaPx2 = ringArea(ring);
+      const perimPx = closedMetrics(ring).perim;
+      const common = {
+        label: r.str,
+        nverts: ring.length,
+        ...r.flood.hatchFiltered ? { hatch_filtered: true } : {},
+        ...opts.returnVerts ? { verts: ring.map(([vx, vy]) => [round1(vx), round1(vy)]) } : {}
+      };
+      if (s.upp == null) {
+        return { ...common, area_px2: round1(areaPx2), perimeter_px: round1(perimPx) };
+      }
+      const upp = s.upp;
+      const area_sf = round2(areaPx2 * upp * upp);
+      const perimeter_lf = round2(perimPx * upp);
+      let shape_id;
+      if (opts.condition) {
+        shape_id = this.commit(s, opts.condition, opts.role, ring, { area_sf, perimeter_lf }, {
+          method: "one_click_v1",
+          actor: "agent",
+          seed_norm: [r.seed[0] / s.widthPx, r.seed[1] / s.heightPx],
+          reviewed: false,
+          ...r.flood.hatchFiltered ? { hatch_filtered: true } : {}
+        }).id;
+      }
+      return { ...common, area_sf, perimeter_lf, ...shape_id ? { shape_id } : {} };
+    }).filter((r) => r !== null);
+    return {
+      detected: rooms.length,
+      rooms,
+      ...s.upp == null ? { warning: `No scale set for ${s.key} \u2014 quantities unavailable. Call set_scale${s.detected ? ` (detected: ${s.detected.label})` : ""}.` } : {}
+    };
+  }
   measurePolygon(name, verts, opts) {
     const s = this.sheet(name);
     if (s.upp == null) throw new UserError(this.scaleGate(s));
@@ -1129,7 +1201,7 @@ var Session = class {
     const area_sf = round2(met.area * s.upp * s.upp);
     const perimeter_lf = round2(met.perim * s.upp);
     let shape_id;
-    if (opts.condition) shape_id = this.commit(s, opts.condition, opts.role, verts, { area_sf, perimeter_lf }).id;
+    if (opts.condition) shape_id = this.commit(s, opts.condition, opts.role, verts, { area_sf, perimeter_lf }, { method: "manual", actor: "agent" }).id;
     return { area_sf, perimeter_lf, nverts: verts.length, ...shape_id ? { shape_id } : {} };
   }
   measureLine(name, pts, opts) {
@@ -1137,7 +1209,7 @@ var Session = class {
     if (s.upp == null) throw new UserError(this.scaleGate(s));
     const length_lf = round2(openLen(pts) * s.upp);
     let shape_id;
-    if (opts.condition) shape_id = this.commit(s, opts.condition, "linear", pts, { area_sf: 0, perimeter_lf: length_lf }).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;
     return { length_lf, npts: pts.length, ...shape_id ? { shape_id } : {} };
   }
   summary() {
@@ -1243,6 +1315,22 @@ var oneClickOutput = {
   perimeter_px: z.number().optional().describe("Preview mode (no scale): raw perimeter in px"),
   warning: z.string().optional().describe("Preview mode (no scale): why quantities are unavailable and what to do")
 };
+var detectedRoom = z.object({
+  label: z.string().describe('The room-number text the seed was read from (e.g. "104", "139A")'),
+  nverts: z.number().int().describe("Vertex count of the traced polygon"),
+  hatch_filtered: z.literal(true).optional().describe("Present when hatch/pattern linework was classified out of the boundary"),
+  verts: z.array(point).optional().describe("Traced polygon vertices (image px), when return_verts was set"),
+  area_sf: z.number().optional().describe("Scaled mode: traced area in SF"),
+  perimeter_lf: z.number().optional().describe("Scaled mode: traced perimeter in LF"),
+  shape_id: z.string().optional().describe("Scaled mode: id of the committed shape, when condition was passed"),
+  area_px2: z.number().optional().describe("Preview mode (no scale): raw area in px\xB2"),
+  perimeter_px: z.number().optional().describe("Preview mode (no scale): raw perimeter in px")
+});
+var detectRoomsOutput = {
+  detected: z.number().int().describe("Count of cleanly-detected rooms \u2014 may be fewer than the labels found on the sheet"),
+  rooms: z.array(detectedRoom),
+  warning: z.string().optional().describe("Preview mode (no scale): why quantities are unavailable and what to do")
+};
 var measurePolygonOutput = {
   area_sf: z.number(),
   perimeter_lf: z.number(),
@@ -1306,7 +1394,7 @@ var exportTakeoffOutput = {
     measure_role: z.enum(["floor_area", "deduct", "linear"]),
     verts_norm: z.array(point).describe("Vertices normalized to sheet dims (0\u20131)"),
     computed: z.object({ area_sf: z.number(), perimeter_lf: z.number() }).passthrough(),
-    origin: z.object({}).passthrough().optional().describe("Provenance for one-click traces")
+    origin: z.object({}).passthrough().optional().describe("Provenance: method (manual|one_click_v1), actor (omitted=human, 'agent'=MCP/automation), reviewed (human affirmed at an explicit gate), and correction fields (edited, edited_before_create, copied, proposed_verts_norm, edits)")
   }).passthrough()),
   markups: z.array(z.unknown()),
   sheet_group: z.array(z.unknown()),
@@ -1361,7 +1449,7 @@ function registerTools(server, session) {
       label: z2.string().optional().describe("A standard scale label, exactly as listed in the error on a miss"),
       upp: z2.number().optional().describe("Real feet per image px at render scale 2.0"),
       calibrate: z2.object({ p1: pointSchema, p2: pointSchema, feet: z2.number() }).optional().describe("Two points (image px) a known real distance apart, and that distance in feet"),
-      use_detected: z2.boolean().optional().describe("true = adopt the sheet's detected scale")
+      use_detected: z2.literal(true).optional().describe("true = adopt the sheet's detected scale")
     },
     outputSchema: setScaleOutput
   }, run("set_scale", (a) => {
@@ -1381,6 +1469,16 @@ function registerTools(server, session) {
     },
     outputSchema: oneClickOutput
   }, run("one_click", (a) => session.oneClick(a.sheet, a.x, a.y, { condition: a.condition, role: a.role, returnVerts: a.return_verts })));
+  server.registerTool("detect_rooms", {
+    description: `Batch room detection: reads every room-number label off the sheet's text layer (e.g. "134", "OFFICE 101") and runs One-Click at each \u2014 one call instead of read_sheet_text + reasoning + N one_click calls. Only cleanly-traced rooms are returned; a label that leaked or landed in dense linework is silently withheld, never reported as a bad room. With the sheet's scale set, returns area_sf/perimeter_lf per room; pass condition to commit every detected room under that finish tag (role "deduct" makes them subtract). Without a scale, returns px-only quantities per room and commits nothing. ${COORDS}`,
+    inputSchema: {
+      sheet: z2.string(),
+      condition: z2.string().optional().describe("Finish tag to commit every detected room under (minted on first use)"),
+      role: roleSchema,
+      return_verts: z2.boolean().default(false).describe("Include each traced polygon's vertices (image px)")
+    },
+    outputSchema: detectRoomsOutput
+  }, run("detect_rooms", (a) => session.detectRooms(a.sheet, { condition: a.condition, role: a.role, returnVerts: a.return_verts })));
   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. ${COORDS}`,
     inputSchema: {
@@ -1511,7 +1609,7 @@ function registerResources(server, session) {
 // package.json
 var package_default = {
   name: "opentakeoff-mcp",
-  version: "0.3.0",
+  version: "0.5.0",
   mcpName: "io.github.Kentucky-ai/opentakeoff",
   type: "module",
   description: "OpenTakeoff MCP server \u2014 drive the takeoff engine from your MCP client over stdio.",
@@ -1527,7 +1625,7 @@ var package_default = {
     mcpb: "npm run build && node scripts/build-mcpb.mjs",
     prepublishOnly: "npm run typecheck && npm test && npm run build",
     typecheck: "tsc --noEmit",
-    test: "node --import tsx --test test/e2e.test.ts test/resources.test.ts test/session.test.ts test/tools.test.ts"
+    test: "node --import tsx --test test/conformance.test.ts test/e2e.test.ts test/resources.test.ts test/session.test.ts test/tools.test.ts"
   },
   dependencies: {
     "@modelcontextprotocol/sdk": "^1.12.0",

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "opentakeoff-mcp",
-  "version": "0.3.0",
+  "version": "0.5.0",
   "mcpName": "io.github.Kentucky-ai/opentakeoff",
   "type": "module",
-  "description": "OpenTakeoff MCP server \u2014 drive the takeoff engine from your MCP client over stdio.",
+  "description": "OpenTakeoff MCP server — drive the takeoff engine from your MCP client over stdio.",
   "license": "Apache-2.0",
   "engines": {
     "node": ">=20"
@@ -16,7 +16,7 @@
     "mcpb": "npm run build && node scripts/build-mcpb.mjs",
     "prepublishOnly": "npm run typecheck && npm test && npm run build",
     "typecheck": "tsc --noEmit",
-    "test": "node --import tsx --test test/e2e.test.ts test/resources.test.ts test/session.test.ts test/tools.test.ts"
+    "test": "node --import tsx --test test/conformance.test.ts test/e2e.test.ts test/resources.test.ts test/session.test.ts test/tools.test.ts"
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.12.0",