@floless/app 0.46.0 → 0.47.0

package/dist/floless-server.cjs

@@ -52856,7 +52856,7 @@ function appVersion() {
   return resolveVersion({
     isSea: isSea2(),
     sqVersionXml: readSqVersionXml(),
-    define: true ? "0.46.0" : void 0,
+    define: true ? "0.47.0" : void 0,
     pkgVersion: readPkgVersion()
   });
 }
@@ -52866,7 +52866,7 @@ function resolveChannel(s) {
   return "dev";
 }
 function appChannel() {
-  return resolveChannel({ isSea: isSea2(), define: true ? "0.46.0" : void 0 });
+  return resolveChannel({ isSea: isSea2(), define: true ? "0.47.0" : void 0 });
 }
 
 // workflow-update.ts
@@ -53862,10 +53862,23 @@ function bakeContractIntoApp(sourcePath, contract) {
     });
   }
   const filter = baked.filter;
-  if (filter && typeof filter === "object" && filter.page && typeof filter.page === "object") {
-    const page = { ...filter.page };
-    delete page.bg_b64;
-    baked.filter = { ...filter, page };
+  if (filter && typeof filter === "object") {
+    const stripPage = (p) => {
+      if (p && typeof p === "object") {
+        const page = { ...p };
+        delete page.bg_b64;
+        return page;
+      }
+      return p;
+    };
+    const next = { ...filter };
+    if (filter.page) next.page = stripPage(filter.page);
+    if (Array.isArray(filter.sheets)) {
+      next.sheets = filter.sheets.map(
+        (s) => s && typeof s === "object" ? { ...s, page: stripPage(s.page) } : s
+      );
+    }
+    baked.filter = next;
   }
   doc2.setIn(["nodes", idx, "config", "takeoff"], baked);
   (0, import_node_fs18.writeFileSync)(sourcePath, doc2.toString());

package/dist/schemas/steel.takeoff.v1.schema.json

@@ -37,7 +37,7 @@
       "additionalProperties": false
     },
     "plans": { "type": "array", "items": { "$ref": "#/$defs/plan" } },
