@pascal-app/editor 1.0.7 → 1.1.0

package/src/components/tools/distribution/distribution-run-tool.tsx

@@ -3,6 +3,7 @@
 import {
   type AnyNodeId,
   emitter,
+  formatFixed,
   type GridEvent,
   sceneRegistry,
   usePascalI18n,
@@ -18,6 +19,7 @@ import {
   isGridSnapActive,
   isMagneticSnapActive,
   isTypingTarget,
+  isViewVisible,
   markToolCancelConsumed,
   publishPlacementSurface,
   triggerSFX,
@@ -226,6 +228,11 @@ export type DistributionRunToolConfig = {
   active: boolean
   levelId: AnyNodeId | null
   toolName: string
+  routingMode?: 'surface' | 'horizontal' | 'vertical'
+  /** Level-local centreline elevation, or the target height for a vertical leg. */
+  elevation?: number
+  targetElevation?: number
+  connectCrossings?: boolean
   initialStart?: RunPoint | null
   initialConnection?: RunConnection | null
   getPorts: () => ScenePort[]
@@ -524,6 +531,7 @@ function surfacePointFromEvent(
 
 export function useDistributionRunTool(config: DistributionRunToolConfig) {
   const { camera, gl } = useThree()
+  const planVisible = useEditor((state) => isViewVisible(state, '2d'))
   const initialStartRef = useRef<RunPoint | null>(
     config.initialStart ? [...config.initialStart] : null,
   )
@@ -534,6 +542,7 @@ export function useDistributionRunTool(config: DistributionRunToolConfig) {
   const [cursor, setCursor] = useState<RunPoint | null>(initialStartRef.current)
   const [snapTarget, setSnapTarget] = useState<RunPoint | null>(null)
   const [snapScreen, setSnapScreen] = useState<PortScreenPoint | null>(null)
+  const [cursorScreen, setCursorScreen] = useState<PortScreenPoint | null>(null)
   const [endConnection, setEndConnection] = useState<RunConnection>({
     port: null,
     body: null,
@@ -592,6 +601,7 @@ export function useDistributionRunTool(config: DistributionRunToolConfig) {
       const typed = Number.parseFloat(lengthInputRef.current)
       if (
         !currentStart ||
+        configRef.current.routingMode === 'vertical' ||
         !Number.isFinite(typed) ||
         typed <= 0 ||
         resolved.port ||
@@ -617,28 +627,47 @@ export function useDistributionRunTool(config: DistributionRunToolConfig) {
       }
     }
 
+    // A vertical route rises from its start to the target elevation wherever the
+    // pointer is, so it resolves without a pointer event.
+    const verticalTarget = (currentStart: RunPoint): ResolvedRunPoint => ({
+      point: [
+        currentStart[0],
+        configRef.current.targetElevation ?? currentStart[1],
+        currentStart[2],
+      ],
+      frame: createRunSurfaceFrame(currentStart),
+      surfaceTarget: null,
+      snapped: null,
+      directionMode: 'vertical',
+      port: null,
+      body: null,
+    })
+
     const resolvePoint = (event: GridEvent): ResolvedRunPoint => {
       const adapter = configRef.current
       const hit = surfacePointFromEvent(event, adapter.levelId)
       const currentStart = startRef.current
       const previous = lastResolvedRef.current
-      const lockedWallTarget = currentStart ? lockedWallTargetRef.current : null
+      const explicitRoute = adapter.routingMode && adapter.routingMode !== 'surface'
+      const lockedWallTarget = currentStart && !explicitRoute ? lockedWallTargetRef.current : null
       const lockedWallHit =
         lockedWallTarget && isSameRunWallSurface(lockedWallTarget, event.surfaceHit)
-      const working = lockedWallTarget
-        ? {
-            ...lockedWallTarget.frame,
-            origin: lockedWallTarget.frame.origin.map(
-              (value, index) =>
-                value +
-                lockedWallTarget.frame.normal[index]! *
-                  (adapter.surfaceClearance?.(lockedWallTarget) ?? 0),
-            ) as RunPoint,
-          }
-        : !event.surfaceHit && previous?.surfaceTarget?.kind === 'wall' && currentStart
-          ? createRunSurfaceFrame(currentStart, UP)
-          : (previous?.frame ?? (currentStart ? createRunSurfaceFrame(currentStart) : null))
-      const hasSurface = !!event.surfaceHit || !working || !event.localRay
+      const working = explicitRoute
+        ? createRunSurfaceFrame([0, currentStart?.[1] ?? adapter.elevation ?? 0, 0])
+        : lockedWallTarget
+          ? {
+              ...lockedWallTarget.frame,
+              origin: lockedWallTarget.frame.origin.map(
+                (value, index) =>
+                  value +
+                  lockedWallTarget.frame.normal[index]! *
+                    (adapter.surfaceClearance?.(lockedWallTarget) ?? 0),
+              ) as RunPoint,
+            }
+          : !event.surfaceHit && previous?.surfaceTarget?.kind === 'wall' && currentStart
+            ? createRunSurfaceFrame(currentStart, UP)
+            : (previous?.frame ?? (currentStart ? createRunSurfaceFrame(currentStart) : null))
+      const hasSurface = !explicitRoute && (!!event.surfaceHit || !working || !event.localRay)
       const target = lockedWallTarget ?? (hasSurface ? hit.target : null)
       const hitForCursor = lockedWallTarget
         ? lockedWallHit
@@ -651,16 +680,25 @@ export function useDistributionRunTool(config: DistributionRunToolConfig) {
         hit: hitForCursor,
         working,
         ray: event.localRay,
-        fallback: previous?.point ?? currentStart ?? hit.point,
+        fallback: explicitRoute ? [...hit.point] : (previous?.point ?? currentStart ?? hit.point),
         clearance: adapter.surfaceClearance?.(target) ?? 0,
       })
+      const routeElevation = currentStart?.[1] ?? adapter.elevation ?? 0
+      if (explicitRoute) {
+        resolved.point[1] = routeElevation
+        if (currentStart && adapter.routingMode === 'vertical') return verticalTarget(currentStart)
+      }
       const bypass = event.nativeEvent?.altKey === true
       const gridStep = !bypass && isGridSnapActive() ? useEditor.getState().gridSnapStep : 0
       const angleLocked = !bypass && (isAngleSnapActive() || isGridSnapActive())
       let point = currentStart
         ? resolved.point
         : snapRunPointToSurface(resolved.point, resolved.frame, gridStep)
-      const forcedDirection = forcedDirectionRef.current
+      const selectedDirection = forcedDirectionRef.current
+      const forcedDirection =
+        explicitRoute && selectedDirection && Math.abs(selectedDirection[1]) > 1e-6
+          ? null
+          : selectedDirection
       if (currentStart && forcedDirection) {
         point = projectRunToDirection(currentStart, point, forcedDirection)
       }
@@ -673,7 +711,11 @@ export function useDistributionRunTool(config: DistributionRunToolConfig) {
       if (currentStart && gridStep > 0) {
         point = snapRunLength(currentStart, point, gridStep)
       }
-      const sample = { frame: resolved.frame, surfaceTarget: target }
+      const drawingTarget: RunSurfaceTarget | null =
+        explicitRoute && adapter.levelId
+          ? { kind: 'surface', levelId: adapter.levelId, frame: resolved.frame }
+          : target
+      const sample = { frame: resolved.frame, surfaceTarget: drawingTarget }
       const native = (event.nativeEvent ?? {}) as {
         clientX?: number
         clientY?: number
@@ -713,11 +755,22 @@ export function useDistributionRunTool(config: DistributionRunToolConfig) {
         const screen = projectConnection(candidate)
         return !!screen && Math.hypot(screen.x - pointer[0], screen.y - pointer[1]) <= 12
       }
+      // An explicit route may only connect at the height its free end reaches above that
+      // plan point, which includes the adapter's fall.
+      const routeHeightAt = (candidate: readonly number[]): number => {
+        const level: RunPoint = [candidate[0]!, routeElevation, candidate[2]!]
+        return currentStart
+          ? (adapter.resolveFreeEnd?.(currentStart, level, startConnectionRef.current) ?? level)[1]
+          : routeElevation
+      }
+      const onRoute = (candidate: readonly number[]) =>
+        !explicitRoute || Math.abs(candidate[1]! - routeHeightAt(candidate)) < 1e-4
       const resolveConnection = (candidate: RunPoint): ResolvedRunPoint | null => {
         if (bypass || !(isGridSnapActive() || isMagneticSnapActive() || isAngleSnapActive()))
           return null
         const source = startConnectionRef.current.port
-        const hit = findScreenPort(adapter.getPorts(), pointer, projectConnection, source)
+        const ports = adapter.getPorts().filter((port) => onRoute(port.position))
+        const hit = findScreenPort(ports, pointer, projectConnection, source)
         if (hit) {
           return {
             frame: createRunSurfaceFrame([...hit.port.position]),
@@ -730,8 +783,19 @@ export function useDistributionRunTool(config: DistributionRunToolConfig) {
             body: null,
           }
         }
-        const body = adapter.findBody(candidate, target)
-        if (body && acceptsConnection(body.point) && body.nodeId !== source?.nodeId) {
+        const body =
+          adapter.connectCrossings === false
+            ? null
+            : adapter.findBody(
+                explicitRoute ? [candidate[0], routeHeightAt(candidate), candidate[2]] : candidate,
+                drawingTarget,
+              )
+        if (
+          body &&
+          onRoute(body.point) &&
+          acceptsConnection(body.point) &&
+          body.nodeId !== source?.nodeId
+        ) {
           return {
             ...sample,
             point: body.point,
@@ -747,7 +811,7 @@ export function useDistributionRunTool(config: DistributionRunToolConfig) {
       if (connection) return connection
       // Rank displayed directions before a surface projection discards height.
       if (currentStart && event.localRay && !bypass && (forcedDirection || angleLocked)) {
-        const source = startConnectionRef.current.port?.direction ?? null
+        const source = explicitRoute ? null : (startConnectionRef.current.port?.direction ?? null)
         const candidates = forcedDirection
           ? [forcedDirection]
           : source
@@ -803,7 +867,7 @@ export function useDistributionRunTool(config: DistributionRunToolConfig) {
               forcedDirection ||
               (Math.abs(directionHit.direction[1]) > 1e-6 && target?.kind === 'floor')
                 ? null
-                : target,
+                : drawingTarget,
             snapped: null,
             directionMode: 'angle',
             port: null,
@@ -951,7 +1015,12 @@ export function useDistributionRunTool(config: DistributionRunToolConfig) {
       setAltActive(false)
     }
 
+    const updateCursorScreen = (event: GridEvent) => {
+      const pointer = getGridEventScreenProjection(event)?.pointer
+      setCursorScreen(pointer ? { x: pointer[0], y: pointer[1], depth: 0 } : null)
+    }
     const onMove = (event: RunPointerEvent) => {
+      updateCursorScreen(event)
       lastPointerRef.current = event
       const clientY = (event.nativeEvent as { clientY?: number } | undefined)?.clientY
       if (typeof clientY === 'number') lastClientYRef.current = clientY
@@ -973,6 +1042,7 @@ export function useDistributionRunTool(config: DistributionRunToolConfig) {
     }
 
     const onClick = (event: GridEvent) => {
+      updateCursorScreen(event)
       event.nativeEvent?.stopPropagation?.()
       const currentStart = startRef.current
       if (altAnchorRef.current && currentStart) {
@@ -993,8 +1063,10 @@ export function useDistributionRunTool(config: DistributionRunToolConfig) {
           port: resolved.port,
           body: resolved.port ? null : resolved.body,
         }
-        if (shouldLockRunWallSurface(resolved.surfaceTarget, connection)) {
-          lockedWallTargetRef.current = resolved.surfaceTarget
+        if (!configRef.current.routingMode || configRef.current.routingMode === 'surface') {
+          if (shouldLockRunWallSurface(resolved.surfaceTarget, connection)) {
+            lockedWallTargetRef.current = resolved.surfaceTarget
+          }
         }
         triggerSFX('sfx:grid-snap')
         startConnectionRef.current = connection
@@ -1005,6 +1077,10 @@ export function useDistributionRunTool(config: DistributionRunToolConfig) {
         setSnapTarget(resolved.snapped)
         setSnapScreen(resolved.snapScreen ?? null)
         setEndConnection({ port: null, body: null })
+        // A vertical route ends at the target, not under the pointer: show that
+        // riser now so the next click or Enter places what the preview shows.
+        if (configRef.current.routingMode === 'vertical')
+          updateCursor(verticalTarget(resolved.point))
         return
       }
       const typedResolved = applyTypedLength(resolved)
@@ -1036,6 +1112,11 @@ export function useDistributionRunTool(config: DistributionRunToolConfig) {
         setAltActive(true)
         return
       }
+      if (
+        configRef.current.routingMode === 'vertical' &&
+        (event.key === 'Tab' || /^[0-9.,]$/.test(event.key))
+      )
+        return
       if (
         event.key === 'Tab' &&
         startRef.current &&
@@ -1045,7 +1126,10 @@ export function useDistributionRunTool(config: DistributionRunToolConfig) {
       ) {
         event.preventDefault()
         event.stopImmediatePropagation()
-        const source = startConnectionRef.current.port?.direction
+        const source =
+          configRef.current.routingMode === 'horizontal'
+            ? null
+            : startConnectionRef.current.port?.direction
         const candidates = source
           ? run3DDirectionCandidates(source)
           : runHorizontalDirectionCandidates(null)
@@ -1117,7 +1201,10 @@ export function useDistributionRunTool(config: DistributionRunToolConfig) {
     }
 
     refreshCursorRef.current = () => {
-      if (lastPointerRef.current)
+      const currentStart = startRef.current
+      if (currentStart && configRef.current.routingMode === 'vertical')
+        updateCursor(verticalTarget(currentStart))
+      else if (lastPointerRef.current)
         updateCursor(applyTypedLength(resolvePoint(lastPointerRef.current)))
       else if (lastResolvedRef.current) updateCursor(applyTypedLength(lastResolvedRef.current))
     }
@@ -1151,18 +1238,39 @@ export function useDistributionRunTool(config: DistributionRunToolConfig) {
     }
   }, [camera, gl, config.active, updateLengthInput])
 
+  // The resolver reads config through a ref; changing these controls must refresh a stationary cursor.
+  // biome-ignore lint/correctness/useExhaustiveDependencies: configuration changes invalidate the cursor
+  useEffect(() => {
+    forcedDirectionRef.current = null
+    if (config.routingMode !== 'surface') lockedWallTargetRef.current = null
+    refreshCursor()
+  }, [
+    config.routingMode,
+    config.elevation,
+    config.targetElevation,
+    config.connectCrossings,
+    refreshCursor,
+  ])
+
   return {
     refreshCursor,
+    routingMode: config.routingMode,
     start,
     cursor,
     snapTarget,
     snapScreen,
+    cursorScreen: planVisible ? cursorScreen : null,
     altActive,
     directionMode,
     lengthInput,
     validationMessage,
     onLengthInputChange: updateLengthInput,
     onDirectionSelect: (direction: RunPoint) => {
+      if (
+        configRef.current.routingMode === 'vertical' ||
+        (configRef.current.routingMode === 'horizontal' && Math.abs(direction[1]) > 1e-6)
+      )
+        return
       forcedDirectionRef.current = direction
       setDirectionMode('angle')
       refreshCursorRef.current()
@@ -1183,6 +1291,7 @@ export function DistributionRunCursor({
   extraParts = [],
   cursorRef,
   directionMode,
+  routingMode,
   startDirection,
   lengthInput,
   validationMessage,
@@ -1198,6 +1307,7 @@ export function DistributionRunCursor({
   extraParts?: DimensionPillPart[]
   cursorRef?: RefObject<Group | null>
   directionMode: RunDirectionMode
+  routingMode?: 'surface' | 'horizontal' | 'vertical'
   startDirection?: readonly [number, number, number] | null
   lengthInput?: string
   validationMessage?: string | null
@@ -1208,8 +1318,8 @@ export function DistributionRunCursor({
   const i18n = usePascalI18n()
   const lengthFieldRef = useRef<HTMLInputElement>(null)
   useEffect(() => {
-    if (start) lengthFieldRef.current?.focus()
-  }, [start])
+    if (start && routingMode !== 'vertical') lengthFieldRef.current?.focus()
+  }, [start, routingMode])
   if (!cursor) return null
   const parts: DimensionPillPart[] = [
     ...(start
@@ -1270,9 +1380,9 @@ export function DistributionRunCursor({
           cursor={cursor}
           mode={directionMode}
           snapped={!!snapTarget}
-          sourceDirection={startDirection ?? null}
+          sourceDirection={routingMode === 'horizontal' ? null : (startDirection ?? null)}
           start={start}
-          onDirectionSelect={onDirectionSelect}
+          onDirectionSelect={routingMode === 'vertical' ? undefined : onDirectionSelect}
         />
       )}
       <CursorSphere
@@ -1291,7 +1401,15 @@ export function DistributionRunCursor({
         >
           <div className="flex flex-col items-center gap-1">
             <DimensionPill parts={parts} primary={primary} unit={unit} />
-            {start ? (
+            {start && routingMode === 'vertical' ? (
+              <div className="rounded-full border border-border/60 bg-background/90 px-3 py-1 text-xs shadow-sm">
+                {i18n._({
+                  id: 'editor.tools.distribution.distributionRunTool.targetElevation',
+                  message: 'Target elevation: {elevation} m · click or Enter to place',
+                  values: { elevation: formatFixed(cursor[1], 2, i18n.getLocale()) },
+                })}
+              </div>
+            ) : start ? (
               <label className="rounded-full border border-border/60 bg-background/90 px-3 py-1 text-[11px] tabular-nums text-muted-foreground shadow-sm backdrop-blur">
                 {messageWithSlot(
                   i18n,

package/src/components/tools/item/move-tool.tsx

@@ -1,8 +1,7 @@
-import type { AnyNodeId, ElevatorNode, SpawnNode } from '@pascal-app/core'
+import type { AnyNodeId, SpawnNode } from '@pascal-app/core'
 import { createSceneApi, nodeRegistry, useScene } from '@pascal-app/core'
 import { Suspense, useMemo } from 'react'
 import { useMovingNode } from '../../../store/use-interaction-scope'
-import { MoveElevatorTool } from '../elevator/move-elevator-tool'
 import { MoveRegistryNodeTool } from '../registry/move-registry-node-tool'
 import { getRegistryAffordanceTool } from '../shared/affordance-dispatch'
 
@@ -20,8 +19,6 @@ import { getRegistryAffordanceTool } from '../shared/affordance-dispatch'
  *   2. `MoveRegistryNodeTool` — generic translate-on-XZ for kinds that only
  *      declare `capabilities.movable` (shelf, spawn, duct-terminal,
  *      hvac-equipment, …).
- *   3. `elevator` is the lone remaining legacy arm — its bespoke cab/shaft
- *      mover hasn't been ported to a kind-owned affordance yet.
  */
 export const MoveTool: React.FC<{
   onNodeMoved?: (nodeId: AnyNodeId) => void
@@ -47,7 +44,5 @@ export const MoveTool: React.FC<{
     return <MoveRegistryNodeTool node={movingNode} />
   }
 
-  if (movingNode.type === 'elevator')
-    return <MoveElevatorTool node={movingNode as ElevatorNode} onCommitted={onNodeMoved} />
   return null
 }

package/src/components/tools/item/use-placement-coordinator.tsx

@@ -9,6 +9,7 @@ import {
   collectAlignmentAnchors,
   emitter,
   findLevelAncestorId,
+  formatLinearMeasurement,
   type GridEvent,
   getScaledDimensions,
   getWallBodyCenterOffset,
@@ -49,7 +50,6 @@ import {
   publishPlacementSurface,
 } from '../../../lib/active-placement-surface'
 import { EDITOR_LAYER } from '../../../lib/constants'
-import { formatLinearMeasurement } from '../../../lib/measurements'
 import { isFreshPlacementMetadata } from '../../../lib/placement-metadata'
 import { createMovementSfxTick } from '../../../lib/sfx/movement-tick'
 import { sfxEmitter } from '../../../lib/sfx-bus'

package/src/components/tools/paint-region/wall-paint-region-tool.tsx

@@ -4,6 +4,7 @@ import {
   type AnyNode,
   type AnyNodeId,
   emitter,
+  formatLinearMeasurement,
   sceneRegistry,
   useScene,
   type WallFace,
@@ -27,7 +28,6 @@ import {
 import { LineBasicNodeMaterial, MeshBasicNodeMaterial } from 'three/webgpu'
 import { markToolCancelConsumed } from '../../../hooks/use-keyboard'
 import { EDITOR_LAYER } from '../../../lib/constants'
-import { formatLinearMeasurement } from '../../../lib/measurements'
 import { paintRegionTargets, usePaintRegionMode } from '../../../lib/paint-region-mode'
 import { isTypingTarget } from '../../../lib/typing-target'
 import {

package/src/components/tools/registry/move-registry-node-tool.test.ts

@@ -107,6 +107,7 @@ test('focus completion: mounted registry mover owns only outside R T and Alt', a
       cancelAnimationFrame: { configurable: true, value: (key: number) => frames.delete(key) },
       IS_REACT_ACT_ENVIRONMENT: { configurable: true, value: true },
     })
+    let supportY = 0
     core.registerNode({
       kind: node.type,
       schemaVersion: 1,
@@ -114,7 +115,14 @@ test('focus completion: mounted registry mover owns only outside R T and Alt', a
       schema: z.object({ type: z.literal(node.type) }).passthrough(),
       defaults: () => ({}),
       capabilities: {
-        movable: { isValidPosition: () => false },
+        movable: {
+          isValidPosition: () => false,
+          resolvePosition: ({ position }: { position: [number, number, number] }) => [
+            position[0],
+            supportY,
+            position[2],
+          ],
+        },
         floorPlaced: {
           collides: true,
           footprint: (candidate: AnyNode) => ({
@@ -251,6 +259,39 @@ test('focus completion: mounted registry mover owns only outside R T and Alt', a
     expect((await key('t', false)).defaultPrevented).toBe(true)
     expect(mesh.rotation.y).toBeCloseTo(0.25)
     expect(core.useLiveTransforms.getState().transforms.get(id)?.rotation).toBeCloseTo(0.25)
+    supportY = 0.75
+    await act(async () => {
+      core.emitter.emit('grid:move', {
+        nativeEvent: {
+          target: { closest: () => null },
+        } as unknown as import('@pascal-app/core').GridEvent['nativeEvent'],
+        position: [7, 0, 3],
+        localPosition: [7, 0, 3],
+        stopPropagation() {},
+      } as import('@pascal-app/core').GridEvent)
+      flushFrames()
+    })
+    expect(mesh.position.y).toBeCloseTo(0.75)
+    expect(core.useLiveTransforms.getState().transforms.get(id)?.position?.[1]).toBeCloseTo(0.75)
+    expect(
+      (core.useScene.getState().nodes[id] as unknown as { position: number[] }).position[1],
+    ).toBe(0)
+    supportY = 1.25
+    await key('Alt', false)
+    await act(async () => {
+      core.emitter.emit('grid:click', {
+        nativeEvent: {
+          target: { closest: () => null },
+        } as unknown as import('@pascal-app/core').GridEvent['nativeEvent'],
+        position: [7, 0, 3],
+        localPosition: [7, 0, 3],
+        stopPropagation() {},
+      } as import('@pascal-app/core').GridEvent)
+      flushFrames()
+    })
+    expect(
+      (core.useScene.getState().nodes[id] as unknown as { position: number[] }).position[1],
+    ).toBeCloseTo(1.25)
   } finally {
     if (root)
       await act(async () => {

package/src/components/tools/registry/move-registry-node-tool.tsx

@@ -484,6 +484,18 @@ export function MoveRegistryNodeTool({ node: source }: { node: AnyNode }) {
       return Array.isArray(rotation) ? [rotation[0] ?? 0, y, rotation[2] ?? 0] : y
     }
 
+    const resolvePosition = (position: [number, number, number]) => {
+      const nodes = useScene.getState().nodes
+      const current = nodes[node.id] ?? node
+      return (
+        nodeRegistry.get(current.type)?.capabilities?.movable?.resolvePosition?.({
+          node: current,
+          position,
+          nodes,
+        }) ?? position
+      )
+    }
+
     const keepStartingElevation = (position: [number, number, number], yaw: number) => {
       if (!preserveLevelAndElevation) return position
       const rotation = toCommitRotation(yaw)
@@ -534,14 +546,19 @@ export function MoveRegistryNodeTool({ node: source }: { node: AnyNode }) {
     // them through `useLiveNodeOverrides` (transient — no history churn;
     // GeometrySystem merges overrides via getEffectiveNode). Each connected
     // node is re-dirtied so its geometry rebuilds against the new override.
-    const previewConnectivity = (position: [number, number, number], rotationY: number) => {
+    // False, previewing nothing, when the connected joints cannot follow.
+    const previewConnectivity = (
+      position: [number, number, number],
+      rotationY: number,
+    ): boolean => {
       const connectivity = connectivityRef.current
-      if (!connectivity) return
+      if (!connectivity) return true
       const updates = resolveConnectivityUpdates(
         connectivity,
         buildPreviewNode(position, rotationY),
       )
-      if (updates.length === 0) return
+      if (!updates) return false
+      if (updates.length === 0) return true
       useLiveNodeOverrides
         .getState()
         .setMany(updates.map((u) => [u.id, u.data as Record<string, unknown>] as const))
@@ -549,6 +566,7 @@ export function MoveRegistryNodeTool({ node: source }: { node: AnyNode }) {
       for (const u of updates) {
         if (useScene.getState().nodes[u.id]) useScene.getState().markDirty(u.id)
       }
+      return true
     }
 
     const clearConnectivityOverrides = () => {
@@ -1026,7 +1044,11 @@ export function MoveRegistryNodeTool({ node: source }: { node: AnyNode }) {
           },
         ).position
       }
-      position = keepStartingElevation(position, rotationRef.current)
+      position = resolvePosition(keepStartingElevation(position, rotationRef.current))
+      // Carry connected ductwork along (preview only — committed on drop). A
+      // position the connected joints cannot follow holds the last frame,
+      // which is what the drop commits.
+      if (!previewConnectivity(position, rotationRef.current)) return
       const visualPosition = getVisualPosition(position)
       hasMovedRef.current = true
       setCursorPosition(visualPosition)
@@ -1054,8 +1076,6 @@ export function MoveRegistryNodeTool({ node: source }: { node: AnyNode }) {
       })
       syncParentFramePreview(position)
       markMovedNodeDirty()
-      // Carry connected ductwork along (preview only — committed on drop).
-      previewConnectivity(position, rotationRef.current)
 
       const soundStep = {
         coords: [x, z],
@@ -1116,7 +1136,7 @@ export function MoveRegistryNodeTool({ node: source }: { node: AnyNode }) {
       // tool — unless Alt (free place) is held to force placement. Other kinds
       // carry no validity box (`validRef` stays true), so they're never blocked.
       if (!validRef.current && !altRef.current) return
-      const position: [number, number, number] = [...lastCursorRef.current]
+      const position = resolvePosition([...lastCursorRef.current])
 
       const rotation = toCommitRotation(rotationRef.current)
       let committedId = node.id as AnyNodeId
@@ -1171,8 +1191,9 @@ export function MoveRegistryNodeTool({ node: source }: { node: AnyNode }) {
             ? resolveConnectivityUpdates(
                 connectivityRef.current,
                 buildPreviewNode(position, rotationRef.current),
-              ).filter((u) => useScene.getState().nodes[u.id])
+              )?.filter((u) => useScene.getState().nodes[u.id])
             : []
+          if (!connectivityUpdates) return
           const surfaceId = surfaceAttachmentId(effectiveNode)
           itemSurfaceMove?.restore()
           useScene.temporal.getState().resume()
@@ -1298,7 +1319,6 @@ export function MoveRegistryNodeTool({ node: source }: { node: AnyNode }) {
         attachmentRotationRef.current,
       )
       if (nextFreeRotation === null) return
-      sfxEmitter.emit('sfx:item-rotate')
       const hostedPose = itemSurfaceMove?.rotate(nextFreeRotation)
       let position = hostedPose?.position ?? lastCursorRef.current
       if (
@@ -1319,10 +1339,16 @@ export function MoveRegistryNodeTool({ node: source }: { node: AnyNode }) {
         )
         position = canonicalPositionFromPlan(planOrigin[0], position[1], planOrigin[2])
       }
-      position = keepStartingElevation(position, hostedPose?.rotationY ?? nextFreeRotation)
+      const rotationY = hostedPose?.rotationY ?? nextFreeRotation
+      position = keepStartingElevation(position, rotationY)
+      // Rotating the fitting swings its collars — connected ducts follow. A
+      // swing they cannot follow holds the last frame; a surface-hosted node
+      // has already turned with its host, so its drop refuses instead.
+      if (!previewConnectivity(position, rotationY) && !hostedPose) return
+      sfxEmitter.emit('sfx:item-rotate')
       lastCursorRef.current = position
-      freeRotationRef.current = hostedPose?.rotationY ?? nextFreeRotation
-      rotationRef.current = freeRotationRef.current
+      freeRotationRef.current = rotationY
+      rotationRef.current = rotationY
       setCursorRotationY(previewRotationY(rotationRef.current))
       const visualPosition = getVisualPosition(position)
       setCursorPosition(visualPosition)
@@ -1335,8 +1361,6 @@ export function MoveRegistryNodeTool({ node: source }: { node: AnyNode }) {
         })
       syncParentFramePreview(position)
       markMovedNodeDirty()
-      // Rotating the fitting swings its collars — connected ducts follow.
-      previewConnectivity(position, rotationRef.current)
       // Rotation changes the footprint's collision span — re-check validity.
       if (!itemSurfaceMove?.hosted && itemSurfaceMove?.rejection && lastSurfaceEvent)
         onItemMove(lastSurfaceEvent)

package/src/components/tools/shared/placement-box.tsx

@@ -2,16 +2,12 @@
 
 import '../../../three-types'
 
+import { formatLinearMeasurement, type LinearUnit, type MetricNotation } from '@pascal-app/core'
 import { useEffect, useMemo } from 'react'
 import { PlaneGeometry } from 'three'
 import { distance, smoothstep, uv, vec2 } from 'three/tsl'
 import { LineBasicNodeMaterial, MeshBasicNodeMaterial } from 'three/webgpu'
 import { EDITOR_LAYER } from '../../../lib/constants'
-import {
-  formatLinearMeasurement,
-  type LinearUnit,
-  type MetricNotation,
-} from '../../../lib/measurements'
 import { Html } from '../../editor/localized-html'
 import { createLineGeometry, getBoxEdgePoints } from './placement-box-geometry'