@pascal-app/nodes 1.0.3 → 1.0.4

package/dist/stair-segment/parametrics.js

@@ -1,5 +1,11 @@
+import { planStairFlightHeightEdit, } from '@pascal-app/core';
+import { StairSegmentConstructionField } from '../stair/construction-controls';
 export const stairSegmentParametrics = {
     groups: [
+        {
+            label: 'Construction',
+            fields: [{ key: 'construction', kind: 'custom', component: StairSegmentConstructionField }],
+        },
         {
             label: 'Type',
             fields: [
@@ -21,14 +27,20 @@ export const stairSegmentParametrics = {
         {
             label: 'Dimensions',
             fields: [
-                { key: 'width', kind: 'number', unit: 'm', min: 0.5, max: 1000, step: 0.1 },
-                { key: 'length', kind: 'number', unit: 'm', min: 0.5, max: 1000, step: 0.1 },
+                { key: 'width', kind: 'number', unit: 'm', min: 0.001, step: 0.1 },
+                {
+                    key: 'length',
+                    kind: 'number',
+                    unit: 'm',
+                    min: 0.001,
+                    step: 0.1,
+                    visibleIf: (node) => !node.winder,
+                },
                 {
                     key: 'height',
                     kind: 'number',
                     unit: 'm',
-                    min: 0.5,
-                    max: 1000,
+                    min: 0.001,
                     step: 0.1,
                     visibleIf: (node) => node.segmentType === 'stair',
                 },
@@ -37,7 +49,6 @@ export const stairSegmentParametrics = {
                     kind: 'number',
                     label: 'Steps',
                     min: 2,
-                    max: 30,
                     step: 1,
                     visibleIf: (node) => node.segmentType === 'stair',
                 },
@@ -51,8 +62,7 @@ export const stairSegmentParametrics = {
                     key: 'thickness',
                     kind: 'number',
                     unit: 'm',
-                    min: 0.05,
-                    max: 1000,
+                    min: 0.001,
                     step: 0.05,
                     visibleIf: (node) => !node.fillToFloor,
                 },
@@ -77,8 +87,11 @@ export const stairSegmentParametrics = {
         if (!(patch.segmentType && patch.segmentType !== previous?.segmentType))
             return {};
         return patch.segmentType === 'landing'
-            ? { height: 0, length: 1, stepCount: 0 }
+            ? { height: 0, length: 1, stepCount: 0, winder: undefined }
             : { height: 2.5, length: 3, stepCount: 10 };
     },
+    reconcile: (previous, next, nodes) => next.segmentType === 'stair' && next.height !== previous.height
+        ? planStairFlightHeightEdit(next, next.height, nodes).slice(1)
+        : [],
     customPanel: () => import('./panel'),
 };

package/dist/stair-segment/renderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../src/stair-segment/renderer.tsx"],"names":[],"mappings":"AAEA,OAAO,EAGL,KAAK,gBAAgB,EAGtB,MAAM,kBAAkB,CAAA;AAMzB,eAAO,MAAM,oBAAoB,GAAI,UAAU;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,gCAgExE,CAAA;AAED,eAAe,oBAAoB,CAAA"}
+{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../src/stair-segment/renderer.tsx"],"names":[],"mappings":"AAEA,OAAO,EAGL,KAAK,gBAAgB,EAKtB,MAAM,kBAAkB,CAAA;AAOzB,eAAO,MAAM,oBAAoB,GAAI,UAAU;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,gCAoExE,CAAA;AAED,eAAe,oBAAoB,CAAA"}

package/dist/stair-segment/renderer.js

@@ -1,9 +1,10 @@
 'use client';
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useRegistry, useScene, } from '@pascal-app/core';
-import { getStraightStairSegmentBodyMaterials, useNodeEvents, useViewer } from '@pascal-app/viewer';
+import { stairSegmentConstructionError, stairSegmentDetailError, useRegistry, useScene, } from '@pascal-app/core';
+import { getStairBodyMaterials, useNodeEvents, useViewer } from '@pascal-app/viewer';
 import { useEffect, useLayoutEffect, useMemo, useRef } from 'react';
 import { createPlaceholderGeometry } from '../shared/placeholder-geometry';
+import { resolveStairBodySlotMaterials, resolveStairSegmentMaterials } from '../stair/materials';
 export const StairSegmentRenderer = ({ node }) => {
     const ref = useRef(null);
     const nodes = useScene((state) => state.nodes);
@@ -15,34 +16,17 @@ export const StairSegmentRenderer = ({ node }) => {
     const shading = useViewer((s) => s.shading);
     const textures = useViewer((s) => s.textures);
     const colorPreset = useViewer((s) => s.colorPreset);
-    const parentNode = node.parentId
+    const parent = node.parentId
         ? nodes[node.parentId]
         : undefined;
+    const parentNode = parent?.type === 'stair' ? parent : undefined;
+    const sceneMaterials = useScene((state) => state.materials);
     const material = useMemo(() => {
-        return getStraightStairSegmentBodyMaterials(node, parentNode, shading, textures, colorPreset);
-    }, [
-        shading,
-        textures,
-        colorPreset,
-        node.materialPreset,
-        node.material,
-        node.material?.preset,
-        node.material?.properties,
-        node.material?.texture,
-        parentNode?.materialPreset,
-        parentNode?.material,
-        parentNode?.material?.preset,
-        parentNode?.material?.properties,
-        parentNode?.material?.texture,
-        parentNode?.railingMaterialPreset,
-        parentNode?.railingMaterial,
-        parentNode?.sideMaterialPreset,
-        parentNode?.sideMaterial,
-        parentNode?.treadMaterialPreset,
-        parentNode?.treadMaterial,
-        node,
-        parentNode,
-    ]);
+        const parentMaterials = parentNode?.type === 'stair'
+            ? resolveStairBodySlotMaterials(parentNode, getStairBodyMaterials(parentNode, shading, textures, colorPreset), sceneMaterials, shading, textures)
+            : undefined;
+        return resolveStairSegmentMaterials(node, parentNode, parentMaterials, sceneMaterials, shading, textures, colorPreset);
+    }, [node, parentNode, sceneMaterials, shading, textures, colorPreset]);
     // 2 groups map 1:1 to the stair segment's 2-material array (body + tread).
     const placeholderGeometry = useMemo(() => createPlaceholderGeometry(2), []);
     useEffect(() => {
@@ -50,6 +34,10 @@ export const StairSegmentRenderer = ({ node }) => {
             placeholderGeometry.dispose();
         };
     }, [placeholderGeometry]);
-    return (_jsx("mesh", { geometry: placeholderGeometry, material: material, position: node.position, ref: ref, "rotation-y": node.rotation, visible: node.visible, ...handlers }));
+    return (_jsx("mesh", { geometry: placeholderGeometry, material: material, position: node.position, ref: ref, "rotation-y": node.rotation, visible: node.visible, userData: {
+            slotIds: ['treads', 'body'],
+            segmentIds: [node.id, node.id],
+            pascalExportRefusal: stairSegmentDetailError(node) ?? stairSegmentConstructionError(node, parentNode),
+        }, ...handlers }));
 };
 export default StairSegmentRenderer;

package/dist/turbine-vent/definition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../src/turbine-vent/definition.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EAGpB,MAAM,kBAAkB,CAAA;AAIzB,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAoD1C;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,qBAAqB,EAAE,cAAc,CAAC,OAAO,eAAe,CA4DxE,CAAA"}
+{"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../src/turbine-vent/definition.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EAIpB,MAAM,kBAAkB,CAAA;AAIzB,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAoD1C;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,qBAAqB,EAAE,cAAc,CAAC,OAAO,eAAe,CAyDxE,CAAA"}

package/dist/turbine-vent/definition.js

@@ -1,4 +1,4 @@
-import { TurbineVentNode as TurbineVentNodeSchema, } from '@pascal-app/core';
+import { TurbineVentNode as TurbineVentNodeSchema, turbineVentSlots, } from '@pascal-app/core';
 import { buildTurbineVentFloorplan } from './floorplan';
 import { turbineVentPaint } from './paint';
 import { turbineVentParametrics } from './parametrics';
@@ -80,10 +80,7 @@ export const turbineVentDefinition = {
         return rest;
     },
     capabilities: {
-        slots: () => [
-            { slotId: 'base', label: 'Base', default: 'library:preset-softwhite' },
-            { slotId: 'head', label: 'Head', default: 'library:preset-softwhite' },
-        ],
+        slots: turbineVentSlots,
         selectable: { hitVolume: 'bbox' },
         duplicable: true,
         deletable: true,

package/dist/turbine-vent/paint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paint.d.ts","sourceRoot":"","sources":["../../src/turbine-vent/paint.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA2B,uBAAuB,EAAE,MAAM,kBAAkB,CAAA;AAMxF,wBAAgB,8BAA8B,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,uBAAuB,CAE9F;AAED,eAAO,MAAM,gBAAgB,4CA0B3B,CAAA"}
+{"version":3,"file":"paint.d.ts","sourceRoot":"","sources":["../../src/turbine-vent/paint.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA2B,uBAAuB,EAAE,MAAM,kBAAkB,CAAA;AAOxF,wBAAgB,8BAA8B,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,uBAAuB,CAE9F;AAED,eAAO,MAAM,gBAAgB,4CAsB3B,CAAA"}

package/dist/turbine-vent/paint.js

@@ -1,4 +1,5 @@
 import { buildSlotPreviewMaterial, createSlotPaintCapability } from '../shared/slot-paint';
+import { swapPreviewMaterial } from '../shared/swap-preview-material';
 export function resolveTurbineVentMaterialRole(hitObjectName) {
     return hitObjectName === 'turbine-vent-head' ? 'head' : 'base';
 }
@@ -15,11 +16,7 @@ export const turbineVentPaint = createSlotPaintCapability({
             const mesh = object;
             if (!mesh.isMesh || mesh.name !== targetName)
                 return;
-            const previous = mesh.material;
-            mesh.material = preview;
-            restores.push(() => {
-                mesh.material = previous;
-            });
+            restores.push(swapPreviewMaterial(mesh, preview));
         });
         if (restores.length === 0)
             return null;

package/dist/turbine-vent/panel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"panel.d.ts","sourceRoot":"","sources":["../../src/turbine-vent/panel.tsx"],"names":[],"mappings":"AA8BA;;;;;GAKG;AACH,MAAM,CAAC,OAAO,UAAU,gBAAgB,uCA6SvC"}
+{"version":3,"file":"panel.d.ts","sourceRoot":"","sources":["../../src/turbine-vent/panel.tsx"],"names":[],"mappings":"AA8BA;;;;;GAKG;AACH,MAAM,CAAC,OAAO,UAAU,gBAAgB,uCAyRvC"}

package/dist/turbine-vent/panel.js

@@ -1,7 +1,7 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { getActiveRoofHeight, TurbineVentNode as TurbineVentSchema, useLiveNodeOverrides, useScene, } from '@pascal-app/core';
-import { ActionButton, ActionGroup, PanelSection, PanelWrapper, SegmentedControl, SliderControl, triggerSFX, useEditor, } from '@pascal-app/editor';
+import { getActiveRoofHeight, useLiveNodeOverrides, useScene, } from '@pascal-app/core';
+import { ActionButton, ActionGroup, duplicateNodeAndPickUp, PanelSection, PanelWrapper, SegmentedControl, SliderControl, triggerSFX, useEditor, } from '@pascal-app/editor';
 import { useViewer } from '@pascal-app/viewer';
 import { Copy, Move, Pause, Play, Trash2 } from 'lucide-react';
 import { useCallback, useRef } from 'react';
@@ -56,27 +56,9 @@ export default function TurbineVentPanel() {
         setSelection({ selectedIds: [] });
     }, [node, setMovingNode, setSelection]);
     const handleDuplicate = useCallback(() => {
-        if (!node)
-            return;
-        triggerSFX('sfx:item-pick');
-        const parentId = node.roofSegmentId;
-        if (!parentId)
-            return;
-        const state = useScene.getState();
-        const meta = typeof node.metadata === 'object' && node.metadata !== null
-            ? node.metadata
-            : {};
-        const cloneInput = {
-            ...node,
-            id: undefined,
-            metadata: { ...meta, isNew: true },
-        };
-        const cloned = TurbineVentSchema.parse(cloneInput);
-        state.createNode(cloned, parentId);
-        state.dirtyNodes.add(parentId);
-        setMovingNode(cloned);
-        setSelection({ selectedIds: [] });
-    }, [node, setMovingNode, setSelection]);
+        if (node)
+            duplicateNodeAndPickUp(node);
+    }, [node]);
     const handleDelete = useCallback(() => {
         if (!(selectedId && node))
             return;

package/dist/unit/unit-panel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"unit-panel.d.ts","sourceRoot":"","sources":["../../src/unit/unit-panel.tsx"],"names":[],"mappings":"AAEA,OAAO,EAML,KAAK,QAAQ,EAGd,MAAM,kBAAkB,CAAA;AAgCzB,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,+BA2J7D"}
+{"version":3,"file":"unit-panel.d.ts","sourceRoot":"","sources":["../../src/unit/unit-panel.tsx"],"names":[],"mappings":"AAEA,OAAO,EAOL,KAAK,QAAQ,EAGd,MAAM,kBAAkB,CAAA;AAgCzB,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,+BA2J7D"}

package/dist/unit/unit-panel.js

@@ -57,5 +57,10 @@ export default function UnitPanel({ node }) {
         }
         return 'No zones assigned yet.';
     });
-    return (_jsxs(PanelWrapper, { icon: "/icons/zone.webp", onClose: handleClose, title: node.name || 'Unit', width: 320, children: [_jsxs(PanelSection, { title: "Unit", children: [_jsx(PanelTextField, { label: "Name", onCommit: (name) => update({ name }), value: node.name }), _jsx(PanelSelect, { label: "Kind", onChange: (kind) => update({ kind: kind }), options: UNIT_KIND_OPTIONS, value: node.kind }), _jsxs("label", { className: "flex h-10 items-center justify-between gap-3 rounded-lg border border-border/50 bg-[#2C2C2E] px-3 text-sm", children: [_jsx("span", { className: "text-muted-foreground", children: "Color" }), _jsxs("span", { className: "flex items-center gap-2", children: [_jsx("span", { className: "font-mono text-muted-foreground text-xs", children: node.color }), _jsx("input", { className: "h-6 w-8 cursor-pointer rounded border border-border/50 bg-transparent", onChange: (event) => update({ color: event.target.value }), type: "color", value: node.color })] })] })] }), _jsxs(PanelSection, { title: "Members", children: [report.members.length === 0 ? (_jsx("p", { className: "text-muted-foreground text-xs leading-snug", children: "No zones yet. Draw zones while this unit is focused, or pick it from a zone's inspector." })) : (report.members.map((member) => (_jsxs("div", { className: "flex h-9 items-center gap-2 rounded-lg border border-border/50 bg-[#2C2C2E] px-3 text-xs", children: [_jsx("span", { className: "min-w-0 flex-1 truncate text-foreground", children: member.name || 'Zone' }), _jsx("span", { className: "shrink-0 truncate text-muted-foreground", children: member.levelId ? levelNameById.get(member.levelId) : '' }), _jsx("span", { className: "shrink-0 font-mono text-muted-foreground tabular-nums", children: formatAreaLabel(member.areaM2, areaUnit, 1) }), _jsx("button", { "aria-label": `Remove ${member.name || 'zone'} from unit`, className: "shrink-0 rounded-full p-1 text-muted-foreground transition-colors hover:bg-[#3e3e3e] hover:text-foreground", onClick: () => removeMember(member.zoneId), type: "button", children: _jsx(X, { className: "h-3.5 w-3.5" }) })] }, member.zoneId)))), warningMessages.length > 0 ? (_jsx("ul", { className: "flex flex-col gap-1 text-amber-300 text-xs leading-snug", children: warningMessages.map((message, index) => (_jsx("li", { children: message }, warnings[index]?.code))) })) : null] }), _jsxs(PanelSection, { title: "Report", children: [_jsx(ReportRow, { label: "Members", value: String(report.memberCount) }), _jsx(ReportRow, { label: "Levels", value: levelSpanLabel }), _jsx(ReportRow, { label: "Gross area", value: formatAreaLabel(report.grossAreaM2, areaUnit, 2) })] }), _jsx(PanelSection, { title: "Actions", children: _jsxs(ActionGroup, { children: [focusedUnitId !== node.id && (_jsx(ActionButton, { className: "rounded-full", label: "Focus", onClick: () => useViewer.getState().setFocusedUnit(node.id) })), _jsx(ActionButton, { className: "text-destructive hover:text-destructive", icon: _jsx(Trash2, { className: "h-3.5 w-3.5" }), label: "Delete", onClick: handleDelete })] }) })] }));
+    return (_jsxs(PanelWrapper, { icon: "/icons/zone.webp", onClose: handleClose, title: node.name || 'Unit', width: 320, children: [_jsxs(PanelSection, { title: "Unit", children: [_jsx(PanelTextField, { label: "Name", onCommit: (name) => update({ name }), value: node.name }), _jsx(PanelSelect, { label: "Kind", onChange: (kind) => update({ kind: kind }), options: UNIT_KIND_OPTIONS, value: node.kind }), _jsxs("label", { className: "flex h-10 items-center justify-between gap-3 rounded-lg border border-border/50 bg-[#2C2C2E] px-3 text-sm", children: [_jsx("span", { className: "text-muted-foreground", children: "Color" }), _jsxs("span", { className: "flex items-center gap-2", children: [_jsx("span", { className: "font-mono text-muted-foreground text-xs", children: node.color }), _jsx("input", { className: "h-6 w-8 cursor-pointer rounded border border-border/50 bg-transparent", onChange: (event) => update({ color: event.target.value }), type: "color", value: node.color })] })] })] }), _jsxs(PanelSection, { title: "Members", children: [report.members.length === 0 ? (_jsx("p", { className: "text-muted-foreground text-xs leading-snug", children: "No rooms yet. Pick this unit from a room's panel, or draw zones while it is focused." })) : (report.members.map((member) => (_jsxs("div", { className: "flex h-9 items-center gap-2 rounded-lg border border-border/50 bg-[#2C2C2E] px-3 text-xs", children: [_jsx("span", { className: "min-w-0 flex-1 truncate text-foreground", children: member.name || memberFallbackName(nodes, member.zoneId) }), _jsx("span", { className: "shrink-0 truncate text-muted-foreground", children: member.levelId ? levelNameById.get(member.levelId) : '' }), _jsx("span", { className: "shrink-0 font-mono text-muted-foreground tabular-nums", children: formatAreaLabel(member.areaM2, areaUnit, 1) }), _jsx("button", { "aria-label": `Remove ${member.name || 'zone'} from unit`, className: "shrink-0 rounded-full p-1 text-muted-foreground transition-colors hover:bg-[#3e3e3e] hover:text-foreground", onClick: () => removeMember(member.zoneId), type: "button", children: _jsx(X, { className: "h-3.5 w-3.5" }) })] }, member.zoneId)))), warningMessages.length > 0 ? (_jsx("ul", { className: "flex flex-col gap-1 text-amber-300 text-xs leading-snug", children: warningMessages.map((message, index) => (_jsx("li", { children: message }, warnings[index]?.code))) })) : null] }), _jsxs(PanelSection, { title: "Report", children: [_jsx(ReportRow, { label: "Members", value: String(report.memberCount) }), _jsx(ReportRow, { label: "Levels", value: levelSpanLabel }), _jsx(ReportRow, { label: "Gross area", value: formatAreaLabel(report.grossAreaM2, areaUnit, 2) })] }), _jsx(PanelSection, { title: "Actions", children: _jsxs(ActionGroup, { children: [focusedUnitId !== node.id && (_jsx(ActionButton, { className: "rounded-full", label: "Focus", onClick: () => useViewer.getState().setFocusedUnit(node.id) })), _jsx(ActionButton, { className: "text-destructive hover:text-destructive", icon: _jsx(Trash2, { className: "h-3.5 w-3.5" }), label: "Delete", onClick: handleDelete })] }) })] }));
+}
+/** An unnamed member reads as what it is: a room, or another zone. */
+function memberFallbackName(nodes, zoneId) {
+    const zone = nodes[zoneId];
+    return zone?.type === 'zone' && zone.spaceRole === 'room' ? 'Room' : 'Zone';
 }

package/dist/wall/actions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"actions.d.ts","sourceRoot":"","sources":["../../src/wall/actions.tsx"],"names":[],"mappings":"AAgBA,kFAAkF;AAClF,MAAM,CAAC,OAAO,UAAU,WAAW,gCAOlC"}
+{"version":3,"file":"actions.d.ts","sourceRoot":"","sources":["../../src/wall/actions.tsx"],"names":[],"mappings":"AAuBA,kFAAkF;AAClF,MAAM,CAAC,OAAO,UAAU,WAAW,gCAOlC"}

