@pascal-app/editor 1.0.1 → 1.0.3

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

@@ -4,6 +4,7 @@ import {
   type AnyNode,
   type AnyNodeId,
   type CeilingEvent,
+  canHostSurfaceChild,
   collectAlignmentAnchors,
   emitter,
   findLevelAncestorId,
@@ -48,6 +49,7 @@ import {
 } 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'
 import {
@@ -80,11 +82,13 @@ import {
 } from '../shared/placement-box-geometry'
 import {
   type PointerSupportSurface,
-  resolvePointerSupportElevation,
   resolvePointerSupportSurface,
 } from '../shared/pointer-support-cap'
 import { createShelfStickiness } from '../shared/shelf-stickiness'
-import { createSurfaceRejectionFeedback } from '../shared/surface-rejection'
+import {
+  createSurfaceEventOwnership,
+  createSurfaceRejectionFeedback,
+} from '../shared/surface-rejection'
 import { shouldCreateFloorDraft } from './draft-creation'
 import { commitFaceHostClick, resolveFaceHostPreviewCommit } from './face-host-commit'
 import {
@@ -597,6 +601,7 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
       wasAdopted: boolean,
       repeat: () => void,
     ) => {
+      if (!committedId) return
       if (configRef.current.onCommitted()) {
         repeat()
         return
@@ -626,12 +631,19 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
     ) => {
       const draftId = draftNode.current?.id ?? null
       const wasAdopted = draftNode.isAdopted
-      const finalId = draftNode.commit(nodeUpdate, options)
-      if (draftId) {
+      const finalId = draftNode.commit(nodeUpdate, {
+        ...options,
+        onReject: (reason) => {
+          feedback.reject(reason)
+          edgeMaterial.color.setHex(0xef_44_44)
+          basePlaneMaterial.color.setHex(0xef_44_44)
+        },
+      })
+      if (finalId && draftId) {
         useLiveTransforms.getState().clear(draftId)
         useLiveNodeOverrides.getState().clearFields(draftId, faceHostClearFields(draftNode.current))
       }
-      return { committedId: finalId ?? draftId, wasAdopted }
+      return { committedId: finalId, wasAdopted }
     }
 
     const faceHostClearFields = (draft: ItemNode | null | undefined): Array<keyof ItemNode> => {
@@ -651,6 +663,7 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
     }
 
     const surfacePointer = createItemSurfacePointerArbitration()
+    const surfaceOwnership = createSurfaceEventOwnership()
     const revalidate = (): boolean => {
       const fits = checkCanPlace(getContext(), validators)
       if (
@@ -681,11 +694,22 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
       return placeable
     }
 
-    const surfaceContext = (event: NodeEvent<AnyNode>) => {
+    const surfaceContext = (event: NodeEvent<AnyNode>, generic = false) => {
       lastSurfaceEvent = event
       return {
         ...getContext(),
         onSurfaceReject: (reason: SurfaceRejectReason) => {
+          // A rejected generic acquisition leaves the paired pointer's floor route in charge.
+          if (
+            generic &&
+            placementState.current.surfaceItemId !== event.node.id &&
+            reason !== 'surface-cutout' &&
+            reason !== 'surface-occupied'
+          ) {
+            return
+          }
+          surfaceOwnership.claim(event.node.id, event.nativeEvent.nativeEvent ?? event.nativeEvent)
+          event.stopPropagation()
           if (
             (reason === 'footprint-outside-surface' ||
               reason === 'footprint-exceeds-host' ||
@@ -695,7 +719,9 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
           ) {
             feedback.clear()
             detachItemSurfaceToFloor(event as ItemEvent)
-            surfacePointer.hit(event.node.id, event.nativeEvent.nativeEvent ?? event.nativeEvent)
+            // A generic host exit yields positioning to this pointer's paired floor event.
+            if (!generic)
+              surfacePointer.hit(event.node.id, event.nativeEvent.nativeEvent ?? event.nativeEvent)
             return
           }
           feedback.reject(reason, event.nativeEvent.nativeEvent ?? event.nativeEvent)
@@ -746,6 +772,7 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
 
     const applyTransition = (result: TransitionResult, event?: NodeEvent<AnyNode>) => {
       if (event) {
+        surfaceOwnership.claim(event.node.id, event.nativeEvent.nativeEvent ?? event.nativeEvent)
         surfacePointer.hit(event.node.id, event.nativeEvent.nativeEvent ?? event.nativeEvent)
         tickSurfaceMovementSfx(result.cursorPosition)
       }
@@ -1054,7 +1081,9 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
       // perspective-skewed along the ray whenever the plane sits on a
       // different storey than the pointed surface (the skew is what made
       // a drag over a deck-above-a-floor hop between the two surfaces).
-      const pointed = resolvePointerSupportSurface(cameraRef.current, event.position)
+      const pointed = resolvePointerSupportSurface(cameraRef.current, event.position, {
+        pointerRay: event.nativeEvent.ray,
+      })
       pointerSupportCapRef.current = pointed?.elevation ?? null
       pointerSupportSurfaceRef.current = pointed
       const surfaceEvent: GridEvent =
@@ -1732,6 +1761,7 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
         if (draft) useScene.getState().updateNode(draft.id, result.nodeUpdate)
       } else {
         draftNode.destroy()
+        gridPosition.current.set(...result.gridPosition)
         Object.assign(placementState.current, result.stateUpdate)
       }
     }
@@ -1744,11 +1774,10 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
       // Landing back on the floor: refresh the pointer surface cap from
       // this event's world hit so the first floor position already targets
       // the aimed-at surface (not a deck above it).
-      pointerSupportCapRef.current = resolvePointerSupportElevation(cameraRef.current, [
-        event.position[0],
-        event.position[1],
-        event.position[2],
-      ])
+      pointerSupportCapRef.current =
+        resolvePointerSupportSurface(cameraRef.current, event.position, {
+          pointerRay: event.nativeEvent.ray,
+        })?.elevation ?? null
       // Coming back from a host: forget the floor grab too, so the item
       // centers under the cursor instead of restoring the pre-drag offset —
       // and landing on the floor is "anchoring elsewhere", so a later return
@@ -1823,7 +1852,7 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
       revalidate()
     }
 
-    const onItemEnter = (event: NodeEvent<AnyNode>) => {
+    const onItemEnter = (event: NodeEvent<AnyNode>, generic = false) => {
       if (event.node.type === 'cabinet' && placementState.current.surfaceItemId === event.node.id) {
         onItemMove(event)
         return
@@ -1834,7 +1863,7 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
       }
       if (event.node.id === draftNode.current?.id) return
       has3DPointerDrivenMoveRef.current = true
-      const result = itemSurfaceStrategy.enter(surfaceContext(event), event)
+      const result = itemSurfaceStrategy.enter(surfaceContext(event, generic), event)
       if (!result) return
       feedback.clear()
 
@@ -1849,12 +1878,12 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
       }
     }
 
-    const onItemMove = (event: NodeEvent<AnyNode>) => {
+    const onItemMove = (event: NodeEvent<AnyNode>, generic = false) => {
       if (event.node.id === draftNode.current?.id) return
       releaseCommit = () => onItemClick(event)
       has3DPointerDrivenMoveRef.current = true
       if (!cursorGroupRef.current) return
-      const ctx = surfaceContext(event)
+      const ctx = surfaceContext(event, generic)
       if (event.node.type === 'cabinet') {
         lastRawPos.current.set(...event.position)
         surfacePointer.hit(event.node.id, event.nativeEvent.nativeEvent ?? event.nativeEvent)
@@ -1879,6 +1908,8 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
           event,
         )
 
+        // An unclaimed generic mesh must let its owning ancestor receive the same hit.
+        if (generic && !enterResult) return
         event.stopPropagation()
         if (enterResult) {
           applyTransition(enterResult, event)
@@ -1892,7 +1923,7 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
       }
 
       if (!draftNode.current) {
-        const enterResult = itemSurfaceStrategy.enter(surfaceContext(event), event)
+        const enterResult = itemSurfaceStrategy.enter(surfaceContext(event, generic), event)
         if (!enterResult) return
         event.stopPropagation()
         ensureDraft(enterResult)
@@ -2007,12 +2038,7 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
         // the host's own click event is blocked by the cursor preview.
         if (ctx.state.surface === 'item-surface' && ctx.state.surfaceItemId) {
           const hostNode = useScene.getState().nodes[ctx.state.surfaceItemId as AnyNodeId]
-          if (
-            hostNode &&
-            (hostNode.type === 'item' ||
-              hostNode.type === 'cabinet' ||
-              hostNode.type === 'procedural-item')
-          ) {
+          if (hostNode) {
             const synthetic = { ...event, node: hostNode } as ItemEvent
             const result = itemSurfaceStrategy.click(ctx, synthetic)
             if (result) {
@@ -2386,7 +2412,49 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
         const currentRotation = draft.rotation
         // Round to the nearest 45° then step, matching the placed-item R/T.
         const newRotationY = steppedRotation(currentRotation[1] ?? 0, rotationDir)
-        draft.rotation = [currentRotation[0], newRotationY, currentRotation[2]]
+        const nextRotation: [number, number, number] = [
+          currentRotation[0],
+          newRotationY,
+          currentRotation[2],
+        ]
+        const surface = placementState.current.surface
+        const surfaceMesh =
+          surface === 'item-surface' && placementState.current.surfaceItemId
+            ? sceneRegistry.nodes.get(placementState.current.surfaceItemId)
+            : undefined
+        let surfacePosition: [number, number, number] | undefined
+        if (surfaceMesh) {
+          const localPos = surfaceMesh.worldToLocal(lastRawPos.current.clone())
+          const [dimX, , dimZ] = getScaledDimensions(draft)
+          const swapDims = Math.abs(Math.sin(newRotationY)) > 0.9
+          surfacePosition = [
+            snapToGrid(localPos.x, swapDims ? dimZ : dimX),
+            gridPosition.current.y,
+            snapToGrid(localPos.z, swapDims ? dimX : dimZ),
+          ]
+        }
+        if (surfaceAttachmentId(draft)) {
+          let occupied = false
+          checkCanPlace(
+            {
+              ...getContext(),
+              draftItem: { ...draft, rotation: nextRotation },
+              gridPosition: surfacePosition
+                ? new Vector3(...surfacePosition)
+                : gridPosition.current,
+              onSurfaceReject: (reason) => {
+                occupied = reason === 'surface-occupied'
+              },
+            },
+            validators,
+          )
+          if (occupied) {
+            feedback.reject('surface-occupied')
+            revalidate()
+            return
+          }
+        }
+        draft.rotation = nextRotation
 
         // Rotate the building-local cursor by the same delta as the host-local
         // draft. This preserves the host's composed yaw for items resting on a
@@ -2398,7 +2466,6 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
         if (mesh) mesh.rotation.y = newRotationY
 
         // Re-snap position immediately with updated rotation (dimX/dimZ may swap at 90°)
-        const surface = placementState.current.surface
         if (surface === 'floor' || surface === 'ceiling') {
           const dims = getScaledDimensions(draft)
           const [dimX, , dimZ] = dims
@@ -2428,15 +2495,8 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
             }
           }
         } else if (surface === 'item-surface' && placementState.current.surfaceItemId) {
-          const surfaceMesh = sceneRegistry.nodes.get(placementState.current.surfaceItemId)
-          if (surfaceMesh) {
-            const localPos = surfaceMesh.worldToLocal(lastRawPos.current.clone())
-            const dims = getScaledDimensions(draft)
-            const [dimX, , dimZ] = dims
-            const swapDims = Math.abs(Math.sin(newRotationY)) > 0.9
-            const x = snapToGrid(localPos.x, swapDims ? dimZ : dimX)
-            const z = snapToGrid(localPos.z, swapDims ? dimX : dimZ)
-            const y = gridPosition.current.y
+          if (surfaceMesh && surfacePosition) {
+            const [x, y, z] = surfacePosition
             gridPosition.current.set(x, y, z)
             draft.position = [x, y, z]
             const worldSnapped = surfaceMesh.localToWorld(new Vector3(x, y, z))
@@ -2594,7 +2654,7 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
     const unsubDraftWatch = useScene.subscribe((state) => {
       if (tearingDown) return
       const draft = draftNode.current
-      if (draft === null) return
+      if (draft === null || isFreshPlacementMetadata(draft.metadata)) return
       if (draft.id in state.nodes) return
 
       queueMicrotask(() => {
@@ -2609,41 +2669,73 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
 
     // ---- Subscribe ----
 
+    const specializedKinds = new Set<string>()
+    const subscribeSpecialized = <E,>(key: string, handler: (event: E) => void) => {
+      specializedKinds.add(key.slice(0, key.lastIndexOf(':')))
+      emitter.on(key as never, handler as never)
+    }
+    const genericRoute = (phase: 'enter' | 'move' | 'click' | 'leave') => (event: NodeEvent) => {
+      if (specializedKinds.has(event.node.type)) return
+      if (
+        !surfaceOwnership.allows(event.node.id, event.nativeEvent.nativeEvent ?? event.nativeEvent)
+      )
+        return
+      if (nodeRegistry.get(event.node.type)?.capabilities.faceHost) {
+        const handlers = {
+          enter: onFaceHostEnter,
+          move: onFaceHostMove,
+          click: onFaceHostClick,
+          leave: onFaceHostLeave,
+        }
+        handlers[phase](event)
+        return
+      }
+      if (!canHostSurfaceChild(event.node, 'item', draftNode.current?.id)) return
+      if (phase === 'leave' && placementState.current.surfaceItemId !== event.node.id) return
+      if (phase === 'enter') onItemEnter(event, true)
+      else if (phase === 'move') onItemMove(event, true)
+      else if (phase === 'click') onItemClick(event)
+      else onItemLeave(event)
+    }
+    const onNodeEnter = genericRoute('enter')
+    const onNodeMove = genericRoute('move')
+    const onNodeClick = genericRoute('click')
+    const onNodeLeave = genericRoute('leave')
     const gridDispatch = createItemSurfaceGridDispatch(onGridMove)
     emitter.on('grid:move', gridDispatch.schedule)
     emitter.on('grid:click', onGridClick)
-    emitter.on('item:enter', onItemEnter)
-    emitter.on('item:move', onItemMove)
-    emitter.on('item:leave', onItemLeave)
-    emitter.on('item:click', onItemClick)
-    emitter.on('wall:enter', onWallEnter)
-    emitter.on('wall:move', onWallMove)
-    emitter.on('wall:click', onWallClick)
-    emitter.on('wall:leave', onWallLeave)
-    emitter.on('roof:enter', onRoofWallEnter)
-    emitter.on('roof:move', onRoofWallMove)
-    emitter.on('roof:click', onRoofWallClick)
-    emitter.on('roof:leave', onRoofWallLeave)
-    emitter.on('node:enter', onFaceHostEnter)
-    emitter.on('node:move', onFaceHostMove)
-    emitter.on('node:click', onFaceHostClick)
-    emitter.on('node:leave', onFaceHostLeave)
-    emitter.on('ceiling:enter', onCeilingEnter)
-    emitter.on('ceiling:move', onCeilingMove)
-    emitter.on('ceiling:click', onCeilingClick)
-    emitter.on('ceiling:leave', onCeilingLeave)
-    emitter.on('cabinet:enter', onItemEnter)
-    emitter.on('procedural-item:enter' as never, onItemEnter)
-    emitter.on('cabinet:move', onItemMove)
-    emitter.on('procedural-item:move' as never, onItemMove)
-    emitter.on('cabinet:click', onItemClick)
-    emitter.on('procedural-item:click' as never, onItemClick)
-    emitter.on('cabinet:leave', onItemLeave)
-    emitter.on('procedural-item:leave' as never, onItemLeave)
-    emitter.on('shelf:enter', onShelfEnter)
-    emitter.on('shelf:move', onShelfMove)
-    emitter.on('shelf:click', onShelfClick)
-    emitter.on('shelf:leave', onShelfLeave)
+    subscribeSpecialized('item:enter', onItemEnter)
+    subscribeSpecialized('item:move', onItemMove)
+    subscribeSpecialized('item:leave', onItemLeave)
+    subscribeSpecialized('item:click', onItemClick)
+    subscribeSpecialized('wall:enter', onWallEnter)
+    subscribeSpecialized('wall:move', onWallMove)
+    subscribeSpecialized('wall:click', onWallClick)
+    subscribeSpecialized('wall:leave', onWallLeave)
+    subscribeSpecialized('roof:enter', onRoofWallEnter)
+    subscribeSpecialized('roof:move', onRoofWallMove)
+    subscribeSpecialized('roof:click', onRoofWallClick)
+    subscribeSpecialized('roof:leave', onRoofWallLeave)
+    emitter.on('node:enter', onNodeEnter)
+    emitter.on('node:move', onNodeMove)
+    emitter.on('node:click', onNodeClick)
+    emitter.on('node:leave', onNodeLeave)
+    subscribeSpecialized('ceiling:enter', onCeilingEnter)
+    subscribeSpecialized('ceiling:move', onCeilingMove)
+    subscribeSpecialized('ceiling:click', onCeilingClick)
+    subscribeSpecialized('ceiling:leave', onCeilingLeave)
+    subscribeSpecialized('cabinet:enter', onItemEnter)
+    subscribeSpecialized('procedural-item:enter', onItemEnter)
+    subscribeSpecialized('cabinet:move', onItemMove)
+    subscribeSpecialized('procedural-item:move', onItemMove)
+    subscribeSpecialized('cabinet:click', onItemClick)
+    subscribeSpecialized('procedural-item:click', onItemClick)
+    subscribeSpecialized('cabinet:leave', onItemLeave)
+    subscribeSpecialized('procedural-item:leave', onItemLeave)
+    subscribeSpecialized('shelf:enter', onShelfEnter)
+    subscribeSpecialized('shelf:move', onShelfMove)
+    subscribeSpecialized('shelf:click', onShelfClick)
+    subscribeSpecialized('shelf:leave', onShelfLeave)
 
     // A floor placement commits at the tracked floor cursor (`gridPosition`),
     // which keeps following the floor even when the click ray lands on a wall
@@ -2689,10 +2781,10 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
       emitter.off('roof:move', onRoofWallMove)
       emitter.off('roof:click', onRoofWallClick)
       emitter.off('roof:leave', onRoofWallLeave)
-      emitter.off('node:enter', onFaceHostEnter)
-      emitter.off('node:move', onFaceHostMove)
-      emitter.off('node:click', onFaceHostClick)
-      emitter.off('node:leave', onFaceHostLeave)
+      emitter.off('node:enter', onNodeEnter)
+      emitter.off('node:move', onNodeMove)
+      emitter.off('node:click', onNodeClick)
+      emitter.off('node:leave', onNodeLeave)
       emitter.off('ceiling:enter', onCeilingEnter)
       emitter.off('ceiling:move', onCeilingMove)
       emitter.off('ceiling:click', onCeilingClick)
@@ -2764,6 +2856,7 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
       draftParent?.type === 'shelf' ||
       draftParent?.type === 'cabinet' ||
       draftParent?.type === 'procedural-item' ||
+      (draftParent && canHostSurfaceChild(draftParent, draft.type, draft.id)) ||
       (draftParent &&
         nodeRegistry.get(draftParent.type)?.capabilities.faceHost?.currentFaceId(draft))
     )
@@ -2782,8 +2875,8 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
   // instead of drawing an inline triangle. Only this coordinator publishes — a
   // moving existing node has no draft here, so the grid reads that case straight
   // off the node's mesh. Cleared when idle.
-  const surfaceNormalRef = useRef(new Vector3(0, 1, 0))
   const surfaceWorldPointRef = useRef(new Vector3())
+  const surfaceNormalRef = useRef(new Vector3(0, 1, 0))
   const facingForwardRef = useRef(new Vector3(0, 0, 1))
   const facingQuatRef = useRef(new Quaternion())
   const ghostSurfaceQuatRef = useRef(new Quaternion())

package/src/components/tools/registry/item-surface-move.test.ts

@@ -9,7 +9,6 @@ import {
   ItemNode,
   LevelNode,
   nodeRegistry,
-  registerNode,
   resolveSupportSlabPatch,
   sceneRegistry,
   spatialGridManager,
@@ -23,6 +22,7 @@ import {
 } from '@pascal-app/core/procedural-items'
 import { Group, Vector3 } from 'three'
 import { commitFreshPlacementSubtree } from '../../../lib/fresh-planar-placement'
+import { registerHostingTestNode } from '../__fixtures__/hosting'
 import {
   createItemSurfaceGridDispatch,
   createItemSurfacePointerArbitration,
@@ -73,7 +73,15 @@ beforeEach(() => {
   oldNodes = useScene.getState().nodes
   oldRoots = useScene.getState().rootNodeIds
   nodeRegistry._reset()
-  registerNode({
+  registerHostingTestNode({
+    kind: 'item',
+    schemaVersion: 1,
+    schema: ItemNode,
+    category: 'furnish',
+    defaults: () => ({}),
+    capabilities: {},
+  })
+  registerHostingTestNode({
     kind: 'procedural-item',
     schemaVersion: 1,
     schema: ProceduralItemNode,

package/src/components/tools/registry/item-surface-move.ts

@@ -11,6 +11,7 @@ import {
   sceneRegistry,
   useLiveTransforms,
   useScene,
+  wouldCreateHostingCycle,
 } from '@pascal-app/core'
 import { boxCorners } from '@pascal-app/core/procedural-items'
 import { type Camera, Euler, Quaternion, Vector3 } from 'three'
@@ -23,7 +24,10 @@ import {
 import { snapToGrid, snapToHalf } from '../item/placement-math'
 import { createShelfStickiness } from '../shared/shelf-stickiness'
 import { itemEventToSurfaceHit } from '../shared/surface-hit'
-import { createSurfaceRejectionFeedback } from '../shared/surface-rejection'
+import {
+  createSurfaceEventOwnership,
+  createSurfaceRejectionFeedback,
+} from '../shared/surface-rejection'
 
 export function createItemSurfacePointerArbitration() {
   let hostId: string | null = null
@@ -114,6 +118,7 @@ export function createRegistryItemSurfaceMove(node: AnyNode) {
   const feedback = createSurfaceRejectionFeedback()
   const scene = createSceneApi(useScene)
   const pointer = createItemSurfacePointerArbitration()
+  const ownership = createSurfaceEventOwnership()
   const originalParent = original.parentId
     ? useScene.getState().nodes[original.parentId as AnyNodeId]
     : null
@@ -165,6 +170,14 @@ export function createRegistryItemSurfaceMove(node: AnyNode) {
       surfaceId,
     )
     useLiveTransforms.getState().clear(node.id)
+    // A floor move and host return can share a React batch with unchanged final props.
+    // Restore the local mesh pose too, so an imperative floor preview cannot survive it.
+    const mesh = sceneRegistry.nodes.get(node.id)
+    if (mesh) {
+      mesh.position.set(...position)
+      const angles = fullRotation ?? rotation(yaw)
+      mesh.rotation.set(...(typeof angles === 'number' ? ([0, angles, 0] as const) : angles))
+    }
   }
   const session = {
     get rejection() {
@@ -211,17 +224,14 @@ export function createRegistryItemSurfaceMove(node: AnyNode) {
       }
     },
     enter(event: NodeEvent<AnyNode>, dimensions: [number, number, number], yaw: number) {
+      if (!ownership.allows(event.node.id, pointerEventOf(event))) return null
       pointer.clear()
       feedback.clear()
       const live = liveNode()
       if (floorPlaced.applies && !floorPlaced.applies(live)) return null
       const host = useScene.getState().nodes[event.node.id]
       if (!host || NON_PHYSICAL_HOST_KINDS.includes(host.type)) return null
-      let ancestor: AnyNode | undefined = host
-      while (ancestor) {
-        if (ancestor.id === node.id) return null
-        ancestor = ancestor.parentId ? scene.get(ancestor.parentId as AnyNodeId) : undefined
-      }
+      if (wouldCreateHostingCycle(node.id, host, scene)) return null
       const mesh = sceneRegistry.nodes.get(host.id)
       if (!mesh) return null
       const raw = mesh.worldToLocal(new Vector3(...event.position)).toArray()
@@ -262,6 +272,7 @@ export function createRegistryItemSurfaceMove(node: AnyNode) {
       const placement = resolveSurfacePlacement({
         host,
         childKind: node.type,
+        childId: node.id,
         childFootprint: {
           size: dimensions,
           rotationY: localYaw,
@@ -278,7 +289,23 @@ export function createRegistryItemSurfaceMove(node: AnyNode) {
         scene,
         snapScalar: host.type !== 'item' ? undefined : snapToGrid,
         checkFootprint: true,
-        onReject: (reason) => feedback.reject(reason, pointerEventOf(event)),
+        onReject: (reason) => {
+          if (
+            live.parentId !== host.id &&
+            !counterHit &&
+            host.type !== 'item' &&
+            host.type !== 'shelf' &&
+            reason !== 'surface-cutout' &&
+            reason !== 'surface-occupied'
+          )
+            return
+          if (reason === 'surface-cutout' || reason === 'surface-occupied') {
+            ownership.claim(host.id, pointerEventOf(event))
+            pointer.hit(host.id, pointerEventOf(event))
+            event.stopPropagation()
+          }
+          feedback.reject(reason, pointerEventOf(event))
+        },
       })
       if (!placement) return null
       valid = true
@@ -291,6 +318,7 @@ export function createRegistryItemSurfaceMove(node: AnyNode) {
         worldPosition: mesh.localToWorld(new Vector3(...placement.position)).toArray(),
       }
       grab = corrected.grab
+      ownership.claim(host.id, pointerEventOf(event))
       pointer.hit(host.id, pointerEventOf(event))
       event.stopPropagation()
       write(
@@ -344,12 +372,7 @@ export function createRegistryItemSurfaceMove(node: AnyNode) {
         false,
       )
       if (host?.type === 'procedural-item') position.splice(0, 3, ...local.position)
-      if (
-        host?.type === 'cabinet' ||
-        host?.type === 'shelf' ||
-        host?.type === 'item' ||
-        host?.type === 'procedural-item'
-      ) {
+      if (host) {
         const footprint = floorPlaced.footprint?.(live, { nodes: scene.nodes() })
         const bounds:
           | { size: [number, number, number]; center?: [number, number, number] }
@@ -376,6 +399,7 @@ export function createRegistryItemSurfaceMove(node: AnyNode) {
         const placement = resolveSurfacePlacement({
           host,
           childKind: live.type,
+          childId: live.id,
           childFootprint: {
             size: bounds.size,
             rotationY: Array.isArray(localRotation) ? localRotation[1] : localRotation,
@@ -394,7 +418,14 @@ export function createRegistryItemSurfaceMove(node: AnyNode) {
           onReject: (reason) => feedback.reject(reason),
         })
         valid = !!placement
-        if (placement && host.type === 'procedural-item') {
+        if (!placement) {
+          // Null means free rotation to the caller, so return the unchanged stored pose.
+          return {
+            position: [...live.position] as [number, number, number],
+            rotationY: Array.isArray(live.rotation) ? live.rotation[1] : live.rotation,
+          }
+        }
+        if (host.type === 'procedural-item') {
           const pose =
             placement.childFrame === 'surface-local'
               ? placement.surfaceLocal!
@@ -405,16 +436,7 @@ export function createRegistryItemSurfaceMove(node: AnyNode) {
             rotationY: pose.rotationY,
           }
         }
-        if (placement) position[1] = placement.position[1]
-        else if (
-          feedback.reason === 'footprint-outside-surface' ||
-          feedback.reason === 'footprint-exceeds-host' ||
-          feedback.reason === 'no-surface'
-        ) {
-          const mesh = sceneRegistry.nodes.get(host.id)
-          if (mesh)
-            return session.detach(mesh.localToWorld(new Vector3(...position)).toArray(), yaw)
-        }
+        position[1] = placement.position[1]
       }
       write(live.parentId, position, yaw)
       return { position, rotationY: yaw }

package/src/components/tools/registry/item-surface-resolver.test.ts

@@ -7,7 +7,6 @@ import {
   ItemNode,
   LevelNode,
   nodeRegistry,
-  registerNode,
   type SurfacePlacement,
   sceneRegistry,
   useLiveTransforms,
@@ -17,6 +16,7 @@ import { Group, Vector3 } from 'three'
 import { commitFreshPlacementSubtree } from '../../../lib/fresh-planar-placement'
 import useEditor from '../../../store/use-editor'
 import useInteractionScope from '../../../store/use-interaction-scope'
+import { registerHostingTestNode } from '../__fixtures__/hosting'
 import { createRegistryItemSurfaceMove } from './item-surface-move'
 
 const level = LevelNode.parse({ id: 'level_resolver' })
@@ -69,7 +69,7 @@ beforeEach(() => {
   savedRoots = useScene.getState().rootNodeIds
   restoreRegistry = nodeRegistry._snapshot()
   nodeRegistry._reset()
-  registerNode({
+  registerHostingTestNode({
     kind: 'item',
     schemaVersion: 1,
     schema: ItemNode,