@pascal-app/nodes 1.0.4 → 1.0.5

package/dist/window/panel.js

@@ -1,16 +1,17 @@
 'use client';
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { scriptImages, useInteractive, useScene, } from '@pascal-app/core';
-import { getWindowStyleOverrides, SHAPED_WINDOW_TYPES, SILLLESS_WINDOW_TYPES, WINDOW_STYLE_CHOICES, WINDOW_STYLE_LABELS, windowStylesOf, windowTakesStyle, windowTypeChange, } from '@pascal-app/core/building';
-import { ActionButton, ActionGroup, cn, duplicateNodeAndPickUp, PanelSection, PanelWrapper, SegmentedControl, SliderControl, ToggleControl, triggerSFX, useEditor, } from '@pascal-app/editor';
+import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { cornerPair, fusesAtCorner, runAsSingleSceneHistoryStep, scriptImages, useInteractive, useScene, } from '@pascal-app/core';
+import { isAgentRefusal } from '@pascal-app/core/agent-tools';
+import { cornerPartnerUpdates, cornerSideWidth, getWindowStyleOverrides, SHAPED_WINDOW_TYPES, SILLLESS_WINDOW_TYPES, unwrapCorner, WINDOW_STYLE_CHOICES, WINDOW_STYLE_LABELS, windowStylesOf, windowTakesStyle, windowTypeChange, wrapCorner, } from '@pascal-app/core/building';
+import { ActionButton, ActionGroup, cn, duplicateNodeAndPickUp, PanelSection, PanelWrapper, SegmentedControl, SliderControl, ToggleControl, triggerSFX, useEditor, writeWindowChanges, } from '@pascal-app/editor';
 import { useViewer } from '@pascal-app/viewer';
 import { Copy, FlipHorizontal2, Move, Trash2 } from 'lucide-react';
 import { useCallback, useEffect, useMemo } from 'react';
-import { AuthoredParams } from '../item/authored-params';
-import { constrainCurtainOpening, curtainOpeningLimits } from '../shared/curtain-opening-limits';
-import { createOpeningPropertyPreview } from '../shared/opening-property-preview';
-import { openingPropertyPreviewHost } from '../shared/opening-property-preview-host';
-import { windowTypeOptions } from './placement';
+import { AuthoredParams } from '../item/authored-params.js';
+import { constrainCurtainOpening, curtainOpeningLimits } from '../shared/curtain-opening-limits.js';
+import { createOpeningPropertyPreview } from '../shared/opening-property-preview.js';
+import { openingPropertyPreviewHost } from '../shared/opening-property-preview-host.js';
+import { windowTypeOptions } from './placement.js';
 function isSameWindowValue(current, next) {
     if (typeof current === 'number' && typeof next === 'number') {
         return Math.abs(current - next) < 1e-6;
@@ -31,6 +32,22 @@ function normalizeWindowCornerRadii(radii, width, height) {
         return next;
     return next.map((radius) => radius * scale);
 }
+/** The Corner section's pill buttons: a token hover, the press, the keyboard focus ring. */
+const CORNER_BUTTON = 'outline-hidden transition-[background-color,scale] duration-150 hover:bg-foreground/[0.06] focus-visible:outline-2 focus-visible:outline-foreground/50 focus-visible:outline-offset-2 motion-safe:active:scale-[0.96]';
+/** A change to one side of a corner window that both share, made on its partner too. */
+function syncCornerPartner(windowId, updates) {
+    const scene = useScene.getState();
+    const partnerUpdate = cornerPartnerUpdates(scene.nodes, windowId, updates);
+    const partnerId = scene.nodes[windowId]?.corner
+        ?.partnerId;
+    if (!partnerUpdate || !partnerId)
+        return;
+    scene.updateNode(partnerId, partnerUpdate);
+    scene.dirtyNodes.add(partnerId);
+    const parentId = scene.nodes[partnerId]?.parentId;
+    if (parentId)
+        scene.dirtyNodes.add(parentId);
+}
 export default function WindowPanel() {
     const selectedId = useViewer((s) => s.selection.selectedIds[0]);
     const setSelection = useViewer((s) => s.setSelection);
@@ -56,14 +73,84 @@ export default function WindowPanel() {
         });
         if (!hasChange)
             return;
-        useScene.getState().updateNode(selectedId, updates);
-        const scene = useScene.getState();
-        scene.dirtyNodes.add(selectedId);
-        if (liveNode.parentId)
-            scene.dirtyNodes.add(liveNode.parentId);
+        // A corner window's partner follows in the same undo step, so undo never splits the pair.
+        runAsSingleSceneHistoryStep(useScene, () => {
+            useScene.getState().updateNode(selectedId, updates);
+            const scene = useScene.getState();
+            scene.dirtyNodes.add(selectedId);
+            if (liveNode.parentId)
+                scene.dirtyNodes.add(liveNode.parentId);
+            syncCornerPartner(selectedId, updates);
+        });
     }, [selectedId]);
+    // A corner window's sides: its partner, and whether this window can wrap its corner. Planned
+    // when the window, its wall or its partner changes, not on every scene update.
+    const hostWall = useScene((s) => node?.parentId ? s.nodes[node.parentId] : undefined);
+    const cornerPartner = useScene((s) => {
+        const partner = node?.corner ? s.nodes[node.corner.partnerId] : undefined;
+        return partner?.type === 'window' ? partner : undefined;
+    });
+    const cornerState = useMemo(() => {
+        // Read from the scene below; these only say when to plan again.
+        void hostWall;
+        void cornerPartner;
+        if (node?.type !== 'window')
+            return 'none';
+        const nodes = useScene.getState().nodes;
+        if (cornerPair(nodes, node))
+            return 'paired';
+        // Within 0.30 m of a corner, not only at it: the window waiting there is adopted, or a partner made.
+        try {
+            wrapCorner(nodes, node.id);
+            return 'wrappable';
+        }
+        catch (error) {
+            if (isAgentRefusal(error))
+                return 'none';
+            throw error;
+        }
+    }, [node, hostWall, cornerPartner]);
+    const corner = cornerState === 'paired' && cornerPartner
+        ? { paired: true, partner: cornerPartner }
+        : cornerState === 'wrappable'
+            ? { paired: false }
+            : null;
+    const writeWindows = (updates) => writeWindowChanges({ create: null, updates, remove: [] });
+    const wrapTheCorner = () => {
+        if (!selectedId)
+            return;
+        try {
+            const { create, updates } = wrapCorner(useScene.getState().nodes, selectedId);
+            writeWindowChanges({ create, updates, remove: [] });
+        }
+        catch (error) {
+            // The scene changed since the panel offered it: the window stays as it is.
+            if (!isAgentRefusal(error))
+                throw error;
+        }
+    };
+    const setCornerWidth = (windowId, width) => {
+        const update = cornerSideWidth(useScene.getState().nodes, windowId, width);
+        if (update)
+            writeWindows({ [windowId]: update });
+    };
+    const setCornerPost = (post) => {
+        if (!(selectedId && corner?.paired && node?.corner))
+            return;
+        writeWindows({
+            [selectedId]: { corner: { ...node.corner, post } },
+            [corner.partner.id]: { corner: { ...corner.partner.corner, post } },
+        });
+    };
     const previewWindowUpdate = (key, value) => preview?.preview({ [key]: value });
