@pascal-app/editor 1.1.0 → 1.1.2

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

@@ -2,7 +2,11 @@ import type {
   AnyNode,
   AnyNodeId,
   ConstructionDrawingType,
+  FloorplanAnnotationRole,
   FloorplanGeometry,
+  FloorplanMetricNotation,
+  FloorplanSchedule,
+  FloorplanWallDimensionFaces,
   GeometryContext,
   NodeDefinition,
   SceneApi,
@@ -11,57 +15,8 @@ import type { ComponentType } from 'react'
 import type { WallSelectionDimension } from '../room-push-dimensions'
 
 export const FLOORPLAN_NODE_EXTENSION_KEY = 'pascal:editor/floorplan'
-export const FLOORPLAN_GEOMETRY_METADATA_KEY = 'pascal:editor/floorplan'
-export const FLOORPLAN_CONTEXT_EXTENSION_KEY = 'pascal:editor/floorplan'
 
-export type FloorplanRenderPurpose = 'edit' | 'document'
-export type FloorplanMetricNotation = 'meters' | 'millimeters'
 export type FloorplanToolMode = 'default' | 'expert'
-/**
- * Display → Measure walls: which finished faces wall dimensions measure to —
- * the interior faces (ID, the room sizes), the exterior faces (OD, the
- * outside size) or both. Read by a selected wall's temporary dimensions in 2D
- * and 3D and by the Expert plan's automatic dimension strings.
- */
-export type FloorplanWallDimensionFaces = 'interior' | 'exterior' | 'both'
-export const DEFAULT_FLOORPLAN_WALL_DIMENSION_FACES: FloorplanWallDimensionFaces = 'both'
-
-export function normalizeFloorplanWallDimensionFaces(value: unknown): FloorplanWallDimensionFaces {
-  return value === 'interior' || value === 'exterior'
-    ? value
-    : DEFAULT_FLOORPLAN_WALL_DIMENSION_FACES
-}
-export type FloorplanAnnotationRole =
-  | 'automatic-dimension'
-  | 'contextual-dimension'
-  | 'manual-dimension'
-  | 'measurement'
-  | 'opening-mark'
-  | 'structural-grid'
-  | 'column-center'
-  | 'room-label'
-  /** A room's finish / ceiling-height lines — detail under the name, off in the clean plan. */
-  | 'room-detail'
-  /** The roof plan proper: outline, ridges, hips, slope arrows. Off over a floor plan unless asked. */
-  | 'roof-plan'
-  | 'roof-pitch'
-  | 'stair-annotation'
-
-export type FloorplanSchedule = {
-  id: string
-  title: string
-  columns: ReadonlyArray<{
-    key: string
-    label: string
-    weight?: number
-  }>
-  rows: ReadonlyArray<{
-    id: string
-    cells: Readonly<Record<string, string>>
-  }>
-  issues?: readonly string[]
-}
-
 export type FloorplanToolContext = {
   sceneApi: SceneApi
   activeLevelId: AnyNodeId | null
@@ -124,7 +79,6 @@ export type FloorplanNodeExtension<N extends AnyNode = AnyNode> = {
     /** A drafted sheet's schedule: marks match the sheet's tags. */
     drafting?: boolean
   }) => FloorplanSchedule | null
-  linkedLevelIds?: (node: N) => readonly AnyNodeId[]
   resolveForDrawing?: (args: {
     node: N
     nodes: Record<string, AnyNode>
@@ -132,38 +86,6 @@ export type FloorplanNodeExtension<N extends AnyNode = AnyNode> = {
   }) => AnyNode | null
 }
 
-type FloorplanGeometryMetadata = {
-  annotationRole?: FloorplanAnnotationRole
-  annotationObstacle?: 'bounds' | 'outline'
-  renderPass?: 'overlay'
-  /**
-   * Annotation text only: the size to print at, in paper points, instead of
-   * the size its role implies. Lets a sheet set a room tag's name larger than
-   * its number without inventing a role per size.
-   */
-  textSizePt?: number
-}
-
-type FloorplanContextExtension = {
-  automaticDimensions: boolean
-  purpose: FloorplanRenderPurpose
-  /**
-   * Sheet drafting (the Sheets plan viewports): kinds draw the permit-set
-   * convention — fixtures as labelled linework, furniture as light outlines,
-   * no raster sprites. Only `collectSheetGeometry` sets it; the editor and the
-   * read-only viewer never do, so their plans keep today's look.
-   */
-  drafting: boolean
-  /**
-   * The editor canvas draws room labels as screen pills over the plan
-   * (`RoomLabels2D`), so zones skip their drawn tags and wash there. Exports,
-   * sheets and the read-only viewer keep the drawn tags.
-   */
-  roomLabelOverlay: boolean
-  metricNotation: FloorplanMetricNotation
-  wallDimensionFaces: FloorplanWallDimensionFaces
-}
-
 export function getFloorplanNodeExtension(
   definition: NodeDefinition<any> | undefined,
 ): FloorplanNodeExtension | undefined {
@@ -171,78 +93,3 @@ export function getFloorplanNodeExtension(
     | FloorplanNodeExtension
     | undefined
 }
-
-export function floorplanGeometryMetadata(
-  values: FloorplanGeometryMetadata,
-): Readonly<Record<string, unknown>> {
-  return { [FLOORPLAN_GEOMETRY_METADATA_KEY]: values }
-}
-
-export function withFloorplanGeometryMetadata<T extends FloorplanGeometry | null>(
-  geometry: T,
-  values: FloorplanGeometryMetadata,
-): T {
-  if (!geometry) return geometry
-  const existing = readFloorplanGeometryMetadata(geometry)
-  return {
-    ...geometry,
-    metadata: floorplanGeometryMetadata({ ...existing, ...values }),
-  } as T
-}
-
-export function readFloorplanGeometryMetadata(geometry: unknown): FloorplanGeometryMetadata {
-  const metadata = (geometry as { metadata?: Readonly<Record<string, unknown>> } | null)?.metadata
-  const value = metadata?.[FLOORPLAN_GEOMETRY_METADATA_KEY]
-  return value && typeof value === 'object' && !Array.isArray(value)
-    ? (value as FloorplanGeometryMetadata)
-    : {}
-}
-
-export function createFloorplanContextExtensions(
-  values: Partial<FloorplanContextExtension>,
-): Readonly<Record<string, unknown>> {
-  return {
-    [FLOORPLAN_CONTEXT_EXTENSION_KEY]: {
-      automaticDimensions: values.automaticDimensions !== false,
-      purpose: values.purpose === 'document' ? 'document' : 'edit',
-      drafting: values.drafting === true,
-      roomLabelOverlay: values.roomLabelOverlay === true,
-      metricNotation: values.metricNotation === 'millimeters' ? 'millimeters' : 'meters',
-      wallDimensionFaces: normalizeFloorplanWallDimensionFaces(values.wallDimensionFaces),
-    } satisfies FloorplanContextExtension,
-  }
-}
-
-export function readFloorplanContext(ctx: GeometryContext): FloorplanContextExtension {
-  const value = ctx.extensions?.[FLOORPLAN_CONTEXT_EXTENSION_KEY]
-  if (value && typeof value === 'object' && !Array.isArray(value)) {
-    const extension = value as Partial<FloorplanContextExtension>
-    return {
-      automaticDimensions: extension.automaticDimensions !== false,
-      purpose: extension.purpose === 'document' ? 'document' : 'edit',
-      drafting: extension.drafting === true,
-      roomLabelOverlay: extension.roomLabelOverlay === true,
-      metricNotation: extension.metricNotation === 'millimeters' ? 'millimeters' : 'meters',
-      wallDimensionFaces: normalizeFloorplanWallDimensionFaces(extension.wallDimensionFaces),
-    }
-  }
-  return {
-    automaticDimensions: true,
-    purpose: 'edit',
-    drafting: false,
-    roomLabelOverlay: false,
-    metricNotation: 'meters',
-    wallDimensionFaces: DEFAULT_FLOORPLAN_WALL_DIMENSION_FACES,
-  }
-}
-
-export function readFloorplanMetricNotationOverride(
-  ctx: GeometryContext,
-): FloorplanMetricNotation | undefined {
-  const value = ctx.extensions?.[FLOORPLAN_CONTEXT_EXTENSION_KEY]
-  if (!value || typeof value !== 'object' || Array.isArray(value)) return undefined
-  const metricNotation = (value as { metricNotation?: unknown }).metricNotation
-  return metricNotation === 'meters' || metricNotation === 'millimeters'
-    ? metricNotation
-    : undefined
-}

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

@@ -1,8 +1,9 @@
+import type { FloorplanAnnotationRole } from '@pascal-app/core'
 import {
   type FloorplanAnnotationVisibility,
   revealFloorplanAnnotationRole,
 } from './annotation-visibility'
-import type { FloorplanAnnotationRole, FloorplanToolMode } from './floorplan-extension'
+import type { FloorplanToolMode } from './floorplan-extension'
 
 export const FLOORPLAN_MODES = ['default', 'expert'] as const
 

package/src/lib/floorplan/floorplan-pdfkit-renderer.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, test } from 'bun:test'
 import type { FloorplanGeometry } from '@pascal-app/core'
+import { floorplanGeometryMetadata } from '@pascal-app/core'
 import PDFDocument from 'pdfkit'
-import { floorplanGeometryMetadata } from './floorplan-extension'
 import { FloorplanPdfDocument, loadFloorplanPdfFonts } from './floorplan-pdfkit-document'
 import { renderFloorplanGeometryToPdfKit } from './floorplan-pdfkit-renderer'
 

package/src/lib/floorplan/floorplan-pdfkit-renderer.ts

@@ -1,16 +1,18 @@
-import { type FloorplanGeometry, type FloorplanPoint, loadAssetUrl } from '@pascal-app/core'
+import {
+  type FloorplanGeometry,
+  type FloorplanPoint,
+  loadAssetUrl,
+  readFloorplanGeometryMetadata,
+} from '@pascal-app/core'
 import {
   type ArchitecturalDimensionLayout,
   computeArchitecturalDimensionLayout,
-} from '../../components/editor-2d/renderers/floorplan-dimension-renderer'
-import {
   documentCircleGeometryAttrs,
   documentRectGeometryAttrs,
   resolveDocumentAnnotationGroupChildren,
-} from '../../components/editor-2d/renderers/floorplan-geometry-renderer'
-import { resolveFloorplanLabelAngle } from '../../components/editor-2d/renderers/floorplan-label-angle'
+  resolveFloorplanLabelAngle,
+} from '@pascal-app/viewer/ui'
 import type { FloorplanExportBounds } from './floorplan-export'
