opentakeoff-mcp 0.9.75 → 0.9.76

package/README.md

@@ -178,7 +178,7 @@ reads the tool list once. ([#230](https://github.com/Kentucky-ai/opentakeoff/iss
 | `import_takeoff` | **The way back in**: load a `takeoff_canvas.v1` file (a prior `export_takeoff`, or the app's own save) through the SAME merge rules as the app's Sheet-menu import—finish-tag identity joins conditions (this session's knobs win), new ids append, duplicates skip (idempotent re-import), this session's calibration wins per sheet. Resume, extend, or audit. Correction rules (#88) ride the file too—`apply_rules` re-runs them. |
 | `apply_rules` | **Re-run the correction rules the takeoff arrived with** (#207)—the lessons an estimator TAUGHT the canvas (#88), for example, "every room like this loses the mechanical chase". Same pure `rules.ts` engine the canvas Preview runs; committed as the ONE batch its Apply makes (`reviewed: false`, one undo step, `origin {method rule_v1, actor rule}` with the rule/seed/room citation). The reply's per-rule disclosure—produced, skipped, ids—IS the preview an agent gets. Idempotent by construction: anything an existing deduct covers is dropped by the engine, so re-running after new rooms commit is the intended workflow. Rules arrive ONLY through `import_takeoff`; minting one is an estimator's correction and stays behind the canvas's human Preview→Apply gate. |
 | `export_dxf` | The takeoff as a **CAD drawing**—a DXF (R2000) that AutoCAD, BricsCAD, LibreCAD and Revit import as native geometry. One sheet per file, like a DWG: every committed shape becomes an `LWPOLYLINE` (floor rings closed, walls and linear runs open, counts a circle) on a layer named for its finish—`OT-<TAG>`, with `-DEDUCT` / `-HOLE` / `-WALL` / `-LINEAR` / `-COUNT` suffix layers and room labels on `OT-LABELS`. Real units in the sheet's frame (origin bottom-left, Y up; feet, or `units:"m"`), and a ring's CAD area equals its `export_report` area to rounding. Refuses without a scale; with several sheets carrying shapes, `sheet` picks the drawing. Names every shape left out and why. `path` required. |
-| `export_marked_pdf` | The **marked-up planset**—the deliverable. Writes a distribution-ready PDF: a legend cover (per-condition totals, swatches, by-sheet breakdown) plus every sheet that carries work, vector-copied from the source with shapes, hatches, per-shape quantity chips, and annotations burned in—built by the same module as the canvas's MARKED SET button. Machine-traced shapes are disclosed as pending human review on the document itself, and the cover states where the finish tags came from (`Finish assignment: N schedule-resolved · N agent-asserted · …`, plus any rooms the last assign run withheld). Default path: `<plan> - marked set.pdf` next to the plan (see **Writing to disk** below). Works without `@napi-rs/canvas`. |
+| `export_marked_pdf` | The **marked-up planset**—the deliverable. Writes a distribution-ready PDF: a legend cover (per-condition totals, swatches, by-sheet breakdown) plus every sheet that carries work, vector-copied from the source with shapes, hatches, per-shape quantity chips, and annotations burned in—built by the same module as the canvas's MARKED SET button. Machine-traced shapes are disclosed as pending human review on the document itself, and the cover states where the finish tags came from (`Finish assignment: N schedule-resolved · N agent-asserted · …`, plus any rooms the last assign run withheld). Default path: `<plan> - marked set.pdf` next to the plan (see **Writing to disk** below). Works without `@napi-rs/canvas`. Refuses an **encrypted** source PDF (owner password, empty user password) with the sheet named — its pages cannot be vector-copied and the server has no canvas to render them; export from the app, or supply an unencrypted PDF. |
 | `list_shapes` | The **mid-session inventory**: every committed shape's id, sheet, condition, role, quantities, room `label`, review state, and assignment verdict (`schedule` \| `asserted`—where its finish tag came from) in one compact read—the ids `edit_shape`/`delete_shape` assume you have, without pulling the whole `export_takeoff` payload. Filters by sheet/condition narrow; empty is a result, not an error. |
 | `undo_last` | Step back over your own last `n` mutations, newest first. Exact inverses: a commit is removed, an edit restored verbatim, a delete re-inserted where it was, a materials edit's whole array restored, a condition edit's waste/multiplier pair restored. A whole `detect_rooms` sweep is **one** step. |
 | `annotate` | Place a note ABOUT the work—cloud/highlight (`rect`), text (`at`), callout (`at` + `target`), **arrow** (`from` + `to`—plank/seam direction), **bubble** (`at` + optional `r`—keynote circle, centered text), **dimension** (`from` + `to`—a dimension line with end ticks, labeled with the measured length at the sheet's scale; the one annotation the scale gate applies to—an unscaled sheet refuses like the measure tools). Attach to a condition and it wears that scope's color on the canvas and in the marked set. No review gate: notes are not geometry. |

package/dist/server-core.js

@@ -12930,6 +12930,19 @@ function boostForDark(hex2) {
   return "#" + toHex2(nr) + toHex2(ng) + toHex2(nb);
 }
 
+// ../web/src/lib/markedsetSource.js
+function sourcePageMode({ dark = false, encrypted = false } = {}) {
+  if (dark) return "raster-inverted";
+  if (encrypted) return "raster";
+  return "vector";
+}
+function sourceStampNote(mode) {
+  return mode === "raster" ? " \xB7 raster copy \u2014 the source PDF is encrypted, so its vector page cannot be embedded" : "";
+}
+function noCanvasForRasterMessage(label) {
+  return `${label ? `${label}: ` : ""}the source PDF is encrypted, so its page cannot be copied as vector, and this environment has no canvas to render it as an image. Export the marked set from the app, or supply an unencrypted PDF.`;
+}
+
 // ../web/src/lib/markedset.js
 function authorTallyLine(shapes) {
   const byAuthor = /* @__PURE__ */ new Map();
@@ -13341,7 +13354,7 @@ async function buildMarkedSetPdf({ projectName, dark, sheets, shapes, markups, a
     return src;
   };
   for (const sh of marked) {
-    let pg, toPage, chipRot = degrees(0), W, H;
+    let pg, toPage, chipRot = degrees(0), W, H, mode = "vector";
     if (sh.stitch) {
       const members = sh.stitch.members;
       const pages2 = [];
@@ -13356,7 +13369,10 @@ async function buildMarkedSetPdf({ projectName, dark, sheets, shapes, markups, a
       W = plan.extent.w;
       H = plan.extent.h;
       const pageW = W / RENDER_SCALE, pageH = H / RENDER_SCALE;
-      if (dark) {
+      const encrypted = !dark && (await Promise.all(members.map((m) => srcDocFor(m.file)))).some((d) => d.isEncrypted);
+      mode = sourcePageMode({ dark, encrypted });
+      if (mode === "raster" && typeof document === "undefined") throw new Error(noCanvasForRasterMessage(sh.label));
+      if (mode !== "vector") {
         const s = Math.min(RASTER_MAX / Math.max(pageW, pageH), 4);
         const cv = document.createElement("canvas");
         cv.width = Math.ceil(pageW * s);
@@ -13379,7 +13395,7 @@ async function buildMarkedSetPdf({ projectName, dark, sheets, shapes, markups, a
           ctx.drawImage(mc, pm.dx * k, pm.dy * k);
           ctx.restore();
         }
-        invertPixels(cv);
+        if (dark) invertPixels(cv);
         const png = await doc.embedPng(cv.toDataURL("image/png"));
         pg = doc.addPage([pageW, pageH]);
         pg.drawImage(png, { x: 0, y: 0, width: pageW, height: pageH });
@@ -13399,7 +13415,10 @@ async function buildMarkedSetPdf({ projectName, dark, sheets, shapes, markups, a
       const vpR = page.getViewport({ scale: RENDER_SCALE });
       W = vpR.width;
       H = vpR.height;
-      if (dark) {
+      const src = dark ? null : await srcDocFor(sh.file);
+      mode = sourcePageMode({ dark, encrypted: !!src?.isEncrypted });
+      if (mode === "raster" && typeof document === "undefined") throw new Error(noCanvasForRasterMessage(sh.label));
+      if (mode !== "vector") {
         const vp1 = page.getViewport({ scale: 1 });
         const s = Math.min(RASTER_MAX / Math.max(vp1.width, vp1.height), 4);
         const vp = page.getViewport({ scale: s });
@@ -13407,18 +13426,13 @@ async function buildMarkedSetPdf({ projectName, dark, sheets, shapes, markups, a
         cv.width = Math.ceil(vp.width);
         cv.height = Math.ceil(vp.height);
         await page.render({ canvasContext: cv.getContext("2d"), viewport: vp }).promise;
-        invertPixels(cv);
+        if (dark) invertPixels(cv);
         const png = await doc.embedPng(cv.toDataURL("image/png"));
         pg = doc.addPage([vp1.width, vp1.height]);
         pg.drawImage(png, { x: 0, y: 0, width: vp1.width, height: vp1.height });
         const k = vp1.width / W;
         toPage = (x, y) => [x * k, vp1.height - y * k];
       } else {
-        let src = srcDocs.get(sh.file);
-        if (!src) {
-          src = await PDFDocument.load(await loadPdfData(sh.file), { ignoreEncryption: true });
-          srcDocs.set(sh.file, src);
-        }
         const [copied] = await doc.copyPages(src, [sh.page - 1]);
         pg = doc.addPage(copied);
         const [a, b, c, d, e, f] = vpR.transform;
@@ -13663,7 +13677,7 @@ async function buildMarkedSetPdf({ projectName, dark, sheets, shapes, markups, a
       const tw = bold.widthOfTextAtSize(label, size);
       pg.drawText(label, { x: pcx - tw / 2, y: pcy - size / 2.7, size, font: bold, color: acol, rotate: chipRot });
     }
-    const stamp = sh.stitch ? `${sh.label} \xB7 stitched composite (${sh.stitch.members.map((m) => m.label || m.key).join(" + ")}) \xB7 marked set` : `${sh.label} \xB7 marked set`;
+    const stamp = (sh.stitch ? `${sh.label} \xB7 stitched composite (${sh.stitch.members.map((m) => m.label || m.key).join(" + ")}) \xB7 marked set` : `${sh.label} \xB7 marked set`) + sourceStampNote(mode);
     text(stamp, 14, 20, 8, muted);
   }
   const allPages = doc.getPages();
@@ -14373,7 +14387,7 @@ All-or-nothing, like derive_base: an unknown tag, a transition landing on either
     outputSchema: applyRulesOutput
   }, run("apply_rules", (a) => session.applyRules(a)));
   server.registerTool("export_marked_pdf", {
-    description: `The MARKED-UP PLANSET \u2014 the deliverable of every takeoff. Writes a distribution-ready PDF to disk: a legend cover (per-condition totals, swatches, a by-sheet breakdown) followed by every sheet that carries takeoff shapes or annotations, vector-copied from the source plan with the work burned in as drawn \u2014 condition colors and hatches, a quantity chip on every shape, annotation clouds/callouts/highlights, and approval marks (the estimator's APPROVED rings, the agent's AGENT diamonds \u2014 the cover tallies the split). Built by the same module as the canvas's MARKED SET button, so agent output and app output are one implementation. A construction takeoff is no good without markup: finish EVERY takeoff by writing this file and giving the user its path (export_report carries the numbers for pricing; this carries the evidence). When the shapes were machine-traced and unreviewed, the document says so on its last page \u2014 the review path is importing the export_takeoff payload into the app, where agent shapes arrive as pencil proposals. Default path: next to the loaded plan as "<plan> - marked set.pdf". Needs no native canvas \u2014 pure vector copy, so it works even where view_sheet cannot render.`,
+    description: `The MARKED-UP PLANSET \u2014 the deliverable of every takeoff. Writes a distribution-ready PDF to disk: a legend cover (per-condition totals, swatches, a by-sheet breakdown) followed by every sheet that carries takeoff shapes or annotations, vector-copied from the source plan with the work burned in as drawn \u2014 condition colors and hatches, a quantity chip on every shape, annotation clouds/callouts/highlights, and approval marks (the estimator's APPROVED rings, the agent's AGENT diamonds \u2014 the cover tallies the split). Built by the same module as the canvas's MARKED SET button, so agent output and app output are one implementation. A construction takeoff is no good without markup: finish EVERY takeoff by writing this file and giving the user its path (export_report carries the numbers for pricing; this carries the evidence). When the shapes were machine-traced and unreviewed, the document says so on its last page \u2014 the review path is importing the export_takeoff payload into the app, where agent shapes arrive as pencil proposals. Default path: next to the loaded plan as "<plan> - marked set.pdf". Needs no native canvas \u2014 pure vector copy, so it works even where view_sheet cannot render. The one source it refuses: an ENCRYPTED plan PDF (owner password, empty user password \u2014 it opens everywhere, but its pages cannot be vector-copied and there is no canvas here to render them); the refusal names the sheet \u2014 export the marked set from the app, or supply an unencrypted PDF.`,
     inputSchema: {
       path: z2.string().optional().describe('Where to write the PDF (default: "<plan dir>/<plan> - marked set.pdf")'),
       project_name: z2.string().optional().describe("Cover-page project name (default: the plan file's name)"),
@@ -14939,7 +14953,7 @@ function nameTheStageInRefusals(server) {
 // package.json
 var package_default = {
   name: "opentakeoff-mcp",
-  version: "0.9.75",
+  version: "0.9.76",
   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.75",
+  "version": "0.9.76",
   "mcpName": "io.github.Kentucky-ai/opentakeoff",
   "type": "module",
   "description": "OpenTakeoff MCP server — drive the takeoff engine from your MCP client over stdio.",