@floless/app 0.34.2 → 0.35.1

package/dist/web/index.html

@@ -33,13 +33,10 @@
         </span>
         <span class="name">FloLess</span>
         </div>
-        <!-- Workspace view switch (Canvas = the workflow topology; Dashboard = the
-             user's custom panels from ~/.floless/ui/extensions.json). The dot on
-             Dashboard lights when panels changed while the user was on Canvas. -->
-        <div class="view-toggle" id="view-toggle" role="group" aria-label="Workspace view">
-          <button type="button" class="view-btn active" data-view="canvas" aria-pressed="true">Canvas</button>
-          <button type="button" class="view-btn" data-view="dashboard" aria-pressed="false">Dashboard<span class="view-dot" id="dash-dot" hidden aria-label="Dashboard updated">●</span></button>
-        </div>
+        <!-- Workspace view switch (Canvas = the workflow topology; Dashboard = the user's
+             custom panels from ~/.floless/ui/extensions.json) moved into the ≡ menu in #149.
+             The "dashboard updated" signal now rides the ≡ hamburger badge (.has-dash-update)
+             and the menu item's dot (#dash-dot, relocated into the menu). -->
         <!-- Shown only while custom panels exist; opens Undo · History · Reset. -->
         <button type="button" id="ext-badge" class="ext-badge" hidden aria-haspopup="menu" aria-expanded="false" aria-controls="ext-menu" data-tip="Your dashboard is customized — undo, history, reset to default">Customized</button>
       </div>
@@ -57,8 +54,8 @@
           </div>
         </div>
         <select id="prompt-select" hidden></select>
-        <button id="browse-btn" data-tip="Browse all installed agents">⊞ Agents</button>
-        <button id="routines-btn" data-tip="Routines — run a workflow on a schedule or a live trigger">⏱ Routines</button>
+        <!-- Agents (⊞) and Routines (⏱) buttons moved into the ≡ menu in #149
+             (Ctrl+G / Ctrl+R); the toolbar keeps only the run-critical controls. -->
         <span class="ctl-sep" aria-hidden="true"></span>
         <span class="run-state" id="run-state" role="status" aria-live="polite"></span>
         <button id="compile-btn" data-tip="Compile + approve → freeze the .lock">⎙ Compile</button>
@@ -265,7 +262,22 @@
       <span class="menu-label">Find on canvas</span>
       <span class="menu-kbd">Ctrl+F</span>
     </button>
+    <!-- Workspace view switch (was the header Canvas|Dashboard toggle, #149). One
+         contextual item: the label names the OTHER view; the dot lights when the
+         dashboard changed while on Canvas. Wired in panels.js (owns the view state). -->
+    <button class="menu-item" data-action="view-switch" role="menuitem">
+      <span class="menu-icon" aria-hidden="true"><svg viewBox="0 0 24 24"><path d="M8 3 4 7l4 4"/><path d="M4 7h16"/><path d="m16 21 4-4-4-4"/><path d="M20 17H4"/></svg></span>
+      <span class="menu-label" id="menu-view-label">Switch to Dashboard</span>
+      <span class="view-dot" id="dash-dot" hidden aria-label="Dashboard updated">●</span>
+    </button>
     <div class="menu-divider"></div>
+    <!-- Agents library (was the header ⊞ Agents button, #149). Heads the agent group
+         (Agents / Graft into agent / Bake into agent). Ctrl+G. -->
+    <button class="menu-item" data-action="agents" role="menuitem">
+      <span class="menu-icon" aria-hidden="true"><svg viewBox="0 0 24 24"><path d="M12 8V4H8"/><rect width="16" height="12" x="4" y="8" rx="2"/><path d="M2 14h2"/><path d="M20 14h2"/><path d="M15 13v2"/><path d="M9 13v2"/></svg></span>
+      <span class="menu-label">Agents</span>
+      <span class="menu-kbd">Ctrl+G</span>
+    </button>
     <button class="menu-item" data-action="graft" role="menuitem">
       <span class="menu-icon" aria-hidden="true"><svg viewBox="0 0 24 24"><path d="M12 22v-5"/><path d="M15 8V2"/><path d="M17 8a1 1 0 0 1 1 1v4a4 4 0 0 1-4 4h-4a4 4 0 0 1-4-4V9a1 1 0 0 1 1-1z"/><path d="M9 8V2"/></svg></span>
       <span class="menu-label">Graft into agent</span>
@@ -283,6 +295,7 @@
     <button class="menu-item" data-action="routines" role="menuitem">
       <span class="menu-icon" aria-hidden="true"><svg viewBox="0 0 24 24"><line x1="10" x2="14" y1="2" y2="2"/><line x1="12" x2="15" y1="14" y2="11"/><circle cx="12" cy="14" r="8"/></svg></span>
       <span class="menu-label">Routines</span>
+      <span class="menu-kbd">Ctrl+R</span>
     </button>
     <div class="menu-divider"></div>
     <button class="menu-item" data-action="report-issue" role="menuitem">

package/dist/web/package.json

@@ -0,0 +1,5 @@
+{
+  "private": true,
+  "type": "module",
+  "//": "Marks web/*.js as ES modules so node (the steel-3d-core unit tests) and the browser agree. Not an npm package — just a module-type marker. The browser ignores it; the bundle copies it harmlessly."
+}

package/dist/web/panels.js

@@ -28,8 +28,9 @@
 
   const $canvasMain = document.getElementById('canvas-main');
   const $dashboard = document.getElementById('dashboard');
-  const $viewToggle = document.getElementById('view-toggle');
-  const $dashDot = document.getElementById('dash-dot');
+  const $dashDot = document.getElementById('dash-dot');             // the "updated" dot, now in the ≡ menu item
+  const $menuBtn = document.getElementById('menu-btn');             // hosts the dashboard-updated badge (#149)
+  const $menuViewLabel = document.getElementById('menu-view-label'); // the ≡ "Switch to Dashboard/Canvas" label
   const $extBadge = document.getElementById('ext-badge');
   const $extMenu = document.getElementById('ext-menu');
   const $extUndo = document.getElementById('ext-undo');
@@ -38,7 +39,7 @@
   const $centerName = document.getElementById('center-panel-name');
   const $centerRole = document.getElementById('center-panel-role');
   const $resetModal = document.getElementById('ext-reset-modal');
-  if (!$dashboard || !$viewToggle) return; // markup absent — nothing to wire
+  if (!$dashboard) return; // markup absent — nothing to wire
 
   const LS_VIEW = 'floless:view';
   let view = 'canvas';
@@ -65,18 +66,23 @@
   const descriptorInvalid = () => !!(ext.validation && ext.validation.valid === false);
 
   // ── view toggle (Canvas | Dashboard) ─────────────────────────────────────────
+  // The "dashboard updated" signal: a dot on the ≡ menu's view-switch item AND a badge on
+  // the ≡ hamburger, so it's visible without opening the menu (#149 — the old toggle that
+  // hosted the dot is gone).
+  function setDashUpdated(on) {
+    if ($dashDot) $dashDot.hidden = !on;
+    if ($menuBtn) $menuBtn.classList.toggle('has-dash-update', on);
+  }
   function applyView() {
     const dash = view === 'dashboard';
     if ($canvasMain) $canvasMain.classList.toggle('view-dashboard', dash);
     $dashboard.hidden = !dash;
-    $viewToggle.querySelectorAll('.view-btn').forEach((b) => {
-      const on = b.dataset.view === view;
-      b.classList.toggle('active', on);
-      b.setAttribute('aria-pressed', on ? 'true' : 'false');
-    });
+    // The Canvas|Dashboard toggle now lives in the ≡ menu as one contextual item (#149):
+    // its label names the OTHER view — the destination of the switch.
+    if ($menuViewLabel) $menuViewLabel.textContent = dash ? 'Switch to Canvas' : 'Switch to Dashboard';
     if ($centerName) $centerName.textContent = dash ? 'Dashboard' : 'Canvas';
     if ($centerRole) $centerRole.textContent = dash ? 'your panels · composed by your terminal AI' : 'transparency layer · read-mostly';
-    if (dash && $dashDot) $dashDot.hidden = true; // seen — clear the "updated" dot
+    if (dash) setDashUpdated(false); // seen — clear the "updated" signal
   }
   function setView(v) {
     view = v === 'dashboard' ? 'dashboard' : 'canvas';
@@ -84,7 +90,15 @@
     applyView();
     if (view === 'dashboard') renderDashboard();
   }
-  $viewToggle.querySelectorAll('.view-btn').forEach((b) => { b.onclick = () => setView(b.dataset.view); });
+  function toggleView() { setView(view === 'dashboard' ? 'canvas' : 'dashboard'); }
+  // The ≡ menu's "Switch to Dashboard/Canvas" item drives the view (the header toggle was
+  // removed in #149). handleMenuAction lives in app.js and is already wrapped in aware.js
+  // for graft/bake; wrap once more here for view-switch and fall through for everything else.
+  const _prevHandleMenuAction = handleMenuAction;
+  handleMenuAction = function (action) {
+    if (action === 'view-switch') { toggleView(); return; }
+    _prevHandleMenuAction(action);
+  };
 
   // ── block renderers (all output escaped; placeholders over errors) ──────────
   const payloadFor = (source) => (typeof source === 'string' ? ext.data[source] : undefined);
@@ -685,7 +699,7 @@
     renderDashboard();
     // Content changed while the user is on Canvas → light the Dashboard dot
     // (never auto-switch — don't yank their context).
-    if (opts.fromChange && view === 'canvas' && allPanels().length && $dashDot) $dashDot.hidden = false;
+    if (opts.fromChange && view === 'canvas' && allPanels().length) setDashUpdated(true);
     refreshPending();
   }
 

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

@@ -0,0 +1,137 @@
+/*
+ * steel-3d-core.js — PURE, framework-free core for the steel 3D editor (no Three.js, no DOM, no
+ * window). Unit-tested in node (server/steel-3d-core.test.ts) AND loaded by web/steel-3d-view.js.
+ * This is the extraction-ready unit: the generic snap engine + the typed-candidate model are what
+ * later lift into AWARE viewer-3d; only `snapCandidates` (beam top-flange centerline, column
+ * plan-center) is steel-specific.
+ *
+ * Coordinate map MUST match server/contract-to-scene.ts (the bake) so editing-space == render-space:
+ *   scene is mm, Z-up. mmX = dispX·k, mmY = -dispY·k   (k = FT_TO_MM / pt_per_ft, Y flipped),
+ *   mmZ = elevation_inches · IN_TO_MM. planPointToWp is the inverse (editing-only; the bake never
+ *   needs it).
+ */
+
+export const FT_TO_MM = 304.8;
+export const IN_TO_MM = 25.4;
+
+const kOf = (ptPerFt) => FT_TO_MM / (ptPerFt > 0 ? ptPerFt : 1);
+
+const nz = (n) => n + 0; // normalize -0 → 0 (negating 0 yields -0, which surprises equality checks)
+
+/** display-space wp point → scene mm [x,y] (Y flipped, matching contractToScene.dispToMm). */
+export function dispToMm(pt, ptPerFt) { const k = kOf(ptPerFt); return [nz(pt[0] * k), nz(-pt[1] * k)]; }
+
+/** scene mm point [x,y,…] → display-space wp [px,py] (inverse of dispToMm). */
+export function planPointToWp(p, ptPerFt) { const k = kOf(ptPerFt); return [nz(p[0] / k), nz(-p[1] / k)]; }
+
+/**
+ * member → its 3D centerline `{ kind, line:[[x,y,z],[x,y,z]] }` in mm, matching contractToScene's
+ * from/to. Beam: work-line at T.O.S. Column: vertical at the plan point, bos→tos.
+ */
+export function memberGeometry(m, ptPerFt, defaultTosMm = 0) {
+  const a = dispToMm(m.wp[0], ptPerFt), b = dispToMm(m.wp[1], ptPerFt);
+  if (m.role === 'column') {
+    const bos = m.col && m.col.bos != null ? m.col.bos * IN_TO_MM : 0;
+    const tos = m.col && m.col.tos != null ? m.col.tos * IN_TO_MM : defaultTosMm;
+    return { kind: 'column', line: [[a[0], a[1], bos], [a[0], a[1], tos]] };
+  }
+  const e = m.ends || [];
+  const z0 = e[0] && e[0].tos != null ? e[0].tos * IN_TO_MM : defaultTosMm;
+  const z1 = e[1] && e[1].tos != null ? e[1].tos * IN_TO_MM : defaultTosMm;
+  return { kind: 'beam', line: [[a[0], a[1], z0], [b[0], b[1], z1]] };
+}
+
+/** XY intersection point of segments a-b and c-d (within both), or null (parallel / outside). */
+function segXY(a, b, c, d) {
+  const rx = b[0] - a[0], ry = b[1] - a[1], sx = d[0] - c[0], sy = d[1] - c[1];
+  const rxs = rx * sy - ry * sx;
+  if (Math.abs(rxs) < 1e-9) return null; // parallel/collinear
+  const qpx = c[0] - a[0], qpy = c[1] - a[1];
+  const t = (qpx * sy - qpy * sx) / rxs, u = (qpx * ry - qpy * rx) / rxs;
+  if (t < 0 || t > 1 || u < 0 || u > 1) return null; // crossing lies outside a segment
+  return [a[0] + rx * t, a[1] + ry * t];
+}
+
+/**
+ * Snap targets from the other members (the dragged one excluded). Beam → its top-flange centerline
+ * (the work-line at T.O.S) + endpoint vertices + a midpoint. Column → a vertical axis at its plan
+ * point + endpoint vertices. Plus member-member centerline INTERSECTIONS (Tekla-standard). Each
+ * tagged `fromId`. Generic `grid-line` targets (from plan grids) plug in here too.
+ */
+export function snapCandidates(members, ptPerFt, defaultTosMm, excludeId) {
+  const out = [];
+  const lines = []; // beam centerlines, for pairwise intersections
+  for (const m of members || []) {
+    if (!m || m.id === excludeId || !Array.isArray(m.wp) || m.wp.length < 2) continue;
+    const { kind, line } = memberGeometry(m, ptPerFt, defaultTosMm);
+    const [p0, p1] = line;
+    if (kind === 'column') { out.push({ type: 'vertical-axis', p: p0, fromId: m.id }); }
+    else {
+      out.push({ type: 'centerline', a: p0, b: p1, fromId: m.id });
+      out.push({ type: 'midpoint', p: [(p0[0] + p1[0]) / 2, (p0[1] + p1[1]) / 2, (p0[2] + p1[2]) / 2], fromId: m.id });
+      lines.push({ id: m.id, p0, p1 });
+    }
+    out.push({ type: 'vertex', p: p0, fromId: m.id });
+    out.push({ type: 'vertex', p: p1, fromId: m.id });
+  }
+  for (let i = 0; i < lines.length; i++) {
+    for (let j = i + 1; j < lines.length; j++) {
+      const x = segXY(lines[i].p0, lines[i].p1, lines[j].p0, lines[j].p1);
+      if (x) out.push({ type: 'intersection', p: [x[0], x[1], (lines[i].p0[2] + lines[j].p0[2]) / 2], fromIds: [lines[i].id, lines[j].id] });
+    }
+  }
+  return out;
+}
+
+/**
+ * Distinct elevation levels (mm, sorted) among the OTHER members' endpoints — the snap targets for a
+ * vertical (Alt) drag, so a member can be raised/lowered onto another's T.O.S level. The caller turns
+ * each level into a point candidate at the dragged member's plan X/Y and reuses snapPoint().
+ */
+export function elevationLevels(members, ptPerFt, defaultTosMm, excludeId) {
+  const set = new Set();
+  for (const m of members || []) {
+    if (!m || m.id === excludeId || !Array.isArray(m.wp) || m.wp.length < 2) continue;
+    const { line } = memberGeometry(m, ptPerFt, defaultTosMm);
+    set.add(Math.round(line[0][2])); set.add(Math.round(line[1][2]));
+  }
+  return [...set].sort((a, b) => a - b);
+}
+
+// Lower wins when two candidates are both within tolerance.
+const PRECEDENCE = { vertex: 0, intersection: 1, midpoint: 2, centerline: 3, 'vertical-axis': 4, 'grid-line': 5, level: 1 };
+
+function closestOnSeg(p, a, b) {
+  const ab = [b[0] - a[0], b[1] - a[1], b[2] - a[2]];
+  const len2 = ab[0] * ab[0] + ab[1] * ab[1] + ab[2] * ab[2] || 1;
+  let t = ((p[0] - a[0]) * ab[0] + (p[1] - a[1]) * ab[1] + (p[2] - a[2]) * ab[2]) / len2;
+  t = Math.max(0, Math.min(1, t));
+  return [a[0] + ab[0] * t, a[1] + ab[1] * t, a[2] + ab[2] * t];
+}
+
+/** The 3D point a candidate proposes for the dragged point. */
+function candidatePoint(c, dragged) {
+  if (c.type === 'vertex' || c.type === 'intersection' || c.type === 'midpoint' || c.type === 'level') return c.p; // fixed points
+  if (c.type === 'vertical-axis') return [c.p[0], c.p[1], dragged[2]]; // lock plan X/Y to the axis, keep dragged Z
+  return closestOnSeg(dragged, c.a, c.b);                              // centerline / grid-line
+}
+
+/**
+ * Snap `dragged` (3D mm) to the nearest candidate within `tolPx` SCREEN pixels. `toScreen` maps a 3D
+ * mm point → `{x,y}` screen px (injected — keeps this DOM-free). Ties within tolerance break by
+ * PRECEDENCE (endpoint > intersection > centerline > axis > grid). Returns `{ snapped, candidate }`;
+ * candidate is null (and snapped === dragged) when nothing is in range.
+ */
+export function snapPoint(dragged, candidates, toScreen, tolPx) {
+  const ds = toScreen(dragged);
+  let best = null, bestPt = null, bestPrec = Infinity, bestD = Infinity;
+  for (const c of candidates || []) {
+    const pt = candidatePoint(c, dragged);
+    const s = toScreen(pt);
+    const d = Math.hypot(s.x - ds.x, s.y - ds.y);
+    if (d > tolPx) continue;
+    const prec = PRECEDENCE[c.type] ?? 9;
+    if (prec < bestPrec || (prec === bestPrec && d < bestD)) { best = c; bestPt = pt; bestPrec = prec; bestD = d; }
+  }
+  return best ? { snapped: bestPt, candidate: best } : { snapped: dragged, candidate: null };
+}