-    const commitWindowPreview = (key, value) => preview?.commit({ [key]: value });
+    // A committed change a corner window shares with its partner (its height, frame, sill) takes the
+    // partner along, in the same undo step.
+    const commitPreview = (updates) => runAsSingleSceneHistoryStep(useScene, () => {
+        preview?.commit(updates);
+        if (selectedId)
+            syncCornerPartner(selectedId, updates);
+    });
+    const commitWindowPreview = (key, value) => commitPreview({ [key]: value });
     const handleClose = useCallback(() => {
         setSelection({ selectedIds: [] });
     }, [setSelection]);
@@ -231,7 +318,7 @@ export default function WindowPanel() {
                             const isSelected = displayedWindowType === option.value;
                             return (_jsx("button", { className: cn('flex min-h-12 items-center rounded-lg border px-3 py-2.5 text-left text-xs transition-colors', isSelected
                                     ? 'border-orange-400/60 bg-orange-400/10 text-foreground'
-                                    : 'border-border/50 bg-[#2C2C2E] text-muted-foreground hover:bg-[#3e3e3e] hover:text-foreground'), onClick: () => handleUpdate({
+                                    : 'border-border/50 bg-black/4 dark:bg-[#2C2C2E] text-muted-foreground hover:bg-black/8 dark:hover:bg-[#3e3e3e] hover:text-foreground'), onClick: () => handleUpdate({
                                     ...windowTypeChange(node, option.value),
                                     ...(option.value === 'awning' ? { awningDirection } : {}),
                                 }), type: "button", children: _jsx("span", { className: "truncate font-medium", children: option.label }) }, option.value));
@@ -249,7 +336,10 @@ export default function WindowPanel() {
                                     { value: 'right', label: 'Right' },
                                 ], value: node.hingesSide ?? 'left' }))] })), showOperationSection && (_jsx("div", { className: "mt-2", children: _jsx(SliderControl, { label: operationLabel, max: 1, min: 0, onChange: setOperationState, precision: 2, restoreOnCommit: false, step: 0.05, value: Math.round((node.operationState ?? 0) * 100) / 100 }) }))] })), showStyleSection && (_jsxs(PanelSection, { title: "Style", children: [_jsx("div", { className: "grid grid-cols-2 gap-2 px-1 pt-1", children: WINDOW_STYLE_CHOICES.map((style) => (_jsx("button", { "aria-pressed": windowStyles.includes(style), className: cn('flex min-h-10 items-center rounded-lg border px-3 py-2 text-left text-xs transition-colors', windowStyles.includes(style)
                                 ? 'border-orange-400/60 bg-orange-400/10 text-foreground'
-                                : 'border-border/50 bg-[#2C2C2E] text-muted-foreground hover:bg-[#3e3e3e] hover:text-foreground'), onClick: () => handleUpdate(getWindowStyleOverrides(style)), type: "button", children: _jsx("span", { className: "truncate font-medium", children: WINDOW_STYLE_LABELS[style] }) }, style))) }), !windowStyles.length && (_jsx("p", { className: "px-1 pt-2 text-muted-foreground text-xs", children: "Custom: the panes match no style." }))] })), _jsxs(PanelSection, { title: "Position", children: [_jsx(SliderControl, { label: _jsxs(_Fragment, { children: ["X", _jsx("sub", { className: "ml-[1px] text-[11px] opacity-70", children: "pos" })] }), onChange: (v) => handleUpdate({ position: [v, node.position[1], node.position[2]] }), precision: 2, step: 0.1, unit: "m", value: node.position[0] }), _jsx(SliderControl, { label: _jsxs(_Fragment, { children: ["Y", _jsx("sub", { className: "ml-[1px] text-[11px] opacity-70", children: "pos" })] }), onChange: (v) => handleUpdate({ position: [node.position[0], v, node.position[2]] }), precision: 2, step: 0.1, unit: "m", value: node.position[1] }), showFlipSide && (_jsx("div", { className: "px-1 pt-2 pb-1", children: _jsx(ActionButton, { className: "w-full", icon: _jsx(FlipHorizontal2, { className: "h-4 w-4" }), label: "Flip Side", onClick: handleFlip }) }))] }), scripted && _jsx(AuthoredParams, { node: node }), !scripted && (_jsxs(PanelSection, { title: "Dimensions", children: [limits && (_jsx("p", { className: "text-[11px] text-muted-foreground", children: "Size is limited to the wall, including clearance for the opening frame." })), _jsx(SliderControl, { label: "Width", max: limits?.width, min: 0.01, onChange: (v) => preview?.preview(getDimensionUpdates({ width: v })), onCommit: (v) => preview?.commit(getDimensionUpdates({ width: v })), onCancel: () => preview?.cancel(), previewWhileTyping: true, precision: 2, restoreOnCommit: false, step: 0.01, unit: "m", value: node.width }), _jsx(SliderControl, { label: "Height", max: limits?.height, min: 0.01, onChange: (v) => preview?.preview(getDimensionUpdates({ height: v })), onCommit: (v) => preview?.commit(getDimensionUpdates({ height: v })), onCancel: () => preview?.cancel(), previewWhileTyping: true, precision: 2, restoreOnCommit: false, step: 0.01, unit: "m", value: node.height })] })), showWindowShapeSection && (_jsxs(PanelSection, { title: "Top Shape", children: [_jsx(SegmentedControl, { onChange: (value) => handleUpdate({
+                                : 'border-border/50 bg-black/4 dark:bg-[#2C2C2E] text-muted-foreground hover:bg-black/8 dark:hover:bg-[#3e3e3e] hover:text-foreground'), onClick: () => handleUpdate(getWindowStyleOverrides(style)), type: "button", children: _jsx("span", { className: "truncate font-medium", children: WINDOW_STYLE_LABELS[style] }) }, style))) }), !windowStyles.length && (_jsx("p", { className: "px-1 pt-2 text-muted-foreground text-xs", children: "Custom: the panes match no style." }))] })), corner && (_jsx(PanelSection, { title: "Corner", children: corner.paired ? (_jsxs("div", { className: "flex flex-col gap-2 px-1 pb-1", children: [_jsxs("div", { className: "flex items-center justify-between gap-2 text-xs", children: [_jsxs("span", { className: "text-muted-foreground", children: ["Wraps the corner with ", corner.partner.name || 'its partner'] }), _jsx("button", { className: cn('rounded-full border border-border/50 px-3 py-1 text-xs', CORNER_BUTTON), onClick: () => selectedId && writeWindows(unwrapCorner(useScene.getState().nodes, selectedId)), type: "button", children: "Unwrap" })] }), _jsx(SliderControl, { label: "This side", min: 0.1, onChange: (v) => selectedId && setCornerWidth(selectedId, v), precision: 2, step: 0.05, unit: "m", value: node.width }), _jsx(SliderControl, { label: "Other side", min: 0.1, onChange: (v) => setCornerWidth(corner.partner.id, v), precision: 2, step: 0.05, unit: "m", value: corner.partner.width }), fusesAtCorner(node) && (_jsx(SegmentedControl, { onChange: setCornerPost, options: [
+                                { label: 'Fused glass', value: 'none' },
+                                { label: 'Corner post', value: 'post' },
+                            ], value: node.corner?.post ?? 'none' }))] })) : (_jsx("div", { className: "px-1 pb-1", children: _jsx("button", { className: cn('w-full rounded-full border border-border/50 px-3 py-2 text-xs', CORNER_BUTTON), onClick: wrapTheCorner, type: "button", children: "Wrap the corner" }) })) })), _jsxs(PanelSection, { title: "Position", children: [!corner?.paired && (_jsx(SliderControl, { label: _jsxs(_Fragment, { children: ["X", _jsx("sub", { className: "ml-[1px] text-[11px] opacity-70", children: "pos" })] }), onChange: (v) => handleUpdate({ position: [v, node.position[1], node.position[2]] }), precision: 2, step: 0.1, unit: "m", value: node.position[0] })), _jsx(SliderControl, { label: _jsxs(_Fragment, { children: ["Y", _jsx("sub", { className: "ml-[1px] text-[11px] opacity-70", children: "pos" })] }), onChange: (v) => handleUpdate({ position: [node.position[0], v, node.position[2]] }), precision: 2, step: 0.1, unit: "m", value: node.position[1] }), showFlipSide && (_jsx("div", { className: "px-1 pt-2 pb-1", children: _jsx(ActionButton, { className: "w-full", icon: _jsx(FlipHorizontal2, { className: "h-4 w-4" }), label: "Flip Side", onClick: handleFlip }) }))] }), scripted && _jsx(AuthoredParams, { node: node }), !scripted && (_jsxs(PanelSection, { title: "Dimensions", children: [limits && (_jsx("p", { className: "text-[11px] text-muted-foreground", children: "Size is limited to the wall, including clearance for the opening frame." })), !corner?.paired && (_jsx(SliderControl, { label: "Width", max: limits?.width, min: 0.01, onChange: (v) => preview?.preview(getDimensionUpdates({ width: v })), onCommit: (v) => preview?.commit(getDimensionUpdates({ width: v })), onCancel: () => preview?.cancel(), previewWhileTyping: true, precision: 2, restoreOnCommit: false, step: 0.01, unit: "m", value: node.width })), _jsx(SliderControl, { label: "Height", max: limits?.height, min: 0.01, onChange: (v) => preview?.preview(getDimensionUpdates({ height: v })), onCommit: (v) => commitPreview(getDimensionUpdates({ height: v })), onCancel: () => preview?.cancel(), previewWhileTyping: true, precision: 2, restoreOnCommit: false, step: 0.01, unit: "m", value: node.height })] })), showWindowShapeSection && (_jsxs(PanelSection, { title: "Top Shape", children: [_jsx(SegmentedControl, { onChange: (value) => handleUpdate({
                             openingShape: value,
                             ...(value === 'rounded'
                                 ? {
@@ -291,5 +381,5 @@ export default function WindowPanel() {
                                 }, precision: 0, step: 1, value: numCols }), _jsx(SliderControl, { label: "Rows", max: 8, min: 1, onChange: (v) => {
                                     const n = Math.max(1, Math.min(8, Math.round(v)));
                                     handleUpdate({ rowRatios: Array(n).fill(1 / n) });
-                                }, precision: 0, step: 1, value: numRows }), numCols > 1 && (_jsxs("div", { className: "mt-2 flex flex-col gap-1", children: [_jsx("div", { className: "mb-1 px-1 font-medium text-[10px] text-muted-foreground/80 uppercase tracking-wider", children: "Col Widths" }), normCols.map((ratio, i) => (_jsx(SliderControl, { label: `C${i + 1}`, max: 95, min: 5, onChange: (v) => setColumnRatio(i, v / 100), precision: 1, step: 1, unit: "%", value: Math.round(ratio * 100 * 10) / 10 }, `c-${i}`))), _jsx("div", { className: "mt-1 border-border/50 border-t pt-1", children: _jsx(SliderControl, { label: "Divider", max: 0.1, min: 0.005, onChange: (v) => handleUpdate({ columnDividerThickness: v }), precision: 3, step: 0.01, unit: "m", value: node.columnDividerThickness ?? 0.03 }) })] })), numRows > 1 && (_jsxs("div", { className: "mt-2 flex flex-col gap-1", children: [_jsx("div", { className: "mb-1 px-1 font-medium text-[10px] text-muted-foreground/80 uppercase tracking-wider", children: "Row Heights" }), normRows.map((ratio, i) => (_jsx(SliderControl, { label: `R${i + 1}`, max: 95, min: 5, onChange: (v) => setRowRatio(i, v / 100), precision: 1, step: 1, unit: "%", value: Math.round(ratio * 100 * 10) / 10 }, `r-${i}`))), _jsx("div", { className: "mt-1 border-border/50 border-t pt-1", children: _jsx(SliderControl, { label: "Divider", max: 0.1, min: 0.005, onChange: (v) => handleUpdate({ rowDividerThickness: v }), precision: 3, step: 0.01, unit: "m", value: node.rowDividerThickness ?? 0.03 }) })] }))] })), showSillSection && (_jsxs(PanelSection, { title: "Sill", children: [_jsx(ToggleControl, { checked: node.sill, label: "Enable Sill", onChange: (checked) => handleUpdate({ sill: checked }) }), node.sill && (_jsxs("div", { className: "mt-1 flex flex-col gap-1", children: [_jsx(SliderControl, { label: "Depth", min: 0, onChange: (v) => handleUpdate({ sillDepth: v }), precision: 3, step: 0.01, unit: "m", value: node.sillDepth }), _jsx(SliderControl, { label: "Thickness", min: 0, onChange: (v) => handleUpdate({ sillThickness: v }), precision: 3, step: 0.01, unit: "m", value: node.sillThickness })] }))] }))] })), _jsx(PanelSection, { title: "Actions", children: _jsxs(ActionGroup, { children: [_jsx(ActionButton, { icon: _jsx(Move, { className: "h-3.5 w-3.5" }), label: "Move", onClick: handleMove }), _jsx(ActionButton, { icon: _jsx(Copy, { className: "h-3.5 w-3.5" }), label: "Duplicate", onClick: handleDuplicate }), _jsx(ActionButton, { className: "hover:bg-red-500/20", icon: _jsx(Trash2, { className: "h-3.5 w-3.5 text-red-400" }), label: "Delete", onClick: handleDelete })] }) })] }));
+                                }, precision: 0, step: 1, value: numRows }), numCols > 1 && (_jsxs("div", { className: "mt-2 flex flex-col gap-1", children: [_jsx("div", { className: "mb-1 px-1 font-medium text-[10px] text-muted-foreground/80 uppercase tracking-wider", children: "Col Widths" }), normCols.map((ratio, i) => (_jsx(SliderControl, { label: `C${i + 1}`, max: 95, min: 5, onChange: (v) => setColumnRatio(i, v / 100), precision: 1, step: 1, unit: "%", value: Math.round(ratio * 100 * 10) / 10 }, `c-${i}`))), _jsx("div", { className: "mt-1 border-border/50 border-t pt-1", children: _jsx(SliderControl, { label: "Divider", max: 0.1, min: 0.005, onChange: (v) => handleUpdate({ columnDividerThickness: v }), precision: 3, step: 0.01, unit: "m", value: node.columnDividerThickness ?? 0.03 }) })] })), numRows > 1 && (_jsxs("div", { className: "mt-2 flex flex-col gap-1", children: [_jsx("div", { className: "mb-1 px-1 font-medium text-[10px] text-muted-foreground/80 uppercase tracking-wider", children: "Row Heights" }), normRows.map((ratio, i) => (_jsx(SliderControl, { label: `R${i + 1}`, max: 95, min: 5, onChange: (v) => setRowRatio(i, v / 100), precision: 1, step: 1, unit: "%", value: Math.round(ratio * 100 * 10) / 10 }, `r-${i}`))), _jsx("div", { className: "mt-1 border-border/50 border-t pt-1", children: _jsx(SliderControl, { label: "Divider", max: 0.1, min: 0.005, onChange: (v) => handleUpdate({ rowDividerThickness: v }), precision: 3, step: 0.01, unit: "m", value: node.rowDividerThickness ?? 0.03 }) })] }))] })), showSillSection && (_jsxs(PanelSection, { title: "Sill", children: [_jsx(ToggleControl, { checked: node.sill, label: "Enable Sill", onChange: (checked) => handleUpdate({ sill: checked }) }), node.sill && (_jsxs("div", { className: "mt-1 flex flex-col gap-1", children: [_jsx(SliderControl, { label: "Depth", min: 0, onChange: (v) => handleUpdate({ sillDepth: v }), precision: 3, step: 0.01, unit: "m", value: node.sillDepth }), _jsx(SliderControl, { label: "Thickness", min: 0, onChange: (v) => handleUpdate({ sillThickness: v }), precision: 3, step: 0.01, unit: "m", value: node.sillThickness })] }))] }))] })), _jsx(PanelSection, { title: "Actions", children: _jsxs(ActionGroup, { children: [_jsx(ActionButton, { icon: _jsx(Move, { className: "h-3.5 w-3.5" }), label: "Move", onClick: handleMove }), _jsx(ActionButton, { icon: _jsx(Copy, { className: "h-3.5 w-3.5" }), label: "Duplicate", onClick: handleDuplicate }), _jsx(ActionButton, { className: "hover:bg-red-500/20", icon: _jsx(Trash2, { className: "h-3.5 w-3.5 text-red-600 dark:text-red-400" }), label: "Delete", onClick: handleDelete })] }) })] }));
 }