-import { readFloorplanGeometryMetadata } from './floorplan-extension'
 import type { FloorplanPdfBaseline, FloorplanPdfDocument } from './floorplan-pdfkit-document'
 
 const DIMENSION_LINE_WIDTH_PT = 0.5

package/src/lib/floorplan/floorplan-plugin-install.test.tsx

@@ -6,12 +6,11 @@ import {
   loadPlugin,
   nodeRegistry,
 } from '@pascal-app/core'
+import { FloorplanPreview } from '@pascal-app/viewer/ui'
 import { renderToStaticMarkup } from 'react-dom/server'
 import { z } from 'zod'
-import { FloorplanPreview } from '../../components/viewer/floorplan-preview'
 import { DEFAULT_FLOORPLAN_ANNOTATION_VISIBILITY } from './annotation-visibility'
 import { collectFloorplanGeometry, floorplanExportInstalledPlugins } from './floorplan-export'
-import { FLOORPLAN_NODE_EXTENSION_KEY } from './floorplan-extension'
 
 // Plugin API v1, no-install case: a plugin kind's floor-plan output appears in
 // the read-only preview and the PDF export only while the project has the
@@ -31,7 +30,7 @@ const bed = {
   visible: true,
   metadata: {},
 } as unknown as AnyNode
-// Lives on the upper level but draws on this one through `linkedLevelIds`.
+// Lives on the upper level but draws on this one through `floorplanLinkedLevelIds`.
 const upper = LevelNode.parse({ id: 'level_plugin_upper', level: 1, children: ['fxshaft_plan'] })
 const shaft = {
   object: 'node',
@@ -70,7 +69,7 @@ beforeEach(async () => {
         category: 'structure',
         defaults: () => ({}),
         capabilities: {},
-        extensions: { [FLOORPLAN_NODE_EXTENSION_KEY]: { linkedLevelIds: () => [level.id] } },
+        floorplanLinkedLevelIds: () => [level.id],
         floorplan: () => ({ kind: 'rect', x: 3, y: 0, width: 1, height: 1 }),
       } as unknown as AnyNodeDefinition,
     ],

package/src/lib/floorplan/geometry.ts

@@ -1,68 +1,5 @@
-import type { Point2D } from '@pascal-app/core'
-import { getWallFaceOffsets, type WallJustification } from '@pascal-app/core'
-import type { FloorplanLineSegment, FloorplanSelectionBounds } from './types'
-
-// Baseline rotation (deg) that orients the plan-local scene "north up" on
-// screen. The on-screen floor-plan scene `<g>` is rotated by
-// `FLOORPLAN_VIEW_ROTATION_DEG + userRotation - buildingRotation`; PDF export
-// uses the same user rotation so its orientation matches the live plan.
-//
-// North is world −Z: with a 0 baseline a rotation-0 reference image (top =
-// −Z) reads upright in the north-aligned view, and "align north" maps to a
-// 3D camera azimuth of 0. The old 90° baseline made north world −X, so
-// north-up floorplan scans displayed sideways whenever the compass claimed
-// the view was aligned.
-export const FLOORPLAN_VIEW_ROTATION_DEG = 0
-
-export function clampPlanValue(value: number, min: number, max: number) {
-  return Math.min(Math.max(value, min), max)
-}
-
-export function rotatePlanVector(x: number, y: number, rotation: number): [number, number] {
-  const cos = Math.cos(rotation)
-  const sin = Math.sin(rotation)
-  return [x * cos + y * sin, -x * sin + y * cos]
-}
-
-// Converts a world X/Z point into the floor-plan-local (building-local)
-// frame used by the SVG scene `<g>` and every stored node position. The
-// inverse of `floorplanLocalToWorldPoint`. Shared so the floor-plan panel
-// and the 2D move overlay resolve the same frame — feeding a world-space
-// `original` into a local-space cursor solver lands the drop off by the
-// building's world X/Z (worse for an off-origin building).
-export function worldToFloorplanLocalPoint(
-  worldX: number,
-  worldZ: number,
-  buildingPosition: readonly [number, number, number],
-  buildingRotationY: number,
-): Point2D {
-  const dx = worldX - buildingPosition[0]
-  const dz = worldZ - buildingPosition[2]
-  const cos = Math.cos(buildingRotationY)
-  const sin = Math.sin(buildingRotationY)
-
-  return {
-    x: dx * cos - dz * sin,
-    y: dx * sin + dz * cos,
-  }
-}
-
-// Inverse of `worldToFloorplanLocalPoint`: floor-plan-local X/Y → world X/Z.
-export function floorplanLocalToWorldPoint(
-  point: Point2D | [number, number],
-  buildingPosition: readonly [number, number, number],
-  buildingRotationY: number,
-): { x: number; z: number } {
-  const localX = Array.isArray(point) ? point[0] : point.x
-  const localY = Array.isArray(point) ? point[1] : point.y
-  const cos = Math.cos(buildingRotationY)
-  const sin = Math.sin(buildingRotationY)
-
-  return {
-    x: buildingPosition[0] + localX * cos + localY * sin,
-    z: buildingPosition[2] - localX * sin + localY * cos,
-  }
-}
+import { clampPlanValue, type Point2D, rotatePlanVector } from '@pascal-app/core'
+import type { FloorplanSelectionBounds } from './types'
 
 export function getRotatedRectanglePolygon(
   center: Point2D,
@@ -88,53 +25,6 @@ export function getRotatedRectanglePolygon(
   })
 }
 
