@pascal-app/nodes 1.0.7 → 1.1.1

package/dist/duct-segment/selection.js

@@ -1,7 +1,7 @@
 'use client';
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { analyzePortConnectivity, DuctSegmentNode, nodeRegistry, pauseSceneHistory, resolveConnectivityUpdates, resumeSceneHistory, sceneRegistry, useLiveNodeOverrides, useScene, } from '@pascal-app/core';
-import { clearPlacementSurface, DimensionPill, isAngleSnapActive, isGridSnapActive, swallowNextClick, triggerSFX, useEditor, } from '@pascal-app/editor';
+import { analyzePortConnectivity, DuctSegmentNode, findLevelAncestorId, nodeRegistry, pauseSceneHistory, resolveConnectivityUpdates, resumeSceneHistory, sceneRegistry, useLiveNodeOverrides, useScene, } from '@pascal-app/core';
+import { AXIS_MOVE_DRAG_LABEL, clearPlacementSurface, DimensionPill, isAngleSnapActive, isGridSnapActive, PATH_POINT_DRAG_LABEL, ROTATE_HANDLE_DRAG_LABEL, swallowNextClick, triggerSFX, useEditor, } from '@pascal-app/editor';
 import { collectScenePorts, findNearestPortXZ } from '@pascal-app/editor/distribution';
 import { useViewer } from '@pascal-app/viewer';
 import { Html } from '@react-three/drei';
@@ -11,14 +11,16 @@ import { Euler, Matrix4, Plane, Quaternion, Raycaster, Vector2, Vector3, } from
 import { newAutoOffsetGroupId, readAutoOffsetTag, translateAutoOffsetBase, withAutoOffsetTag, withoutAutoOffsetTag, } from '../shared/auto-offset-tag.js';
 import { planRunEndCapFollowUpdates } from '../shared/automatic-run-end-cap.js';
 import { detectFittingEndpoint, planFittingEndpointReaim, } from '../shared/fitting-endpoint-reaim.js';
+import { useHandleDragScope } from '../shared/handle-drag-scope.js';
 import { DuctSegmentGhost, FittingGhost } from '../shared/mep-ghost.js';
 import { DUCT_PORT_SYSTEMS } from '../shared/port-systems.js';
 import { planRunTranslationOffsets } from '../shared/run-translation-offset.js';
 import { ContinuePlusHandle, HandleCube, MoveChevron, RotateArc } from '../shared/selection-handles.js';
 import { planVerticalOffsets } from '../shared/vertical-offset.js';
 import { refreshWallRunAttachment } from '../shared/wall-run-move.js';
-import { activateDuctContinuation, ductContinuationHandlePlan, } from './continuation.js';
-import { INCHES_TO_METERS } from './geometry.js';
+import { activateDuctContinuation } from './continuation.js';
+import { ductContinuationHandlePlan } from './continuation-handle.js';
+import { INCHES_TO_METERS } from './profile.js';
 /** Port-snap radius for dragged run endpoints (meters, XZ). */
 const PORT_SNAP_RADIUS_M = 0.4;
 // In-world arrow handle layout (meters) — the arrows stand off the run body so
@@ -146,6 +148,7 @@ const DuctPointHandles = ({ duct, target }) => {
     });
     const unit = useViewer((s) => s.unit);
     const [draggingIndex, setDraggingIndex] = useState(null);
+    const claimHandleDrag = useHandleDragScope();
     const [rolling, setRolling] = useState(false);
     const [runMoving, setRunMoving] = useState(false);
     // Auto-routed offset preview shown while the run-center cube's ±Y arrows
@@ -307,9 +310,12 @@ const DuctPointHandles = ({ duct, target }) => {
             ]);
         }
         const path = drag.initialPath.map((p, i) => (i === drag.index ? next : p));
+        const followers = detached ? [] : connectivityUpdatesForPath(drag.connectivity, path);
+        if (!followers)
+            return null;
         const updates = [
             { id: duct.id, data: { path, wallAttachment: attachmentFor(path) } },
-            ...(detached ? [] : connectivityUpdatesForPath(drag.connectivity, path)),
+            ...followers,
         ];
         return detached ? updates : withEndCapFollow(path, updates);
     };
@@ -322,12 +328,13 @@ const DuctPointHandles = ({ duct, target }) => {
     };
     // Follow-updates for fittings / ducts mated to this run's endpoints, given
     // the run's live path. Endpoints whose position didn't change resolve to a
-    // zero delta, so only the dragged endpoint's partner actually moves.
+    // zero delta, so only the dragged endpoint's partner actually moves. Null
+    // when the mated joints cannot follow the path.
     const connectivityUpdatesForPath = (connectivity, path) => {
         if (!connectivity)
             return [];
         const preview = { ...duct, path };
-        return resolveConnectivityUpdates(connectivity, preview).filter((u) => useScene.getState().nodes[u.id]);
+        return (resolveConnectivityUpdates(connectivity, preview)?.filter((u) => useScene.getState().nodes[u.id]) ?? null);
     };
     // A corner arrow drag: the point is locked to one axis (X / Z / Y). All the
     // rich behaviour — port-snap, elbow re-aim, connectivity follow, single-undo
