@pascal-app/viewer 1.0.3 → 1.0.5

package/dist/systems/wall/wall-system.js

@@ -1,17 +1,20 @@
-import { DEFAULT_LEVEL_HEIGHT, getAdjacentWallIds, getEffectiveNode, getWallBandSlotId, getWallCurveFrameAt, getWallFaceBandConfig, getWallFaceBandForHeight, getWallMiterBoundaryPoints, getWallPlaneTop, getWallPlanFootprint, getWallSurfacePolygon, getWallThickness, isCurvedWall, pointToKey, resolveLevelId, resolveWallTop, sceneRegistry, spatialGridManager, terrainSupportLift, useLiveNodeOverrides, useLiveTransforms, useScene, } from '@pascal-app/core';
+import { buildWallFinishLayout, containsPoint, cornerPair, DEFAULT_LEVEL_HEIGHT, getAdjacentWallIds, getEffectiveNode, getOpeningWallCut, getWallBodyCenterOffset, getWallCurveFrameAt, getWallCurveLength, getWallFaceOffsets, getWallLevelZones, getWallMiterBoundaryPoints, getWallPlaneTop, getWallPlanFootprint, getWallSurfacePolygon, getWallThickness, isCurvedWall, isCutterName, pointToKey, resolveCutterHost, resolveLevelId, resolveWallFaceBottom, resolveWallFinish, resolveWallTop, sceneRegistry, spatialGridManager, terrainSupportLift, useLiveNodeOverrides, useLiveTransforms, useScene, WALL_SURFACE_SLOT_DEFAULTS, wallFinishMaterialIndex, zoneHasWallFinish, } from '@pascal-app/core';
 import { useFrame } from '@react-three/fiber';
 import { useEffect } from 'react';
 import * as THREE from 'three';
 import { mergeGeometries } from 'three/examples/jsm/utils/BufferGeometryUtils.js';
-import { ADDITION, Brush, Evaluator, SUBTRACTION } from 'three-bvh-csg';
+import { ADDITION, Brush, Evaluator, INTERSECTION, SUBTRACTION } from 'three-bvh-csg';
 import { computeBoundsTree } from 'three-mesh-bvh';
 import { ensureRenderableGeometryAttributes, prepareBrushForCSG } from '../../lib/csg-utils';
 import { setGroupsSortedByMaterial } from '../../lib/geometry-groups';
 import { timeSpan } from '../../lib/perf-tracks';
+import { isRevealWaiting } from '../../lib/reveal-pending';
 import { buildTerrainPerimeterFillGeometry } from '../../lib/terrain-perimeter-fill';
+import { cornerFrameStale } from '../window/corner-frame';
 import { clearLevelMiterCache, getCachedLevelMiters } from './level-miter-cache';
 import { buildOpeningCutoutGeometry, getOpeningCutoutBottomPadding, } from './opening-cutout-geometry';
 import { drainStats, endInitialBuild, initiallyBuiltWalls, isWallInitialBuildActive, pendingAdjacentByLevel, publishWallDrainStats, } from './wall-build-lifecycle';
+import { getWallFaceBaseAt, } from './wall-finish-data';
 import { sweepUnbuiltWalls, WALL_PLACEHOLDER_SWEEP_INTERVAL } from './wall-placeholder-sweep';
 import { notifyWallRebuilt } from './wall-rebuild-notifications';
 export { isWallInitialBuildActive } from './wall-build-lifecycle';
@@ -23,28 +26,10 @@ const CURVED_WALL_3D_ENDPOINT_INSET = 0.0015;
 const WALL_FACE_NORMAL_Y_EPSILON = 0.6;
 const WALL_FACE_EDGE_DISTANCE_EPSILON = 0.003;
 const WALL_BAND_SPLIT_EPSILON = 1e-5;
