Normalize root scene nodes and fix level duplication

packages/editor/src/components/ui/floating-level-selector.tsx

@@ -293,13 +293,21 @@ export function FloatingLevelSelector() {
 
   const handleDuplicateLevel = useCallback(
     (level: LevelNode, preset: LevelDuplicatePreset = 'everything') => {
-      const { createOps, newLevelId } = buildLevelDuplicateCreateOps({
+      const { createOps, newLevelId, shiftedLevels } = buildLevelDuplicateCreateOps({
         nodes: useScene.getState().nodes,
         level,
         levels,
         preset,
       })
 
+      if (shiftedLevels.length > 0) {
+        updateNodes(
+          shiftedLevels.map((shiftedLevel) => ({
+            id: shiftedLevel.id as AnyNodeId,
+            data: { level: shiftedLevel.level } as Partial<AnyNode>,
+          })),
+        )
+      }
       createNodes(createOps)
 
       setSelection({
@@ -307,7 +315,7 @@ export function FloatingLevelSelector() {
         levelId: newLevelId as LevelNode['id'],
       })
     },
-    [createNodes, levels, resolvedBuildingId, setSelection],
+    [createNodes, levels, resolvedBuildingId, setSelection, updateNodes],
   )
 
   if (levels.length === 0) return null

packages/editor/src/components/ui/sidebar/panels/site-panel/index.tsx

@@ -587,10 +587,19 @@ const LevelItem = memo(function LevelItem({
   const [duplicateDialogOpen, setDuplicateDialogOpen] = useState(false)
   const [isEditing, setIsEditing] = useState(false)
   const createNodes = useScene((s) => s.createNodes)
+  const updateNodes = useScene((s) => s.updateNodes)
   const itemRef = useRef<HTMLDivElement>(null)
   const isSelected = selectedLevelId === level.id
   const canDeleteLevel = level.level !== 0
   const [isExpanded, setIsExpanded] = useState(isSelected)
+  const buildingId =
+    typeof level.parentId === 'string' && level.parentId.startsWith('building_')
+      ? (level.parentId as BuildingNode['id'])
+      : undefined
+
+  const selectLevel = (levelId: LevelNode['id']) => {
+    setSelection(buildingId ? { buildingId, levelId } : { levelId })
+  }
 
   useEffect(() => {
     setIsExpanded(isSelected)
@@ -603,7 +612,7 @@ const LevelItem = memo(function LevelItem({
   }, [isSelected])
 
   const handleSelect = () => {
-    setSelection({ levelId: level.id })
+    selectLevel(level.id)
   }
 
   const handleDoubleClick = () => {
@@ -611,15 +620,23 @@ const LevelItem = memo(function LevelItem({
   }
 
   const handleDuplicateLevel = (preset: LevelDuplicatePreset = 'everything') => {
-    const { createOps, newLevelId } = buildLevelDuplicateCreateOps({
+    const { createOps, newLevelId, shiftedLevels } = buildLevelDuplicateCreateOps({
       nodes: useScene.getState().nodes,
       level,
       levels,
       preset,
     })
 
+    if (shiftedLevels.length > 0) {
+      updateNodes(
+        shiftedLevels.map((shiftedLevel) => ({
+          id: shiftedLevel.id as AnyNodeId,
+          data: { level: shiftedLevel.level } as Partial<AnyNode>,
+        })),
+      )
+    }
     createNodes(createOps)
-    setSelection({ levelId: newLevelId })
+    selectLevel(newLevelId as LevelNode['id'])
     setDuplicateDialogOpen(false)
   }
 
@@ -664,7 +681,7 @@ const LevelItem = memo(function LevelItem({
               if (isSelected) {
                 setIsExpanded(!isExpanded)
               } else {
-                setSelection({ levelId: level.id })
+                selectLevel(level.id)
               }
             }}
           >
@@ -869,7 +886,7 @@ const LevelsSection = memo(function LevelsSection({
       parentId: building.id,
     })
     createNode(newLevel, building.id)
-    setSelection({ levelId: newLevel.id })
+    setSelection({ buildingId: building.id, levelId: newLevel.id })
   }
 
   return (

packages/editor/src/lib/level-duplication.test.ts

@@ -0,0 +1,41 @@
+// @ts-expect-error — bun:test is provided by the Bun runtime; editor does not
+// depend on @types/bun so the import type is unresolved at compile time.
+import { describe, expect, test } from 'bun:test'
+import {
+  type AnyNode,
+  type AnyNodeId,
+  BuildingNode,
+  LevelNode,
+  WallNode,
+} from '@pascal-app/core/schema'
+import { buildLevelDuplicateCreateOps } from './level-duplication'
+
+describe('buildLevelDuplicateCreateOps', () => {
+  test('parents a duplicated bootstrap level back to its building', () => {
+    const level = LevelNode.parse({ level: 0, children: [] })
+    const building = BuildingNode.parse({ children: [level.id] })
+    const wall = WallNode.parse({
+      parentId: level.id,
+      start: [0, 0],
+      end: [4, 0],
+    })
+    const sourceLevel = { ...level, children: [wall.id] } satisfies LevelNode
+    const nodes = {
+      [building.id]: building,
+      [sourceLevel.id]: sourceLevel,
+      [wall.id]: wall,
+    } as Record<AnyNodeId, AnyNode>
+
+    const { createOps, newLevelId } = buildLevelDuplicateCreateOps({
+      nodes,
+      level: sourceLevel,
+      levels: [sourceLevel],
+      preset: 'everything',
+    })
+
+    const levelCreateOp = createOps.find((op) => op.node.id === newLevelId)
+
+    expect(sourceLevel.parentId).toBeNull()
+    expect(levelCreateOp?.parentId).toBe(building.id)
+  })
+})

packages/editor/src/lib/level-duplication.ts

@@ -1,5 +1,5 @@
-import type { AnyNode, AnyNodeId, LevelNode } from '@pascal-app/core'
-import { cloneLevelSubtree } from '@pascal-app/core'
+import { cloneLevelSubtree } from '@pascal-app/core/clone-scene-graph'
+import type { AnyNode, AnyNodeId, LevelNode } from '@pascal-app/core/schema'
 
 export type LevelDuplicatePreset =
   | 'everything'
@@ -79,6 +79,20 @@ function stripMaterials(node: AnyNode): AnyNode {
   return next as AnyNode
 }
 
+function findLevelBuildingId(nodes: Record<AnyNodeId, AnyNode>, levelId: AnyNodeId) {
+  for (const node of Object.values(nodes)) {
+    if (node.type !== 'building' || !('children' in node) || !Array.isArray(node.children)) {
+      continue
+    }
+
+    if ((node.children as AnyNodeId[]).includes(levelId)) {
+      return node.id as AnyNodeId
+    }
+  }
+
+  return undefined
+}
+
 export function buildLevelDuplicateCreateOps({
   nodes,
   level,
@@ -91,7 +105,15 @@ export function buildLevelDuplicateCreateOps({
   preset: LevelDuplicatePreset
 }) {
   const { clonedNodes, newLevelId } = cloneLevelSubtree(nodes, level.id)
-  const nextLevelNumber = Math.max(...levels.map((entry) => entry.level), -1) + 1
+  const parentBuildingId =
+    (level.parentId as AnyNodeId | null) ?? findLevelBuildingId(nodes, level.id)
+  const nextLevelNumber = level.level + 1
+  const shiftedLevels = levels
+    .filter((entry) => entry.id !== level.id && entry.level >= nextLevelNumber)
+    .map((entry) => ({
+      id: entry.id,
+      level: entry.level + 1,
+    }))
 
   const filteredNodes = clonedNodes
     .filter((node) => shouldKeepNode(node, preset))
@@ -119,8 +141,12 @@ export function buildLevelDuplicateCreateOps({
               level: nextLevelNumber,
             } as AnyNode)
           : node,
-      parentId: node.parentId as AnyNodeId | undefined,
+      parentId:
+        node.id === newLevelId
+          ? parentBuildingId
+          : ((node.parentId as AnyNodeId | null) ?? undefined),
     })),
     newLevelId,
+    shiftedLevels,
   }
 }