@floless/app 0.74.0 → 0.76.0

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

@@ -236,19 +236,38 @@
     },
     "joint": {
       "type": "object",
-      "required": ["id", "kind", "main"],
+      "required": ["id", "kind"],
       "additionalProperties": true,
-      "description": "A placed connection — the geometry-bearing recipe the connection engine expands into real 3D parts bound to its member(s). Distinct from the `connections[]` library (vendor-neutral type/detail/targets identities a joint can cite). The engine derives all geometry from this recipe + the live member positions, so a joint moves/re-solves with its members. v1 kinds: base-plate, shear-plate.",
+      "description": "A placed connection the connection engine expands into real 3D parts. A parametric RECIPE kind (base-plate, shear-plate) derives all geometry from its `params` + the live member positions, so it moves/re-solves with its members. A 'custom' kind is an imported connection (read from IFC via AWARE's connection-reader) that carries its own opaque tessellated `geometry` and a `place` point — move / replace only, no per-dimension edit. Distinct from the `connections[]` library (vendor-neutral type/detail/targets identities a joint can cite). v1 kinds: base-plate, shear-plate, custom.",
       "properties": {
-        "id": { "type": "string", "description": "Stable joint id, e.g. j-bp-1 / sp-b3-e0." },
-        "kind": { "type": "string", "description": "Connection kind the engine knows how to expand: base-plate, shear-plate (v1). end-plate / cap-plate / … follow." },
-        "main": { "type": "string", "description": "Id of the host member this joint hangs off. For a base-plate this is the column; for a shear-plate this is the SUPPORTED BEAM (the joint sits at one of the beam's ends — see `at`)." },
+        "id": { "type": "string", "description": "Stable joint id, e.g. j-bp-1 / sp-b3-e0 / cx-<id>." },
+        "kind": { "type": "string", "description": "Connection kind: base-plate, shear-plate (parametric recipes the engine expands), or custom (imported IFC geometry). end-plate / cap-plate / … follow." },
+        "main": { "type": "string", "description": "Id of the host member this joint hangs off. For a base-plate this is the column; for a shear-plate this is the SUPPORTED BEAM (the joint sits at one of the beam's ends — see `at`). Required for the recipe kinds; optional for 'custom' (an imported connection carries its own geometry rather than deriving it from a member)." },
         "secondaries": { "type": "array", "items": { "type": "string" }, "description": "Ids of the other members this joint binds — e.g. the SUPPORT a shear-plate frames into. Optional and inferred by geometry; the shear-plate engine does not require it (the fin plate is placed off the beam end + beam axis). Empty for a base-plate." },
         "at": { "type": "string", "description": "Where on the main member the joint sits (kind-dependent): base-plate = base; shear-plate = end0 | end1 — the beam end framing into the support (end0 ↔ ends[0]/start, end1 ↔ ends[1]/end)." },
         "conn": { "type": "string", "description": "Optional `connections[]` row id this joint cites for its type/detail identity (keeps the connection library + confidence scoring in play)." },
-        "params": { "type": "object", "additionalProperties": true, "description": "Geometry settings (mm) with engine defaults; absent = all defaults. base-plate: plateWidth/plateDepth/thickness, boltCols/boltRows/boltDia/edgeDist, weldLeg, anchor kit, levelingNut. shear-plate: plateThickness, plateWidth (along the beam), plateHeight (vertical), boltCols/boltRows/boltDia/boltPitch/edgeDist, weldLeg, clearance (the erection gap so the beam clears the support, ~½–¾\"; pulls the beam box back), webSide (+1/-1 — which face of the beam web the plate laps), boltGrade (A325 | A490 — the AISC bolt length auto-sizes from the grip), stiffener (bool — a full-height stiffener on the far side of a girder web)." },
+        "params": { "type": "object", "additionalProperties": true, "description": "Geometry settings (mm) with engine defaults; absent = all defaults. base-plate: plateWidth/plateDepth/thickness, boltCols/boltRows/boltDia/edgeDist, weldLeg, anchor kit, levelingNut. shear-plate: plateThickness, plateWidth (along the beam), plateHeight (vertical), boltCols/boltRows/boltDia/boltPitch/edgeDist, weldLeg, clearance (the erection gap so the beam clears the support, ~½–¾\"; pulls the beam box back), webSide (+1/-1 — which face of the beam web the plate laps), boltGrade (A325 | A490 — the AISC bolt length auto-sizes from the grip), stiffener (bool — a full-height stiffener on the far side of a girder web). Not used by 'custom'." },
         "source": { "enum": ["auto", "user"], "description": "auto = proposed by auto-detail from the takeoff; user = placed/edited by hand." },
-        "verified": { "type": "boolean", "description": "True = a human confirmed this joint." }
+        "verified": { "type": "boolean", "description": "True = a human confirmed this joint." },
+        "name": { "type": "string", "description": "custom only: display label carried from the source IFC (e.g. \"COLUMN C102\")." },
+        "place": { "$ref": "#/$defs/point3", "description": "custom only: the world-mm point the connection's LOCAL `geometry` is translated by — its placement in the model." },
+        "geometry": { "type": "array", "items": { "$ref": "#/$defs/meshPart" }, "description": "custom only: imported mesh parts (one per plate/bolt/weld) in the connection's LOCAL mm frame. Read once from IFC by AWARE's connection-reader; opaque tessellated geometry (no per-dimension edit)." }
+      },
+      "allOf": [
+        { "if": { "properties": { "kind": { "enum": ["base-plate", "shear-plate"] } } }, "then": { "required": ["main"] } },
+        { "if": { "properties": { "kind": { "const": "custom" } } }, "then": { "required": ["geometry"] } }
+      ]
+    },
+    "meshPart": {
+      "type": "object",
+      "required": ["positions", "indices"],
+      "additionalProperties": true,
+      "description": "One tessellated mesh part of a 'custom' connection (a plate / bolt / weld), in the connection's LOCAL mm frame: flat x,y,z position triples + 0-based triangle indices — AWARE's generic kind:\"mesh\" scene primitive. Read from IFC by the connection-reader; never hand-authored.",
+      "properties": {
+        "id": { "type": "string", "description": "Source part id (the IFC element GlobalId)." },
+        "role": { "type": "string", "description": "Hardware role from the source IFC: plate | bolt | weld." },
+        "positions": { "type": "array", "items": { "type": "number" }, "description": "Flat x,y,z vertex coordinates (mm), local to the connection; length is a multiple of 3." },
+        "indices": { "type": "array", "items": { "type": "number" }, "description": "0-based triangle vertex indices (triples) into positions." }
       }
     },
     "point2": {

package/dist/web/app.css

@@ -3344,6 +3344,8 @@ body {
 .app.mode-workspaces .notes-strip, .app.mode-workspaces .find-overlay,
 /* the ws surfaces carry their own headings — hide the canvas's "Canvas · transparency layer" label */
 .app.mode-workspaces .canvas > .panel-label { display:none !important; }
+/* …but Find in model reuses that overlay — un-hide it while open (Ctrl+F searches editor members). */
+.app.mode-workspaces .find-overlay.show { display: flex !important; }
 /* the editor owns center+right in a project — collapse the inspect column entirely */
 .app.mode-workspaces { --right-width:0px !important; }
 .app.mode-workspaces .inspect { display:none; }
@@ -3473,9 +3475,26 @@ table.hist tr.current td { background:var(--accent-soft); }
 .hist .gate-badge { display:inline-block; padding:2px 7px; border-radius:4px; font-size:9.5px; font-weight:600;
   text-transform:uppercase; letter-spacing:.05em; background:transparent; border:1px solid var(--border-strong); color:var(--text-dim); }
 .hist .gate-badge.model { background:var(--accent-soft); border-color:var(--accent-dim); color:var(--accent-bright); }
-.hist .btn-mini { background:none; border:1px solid var(--border-strong); color:var(--text-muted); border-radius:6px;
+.hist .btn-mini, .ws-drawings-bar .btn-mini, .ws-revision-card .btn-mini { background:none; border:1px solid var(--border-strong); color:var(--text-muted); border-radius:6px;
   padding:4px 10px; font-size:11px; cursor:pointer; white-space:nowrap; }
-.hist .btn-mini:hover { color:var(--text); border-color:var(--accent); }
+.hist .btn-mini:hover, .ws-drawings-bar .btn-mini:hover, .ws-revision-card .btn-mini:hover { color:var(--text); border-color:var(--accent); }
+
+/* ── Workspaces: revision re-read (Slice 4b) — attach band + pending/failed card ── */
+.ws-drawings-bar { flex:none; display:flex; align-items:center; gap:10px; padding:8px 14px; border-bottom:1px solid var(--border); background:var(--surface); }
+.ws-drawings-bar[hidden] { display:none !important; }
+.ws-drawings-bar-label { font-size:10px; color:var(--text-dim); text-transform:uppercase; letter-spacing:.1em; }
+.ws-drawings-bar-sep { flex:1; }
+.ws-revision-card { flex:none; display:flex; align-items:center; gap:10px; padding:9px 14px; border-bottom:1px solid var(--border); background:var(--surface-2); font-size:12px; color:var(--text-muted); }
+.ws-revision-card[hidden] { display:none !important; }
+.ws-revision-card b { color:var(--text); font-weight:600; }
+.ws-revision-card .wrc-text { flex:1; min-width:0; }
+.ws-revision-card .wrc-spin { flex:none; width:14px; height:14px; border:2px solid var(--border-strong); border-top-color:var(--accent); border-radius:50%; animation:spin .8s linear infinite; }
+.ws-revision-card.state-failed { border-left:3px solid var(--err); }
+.ws-revision-card.state-failed .wrc-err-ico { color:var(--err); flex:none; }
+.ws-revision-card.state-failed .wrc-err-detail { color:var(--text-dim); }
+.ws-revision-card .wrc-actions { display:flex; gap:6px; flex:none; }
+@media (prefers-reduced-motion: reduce) { .ws-revision-card .wrc-spin { animation:none; } }
+.hist .gate-badge.ai-read { background:var(--accent-soft); border-color:var(--accent-dim); color:var(--accent-bright); }
 
 /* Rollback confirm — a styled anchored popover (NEVER a native dialog); names the Exports re-lock. */
 .hist-confirm { position:absolute; z-index:20; width:264px; padding:12px 13px; background:var(--surface-3);

package/dist/web/app.js

@@ -1094,6 +1094,10 @@ const $findInput   = document.getElementById('find-input');
 const $findCount   = document.getElementById('find-count');
 
 function openFind() {
+  const ws = window.flolessWorkspaces && window.flolessWorkspaces.findActive();
+  // In Workspaces mode there's nothing to find off the Model step — don't pop a dead overlay.
+  if (document.getElementById('app').classList.contains('mode-workspaces') && !ws) return;
+  $findInput.placeholder = ws ? 'Find in model…' : 'Find agent…';
   $findOverlay.classList.add('show');
   $findInput.value = '';
   $findCount.textContent = '';
@@ -1101,13 +1105,21 @@ function openFind() {
 }
 function closeFind() {
   $findOverlay.classList.remove('show');
+  if (window.flolessWorkspaces && window.flolessWorkspaces.clearFind) window.flolessWorkspaces.clearFind();
   document.querySelectorAll('.agent-card').forEach(c => {
     c.classList.remove('find-dim', 'find-match');
   });
 }
 
 $findInput.addEventListener('input', () => {
-  const q = $findInput.value.toLowerCase().trim();
+  const raw = $findInput.value;
+  const q = raw.toLowerCase().trim();
+  // Workspaces + Model step: search members in the embedded editor, not the canvas.
+  if (window.flolessWorkspaces && window.flolessWorkspaces.findActive()) {
+    const r = window.flolessWorkspaces.find(raw) || { count: 0 };
+    $findCount.textContent = q ? `${r.count} match${r.count === 1 ? '' : 'es'}` : '';
+    return;
+  }
   let matches = 0;
   document.querySelectorAll('.agent-card').forEach(card => {
     if (!q) {

package/dist/web/aware.js

@@ -4655,6 +4655,13 @@
     if (req.type === 'new-workflow') {
       return `Help me build a brand-new floless workflow from scratch, step by step, with your floless-app-new-workflow skill. Ask me what I want it to do, then before writing any node confirm the agents it needs are installed (offer to install a missing one from the catalogue, or to report a not-yet-existing agent as an idea). Author the .flo node by node, verifying each step is correct (plain-English descriptions, validate, compile, a real run), and finish by installing → Compile → ▶ Run so I can see it work and approve.`;
     }
+    if (req.type === 'revision-read') {
+      const snaps = req.snapshots && req.snapshots.length
+        ? `\nRevised drawing${req.snapshots.length > 1 ? 's' : ''} (read these): ${req.snapshots.join(', ')}`
+        : '';
+      const note = req.instruction ? `\nMy note: ${req.instruction}` : '';
+      return `In floless project "${req.project}" (app "${req.appId}"), a REVISED drawing set was attached — re-read it into the SAME project as a new version (do NOT create a new project). Read the drawings per the floless-app-steel-takeoff skill, compose the updated steel.takeoff/v1 contract, then POST /api/projects/${req.project}/revision-read with { contract, message: "<plain-English what changed>", requestId: "${req.id}" }. The server derives the base version + source provenance from this queued request, records a "revision-read" version, and clears the request — do NOT DELETE the request yourself. If you can't read the set, POST /api/projects/${req.project}/revision-requests/${req.id}/fail with { error }.${snaps}${note}`;
+    }
     return '';
   }
 
@@ -4665,6 +4672,7 @@
     tweak: 'floless-app-workflows',
     'ui-customize': 'floless-app-ui',
     rebake: 'floless-app-rebake',
+    'revision-read': 'floless-app-steel-takeoff',
     // The guided-tour ask is picked up by onboarding; the instruction body names the
     // per-app floless-app-<appId> skill for depth when one exists.
     guide: 'floless-app-onboarding',
@@ -4682,10 +4690,15 @@
     if (!body) return '';
     const skill = REQUEST_SKILL[req.type] || 'floless-app-workflows';
     const base = (typeof location !== 'undefined' && location.origin) ? location.origin : 'http://127.0.0.1:4317';
+    // A revision-read is cleared by its own /revision-read POST — a separate DELETE would 404. Every
+    // other type is applied-then-DELETEd by the terminal AI.
+    const clears = req.type === 'revision-read'
+      ? `apply it via the route in the line below (that POST clears this request — do NOT DELETE it separately).`
+      : `apply that request, then DELETE ${base}/api/requests/${req.id}.`;
     const marker =
       `[floless-request type=${req.type} id=${req.id}] — queued from the FloLess Dashboard. ` +
       `Apply it with your ${skill} skill: fetch the authoritative spec from GET ${base}/api/requests, ` +
-      `apply that request, then DELETE ${base}/api/requests/${req.id}. Don't run the line below verbatim.`;
+      `${clears} Don't run the line below verbatim.`;
     return `${marker}\n${body}`;
   }
 
@@ -4764,8 +4777,8 @@
       return;
     }
     $list.innerHTML = pendingRequests.map((r) => {
-      const label = r.type === 'use-template' ? 'template' : r.type === 'ui-customize' ? 'dashboard' : r.type === 'rebake' ? 're-bake' : r.type === 'guide' ? 'guide' : r.type === 'new-workflow' ? 'new workflow' : 'tweak';
-      const badgeCls = r.type === 'tweak' || r.type === 'ui-customize' || r.type === 'rebake' ? 'req-type req-type-tweak' : 'req-type';
+      const label = r.type === 'use-template' ? 'template' : r.type === 'ui-customize' ? 'dashboard' : r.type === 'rebake' ? 're-bake' : r.type === 'revision-read' ? 'revision' : r.type === 'guide' ? 'guide' : r.type === 'new-workflow' ? 'new workflow' : 'tweak';
+      const badgeCls = r.type === 'tweak' || r.type === 'ui-customize' || r.type === 'rebake' || r.type === 'revision-read' ? 'req-type req-type-tweak' : 'req-type';
       const target = r.type === 'tweak' && r.nodeId
         ? ` · node <code>${escapeHtml(r.nodeId)}</code>`
         : r.type === 'rebake' && r.inputName

package/dist/web/index.html

@@ -170,6 +170,15 @@
           <button type="button" data-step="exports" role="tab" aria-selected="false">Exports</button>
           <button type="button" data-step="history" role="tab" aria-selected="false">History</button>
         </div>
+        <!-- Drawings step: a shell toolbar band + revision-read status card ABOVE the filter iframe
+             (chrome around it, never inside — the filter owns its own layout). Shown only on Drawings. -->
+        <div class="ws-drawings-bar" id="ws-drawings-bar" hidden>
+          <span class="ws-drawings-bar-label">Drawing set</span>
+          <span class="ws-drawings-bar-sep"></span>
+          <button type="button" id="ws-attach-revision" class="btn-mini" data-tip="Attach a revised drawing set — your terminal AI reads it into a new version">⤒ Attach revised drawings…</button>
+          <input type="file" id="ws-revision-file" accept=".pdf,image/*" multiple hidden>
+        </div>
+        <div class="ws-revision-card" id="ws-revision-card" hidden></div>
         <!-- Two lazily-srced iframes so switching steps never reloads the editor's 3D state.
              Same-origin like #contract-editor-frame (they call /api/contract directly). -->
         <iframe id="ws-frame-model" class="ws-frame" title="Project model editor" hidden></iframe>

package/dist/web/steel-3d-view.js

@@ -422,6 +422,18 @@ function placeWasher(mesh, el) {
   mesh.position.copy(A); // extrudes from `from` toward `to`
 }
 
+// An imported connection part (slice B): AWARE's generic kind:"mesh" primitive — flat world-mm
+// positions + 0-based triangle indices straight from the connection-reader. Absolute coordinates, so
+// the mesh sits at the root origin like a member box (no local transform). Winding order isn't trusted
+// (its material is double-sided) — computeVertexNormals so it still shades.
+function placeMesh(mesh, el) {
+  const g = new THREE.BufferGeometry();
+  g.setAttribute('position', new THREE.Float32BufferAttribute(el.positions || [], 3));
+  if (Array.isArray(el.indices) && el.indices.length) g.setIndex(el.indices);
+  g.computeVertexNormals();
+  mesh.geometry = g;
+}
+
 // Build a mesh for one scene element by kind: a member box (default) or a connection part. Returns
 // false for an unknown kind so the caller skips it (forward-compatible with later part kinds).
 function placeElement(mesh, el) {
@@ -434,6 +446,7 @@ function placeElement(mesh, el) {
     case 'nut': placeNut(mesh, el); return true;
     case 'washer': placeWasher(mesh, el); return true;
     case 'weld': placeWeld(mesh, el); return true;
+    case 'mesh': placeMesh(mesh, el); return true;
     default: return false;
   }
 }
@@ -444,7 +457,10 @@ function materialFor(groupKey) {
     // Fasteners (anchor rods / bolts / nuts / washers) read more metallic (zinc-plated); plates/welds/members stay matte.
     const metallic = groupKey === 'anchor' || groupKey === 'bolt' || groupKey === 'nut' || groupKey === 'washer';
     const metal = metallic ? 0.5 : 0.1, rough = metallic ? 0.4 : 0.75;
-    baseMat.set(groupKey, new THREE.MeshStandardMaterial({ color: col, metalness: metal, roughness: rough }));
+    // Imported (custom) connection meshes are tessellated with untrusted winding order → render both
+    // faces so no triangle drops out; matte steel like a plate.
+    const dbl = groupKey === 'custom';
+    baseMat.set(groupKey, new THREE.MeshStandardMaterial({ color: col, metalness: metal, roughness: rough, side: dbl ? THREE.DoubleSide : THREE.FrontSide }));
   }
   return baseMat.get(groupKey);
 }