-    "filter": { "$ref": "#/$defs/filter", "description": "Layer/thickness/colour filter pre-stage dataset from one compose-time PyMuPDF pass. The saved selection (per-facet `on` flags + `mode`) scopes which lines the reader binds profile labels to; replaces the length heuristic, fallback when absent. CONFIDENTIAL: `page.bg_b64` is machine-local, never committed." },
+    "filter": { "$ref": "#/$defs/filter", "description": "Layer/thickness/colour filter pre-stage. `sheets[]` holds per-framing-plan geometry; the facets + `mode` + on-flag selection are GLOBAL across sheets. The saved selection scopes which lines the reader binds profile labels to per sheet; replaces the length heuristic, fallback when absent. CONFIDENTIAL: each sheet's `page.bg_b64` is machine-local, never committed." },
     "dims3d": { "type": "array", "items": { "$ref": "#/$defs/dim3" }, "description": "Draft-only 3D dimensions (editor annotations, model-global). World-scene mm. NOT baked into the lock / 3D scene / IFC / BOM." }
   },
   "$defs": {
@@ -46,10 +46,16 @@
       "additionalProperties": true,
       "description": "Steel filter pre-stage. Lines render as SVG paths over a dimmed page raster; text spans make profile labels pickable (and feed the label-binding step).",
       "properties": {
+        "active": { "type": "integer", "description": "Index into `sheets` of the active framing plan (mirrors the top-level plans/active)." },
+        "sheets": {
+          "type": "array",
+          "items": { "$ref": "#/$defs/filterSheet" },
+          "description": "Per-sheet filter GEOMETRY — one entry per confirmed framing plan. The facets (layers/thicknesses/colors), `mode` and on-flag selection are GLOBAL (top-level here) and apply to every sheet."
+        },
         "page": {
           "type": "object",
           "required": ["w", "h"],
-          "description": "When present, w and h are required and positive — the view sets the SVG viewBox from them (an empty page would yield viewBox=\"NaN …\").",
+          "description": "LEGACY pre-multisheet single-page geometry (now per-sheet in `sheets[]`). normalizeFilter wraps it into one sheet on load; the view migrates it into `sheets` on Save. When present, w and h are required and positive.",
           "properties": {
             "w": { "type": "number", "minimum": 1 },
             "h": { "type": "number", "minimum": 1 },
@@ -120,6 +126,44 @@
         }
       }
     },
+    "filterSheet": {
+      "type": "object",
+      "required": ["elements"],
+      "additionalProperties": true,
+      "description": "One framing plan's filter geometry. The dimmed `page.bg_b64` raster is CONFIDENTIAL — machine-local, stripped from the baked .flo (contract-bake.ts), never committed.",
+      "properties": {
+        "sheet": { "type": "string", "description": "Sheet number, e.g. S-201 — the switcher label." },
+        "title": { "type": "string" },
+        "page": {
+          "type": "object",
+          "required": ["w", "h"],
+          "properties": {
+            "w": { "type": "number", "minimum": 1 },
+            "h": { "type": "number", "minimum": 1 },
+            "bg_b64": { "type": "string", "description": "Base64 JPEG of this sheet (title block excluded). CONFIDENTIAL — stripped before bake, never committed." }
+          }
+        },
+        "steelBbox": { "type": "array", "items": { "type": "number" }, "minItems": 4, "maxItems": 4, "description": "[x0,y0,x1,y1] of this sheet's steel linework, for Zoom-to-steel." },
+        "elements": {
+          "type": "array",
+          "description": "This sheet's drawing elements: lines (SVG path `d`) and text spans (`text`+`bbox`), each tagged layer/thickness/colour.",
+          "items": {
+            "type": "object",
+            "additionalProperties": true,
+            "properties": {
+              "kind": { "enum": ["line", "text"] },
+              "layer": { "type": "string" },
+              "w": { "type": "number" },
+              "color": { "type": "string" },
+              "d": { "type": "string" },
+              "text": { "type": "string" },
+              "bbox": { "type": "array", "items": { "type": "number" } },
+              "dashed": { "type": "boolean" }
+            }
+          }
+        }
+      }
+    },
     "point2": {
       "type": "array",
       "items": { "type": "number" },

package/dist/skills/floless-app-steel-takeoff/SKILL.md

@@ -41,45 +41,50 @@ and proceed from that path.
 
 ### 1b. Filter pre-stage — isolate the steel linework FIRST (the `filter` node)
 
-Before the heavy read, do **one** deterministic PyMuPDF pass that enumerates *every* drawing
-element by **layer · thickness · colour** and bakes it into the contract's `filter` block. The user
-then opens the **Filter** node (double-click → the steel-filter view) and keeps only the real steel
-lines — by facet (layer/thickness/colour) or the **eyedropper** (click a line or label → Add its
-layer/thickness/colour). The saved selection is what step 2 binds profile labels to, so a clean
-framing plan goes in instead of the whole noisy sheet. This is a big reliability win
-(`S-ANNO-BEAM-STEL` + thick line beats a length-only guess) **and** makes the profile-label search in
-step 2 far cleaner (fewer candidate lines).
-
-One pass, display space (`page.rotation_matrix` — same as step 2, never mix native/display coords):
-
-1. **Lines** — `page.get_drawings()`: for each path keep `{ kind:"line", layer:<OCG name>, w:<stroke
-   width pt>, color:<#rrggbb stroke>, d:<SVG path built from the path items>, dashed:<bool> }`. The
-   **layer** is the path's optional-content group (OCG) name; thickness is the stroke width; colour
-   the stroke colour.
-2. **Text** — `page.get_text("dict")` (or rawdict): for each span keep `{ kind:"text", layer:<OCG>,
-   w:0, color:<#hex>, text:<string>, bbox:[x0,y0,x1,y1] }`. Text elements make profile **labels**
-   pickable (the eyedropper) and are the candidate set step 2's label-binding iterates.
-3. **Facets** — aggregate distinct `layers` / `thicknesses` / `colors` with a `count` each. Round
-   each element's `w` and the facet `w` the **same** way — matching is exact-equality, so a rounding
-   mismatch would silently hide lines. Mark
-   `steel: true` on layers whose name reads as steel framing (e.g. `*BEAM*STEL*`, `*COL*`, `*BRACE*`,
-   `*JOIST*`) → those default **on**; everything else defaults off. Mark `drawable: false` on pure
-   text/dimension/title-block layers (listed for completeness, not drawn as lines).
-4. **Page + bbox** — `page: { w, h, bg_b64 }` where `bg_b64` is a dimmed raster of the framing area
+Before the heavy read, do **one** deterministic PyMuPDF pass **per framing-plan sheet** that enumerates
+*every* drawing element by **layer · thickness · colour** and bakes it into the contract's `filter`
+block. The user then opens the **Filter** node (double-click → the steel-filter view), flips through
+the sheets, and keeps only the real steel lines — by facet (layer/thickness/colour) or the
+**eyedropper**. Because a coordinated drawing set uses one CAD template, the facet selection is
+**global**: narrow once, it applies to every sheet. The saved selection is what step 2 binds profile
+labels to, per sheet.
+
+**First, pick the plans (confirm gate).** From the sheet index (step 2.1) enumerate the framing-plan
+sheets (Foundation, each Floor, Roof). **Show the user the list and get an explicit OK** —
+"I found these framing plans: S-201, S-202, S-301 — filter all of these?" — before the pass. (The full
+elevation/detail classification is the broader workflow; here we only need the plan set.)
+
+Then, for **each** confirmed plan sheet, one pass in display space (`page.rotation_matrix` — never mix
+native/display coords):
+
+1. **Lines** — `page.get_drawings()`: per path keep `{ kind:"line", layer:<OCG name>, w:<stroke width
+   pt>, color:<#rrggbb stroke>, d:<SVG path>, dashed:<bool> }`.
+2. **Text** — `page.get_text("dict")`: per span keep `{ kind:"text", layer:<OCG>, w:0, color:<#hex>,
+   text:<string>, bbox:[x0,y0,x1,y1] }`.
+3. **Per-sheet entry** — push `{ sheet:<number>, title:<name?>, page:{ w, h, bg_b64 }, steelBbox,
+   elements:[…] }` onto `filter.sheets`. `bg_b64` is a dimmed raster of THIS sheet's framing area
    (**title block excluded** — CONFIDENTIAL, machine-local, never committed); `steelBbox` = the bbox
-   of the steel-layer elements (for Zoom-to-steel). Set `mode: "layer"`.
-5. **PUT** the contract with this `filter` block (`PUT /api/contract/steel-takeoff`). On a re-read,
-   preserve any existing per-facet `on` flags the user already set.
-
-Then tell the user to open the **Filter** node, narrow to the steel, and **Save**. The saved `on`
-flags + `mode` are what step 2 reads.
+   of this sheet's steel-layer elements (Zoom-to-steel).
+4. **Global facets (union across sheets)** — aggregate distinct `layers` / `thicknesses` / `colors`
+   with a summed `count` each, ACROSS all sheets, into the top-level `filter.layers/thicknesses/colors`
+   (NOT per-sheet). Round each element's `w` and the facet `w` the **same** way (matching is
+   exact-equality). Mark `steel: true` on layers whose name reads as steel framing (e.g.
+   `*BEAM*STEL*`, `*COL*`, `*BRACE*`, `*JOIST*`) → default **on**; others off. Mark
+   `drawable: false` on pure text/dimension/title-block layers.
+5. Set `filter.mode: "layer"`, `filter.active: 0`. **PUT** the contract
+   (`PUT /api/contract/steel-takeoff`). On a re-read, preserve any existing per-facet `on` flags.
+
+Then tell the user to open the **Filter** node, flip through the sheets, narrow to the steel, and
+**Save**. The saved `on` flags + `mode` are what step 2 reads — **per sheet** (each sheet's elements
+passing `mode` + the global `on` flags).
 
 ### 2. Read it with your own vision — the heavy pipeline
 
 > **Candidate geometry comes from the filter (1b) when present.** If the contract carries a saved
-> `filter`, the member candidate set is the **kept** line elements (those whose layer/thickness/colour
-> pass `mode` + the `on` flags) — bind labels to *those*, not to a length-filtered scan of the whole
-> sheet. The length heuristic below is the **fallback** only when no filter was saved.
+> `filter`, the member candidate set **for each sheet** is that sheet's **kept** line elements
+> (`filter.sheets[i].elements` whose layer/thickness/colour pass the GLOBAL `mode` + `on` flags) —
+> bind labels to *those*, not to a length-filtered scan of the whole sheet. The length heuristic
+> below is the **fallback** only when no filter was saved.
 
 Follow the methodology condensed here (full detail + every gotcha in
 `docs/superpowers/specs/2026-06-17-steel-takeoff-agent-guidance.md`):

package/dist/web/aware.js

@@ -1471,7 +1471,19 @@
     $contractEditor.hidden = false;
     return true;
   }