@@ -342,10 +349,20 @@ const DuctPointHandles = ({ duct, target }) => {
         const livePreviewIds = new Set();
         const publishLivePreview = (updates) => {
             const scene = useScene.getState();
+            const overrides = useLiveNodeOverrides.getState();
             const entries = updates
                 .filter((update) => scene.nodes[update.id])
                 .map((update) => [update.id, update.data]);
-            useLiveNodeOverrides.getState().setMany(entries);
+            const previewed = new Set(entries.map(([id]) => id));
+            for (const id of livePreviewIds) {
+                if (previewed.has(id))
+                    continue;
+                overrides.clear(id);
+                if (scene.nodes[id])
+                    scene.markDirty(id);
+                livePreviewIds.delete(id);
+            }
+            overrides.setMany(entries);
             for (const [id] of entries) {
                 livePreviewIds.add(id);
                 scene.markDirty(id);
@@ -363,6 +380,10 @@ const DuctPointHandles = ({ duct, target }) => {
         useViewer.getState().setInputDragging(true);
         document.body.style.cursor = kind.axis === 'y' ? 'ns-resize' : 'grabbing';
         setDraggingIndex(index);
+        const releaseScope = claimHandleDrag(duct.id, PATH_POINT_DRAG_LABEL, () => {
+            swallowNextClick();
+            finish(false);
+        });
         const isEndpoint = index === 0 || index === initialPath.length - 1;
         // Swing pivot: the across-run (side) and up / down arrows DON'T stretch the
         // run — they sweep the grabbed point around its neighbour at a fixed radius
@@ -452,6 +473,7 @@ const DuctPointHandles = ({ duct, target }) => {
             if (isEndpoint && (detached || !drag.fittingEndpoint)) {
                 const port = findNearestPortXZ([next[0], next[1], next[2]], collectScenePorts({
                     excludeNodeId: duct.id,
+                    levelId: (findLevelAncestorId(duct.id, useScene.getState().nodes) ?? undefined),
                     systems: DUCT_PORT_SYSTEMS,
                 }), PORT_SNAP_RADIUS_M);
                 if (port)
@@ -471,16 +493,10 @@ const DuctPointHandles = ({ duct, target }) => {
                 triggerSFX('sfx:grid-snap');
             publishLivePreview(batch);
         };
-        const onUp = () => {
+        const finish = (commit) => {
             const drag = dragRef.current;
             if (!drag)
                 return;
-            // Swallow the trailing synthetic click so it doesn't reach the
-            // background-click deselect handler — `cleanup()` drops `inputDragging`
-            // synchronously here, so without this the click that fires after
-            // pointerup would land with the drag gate already down and clear the
-            // selection. Mirrors `useHandleDrag`'s onUp.
-            swallowNextClick();
             drag.cleanup();
             dragRef.current = null;
             setDraggingIndex(null);
@@ -491,7 +507,7 @@ const DuctPointHandles = ({ duct, target }) => {
             // detached — just the duct path).
             const detached = drag.detached;
             const moved = drag.current.some((v, axis) => v !== drag.initialPath[drag.index][axis]);
-            const finalBatch = buildDragBatch(drag, drag.current, detached);
+            const finalBatch = commit ? buildDragBatch(drag, drag.current, detached) : null;
             resumeSceneHistory(useScene);
             if (moved && finalBatch) {
                 // A manual corner edit invalidates any stored auto-offset base (the
@@ -509,10 +525,23 @@ const DuctPointHandles = ({ duct, target }) => {
                 useScene.getState().updateNodes(finalWithTagStrip);
             }
         };
+        const onUp = () => {
+            if (!dragRef.current)
+                return;
+            // Swallow the trailing synthetic click so it doesn't reach the
+            // background-click deselect handler — `cleanup()` drops `inputDragging`
+            // synchronously here, so without this the click that fires after
+            // pointerup would land with the drag gate already down and clear the
+            // selection. Mirrors `useHandleDrag`'s onUp.
+            swallowNextClick();
+            finish(true);
+        };
+        const onCancel = () => finish(false);
         const cleanup = () => {
             window.removeEventListener('pointermove', onMove);
             window.removeEventListener('pointerup', onUp);
-            window.removeEventListener('pointercancel', onUp);
+            window.removeEventListener('pointercancel', onCancel);
+            releaseScope();
             useViewer.getState().setInputDragging(false);
             document.body.style.cursor = '';
         };
@@ -530,7 +559,7 @@ const DuctPointHandles = ({ duct, target }) => {
         };
         window.addEventListener('pointermove', onMove);
         window.addEventListener('pointerup', onUp);
-        window.addEventListener('pointercancel', onUp);
+        window.addEventListener('pointercancel', onCancel);
     };
     // Roll: spin the rect / oval cross-section about the run (length) axis. The
     // cursor's bearing in the plane perpendicular to the run direction (taken in
@@ -572,6 +601,10 @@ const DuctPointHandles = ({ duct, target }) => {
         useViewer.getState().setInputDragging(true);
         document.body.style.cursor = 'grabbing';
         setRolling(true);
+        const releaseScope = claimHandleDrag(duct.id, ROTATE_HANDLE_DRAG_LABEL, () => {
+            swallowNextClick();
+            finish(false);
+        });
         let current = startRoll;
         let lastStep = Number.NaN;
         const onMove = (event) => {
@@ -580,15 +613,16 @@ const DuctPointHandles = ({ duct, target }) => {
             const b = bearing(event.clientX, event.clientY);
             if (b === null)
                 return;
-            // Snap the roll to 45° steps only in the active angle mode.
+            // Snap the roll to 45° steps only in the active angle mode; held Alt rolls freely.
             const raw = b - startBearing;
-            const delta = isAngleSnapActive() ? Math.round(raw / ROLL_STEP_RAD) * ROLL_STEP_RAD : raw;
+            const snapped = !event.altKey && isAngleSnapActive();
+            const delta = snapped ? Math.round(raw / ROLL_STEP_RAD) * ROLL_STEP_RAD : raw;
             const next = startRoll + delta;
             if (next === current)
                 return;
             current = next;
             // Tick the rotate SFX each time a fresh snapped step is crossed.
-            if (isAngleSnapActive()) {
+            if (snapped) {
                 const step = Math.round(raw / ROLL_STEP_RAD);
                 if (step !== lastStep) {
                     lastStep = step;
@@ -598,11 +632,11 @@ const DuctPointHandles = ({ duct, target }) => {
             useLiveNodeOverrides.getState().set(duct.id, { roll: next });
             useScene.getState().markDirty(duct.id);
         };
-        const onUp = () => {
-            swallowNextClick();
+        const finish = (commit) => {
             window.removeEventListener('pointermove', onMove);
             window.removeEventListener('pointerup', onUp);
-            window.removeEventListener('pointercancel', onUp);
+            window.removeEventListener('pointercancel', onCancel);
+            releaseScope();
             useViewer.getState().setInputDragging(false);
             clearPlacementSurface();
             document.body.style.cursor = '';
@@ -610,16 +644,21 @@ const DuctPointHandles = ({ duct, target }) => {
             useLiveNodeOverrides.getState().clear(duct.id);
             useScene.getState().markDirty(duct.id);
             resumeSceneHistory(useScene);
-            if (current !== startRoll) {
+            if (commit && current !== startRoll) {
                 useScene.getState().updateNode(duct.id, {
                     roll: current,
                     ...(readAutoOffsetTag(duct) ? { metadata: withoutAutoOffsetTag(duct.metadata) } : {}),
                 });
             }
         };
+        const onUp = () => {
+            swallowNextClick();
+            finish(true);
+        };
+        const onCancel = () => finish(false);
         window.addEventListener('pointermove', onMove);
         window.addEventListener('pointerup', onUp);
-        window.addEventListener('pointercancel', onUp);
+        window.addEventListener('pointercancel', onCancel);
     };
     // Move the WHOLE run, locked to one direction: the vertical world axis, or a
     // run-relative horizontal line (node-local XZ unit dir) so the along-/across-
@@ -755,10 +794,14 @@ const DuctPointHandles = ({ duct, target }) => {
         useViewer.getState().setInputDragging(true);
         document.body.style.cursor = kind.axis === 'y' ? 'ns-resize' : 'grabbing';
         setRunMoving(true);
+        const releaseScope = claimHandleDrag(duct.id, AXIS_MOVE_DRAG_LABEL, () => {
+            swallowNextClick();
+            finish(false);
+        });
         let delta = 0;
         // Last frame's offset outcome (vertical move only): a valid plan to mint on
         // release, an invalid marker (preview-only, snap back), or null for a plain
-        // translate. `onUp` reads it to decide create vs. translate vs. nothing.
+        // translate. `finish` reads it to decide create vs. translate vs. nothing.
         let offsetResult = null;
         // Shift the LOGICAL L: vertical adds the carried `baseDy` plus this drag's
         // delta (so a re-drag accumulates from the L, not the lifted Z); horizontal
@@ -774,10 +817,10 @@ const DuctPointHandles = ({ duct, target }) => {
             }
             return next;
         });
-        const batchFor = (path) => [
-            { id: duct.id, data: { path } },
-            ...connectivityUpdatesForPath(connectivity, path),
-        ];
+        const batchFor = (path) => {
+            const followers = connectivityUpdatesForPath(connectivity, path);
+            return followers && [{ id: duct.id, data: { path } }, ...followers];
+        };
         // Patches restoring every connected partner to its post-rewind (logical-L)
         // pose — runs by path, fittings by position (+ a re-aimed elbow's rotation /
         // angle). Used to FREEZE partners on an invalid frame.
@@ -878,30 +921,37 @@ const DuctPointHandles = ({ duct, target }) => {
             const s = sample(event.clientX, event.clientY);
             if (s === null)
                 return;
-            const step = isGridSnapActive() ? useEditor.getState().gridSnapStep : 0;
+            const step = !event.altKey && isGridSnapActive() ? useEditor.getState().gridSnapStep : 0;
             const next = snap(s - startSample, step);
             if (next === delta)
                 return;
-            delta = next;
-            if (step > 0)
-                triggerSFX('sfx:grid-snap');
             const dyEff = baseDy + next;
             // Vertical move: connected ends stay welded to their (stationary)
             // partner via an auto-routed elbow → riser → elbow offset, planned from
             // the LOGICAL L by the accumulated lift. The planner returns valid (offset
             // fits), invalid (connected but no clean offset at this height), or null
             // (no connections, or dyEff 0 → back at the L → plain translate).
-            offsetResult =
-                isVertical && dyEff !== 0
-                    ? planVerticalOffsets({
-                        duct: logicalDuct,
-                        dy: dyEff,
-                        profile,
-                        connections: connectivity?.connections ?? [],
-                        scenePorts,
-                        nodesById,
-                    })
-                    : null;
+            const result = isVertical && dyEff !== 0
+                ? planVerticalOffsets({
+                    duct: logicalDuct,
+                    dy: dyEff,
+                    profile,
+                    connections: connectivity?.connections ?? [],
+                    scenePorts,
+                    nodesById,
+                })
+                : null;
+            const followUpdates = result?.status === 'invalid'
+                ? []
+                : connectivityUpdatesForPath(connectivity, result?.status === 'valid' ? result.plan.followPath : shiftedPath(next));
+            // Joints that cannot follow hold the last shown frame, which is what
+            // release commits.
+            if (!followUpdates)
+                return;
+            delta = next;
+            offsetResult = result;
+            if (step > 0)
+                triggerSFX('sfx:grid-snap');
             if (offsetResult?.status === 'valid') {
                 applyLogicalBasePreview();
                 // Lift the run to the offset path; trim run-offset partners back one
@@ -913,7 +963,6 @@ const DuctPointHandles = ({ duct, target }) => {
                 const scene = useScene.getState();
                 const deletePreview = (plan.delete ?? []).filter((id) => scene.nodes[id]);
                 setPreviewHidden([...mintedIds, ...deletePreview]);
-                const followUpdates = connectivityUpdatesForPath(connectivity, plan.followPath);
                 const updates = [
                     { id: duct.id, data: { path: plan.ductPath } },
                     ...plan.updates.filter((u) => scene.nodes[u.id]),
@@ -941,15 +990,17 @@ const DuctPointHandles = ({ duct, target }) => {
             else {
                 applyLogicalBasePreview();
                 setVerticalGhost(null);
-                const updates = batchFor(shiftedPath(next));
-                publishLivePreview(updates);
+                publishLivePreview([
+                    { id: duct.id, data: { path: shiftedPath(next) } },
+                    ...followUpdates,
+                ]);
             }
         };
-        const onUp = () => {
-            swallowNextClick();
+        const finish = (commit) => {
             window.removeEventListener('pointermove', onMove);
             window.removeEventListener('pointerup', onUp);
-            window.removeEventListener('pointercancel', onUp);
+            window.removeEventListener('pointercancel', onCancel);
+            releaseScope();
             useViewer.getState().setInputDragging(false);
             document.body.style.cursor = '';
             setRunMoving(false);
@@ -957,7 +1008,7 @@ const DuctPointHandles = ({ duct, target }) => {
             clearLivePreview();
             setPreviewHidden([]);
             resumeSceneHistory(useScene);
-            if (delta === 0)
+            if (!commit || delta === 0)
                 return;
             const dyEff = baseDy + delta;
             const result = offsetResult;
@@ -983,6 +1034,8 @@ const DuctPointHandles = ({ duct, target }) => {
                     base,
                 };
                 const followUpdates = connectivityUpdatesForPath(connectivity, plan.followPath);
+                if (!followUpdates)
+                    return;
                 const updates = [
                     {
                         id: duct.id,
@@ -1068,6 +1121,8 @@ const DuctPointHandles = ({ duct, target }) => {
                     return;
                 }
                 const updates = batchFor(finalPath);
+                if (!updates)
+                    return;
                 if (isVertical && existingTag) {
                     updates[0] = {
                         ...updates[0],
@@ -1095,9 +1150,14 @@ const DuctPointHandles = ({ duct, target }) => {
                 ensureSceneObjectsVisible(updates.map((update) => update.id));
             }
         };
+        const onUp = () => {
+            swallowNextClick();
+            finish(true);
+        };
+        const onCancel = () => finish(false);
         window.addEventListener('pointermove', onMove);
         window.addEventListener('pointerup', onUp);
-        window.addEventListener('pointercancel', onUp);
+        window.addEventListener('pointercancel', onCancel);
     };
     const cornerArrows = useMemo(() => getCornerArrows(displayDuct), [displayDuct]);
     const rollGizmo = useMemo(() => (displayDuct.shape === 'round' ? null : runAxisAndCenter(displayDuct)), [displayDuct]);

package/dist/duct-segment/tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../src/duct-segment/tool.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,eAAe,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAQtF,OAAO,EAOL,KAAK,UAAU,EACf,KAAK,gBAAgB,EACrB,KAAK,SAAS,EAGf,MAAM,iCAAiC,CAAA;AA+JxC,qEAAqE;AACrE,KAAK,YAAY,GAAG;IAClB,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAAA;IAChC,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,UAAQ,GAAG,MAAM,CAUjF;AAgDD;;;;;6BAK6B;AAC7B,KAAK,YAAY,GAAG;IAClB,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAA;IAChC,QAAQ,EAAE,eAAe,EAAE,CAAA;IAC3B,KAAK,EAAE,eAAe,EAAE,CAAA;IACxB,KAAK,EAAE,eAAe,EAAE,CAAA;IACxB,OAAO,EAAE;QAAE,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;KAAE,EAAE,CAAA;IACxD,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAA;CACxB,CAAA;AA4CD;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAC/B,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAC7B,SAAS,EAAE,SAAS,GAAG,IAAI,EAC3B,SAAS,EAAE,UAAU,GAAG,IAAI,EAC5B,OAAO,EAAE,SAAS,GAAG,IAAI,EACzB,OAAO,EAAE,UAAU,GAAG,IAAI,EAC1B,OAAO,EAAE,YAAY,EACrB,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EACxC,OAAO,CAAC,EAAE,gBAAgB,GAAG,IAAI,EACjC,WAAW,UAAQ,EACnB,YAAY,GAAE,OAAO,CAAC,eAAe,CAAM,EAC3C,WAAW,GAAE,QAAQ,GAAG,QAAmB,GAC1C,YAAY,GAAG,IAAI,CAwLrB;AAED,QAAA,MAAM,eAAe,0CAuRpB,CAAA;eAEc,eAAe"}
+{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../src/duct-segment/tool.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,eAAe,EAAE,eAAe,EAAgB,MAAM,kBAAkB,CAAA;AAQpG,OAAO,EAOL,KAAK,UAAU,EACf,KAAK,gBAAgB,EACrB,KAAK,SAAS,EAGf,MAAM,iCAAiC,CAAA;AAiKxC,qEAAqE;AACrE,KAAK,YAAY,GAAG;IAClB,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAAA;IAChC,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,UAAQ,GAAG,MAAM,CAUjF;AAgDD;;;;;6BAK6B;AAC7B,KAAK,YAAY,GAAG;IAClB,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAA;IAChC,QAAQ,EAAE,eAAe,EAAE,CAAA;IAC3B,KAAK,EAAE,eAAe,EAAE,CAAA;IACxB,KAAK,EAAE,eAAe,EAAE,CAAA;IACxB,OAAO,EAAE;QAAE,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;KAAE,EAAE,CAAA;IACxD,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAA;CACxB,CAAA;AA4CD;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAC/B,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAC7B,SAAS,EAAE,SAAS,GAAG,IAAI,EAC3B,SAAS,EAAE,UAAU,GAAG,IAAI,EAC5B,OAAO,EAAE,SAAS,GAAG,IAAI,EACzB,OAAO,EAAE,UAAU,GAAG,IAAI,EAC1B,OAAO,EAAE,YAAY,EACrB,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EACxC,OAAO,CAAC,EAAE,gBAAgB,GAAG,IAAI,EACjC,WAAW,UAAQ,EACnB,YAAY,GAAE,OAAO,CAAC,eAAe,CAAM,EAC3C,WAAW,GAAE,QAAQ,GAAG,QAAmB,GAC1C,YAAY,GAAG,IAAI,CAsNrB;AAED,QAAA,MAAM,eAAe,0CA6VpB,CAAA;eAEc,eAAe"}

package/dist/duct-segment/tool.js

@@ -1,9 +1,9 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { DuctSegmentNode } from '@pascal-app/core';
+import { DuctSegmentNode, nodeRegistry } from '@pascal-app/core';
 import { EDITOR_LAYER, triggerSFX, useEditor, usePathDraftPreview, useRegistryToolContext, } from '@pascal-app/editor';
 import { collectScenePorts, createRunWallAttachment, DistributionRunCursor, runDistanceSquared as dist2, findNearestRunBody3D, findRunBodyCrossingSurface, stepNominalRunSize, useDistributionRunTool, } from '@pascal-app/editor/distribution';
-import { useEffect, useMemo, useRef, useState } from 'react';
+import { useEffect, useMemo, useRef } from 'react';
 import { Euler, Vector3 } from 'three';
 import { getDuctFittingPorts } from '../duct-fitting/ports.js';
 import { planCrossAtRunBody, planElbowAtPort, planElbowRealign, planTeeAtRunBody, } from '../shared/auto-fitting.js';
@@ -16,9 +16,11 @@ import { DuctSegmentGhost, FittingGhost } from '../shared/mep-ghost.js';
 import { DUCT_PORT_SYSTEMS, runSectionHalfSizeM } from '../shared/port-systems.js';
 import { RunHangerPreview } from '../shared/run-hanger-controls.js';
 import { useRunHangerMode } from '../shared/run-hanger-mode.js';
-import { currentDuctContinuationSeed, ductEndpointPort } from './continuation.js';
+import { clearRunContinuation, updateRunDefaults } from '../shared/run-tool-options.js';
+import { currentDuctContinuationSeed } from './continuation.js';
+import { ductEndpointPort } from './continuation-handle.js';
 import { ductSegmentDefinition } from './definition.js';
-import { rectSectionAxes, rollToContinueAcrossElbow } from './geometry.js';
+import { rectSectionAxes, rollToContinueAcrossElbow } from './profile.js';
 /**
  * Continuous placement tool for duct segments.
  *
@@ -245,6 +247,30 @@ export function planDuctDraw(start, end, startPort, startBody, endPort, endBody,
         updates: [],
         delete: [],
     });
+    const system = toolDefaults.system ?? startPort?.system ?? endPort?.system ?? 'supply';
+    for (const [port, away] of [
+        [startPort, dir],
+        [endPort, [-dir[0], -dir[1], -dir[2]]],
+    ]) {
+        if (!port)
+            continue;
+        const owner = nodes[port.nodeId];
+        if (!owner || owner.type === 'duct-segment' || owner.type === 'duct-fitting')
+            continue;
+        const occupied = Object.values(nodes).some((node) => node.id !== owner.id &&
+            node.parentId === owner.parentId &&
+            (nodeRegistry.get(node.type)?.ports?.(node) ?? []).some((other) => other.system === port.system &&
+                dist2([...other.position], [...port.position]) < 0.005 ** 2));
+        const message = port.system !== system
+            ? 'Use the same supply or return system as the collar.'
+            : occupied
+                ? 'This collar is already connected.'
+                : new Vector3(...away).dot(new Vector3(...port.direction).normalize()) < 0.9999
+                    ? 'Draw the first section straight out of the collar, then add a bend from the new duct endpoint.'
+                    : null;
+        if (message)
+            return { ...invalidPlan(), validationMessage: message };
+    }
     if (startPlan?.hasClearance === false || endPlan?.hasClearance === false)
         return invalidPlan();
     const startRealign = startPlan ? null : realignPlanFor(startPort, dir, nodes);
@@ -306,7 +332,7 @@ export function planDuctDraw(start, end, startPort, startBody, endPort, endBody,
     if (!endTee && endTeePlan)
         ductEnd = endRealign?.collarPoint ?? end;
     const realigns = [startRealign, endRealign].filter((p) => p !== null);
-    const crossHit = surface
+    const crossHit = surface && toolDefaults.crossingMode !== 'cross'
         ? findRunBodyCrossingSurface(start, end, BODY_SNAP_RADIUS_M, surface, {
             kinds: ['duct-segment'],
         })
@@ -336,6 +362,7 @@ export function planDuctDraw(start, end, startPort, startBody, endPort, endBody,
     const makeDuct = (from, to) => DuctSegmentNode.parse({
         ...defaults,
         ...toolDefaults,
+        system,
         autoHangers,
         hangerStyle,
         name: profile.shape === 'rect' ? 'Trunk' : 'Duct run',
@@ -406,27 +433,47 @@ const DuctSegmentTool = () => {
     const autoHangersRef = useRef(autoHangers);
     autoHangersRef.current = autoHangers;
     const pendingPromotionRef = useRef(continuationSeed?.promotedFitting ?? null);
-    const [profile, setProfile] = useState(() => {
-        const defaults = ductSegmentDefinition.defaults();
-        const seeded = useEditor.getState().toolDefaults['duct-segment'];
-        return {
-            shape: continuationSeed?.duct.shape ?? seeded?.shape ?? defaults.shape,
-            diameter: continuationSeed?.duct.diameter ?? seeded?.diameter ?? defaults.diameter,
-            width: continuationSeed?.duct.width ?? seeded?.width ?? defaults.width,
-            height: continuationSeed?.duct.height ?? seeded?.height ?? defaults.height,
-        };
-    });
+    const initialProfile = useRef(null);
+    if (!initialProfile.current)
+        initialProfile.current = (() => {
+            const defaults = ductSegmentDefinition.defaults();
+            const seeded = useEditor.getState().toolDefaults['duct-segment'];
+            return {
+                shape: continuationSeed?.duct.shape ?? seeded?.shape ?? defaults.shape,
+                diameter: continuationSeed?.duct.diameter ?? seeded?.diameter ?? defaults.diameter,
+                width: continuationSeed?.duct.width ?? seeded?.width ?? defaults.width,
+                height: continuationSeed?.duct.height ?? seeded?.height ?? defaults.height,
+            };
+        })();
+    const profile = useMemo(() => ({
+        shape: toolDefaults?.shape ?? initialProfile.current.shape,
+        diameter: toolDefaults?.diameter ?? initialProfile.current.diameter,
+        width: toolDefaults?.width ?? initialProfile.current.width,
+        height: toolDefaults?.height ?? initialProfile.current.height,
+    }), [toolDefaults?.shape, toolDefaults?.diameter, toolDefaults?.width, toolDefaults?.height]);
+    const setProfile = (value) => updateRunDefaults('duct-segment', typeof value === 'function' ? value(profile) : value);
     const profileRef = useRef(profile);
     profileRef.current = profile;
     useEffect(() => {
         const mode = useRunHangerMode.getState();
         mode.setEnabled('duct-segment', initialAutoHangersRef.current);
-        return () => mode.setEnabled('duct-segment', false);
+        return () => {
+            updateRunDefaults('duct-segment', {
+                autoHangers: useRunHangerMode.getState().enabled['duct-segment'],
+            });
+            mode.setEnabled('duct-segment', false);
+        };
     }, []);
     const run = useDistributionRunTool({
         active: !!activeLevelId,
         levelId: activeLevelId,
         toolName: 'duct-segment',
+        routingMode: hangerDefaults?.routingMode === 'horizontal' || hangerDefaults?.routingMode === 'vertical'
+            ? hangerDefaults.routingMode
+            : 'surface',
+        elevation: typeof hangerDefaults?.elevation === 'number' ? hangerDefaults.elevation : 0,
+        targetElevation: typeof hangerDefaults?.targetElevation === 'number' ? hangerDefaults.targetElevation : 3,
+        connectCrossings: hangerDefaults?.crossingMode !== 'cross',
         initialStart: continuationSeed
             ? [...(continuationSeed.port?.position ?? continuationSeed.body?.point ?? [0, 0, 0])]
             : null,
@@ -440,6 +487,15 @@ const DuctSegmentTool = () => {
         }),
         surfaceClearance: (surface) => surface ? ductSurfaceClearanceM(profileRef.current, surface.kind === 'wall') : 0,
         minimumSegmentLength: 0.08,
+        resolveFreeEnd: (start, end, connection) => {
+            const port = connection.port;
+            const owner = port ? sceneApi.get(port.nodeId) : null;
+            if (!port || !owner || owner.type === 'duct-segment' || owner.type === 'duct-fitting')
+                return end;
+            const axis = new Vector3(...port.direction).normalize();
+            const distance = Math.max(0, new Vector3(...end).sub(new Vector3(...start)).dot(axis));
+            return new Vector3(...start).addScaledVector(axis, distance).toArray();
+        },
         inheritFromConnection: ({ port }) => {
             if (!port)
                 return;
@@ -493,6 +549,14 @@ const DuctSegmentTool = () => {
                 delete: plan.delete,
             });
             pendingPromotionRef.current = null;
+            const startOwner = startConnection.port && !promotedFitting ? sceneApi.get(startConnection.port.nodeId) : null;
+            // A riser out of a fixed collar reaches the target; staying vertical would aim the
+            // next section at the riser's own top.
+            if (hangerDefaults?.routingMode === 'vertical' &&
+                startOwner &&
+                startOwner.type !== 'duct-segment' &&
+                startOwner.type !== 'duct-fitting')
+                updateRunDefaults('duct-segment', { routingMode: 'horizontal' });
             const nextDuct = plan.ducts.at(-1);
             const nextStart = nextDuct ? nextDuct.path[nextDuct.path.length - 1] : end;
             const nextPort = nextDuct ? ductEndpointPort(nextDuct, 'end') : endConnection.port;
@@ -529,15 +593,8 @@ const DuctSegmentTool = () => {
         },
     });
     useEffect(() => {
-        if (!toolDefaults)
-            return;
-        setProfile((current) => ({
-            shape: toolDefaults.shape ?? current.shape,
-            diameter: toolDefaults.diameter ?? current.diameter,
-            width: toolDefaults.width ?? current.width,
-            height: toolDefaults.height ?? current.height,
-        }));
-    }, [toolDefaults]);
+        updateRunDefaults('duct-segment', initialProfile.current);
+    }, []);
     const previewPlan = useMemo(() => {
         if (!(activeLevelId && run.start && run.cursor))
             return null;
@@ -555,6 +612,11 @@ const DuctSegmentTool = () => {
         run.surfaceTarget,
         sceneApi,
     ]);
+    // Profile changes alter the centreline clearance even with a stationary pointer.
+    // biome-ignore lint/correctness/useExhaustiveDependencies: the resolver reads the profile through a ref
+    useEffect(() => {
+        run.refreshCursor();
+    }, [profile, run.refreshCursor]);
     const ghostFittings = useMemo(() => previewPlan?.fittings ?? [], [previewPlan]);
     useEffect(() => {
         usePathDraftPreview
@@ -562,7 +624,7 @@ const DuctSegmentTool = () => {
             .setDraft('duct-segment', run.start ? [run.start] : [], run.cursor, { ...profile, autoHangers, hangerStyle }, ghostFittings);
     }, [autoHangers, hangerStyle, ghostFittings, profile, run.cursor, run.start]);
     useEffect(() => () => usePathDraftPreview.getState().clear('duct-segment'), []);
-    useEffect(() => () => useEditor.getState().setToolDefaults('duct-segment', null), []);
+    useEffect(() => () => clearRunContinuation('duct-segment'), []);
     if (!activeLevelId)
         return null;
     const extraParts = profile.shape === 'round'
@@ -571,9 +633,24 @@ const DuctSegmentTool = () => {
             { key: 'trunk-w', prefix: 'W', value: profile.width * 0.0254 },
             { key: 'trunk-h', prefix: 'H', value: profile.height * 0.0254 },
         ];
-    return (_jsxs(LevelOffsetGroup, { children: [_jsx(ConnectionFeedback, { point: run.cursor, target: run.endConnection.port, levelId: activeLevelId, profile: {
+    return (_jsxs(LevelOffsetGroup, { children: [_jsx(ConnectionFeedback, { detail: ghostFittings
+                    .filter((fitting) => ['reducer', 'transition'].includes(fitting.fittingType))
+                    .map((fitting) => {
+                    const size = (outlet) => {
+                        const shape = outlet
+                            ? (fitting.outletShape ?? fitting.shape2)
+                            : (fitting.inletShape ?? fitting.shape);
+                        return shape === 'round'
+                            ? `Ø${outlet ? fitting.diameter2 : fitting.diameter} in`
+                            : `${outlet ? fitting.width2 : fitting.width} × ${outlet ? fitting.height2 : fitting.height} in ${shape}`;
+                    };
+                    const ports = getDuctFittingPorts(fitting);
+                    const length = new Vector3(...ports[0].position).distanceTo(new Vector3(...ports[1].position));
+                    return `${size(false)} → ${size(true)} · ${length.toFixed(2)} m long`;
+                })
+                    .join('; ') || undefined, point: run.cursor, target: run.endConnection.port, screen: run.snapScreen ?? run.cursorScreen, error: run.cursorScreen ? (previewPlan?.validationMessage ?? run.validationMessage) : undefined, levelId: activeLevelId, profile: {
                     ...profile,
                     system: String(hangerDefaults?.system ?? ductSegmentDefinition.defaults().system),
-                } }), _jsx(DistributionRunCursor, { altActive: run.altActive, cursor: run.cursor, cursorRef: cursorRef, directionMode: run.directionMode, extraParts: extraParts, lengthInput: run.lengthInput, onLengthInputChange: run.onLengthInputChange, onDirectionSelect: run.onDirectionSelect, validationMessage: previewPlan?.validationMessage ?? run.validationMessage, snapTarget: run.snapTarget, snapScreen: run.snapScreen, start: run.start, startDirection: run.startConnection.port?.direction ?? null, unit: unit }), run.start && (_jsxs("mesh", { layers: EDITOR_LAYER, position: run.start, children: [_jsx("sphereGeometry", { args: [0.07, 16, 12] }), _jsx("meshBasicMaterial", { color: "#818cf8", depthTest: false })] })), previewPlan?.ducts.map((duct, index) => (_jsx(DuctSegmentGhost, { duct: duct }, index))), previewPlan?.ducts.map((duct, index) => (_jsx(RunHangerPreview, { run: duct, levelId: activeLevelId }, `hanger-${index}`))), ghostFittings.map((fitting) => (_jsx(FittingGhost, { fitting: fitting }, fitting.id)))] }));
+                } }), _jsx(DistributionRunCursor, { altActive: run.altActive, cursor: run.cursor, cursorRef: cursorRef, directionMode: run.directionMode, routingMode: run.routingMode, extraParts: extraParts, lengthInput: run.lengthInput, onLengthInputChange: run.onLengthInputChange, onDirectionSelect: run.onDirectionSelect, validationMessage: previewPlan?.validationMessage ?? run.validationMessage, snapTarget: run.snapTarget, snapScreen: run.snapScreen, start: run.start, startDirection: run.startConnection.port?.direction ?? null, unit: unit }), run.start && (_jsxs("mesh", { layers: EDITOR_LAYER, position: run.start, children: [_jsx("sphereGeometry", { args: [0.07, 16, 12] }), _jsx("meshBasicMaterial", { color: "#818cf8", depthTest: false })] })), previewPlan?.ducts.map((duct, index) => (_jsx(DuctSegmentGhost, { duct: duct }, index))), previewPlan?.ducts.map((duct, index) => (_jsx(RunHangerPreview, { run: duct, levelId: activeLevelId }, `hanger-${index}`))), ghostFittings.map((fitting) => (_jsx(FittingGhost, { fitting: fitting }, fitting.id)))] }));
 };
 export default DuctSegmentTool;