package/dist/window/parametrics.d.ts

@@ -1,5 +1,5 @@
 import type { ParametricDescriptor } from '@pascal-app/core';
-import type { WindowNode } from './schema';
+import type { WindowNode } from './schema.js';
 /**
  * Minimal inspector descriptor for window. Like door, the legacy
  * `<WindowPanel>` has 15+ SliderControls covering sashes, dividers,

package/dist/window/parametrics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parametrics.d.ts","sourceRoot":"","sources":["../../src/window/parametrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAE1C;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,EAAE,oBAAoB,CAAC,UAAU,CAc9D,CAAA"}
+{"version":3,"file":"parametrics.d.ts","sourceRoot":"","sources":["../../src/window/parametrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAsB,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AAEhF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAE1C;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,EAAE,oBAAoB,CAAC,UAAU,CAoB9D,CAAA"}

package/dist/window/parametrics.js

@@ -1,3 +1,4 @@
+import { unwrapCorner } from '@pascal-app/core/building';
 /**
  * Minimal inspector descriptor for window. Like door, the legacy
  * `<WindowPanel>` has 15+ SliderControls covering sashes, dividers,
@@ -6,6 +7,11 @@
  * `case 'window':`.
  */
 export const windowParametrics = {
+    // One side of a corner window deleted: the other is a plain window again, framed at the corner.
+    onDelete: (node, nodes) => Object.entries(unwrapCorner(nodes, node.id)).map(([id, data]) => ({
+        id: id,
+        data: data,
+    })),
     groups: [
         {
             label: 'Dimensions',
@@ -18,5 +24,5 @@ export const windowParametrics = {
     // Stage E — kind-owned panel mounted by <ParametricInspector>. Window
     // has 15+ controls (sashes, dividers, sill, frame, opening shape)
     // that don't fit the generic auto-inspector.
-    customPanel: () => import('./panel'),
+    customPanel: () => import('./panel.js'),
 };

package/dist/window/placement.d.ts

@@ -19,5 +19,11 @@ export declare const useWindowPlacement: import("zustand").UseBoundStore<import(
  */
 export declare function placedWindowFields(): Partial<WindowNode>;
 export declare const WINDOW_PLACEMENT_HINTS: ToolHint[];
+/** The plain click row, which gives way to the corner rows where a click does something else. */
+export declare const WINDOW_PLAIN_PLACE_VISIBLE: {
+    subscribe: (onChange: () => void) => () => void;
+    value: () => boolean;
+};
+export declare const WINDOW_CORNER_HINTS: ToolHint[];
 export {};
 //# sourceMappingURL=placement.d.ts.map

package/dist/window/placement.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"placement.d.ts","sourceRoot":"","sources":["../../src/window/placement.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC5D,OAAO,EAKL,KAAK,WAAW,EAGjB,MAAM,2BAA2B,CAAA;AAGlC,mEAAmE;AACnE,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,UAAU,CAAC,YAAY,CAAC,CAAA;CAAE,CAUvF,CAAA;AAED,KAAK,oBAAoB,GAAG;IAC1B,IAAI,EAAE,UAAU,CAAC,YAAY,CAAC,CAAA;IAC9B,KAAK,EAAE,WAAW,CAAA;IAClB,SAAS,IAAI,IAAI,CAAA;IACjB,UAAU,IAAI,IAAI,CAAA;CACnB,CAAA;AAID,eAAO,MAAM,kBAAkB,mFAW5B,CAAA;AAEH;;;;GAIG;AACH,wBAAgB,kBAAkB,IAAI,OAAO,CAAC,UAAU,CAAC,CAOxD;AAED,eAAO,MAAM,sBAAsB,EAAE,QAAQ,EAgC5C,CAAA"}
+{"version":3,"file":"placement.d.ts","sourceRoot":"","sources":["../../src/window/placement.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAqB,QAAQ,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC/E,OAAO,EAKL,KAAK,WAAW,EAGjB,MAAM,2BAA2B,CAAA;AASlC,mEAAmE;AACnE,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,UAAU,CAAC,YAAY,CAAC,CAAA;CAAE,CAUvF,CAAA;AAED,KAAK,oBAAoB,GAAG;IAC1B,IAAI,EAAE,UAAU,CAAC,YAAY,CAAC,CAAA;IAC9B,KAAK,EAAE,WAAW,CAAA;IAClB,SAAS,IAAI,IAAI,CAAA;IACjB,UAAU,IAAI,IAAI,CAAA;CACnB,CAAA;AAID,eAAO,MAAM,kBAAkB,mFAW5B,CAAA;AAEH;;;;GAIG;AACH,wBAAgB,kBAAkB,IAAI,OAAO,CAAC,UAAU,CAAC,CAOxD;AAED,eAAO,MAAM,sBAAsB,EAAE,QAAQ,EAgC5C,CAAA;AAYD,iGAAiG;AACjG,eAAO,MAAM,0BAA0B;IACrC,SAAS,aAAa,MAAM,IAAI;IAChC,KAAK;CAIN,CAAA;AAED,eAAO,MAAM,mBAAmB,EAAE,QAAQ,EASzC,CAAA"}

package/dist/window/placement.js

@@ -1,5 +1,6 @@
 // The window tool's placement choices: the chips [O] Type and [L] Style.
 import { getWindowStyleOverrides, SILLLESS_WINDOW_TYPES, WINDOW_STYLE_CHOICES, WINDOW_STYLE_LABELS, windowTakesStyle, windowTypeFields, } from '@pascal-app/core/building';
+import { CORNER_BLOCK_NOTES, cornerHintRows, useCornerSnapHint, } from '@pascal-app/editor';
 import { create } from 'zustand';
 /** The window panel's Window Type row and the tool's Type chip. */
 export const windowTypeOptions = [
@@ -64,3 +65,28 @@ export const WINDOW_PLACEMENT_HINTS = [
         },
     },
 ];
+/**
+ * What a click does while the ghost is inside a corner zone, or why it is not a corner: shown only
+ * there, so the hint appears when the window can join and goes when it leaves.
+ */
+const HINTS_FOR = [
+    'join',
+    'new',
+    ...Object.keys(CORNER_BLOCK_NOTES),
+];
+/** The plain click row, which gives way to the corner rows where a click does something else. */
+export const WINDOW_PLAIN_PLACE_VISIBLE = {
+    subscribe: (onChange) => useCornerSnapHint.subscribe(onChange),
+    value: () => {
+        const hint = useCornerSnapHint.getState().hint;
+        return hint !== 'join' && hint !== 'new';
+    },
+};
+export const WINDOW_CORNER_HINTS = HINTS_FOR.flatMap((hint) => cornerHintRows(hint).map((row) => ({
+    key: row.keys.join('+'),
+    label: row.label,
+    visible: {
+        subscribe: (onChange) => useCornerSnapHint.subscribe(onChange),
+        value: () => useCornerSnapHint.getState().hint === hint,
+    },
+})));

package/dist/window/preview.d.ts

@@ -1,4 +1,4 @@
-import type { WindowNode } from './schema';
+import type { WindowNode } from './schema.js';
 /**
  * Translucent preview of a window — used by the placement tool's floating ghost.
  *

package/dist/window/preview.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preview.d.ts","sourceRoot":"","sources":["../../src/window/preview.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAE1C;;;;;;;;;GASG;AACH,QAAA,MAAM,aAAa,GAAI,2BAIpB;IACD,IAAI,EAAE,UAAU,CAAA;IAChB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,gCA0BA,CAAA;AAED,eAAe,aAAa,CAAA"}
+{"version":3,"file":"preview.d.ts","sourceRoot":"","sources":["../../src/window/preview.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAE1C;;;;;;;;;GASG;AACH,QAAA,MAAM,aAAa,8BAIhB;IACD,IAAI,EAAE,UAAU,CAAA;IAChB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,gCA0BA,CAAA;eAEc,aAAa"}

package/dist/window/preview.js

@@ -3,7 +3,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { EDITOR_LAYER } from '@pascal-app/editor';
 import { buildWindowPreviewMesh } from '@pascal-app/viewer';
 import { useEffect, useMemo } from 'react';
-import { applyGhost } from '../shared/ghost-materials';
+import { applyGhost } from '../shared/ghost-materials.js';
 /**
  * Translucent preview of a window — used by the placement tool's floating ghost.
  *

package/dist/window/renderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../src/window/renderer.tsx"],"names":[],"mappings":"AAEA,OAAO,EAA+C,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAY/F,eAAO,MAAM,cAAc,GAAI,UAAU;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,gCA6C5D,CAAA;AAED,eAAe,cAAc,CAAA"}
+{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../src/window/renderer.tsx"],"names":[],"mappings":"AAEA,OAAO,EAA+C,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAY/F,eAAO,MAAM,cAAc,aAAc;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,gCA6C5D,CAAA;eAEc,cAAc"}

package/dist/window/renderer.js

@@ -3,8 +3,8 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useLiveNodeOverrides, useRegistry, useScene } from '@pascal-app/core';
 import { createMaterial, DEFAULT_WINDOW_MATERIAL, useNodeEvents, useViewer, } from '@pascal-app/viewer';
 import { useLayoutEffect, useMemo, useRef } from 'react';
-import { RoofFaceHostFrame } from '../shared/roof-face-host';
-import { ScriptedOpeningModel } from '../shared/scripted-opening';
+import { RoofFaceHostFrame } from '../shared/roof-face-host.js';
+import { ScriptedOpeningModel } from '../shared/scripted-opening.js';
 export const WindowRenderer = ({ node }) => {
     const ref = useRef(null);
     useRegistry(node.id, 'window', ref);

package/dist/window/system.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"system.d.ts","sourceRoot":"","sources":["../../src/window/system.tsx"],"names":[],"mappings":"AAIA;;;;;;;;GAQG;AACH,QAAA,MAAM,aAAa,mCAOlB,CAAA;AAED,eAAe,aAAa,CAAA"}
+{"version":3,"file":"system.d.ts","sourceRoot":"","sources":["../../src/window/system.tsx"],"names":[],"mappings":"AAIA;;;;;;;;GAQG;AACH,QAAA,MAAM,aAAa,mCAOlB,CAAA;eAEc,aAAa"}

package/dist/window/system.js

@@ -1,5 +1,5 @@
 'use client';
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { WindowAnimationSystem, WindowSystem } from '@pascal-app/viewer';
 /**
  * Registry-driven window system bundle.

package/dist/window/tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../src/window/tool.tsx"],"names":[],"mappings":"AAuGA;;;;;;;;;GASG;AACH,QAAA,MAAM,UAAU,EAAE,KAAK,CAAC,EAgkCvB,CAAA;AAED,eAAe,UAAU,CAAA"}
+{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../src/window/tool.tsx"],"names":[],"mappings":"AA+GA;;;;;;;;;GASG;AACH,QAAA,MAAM,UAAU,EAAE,KAAK,CAAC,EA2oCvB,CAAA;eAEc,UAAU"}

package/dist/window/tool.js

@@ -1,20 +1,22 @@
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import { beginSceneHistoryDraft, dormerWallFacePointToDormer, emitter, getEffectiveNode, holdHiddenWallPointerEvents, isCurvedWall, sceneRegistry, spatialGridManager, useLiveNodeOverrides, useScene, WallNode as WallNodeSchema, WindowNode, } from '@pascal-app/core';
+import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { beginSceneHistoryDraft, createSnapEaser, dormerWallFacePointToDormer, emitter, evaluateCorner, getEffectiveNode, holdHiddenWallPointerEvents, isCurvedWall, prefersReducedMotion, runAsSingleSceneHistoryStep, sceneRegistry, spatialGridManager, useLiveNodeOverrides, useScene, WallNode as WallNodeSchema, WindowNode, } from '@pascal-app/core';
 import { windowTakesStyle } from '@pascal-app/core/building';
-import { calculateItemRotation, clearPlacementSurface, EDITOR_LAYER, getSideFromNormal, isMagneticSnapActive, isValidWallSideFace, publishPlacementSurface, snapToHalf, triggerSFX, useAlignmentGuides, useEditor, useFacingPose, usePlacementPreview, useRegistryToolContext, } from '@pascal-app/editor';
+import { calculateItemRotation, clearPlacementSurface, EDITOR_LAYER, getSideFromNormal, isMagneticSnapActive, isTypingTarget, isValidWallSideFace, publishPlacementSurface, snapToHalf, triggerSFX, useAlignmentGuides, useEditor, useFacingPose, usePlacementPreview, useRegistryToolContext, } from '@pascal-app/editor';
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { BoxGeometry, EdgesGeometry, Vector3 } from 'three';
 import { LineBasicNodeMaterial } from 'three/webgpu';
-import { dormerEventFromHostedWindow, getDormerWindowWorldNormal, getDormerWindowWorldYaw, resolveDormerWindowTarget, } from '../shared/dormer-wall-opening-placement';
-import { shouldFollowOpeningGrid, shouldHandleOpeningHostLeave, } from '../shared/opening-grid-follow';
-import { clearOpeningGuides3D, publishOpeningGuidesForWallEvent, resolveSillSnap, } from '../shared/opening-guides-runtime';
-import { getRoofWallOpeningCursorPose, resolveRoofWallOpeningTarget, worldToSelectedBuildingLocal, } from '../shared/roof-wall-opening-placement';
-import { wallEventFromGrid } from '../shared/wall-event-from-grid';
-import { collectWallOpeningAlignmentCandidates, resolveWallSlideAlignment, } from '../shared/wall-opening-alignment';
-import { WindowFloorProjection } from './floor-projection';
-import { placedWindowFields, useWindowPlacement } from './placement';
-import WindowPreview from './preview';
-import { clampToWall, DEFAULT_WINDOW_SILL_M, hasWallChildOverlap, wallLocalToWorld, } from './window-math';
+import { dormerEventFromHostedWindow, getDormerWindowWorldNormal, getDormerWindowWorldYaw, resolveDormerWindowTarget, } from '../shared/dormer-wall-opening-placement.js';
+import { shouldFollowOpeningGrid, shouldHandleOpeningHostLeave, } from '../shared/opening-grid-follow.js';
+import { clearOpeningGuides3D, publishOpeningGuidesForWallEvent, resolveSillSnap, } from '../shared/opening-guides-runtime.js';
+import { getRoofWallOpeningCursorPose, resolveRoofWallOpeningTarget, worldToSelectedBuildingLocal, } from '../shared/roof-wall-opening-placement.js';
+import { wallEventFromGrid } from '../shared/wall-event-from-grid.js';
+import { collectWallOpeningAlignmentCandidates, resolveWallSlideAlignment, } from '../shared/wall-opening-alignment.js';
+import { showCornerCue, snappingTurnedOff } from './corner-cue.js';
+import { fuseAtCorner } from './corner-fuse.js';
+import { WindowFloorProjection } from './floor-projection.js';
+import { placedWindowFields, useWindowPlacement } from './placement.js';
+import WindowPreview from './preview.js';
+import { clampToWall, DEFAULT_WINDOW_SILL_M, hasWallChildOverlap, wallLocalToWorld, } from './window-math.js';
 // Shared edge material — reuse across renders, just toggle color
 const edgeMaterial = new LineBasicNodeMaterial({
     color: 0xef_44_44, // red-500 default (invalid)
@@ -135,6 +137,25 @@ const WindowTool = () => {
         // to the last wall hover so the flip shows live before commit.
         let sideFlip = false;
         let lastWallEvent = null;
+        // Placing near a corner: inside the corner zone the ghost snaps its edge to the corner, the
+        // window waiting on the other wall is outlined, and the HUD says what a click does. Alt places
+        // the window plain.
+        let cornerHeld = null;
+        // Whether Alt is held: from the keys, and from each new pointer event, which also catches a
+        // press made while the canvas did not have focus.
+        let altDown = false;
+        // Alt, or snapping off, places the window where it is clicked.
+        const cornerSnapOn = () => !altDown && !snappingTurnedOff();
+        const cornerEaser = createSnapEaser();
+        let cornerEaseFrame = 0;
+        const resetCorner = () => {
+            cornerHeld = null;
+            cornerEaser.reset();
+            if (cornerEaseFrame)
+                cancelAnimationFrame(cornerEaseFrame);
+            cornerEaseFrame = 0;
+            showCornerCue(null);
+        };
         let lastDormerEvent = null;
         // Last open-floor cursor point (level-local X/Z) + floor Y, so an R-flip
         // while free-following can re-render the floating ghost with the new facing.
@@ -149,6 +170,7 @@ const WindowTool = () => {
             useScene.getState().dirtyNodes.add(hostId);
         };
         const destroyDraft = () => {
+            resetCorner();
             const draft = draftRef.current;
             if (!draft) {
                 clearPlacementPreview();
@@ -306,7 +328,7 @@ const WindowTool = () => {
             return sillY ?? snapToHalf(args.rawLocalY);
         };
         // Settle a wall target: alignment snap → sill clamp → overlap check.
-        const resolveWallPlacement = (wall, rawLocalX, rawLocalY, width, height, applySnap, ignoreId) => {
+        const resolveWallPlacement = (wall, rawLocalX, rawLocalY, width, height, applySnap, cornerSnapOn, ignoreId) => {
             // Along-wall alignment guides are DISPLAYED in every snapping mode; the
             // magnetic pull onto them is applied only when `applySnap` (magnetic
             // "lines" mode). The grid component lives in `snapToHalf` (mode-aware).
@@ -325,16 +347,41 @@ const WindowTool = () => {
                 width,
                 height,
             });
-            const { clampedX, clampedY } = clampToWall(wall, localX, localY, width, height, useScene.getState().nodes);
-            const valid = !hasWallChildOverlap(wall.id, useScene.getState().nodes, clampedX, clampedY, width, height, ignoreId);
-            return { clampedX, clampedY, valid };
+            const nodes = useScene.getState().nodes;
+            const slid = clampToWall(wall, localX, localY, width, height, nodes);
+            const { clampedY } = slid;
+            let clampedX = slid.clampedX;
+            // The corner zone: the edge snaps to the corner, unless a curtain wall's margin keeps it off.
+            const found = cornerSnapOn
+                ? evaluateCorner(nodes, {
+                    wallId: wall.id,
+                    centreX: clampedX,
+                    width,
+                    height,
+                    sillHeight: clampedY - height / 2,
+                    ignoreId,
+                    held: cornerHeld,
+                })
+                : { snap: null, block: null };
+            let { snap, block } = found;
+            if (snap) {
+                const settled = clampToWall(wall, snap.centreX, clampedY, width, height, nodes);
+                if (Math.abs(settled.clampedX - snap.centreX) > 1e-6) {
+                    block = { reason: 'curtain', end: snap.end };
+                    snap = null;
+                }
+                else
+                    clampedX = snap.centreX;
+            }
+            const valid = !hasWallChildOverlap(wall.id, nodes, clampedX, clampedY, width, height, ignoreId);
+            return { clampedX, clampedY, valid, snap, block };
         };
         // Shared create/update path for the wall draft — used by the direct
         // wall-mesh hover and the floor proximity snap. Reuses the existing draft
         // (reparenting only on an actual wall change to avoid churning the host's
         // children array, which flashes 0-vertex wall geometry in WebGPU).
         const applyWallTarget = (args) => {
-            const { wall, rawLocalX, rawLocalY, side, itemRotation, cursorRotationY, applySnap } = args;
+            const { wall, rawLocalX, rawLocalY, side, itemRotation, cursorRotationY, applySnap, cornerSnapOn, } = args;
             const width = draftRef.current?.width ?? 1.5;
             const height = draftRef.current?.height ?? 1.5;
             if (!draftRef.current) {
@@ -350,10 +397,22 @@ const WindowTool = () => {
                 createDraft(node, wall.id);
                 draftRef.current = node;
             }
-            const { clampedX, clampedY, valid } = resolveWallPlacement(wall, rawLocalX, rawLocalY, width, height, applySnap, draftRef.current.id);
+            const { clampedX, clampedY, valid, snap, block } = resolveWallPlacement(wall, rawLocalX, rawLocalY, width, height, applySnap, cornerSnapOn, draftRef.current.id);
+            cornerHeld = (snap ?? block)?.end ?? null;
+            showCornerCue(snap, block);
+            // The ghost eases into and out of the snap; the click always lands on the snapped place.
+            const now = performance.now();
+            const shownX = cornerEaser.display(clampedX, snap !== null, now, prefersReducedMotion());
+            if (cornerEaser.active(now) && !cornerEaseFrame) {
+                cornerEaseFrame = requestAnimationFrame(() => {
+                    cornerEaseFrame = 0;
+                    if (lastWallEvent)
+                        onWallHover(lastWallEvent);
+                });
+            }
             if (wall.id === draftRef.current.parentId) {
                 useLiveNodeOverrides.getState().set(draftRef.current.id, {
-                    position: [clampedX, clampedY, 0],
+                    position: [shownX, clampedY, 0],
                     rotation: [0, itemRotation, 0],
                     side,
                 });
@@ -362,7 +421,7 @@ const WindowTool = () => {
             else {
                 useLiveNodeOverrides.getState().clear(draftRef.current.id);
                 useScene.getState().updateNode(draftRef.current.id, {
-                    position: [clampedX, clampedY, 0],
+                    position: [shownX, clampedY, 0],
                     rotation: [0, itemRotation, 0],
                     side,
                     parentId: wall.id,
@@ -373,7 +432,7 @@ const WindowTool = () => {
                 });
             }
             publishDraftPreview(wall);
-            updateCursor(wallLocalToWorld(wall, clampedX, clampedY, getLevelYOffset(), getSlabElevationForWall(wall)), cursorRotationY, valid, -clampedY);
+            updateCursor(wallLocalToWorld(wall, shownX, clampedY, getLevelYOffset(), getSlabElevationForWall(wall)), cursorRotationY, valid, -clampedY);
             if (draftRef.current) {
                 publishOpeningGuidesForWallEvent({
                     wall,
@@ -391,11 +450,12 @@ const WindowTool = () => {
         };
         // Promote the draft into a permanent window. Shared by the wall-mesh click
         // and the floor proximity click.
-        const commitWindowAtWall = (wall, clampedX, clampedY, side, itemRotation) => {
+        const commitWindowAtWall = (wall, clampedX, clampedY, side, itemRotation, snap = null) => {
             const draft = draftRef.current;
             if (!draft)
                 return;
             clearPlacementPreview();
+            resetCorner();
             draftRef.current = null;
             hostKind = null;
             useLiveNodeOverrides.getState().clear(draft.id);
@@ -433,7 +493,12 @@ const WindowTool = () => {
                 sillDepth: draft.sillDepth,
                 sillThickness: draft.sillThickness,
             });
-            useScene.getState().createNode(node, wall.id);
+            // At a corner the window is placed already joined, as one undo step.
+            runAsSingleSceneHistoryStep(useScene, () => {
+                useScene.getState().createNode(node, wall.id);
+                if (snap)
+                    fuseAtCorner(node.id, snap.waitingId);
+            });
             selectNode(node.id);
             triggerSFX('sfx:structure-build');
             useAlignmentGuides.getState().clear();
@@ -516,6 +581,9 @@ const WindowTool = () => {
                 showWallFallbackCursor(event);
                 return;
             }
+            // The Alt toggle re-runs the last event: only a new one says whether Alt is held.
+            if (event !== lastWallEvent)
+                altDown = event.nativeEvent?.altKey === true;
             lastWallEvent = event;
             const faceSide = getSideFromNormal(event.normal);
             const side = sideFlip ? (faceSide === 'front' ? 'back' : 'front') : faceSide;
@@ -535,6 +603,7 @@ const WindowTool = () => {
                 itemRotation,
                 cursorRotationY: cursorRotation,
                 applySnap: isMagneticSnapActive(),
+                cornerSnapOn: cornerSnapOn(),
             });
             event.stopPropagation();
         };
@@ -549,11 +618,11 @@ const WindowTool = () => {
             const faceSide = getSideFromNormal(event.normal);
             const side = sideFlip ? (faceSide === 'front' ? 'back' : 'front') : faceSide;
             const itemRotation = calculateItemRotation(event.normal) + (sideFlip ? Math.PI : 0);
-            const { clampedX, clampedY, valid } = resolveWallPlacement(event.node, event.localPosition[0], event.localPosition[1], draftRef.current.width, draftRef.current.height, isMagneticSnapActive(), draftRef.current.id);
+            const { clampedX, clampedY, valid, snap } = resolveWallPlacement(event.node, event.localPosition[0], event.localPosition[1], draftRef.current.width, draftRef.current.height, isMagneticSnapActive(), event.nativeEvent?.altKey !== true && cornerSnapOn(), draftRef.current.id);
             // Alt force-places over a collision (the draft stays red as a warning).
             if (!valid && event.nativeEvent?.altKey !== true)
                 return;
-            commitWindowAtWall(event.node, clampedX, clampedY, side, itemRotation);
+            commitWindowAtWall(event.node, clampedX, clampedY, side, itemRotation, snap);
             event.stopPropagation();
         };
         // XR selectend produces a grid click without replaying the wall mesh's
@@ -833,8 +902,7 @@ const WindowTool = () => {
                 return;
             if (e.repeat)
                 return;
-            const t = e.target;
-            if (t && (t.tagName === 'INPUT' || t.tagName === 'TEXTAREA' || t.isContentEditable))
+            if (isTypingTarget(e.target))
                 return;
             if (key !== 'r' && (e.metaKey || e.ctrlKey || e.altKey))
                 return;
@@ -881,7 +949,21 @@ const WindowTool = () => {
         emitter.on('grid:move', onGridFreeFollow);
         emitter.on('grid:pointerup', onGridPointerUp);
         emitter.on('tool:cancel', onCancel);
+        // Alt turns the corner snap off, and pressing it while hovering says so at once.
+        const onAltToggle = (e) => {
+            // A field's own Alt (a typed character) is not the placement's.
+            if (e.key !== 'Alt' || isTypingTarget(e.target))
+                return;
+            const held = e.type === 'keydown';
+            if (held === altDown)
+                return;
+            altDown = held;
+            if (lastWallEvent)
+                onWallHover(lastWallEvent);
+        };
         window.addEventListener('keydown', onKeyDown);
+        window.addEventListener('keydown', onAltToggle);
+        window.addEventListener('keyup', onAltToggle);
         // A chip changed (key or click): the draft takes the new type and style, then re-previews.
         const unsubscribePlacement = useWindowPlacement.subscribe(() => {
             const draft = draftRef.current;
@@ -911,6 +993,7 @@ const WindowTool = () => {
             for (const end of draftHistoryEnds.values())
                 end();
             hideCursor();
+            resetCorner();
             clearPlacementPreview();
             useAlignmentGuides.getState().clear();
             clearOpeningGuides3D();
@@ -937,6 +1020,8 @@ const WindowTool = () => {
             emitter.off('grid:pointerup', onGridPointerUp);
             emitter.off('tool:cancel', onCancel);
             window.removeEventListener('keydown', onKeyDown);
+            window.removeEventListener('keydown', onAltToggle);
+            window.removeEventListener('keyup', onAltToggle);
             unsubscribePlacement();
         };
     }, [activeLevelId, isCameraDragging, selectNode]);