nodes: improve block mesh editing UX

packages/editor/src/components/systems/selection-affordance-manager.tsx

@@ -1,9 +1,18 @@
 'use client'
 
-import { type AnyNodeId, useScene } from '@pascal-app/core'
+import {
+  type AnyNodeId,
+  createSceneApi,
+  runAsSingleSceneHistoryStep,
+  useScene,
+} from '@pascal-app/core'
 import { useViewer } from '@pascal-app/viewer'
 import { type ComponentType, Suspense, useMemo } from 'react'
 import { getRegistryAffordanceTool } from '../tools/shared/affordance-dispatch'
+import type {
+  SelectionAffordanceHistoryApi,
+  SelectionAffordanceProps,
+} from './selection-affordance-services'
 
 /**
  * Editor-mounted dispatcher for a kind's selection-time editing UI.
@@ -19,20 +28,43 @@ import { getRegistryAffordanceTool } from '../tools/shared/affordance-dispatch'
  */
 export function SelectionAffordanceManager() {
   const selectedIds = useViewer((s) => s.selection.selectedIds)
-  const selectedKind = useScene((s) => {
+  const selectedNode = useScene((s) => {
     if (selectedIds.length !== 1) return null
-    return s.nodes[selectedIds[0] as AnyNodeId]?.type ?? null
+    return s.nodes[selectedIds[0] as AnyNodeId] ?? null
   })
+  const readOnly = useScene((s) => s.readOnly)
+  const sceneApi = useMemo(() => createSceneApi(useScene), [])
+  const historyApi = useMemo<SelectionAffordanceHistoryApi>(
+    () => ({
+      depth: () => useScene.temporal.getState().pastStates.length,
+      replaceLatest: (expectedDepth, replace) => {
+        if (useScene.temporal.getState().pastStates.length !== expectedDepth) return false
+        let replaced = false
+        runAsSingleSceneHistoryStep(useScene, () => {
+          useScene.temporal.getState().undo()
+          replaced = replace()
+          if (!replaced) useScene.temporal.getState().redo()
+        })
+        return replaced
+      },
+    }),
+    [],
+  )
 
-  const Component = useMemo<ComponentType | null>(() => {
-    if (!selectedKind) return null
-    return getRegistryAffordanceTool(selectedKind, 'selection')
-  }, [selectedKind])
+  const Component = useMemo<ComponentType<SelectionAffordanceProps> | null>(() => {
+    if (!selectedNode) return null
+    return getRegistryAffordanceTool(selectedNode.type, 'selection')
+  }, [selectedNode])
 
-  if (!Component) return null
+  if (!(Component && selectedNode)) return null
   return (
     <Suspense fallback={null}>
-      <Component />
+      <Component
+        historyApi={historyApi}
+        node={selectedNode}
+        readOnly={readOnly}
+        sceneApi={sceneApi}
+      />
     </Suspense>
   )
 }

packages/editor/src/components/systems/selection-affordance-services.ts

@@ -0,0 +1,13 @@
+import type { AnyNode, SceneApi } from '@pascal-app/core'
+
+export type SelectionAffordanceHistoryApi = {
+  depth: () => number
+  replaceLatest: (expectedDepth: number, replace: () => boolean) => boolean
+}
+
+export type SelectionAffordanceProps = {
+  historyApi: SelectionAffordanceHistoryApi
+  node: AnyNode
+  readOnly: boolean
+  sceneApi: SceneApi
+}

packages/editor/src/components/tools/item/block-preview.test.ts

@@ -39,10 +39,10 @@ describe('resolveBlockFaceSwitch', () => {
 })
 
 describe('shouldDetachBlockFaceOnLeave', () => {
-  test('keeps attached items on the last valid block face during transient leave events', () => {
-    expect(shouldDetachBlockFaceOnLeave('wall')).toBe(false)
-    expect(shouldDetachBlockFaceOnLeave('wall-side')).toBe(false)
-    expect(shouldDetachBlockFaceOnLeave('ceiling')).toBe(false)
+  test('detaches attached items when they leave a block face', () => {
+    expect(shouldDetachBlockFaceOnLeave('wall')).toBe(true)
+    expect(shouldDetachBlockFaceOnLeave('wall-side')).toBe(true)
+    expect(shouldDetachBlockFaceOnLeave('ceiling')).toBe(true)
   })
 
   test('allows free floor items to leave a block face', () => {

packages/editor/src/components/tools/item/block-preview.ts

@@ -35,7 +35,12 @@ export function resolveBlockFaceSwitch(
 }
 
 export function shouldDetachBlockFaceOnLeave(attachTo: string | undefined): boolean {
-  return !attachTo
+  return (
+    attachTo === undefined ||
+    attachTo === 'wall' ||
+    attachTo === 'wall-side' ||
+    attachTo === 'ceiling'
+  )
 }
 
 export function clampBlockFacePosition(

packages/editor/src/hooks/use-keyboard.test.ts

@@ -8,7 +8,11 @@ import {
 } from '@pascal-app/core'
 import { meshEditScope } from '../lib/interaction/scope'
 import useInteractionScope from '../store/use-interaction-scope'
-import { runHistoryShortcut } from './use-keyboard'
+import {
+  canCycleSnappingModeShortcut,
+  canRunGlobalRotationShortcut,
+  runHistoryShortcut,
+} from './use-keyboard'
 
 type RafFn = (callback: (time: number) => void) => number
 ;(globalThis as unknown as { requestAnimationFrame?: RafFn }).requestAnimationFrame ??= (
@@ -42,6 +46,20 @@ afterEach(() => {
 })
 
 describe('history shortcuts during block editing', () => {
+  test('reserves R for the active mesh editor', () => {
+    expect(canRunGlobalRotationShortcut()).toBe(true)
+    useInteractionScope.getState().begin(meshEditScope(NODE_ID))
+    expect(canRunGlobalRotationShortcut()).toBe(false)
+  })
+
+  test('reserves held Shift for precision while a mesh operation is active', () => {
+    useInteractionScope.getState().begin(meshEditScope(NODE_ID))
+    expect(canCycleSnappingModeShortcut(true)).toBe(true)
+
+    useInteractionScope.getState().begin(meshEditScope(NODE_ID, 'operating', 'translate'))
+    expect(canCycleSnappingModeShortcut(true)).toBe(false)
+  })
+
   test('undoes and redoes mesh changes without leaving component selection mode', () => {
     useInteractionScope.getState().begin(meshEditScope(NODE_ID))
 

packages/editor/src/hooks/use-keyboard.ts

@@ -171,6 +171,14 @@ export const runHistoryShortcut = (direction: 'undo' | 'redo') => {
   return true
 }
 
+export const canRunGlobalRotationShortcut = () =>
+  useInteractionScope.getState().scope.kind !== 'mesh-editing'
+
+export const canCycleSnappingModeShortcut = (hasActiveContext = getActiveSnapContext() != null) => {
+  const scope = useInteractionScope.getState().scope
+  return hasActiveContext && !(scope.kind === 'mesh-editing' && scope.phase === 'operating')
+}
+
 export const useKeyboard = ({
   isVersionPreviewMode = false,
   disabled = false,
@@ -200,7 +208,6 @@ export const useKeyboard = ({
     // every node move (including wall-hosted items + door/window openings, which
     // now declare `snapProfile`), and endpoint/polygon reshaping, so the keys
     // never silently stop working. Force-place lives on Alt where a tool supports it.
-    const isSnappingCycleContext = () => getActiveSnapContext() != null
     // A "clean tap" of Ctrl/Meta (pressed and released with NO other key in
     // between) cycles the grid step — same context as the Shift snapping-mode
     // cycle. `ctrlTapClean` starts true the moment Ctrl/Meta goes down alone
@@ -270,7 +277,7 @@ export const useKeyboard = ({
         return
       }
 
-      if (e.key === 'Shift' && !e.repeat && isSnappingCycleContext()) {
+      if (e.key === 'Shift' && !e.repeat && canCycleSnappingModeShortcut()) {
         // Cycle the global snapping mode (grid → lines → angles → off).
         // `'off'` is the snap bypass now, so Shift no longer holds-to-bypass.
         e.preventDefault()
@@ -480,7 +487,8 @@ export const useKeyboard = ({
         !e.metaKey &&
         !e.ctrlKey &&
         !isVersionPreviewMode &&
-        !isPlacingOpening()
+        !isPlacingOpening() &&
+        canRunGlobalRotationShortcut()
       ) {
         // `!metaKey && !ctrlKey` lets Cmd/Ctrl+R reach the browser reload instead
         // of rotating/flipping the selected node.
@@ -699,7 +707,7 @@ export const useKeyboard = ({
         if (e.target instanceof HTMLInputElement || e.target instanceof HTMLTextAreaElement) {
           return
         }
-        if (!isSnappingCycleContext()) return
+        if (!canCycleSnappingModeShortcut()) return
         // Cycle the grid / measurement step (0.5 → 0.25 → 0.1 → 0.05).
         useEditor.getState().cycleGridSnapStep()
         sfxEmitter.emit('sfx:grid-snap')

packages/editor/src/index.tsx

@@ -99,6 +99,10 @@ export {
   buildSvgArrowHeadPoints,
   getArcPlanPoint,
 } from './components/editor-2d/svg-paths'
+export type {
+  SelectionAffordanceHistoryApi,
+  SelectionAffordanceProps,
+} from './components/systems/selection-affordance-services'
 // Phase 5 Stage D transitional exports — pure drafting / angle helpers
 // consumed by kind-owned drag actions in @pascal-app/nodes. Stage F
 // cleanup moves these into @pascal-app/nodes (fence/drafting.ts +