-export function interpolatePlanPoint(start: Point2D, end: Point2D, t: number): Point2D {
-  return {
-    x: start.x + (end.x - start.x) * t,
-    y: start.y + (end.y - start.y) * t,
-  }
-}
-
-export function getPlanPointDistance(start: Point2D, end: Point2D): number {
-  return Math.hypot(end.x - start.x, end.y - start.y)
-}
-
-export function movePlanPointTowards(start: Point2D, end: Point2D, distance: number): Point2D {
-  const totalDistance = getPlanPointDistance(start, end)
-  if (totalDistance <= Number.EPSILON || distance <= 0) {
-    return start
-  }
-
-  return interpolatePlanPoint(start, end, Math.min(1, distance / totalDistance))
-}
-
-export function getThickPlanLinePolygon(
-  line: FloorplanLineSegment,
-  thickness: number,
-  justification?: WallJustification,
-): Point2D[] {
-  const dx = line.end.x - line.start.x
-  const dy = line.end.y - line.start.y
-  const length = Math.hypot(dx, dy)
-
-  if (length <= Number.EPSILON || thickness <= 0) {
-    return [line.start, line.end, line.end, line.start]
-  }
-
-  const { a, b } = getWallFaceOffsets({ thickness, justification })
-  const normalX = (-dy / length) * a
-  const normalY = (dx / length) * a
-
-  const backX = (-dy / length) * -b
-  const backY = (dx / length) * -b
-  return [
-    { x: line.start.x + normalX, y: line.start.y + normalY },
-    { x: line.end.x + normalX, y: line.end.y + normalY },
-    { x: line.end.x - backX, y: line.end.y - backY },
-    { x: line.start.x - backX, y: line.start.y - backY },
-  ]
-}
-
 export function getFloorplanSelectionBounds(
   start: [number, number],
   end: [number, number],

package/src/lib/floorplan/index.ts

@@ -6,23 +6,14 @@ export {
   type FloorplanAlignmentResult,
 } from './apply-alignment'
 export {
-  clampPlanValue,
   doesPolygonIntersectSelectionBounds,
-  FLOORPLAN_VIEW_ROTATION_DEG,
-  floorplanLocalToWorldPoint,
   getDistanceToWallSegment,
   getFloorplanSelectionBounds,
-  getPlanPointDistance,
   getRotatedRectanglePolygon,
-  getThickPlanLinePolygon,
-  interpolatePlanPoint,
   isPointInsidePolygon,
   isPointInsidePolygonWithHoles,
   isPointInsideSelectionBounds,
-  movePlanPointTowards,
   pointMatchesWallPlanPoint,
-  rotatePlanVector,
-  worldToFloorplanLocalPoint,
 } from './geometry'
 export {
   buildFloorplanItemEntry,

package/src/lib/floorplan/items.ts

@@ -6,9 +6,10 @@ import {
   getWallLocalFaceZ,
   type ItemNode,
   type LevelNode,
+  rotatePlanVector,
   useLiveTransforms,
 } from '@pascal-app/core'
-import { getRotatedRectanglePolygon, rotatePlanVector } from './geometry'
+import { getRotatedRectanglePolygon } from './geometry'
 import type { FloorplanItemEntry, FloorplanNodeTransform, LevelDescendantMap } from './types'
 
 export function collectLevelDescendants(

package/src/lib/floorplan/schedules.ts

@@ -1,8 +1,11 @@
 import type { AnyNode, AnyNodeId, DoorNode, WallNode, WindowNode, ZoneNode } from '@pascal-app/core'
-import { deriveZoneQuantityReport, resolveHostedOpeningFrameDepth } from '@pascal-app/core'
+import {
+  deriveZoneQuantityReport,
+  type FloorplanSchedule,
+  resolveHostedOpeningFrameDepth,
+  resolveMarkDetail,
+} from '@pascal-app/core'
 import { collectFloorplanSchedules } from './floorplan-export'
-import type { FloorplanSchedule } from './floorplan-extension'
-import { resolveMarkDetail } from './marks'
 
 /**
  * Construction-document schedule DATA — WS3.

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

@@ -30,7 +30,11 @@ import type {
   FloorplanGeometry,
   LiveNodeOverrides,
 } from '@pascal-app/core'
-import { nodeRegistry, resolveBuildingForLevel } from '@pascal-app/core'
+import {
+  type FloorplanMetricNotation,
+  nodeRegistry,
+  resolveBuildingForLevel,
+} from '@pascal-app/core'
 import {
   buildContext,
   collectFloorplanLinkedLevelNodes,
@@ -52,14 +56,12 @@ import {
   resolveFloorplanExportRotationDeg,
   resolveFloorplanExportViewState,
 } from './floorplan-export'
-import type { FloorplanMetricNotation } from './floorplan-extension'
 import { createFloorplanPdfDocument } from './floorplan-pdfkit-document'
 import { renderFloorplanGeometryToPdfKit } from './floorplan-pdfkit-renderer'
 
 /** PDF user-space units per inch. */
 export const POINTS_PER_INCH = 72
 
-export type { FloorplanSchedule } from './floorplan-extension'
 /**
  * The schedules the kinds on a level contribute
  * (`def.extensions['pascal:editor/floorplan'].schedule`). Re-exported here so
@@ -316,3 +318,5 @@ async function drawPlate(
     },
   )
 }
+
+export type { FloorplanSchedule } from '@pascal-app/core'

package/src/lib/floorplan/site-plan/site-parts.ts

@@ -15,7 +15,9 @@ import {
   isOutdoorRoomType,
   type LevelNode,
   migrateSiteMetadata,
+  type RoofNode,
   type RoofSegmentNode,
+  roofFaceShapes,
   type SceneSnapshot,
   type SiteNode,
   siteFrame,
@@ -75,7 +77,8 @@ export function findLowestLevel(
 /**
  * The roof's outline on the lot — every roof segment's plan rectangle out to
  * its deck's reach at its eaves and rakes, through the segment's, the roof's
- * and the building's turns, unioned into the outer ring(s). Dashed on the site plan: what the eye sees
+ * and the building's turns, and every face of another kind (`capabilities.roofs`)
+ * by its own outline, unioned into the outer ring(s). Dashed on the site plan: what the eye sees
  * from above is the roof, and the setback is measured to the wall under it.
  */
 export function roofOutlineRings(
@@ -93,6 +96,9 @@ export function roofOutlineRings(
   }
   if (roofs.size === 0) return []
   const rects: Pt[][] = []
+  for (const roof of roofs.values())
+    for (const face of roofFaceShapes(roof as RoofNode, scene.nodes))
+      rects.push(face.outline.map(([x, z]) => toSite(x, z)))
   for (const node of Object.values(scene.nodes)) {
     if (node.type !== 'roof-segment') continue
     const roof = roofs.get(String((node as { parentId?: unknown }).parentId))

package/src/lib/floorplan/site-plan/site-plan-layer.tsx

@@ -7,8 +7,8 @@ import {
   resumeSceneHistory,
   useScene,
 } from '@pascal-app/core'
+import { FloorplanGeometryRenderer } from '@pascal-app/viewer/ui'
 import { type PointerEvent as ReactPointerEvent, useCallback, useMemo, useRef } from 'react'
-import { FloorplanGeometryRenderer } from '../../../components/editor-2d/renderers/floorplan-geometry-renderer'
 import { clientToPlan } from '../plan-coords'
 import { buildSitePlanDrawing } from './build-site-plan-drawing'
 

package/src/lib/follow-pascal-presentation.ts

@@ -1,5 +1,5 @@
 import type { WallMode } from '@pascal-app/viewer'
-import type { RoomKey } from './room-selection'
+import type { RoomKey } from '@pascal-app/viewer/ui'
 
 /**
  * Follow Pascal changes how the building is shown so the build it follows is in view: the walls cut

package/src/lib/glb-export.ts

@@ -32,6 +32,7 @@ import {
   type ViewerPresentationContribution,
   viewerPresentationRegistry,
 } from '@pascal-app/viewer'
+import { nodeDisplayLabel } from '@pascal-app/viewer/ui'
 import type { Object3D } from 'three'
 import * as THREE from 'three'
 import {
@@ -42,7 +43,6 @@ import {
 import { createExportTextureUtils, type ExportTextureUtils } from './export-texture-utils'
 import { cloneExportUserData } from './export-user-data'
 import { isIfcRolePart } from './ifc-parts'
-import { nodeDisplayLabel } from './node-display-label'
 import {
   type CompressedTextureDecompressor,
   decompressCanonicalNormalMaps,

package/src/lib/material-paint.ts

@@ -309,7 +309,7 @@ export function resolveActivePaintMaterialFromSelection(params: {
     ) {
       const roofNode = selectedNode as RoofNode
       const fallbackSegment = (roofNode.children ?? [])
-        .map((id: AnyNodeId) => nodes[id as AnyNodeId] as RoofSegmentNode | undefined)
+        .map((id) => nodes[id as AnyNodeId] as RoofSegmentNode | undefined)
         .find(
           (segment: RoofSegmentNode | undefined) =>
             segment?.type === 'roof-segment' &&

package/src/lib/measurements.test.ts

@@ -17,11 +17,12 @@ import {
 import {
   MEASUREMENT_ACTIVE_COLOR,
   MEASUREMENT_DANGLING_COLOR,
+  MEASUREMENT_FLOORPLAN_COLOR,
   MEASUREMENT_PERSISTENT_COLOR,
+  measurementFloorplanPresentationColor,
   measurementPresentationColor,
 } from '@pascal-app/viewer'
 import { measurementHint, parseMeasurement } from '../index'
-import { MEASUREMENT_FLOORPLAN_COLOR, measurementFloorplanPresentationColor } from './measurements'
 
 describe('measurement presentation', () => {
   test('uses black at rest, indigo while active, and red for dangling references', () => {

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

@@ -15,6 +15,7 @@ import {
   type ZoneNode,
 } from '@pascal-app/core'
 import { useViewer } from '@pascal-app/viewer'
+import { RoomSelectionIndex, resolveRoomHit } from '@pascal-app/viewer/ui'
 import { deleteConfirmationContent } from '../components/editor/delete-confirmation-dialog'
 import { resolveFloorRegionRoom } from '../components/editor/floor-region-controls'
 import { MEZZANINE_GESTURE_HINTS, mezzanineGesture } from '../components/ui/helpers/helper-manager'
@@ -23,7 +24,6 @@ import {
   mezzanineElevationBounds,
   ROOM_ELEVATION_DRAG_LABEL,
 } from './room-handle-drag'
-import { RoomSelectionIndex, resolveRoomHit } from './room-selection'
 import { applyRoomPlan } from './room-structure-commands'
 import { ROOM_MOVE_DRAG_LABEL } from './room-transform-session'
 import { zoneAtLevelPoint } from './units'

package/src/lib/paint-region-mode.ts

@@ -1,6 +1,6 @@
+import { isTypingTarget } from '@pascal-app/viewer'
 import { create } from 'zustand'
 import type { ActivePaintMaterial } from './material-paint'
-import { isTypingTarget } from './typing-target'
 
 /**
  * What a paint click does: paint the whole surface under it, draw part of a

package/src/lib/point-ask/session.ts

@@ -18,6 +18,7 @@ import {
 } from '@pascal-app/core'
 import { sceneViewBounds, sceneViewPose } from '@pascal-app/core/agent-operations'
 import { retractNodes, useViewer } from '@pascal-app/viewer'
+import { cameraPoseStore, useFollowPascal } from '@pascal-app/viewer/ui'
 import { type Object3D, Vector2, Vector3 } from 'three'
 import {
   resolveRoofSegmentSelectionTarget,
@@ -25,9 +26,7 @@ import {
 } from '../../components/editor/selection-manager'
 import { getEditorThreeContext } from '../../components/editor/three-context-bridge'
 import { resolveEditorRoomHit } from '../../hooks/use-selected-room'
-import { cameraPoseStore } from '../../store/camera-pose-store'
 import useEditor, { getActiveContinuationContext } from '../../store/use-editor'
-import useFollowPascal from '../../store/use-follow-pascal'
 import useInteractionScope from '../../store/use-interaction-scope'
 import {
   type BubbleTarget,