package/dist/wall/actions.js

@@ -1,7 +1,7 @@
 'use client';
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { planWallMerge, runAsSingleSceneHistoryStep, useScene, } from '@pascal-app/core';
-import { Tooltip, TooltipContent, TooltipTrigger, triggerSFX } from '@pascal-app/editor';
+import { captureElementActionOrigin, completeElementAction, Tooltip, TooltipContent, TooltipTrigger, triggerSFX, } from '@pascal-app/editor';
 import { useViewer } from '@pascal-app/viewer';
 import { FoldHorizontal, Scissors } from 'lucide-react';
 import { useMemo } from 'react';
@@ -45,9 +45,14 @@ function MergeWallsAction() {
     const button = (_jsx("button", { type: "button", "aria-label": "Merge walls", title: reason ? undefined : 'Merge walls', disabled: readOnly || reason !== null, className: BUTTON, onClick: (event) => {
             event.stopPropagation();
             const plan = planWallMerge(useScene.getState().nodes, selected);
+            // Walls drilled from one room go back to it; otherwise the merged wall stays selected.
+            const origin = captureElementActionOrigin(selected);
             runAsSingleSceneHistoryStep(useScene, () => useScene.getState().applyNodeChanges(plan.changes));
-            useViewer.getState().setSelection({ selectedIds: [plan.wallId] });
             triggerSFX('sfx:structure-build');
+            if (origin)
+                completeElementAction(origin);
+            else
+                useViewer.getState().setSelection({ selectedIds: [plan.wallId] });
         }, children: _jsx(FoldHorizontal, { className: "size-4" }) }));
     if (!reason)
         return button;

package/dist/wall/construction-dimensions.js

@@ -1,4 +1,4 @@
-import { getWallArcData, getWallChordFrame, getWallMidpointHandlePoint, getWallThickness, isCurvedWall, } from '@pascal-app/core';
+import { getWallArcData, getWallChordFrame, getWallLocalFaceZ, getWallMidpointHandlePoint, isCurvedWall, } from '@pascal-app/core';
 import { getColumnFloorplanFootprint } from '../column/floorplan';
 import { DEFAULT_CONSTRUCTION_DIMENSION_STANDARD, } from '../shared/construction-dimension-standards';
 import { formatConstructionLength, } from '../shared/construction-length';
@@ -506,7 +506,7 @@ function wallSegmentsTouch(left, right) {
         segmentIntersection(left.start, left.end, right.start, right.end) !== null);
 }
 function isFacadeOccluded(wall, outwardNormal, network) {
-    const halfThickness = (wall.thickness ?? 0.1) / 2;
+    const halfThickness = wallDatumDistanceToward(wall, 'wall-face', outwardNormal);
     const origin = addScaled([(wall.start[0] + wall.end[0]) / 2, (wall.start[1] + wall.end[1]) / 2], outwardNormal, halfThickness + FACADE_LINE_TOLERANCE);
     return network.some((candidate) => candidate.id !== wall.id &&
         raySegmentDistance(origin, outwardNormal, candidate.start, candidate.end) !== null);
@@ -722,7 +722,7 @@ function selectCanonicalWallFaceIntersection(intersections, wall) {
     const direction = subtract(wall.end, wall.start);
     const length = Math.hypot(direction[0], direction[1]);
     if (length < MIN_SEGMENT_LENGTH)
-        return undefined;
+        return;
     let tangent = [direction[0] / length, direction[1] / length];
     if (tangent[0] < -FACADE_DIRECTION_TOLERANCE ||
         (Math.abs(tangent[0]) <= FACADE_DIRECTION_TOLERANCE && tangent[1] < 0)) {
@@ -929,7 +929,10 @@ function splitFacadeRuns(members) {
     return runs;
 }
 function facadePartitionFaceIntersections(facade, candidate, outwardNormal, datumPolicy) {
-    const halfThickness = wallDatumDistanceToward(facade, 'wall-face', outwardNormal);
+    const halfThickness = wallDatumDistanceToward(facade, 'wall-face', [
+        -outwardNormal[0],
+        -outwardNormal[1],
+    ]);
     const insideStart = [
         facade.start[0] - outwardNormal[0] * halfThickness,
         facade.start[1] - outwardNormal[1] * halfThickness,
@@ -960,7 +963,7 @@ function wallDatumOffsets(wall, policy) {
 function wallDatumOffsetOnSide(wall, policy, side) {
     if (policy === 'centerline')
         return 0;
-    return (getWallThickness(wall) / 2) * side;
+    return getWallLocalFaceZ(wall, side > 0 ? 'a' : 'b');
 }
 function wallDatumDistanceToward(wall, policy, direction) {
     if (policy === 'centerline')

package/dist/wall/contextual-dimensions.js

@@ -1,4 +1,4 @@
-import { getWallCurveFrameAt, getWallCurveLength, getWallThickness, isCurvedWall, } from '@pascal-app/core';
+import { getWallCurveFrameAt, getWallCurveLength, getWallFaceOffsets, isCurvedWall, } from '@pascal-app/core';
 import { formatLinearMeasurement, readFloorplanMetricNotationOverride } from '@pascal-app/editor';
 const WALL_CONNECTION_TOLERANCE = 0.03;
 function formatLength(value, ctx) {
@@ -62,8 +62,8 @@ function structuralFaceProjections(wallStart, wallTangent, connectedWall) {
     if (Math.abs(denominator) <= 1e-6)
         return [];
     const normal = [-direction[1], direction[0]];
-    const halfThickness = getWallThickness(connectedWall) / 2;
-    return [-halfThickness, halfThickness].map((offset) => {
+    const { a, b } = getWallFaceOffsets(connectedWall);
+    return [b, a].map((offset) => {
         const facePoint = [
             connectedWall.start[0] + normal[0] * offset,
             connectedWall.start[1] + normal[1] * offset,
@@ -177,7 +177,7 @@ export function buildWallHostedOpeningContextualDimensions(node, ctx, options) {
         };
     }
     const offsetNormal = contextualWallDimensionNormal(wall, [-dirY, dirX], ctx.siblings);
-    if (!options.showClearancesWhileMoving || !ctx.viewState?.moving) {
+    if (!(options.showClearancesWhileMoving && ctx.viewState?.moving)) {
         return {
             kind: 'dimension',
             start: openingStart,

package/dist/wall/curtain-wall-materials.d.ts

@@ -1,5 +1,5 @@
 import { type SceneMaterial, type SceneMaterialId, type WallNode } from '@pascal-app/core';
 import { getMaterialsForWall, type RenderShading, type WallMaterialOverride, type WallMaterials } from '@pascal-app/viewer';
 export declare function createCurtainWallMaterials(wall: WallNode, shading: RenderShading, materials?: Record<SceneMaterialId, SceneMaterial>): WallMaterialOverride;
-export declare function getCurtainAwareWallMaterials(wall: WallNode, shading?: RenderShading, textures?: boolean, colorPreset?: Parameters<typeof getMaterialsForWall>[3], sceneTheme?: string, materials?: Record<SceneMaterialId, SceneMaterial>): WallMaterials;
+export declare function getCurtainAwareWallMaterials(wall: WallNode, shading?: RenderShading, textures?: boolean, colorPreset?: Parameters<typeof getMaterialsForWall>[3], sceneTheme?: string, materials?: Record<SceneMaterialId, SceneMaterial>, finishRefs?: readonly string[]): WallMaterials;
 //# sourceMappingURL=curtain-wall-materials.d.ts.map

package/dist/wall/curtain-wall-materials.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"curtain-wall-materials.d.ts","sourceRoot":"","sources":["../../src/wall/curtain-wall-materials.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,aAAa,EAClB,KAAK,eAAe,EACpB,KAAK,QAAQ,EACd,MAAM,kBAAkB,CAAA;AACzB,OAAO,EACL,mBAAmB,EACnB,KAAK,aAAa,EAElB,KAAK,oBAAoB,EACzB,KAAK,aAAa,EACnB,MAAM,oBAAoB,CAAA;AAI3B,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,aAAa,EACtB,SAAS,CAAC,EAAE,MAAM,CAAC,eAAe,EAAE,aAAa,CAAC,GACjD,oBAAoB,CA6CtB;AAED,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,QAAQ,EACd,OAAO,GAAE,aAA0B,EACnC,QAAQ,UAAO,EACf,WAAW,GAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC,CAAC,CAAU,EAC/D,UAAU,CAAC,EAAE,MAAM,EACnB,SAAS,CAAC,EAAE,MAAM,CAAC,eAAe,EAAE,aAAa,CAAC,GACjD,aAAa,CAMf"}
+{"version":3,"file":"curtain-wall-materials.d.ts","sourceRoot":"","sources":["../../src/wall/curtain-wall-materials.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,aAAa,EAClB,KAAK,eAAe,EACpB,KAAK,QAAQ,EACd,MAAM,kBAAkB,CAAA;AACzB,OAAO,EACL,mBAAmB,EACnB,KAAK,aAAa,EAElB,KAAK,oBAAoB,EACzB,KAAK,aAAa,EACnB,MAAM,oBAAoB,CAAA;AAI3B,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,aAAa,EACtB,SAAS,CAAC,EAAE,MAAM,CAAC,eAAe,EAAE,aAAa,CAAC,GACjD,oBAAoB,CA6CtB;AAED,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,QAAQ,EACd,OAAO,GAAE,aAA0B,EACnC,QAAQ,UAAO,EACf,WAAW,GAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC,CAAC,CAAU,EAC/D,UAAU,CAAC,EAAE,MAAM,EACnB,SAAS,CAAC,EAAE,MAAM,CAAC,eAAe,EAAE,aAAa,CAAC,EAClD,UAAU,GAAE,SAAS,MAAM,EAAO,GACjC,aAAa,CAef"}

package/dist/wall/curtain-wall-materials.js

@@ -47,9 +47,9 @@ export function createCurtainWallMaterials(wall, shading, materials) {
         },
     };
 }
-export function getCurtainAwareWallMaterials(wall, shading = 'rendered', textures = true, colorPreset = 'clay', sceneTheme, materials) {
+export function getCurtainAwareWallMaterials(wall, shading = 'rendered', textures = true, colorPreset = 'clay', sceneTheme, materials, finishRefs = []) {
     const override = textures && wall.wallType === 'curtain'
         ? createCurtainWallMaterials(wall, shading, materials)
         : undefined;
-    return getMaterialsForWall(wall, shading, textures, colorPreset, sceneTheme, materials, override);
+    return getMaterialsForWall(wall, shading, textures, colorPreset, sceneTheme, materials, finishRefs, override);
 }

package/dist/wall/curve-tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"curve-tool.d.ts","sourceRoot":"","sources":["../../src/wall/curve-tool.tsx"],"names":[],"mappings":"AAEA,OAAO,EAaL,KAAK,QAAQ,EACd,MAAM,kBAAkB,CAAA;AAazB;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAmJtD,CAAA;AAED,eAAe,aAAa,CAAA"}
+{"version":3,"file":"curve-tool.d.ts","sourceRoot":"","sources":["../../src/wall/curve-tool.tsx"],"names":[],"mappings":"AAEA,OAAO,EAaL,KAAK,QAAQ,EACd,MAAM,kBAAkB,CAAA;AAazB;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAsJtD,CAAA;AAED,eAAe,aAAa,CAAA"}

package/dist/wall/curve-tool.js

@@ -55,6 +55,10 @@ export const CurveWallTool = ({ node }) => {
             useScene.getState().markDirty(nodeId);
         };
         const onGridMove = (event) => {
+            // A move between the cancel and the unmount would republish an override
+            // nothing clears any more.
+            if (wasFinalized)
+                return;
             const snapStep = getSegmentGridStep();
             // Snap the cursor on the WORLD XZ grid (still in building-local
             // coords for the rest of the math) so a rotated building doesn't

package/dist/wall/definition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../src/wall/definition.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,cAAc,EAEpB,MAAM,kBAAkB,CAAA;AA4BzB,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAyBnC,eAAO,MAAM,cAAc,EAAE,cAAc,CAAC,OAAO,QAAQ,CAsN1D,CAAA"}
+{"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../src/wall/definition.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,cAAc,EAGpB,MAAM,kBAAkB,CAAA;AA8BzB,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AA8BnC,eAAO,MAAM,cAAc,EAAE,cAAc,CAAC,OAAO,QAAQ,CA2O1D,CAAA"}

package/dist/wall/definition.js

@@ -1,19 +1,17 @@
-import { getWallBaseElevationForNodes, getWallEffectiveHeightForNodes, } from '@pascal-app/core';
-import { DRAFTING_SURFACE_EXTENSION_KEY, PANEL_MODEL_EXTENSION, } from '@pascal-app/editor';
+import { DEFAULT_WALL_THICKNESS, getWallBaseElevationForNodes, getWallEffectiveHeightForNodes, wallSlots, } from '@pascal-app/core';
+import { DRAFTING_SURFACE_EXTENSION_KEY, getWallDrawVariant, PANEL_MODEL_EXTENSION, useEditor, } from '@pascal-app/editor';
 import { buildWallContextualDimensions } from './contextual-dimensions';
 import { hasWallCurveBlockingChildren } from './curve-eligibility';
-import { useWallDrawingMode } from './drawing-mode';
 import { buildWallFloorplan, computeWallFloorplanLevelData } from './floorplan';
 import { wallCurveAffordance, wallMoveEndpointAffordance, wallThicknessAffordance, } from './floorplan-affordances';
 import { wallFloorplanMoveTarget } from './floorplan-move';
 import { wallFloorplanSiblingOverrides } from './floorplan-overrides';
 import { matchWallMeasurementFeature, resolveWallMeasurementFeature, wallMeasurementFeatures, } from './measurement';
 import { wallPaint } from './paint';
-import { wallSettings } from './panel-model';
+import { wallReferenceModel, wallSettings } from './panel-model';
 import { wallParametrics } from './parametrics';
 import { wallQuickMeasurement } from './quick-measurement';
 import { WallNode } from './schema';
-import { wallSlots } from './slots';
 import { WALL_SPLIT_MAX_CUTS } from './split-preview';
 import { setWallSplitCuts } from './split-session';
 import { useWallSplit } from './split-store';
@@ -33,16 +31,35 @@ import { useWallSplit } from './split-store';
  *   wall is registered.
  */
 const SPLIT_CUT_COUNTS = Array.from({ length: WALL_SPLIT_MAX_CUTS }, (_, index) => String(index + 1));
+/** Show a tool hint only while the wall tool draws this Rooms variant. */
+const whenWallVariant = (variant) => ({
+    subscribe: (onChange) => useEditor.subscribe(onChange),
+    value: () => getWallDrawVariant() === variant,
+});
 export const wallDefinition = {
     kind: 'wall',
     snapProfile: 'structural',
-    schemaVersion: 9,
+    schemaVersion: 10,
     schema: WallNode,
     category: 'structure',
     surfaceRole: 'wall',
     extensions: {
         [PANEL_MODEL_EXTENSION]: {
             rows: ({ node, nodes, update }) => wallSettings(node, nodes, update),
+            multiControls: ({ selection, nodes }) => {
+                const reference = wallReferenceModel(selection, nodes);
+                return [
+                    {
+                        id: 'wall-reference',
+                        kind: 'segmented',
+                        section: 'Dimensions',
+                        label: 'Reference',
+                        options: reference.options,
+                        value: reference.value,
+                        onChange: (value) => reference.apply(value),
+                    },
+                ];
+            },
         },
         [DRAFTING_SURFACE_EXTENSION_KEY]: {
             kind: 'wall',
@@ -115,6 +132,13 @@ export const wallDefinition = {
         // Paint still writes the legacy inline fields for base faces via
         // `wallPaint`; migrating those fully into `node.slots` is a later step.
         slots: (node) => wallSlots(node),
+        // F2 layers stack from the front face (or the exterior with
+        // `face: 'exterior'`); `thickness` holds their sum.
+        assembly: {
+            reference: 'front',
+            measure: 'normal',
+            body: (node) => node.thickness ?? DEFAULT_WALL_THICKNESS,
+        },
     },
     relations: {
         hosts: ['door', 'window', 'item', 'lean-to-extension'],
@@ -171,20 +195,20 @@ export const wallDefinition = {
     },
     floorplanMoveTarget: wallFloorplanMoveTarget,
     floorplanSiblingOverrides: wallFloorplanSiblingOverrides,
+    // The gesture row follows the Rooms variant picked in the Build panel (the
+    // HUD header names it); the variant itself is never cycled from here.
     toolHints: [
-        { key: 'Left click', label: 'Set wall start / end' },
         {
-            key: 'R',
-            label: 'Shape',
-            chip: {
-                subscribe: (onChange) => useWallDrawingMode.subscribe(onChange),
-                value: () => useWallDrawingMode.getState().mode,
-                cycle: () => useWallDrawingMode.getState().toggle(),
-                labels: { line: 'Shape: Line', rectangle: 'Shape: Rectangle' },
-                icons: { line: 'lucide:minus', rectangle: 'lucide:square' },
-                tooltip: 'Wall shape — click or press R to toggle',
-            },
+            key: 'Left click',
+            label: 'Set one corner, then the opposite',
+            visible: whenWallVariant('rectangle'),
+        },
+        {
+            key: 'Left click',
+            label: 'Add a corner · click the first to close',
+            visible: whenWallVariant('polygon'),
         },
+        { key: 'Left click', label: 'Set wall start / end', visible: whenWallVariant('walls') },
         { key: 'Esc', label: 'Cancel' },
     ],
     // The split session (`split-session.ts`) is the wall's own reshape; the HUD

package/dist/wall/floorplan-move.d.ts

@@ -23,7 +23,7 @@ import { type FloorplanMoveTarget, type WallNode } from '@pascal-app/core';
  * overrides after the write lands so the system reads from the new
  * committed scene state.
  *
- * Existing automatic slabs and ceilings receive live polygon overrides during
+ * Existing slabs, ceilings and zones receive live polygon overrides during
  * the drag. New surfaces and removals stay deferred until commit because live
  * overrides cannot represent nodes that do not exist in the scene.
  */

package/dist/wall/floorplan-move.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"floorplan-move.d.ts","sourceRoot":"","sources":["../../src/wall/floorplan-move.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,mBAAmB,EAaxB,KAAK,QAAQ,EAEd,MAAM,kBAAkB,CAAA;AAqCzB;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,eAAO,MAAM,uBAAuB,EAAE,mBAAmB,CAAC,QAAQ,CAuYjE,CAAA"}
+{"version":3,"file":"floorplan-move.d.ts","sourceRoot":"","sources":["../../src/wall/floorplan-move.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,mBAAmB,EAQxB,KAAK,QAAQ,EAEd,MAAM,kBAAkB,CAAA;AAoBzB;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,eAAO,MAAM,uBAAuB,EAAE,mBAAmB,CAAC,QAAQ,CAgVjE,CAAA"}