-  function closeContractEditor() {
+  async function closeContractEditor() {
+    // A surface inside the iframe (the steel filter) can expose a same-origin dirty-guard so we show
+    // OUR styled confirm modal instead of its native beforeunload "Leave site?" (#170). Cross-origin
+    // (about:blank) access throws — treat that as "no guard".
+    let guard = null;
+    try { guard = $contractEditorFrame.contentWindow && $contractEditorFrame.contentWindow.__floGuard; }
+    catch (_) { guard = null; }
+    if (guard && typeof guard.isDirty === 'function' && guard.isDirty()) {
+      const choice = await confirmUnsavedSwitch('', 'You have unsaved changes to the steel filter. What would you like to do?', 'Unsaved filter changes');
+      if (choice === 'cancel') return;                       // keep the view open
+      if (choice === 'save') { const ok = await guard.save(); if (!ok) return; } // save failed → stay open
+      else if (choice === 'discard') { try { guard.discard(); } catch (_) {} }   // silence the backstop
+    }
     $contractEditor.hidden = true;
     $contractEditorFrame.src = 'about:blank'; // tear down the editor session + its draft listeners
   }
@@ -1849,13 +1861,15 @@
   // Save is the primary (Enter); Esc and the backdrop both cancel (the safe,
   // non-destructive default — never lose edits to a stray key/click).
   const $confirmModal = document.getElementById('confirm-modal');
-  function confirmUnsavedSwitch(appName) {
+  function confirmUnsavedSwitch(appName, subMsg, titleMsg) {
     return new Promise((resolve) => {
+      const $title = document.getElementById('confirm-modal-title');
       const $sub = document.getElementById('confirm-modal-sub');
       const $save = document.getElementById('confirm-save');
       const $dont = document.getElementById('confirm-dont-save');
       const $cancel = document.getElementById('confirm-cancel');
-      $sub.textContent = `You changed the inputs for “${appName}” but haven’t saved them yet. What would you like to do?`;
+      $title.textContent = titleMsg || 'Unsaved input changes'; // reset each call (default = the inputs-switch copy)
+      $sub.textContent = subMsg || `You changed the inputs for “${appName}” but haven’t saved them yet. What would you like to do?`;
       showModal($confirmModal);
       setTimeout(() => $save.focus(), 0);
       const done = (result) => {

package/dist/web/index.html

@@ -426,7 +426,7 @@
        input changes. Reuses the shared modal styling; no new backdrop look. -->
   <div class="modal-backdrop" id="confirm-modal">
     <div class="modal">
-      <div class="modal-title">Unsaved input changes</div>
+      <div class="modal-title" id="confirm-modal-title">Unsaved input changes</div>
       <div class="modal-sub" id="confirm-modal-sub"></div>
       <div class="modal-actions">
         <button id="confirm-dont-save">Don’t save</button>

package/dist/web/steel-filter-core.js

@@ -77,3 +77,35 @@ export function applySelToFilter(filter, sel, mode) {
   for (const c of filter.colors || []) c.on = sel.colors.has(c.hex);
   return filter;
 }
+
+/**
+ * Multi-sheet normalizer. The shipped single-sheet filter carries `page`/`steelBbox`/`elements`
+ * at the top level; the multi-sheet shape carries `sheets:[{sheet,title?,page,steelBbox,elements}]`
+ * + `active`. This returns `{ sheets, active }` for both, wrapping a legacy filter into one sheet so
+ * the view has a single code path. Facets (layers/thicknesses/colors) are GLOBAL and stay on the
+ * filter object — they are not touched here.
+ *
+ * ponytail: back-compat bridge for pre-multisheet contracts. Upgrade path: drop the legacy branch
+ * once no single-sheet contracts remain in the wild (the view migrates them forward on Save).
+ */
+export function normalizeFilter(filter) {
+  if (!filter || typeof filter !== 'object') return { sheets: [], active: 0 };
+  let sheets;
+  if (Array.isArray(filter.sheets)) {
+    sheets = filter.sheets;
+  } else if (Array.isArray(filter.elements) && filter.elements.length) {
+    sheets = [{
+      sheet: filter.sheet || '',
+      title: filter.title,
+      page: filter.page,
+      steelBbox: filter.steelBbox,
+      elements: filter.elements,
+    }];
+  } else {
+    sheets = [];
+  }
+  const n = sheets.length;
+  const a = Number.isInteger(filter.active) ? filter.active : 0;
+  const active = (n === 0 || a < 0 || a >= n) ? 0 : a;
+  return { sheets, active };
+}

package/dist/web/steel-filter.html

@@ -24,6 +24,9 @@ button{background:#334155;color:var(--text);border:1px solid #475569;border-radi
 button:hover{background:#475569} button:disabled{opacity:.5;cursor:default}
 button.primary{background:var(--brand);border-color:var(--brand);color:#fff} button.primary:hover{background:#2f6fe0}
 button:focus-visible{outline:2px solid var(--brand);outline-offset:1px}
+select{background:#0f172a;color:var(--text);border:1px solid #475569;border-radius:6px;padding:5px 8px;font:13px system-ui;cursor:pointer}
+select:focus-visible{outline:2px solid var(--brand);outline-offset:1px}
+header select#sheetSel{font-weight:600;min-width:200px;max-width:320px}
 #app{display:flex;flex:1;min-height:0}
 #panel{width:300px;flex:0 0 300px;background:var(--panel);border-right:1px solid var(--line);padding:14px;overflow-y:auto;display:flex;flex-direction:column;gap:18px}
 #panel h2{font-size:11px;text-transform:uppercase;letter-spacing:.06em;color:var(--mut);margin:0 0 8px;display:flex;align-items:center;justify-content:space-between}
@@ -70,6 +73,7 @@ footer{margin-top:auto;display:flex;align-items:center;gap:6px;flex-wrap:wrap;bo
 <body>
 <header>
   <b>Steel filter</b>
+  <select id="sheetSel" title="Switch framing-plan sheet" style="display:none"></select>
   <span id="src" class="stat"></span>
   <span class="sp"></span>
   <span id="saved" class="stat"></span>
@@ -124,7 +128,7 @@ footer{margin-top:auto;display:flex;align-items:center;gap:6px;flex-wrap:wrap;bo
 </div>
 
 <script type="module">
-import { matchesActive, selFromFilter, eyedropperAdd, countShown, applySelToFilter } from './steel-filter-core.js';
+import { matchesActive, selFromFilter, eyedropperAdd, countShown, applySelToFilter, normalizeFilter } from './steel-filter-core.js';
 
 const APP_ID = new URLSearchParams(location.search).get('app') || '';
 const SVGNS = 'http://www.w3.org/2000/svg';
@@ -147,6 +151,8 @@ let mode = 'layer';
 let nodes = [];          // [{ node, el }]
 let layerColor = {};
 let dirty = false;
+let sheets = [];         // normalizeFilter(F).sheets — per-sheet geometry
+let active = 0;          // index into sheets
 
 function setSaved(state){
   savedEl.className = 'stat ' + (state || '');
@@ -162,7 +168,9 @@ async function boot(){
   if(!res.ok){ showEmpty(); return; }
   C = await res.json();
   F = C && C.filter;
-  if(!F || !Array.isArray(F.elements) || !F.elements.length){ showEmpty(); return; }
+  const norm = normalizeFilter(F);
+  sheets = norm.sheets; active = norm.active;
+  if(!F || !sheets.some(s => Array.isArray(s.elements) && s.elements.length)){ showEmpty(); return; }
   document.getElementById('empty').classList.remove('show');
   document.getElementById('src').textContent = (C.source && C.source.name) ? ('· ' + C.source.name) : '';
   initFromFilter();
@@ -178,27 +186,49 @@ function initFromFilter(){
   mode = F.mode || 'layer';
   document.querySelector(`input[name=mode][value="${mode}"]`)?.setAttribute('checked','');
   document.querySelectorAll('input[name=mode]').forEach(r => { r.checked = (r.value === mode); });
-  // layer colours: steel layers vivid+distinct, others a single muted slate
+  // layer colours: steel layers vivid+distinct, others a single muted slate (GLOBAL facets)
   let si = 0;
   layerColor = {};
   for(const l of F.layers || []) layerColor[l.name] = l.steel ? PALETTE[si++ % PALETTE.length] : '#94a3b8';
   sel = selFromFilter(F);
-  // page + viewBox
-  const pg = (F.page && F.page.w > 0 && F.page.h > 0) ? F.page : { w: 1000, h: 1000 };  // guard an empty page → no NaN viewBox
+  // Facets are GLOBAL — one selection for every sheet. The producer (skill step 1b) MUST aggregate
+  // the UNION of layers/thicknesses/colors across all sheets here; a facet value present on a sheet
+  // but missing from these lists has no toggle, so its elements would silently stay hidden.
+  buildFacet('layers', F.layers || [], 'name', it => it.name, it => it.name);
+  buildFacet('thicknesses', F.thicknesses || [], 'w', it => it.w + ' pt', it => it.w);
+  buildFacet('colors', F.colors || [], 'hex', it => it.hex, it => it.hex);
+  // sheet switcher (mirror the editor's planSel) — hidden for a single-sheet set
+  const sheetSel = document.getElementById('sheetSel');
+  sheetSel.innerHTML = sheets.map((s, i) => {
+    const lbl = (s.sheet || ('Sheet ' + (i + 1))) + (s.title ? (' · ' + s.title) : '');
+    return `<option value="${i}">${esc(lbl)}</option>`;
+  }).join('');
+  sheetSel.style.display = sheets.length > 1 ? '' : 'none';
+  sheetSel.onchange = e => setSheet(+e.target.value);
+  setSheet(active);
+}
+
+// Render one framing-plan sheet; facets/sel/mode are global and persist across sheets.
+// Switching sheets is NAVIGATION, not a document edit — it deliberately does not markDirty() (an
+// estimator pages through framing plans constantly; a false "unsaved changes" prompt on read-only
+// browsing is worse than not persisting the viewed-sheet index). `active` is written on the next Save.
+function setSheet(i){
+  active = Math.min(Math.max(0, i|0), sheets.length - 1);
+  const sh = sheets[active] || {};
+  const pg = (sh.page && sh.page.w > 0 && sh.page.h > 0) ? sh.page : { w: 1000, h: 1000 };  // guard empty page → no NaN viewBox
   svg.setAttribute('viewBox', `0 0 ${pg.w} ${pg.h}`);
   if(pg.bg_b64){ bgImg.setAttribute('href', 'data:image/jpeg;base64,' + pg.bg_b64); bgImg.setAttribute('width', pg.w); bgImg.setAttribute('height', pg.h); bgImg.style.display=''; }
   else bgImg.style.display = 'none';
   buildOverlay();
-  buildFacet('layers', F.layers || [], 'name', it => it.name, it => it.name);
-  buildFacet('thicknesses', F.thicknesses || [], 'w', it => it.w + ' pt', it => it.w);
-  buildFacet('colors', F.colors || [], 'hex', it => it.hex, it => it.hex);
-  base = { x: 0, y: 0, w: pg.w, h: pg.h }; vb = { ...base };
+  base = { x: 0, y: 0, w: pg.w, h: pg.h }; vb = { ...base }; setVB();
   apply();
+  closeEye();
+  const ss = document.getElementById('sheetSel'); if(ss) ss.value = String(active);
 }
 
 function buildOverlay(){
   overlay.replaceChildren();
-  nodes = (F.elements || []).map(el => {
+  nodes = ((sheets[active] && sheets[active].elements) || []).map(el => {
     let n;
     if(el.kind === 'text'){
       n = document.createElementNS(SVGNS, 'text');
@@ -271,7 +301,14 @@ function apply(){
     const vis = matchesActive(el, mode, sel);
     node.style.display = vis ? '' : 'none';
   }
-  countEl.innerHTML = '<b>' + countShown(F.elements, mode, sel) + '</b> of <b>' + nodes.length + '</b> elements shown';
+  const cur = (sheets[active] && sheets[active].elements) || [];
+  let html = '<b>' + countShown(cur, mode, sel) + '</b> of <b>' + cur.length + '</b> shown';
+  if(sheets.length > 1){
+    let sa = 0, ta = 0;
+    for(const s of sheets){ const els = s.elements || []; sa += countShown(els, mode, sel); ta += els.length; }
+    html += ' · <b>' + sa + '</b> of <b>' + ta + '</b> total (' + sheets.length + ' sheets)';
+  }
+  countEl.innerHTML = html;
   document.getElementById('facet-layers').classList.toggle('dim', !(mode === 'layer' || mode === 'thickness+layer'));
   document.getElementById('facet-thicknesses').classList.toggle('dim', !mode.startsWith('thickness'));
   document.getElementById('facet-colors').classList.toggle('dim', !(mode === 'color' || mode === 'thickness+color'));
@@ -345,7 +382,7 @@ svg.addEventListener('pointerup', e => {
   drag = null;
 });
 function fit(){ vb = { ...base }; setVB(); }
-function zoomSteel(){ const b = F && F.steelBbox; if(!b){ fit(); return; } const pad = 40; vb = { x: b[0]-pad, y: b[1]-pad, w: (b[2]-b[0])+2*pad, h: (b[3]-b[1])+2*pad }; setVB(); }
+function zoomSteel(){ const b = sheets[active] && sheets[active].steelBbox; if(!b){ fit(); return; } const pad = 40; vb = { x: b[0]-pad, y: b[1]-pad, w: (b[2]-b[0])+2*pad, h: (b[3]-b[1])+2*pad }; setVB(); }
 document.getElementById('fit').onclick = fit;
 document.getElementById('fit2').onclick = fit;
 document.getElementById('zoomsteel').onclick = zoomSteel;
@@ -355,7 +392,9 @@ document.getElementById('zoomsteel2').onclick = zoomSteel;
 saveBtn.onclick = save;
 async function save(){
   if(!C || !F) return;
-  applySelToFilter(F, sel, mode);
+  applySelToFilter(F, sel, mode);     // global facet on-flags + mode
+  F.sheets = sheets; F.active = active;
+  delete F.page; delete F.elements; delete F.steelBbox;  // migrate legacy single-sheet shape forward
   C.filter = F;
   saveBtn.disabled = true; setSaved('');
   try {
@@ -365,6 +404,15 @@ async function save(){
   } catch(e){ console.error('filter save failed', e); setSaved('err'); saveBtn.disabled = false; }
 }
 window.addEventListener('beforeunload', e => { if(dirty){ e.preventDefault(); e.returnValue = ''; } });
+// #170: same-origin bridge so the parent (aware.js) can show ITS styled confirm modal on close
+// instead of the iframe's native beforeunload "Leave site?". beforeunload above stays only as the
+// hard tab/browser-close backstop. save() resolves dirty→false on success; discard() silences the
+// backstop so an intentional close doesn't re-trigger the native prompt.
+window.__floGuard = {
+  isDirty: () => dirty,
+  save: async () => { await save(); return !dirty; },
+  discard: () => { dirty = false; },
+};
 
 // Test seam (mirrors steel-3d-view's debug()/probe()) — lets a headless E2E drive the eyedropper
 // and inspect state deterministically without fragile sub-pixel clicks on thin SVG strokes.
@@ -372,8 +420,11 @@ window.__filterTest = {
   ready: () => !!F,
   mode: () => mode,
   sel: () => ({ layers: [...sel.layers], thicknesses: [...sel.thicknesses], colors: [...sel.colors] }),
-  shown: () => countShown(F.elements, mode, sel),
-  total: () => nodes.length,
+  shown: () => countShown((sheets[active] && sheets[active].elements) || [], mode, sel),
+  total: () => ((sheets[active] && sheets[active].elements) || []).length,
+  sheetCount: () => sheets.length,
+  activeSheet: () => active,
+  setSheet: (i) => setSheet(i),
   pick: (i) => { const el = nodes[i].el; openEyedropper(Math.round(window.innerWidth / 2), 200, el); return el; },
   addAll: () => document.getElementById('eyeAddAll').click(),
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@floless/app",
-  "version": "0.46.0",
+  "version": "0.47.0",
   "type": "module",
   "description": "Thin localhost host for floless.app — serves web/ and shells the aware CLI. No engine, no LLM.",
   "bin": {