-const WALL_BAND_SLOT_MATERIAL_INDEX = {
-    interior: 1,
-    exterior: 2,
-    lowerInterior: 3,
-    middleInterior: 4,
-    upperInterior: 5,
-    topInterior: 6,
-    lowerExterior: 7,
-    middleExterior: 8,
-    upperExterior: 9,
-    topExterior: 10,
-    skirtingInterior: 0,
-    skirtingExterior: 0,
-    crownInterior: 0,
-    crownExterior: 0,
-    chairRailInterior: 0,
-    chairRailExterior: 0,
-};
 function computeGeometryBoundsTree(geometry) {
     ;
     geometry.computeBoundsTree = computeBoundsTree;
-    geometry.computeBoundsTree({ maxLeafSize: 10 });
+    geometry.computeBoundsTree({ targetLeafSize: 10 });
 }
 function csgGeometry(brush) {
     return brush.geometry;
@@ -263,17 +248,17 @@ function distanceToWallBoundaryEdge(point, edge) {
     const closestZ = edge.start.y + edgeDz * t;
     return Math.hypot(point.x - closestX, point.y - closestZ);
 }
-function getWallFaceMaterialIndex(wall, face, y, effectiveWallHeight) {
-    const semantic = face === 'front' ? wall.frontSide : wall.backSide;
-    const fallback = face === 'front' ? 'interior' : 'exterior';
-    const side = semantic === 'interior' || semantic === 'exterior' ? semantic : fallback;
-    const bands = getWallFaceBandConfig(wall, effectiveWallHeight);
-    if (!bands.enabled)
-        return WALL_BAND_SLOT_MATERIAL_INDEX[side];
-    const band = getWallFaceBandForHeight(wall, y, effectiveWallHeight);
-    return WALL_BAND_SLOT_MATERIAL_INDEX[getWallBandSlotId(side, band)];
+function getWallFaceMaterialIndex(context, face, x, y) {
+    const { layout, foundation } = context;
+    // The underpinning's stemwall: everything under the rim depth is concrete.
+    if (foundation && y < foundation.top + WALL_BAND_SPLIT_EPSILON)
+        return foundation.index;
+    if (layout.plain)
+        return face === 'a' ? 1 : 2;
+    const hit = resolveWallFinish(layout, face, x, y - getWallFaceBaseAt(context, face, x));
+    return wallFinishMaterialIndex(layout, face, hit);
 }
-function assignWallMaterialGroups(geometry, wall, boundaryEdges, effectiveWallHeight) {
+function assignWallMaterialGroups(geometry, wall, boundaryEdges, finish) {
     const position = geometry.getAttribute('position');
     if (!position)
         return;
@@ -336,7 +321,7 @@ function assignWallMaterialGroups(geometry, wall, boundaryEdges, effectiveWallHe
             triangleMaterials[triangleIndex] = 0;
             continue;
         }
-        triangleMaterials[triangleIndex] = getWallFaceMaterialIndex(wall, nearestTag, centroid.y, effectiveWallHeight);
+        triangleMaterials[triangleIndex] = getWallFaceMaterialIndex(finish, nearestTag === 'front' ? 'a' : 'b', centroid.x, centroid.y);
     }
     setGroupsSortedByMaterial(geometry, triangleMaterials);
 }
@@ -347,22 +332,22 @@ function interpolateSplitVertex(a, b, t) {
         z: a.z + (b.z - a.z) * t,
     };
 }
-function clipPolygonByY(polygon, planeY, keepBelow) {
+function clipPolygonByPlane(polygon, axis, plane, keepBelow) {
     const out = [];
     if (polygon.length === 0)
         return out;
     const isInside = (vertex) => keepBelow
-        ? vertex.y <= planeY + WALL_BAND_SPLIT_EPSILON
-        : vertex.y >= planeY - WALL_BAND_SPLIT_EPSILON;
+        ? vertex[axis] <= plane + WALL_BAND_SPLIT_EPSILON
+        : vertex[axis] >= plane - WALL_BAND_SPLIT_EPSILON;
     for (let index = 0; index < polygon.length; index += 1) {
         const current = polygon[index];
         const previous = polygon[(index + polygon.length - 1) % polygon.length];
         const currentInside = isInside(current);
         const previousInside = isInside(previous);
         if (currentInside !== previousInside) {
-            const denom = current.y - previous.y;
+            const denom = current[axis] - previous[axis];
             if (Math.abs(denom) > WALL_BAND_SPLIT_EPSILON) {
-                out.push(interpolateSplitVertex(previous, current, (planeY - previous.y) / denom));
+                out.push(interpolateSplitVertex(previous, current, (plane - previous[axis]) / denom));
             }
         }
         if (currentInside)
@@ -380,11 +365,22 @@ function triangulateSplitPolygon(polygon, positions) {
         positions.push(first.x, first.y, first.z, b.x, b.y, b.z, c.x, c.y, c.z);
     }
 }
-function splitGeometryAtHorizontalPlanes(geometry, planes) {
-    const splitPlanes = Array.from(new Set(planes
-        .filter((plane) => Number.isFinite(plane) && plane > WALL_BAND_SPLIT_EPSILON)
+function normalizeSplitPlanes(planes) {
+    return Array.from(new Set(planes
+        .filter((plane) => Number.isFinite(plane))
         .map((plane) => Math.round(plane / WALL_BAND_SPLIT_EPSILON) * WALL_BAND_SPLIT_EPSILON))).sort((a, b) => a - b);
-    if (splitPlanes.length === 0)
+}
+/**
+ * Cuts triangles at the vertical planes `x = const` (wall-local stations) and
+ * horizontal planes `y = const`, so each piece lies in one finish cell. With no
+ * planes the geometry is returned untouched — plain walls never pay for this.
+ */
+function splitGeometryAtPlanes(geometry, yPlanes, xPlanes = []) {
+    const cuts = [
+        ...normalizeSplitPlanes(xPlanes).map((plane) => ({ axis: 'x', plane })),
+        ...normalizeSplitPlanes(yPlanes).map((plane) => ({ axis: 'y', plane })),
+    ];
+    if (cuts.length === 0)
         return geometry;
     const source = geometry.index ? geometry.toNonIndexed() : geometry;
     const position = source.getAttribute('position');
@@ -399,17 +395,17 @@ function splitGeometryAtHorizontalPlanes(geometry, planes) {
                 { x: position.getX(index + 2), y: position.getY(index + 2), z: position.getZ(index + 2) },
             ],
         ];
-        for (const plane of splitPlanes) {
+        for (const { axis, plane } of cuts) {
             const next = [];
             for (const polygon of polygons) {
-                const minY = Math.min(...polygon.map((vertex) => vertex.y));
-                const maxY = Math.max(...polygon.map((vertex) => vertex.y));
-                if (plane <= minY + WALL_BAND_SPLIT_EPSILON || plane >= maxY - WALL_BAND_SPLIT_EPSILON) {
+                const min = Math.min(...polygon.map((vertex) => vertex[axis]));
+                const max = Math.max(...polygon.map((vertex) => vertex[axis]));
+                if (plane <= min + WALL_BAND_SPLIT_EPSILON || plane >= max - WALL_BAND_SPLIT_EPSILON) {
                     next.push(polygon);
                     continue;
                 }
-                const below = clipPolygonByY(polygon, plane, true);
-                const above = clipPolygonByY(polygon, plane, false);
+                const below = clipPolygonByPlane(polygon, axis, plane, true);
+                const above = clipPolygonByPlane(polygon, axis, plane, false);
                 if (below.length >= 3)
                     next.push(below);
                 if (above.length >= 3)
@@ -428,16 +424,26 @@ function splitGeometryAtHorizontalPlanes(geometry, planes) {
     split.computeVertexNormals();
     return split;
 }
-function getWallBandSplitPlanes(wall, effectiveWallHeight) {
-    const bands = getWallFaceBandConfig(wall, effectiveWallHeight);
-    if (!bands.enabled)
-        return [];
-    const planes = [bands.lowerTop];
-    if (bands.count >= 3)
-        planes.push(bands.middleTop);
-    if (bands.count >= 4)
-        planes.push(bands.upperTop);
-    return planes.filter((plane) => plane > WALL_BAND_SPLIT_EPSILON && plane < effectiveWallHeight - WALL_BAND_SPLIT_EPSILON);
+/** Split planes a finish layout needs, in wall-local coordinates. */
+function getWallFinishSplitPlanes(finish) {
+    const { layout, faceBase } = finish;
+    if (layout.plain)
+        return { x: [], y: [] };
+    const x = [...layout.uSplits];
+    const bases = new Set([0]);
+    if (faceBase && layout.vSplits.length > 0) {
+        bases.clear();
+        for (const run of [...faceBase.a, ...faceBase.b]) {
+            bases.add(run.y);
+            // A face base that steps moves every height with it, so cut at the step too.
+            if (run.start > 0)
+                x.push(run.start);
+            if (run.end < layout.length)
+                x.push(run.end);
+        }
+    }
+    const y = [...bases].flatMap((base) => layout.vSplits.map((v) => base + v));
+    return { x, y };
 }
 // ============================================================================
 // WALL SYSTEM
@@ -477,10 +483,16 @@ function wallRebuildExitReason(wallId, nodes, rebuiltThisFrame, elapsedMs, initi
     let cutouts = 0;
     for (const childId of getEffectiveWall(wall).children ?? []) {
         const child = nodes[childId];
-        if (child?.type === 'door' ||
-            child?.type === 'window' ||
-            (child?.type === 'item' &&
-                sceneRegistry.nodes.get(childId)?.getObjectByName('cutout')?.geometry?.getAttribute('position')?.count)) {
+        let hasCutter = false;
+        if (child?.type === 'item') {
+            sceneRegistry.nodes.get(childId)?.traverse((object) => {
+                const mesh = object;
+                const name = typeof mesh.userData.name === 'string' ? mesh.userData.name : mesh.name;
+                if (mesh.isMesh && isCutterName(name) && mesh.geometry?.getAttribute('position')?.count)
+                    hasCutter = true;
+            });
+        }
+        if (child?.type === 'door' || child?.type === 'window' || hasCutter) {
             cutouts++;
             if (cutouts >= HEAVY_WALL_OPENINGS)
                 return 'heavy';
@@ -499,7 +511,13 @@ let placeholderSweepCountdown = WALL_PLACEHOLDER_SWEEP_INTERVAL;
 export const WallSystem = ({ geometryAdapter } = {}) => {
     useScene((state) => state.dirtyNodes);
     useLiveNodeOverrides((s) => s.overrides);
-    useEffect(() => () => clearLevelMiterCache(), []);
+    useEffect(() => () => {
+        clearLevelMiterCache();
+        zoneFinishRecords.clear();
+        zoneFinishNodes = null;
+        levelZones.clear();
+        levelZonesNodes = null;
+    }, []);
     useFrame(() => runWallBuildFrame(geometryAdapter), 4);
     return null;
 };
@@ -518,7 +536,94 @@ export function runWallBuildFrame(geometryAdapter) {
         publishWallDrainStats();
     }
 }
+// Zones per level for the current scene snapshot: a floor's walls rebuild
+// together, and each one would otherwise rescan the level's children.
+const levelZones = new Map();
+let levelZonesNodes = null;
+function getCachedLevelZones(wall, nodes) {
+    if (nodes !== levelZonesNodes) {
+        levelZones.clear();
+        levelZonesNodes = nodes;
+    }
+    const key = wall.parentId ?? '';
+    let zones = levelZones.get(key);
+    if (!zones) {
+        zones = getWallLevelZones(wall, nodes);
+        levelZones.set(key, zones);
+    }
+    return zones;
+}
+const zoneFinishRecords = new Map();
+let zoneFinishNodes = null;
+function zoneFinishSignature(zone) {
+    const painted = zoneHasWallFinish(zone);
+    if (!painted && zone.floor?.elevation === undefined)
+        return null;
+    return JSON.stringify([
+        zone.parentId,
+        zone.floor?.elevation,
+        zone.wallMaterial,
+        zone.wallOverrides,
+        // A floor-only room reshape does not change the datum of every boundary wall.
+        // Endpoint edits already invalidate their walls and queue adjacent miters.
+        painted ? zone.polygon : undefined,
+        painted ? zone.holes : undefined,
+        zone.boundaryWallIds,
+    ]);
+}
+/**
+ * A room's wall finish lives on its zone, so a zone edit must rebuild the walls
+ * bounding it — the old boundary and the new one. Zones without a wall finish
+ * never touch their walls, so ordinary room edits cost nothing here.
+ */
+export function markWallsForZoneFinishChanges() {
+    const state = useScene.getState();
+    const nodes = state.nodes;
+    if (nodes === zoneFinishNodes)
+        return;
+    zoneFinishNodes = nodes;
+    const walls = new Set();
+    const seen = new Set();
+    const collect = (zone) => {
+        for (const id of zone.boundaryWallIds ?? [])
+            walls.add(id);
+        for (const entry of zone.wallOverrides ?? [])
+            walls.add(entry.wallId);
+    };
+    for (const id in nodes) {
+        const node = nodes[id];
+        if (node?.type !== 'zone')
+            continue;
+        seen.add(id);
+        const previous = zoneFinishRecords.get(id);
+        if (previous?.zone === node)
+            continue;
+        const signature = zoneFinishSignature(node);
+        if (signature !== (previous?.signature ?? null)) {
+            if (previous)
+                collect(previous.zone);
+            collect(node);
+        }
+        zoneFinishRecords.set(id, { zone: node, signature });
+    }
+    for (const [id, record] of zoneFinishRecords) {
+        if (seen.has(id))
+            continue;
+        if (record.signature !== null)
+            collect(record.zone);
+        zoneFinishRecords.delete(id);
+    }
+    for (const id of walls) {
+        const wall = nodes[id];
+        if (wall?.type === 'wall') {
+            state.markDirty(wall.id);
+            for (const child of wall.children)
+                state.markDirty(child);
+        }
+    }
+}
 function consumeWallBuildFrame(initialBuild, geometryAdapter) {
+    markWallsForZoneFinishChanges();
     const clearDirty = useScene.getState().clearDirty;
     // Self-heal: any registered wall still on its mount-time placeholder
     // geometry with NO dirty mark gets re-marked, so a lost mark (system
@@ -539,7 +644,7 @@ function consumeWallBuildFrame(initialBuild, geometryAdapter) {
     const dirtyNodes = useScene.getState().dirtyNodes;
     const hasDirty = dirtyNodes.size > 0;
     const hasPending = pendingAdjacentByLevel.size > 0;
-    if (!hasDirty && !hasPending) {
+    if (!(hasDirty || hasPending)) {
         endInitialBuild();
         return;
     }
@@ -613,7 +718,7 @@ function consumeWallBuildFrame(initialBuild, geometryAdapter) {
                 else {
                     drainStats.reinvalidationBuilds++;
                 }
-                if (!initialBuild || !firstBuild)
+                if (!(initialBuild && firstBuild))
                     rebuiltWallIds.add(wallId);
                 rebuiltWallsThisFrame += 1;
                 drainStats.wallsConsumedThisFrame++;
@@ -641,7 +746,7 @@ function consumeWallBuildFrame(initialBuild, geometryAdapter) {
             pendingAdjacentByLevel.set(levelId, pending);
         }
         for (const wallId of adjacentWallIds) {
-            if (!dirtyWallIds.has(wallId) && !pending.has(wallId)) {
+            if (!(dirtyWallIds.has(wallId) || pending.has(wallId))) {
                 pending.add(wallId);
                 drainStats.pendingNeighbours++;
                 drainStats.neighbourEnqueues++;
@@ -777,24 +882,11 @@ function updateWallGeometry(wallId, miterData, geometryAdapter) {
         return;
     const levelId = resolveLevelId(node, nodes);
     // Covering-clamped plane: a flush/thick slab on the level above shortens
-    // the plane-bound walls below it (explicit-height walls ignore the value).
+    // the plane-bound walls below it.
     const planeTop = getWallPlaneTop(node, levelId, nodes);
-    const slabSupport = spatialGridManager.getSlabSupportForWall(levelId, node.start, node.end, node.curveOffset ?? 0, node.thickness, node.supportSlabId, undefined, node.supportOffset);
+    const slabSupport = spatialGridManager.getSlabSupportForWall(levelId, node.start, node.end, node.curveOffset ?? 0, node.thickness, node.supportSlabId, undefined, node.supportOffset, node.justification);
     const slabElevation = slabSupport.elevation;
-    const terrainBottomAt = node.fillToTerrain
-        ? (x, z) => terrainSupportLift(nodes, levelId, x, z)
-        : undefined;
-    const childrenIds = node.children || [];
-    const childrenNodes = childrenIds
-        .map((childId) => nodes[childId])
-        .filter((n) => n !== undefined)
-        .map((child) => {
-        if (child.type !== 'door' && child.type !== 'window')
-            return child;
-        const effective = getEffectiveNode(child);
-        const live = useLiveTransforms.getState().get(child.id);
-        return live?.position ? { ...effective, position: live.position } : effective;
-    });
+    const childrenNodes = wallGeometryChildren(node, nodes);
     const prepared = geometryAdapter?.prepareChildren?.(node, childrenNodes, {
         isLive: (id) => useLiveNodeOverrides.getState().get(id) !== undefined ||
             useLiveTransforms.getState().get(id) !== undefined,
@@ -802,7 +894,20 @@ function updateWallGeometry(wallId, miterData, geometryAdapter) {
         envelopeChildren: childrenNodes,
         renderChildren: childrenNodes,
     };
-    const builtGeo = generateExtrudedWall(node, prepared.envelopeChildren, miterData, slabElevation, slabSupport.baseElevation, slabSupport.baseSegments, planeTop, terrainBottomAt);
+    const fillMasks = node.fillToTerrain
+        ? [
+            ...Object.values(nodes).flatMap((slab) => slab.type === 'slab' && slab.parentId === levelId && slab.support !== 'open'
+                ? [{ outer: slab.polygon, holes: slab.holes }]
+                : []),
+            ...childrenNodes.flatMap((child) => child.type === 'door' || child.type === 'window'
+                ? getOpeningWallCut(node, child, nodes, slabSupport).aperture
+                : []),
+        ]
+        : [];
+    const terrainBottomAt = node.fillToTerrain
+        ? (x, z) => containsPoint(fillMasks, [x, z]) ? slabElevation : terrainSupportLift(nodes, levelId, x, z)
+        : undefined;
+    const builtGeo = generateExtrudedWall(node, prepared.envelopeChildren, miterData, slabElevation, slabSupport.baseElevation, slabSupport.baseSegments, planeTop, terrainBottomAt, slabSupport.faceDatum, buildWallFinishLayout(node, getCachedLevelZones(node, nodes)));
     const wallAngle = Math.atan2(node.end[1] - node.start[1], node.end[0] - node.start[0]);
     // World transform the render mesh will apply (position + Y-rotation below).
     // Reproduce it here so the UVs can be projected in WORLD space — see
@@ -819,13 +924,43 @@ function updateWallGeometry(wallId, miterData, geometryAdapter) {
     // Update collision mesh
     const collisionMesh = mesh.getObjectByName('collision-mesh');
     if (collisionMesh) {
-        const collisionGeo = generateExtrudedWall(node, [], miterData, slabElevation, slabSupport.baseElevation, slabSupport.baseSegments, planeTop, terrainBottomAt);
+        const collisionGeo = generateExtrudedWall(node, [], miterData, slabElevation, slabSupport.baseElevation, slabSupport.baseSegments, planeTop, terrainBottomAt, slabSupport.faceDatum);
         collisionMesh.geometry.dispose();
         collisionMesh.geometry = collisionGeo;
     }
     mesh.position.set(node.start[0], slabElevation, node.start[1]);
     const angle = Math.atan2(node.end[1] - node.start[1], node.end[0] - node.start[0]);
     mesh.rotation.y = -angle;
+    const offsets = getWallFaceOffsets(node);
+    const frameKey = `${offsets.a}:${offsets.b}`;
+    // Child systems otherwise only see their own edits. Invalidate on a frame
+    // change once, avoiding a wall → opening → wall rebuild loop.
+    if (mesh.userData.wallFrameKey !== undefined && mesh.userData.wallFrameKey !== frameKey) {
+        for (const child of childrenNodes)
+            useScene.getState().markDirty(child.id);
+    }
+    mesh.userData.wallFrameKey = frameKey;
+    // A wall moved apart from the other wall of a corner window, or back, makes or breaks the pair:
+    // its windows rebuild their frames once (they read the pair only then).
+    for (const child of childrenNodes)
+        if (cornerFrameStale(child, nodes))
+            useScene.getState().markDirty(child.id);
+}
+/**
+ * The children a wall builds around, as they stand live: an opening still waiting for its
+ * construction reveal is left out, so the wall rises whole and is cut at the opening's turn.
+ */
+export function wallGeometryChildren(node, nodes) {
+    return (node.children ?? [])
+        .map((childId) => nodes[childId])
+        .filter((child) => child !== undefined && !isRevealWaiting(child.id))
+        .map((child) => {
+        if (child.type !== 'door' && child.type !== 'window')
+            return child;
+        const effective = getEffectiveNode(child);
+        const live = useLiveTransforms.getState().get(child.id);
+        return live?.position ? { ...effective, position: live.position } : effective;
+    });
 }
 const WALL_UV_Y_AXIS = new THREE.Vector3(0, 1, 0);
 const WALL_UV_UNIT_SCALE = new THREE.Vector3(1, 1, 1);
@@ -842,8 +977,10 @@ const WALL_UV_UNIT_SCALE = new THREE.Vector3(1, 1, 1);
  */
 function applyWorldPlanarWallUVs(geometry, worldMatrix) {
     const target = geometry.index ? geometry.toNonIndexed() : geometry;
-    if (target !== geometry)
+    if (target !== geometry) {
+        target.userData = geometry.userData;
         geometry.dispose();
+    }
     const position = target.getAttribute('position');
     if (!position || position.count === 0)
         return target;
@@ -919,34 +1056,183 @@ function buildWallTerrainFillGeometry(perimeter, worldToLocal, wallBaseElevation
     });
     return buildTerrainPerimeterFillGeometry(localPoints, bottomY, 0);
 }
-function mergeWallTerrainFill(body, fill, wall, boundaryEdges, effectiveWallHeight) {
-    if (!fill)
+/**
+ * The underpinning under a wall (`WallNode.underpinning`): a skirt of the
+ * wall's own faces `rim` deep below the base, then the stemwall skirt from
+ * there down `stem` more — or to the terrain wherever that is lower when
+ * the wall also fills to terrain. Two fills, split at the rim depth, so the
+ * material groups can paint the stem concrete and the rim in the finish.
+ */
+function buildWallUnderpinningGeometry(perimeter, worldToLocal, wallBaseElevation, wall, terrainBottomAt, curved = false) {
+    const underpinning = wall.underpinning;
+    if (!underpinning)
+        return [];
+    const worldPoints = densifyClosedWallPerimeter(perimeter);
+    if (worldPoints.length < 3)
+        return [];
+    const localPoints = worldPoints.map(worldToLocal);
+    const rimBottom = -underpinning.rim;
+    const fills = [];
+    if (underpinning.rim > 1e-6) {
+        const rim = buildTerrainPerimeterFillGeometry(localPoints, worldPoints.map(() => rimBottom), 0);
+        if (rim)
+            fills.push(rim);
+    }
+    const stemBottom = worldPoints.map((point) => {
+        let y = rimBottom - underpinning.stem;
+        if (terrainBottomAt) {
+            const terrainElevation = terrainBottomAt(point.x, point.y);
+            if (terrainElevation != null)
+                y = Math.min(y, terrainElevation - wallBaseElevation);
+        }
+        return y;
+    });
+    if (stemBottom.some((y) => y < rimBottom - 1e-6)) {
+        const stem = buildTerrainPerimeterFillGeometry(localPoints, stemBottom, rimBottom);
+        if (stem) {
+            fills.push(underpinning.openings?.length && !curved
+                ? cutUnderpinningOpenings(stem, localPoints, rimBottom, underpinning.openings)
+                : stem);
+        }
+    }
+    return fills;
+}
+/**
+ * The stem skirt with its openings (`WallUnderpinning.openings`) cut through
+ * it: the skirt is closed with a cap at its top so it is a solid, then each
+ * opening's box is subtracted across the full thickness. The cap lands on
+ * the rim's (or the body's) own bottom face, inside the wall.
+ */
+function cutUnderpinningOpenings(stem, localPoints, topY, openings) {
+    const stemPositions = stem.getAttribute('position');
+    const positions = Array.from(stemPositions.array);
+    const faces = THREE.ShapeUtils.triangulateShape(localPoints.map((point) => new THREE.Vector2(point.x, point.z)), []);
+    for (const [ia, ib, ic] of faces) {
+        const a = localPoints[ia];
+        const b = localPoints[ib];
+        const c = localPoints[ic];
+        const cross = (b.x - a.x) * (c.z - a.z) - (b.z - a.z) * (c.x - a.x);
+        const [second, third] = cross >= 0 ? [c, b] : [b, c];
+        positions.push(a.x, topY, a.z, second.x, topY, second.z, third.x, topY, third.z);
+    }
+    stem.dispose();
+    const solid = new THREE.BufferGeometry();
+    solid.setAttribute('position', new THREE.Float32BufferAttribute(positions, 3));
+    solid.computeVertexNormals();
+    ensureRenderableGeometryAttributes(solid);
+    computeGeometryBoundsTree(solid);
+    let minZ = Number.POSITIVE_INFINITY;
+    let maxZ = Number.NEGATIVE_INFINITY;
+    for (const point of localPoints) {
+        minZ = Math.min(minZ, point.z);
+        maxZ = Math.max(maxZ, point.z);
+    }
+    const depth = maxZ - minZ + 0.2;
+    const centerZ = (minZ + maxZ) / 2;
+    let result = new Brush(solid);
+    result.updateMatrixWorld();
+    for (const opening of openings) {
+        const height = opening.bottom - opening.top;
+        if (height <= 1e-6)
+            continue;
+        const box = new THREE.BoxGeometry(opening.width, height, depth);
+        box.translate(opening.u, -(opening.top + opening.bottom) / 2, centerZ);
+        const cutter = new Brush(box);
+        prepareBrushForCSG(cutter);
+        const next = csgEvaluator.evaluate(result, cutter, SUBTRACTION);
+        csgGeometry(cutter).dispose();
+        csgGeometry(result).dispose();
+        result = next;
+    }
+    // the other skirts and the body merge non-indexed
+    const cut = csgGeometry(result);
+    const geometry = cut.index ? cut.toNonIndexed() : cut;
+    if (geometry !== cut)
+        cut.dispose();
+    geometry.clearGroups();
+    return geometry;
+}
+function mergeWallTerrainFill(body, fills, wall, boundaryEdges, finish) {
+    const present = fills.filter((fill) => fill !== null);
+    if (present.length === 0)
         return body;
     const bodyGeometry = body.index ? body.toNonIndexed() : body;
     if (bodyGeometry !== body)
         body.dispose();
+    // The fill is part of each face below the base: it splits at the same finish bounds.
+    const planes = getWallFinishSplitPlanes(finish);
+    const splitFills = present.map((fill) => splitGeometryAtPlanes(fill, planes.y, planes.x));
     ensureRenderableGeometryAttributes(bodyGeometry);
-    ensureRenderableGeometryAttributes(fill);
-    const merged = mergeGeometries([bodyGeometry, fill], false);
+    for (const fill of splitFills)
+        ensureRenderableGeometryAttributes(fill);
+    const merged = mergeGeometries([bodyGeometry, ...splitFills], false);
     if (!merged) {
-        fill.dispose();
+        for (const fill of splitFills)
+            fill.dispose();
         return bodyGeometry;
     }
     bodyGeometry.dispose();
-    fill.dispose();
+    for (const fill of splitFills)
+        fill.dispose();
     merged.computeVertexNormals();
-    assignWallMaterialGroups(merged, wall, boundaryEdges, effectiveWallHeight);
+    assignWallMaterialGroups(merged, wall, boundaryEdges, finish);
     ensureRenderableGeometryAttributes(merged);
     return merged;
 }
+/** Wall-local x of a support-segment parameter (curve parameter on arcs). */
+function wallStationX(wall, t, length) {
+    if (!isCurvedWall(wall))
+        return t * length;
+    const point = getWallCurveFrameAt(wall, t).point;
+    const dx = wall.end[0] - wall.start[0];
+    const dz = wall.end[1] - wall.start[1];
+    return ((point.x - wall.start[0]) * dx + (point.y - wall.start[1]) * dz) / length;
+}
+function buildWallFinishContext(wall, layout, faceBase, slabElevation) {
+    const refs = [...layout.refs];
+    let foundation = null;
+    if (wall.underpinning) {
+        const ref = wall.slots?.foundation ?? WALL_SURFACE_SLOT_DEFAULTS.foundation;
+        if (!refs.includes(ref))
+            refs.push(ref);
+        foundation = { index: 3 + refs.indexOf(ref), top: -wall.underpinning.rim };
+    }
+    if (!faceBase || layout.plain)
+        return { layout, faceBase: null, refs, foundation };
+    const runs = (segments) => segments
+        .map((segment) => ({
+        start: wallStationX(wall, segment.start, layout.length),
+        end: wallStationX(wall, segment.end, layout.length),
+        y: segment.elevation - slabElevation,
+    }))
+        .sort((left, right) => left.start - right.start);
+    return { layout, faceBase: { a: runs(faceBase.a), b: runs(faceBase.b) }, refs, foundation };
+}
 export function generateExtrudedWall(wallNode, childrenNodes, miterData, slabElevation = 0, baseElevation = slabElevation, baseSegments = [
     { start: 0, end: 1, elevation: baseElevation },
-], storeyHeight = DEFAULT_LEVEL_HEIGHT, terrainBottomAt) {
+], storeyHeight = DEFAULT_LEVEL_HEIGHT, terrainBottomAt, faceBase, finishLayout = buildWallFinishLayout(wallNode, []), sceneNodes = useScene.getState().nodes) {
     const wallStart = { x: wallNode.start[0], y: wallNode.start[1] };
     const wallEnd = { x: wallNode.end[0], y: wallNode.end[1] };
-    const topElevation = resolveWallTop(wallNode, storeyHeight, slabElevation);
-    const effectiveWallHeight = topElevation - slabElevation;
-    const effectiveBaseElevation = Math.min(baseElevation, slabElevation);
+    const levelId = resolveLevelId(wallNode, sceneNodes);
+    const level = sceneNodes[levelId];
+    const authoredStoreyHeight = level?.type === 'level' ? (level.height ?? null) : null;
+    const topElevation = resolveWallTop(wallNode, storeyHeight, slabElevation, authoredStoreyHeight);
+    const faceDatum = faceBase;
+    if (faceBase)
+        faceBase = {
+            a: resolveWallFaceBottom(faceBase.a, baseSegments, slabElevation),
+            b: resolveWallFaceBottom(faceBase.b, baseSegments, slabElevation),
+        };
+    const faceSegments = faceBase ? [...faceBase.a, ...faceBase.b] : [];
+    const sameBase = faceBase &&
+        [faceBase.a, faceBase.b].every((segments) => JSON.stringify(segments) === JSON.stringify(baseSegments));
+    const useFaceBase = faceBase && !sameBase;
+    const effectiveBaseElevation = useFaceBase
+        ? Math.min(...faceSegments.flatMap((segment) => [
+            segment.elevation,
+            segment.endElevation ?? segment.elevation,
+        ]), slabElevation)
+        : Math.min(baseElevation, slabElevation);
     const localBottom = effectiveBaseElevation - slabElevation;
     const height = topElevation - effectiveBaseElevation;
     // A slab at or above the storey plane leaves a plane-bound wall with no
@@ -984,9 +1270,15 @@ export function generateExtrudedWall(wallNode, childrenNodes, miterData, slabEle
     // Convert polygon to local coordinates
     const localPoints = polyPoints.map(worldToLocal);
     const boundaryEdges = buildTaggedWallBoundaryEdges(wallNode, localPoints, miterData);
-    const terrainFill = terrainBottomAt
+    const finish = buildWallFinishContext(wallNode, finishLayout, faceDatum, slabElevation);
+    const finishPlanes = getWallFinishSplitPlanes(finish);
+    // An underpinned wall's stem skirt reaches the terrain itself; the plain
+    // terrain fill is for a wall with no underpinning.
+    const underpinningFills = buildWallUnderpinningGeometry(polyPoints, worldToLocal, slabElevation, wallNode, terrainBottomAt, isCurvedWall(wallNode));
+    const terrainFill = terrainBottomAt && !wallNode.underpinning
         ? buildWallTerrainFillGeometry(polyPoints, worldToLocal, slabElevation, terrainBottomAt)
         : null;
+    const belowBaseFills = [terrainFill, ...underpinningFills];
     // Build THREE.js shape
     // Shape uses (x, y) where we map: shape.x = local.x, shape.y = -local.z
     // The negation is needed because after rotateX(-PI/2), shape.y becomes -geometry.z
@@ -1006,20 +1298,31 @@ export function generateExtrudedWall(wallNode, childrenNodes, miterData, slabEle
     if (Math.abs(localBottom) > 1e-9)
         geometry.translate(0, localBottom, 0);
     geometry.computeVertexNormals();
-    assignWallMaterialGroups(geometry, wallNode, boundaryEdges, effectiveWallHeight);
+    assignWallMaterialGroups(geometry, wallNode, boundaryEdges, finish);
     ensureRenderableGeometryAttributes(geometry);
     // Start with the lowest required wall prism, then remove the volume below
     // each higher-supported run. This keeps the existing mitered footprint and
     // opening CSG while giving one wall a stepped longitudinal base.
     const baseProfileCutouts = [];
-    for (const segment of baseSegments) {
-        const segmentElevation = Math.min(segment.elevation, slabElevation);
+    const profiles = useFaceBase && faceBase
+        ? [
+            ...faceBase.a.map((segment) => ({ segment, face: 'a' })),
+            ...faceBase.b.map((segment) => ({ segment, face: 'b' })),
+        ]
+        : baseSegments.map((segment) => ({ segment, face: undefined }));
+    for (const { segment, face } of profiles) {
+        const segmentElevation = face
+            ? Math.min(Math.max(segment.elevation, segment.endElevation ?? segment.elevation), topElevation)
+            : Math.min(segment.elevation, slabElevation);
         const cutHeight = segmentElevation - effectiveBaseElevation;
         if (cutHeight <= 1e-6 || segment.end - segment.start <= 1e-7)
             continue;
         const segmentStart = THREE.MathUtils.clamp(segment.start, 0, 1);
         const segmentEnd = THREE.MathUtils.clamp(segment.end, 0, 1);
         const cutHalfWidth = Math.max(thickness * 2, 0.2);
+        const centerOffset = getWallBodyCenterOffset(wallNode);
+        const leftOffset = face === 'b' ? centerOffset : cutHalfWidth;
+        const rightOffset = face === 'a' ? centerOffset : -cutHalfWidth;
         const worldCutoutPoints = [];
         if (isCurvedWall(wallNode)) {
             const sampleCount = Math.max(2, Math.ceil((segmentEnd - segmentStart) * 24));
@@ -1038,12 +1341,12 @@ export function generateExtrudedWall(wallNode, childrenNodes, miterData, slabEle
                     y: frame.point.y + frame.tangent.y * endpointExtension,
                 };
                 left.push({
-                    x: center.x + frame.normal.x * cutHalfWidth,
-                    y: center.y + frame.normal.y * cutHalfWidth,
+                    x: center.x + frame.normal.x * leftOffset,
+                    y: center.y + frame.normal.y * leftOffset,
                 });
                 right.push({
-                    x: center.x - frame.normal.x * cutHalfWidth,
-                    y: center.y - frame.normal.y * cutHalfWidth,
+                    x: center.x + frame.normal.x * rightOffset,
+                    y: center.y + frame.normal.y * rightOffset,
                 });
             }
             worldCutoutPoints.push(...left, ...right.reverse());
@@ -1064,11 +1367,11 @@ export function generateExtrudedWall(wallNode, childrenNodes, miterData, slabEle
                 y: wallStart.y + tangentY * (segmentEnd * L + endExtension),
             };
             worldCutoutPoints.push({
-                x: startPoint.x + normalX * cutHalfWidth,
-                y: startPoint.y + normalY * cutHalfWidth,
-            }, { x: endPoint.x + normalX * cutHalfWidth, y: endPoint.y + normalY * cutHalfWidth }, { x: endPoint.x - normalX * cutHalfWidth, y: endPoint.y - normalY * cutHalfWidth }, {
-                x: startPoint.x - normalX * cutHalfWidth,
-                y: startPoint.y - normalY * cutHalfWidth,
+                x: startPoint.x + normalX * leftOffset,
+                y: startPoint.y + normalY * leftOffset,
+            }, { x: endPoint.x + normalX * leftOffset, y: endPoint.y + normalY * leftOffset }, { x: endPoint.x + normalX * rightOffset, y: endPoint.y + normalY * rightOffset }, {
+                x: startPoint.x + normalX * rightOffset,
+                y: startPoint.y + normalY * rightOffset,
             });
         }
         const localCutoutPoints = worldCutoutPoints.map(worldToLocal);
@@ -1080,7 +1383,11 @@ export function generateExtrudedWall(wallNode, childrenNodes, miterData, slabEle
             cutoutShape.lineTo(localCutoutPoints[index].x, -localCutoutPoints[index].z);
         }
         cutoutShape.closePath();
-        const cutoutBottom = localBottom - 0.01;
+        const slopeExtension = segment.endElevation === undefined
+            ? 0
+            : (Math.abs(segment.endElevation - segment.elevation) * cutHalfWidth) /
+                ((segmentEnd - segmentStart) * L);
+        const cutoutBottom = localBottom - 0.01 - slopeExtension;
         const cutoutTop = segmentElevation - slabElevation;
         const cutoutGeometry = new THREE.ExtrudeGeometry(cutoutShape, {
             depth: cutoutTop - cutoutBottom,
@@ -1088,19 +1395,31 @@ export function generateExtrudedWall(wallNode, childrenNodes, miterData, slabEle
         });
         cutoutGeometry.rotateX(-Math.PI / 2);
         cutoutGeometry.translate(0, cutoutBottom, 0);
+        if (segment.endElevation !== undefined) {
+            const from = wallStationX(wallNode, segmentStart, L);
+            const to = wallStationX(wallNode, segmentEnd, L);
+            const positions = cutoutGeometry.getAttribute('position');
+            for (let i = 0; i < positions.count; i++) {
+                if (Math.abs(positions.getY(i) - cutoutTop) > 1e-5)
+                    continue;
+                const t = (positions.getX(i) - from) / (to - from);
+                positions.setY(i, Math.min(topElevation, segment.elevation + (segment.endElevation - segment.elevation) * t) - slabElevation);
+            }
+            cutoutGeometry.computeVertexNormals();
+        }
         computeGeometryBoundsTree(cutoutGeometry);
         baseProfileCutouts.push(new Brush(cutoutGeometry));
     }
     const cutoutBrushes = [
         ...baseProfileCutouts,
-        ...collectCutoutBrushes(wallNode, childrenNodes, thickness),
+        ...collectCutoutBrushes(wallNode, childrenNodes, thickness, faceDatum, slabElevation, sceneNodes, baseSegments),
     ];
     if (cutoutBrushes.length === 0) {
-        const splitGeometry = splitGeometryAtHorizontalPlanes(geometry, getWallBandSplitPlanes(wallNode, effectiveWallHeight));
+        const splitGeometry = splitGeometryAtPlanes(geometry, finishPlanes.y, finishPlanes.x);
         splitGeometry.computeVertexNormals();
-        assignWallMaterialGroups(splitGeometry, wallNode, boundaryEdges, effectiveWallHeight);
+        assignWallMaterialGroups(splitGeometry, wallNode, boundaryEdges, finish);
         ensureRenderableGeometryAttributes(splitGeometry);
-        return mergeWallTerrainFill(splitGeometry, terrainFill, wallNode, boundaryEdges, effectiveWallHeight);
+        return withWallFinishData(mergeWallTerrainFill(splitGeometry, belowBaseFills, wallNode, boundaryEdges, finish), finish);
     }
     // Create wall brush from geometry
     // Pre-compute BVH with new API to avoid deprecation warning
@@ -1143,18 +1462,59 @@ export function generateExtrudedWall(wallNode, childrenNodes, miterData, slabEle
             csgGeometry(brush).dispose();
     }
     const resultGeometry = csgGeometry(resultBrush);
-    const splitResultGeometry = splitGeometryAtHorizontalPlanes(resultGeometry, getWallBandSplitPlanes(wallNode, effectiveWallHeight));
+    const splitResultGeometry = splitGeometryAtPlanes(resultGeometry, finishPlanes.y, finishPlanes.x);
     splitResultGeometry.computeVertexNormals();
-    assignWallMaterialGroups(splitResultGeometry, wallNode, boundaryEdges, effectiveWallHeight);
+    assignWallMaterialGroups(splitResultGeometry, wallNode, boundaryEdges, finish);
     ensureRenderableGeometryAttributes(splitResultGeometry);
-    return mergeWallTerrainFill(splitResultGeometry, terrainFill, wallNode, boundaryEdges, effectiveWallHeight);
+    return withWallFinishData(mergeWallTerrainFill(splitResultGeometry, belowBaseFills, wallNode, boundaryEdges, finish), finish);
+}
+function withWallFinishData(geometry, finish) {
+    if (!finish.layout.plain || finish.foundation) {
+        geometry.userData.wallFinish = {
+            refs: finish.refs,
+            faceBase: finish.faceBase,
+        };
+    }
+    return geometry;
 }
 /**
  * Collects opening and item cutout brushes for CSG subtraction. Door/window
  * cuts come directly from node geometry; item proxy meshes are transformed
  * into wall-local boxes that pass through the wall.
  */
-function collectCutoutBrushes(wallNode, childrenNodes, wallThickness) {
+/**
+ * A CSG brush from an authored object's `cutout` mesh: the mesh in wall-local
+ * space, its depth stretched to twice the wall's thickness about the wall's
+ * body centre so it overshoots both faces. Null when the mesh has no depth to
+ * stretch (a flat cutter), so the caller falls back to its bounding box.
+ */
+function authoredCutoutBrush(cutoutMesh, wallMatrixInverse, wallThickness, wallNode) {
+    const geometry = cutoutMesh.geometry.clone();
+    geometry.applyMatrix4(new THREE.Matrix4().multiplyMatrices(wallMatrixInverse, cutoutMesh.matrixWorld));
+    geometry.computeBoundingBox();
+    const box = geometry.boundingBox;
+    const depth = box.max.z - box.min.z;
+    if (!(depth > 1e-4)) {
+        geometry.dispose();
+        return null;
+    }
+    const centre = getWallBodyCenterOffset(wallNode);
+    const meshCentre = (box.min.z + box.max.z) / 2;
+    const scale = (wallThickness * 2) / depth;
+    const positions = geometry.getAttribute('position');
+    for (let i = 0; i < positions.count; i++) {
+        positions.setZ(i, centre + (positions.getZ(i) - meshCentre) * scale);
+    }
+    positions.needsUpdate = true;
+    // The evaluator needs the attributes every brush carries.
+    if (!geometry.getAttribute('uv')) {
+        geometry.setAttribute('uv', new THREE.BufferAttribute(new Float32Array(positions.count * 2), 2));
+    }
+    geometry.computeVertexNormals();
+    computeGeometryBoundsTree(geometry);
+    return new Brush(geometry);
+}
+function collectCutoutBrushes(wallNode, childrenNodes, wallThickness, faceBase, elevation = 0, sceneNodes = useScene.getState().nodes, baseSegments = [{ start: 0, end: 1, elevation }]) {
     const brushes = [];
     const wallMesh = sceneRegistry.nodes.get(wallNode.id);
     if (!wallMesh)
@@ -1162,63 +1522,165 @@ function collectCutoutBrushes(wallNode, childrenNodes, wallThickness) {
     // Get wall's world matrix inverse to transform cutouts to wall-local space
     wallMesh.updateMatrixWorld();
     const wallMatrixInverse = wallMesh.matrixWorld.clone().invert();
+    // A wall child can only bind to its parent, so the wall alone resolves every cutter.
+    const hostNodes = { [wallNode.id]: wallNode };
     for (const child of childrenNodes) {
         if (child.type !== 'item' && child.type !== 'window' && child.type !== 'door')
             continue;
-        if (child.type === 'door' || child.type === 'window') {
-            brushes.push(createOpeningCutoutBrush(child, wallThickness));
+        const cutterMeshes = [];
+        sceneRegistry.nodes.get(child.id)?.traverse((object) => {
+            const name = typeof object.userData.name === 'string' ? object.userData.name : object.name;
+            if (object.isMesh &&
+                resolveCutterHost(child, name, hostNodes)?.id === wallNode.id) {
+                cutterMeshes.push(object);
+            }
+        });
+        // A window or door built from a script cuts its `cutout` mesh like an
+        // authored item (below); without one, or until it loads, its outline.
+        const scriptedCutout = child.type !== 'item' && child.source && cutterMeshes.length > 0;
+        if ((child.type === 'door' || child.type === 'window') && !scriptedCutout) {
+            const nodes = {
+                ...sceneNodes,
+                [wallNode.id]: wallNode,
+                ...Object.fromEntries(childrenNodes.map((node) => [node.id, node])),
+            };
+            const datum = faceBase ?? {
+                a: [{ start: 0, end: 1, elevation }],
+                b: [{ start: 0, end: 1, elevation }],
+            };
+            const support = {
+                elevation,
+                electedSlabId: null,
+                baseElevation: elevation,
+                baseSegments: [...baseSegments],
+                faceDatum: { a: [...datum.a], b: [...datum.b] },
+                faceBottom: {
+                    a: resolveWallFaceBottom(datum.a, baseSegments, elevation),
+                    b: resolveWallFaceBottom(datum.b, baseSegments, elevation),
+                },
+            };
+            const cut = getOpeningWallCut(wallNode, child, nodes, support);
+            // The cutter must overshoot the faces it cuts through; `cut.aperture` is
+            // clipped to the wall's own footprint (the doorway floor), so extruding it
+            // would leave coplanar faces and CSG would drop the cut.
+            if (!isCurvedWall(wallNode)) {
+                brushes.push(createOpeningCutoutBrush({
+                    ...child,
+                    position: [
+                        child.position[0],
+                        child.position[1] + cut.datum - elevation,
+                        child.position[2],
+                    ],
+                }, wallThickness, getWallBodyCenterOffset(wallNode), cut.bottom - elevation, child.type === 'window' ? cornerPair(sceneNodes, child)?.end : undefined));
+                continue;
+            }
+            if (cut.band.length < 3)
+                continue;
+            const angle = Math.atan2(wallNode.end[1] - wallNode.start[1], wallNode.end[0] - wallNode.start[0]);
+            const points = cut.band.map(([x, z]) => {
+                const dx = x - wallNode.start[0], dz = z - wallNode.start[1];
+                return new THREE.Vector2(dx * Math.cos(angle) + dz * Math.sin(angle), dx * Math.sin(angle) - dz * Math.cos(angle));
+            });
+            const padding = getOpeningCutoutBottomPadding(child, cut.bottom - elevation);
+            const geometry = new THREE.ExtrudeGeometry(new THREE.Shape(points), {
+                depth: cut.top - cut.bottom + padding,
+                bevelEnabled: false,
+            });
+            geometry.rotateX(-Math.PI / 2);
+            geometry.translate(0, cut.bottom - elevation - padding, 0);
+            computeGeometryBoundsTree(geometry);
+            const bandBrush = new Brush(geometry);
+            if (child.openingShape !== 'arch' && child.openingShape !== 'rounded') {
+                brushes.push(bandBrush);
+                continue;
+            }
+            const shaped = createOpeningCutoutBrush({
+                ...child,
+                position: [
+                    child.position[0],
+                    child.position[1] + cut.datum - elevation,
+                    child.position[2],
+                ],
+            }, wallThickness, getWallBodyCenterOffset(wallNode), cut.bottom - elevation);
+            const frame = getWallCurveFrameAt(wallNode, child.position[0] / getWallCurveLength(wallNode));
+            const offset = getWallBodyCenterOffset(wallNode);
+            const dx = frame.point.x + frame.normal.x * offset - wallNode.start[0], dz = frame.point.y + frame.normal.y * offset - wallNode.start[1];
+            csgGeometry(shaped).translate(-child.position[0], 0, -offset);
+            csgGeometry(shaped).rotateY(angle - Math.atan2(frame.tangent.y, frame.tangent.x));
+            csgGeometry(shaped).translate(dx * Math.cos(angle) + dz * Math.sin(angle), 0, -dx * Math.sin(angle) + dz * Math.cos(angle));
+            prepareBrushForCSG(bandBrush);
+            prepareBrushForCSG(shaped);
+            bandBrush.updateMatrixWorld();
+            shaped.updateMatrixWorld();
+            brushes.push(csgEvaluator.evaluate(bandBrush, shaped, INTERSECTION));
+            geometry.dispose();
+            csgGeometry(shaped).dispose();
             continue;
         }
-        const childMesh = sceneRegistry.nodes.get(child.id);
-        if (!childMesh)
-            continue;
-        const cutoutMesh = childMesh.getObjectByName('cutout');
-        if (!cutoutMesh)
-            continue;
-        // Get the cutout's bounding box in world space
-        cutoutMesh.updateMatrixWorld();
-        const positions = cutoutMesh.geometry?.attributes?.position;
-        if (!positions)
-            continue;
-        // Calculate bounds in wall-local space
-        const v3 = new THREE.Vector3();
-        let minX = Number.POSITIVE_INFINITY, maxX = Number.NEGATIVE_INFINITY;
-        let minY = Number.POSITIVE_INFINITY, maxY = Number.NEGATIVE_INFINITY;
-        for (let i = 0; i < positions.count; i++) {
-            v3.fromBufferAttribute(positions, i);
-            v3.applyMatrix4(cutoutMesh.matrixWorld);
-            v3.applyMatrix4(wallMatrixInverse);
-            minX = Math.min(minX, v3.x);
-            maxX = Math.max(maxX, v3.x);
-            minY = Math.min(minY, v3.y);
-            maxY = Math.max(maxY, v3.y);
+        for (const cutoutMesh of cutterMeshes) {
+            // Get the cutout's bounding box in world space
+            cutoutMesh.updateMatrixWorld();
+            const positions = cutoutMesh.geometry?.attributes?.position;
+            if (!positions)
+                continue;
+            // Calculate bounds in wall-local space
+            const v3 = new THREE.Vector3();
+            let minX = Number.POSITIVE_INFINITY, maxX = Number.NEGATIVE_INFINITY;
+            let minY = Number.POSITIVE_INFINITY, maxY = Number.NEGATIVE_INFINITY;
+            for (let i = 0; i < positions.count; i++) {
+                v3.fromBufferAttribute(positions, i);
+                v3.applyMatrix4(cutoutMesh.matrixWorld);
+                v3.applyMatrix4(wallMatrixInverse);
+                minX = Math.min(minX, v3.x);
+                maxX = Math.max(maxX, v3.x);
+                minY = Math.min(minY, v3.y);
+                maxY = Math.max(maxY, v3.y);
+            }
+            if (!Number.isFinite(minX))
+                continue;
+            // An authored object's cutout keeps its shape (an arch, a circle): its own
+            // geometry in wall space, stretched across the wall so it cuts both faces.
+            if (child.source) {
+                const shaped = authoredCutoutBrush(cutoutMesh, wallMatrixInverse, wallThickness, wallNode);
+                if (shaped) {
+                    brushes.push(shaped);
+                    continue;
+                }
+            }
+            // Create a box geometry that extends through the wall thickness
+            const width = maxX - minX;
+            const height = maxY - minY;
+            const depth = wallThickness * 2; // Extend beyond wall to ensure clean cut
+            const boxGeo = new THREE.BoxGeometry(width, height, depth);
+            // Position box at the center of the cutout
+            boxGeo.translate(minX + width / 2, minY + height / 2, getWallBodyCenterOffset(wallNode));
+            // Pre-compute BVH with new API to avoid deprecation warning
+            computeGeometryBoundsTree(boxGeo);
+            const brush = new Brush(boxGeo);
+            brushes.push(brush);
         }
-        if (!Number.isFinite(minX))
-            continue;
-        // Create a box geometry that extends through the wall thickness
-        const width = maxX - minX;
-        const height = maxY - minY;
-        const depth = wallThickness * 2; // Extend beyond wall to ensure clean cut
-        const boxGeo = new THREE.BoxGeometry(width, height, depth);
-        // Position box at the center of the cutout
-        boxGeo.translate(minX + width / 2, minY + height / 2, 0);
-        // Pre-compute BVH with new API to avoid deprecation warning
-        computeGeometryBoundsTree(boxGeo);
-        const brush = new Brush(boxGeo);
-        brushes.push(brush);
     }
     return brushes;
 }
-function createOpeningCutoutBrush(opening, wallThickness) {
+/**
+ * How far a corner window's cut runs past its wall's end: past this wall's half of the corner at any
+ * angle (the miter stops at five thicknesses), so the two sides open the corner between them. The
+ * cut only takes this wall's own geometry, so running past it touches nothing else.
+ */
+const CORNER_CUT_REACH = 6;
+function createOpeningCutoutBrush(opening, wallThickness, centerOffset, cutBottom, cornerEnd) {
     const halfWidth = opening.width / 2;
-    const bottom = opening.position[1] - opening.height / 2;
+    const bottom = cutBottom ?? opening.position[1] - opening.height / 2;
     const bottomPadding = getOpeningCutoutBottomPadding(opening, bottom);
+    const reach = CORNER_CUT_REACH * wallThickness;
     const geometry = buildOpeningCutoutGeometry(opening, {
-        left: opening.position[0] - halfWidth,
-        right: opening.position[0] + halfWidth,
+        left: opening.position[0] - halfWidth - (cornerEnd === 'start' ? reach : 0),
+        right: opening.position[0] + halfWidth + (cornerEnd === 'end' ? reach : 0),
         bottom: bottom - bottomPadding,
         top: opening.position[1] + opening.height / 2,
     }, wallThickness * 2, wallThickness);
+    if (centerOffset !== 0)
+        geometry.translate(0, 0, centerOffset);
     computeGeometryBoundsTree(geometry);
     return new Brush(geometry);
 }