@pascal-app/editor 1.0.1 → 1.0.3

package/src/hooks/use-keyboard.ts

@@ -9,7 +9,6 @@ import {
 } from '@pascal-app/core'
 import { cancelPerfAction, markPerfAction, useViewer } from '@pascal-app/viewer'
 import { useEffect } from 'react'
-import { Vector3 } from 'three'
 import {
   cutSelectionToEditorClipboard,
   deleteSelection,
@@ -18,9 +17,9 @@ import {
 import {
   classifyParticipant,
   collectParticipants,
-  computeGroupBox,
-  expandToComponent,
+  groupPlanBounds,
   levelFrame,
+  planBoundsCenter,
   rotateGroupPatches,
 } from '../components/editor/group-transform-shared'
 import { steppedRotation } from '../components/tools/item/placement-math'
@@ -36,7 +35,10 @@ import { leaveUnitFocus } from '../lib/units'
 import { toggleWindowOpenState } from '../lib/window-interaction'
 import useDeleteConfirmation from '../store/use-delete-confirmation'
 import useEditor, { getActiveContinuationContext, getActiveSnapContext } from '../store/use-editor'
-import useInteractionScope, { getMovingNode } from '../store/use-interaction-scope'
+import useInteractionScope, {
+  getMovingNode,
+  isInteractionSubtreeDraft,
+} from '../store/use-interaction-scope'
 import { groupCurrentSelection, ungroupCurrentSelection } from '../store/use-session-groups'
 
 // References (guide/scan) are selected via `useEditor.selectedReferenceId`, not
@@ -66,27 +68,20 @@ function rotateGroupSelection(direction: 1 | -1): boolean {
     (id) => classifyParticipant(nodes[id as AnyNodeId], levelId, nodes) !== null,
   )
   if (participantIds.length === 0) return false
-  const fullIds = expandToComponent(participantIds, nodes, levelId)
-  const { starts, links } = collectParticipants(fullIds, nodes, levelId)
+  const { starts, links } = collectParticipants(participantIds, nodes, levelId)
   if (starts.length === 0) return false
 
-  // Same pivot as the 3D gizmo: the selection's world bbox center, converted
-  // into the level frame before orbiting placements (a rotated building would
-  // otherwise displace the centre).
-  const box = computeGroupBox(fullIds)
-  if (!box) return false
-  const worldCenter = new Vector3(
-    (box.min.x + box.max.x) / 2,
-    box.min.y,
-    (box.min.z + box.max.z) / 2,
-  )
-  const localCenter = worldCenter.applyMatrix4(levelFrame(levelId).inverse)
+  // Same pivot as the dashed boxes and the rotate gizmo: the selection's box
+  // centre in the level frame.
+  const bounds = groupPlanBounds(starts, levelFrame(levelId).inverse)
+  if (!bounds) return false
+  const [pivotX, pivotZ] = planBoundsCenter(bounds)
 
   // R (+45° yaw) orbits by -45° in the atan2 x→z sense: yaw = rotation - delta
   // (see rotateGroupPatches), so keyboard direction matches the single-node
   // steppedRotation sense.
   const delta = -direction * (Math.PI / 4)
-  const patches = rotateGroupPatches(starts, links, { x: localCenter.x, z: localCenter.z }, delta)
+  const patches = rotateGroupPatches(starts, links, { x: pivotX, z: pivotZ }, delta)
   // Space detection stays out: a rigid rotation of existing walls must not
   // re-create the room's auto floors/ceilings at the new bearing.
   pauseSpaceDetection()
@@ -116,7 +111,13 @@ const exitToSelectAfterUnconsumedCancel = () => {
   const currentPhase = useEditor.getState().phase
   const currentStructureLayer = useEditor.getState().structureLayer
 
-  useInteractionScope.getState().endIf((sc) => sc.kind === 'reshaping' && sc.reshape === 'hole')
+  useInteractionScope
+    .getState()
+    .endIf(
+      (sc) =>
+        (sc.kind === 'placing' && isInteractionSubtreeDraft()) ||
+        (sc.kind === 'reshaping' && sc.reshape === 'hole'),
+    )
 
   // From zone mode, return to structure select
   if (currentPhase === 'structure' && currentStructureLayer === 'zones') {
@@ -134,6 +135,20 @@ const exitToSelectAfterUnconsumedCancel = () => {
   useEditor.getState().setSelectedReferenceId(null)
 }
 
+// Cancel the active editor action with the same consume-or-exit semantics as
+// Escape. Spatial inputs use this instead of unconditionally selecting the
+// Select tool, so multi-step tools can keep their tool active after clearing
+// the current draft.
+export const cancelActiveTool = () => {
+  _toolCancelConsumed = false
+  emitter.emit('tool:cancel')
+  if (!_toolCancelConsumed) {
+    if (leaveUnitFocus()) useEditor.getState().armToolMode({ mode: 'select' })
+    else exitToSelectAfterUnconsumedCancel()
+  }
+  return _toolCancelConsumed
+}
+
 // ⌘Z pressed mid-interaction (moving a node, drawing a wall, mid-placement…)
 // reads as "abort this action", not history undo — behave exactly like Escape
 // and report whether anything was in flight so the undo/redo arms know to
@@ -176,7 +191,8 @@ export const runHistoryShortcut = (direction: 'undo' | 'redo') => {
   return true
 }
 
-export const isToolOwnedRotation = () => {
+/** Whether an armed tool owns the rotation key (`R` or `T`) instead of the selection. */
+export const isToolOwnedRotation = (key: 'r' | 't' = 'r') => {
   const editor = useEditor.getState()
   const moving = getMovingNode()
   if (
@@ -196,7 +212,10 @@ export const isToolOwnedRotation = () => {
       // exist. Without this check, selecting an existing item in the 2D plan
       // while the item tool is armed silently drops the global rotate key.
       (editor.tool === 'item' && editor.selectedItem !== null) ||
-      editor.tool === 'lean-to-extension')
+      editor.tool === 'lean-to-extension' ||
+      // R toggles the wall tool between line and rectangle drawing; T stays
+      // the selection's.
+      (editor.tool === 'wall' && key === 'r'))
   )
 }
 
@@ -385,15 +404,9 @@ export const useKeyboard = ({
           return
         }
 
-        _toolCancelConsumed = false
-        emitter.emit('tool:cancel')
-
         // Only switch to select mode if no tool had an active mid-action to cancel.
         // (e.g. mid-wall draw or mid-slab polygon should only cancel the action, not exit the tool)
-        if (!_toolCancelConsumed) {
-          if (leaveUnitFocus()) useEditor.getState().armToolMode({ mode: 'select' })
-          else exitToSelectAfterUnconsumedCancel()
-        }
+        cancelActiveTool()
       } else if (e.key === '1' && !e.metaKey && !e.ctrlKey) {
         e.preventDefault()
         useEditor.getState().setPhase('site')
@@ -619,7 +632,7 @@ export const useKeyboard = ({
       } else if (
         (e.key === 't' || e.key === 'T') &&
         !isVersionPreviewMode &&
-        !isToolOwnedRotation() &&
+        !isToolOwnedRotation('t') &&
         canRunGlobalRotationShortcut()
       ) {
         // Rotate selected node counter-clockwise

package/src/index.tsx

@@ -49,7 +49,7 @@ export { FloatingActionMenu as FloatingMenu } from './components/editor/floating
 // camera controls via the `useViewer.inputDragging` / `useEditor.movingNode`
 // flags. Tools place onto `useViewer.selection.levelId`, so the host must set a
 // building + level selection first.
-export { Grid } from './components/editor/grid'
+export { EDITOR_GRID_INPUT_NAME, Grid } from './components/editor/grid'
 export {
   DimensionPill,
   type DimensionPillPart,
@@ -79,12 +79,18 @@ export {
   useInvisibleHitAreaMaterial,
 } from './components/editor/node-arrow-handles'
 export { QuickMeasurementCard } from './components/editor/quick-measurement-card'
+export { SelectionManager } from './components/editor/selection-manager'
 export {
   type SnapshotCameraData,
   ThumbnailGenerator,
 } from './components/editor/thumbnail-generator'
+export { WallMoveSideHandles } from './components/editor/wall-move-side-handles'
 export { useFloorplanRender } from './components/editor-2d/floorplan-render-context'
 export { FloorplanDimensionRenderer } from './components/editor-2d/renderers/floorplan-dimension-renderer'
+export {
+  type DraftWallMeasurement,
+  FloorplanDraftWallMeasurement,
+} from './components/editor-2d/renderers/floorplan-draft-wall-measurement'
 export { FloorplanGeometryRenderer } from './components/editor-2d/renderers/floorplan-geometry-renderer'
 export {
   FloorplanNodePreview,
@@ -140,6 +146,10 @@ export {
 export { MoveRegistryNodeTool } from './components/tools/registry/move-registry-node-tool'
 export { useRegistryToolContext } from './components/tools/registry-tool-context'
 export { CursorSphere } from './components/tools/shared/cursor-sphere'
+export {
+  DRAFT_LABEL_Y_OFFSET,
+  DraftMeasurementLabel,
+} from './components/tools/shared/draft-measurement-label'
 export { DragBoundingBox } from './components/tools/shared/drag-bounding-box'
 export { getFloorStackPreviewPosition } from './components/tools/shared/floor-stack-preview'
 export { useFreshPlacementVisibility } from './components/tools/shared/fresh-placement-visibility'
@@ -221,6 +231,7 @@ export {
   CameraActions as ToolbarRight,
   CameraActions as ViewerToolbarRight,
 } from './components/ui/action-menu/camera-actions'
+export { furnishTools } from './components/ui/action-menu/furnish-tools'
 export {
   ViewToggles as ToolbarLeft,
   ViewToggles as ViewerToolbarLeft,
@@ -247,6 +258,19 @@ 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/.
 export { CollectionsPopover } from './components/ui/panels/collections/collections-popover'
+export {
+  resolveHomogeneousSelection,
+  resolveUniqueSelectionIds,
+} from './components/ui/panels/homogeneous-selection'
+export {
+  commitMultiNodeFields,
+  fieldVisibleForAll,
+  firstNumericFieldValue,
+  firstVec3FieldValue,
+  reduceFieldValue,
+  reduceHeightBoundMode,
+} from './components/ui/panels/multi-field-value'
+export { applyMultiHeightMode } from './components/ui/panels/multi-height-mode'
 // Phase 5 Stage E — kinds with bespoke editors (slab holes list,
 // ceiling height presets, etc.) use `parametrics.customPanel` to mount
 // a kind-owned panel and need PanelWrapper for the chrome.
@@ -269,6 +293,7 @@ export {
 } from './components/ui/primitives/shortcut-token'
 export { useSidebarStore } from './components/ui/primitives/sidebar'
 export { Slider } from './components/ui/primitives/slider'
+export { Tooltip, TooltipContent, TooltipTrigger } from './components/ui/primitives/tooltip'
 export { SceneLoader } from './components/ui/scene-loader'
 export type { ExtraPanel } from './components/ui/sidebar/icon-rail'
 export { ItemsPanel } from './components/ui/sidebar/panels/items-panel'
@@ -330,7 +355,7 @@ export type { SaveStatus } from './hooks/use-auto-save'
 // can express their affordances declaratively in their own folder.
 export { type UseDragActionArgs, useDragAction } from './hooks/use-drag-action'
 // Phase 5 Stage D — extras for kind-owned placement tools (FenceTool etc.).
-export { markToolCancelConsumed } from './hooks/use-keyboard'
+export { cancelActiveTool, markToolCancelConsumed } from './hooks/use-keyboard'
 export { useReducedMotion } from './hooks/use-reduced-motion'
 export { type Selection, useSelection } from './hooks/use-selection'
 export {
@@ -339,6 +364,11 @@ export {
   type PlacementSurface,
   publishPlacementSurface,
 } from './lib/active-placement-surface'
+export {
+  activateCatalogItem,
+  filterCatalogItems,
+  isCatalogItemSelected,
+} from './lib/catalog-panel-model'
 export {
   CEILING_ALIGNMENT_THRESHOLD_M,
   type CeilingPlanSnapInput,
@@ -361,6 +391,7 @@ export {
   continuationContextOf,
   nextContinuation,
 } from './lib/continuation'
+export { canDirectMoveNode } from './lib/direct-manipulation'
 export { createEditorApi } from './lib/editor-api'
 export {
   clearStructuralElevationGuide,
@@ -435,6 +466,7 @@ export {
   type FloorplanMode,
   isFloorplanToolAvailableInMode,
 } from './lib/floorplan/floorplan-mode'
+export { clientToPlan } from './lib/floorplan/plan-coords'
 export {
   commitFreshPlacementSubtree,
   createFreshPlacementSubtree,
@@ -474,6 +506,8 @@ export {
   movingNodeOf,
   scopeNodeId,
 } from './lib/interaction/scope'
+export { isEditableKeyboardTarget } from './lib/keyboard-pan'
+export { useMaterialCatalogModel } from './lib/material-catalog-model'
 export {
   type ActivePaintMaterial,
   buildResetSurfaceMaterialUpdates,
@@ -483,6 +517,7 @@ export {
   getActivePaintMaterialLabel,
   hasActivePaintMaterial,
 } from './lib/material-paint'
+export { useMaterialPaintPanelModel } from './lib/material-paint-panel-model'
 export {
   CREATABLE_MEASUREMENT_KINDS,
   type CreatableMeasurementKind,
@@ -529,6 +564,21 @@ export type {
   ModelExportFormat,
   ModelExportOptions,
 } from './lib/model-export'
+export {
+  cyclePaintScope,
+  type PaintHoverInfo,
+  type PaintScope,
+  paintScopeLabel,
+} from './lib/paint-scope'
+export {
+  getNodePanelModel,
+  type NodePanelModel,
+  PANEL_MODEL_EXTENSION,
+  type PanelAction,
+  type PanelRow,
+} from './lib/panel-rows'
+export { type PanelToolOption, usePanelToolHints } from './lib/panel-tool-options'
+export { commitParametricNodeFields } from './lib/parametric-node-update'
 export { consumePlacementDragRelease } from './lib/placement-drag-release'
 export {
   addFreshPlacementMetadata,
@@ -562,7 +612,7 @@ export { hasRoofFaceChildOverlap, type RoofWallHit, resolveRoofWallHit } from '.
 export type { SceneGraph } from './lib/scene'
 export { applySceneGraphToEditor } from './lib/scene'
 export { movementSfxStepKey } from './lib/sfx/movement-tick'
-export { triggerSFX } from './lib/sfx-bus'
+export { emitDeleteSFX, triggerSFX } from './lib/sfx-bus'
 export { playSFX, type SFXName, type SFXPlaybackOptions } from './lib/sfx-player'
 export {
   clearSlabSnapFeedback,
@@ -575,12 +625,14 @@ export {
   type SlabPlanSnapResult,
 } from './lib/slab-plan-snap'
 export {
+  cycleSnappingModeIn,
   getSnappingModeLabel,
   resolveSnapFlags,
   type SnapContext,
   type SnapFlags,
   type SnappingMode,
 } from './lib/snapping-mode'
+export { getSpatialPointerId, spatialPointerInput } from './lib/spatial-pointer-input'
 export { duplicateStairSubtree } from './lib/stair-duplication'
 export {
   getBuildingLevelsForLevel,
@@ -590,6 +642,7 @@ export {
   resolveStairPlacementLevelId,
   resolveStairToLevelId,
 } from './lib/stair-levels'
+export { surfaceAttachmentId, surfaceFramePose, updateSurfaceNode } from './lib/surface-attachment'
 export {
   clearSurfacePlanSnapFeedback,
   resolveSurfacePlanPointSnap,
@@ -597,14 +650,20 @@ export {
   type SurfacePlanSnapInput,
   type SurfacePlanSnapResult,
 } from './lib/surface-plan-snap'
+export { useTerrainPanelRows } from './lib/terrain-panel-model'
 export {
+  brushRadiusRange,
+  clipTerrainPatchToSite,
+  commitStroke,
   fieldExtentForSite,
   flattenSite,
   resetSiteTerrain,
   resolveFlattenTarget,
   sculptFieldForSite,
+  terrainPointInsideSite,
 } from './lib/terrain-sculpt'
 export { exportSceneToUsdz, type UsdzExportOptions } from './lib/usdz-export'
+export { useLinearDisplay } from './lib/use-linear-display'
 // `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.
@@ -652,6 +711,7 @@ export {
   isAngleSnapActive,
   isGridSnapActive,
   isMagneticSnapActive,
+  selectDefaultBuildingAndLevel,
 } from './store/use-editor'
 export { default as useFacingPose, type FacingPose } from './store/use-facing-pose'
 export { default as useFenceCurveDraft } from './store/use-fence-curve-draft'

package/src/lib/catalog-panel-model.ts

@@ -0,0 +1,39 @@
+import { useViewer } from '@pascal-app/viewer'
+import { CATALOG_ITEMS, type CatalogItem } from '../components/ui/item-catalog/catalog-items'
+import useEditor, { type CatalogCategory } from '../store/use-editor'
+
+export function filterCatalogItems({
+  category,
+  items = CATALOG_ITEMS,
+  search = '',
+  activePlacementTag,
+  activeFunctionalTag,
+  overrideItems,
+}: {
+  category?: CatalogCategory
+  items?: readonly CatalogItem[]
+  search?: string
+  activePlacementTag?: string | null
+  activeFunctionalTag?: string | null
+  overrideItems?: readonly CatalogItem[]
+}): readonly CatalogItem[] {
+  return (
+    overrideItems ??
+    items.filter((item) => {
+      if (!search && category && item.category !== category) return false
+      if (activePlacementTag && !item.tags?.includes(activePlacementTag)) return false
+      if (activeFunctionalTag && !item.tags?.includes(activeFunctionalTag)) return false
+      return !search || item.name.toLowerCase().includes(search.toLowerCase())
+    })
+  )
+}
+
+export function activateCatalogItem(item: CatalogItem) {
+  useViewer.getState().setSelection({ selectedIds: [], zoneId: null })
+  const editor = useEditor.getState()
+  editor.setSelectedItem(item)
+  editor.setTool(item.tool ?? 'item')
+  editor.setMode('build')
+}
+
+export { isCatalogItemSelected } from './catalog-selection'

package/src/lib/catalog-selection.test.ts

@@ -0,0 +1,27 @@
+import { test } from 'bun:test'
+import assert from 'node:assert/strict'
+import { isCatalogItemSelected } from './catalog-selection'
+
+test('no selection leaves every tile unhighlighted, including items without model URLs', () => {
+  for (const item of [{ id: 'chair' }, { id: 'cabinet' }]) {
+    assert.equal(isCatalogItemSelected(item, null), false)
+  }
+})
+
+test('only the chosen item is highlighted when model URLs are missing or shared', () => {
+  for (const src of [undefined, '/shared-model.glb']) {
+    const items = [
+      { id: 'first', src },
+      { id: 'second', src },
+    ]
+    assert.deepEqual(
+      items.map((item) => isCatalogItemSelected(item, items[1]!)),
+      [false, true],
+    )
+  }
+})
+
+test('selection follows identity across reloaded catalog objects', () => {
+  assert.equal(isCatalogItemSelected({ id: 'chair' }, { id: 'chair' }), true)
+  assert.equal(isCatalogItemSelected({ id: 'chair' }, { id: 'table' }), false)
+})

package/src/lib/catalog-selection.ts

@@ -0,0 +1,8 @@
+import type { CatalogItem } from '../components/ui/item-catalog/catalog-items'
+
+export function isCatalogItemSelected(
+  item: Pick<CatalogItem, 'id'>,
+  selected: Pick<CatalogItem, 'id'> | null,
+) {
+  return selected != null && item.id === selected.id
+}

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

@@ -1,5 +1,14 @@
 import { describe, expect, test } from 'bun:test'
-import { resolveSelectModeHelpHints } from './contextual-help'
+import { resolveRotateHandleHelpHints, resolveSelectModeHelpHints } from './contextual-help'
+
+test('rotation advertises Alt as the temporary free-rotation override', () => {
+  expect(resolveRotateHandleHelpHints(false)).toEqual([
+    { keys: ['Alt'], label: 'Hold to rotate freely', active: false },
+  ])
+  expect(resolveRotateHandleHelpHints(true)).toEqual([
+    { keys: ['Alt'], label: 'Rotating freely (no angle step)', active: true },
+  ])
+})
 
 describe('resolveSelectModeHelpHints', () => {
   test('stays hidden in idle select mode with no selection', () => {
@@ -117,4 +126,21 @@ describe('resolveSelectModeHelpHints', () => {
       },
     ])
   })
+
+  test('shows the single-side radius hint for rounded openings', () => {
+    expect(
+      resolveSelectModeHelpHints({
+        selectedCount: 1,
+        hasMovableSelection: true,
+        hasRotatableSelection: false,
+        hasOpeningRadiusSelection: true,
+        commandPressed: false,
+        shiftPressed: false,
+      }),
+    ).toContainEqual({
+      keys: ['Shift'],
+      label: 'Adjust one side’s corner radius',
+      active: false,
+    })
+  })
 })

package/src/lib/contextual-help.ts

@@ -11,8 +11,8 @@ export type ContextualShortcutHint = {
 }
 
 // `activeHandleDrag.label` value a rotate gizmo sets while dragging, so the
-// contextual HUD can surface the Shift = free-rotation toggle for the duration
-// (mirrors how wall drafting advertises Shift). Distinct from resize handles,
+// contextual HUD can surface the rotation snapping mode for the duration.
+// Distinct from resize handles,
 // which route their own measurement label here.
 export const ROTATE_HANDLE_DRAG_LABEL = 'rotate-handle'
 
@@ -29,15 +29,12 @@ export const RESIZE_HANDLE_DRAG_LABEL = 'resize-handle'
 export const GROUP_MOVE_DRAG_LABEL = 'group-move-handle'
 export const GROUP_ROTATE_DRAG_LABEL = 'group-rotate-handle'
 
-// Hints shown while a rotate gizmo is mid-drag: Shift bypasses the angle step
-// (free rotation), the same toggle wall drafting exposes. `active` lights the
-// pill while Shift is held.
-export function resolveRotateHandleHelpHints(shiftPressed: boolean): ContextualShortcutHint[] {
+export function resolveRotateHandleHelpHints(altPressed: boolean): ContextualShortcutHint[] {
   return [
     {
-      keys: [SHIFT_KEY],
-      label: shiftPressed ? 'Rotating freely (no angle step)' : 'Hold to rotate freely',
-      active: shiftPressed,
+      keys: [ALT_KEY],
+      label: altPressed ? 'Rotating freely (no angle step)' : 'Hold to rotate freely',
+      active: altPressed,
     },
   ]
 }
@@ -46,6 +43,7 @@ export type SelectModeHelpContext = {
   selectedCount: number
   hasMovableSelection: boolean
   hasRotatableSelection: boolean
+  hasOpeningRadiusSelection?: boolean
   commandPressed: boolean
   shiftPressed: boolean
   // When a single MEP node is selected its in-world handle rig (click a dot to
@@ -67,6 +65,7 @@ export function resolveSelectModeHelpHints({
   selectedCount,
   hasMovableSelection,
   hasRotatableSelection,
+  hasOpeningRadiusSelection = false,
   commandPressed,
   shiftPressed,
   mepSelection = null,
@@ -142,6 +141,14 @@ export function resolveSelectModeHelpHints({
     })
   }
 
+  if (hasOpeningRadiusSelection) {
+    hints.push({
+      keys: [SHIFT_KEY],
+      label: 'Adjust one side’s corner radius',
+      active: shiftPressed,
+    })
+  }
+
   hints.push({
     keys: [[COMMAND_KEY, SHIFT_KEY], LEFT_CLICK],
     label: 'Add or remove objects from the selection',

package/src/lib/floorplan/floorplan-export.test.ts

@@ -774,7 +774,9 @@ describe('collectFloorplanGeometry', () => {
         'finished-faces',
         [enabledPluginId],
       )
-      expect(hiddenSite.map(({ id }) => id)).toEqual(['level_architecture'])
+      // A hidden Site hides only its own ground and boundary; the site-scoped
+      // nodes on it keep their own flag (see `hidesDescendants`).
+      expect(hiddenSite.map(({ id }) => id)).toEqual(['site_overlay', 'level_architecture'])
 
       const structure = collectFloorplanGeometry(
         nodes,

package/src/lib/floorplan/floorplan-extension.ts

@@ -57,13 +57,29 @@ export type FloorplanToolContext = {
 
 export type FloorplanNodeExtension<N extends AnyNode = AnyNode> = {
   tool?: () => Promise<{ default: ComponentType<FloorplanToolContext> }>
+  directDrag?: boolean
   availableModes?: readonly FloorplanToolMode[]
   preferredView?: '2d' | '3d'
   referencedSelectionAnnotationRole?: FloorplanAnnotationRole
   contextualDimensions?: (node: N, ctx: GeometryContext) => FloorplanGeometry | null
   actionMenu?: {
     canCurve?: (args: { node: N; nodes: Readonly<Record<AnyNodeId, AnyNode>> }) => boolean
+    /** Buttons the kind adds to the selection's action menu (2D and 3D); each decides its own visibility. */
+    actions?: () => Promise<{ default: ComponentType }>
   }
+  /**
+   * Plan layers mounted while a node of this kind is in a `reshaping` scope of
+   * that name (the 2D sibling of `def.affordanceTools[reshape]`).
+   */
+  reshapeLayers?: Record<string, () => Promise<{ default: ComponentType<FloorplanToolContext> }>>
+  /**
+   * Nodes the plan treats as one with this node when toggling it out of a
+   * selection (a slab and its ceiling share an outline and a click).
+   */
+  selectionCounterparts?: (args: {
+    node: N
+    nodes: Readonly<Record<AnyNodeId, AnyNode>>
+  }) => AnyNodeId[]
   schedule?: (args: {
     siblings: ReadonlyArray<N>
     nodes: Readonly<Record<string, AnyNode>>