@pascal-app/editor 1.0.0-beta.5 → 1.0.0

package/src/index.tsx

@@ -56,6 +56,7 @@ export {
   formatMeasurement,
   MeasurementPill,
 } from './components/editor/measurement-pill'
+export { NodeActionMenu } from './components/editor/node-action-menu'
 // In-world arrow handle primitives (chevron geometry, invisible hit area,
 // shared material, palette + scale constants). Re-exported so kind-owned
 // 3D selection affordances in `@pascal-app/nodes` (duct side-move / height /
@@ -98,6 +99,11 @@ export {
   buildSvgArrowHeadPoints,
   getArcPlanPoint,
 } from './components/editor-2d/svg-paths'
+export type {
+  SelectionAffordanceHistoryApi,
+  SelectionAffordanceInteractionApi,
+  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 +
@@ -113,7 +119,6 @@ export { MoveTool } from './components/tools/item/move-tool'
 // `@pascal-app/nodes` (wall curve sagitta snap, door / window placement,
 // item drop) so kinds don't reach into editor internals.
 export {
-  calculateCursorRotation,
   calculateItemRotation,
   getSideFromNormal,
   isValidWallSideFace,
@@ -132,6 +137,7 @@ export {
   type PlacementCoordinatorConfig,
   usePlacementCoordinator,
 } from './components/tools/item/use-placement-coordinator'
+export { useRegistryToolContext } from './components/tools/registry-tool-context'
 export { CursorSphere } from './components/tools/shared/cursor-sphere'
 export { DragBoundingBox } from './components/tools/shared/drag-bounding-box'
 export { getFloorStackPreviewPosition } from './components/tools/shared/floor-stack-preview'
@@ -144,6 +150,7 @@ export {
   resolveLevelConstructionPlane,
 } from './components/tools/shared/horizontal-construction-plane'
 export { PlacementBox } from './components/tools/shared/placement-box'
+export { PlacementDimensionGuides } from './components/tools/shared/placement-dimension-guides'
 // Pointer-decided support surface (deck top vs floor underneath) — the
 // draw tools (wall / fence) ride their grid plane and commit cap on it.
 export {
@@ -234,6 +241,7 @@ export { SegmentedControl } from './components/ui/controls/segmented-control'
 export { SliderControl } from './components/ui/controls/slider-control'
 export { TerrainSculptPanel } from './components/ui/controls/terrain-sculpt-panel'
 export { ToggleControl } from './components/ui/controls/toggle-control'
+export { ToolOptionsPanel } from './components/ui/controls/tool-options-panel'
 export { FloatingLevelSelector } from './components/ui/floating-level-selector'
 export { CATALOG_ITEMS } from './components/ui/item-catalog/catalog-items'
 // Item collections UI — used by the kind-owned ItemPanel in nodes/.
@@ -254,6 +262,10 @@ export {
   DropdownMenuSubTrigger,
   DropdownMenuTrigger,
 } from './components/ui/primitives/dropdown-menu'
+export {
+  ShortcutToken,
+  shortcutDisplayValue,
+} from './components/ui/primitives/shortcut-token'
 export { useSidebarStore } from './components/ui/primitives/sidebar'
 export { Slider } from './components/ui/primitives/slider'
 export { SceneLoader } from './components/ui/scene-loader'
@@ -333,6 +345,12 @@ export {
   resolveCeilingPlanPointSnap,
 } from './lib/ceiling-plan-snap'
 export { EDITOR_LAYER } from './lib/constants'
+export type { ContextualShortcutHint } from './lib/contextual-help'
+export {
+  CONTEXTUAL_HELP_NODE_EXTENSION_KEY,
+  type ContextualHelpNodeExtension,
+  getContextualHelpNodeExtension,
+} from './lib/contextual-help-extension'
 // Helper libs used by the kind-owned roof / stair / elevator panels.
 export {
   CONTINUATION_PROFILES,
@@ -341,6 +359,7 @@ export {
   continuationContextOf,
   nextContinuation,
 } from './lib/continuation'
+export { createEditorApi } from './lib/editor-api'
 export {
   clearStructuralElevationGuide,
   collectElevationSnapTargets,
@@ -348,6 +367,7 @@ export {
   type ElevationGuideSource,
   type ElevationSnapMatch,
   type ElevationSnapTarget,
+  publishResolvedElevationGuide,
   publishStructuralElevationGuide,
   resolveElevationSnapMatch,
   resolveStructuralElevationSnap,
@@ -358,6 +378,7 @@ export {
   resolveElevatorSupportLevelId,
   resolveElevatorSupportY,
 } from './lib/elevator-support'
+export { getFloatingMenuScale } from './lib/floating-menu-scale'
 // Floor-plan stair helpers — the cumulative-transform walk
 // (`computeFloorplanStairSegmentTransforms`) and the rich segment-entry
 // builder (`buildFloorplanStairEntry`) used by the kind-owned stair
@@ -382,6 +403,10 @@ export type {
   FloorplanAnnotationCategory,
   FloorplanAnnotationVisibility,
 } from './lib/floorplan/annotation-visibility'
+export {
+  exportFloorplanPdf,
+  type FloorplanExportScope,
+} from './lib/floorplan/floorplan-export'
 export {
   createFloorplanContextExtensions,
   FLOORPLAN_CONTEXT_EXTENSION_KEY,
@@ -407,8 +432,16 @@ export {
   type FloorplanMode,
   isFloorplanToolAvailableInMode,
 } from './lib/floorplan/floorplan-mode'
-export { commitFreshPlacementSubtree } from './lib/fresh-planar-placement'
-export { exportSceneToGlb } from './lib/glb-export'
+export {
+  commitFreshPlacementSubtree,
+  createFreshPlacementSubtree,
+} from './lib/fresh-planar-placement'
+export { exportSceneToGlb, type GlbExportOptions } from './lib/glb-export'
+export {
+  type EditorGridEvent,
+  type GridEventScreenProjection,
+  getGridEventScreenProjection,
+} from './lib/grid-event-presentation'
 export {
   getHistoryCommandState,
   type HistoryCommandDelegate,
@@ -419,15 +452,27 @@ export {
   runUndo,
   subscribeHistoryCommandState,
 } from './lib/history'
+export {
+  type EditorHostTreeChildren,
+  type EditorHostTreeChildrenProps,
+  editorHostTreeChildrenRegistry,
+  registerEditorHostTreeChildren,
+} from './lib/host-tree-children'
+export {
+  DRAFTING_SURFACE_EXTENSION_KEY,
+  type DraftingSurfaceExtension,
+} from './lib/interaction/registered-drafting'
 export {
   boundaryReshapeScope,
   curveReshapeScope,
   endpointReshapeScope,
   holeEditScope,
+  meshEditScope,
   movingNodeOf,
   scopeNodeId,
 } from './lib/interaction/scope'
 export {
+  type ActivePaintMaterial,
   buildResetSurfaceMaterialUpdates,
   buildRoofSurfaceMaterialPatch,
   buildSingleSurfaceMaterialPatch,
@@ -446,6 +491,14 @@ export {
   measurementPolygonLabelAnchor,
   triangulateMeasurementPolygon,
 } from './lib/measurement-label'
+export {
+  type LingoUnitSpec,
+  lingoUnitSpec,
+  type MeasurementHintOptions,
+  measurementHint,
+  type ParseMeasurementOptions,
+  parseMeasurement,
+} from './lib/measurement-parser'
 export {
   buildMeasurementAngleArcPoints,
   cubicMetersToVolumeUnit,
@@ -467,6 +520,12 @@ export {
   metersToLinearUnit,
   squareMetersToAreaUnit,
 } from './lib/measurements'
+export type {
+  ModelExport,
+  ModelExportArtifact,
+  ModelExportFormat,
+  ModelExportOptions,
+} from './lib/model-export'
 export { consumePlacementDragRelease } from './lib/placement-drag-release'
 export {
   addFreshPlacementMetadata,
@@ -510,6 +569,13 @@ export {
   type SlabPlanSnapInput,
   type SlabPlanSnapResult,
 } from './lib/slab-plan-snap'
+export {
+  getSnappingModeLabel,
+  resolveSnapFlags,
+  type SnapContext,
+  type SnapFlags,
+  type SnappingMode,
+} from './lib/snapping-mode'
 export { duplicateStairSubtree } from './lib/stair-duplication'
 export {
   getBuildingLevelsForLevel,
@@ -533,6 +599,7 @@ export {
   resolveFlattenTarget,
   sculptFieldForSite,
 } from './lib/terrain-sculpt'
+export { exportSceneToUsdz, type UsdzExportOptions } from './lib/usdz-export'
 // `cn` (twMerge + clsx) — used by kind-owned panels in `@pascal-app/
 // nodes` so they don't need their own copy / their own tailwind-merge
 // dependency.
@@ -548,6 +615,7 @@ export {
 export { subscribeCameraPose } from './store/camera-pose-store'
 export { default as useAlignmentGuides } from './store/use-alignment-guides'
 export { default as useAudio } from './store/use-audio'
+export { type CameraHintAction, useCameraHintFocus } from './store/use-camera-hint-focus'
 export { type CommandAction, useCommandRegistry } from './store/use-command-registry'
 export {
   DRAWING_TYPE_OPTIONS,
@@ -556,17 +624,24 @@ export {
 export type {
   CaptureMode,
   FloorplanSelectionTool,
+  Mode,
   SnapshotCropMode,
   SnapshotStandardAspect,
   SplitOrientation,
+  StructureTool,
   Tool,
   ToolDefaults,
+  ToolMode,
   ViewMode,
   WorkspaceMode,
 } from './store/use-editor'
 export {
+  armMaterialPaint,
+  armToolMode,
   default as useEditor,
   getActiveContinuationContext,
+  getActiveSnapContext,
+  getActiveSnappingMode,
   getContinuation,
   isAlignmentGuideActive,
   isAngleSnapActive,
@@ -623,7 +698,10 @@ export {
   type PathDraftPoint,
   usePathDraftPreview,
 } from './store/use-path-draft-preview'
-export { default as usePlacementPreview } from './store/use-placement-preview'
+export {
+  default as usePlacementPreview,
+  type PlacementPreviewDimension,
+} from './store/use-placement-preview'
 export {
   activateQuickMeasurementHudSource,
   clearQuickMeasurementHudSource,

package/src/lib/active-placement-surface.test.ts

@@ -4,6 +4,7 @@ import {
   clearPlacementSurface,
   getPlacementSurface,
   publishPlacementSurface,
+  usesOrientedPlacementPlane,
 } from './active-placement-surface'
 
 describe('active placement surface', () => {
@@ -21,4 +22,19 @@ describe('active placement surface', () => {
 
     expect(getPlacementSurface()?.projection).toBe('surface')
   })
+
+  test('copies a stable lattice anchor when one is provided', () => {
+    publishPlacementSurface(
+      new Vector3(4, 2, 3),
+      new Vector3(0, 0, 1),
+      'surface',
+      new Vector3(1, 2, 3),
+    )
+
+    expect(getPlacementSurface()?.anchor?.toArray()).toEqual([1, 2, 3])
+  })
+
+  test('orients the grid to a sloped placement surface', () => {
+    expect(usesOrientedPlacementPlane(new Vector3(0, 0.6, 0.8))).toBe(true)
+  })
 })

package/src/lib/active-placement-surface.ts

@@ -11,12 +11,15 @@ import { Vector3 } from 'three'
 // readers must consume them within the same frame.
 export type PlacementSurface = {
   point: Vector3
+  /** Optional stable origin for the construction lattice. */
+  anchor?: Vector3
   normal: Vector3
   projection: 'surface' | 'fixed-plane'
 }
 
 const surface: PlacementSurface = {
   point: new Vector3(),
+  anchor: new Vector3(),
   normal: new Vector3(0, 1, 0),
   projection: 'surface',
 }
@@ -26,8 +29,15 @@ export function publishPlacementSurface(
   point: Vector3,
   normal: Vector3,
   projection: PlacementSurface['projection'] = 'surface',
+  anchor?: Vector3,
 ): void {
   surface.point.copy(point)
+  if (anchor) {
+    surface.anchor ??= new Vector3()
+    surface.anchor.copy(anchor)
+  } else {
+    surface.anchor = undefined
+  }
   surface.normal.copy(normal)
   surface.projection = projection
   active = true
@@ -40,3 +50,7 @@ export function clearPlacementSurface(): void {
 export function getPlacementSurface(): PlacementSurface | null {
   return active ? surface : null
 }
+
+export function usesOrientedPlacementPlane(normal: Vector3): boolean {
+  return Math.abs(normal.y) < 0.95
+}

package/src/lib/ceiling-surface-raycast.test.ts

@@ -0,0 +1,64 @@
+import { describe, expect, test } from 'bun:test'
+import {
+  BackSide,
+  Mesh,
+  MeshBasicMaterial,
+  Path,
+  Raycaster,
+  Shape,
+  ShapeGeometry,
+  Vector3,
+} from 'three'
+import { raycastCeilingUnderside } from './ceiling-surface-raycast'
+
+function ceilingMesh() {
+  const shape = new Shape()
+  shape.moveTo(-2, -2)
+  shape.lineTo(2, -2)
+  shape.lineTo(2, 2)
+  shape.lineTo(-2, 2)
+  shape.closePath()
+  const hole = new Path()
+  hole.moveTo(-0.5, -0.5)
+  hole.lineTo(-0.5, 0.5)
+  hole.lineTo(0.5, 0.5)
+  hole.lineTo(0.5, -0.5)
+  hole.closePath()
+  shape.holes.push(hole)
+  const geometry = new ShapeGeometry(shape).rotateX(-Math.PI / 2)
+  const mesh = new Mesh(geometry, new MeshBasicMaterial({ side: BackSide }))
+  mesh.position.y = 3
+  mesh.updateMatrixWorld(true)
+  return mesh
+}
+
+describe('ceiling drawing surfaces', () => {
+  test('lets drawing pass through the transparent top while picking the underside', () => {
+    const ceiling = ceilingMesh()
+    for (const side of [-1, 1]) {
+      const ray = new Raycaster(new Vector3(1, 3 + side * 2, 0), new Vector3(0, -side, 0))
+      const hit = raycastCeilingUnderside(ray, ceiling)[0]
+      if (side > 0) {
+        expect(hit).toBeUndefined()
+      } else {
+        expect(hit?.point.y).toBeCloseTo(3)
+        expect(hit?.object).toBe(ceiling)
+      }
+      expect(ceiling.material.side).toBe(BackSide)
+    }
+    ceiling.geometry.dispose()
+    ceiling.material.dispose()
+  })
+
+  test('respects ceiling holes and the polygon boundary from either side', () => {
+    const ceiling = ceilingMesh()
+    for (const side of [-1, 1]) {
+      for (const x of [0, 3]) {
+        const ray = new Raycaster(new Vector3(x, 3 + side * 2, 0), new Vector3(0, -side, 0))
+        expect(raycastCeilingUnderside(ray, ceiling)).toHaveLength(0)
+      }
+    }
+    ceiling.geometry.dispose()
+    ceiling.material.dispose()
+  })
+})

package/src/lib/ceiling-surface-raycast.ts

@@ -0,0 +1,12 @@
+import { BackSide, Mesh, MeshBasicMaterial, type Object3D, type Raycaster } from 'three'
+
+const pickingMaterial = new MeshBasicMaterial({ side: BackSide })
+
+export function raycastCeilingUnderside(raycaster: Raycaster, ceiling: Object3D) {
+  if (!(ceiling instanceof Mesh)) return []
+  // Ignore the transparent top and its grid overlay so drawing can reach surfaces below.
+  const proxy = new Mesh(ceiling.geometry, pickingMaterial)
+  proxy.matrixWorld.copy(ceiling.matrixWorld)
+  proxy.layers.mask = ceiling.layers.mask
+  return raycaster.intersectObject(proxy, false).map((hit) => ({ ...hit, object: ceiling }))
+}

package/src/lib/contextual-help-extension.ts

@@ -0,0 +1,17 @@
+import type { NodeDefinition } from '@pascal-app/core'
+import type { ContextualShortcutHint } from './contextual-help'
+
+export const CONTEXTUAL_HELP_NODE_EXTENSION_KEY = 'pascal:editor/contextual-help'
+
+export type ContextualHelpNodeExtension = {
+  subscribe: (onChange: () => void) => () => void
+  getHints: (nodeId: string) => ContextualShortcutHint[]
+}
+
+export function getContextualHelpNodeExtension(
+  definition: NodeDefinition<any> | undefined,
+): ContextualHelpNodeExtension | undefined {
+  return definition?.extensions?.[CONTEXTUAL_HELP_NODE_EXTENSION_KEY] as
+    | ContextualHelpNodeExtension
+    | undefined
+}

package/src/lib/continuation.test.ts

@@ -0,0 +1,11 @@
+import { describe, expect, test } from 'bun:test'
+import { CONTINUATION_PROFILES, continuationContextOf, nextContinuation } from './continuation'
+
+describe('canopy continuation', () => {
+  test('maps the canopy tool to its own single and continuous profile', () => {
+    expect(continuationContextOf('lean-to-extension')).toBe('canopy')
+    expect(CONTINUATION_PROFILES.canopy.default).toBe('single')
+    expect(nextContinuation('canopy', 'single')).toBe('continuous')
+    expect(nextContinuation('canopy', 'continuous')).toBe('single')
+  })
+})

package/src/lib/continuation.ts

@@ -1,4 +1,4 @@
-export type ContinuationContext = 'wall' | 'fence' | 'point' | 'cabinet'
+export type ContinuationContext = 'wall' | 'fence' | 'point' | 'cabinet' | 'canopy'
 export type ContinuationMode = string
 
 export const CONTINUATION_PROFILES: Record<
@@ -42,6 +42,12 @@ export const CONTINUATION_PROFILES: Record<
     labels: { single: 'Single cabinet', continuous: 'Continuous run' },
     icons: { single: 'lucide:minus', continuous: 'lucide:waypoints' },
   },
+  canopy: {
+    options: ['single', 'continuous'],
+    default: 'single',
+    labels: { single: 'Single canopy', continuous: 'Continuous canopy' },
+    icons: { single: 'lucide:minus', continuous: 'lucide:waypoints' },
+  },
 }
 
 const POINT_KINDS = new Set(['item', 'door', 'window', 'shelf', 'column'])
@@ -60,5 +66,6 @@ export function continuationContextOf(kind: string): ContinuationContext | null
   if (kind === 'wall') return 'wall'
   if (kind === 'fence') return 'fence'
   if (kind === 'cabinet') return 'cabinet'
+  if (kind === 'lean-to-extension') return 'canopy'
   return POINT_KINDS.has(kind) ? 'point' : null
 }

package/src/lib/direct-manipulation.test.ts

@@ -9,9 +9,12 @@ import {
 import { z } from 'zod'
 import {
   canDirectMoveNode,
+  EDITOR_HANDLE_HIT_AREA_USER_DATA_KEY,
+  pointerEventHitsEditorHandle,
   resolveDirectManipulationNode,
   resolveDirectRotationDragDelta,
   resolveMoveActionNode,
+  shouldStartDirectMoveDrag,
   snapDirectRotationDelta,
 } from './direct-manipulation'
 
@@ -116,6 +119,91 @@ describe('canDirectMoveNode', () => {
   })
 })
 
+describe('shouldStartDirectMoveDrag', () => {
+  test('arms a plain drag for a kind that opts into direct dragging', () => {
+    expect(
+      shouldStartDirectMoveDrag({
+        allowPlainDrag: true,
+        commandModifier: false,
+        handleOwnsPointer: false,
+        nodeId: 'cabinet_existing',
+        selectedIds: [],
+      }),
+    ).toBe(true)
+  })
+
+  test('keeps modifier dragging limited to the sole selected node', () => {
+    expect(
+      shouldStartDirectMoveDrag({
+        allowPlainDrag: false,
+        commandModifier: true,
+        handleOwnsPointer: false,
+        nodeId: 'item_selected',
+        selectedIds: ['item_selected'],
+      }),
+    ).toBe(true)
+    expect(
+      shouldStartDirectMoveDrag({
+        allowPlainDrag: false,
+        commandModifier: true,
+        handleOwnsPointer: false,
+        nodeId: 'item_other',
+        selectedIds: ['item_selected'],
+      }),
+    ).toBe(false)
+  })
+
+  test('does not arm body dragging when a resize handle owns the pointer', () => {
+    expect(
+      shouldStartDirectMoveDrag({
+        allowPlainDrag: true,
+        commandModifier: false,
+        handleOwnsPointer: true,
+        nodeId: 'cabinet_selected',
+        selectedIds: ['cabinet_selected'],
+      }),
+    ).toBe(false)
+  })
+})
+
+describe('pointerEventHitsEditorHandle', () => {
+  test('keeps a visible resize handle from falling through to a nearer cabinet body', () => {
+    expect(
+      pointerEventHitsEditorHandle({
+        intersections: [
+          { object: { userData: {} } },
+          {
+            object: {
+              userData: { [EDITOR_HANDLE_HIT_AREA_USER_DATA_KEY]: true },
+            },
+          },
+        ],
+      }),
+    ).toBe(true)
+  })
+
+  test('recognises a handle when it is the nearest R3F intersection', () => {
+    expect(
+      pointerEventHitsEditorHandle({
+        intersections: [
+          {
+            object: {
+              userData: { [EDITOR_HANDLE_HIT_AREA_USER_DATA_KEY]: true },
+            },
+          },
+          { object: { userData: {} } },
+        ],
+      }),
+    ).toBe(true)
+  })
+
+  test('does not claim ordinary scene intersections', () => {
+    expect(pointerEventHitsEditorHandle({ intersections: [{ object: { userData: {} } }] })).toBe(
+      false,
+    )
+  })
+})
+
 describe('resolveDirectManipulationNode', () => {
   test('routes proxied members to their assembly for direct transforms', () => {
     const group = {
@@ -272,4 +360,48 @@ describe('resolveMoveActionNode', () => {
       }),
     ).toBe(child)
   })
+
+  test('routes a parent-frame child move to a rotatable assembly parent', () => {
+    const parentKind = 'move-action-rotatable-parent-kind-test'
+    const childKind = 'move-action-rotatable-child-kind-test'
+    registerTestDefinition(parentKind, {
+      capabilities: { rotatable: { axes: ['y'], snapAngles: [Math.PI / 4] } },
+    })
+    registerTestDefinition(childKind, {
+      capabilities: {
+        movable: {
+          axes: ['x', 'z'],
+          gridSnap: true,
+          parentFrame: {
+            resolveParent: (node: AnyNode, nodes: Readonly<Record<string, AnyNode>>) =>
+              (node.parentId ? nodes[node.parentId] : null) ?? null,
+            parentRotationY: () => 0,
+            localToPlan: (_parent: AnyNode, local: readonly [number, number, number]) => [
+              local[0],
+              local[1],
+              local[2],
+            ],
+            planToLocal: (_parent: AnyNode, planX: number, localY: number, planZ: number) => [
+              planX,
+              localY,
+              planZ,
+            ],
+          },
+        },
+      },
+    })
+    const parent = { id: 'move_action_rotatable_run', type: parentKind } as unknown as AnyNode
+    const child = {
+      id: 'move_action_rotatable_module',
+      type: childKind,
+      parentId: parent.id,
+    } as unknown as AnyNode
+
+    expect(
+      resolveMoveActionNode(child, {
+        [parent.id]: parent,
+        [child.id]: child,
+      }),
+    ).toBe(parent)
+  })
 })

package/src/lib/direct-manipulation.ts

@@ -45,6 +45,25 @@ const BESPOKE_SELECTION_MOVE_KINDS = new Set([
   'liquid-line',
 ])
 
+export const EDITOR_HANDLE_HIT_AREA_USER_DATA_KEY = 'editorHandleHitArea'
+
+export function pointerEventHitsEditorHandle(event: unknown): boolean {
+  if (!event || typeof event !== 'object') return false
+  const intersections = (
+    event as {
+      intersections?: readonly {
+        object?: { userData?: Record<string, unknown> }
+      }[]
+    }
+  ).intersections
+  return (
+    intersections?.some(
+      (intersection) =>
+        intersection.object?.userData?.[EDITOR_HANDLE_HIT_AREA_USER_DATA_KEY] === true,
+    ) ?? false
+  )
+}
+
 export function canDirectMoveNode(node: AnyNode): boolean {
   // These MEP kinds own move through bespoke selection rigs (latch cubes,
   // directional arrows, grid-driven previews). Sending body drags/clicks
@@ -64,6 +83,24 @@ export function canDirectMoveNode(node: AnyNode): boolean {
   return isMovable(node)
 }
 
+export function shouldStartDirectMoveDrag({
+  allowPlainDrag,
+  commandModifier,
+  handleOwnsPointer,
+  nodeId,
+  selectedIds,
+}: {
+  allowPlainDrag: boolean
+  commandModifier: boolean
+  handleOwnsPointer: boolean
+  nodeId: string
+  selectedIds: readonly string[]
+}): boolean {
+  if (handleOwnsPointer) return false
+  if (commandModifier) return selectedIds.length === 1 && selectedIds[0] === nodeId
+  return allowPlainDrag && selectedIds.length < 2
+}
+
 export function resolveDirectManipulationNode(
   node: AnyNode,
   nodes: Readonly<Record<string, AnyNode | undefined>>,
@@ -80,7 +117,7 @@ export function resolveMoveActionNode(
 ): AnyNode {
   const parentFrame = nodeRegistry.get(node.type)?.capabilities?.movable?.parentFrame
   const parent = parentFrame?.resolveParent(node, nodes as Readonly<Record<string, AnyNode>>)
-  return parent?.type === node.type ? parent : node
+  return parent && (parent.type === node.type || canDirectRotateNode(parent)) ? parent : node
 }
 
 export function snapDirectRotationDelta(delta: number, free: boolean): number {

package/src/lib/editor-api.ts

@@ -1,6 +1,7 @@
-import type { AnyNode, EditorApi } from '@pascal-app/core'
+import { type AnyNode, type EditorApi, useScene } from '@pascal-app/core'
 import useEditor from '../store/use-editor'
 import useInteractionScope from '../store/use-interaction-scope'
+import { resolveDirectManipulationNode, resolveMoveActionNode } from './direct-manipulation'
 import {
   controlPointReshapeScope,
   endpointReshapeScope,
@@ -25,14 +26,16 @@ export function createEditorApi(): EditorApi {
       // (every concrete kind enumerated). Descriptors pass any node; the
       // cast lets registry-driven move kinds through without forcing a
       // schema-level type widening.
-      editor.setMovingNode(node as Parameters<typeof editor.setMovingNode>[0])
+      const target = resolveMoveActionNode(node, useScene.getState().nodes)
+      editor.setMovingNode(target as Parameters<typeof editor.setMovingNode>[0])
     },
     engageMoveDrag(node: AnyNode) {
       const editor = useEditor.getState()
       // Flag drag mode BEFORE mounting the move tool so the coordinator reads
       // it at setup and wires its commit-on-release listener.
       editor.setPlacementDragMode(true)
-      editor.setMovingNode(node as Parameters<typeof editor.setMovingNode>[0])
+      const target = resolveDirectManipulationNode(node, useScene.getState().nodes)
+      editor.setMovingNode(target as Parameters<typeof editor.setMovingNode>[0])
     },
     engageEndpointMove(node: AnyNode, endpoint: 'start' | 'end') {
       // Endpoint reshape is kind-agnostic: the scope carries the node id + which