@things-factory/figure-ui 10.1.82 → 10.1.84

package/client/modeller/gizmo.ts

@@ -1,13 +1,13 @@
-import { figureAttachmentsOf } from '@hatiolab/figure-model'
+import { figureAttachmentsOf, figureShapeProviderOf } from '@hatiolab/figure-model'
 import type { FigureAsset, FigureInputChange } from '@hatiolab/figure-model'
 
 /**
  * What the gizmo may write for a part: move · turn · size, on a asset.
  *
  * A drag can only be written back where the part is placed by its own numbers. A part the create commands made is:
- * its pose is `rigid@1` into the asset frame from `<part>.position.*` and `<part>.rotation.*`, and a box's shape
- * (`box-shape@1` or `rounded-box@1`) takes its width, height and depth from inputs of its own — `<part>.size.*` from
- * `addFigureBox`, `<part>.dimension.*` from the editor's shape palette. A part fastened to another, following an instance size or placed by
+ * its pose is `rigid@1` into the asset frame from `<part>.position.*` and `<part>.rotation.*`, and its shape takes its
+ * measures from inputs of its own — `<part>.size.*` from `addFigureBox`, `<part>.dimension.*` from the editor's shape
+ * palette — at the arguments the shape itself names (figure-model's provider). A part fastened to another, following an instance size or placed by
  * expressions has no such numbers; the gizmo does not offer what it could not write back, rather
  * than move something the next evaluation would put back.
  */
@@ -29,9 +29,6 @@ export interface GizmoReach {
   round?: { across: string[]; along: string[] }
 }
 
-/** Shapes whose first three arguments are the extent along X, Y and Z: a door frame's too (its width, height, depth). */
-const BOXES = new Set(['box-shape@1', 'rounded-box@1', 'portal-profile@2', 'hollow-box@2'])
-
 interface Node {
   id: string
   op: string
@@ -65,15 +62,28 @@ export function gizmoReachOf(asset: AssetLike, part: string): GizmoReach {
   const posed = direct || reseated
   const shape = nodes.find(node => node.id === `${part}.shape`)
   const mine = (ids: string[]) => ids.every(id => id.startsWith(`${part}.`) && design.has(id))
-  const round =
-    shape?.op === 'cylinder-shape@1' && mine(shape.args.slice(0, 2))
-      ? { across: [shape.args[0]!], along: [shape.args[1]!] }
-      : shape?.op === 'frustum-shape@1' && mine(shape.args.slice(0, 3))
-        ? { across: shape.args.slice(0, 2), along: [shape.args[2]!] }
-        : shape?.op === 'sphere-shape@1' && mine(shape.args.slice(0, 3))
-          ? { across: shape.args.slice(0, 3), along: [] }
-          : undefined
-  const extent = shape && BOXES.has(shape.op) ? shape.args.slice(0, 3) : []
+  /*
+    Which argument sizes the part along X, Y and Z: the shape says (figure-model's provider, ADR-0100) -- never its first
+    three arguments. A round section written from one radius, a sphere and a taper keep their shape: their radii take one
+    factor together.
+  */
+  const provider = shape ? figureShapeProviderOf(shape as never) : undefined
+  const edit = provider?.edit
+  const refOf = (axis: 'x' | 'y' | 'z') => {
+    const e = edit?.[axis]
+    return e && !('refused' in e) ? shape!.args[e.arg]! : undefined
+  }
+  const measures = AXES.map(refOf)
+  const shared = !!edit && AXES.some(axis => { const e = edit[axis]; return !('refused' in e) && !!(e.sameAs || e.with?.length) })
+  let round: GizmoReach['round']
+  if (shared && edit) {
+    const withs = AXES.flatMap(axis => { const e = edit[axis]; return !('refused' in e) ? (e.with ?? []).map(i => shape!.args[i]!) : [] })
+    const sphere = !!provider && Object.keys(provider.faces).length === 0
+    const across = [...new Set([refOf('x')!, ...withs])]
+    const along = sphere ? [] : [refOf('y')!]
+    if ([...across, ...along].every(id => id && mine([id]))) round = { across: sphere ? [...new Set([...across, refOf('y')!])] : across, along }
+  }
+  const extent = !round && measures.every(Boolean) ? (measures as string[]) : []
   const sizes =
     extent.length === 3 && extent.every(id => id.startsWith(`${part}.`) && design.has(id)) ? (extent as [string, string, string]) : undefined
   /*

package/client/modeller/joint-fan.ts

@@ -2,6 +2,7 @@ import { compileFigureAsset, compileFigureGraph, figureWorldBoxesOf, figureWrite
 import type { FigureAsset } from '@hatiolab/figure-model'
 
 import type { FigureRenderPart } from './renderer.js'
+import { sectionShape } from './drawn-shapes.js'
 
 /*
  * Where the selected part turns, and how far -- a translucent fan on the editing board. An axis name says nothing about which way a part swings; on a six-axis arm the author went to the preview and
@@ -249,14 +250,14 @@ export function jointFanOf(asset: FigureAsset, part: string, values: Record<stri
   const r = [0, 1, 2].map(i => [first[i]!, axisNow[i]!, zAxis[i]!])
   const local = (p: number[]) => {
     const v = sub(p, pivot)
-    return { x: dot(v, first), y: dot(v, zAxis) }
+    return { x: dot(v, first), z: dot(v, zAxis) }
   }
   const full = max - min >= 359.999
-  const profile = [...(full ? [] : [{ x: 0, y: 0 }]), ...traced.map(local)].map(p => ({ x: Math.round(p.x * 1000) / 1000, y: Math.round(p.y * 1000) / 1000 }))
+  const profile = [...(full ? [] : [{ x: 0, z: 0 }]), ...traced.map(local)].map(p => ({ x: Math.round(p.x * 1000) / 1000, z: Math.round(p.z * 1000) / 1000 }))
 
   return {
     id: JOINT_FAN,
-    shape: { provider: 'polygon', dimensions: { height: THICKNESS }, profile },
+    shape: sectionShape(profile, THICKNESS),
     pose: { t: pivot, r },
     material: { token: '__joint-fan', transparent: true },
     /** Which control turns it: the joint the fan shows. */

package/client/modeller/links.ts

@@ -1,6 +1,7 @@
 import { FIGURE_FACES, figureShapeFaces, figurePartsExtentOf, compileFigureAsset, compileFigureGraph, figureFollowOf, proposeFigureProportion, defaultInstanceSizeRange, foldInstanceSizeRange, figureAttachmentsOf, figureBindingsOf, figureInstanceSizeLimitsOf, figureFollowableAxesOf, figureShapeProviderOf } from '@hatiolab/figure-model'
 import type { FigureFollow, FigureSizeRange } from '@hatiolab/figure-model'
 import type { FigureAsset, FigureBindingPlace, FigureFace, FigureJoint } from '@hatiolab/figure-model'
+import { startingShapeKindOf } from './starting-shape.js'
 
 /*
  * What a part is tied to — the readers behind the parts' size response, fastening and motion sections. Kept apart from the element so they can be tested without a browser.
@@ -62,7 +63,7 @@ export function canFollow(asset: FigureAsset, part: string): boolean {
  */
 export function followableAxes(asset: FigureAsset, part: string): Axis[] {
   const shape = modelOf(asset).nodes.find(n => n.id === `${part}.shape`)
-  return shape ? figureFollowableAxesOf(shape.op) : []
+  return shape ? figureFollowableAxesOf(shape as never) : []
 }
 
 /**
@@ -87,27 +88,14 @@ export function resizeAxesOf(asset: FigureAsset, part: string, pending?: readonl
   return { axes: editable, basis: editable.length ? 'suggested' : 'none' }
 }
 
-const KIND_OF_SHAPE: Record<string, string> = {
-  'box-shape@1': 'cube',
-  'rounded-box@1': 'rounded-box',
-  'rounded-box@2': 'rounded-box',
-  'hollow-box@1': 'hollow-box',
-  'hollow-box@2': 'hollow-box',
-  'portal-profile@2': 'portal',
-  'cylinder-shape@1': 'cylinder',
-  'cylinder-shape@2': 'cylinder',
-  'sphere-shape@1': 'sphere',
-  'frustum-shape@1': 'frustum',
-  'polygon-shape@1': 'polygon'
-}
-
 /**
  * The selected part in three short lines, for the head of its panel (designer 2026-09-27, B): what it is, how its
  * size answers the figure's, and what holds it -- 「box · 상자 / 너비는 도형을 따라감 / 아랫면을 바닥에 유지 중」.
  */
 export function partSummaryOf(asset: FigureAsset, part: string, say: (key: string, params?: Record<string, string>) => string): { kind: string; size: string; relation: string } {
   const shape = modelOf(asset).nodes.find(n => n.id === `${part}.shape`)
-  const kind = shape && KIND_OF_SHAPE[shape.op] ? say(`figure.label.primitive-${KIND_OF_SHAPE[shape.op]}`) : ''
+  const named = startingShapeKindOf(shape as never)
+  const kind = named ? say(`figure.label.primitive-${named}`) : ''
   const editable = followableAxes(asset, part)
   const round = editable.length === 2
   const word = (axis: Axis) => say(round && axis === 'x' ? 'figure.label.resize-diameter' : `figure.label.resize-${axis}`)
@@ -146,7 +134,10 @@ export function fieldWordsOf(id: string, say: (key: string) => string): string {
 /** What a part's own measure on an axis is now (a box's side, a cylinder's radius or length), at the design as it stands. */
 export function dimensionNow(asset: FigureAsset, part: string, axis: Axis): number | undefined {
   const m = modelOf(asset)
-  const ref = m.nodes.find(n => n.id === `${part}.shape`)?.args[AXES.indexOf(axis)]
+  /* The argument the shape names for this axis (figure-model's provider), not its place among the arguments. */
+  const shape = m.nodes.find(n => n.id === `${part}.shape`)
+  const edit = shape && figureShapeProviderOf(shape as never)?.edit[axis]
+  const ref = edit && !('refused' in edit) ? shape!.args[edit.arg] : undefined
   if (!ref) return undefined
   try {
     const values = compileFigureGraph(asset.document.model as never).evaluate({ ...asset.designInputs, ...asset.stateDefaults }).values as Record<string, number>
@@ -163,7 +154,7 @@ export function dimensionNow(asset: FigureAsset, part: string, axis: Axis): numb
  */
 export function measureNow(asset: FigureAsset, part: string, axis: Axis): number | undefined {
   const shape = modelOf(asset).nodes.find(n => n.id === `${part}.shape`)
-  const edit = shape && figureShapeProviderOf(shape.op)?.edit[axis]
+  const edit = shape && figureShapeProviderOf(shape as never)?.edit[axis]
   if (!shape || !edit || 'refused' in edit) return undefined
   try {
     const values = compileFigureGraph(asset.document.model as never).evaluate({ ...asset.designInputs, ...asset.stateDefaults }).values as Record<string, number>
@@ -180,13 +171,20 @@ export function measureNow(asset: FigureAsset, part: string, axis: Axis): number
  */
 export function facesOf(asset: FigureAsset, part: string): string[] {
   const shape = modelOf(asset).nodes.find(n => n.id === `${part}.shape`)
-  return Object.keys((shape && figureShapeFaces(shape.op)) ?? {})
+  return inScreenOrder(Object.keys((shape && figureShapeFaces(shape as never)) ?? {}))
+}
+
+/** Faces in the order the screen lists them: the six outer ones left to front, then the rest as the shape gives them. */
+const SCREEN_ORDER = ['left', 'right', 'bottom', 'top', 'back', 'front']
+function inScreenOrder(names: string[]): string[] {
+  const rank = (n: string) => (SCREEN_ORDER.includes(n) ? SCREEN_ORDER.indexOf(n) : SCREEN_ORDER.length)
+  return names.map((n, i) => [n, i] as const).sort((a, b) => rank(a[0]) - rank(b[0]) || a[1] - b[1]).map(([n]) => n)
 }
 
 /** The axis a face of a part faces along, from the same definitions. */
 export function faceAxisOf(asset: FigureAsset, part: string, face: string): Axis | undefined {
   const shape = modelOf(asset).nodes.find(n => n.id === `${part}.shape`)
-  return (shape && figureShapeFaces(shape.op)?.[face]?.axis) as Axis | undefined
+  return (shape && figureShapeFaces(shape as never)?.[face]?.axis) as Axis | undefined
 }
 
 /** Whether `attach` can take this part: any part whose shape has a flat face. */
@@ -556,12 +554,14 @@ export function choiceOf(follow: Follow): string {
   }
 }
 
-/** The faces a place can sit on for this part: a box's six, a rounded box's top and bottom, none for a round body. */
+/**
+ * The faces a place can sit on for this part: its flat faces, but not a plane that only touches a curved side along a
+ * line (a cylinder's side, Q3) -- nothing is held on a line. A sphere has none.
+ */
 export function placeFacesOf(asset: FigureAsset, part: string): FigureFace[] {
   const shape = modelOf(asset).nodes.find(n => n.id === `${part}.shape`)
-  if (shape?.op === 'box-shape@1') return ['left', 'right', 'bottom', 'top', 'back', 'front']
-  if (shape?.op === 'rounded-box@1') return ['bottom', 'top']
-  return []
+  const faces = (shape && figureShapeFaces(shape as never)) ?? {}
+  return inScreenOrder(Object.entries(faces).filter(([, f]) => !(f as { contact?: string }).contact).map(([name]) => name)) as FigureFace[]
 }
 
 /** The places things are held that sit on this part. */

package/client/modeller/maturity.ts

@@ -154,8 +154,9 @@ export function figureReportOf(asset: FigureAsset): FigureReport | undefined {
 }
 
 /**
- * The key things-scene shares a body's geometry by (`figure-geometry.ts` `keyOf`): provider, dimensions to a
- * micrometre, segments (12 when unset), and a polygon's corners.
+ * The key things-scene shares a body's geometry by (`figure-geometry.ts` `keyOf`): the operation, what is not in its
+ * numbers (the axis, the kind of section, which ends of an inside are open), its numbers to a micrometre, and segments
+ * (12 when unset).
  */
 export function shapeKeyOf(body: FigureAssetGeometry | FigureGeometry): string {
   if (!('shape' in body)) {
@@ -169,9 +170,12 @@ export function shapeKeyOf(body: FigureAssetGeometry | FigureGeometry): string {
     .sort()
     .map(k => `${k}=${round(shape.dimensions[k]!)}`)
     .join(',')
-  const profile = shape.profile ? '|' + shape.profile.map(p => `${round(p.x)}:${round(p.y)}`).join(';') : ''
+  const e = shape.extrusion,
+    c = shape.cavity,
+    r = shape.revolution
+  const meaning = e ? `${e.axis}:${e.section.kind}:${c ? `${c.start === 'open' ? 'o' : 'c'}${c.end === 'open' ? 'o' : 'c'}` : '-'}` : r ? `${r.axis}:${r.profile.kind}` : ''
   const segments = (body as { segments?: number }).segments ?? 12
-  return `${shape.provider}|${dims}|s${segments}${profile}`
+  return `${shape.provider}|${meaning}|${dims}|s${segments}`
 }
 
 /**
@@ -202,7 +206,9 @@ function consistency(asset: FigureAsset, distinctMaterials: number): FigureMatur
 }
 
 /** Seen from above, these do not fill their footprint box, by provider name. */
-const ROUND_FOOTPRINT: readonly string[] = ['cylinder', 'ellipticCylinder', 'frustum', 'sphere']
+/** Round seen from above: a circle or an ellipse pushed along Y, anything turned about Y. */
+const roundFootprint = (shape: { extrusion?: { axis: string; section: { kind: string } }; revolution?: { axis: string } }) =>
+  (shape.extrusion?.axis === 'y' && shape.extrusion.section.kind === 'ellipse') || shape.revolution?.axis === 'y'
 
 /**
  * Can it be told apart from above — baseline 1.
@@ -276,7 +282,7 @@ function topViewRegions(
     const x1 = Math.min(GRID, Math.ceil((box.centre.x + box.extent.x / 2 - frame.x0) * sx))
     const y0 = Math.max(0, Math.floor((box.centre.z - box.extent.z / 2 - frame.z0) * sz))
     const y1 = Math.min(GRID, Math.ceil((box.centre.z + box.extent.z / 2 - frame.z0) * sz))
-    const round = 'shape' in body && ROUND_FOOTPRINT.includes(body.shape.provider)
+    const round = 'shape' in body && roundFootprint(body.shape as never)
 
     for (let y = y0; y < y1; y++) {
       for (let x = x0; x < x1; x++) {

package/client/modeller/motion-ends.ts

@@ -3,6 +3,7 @@ import type { FigureAsset } from '@hatiolab/figure-model'
 
 import { PREVIEW, TARGET_FACE } from './command-preview.js'
 import type { FigureRenderPart } from './renderer.js'
+import { boxShape } from './drawn-shapes.js'
 
 /*
  * Where a part's motion takes it (ADR-0097 §5.5, designer 2026-09-27): the bodies its control moves, drawn translucent at
@@ -73,7 +74,7 @@ export function motionEndsOf(asset: FigureAsset, part: string, values: Record<st
       const y = [z[1]! * x[2]! - z[2]! * x[1]!, z[2]! * x[0]! - z[0]! * x[2]!, z[0]! * x[1]! - z[1]! * x[0]!]
       ghost.push({
         id: `${TARGET_FACE}:slide`,
-        shape: { provider: 'box', dimensions: { width: length, height: THICKNESS, depth: THICKNESS } },
+        shape: boxShape(length, THICKNESS, THICKNESS),
         pose: { r: [0, 1, 2].map(i => [x[i]!, y[i]!, z[i]!]), t: [0, 1, 2].map(i => (from[i]! + to[i]!) / 2) },
         material: { token: TARGET_FACE }
       })

package/client/modeller/refusals.ts

@@ -117,10 +117,30 @@ export function recipeRefusalOf(error: unknown, say: Say): string | null {
  * duplicate of a row's part showed 「EDIT_TARGET: … not a repeated template」, 2026-09-27). The figure's node limit
  * is said with its number.
  */
+/**
+ * A corner or an inside the part cannot take (ADR-0100 stage 1): what was too large or too thick, or what holds on
+ * to what the edit would take away. The kernel names the problem in its message; the screen names it in words.
+ */
+function sectionRefusalOf(code: string | undefined, message: string, say: Say): string | null {
+  if (code === 'FEATURE_MAPPING_REQUIRED') {
+    /* 「takes away inside-bottom (joint j1); top (feature f2)」: the faces, each in the author's words. */
+    const faces = [...message.matchAll(/([\w-]+) \([^)]*\)/g)].map(([, face]) => say('figure.label.face-' + face, {}))
+    return say('figure.text.section-face-in-use', { faces: faces.join(', ') })
+  }
+  if (code === 'DIMENSION_LINKED') return say('figure.text.section-dimension-linked', {})
+  if (code !== 'GEOMETRY_DOMAIN') return null
+  if (/CORNER_TOO_LARGE/.test(message)) return say('figure.text.section-corner-too-large', {})
+  if (/NO_ROOM_INSIDE/.test(message)) return say('figure.text.section-wall-too-thick', {})
+  if (/CAVITY_NO_LENGTH/.test(message)) return say('figure.text.section-ends-too-thick', {})
+  return null
+}
+
 export function editRefusalOf(error: unknown, say: Say): string {
   const code = (error as { code?: string })?.code
   const message = error instanceof Error ? error.message : String(error)
   if (code === 'DOCUMENT_LIMIT') return say('figure.text.edit-refused-node-limit', { max: /maximum (\d+) nodes/.exec(message)?.[1] ?? '' })
+  const section = sectionRefusalOf(code, message, say)
+  if (section) return section
   return say('figure.text.edit-refused', { code: code ?? '' })
 }
 

package/client/modeller/renderer.ts

@@ -4,7 +4,7 @@ import { buildFigureGeometry } from '@hatiolab/things-scene'
 /** Evaluated boundary: graph values are resolved before reaching the renderer. */
 export interface FigureRenderPart {
   id: string
-  shape: { provider: string; dimensions: Record<string, number>; profile?: Array<{x:number;y:number}> }
+  shape: { provider: string; dimensions: Record<string, number>; extrusion?: unknown; cavity?: unknown; revolution?: unknown }
   pose: {r:number[][];t:number[]}
   material: {token:string;preset?:string;transparent?:boolean;emissive?:{token:string;intensity:number;on:boolean}}
   segments?:number
@@ -34,7 +34,8 @@ export function drawableFigureParts(geometry: readonly unknown[]): FigureRenderP
  */
 function geometry(part: FigureRenderPart): THREE.BufferGeometry {
   const built = buildFigureGeometry(part.shape as never, part.segments ?? 12) as THREE.BufferGeometry | undefined
-  if (!built) throw Error('Unsupported provider: ' + part.shape.provider)
+  /* A shape the builder does not know comes back empty: said, not drawn as nothing. */
+  if (!built?.getAttribute('position')) throw Error('Unsupported shape: ' + part.shape.provider)
   return built
 }
 

package/client/modeller/section-controls.ts

@@ -0,0 +1,34 @@
+import type { FigureCavityRequest, FigureEvaluatedShape } from '@hatiolab/figure-model'
+
+/** The one value every entry holds, or undefined when they differ (or there are none). */
+export const sameOf = (values: readonly (number | undefined)[]) =>
+  values.length && values.every(v => v !== undefined && Math.abs(v - values[0]!) < 1e-6) ? values[0] : undefined
+
+export const mm = (value: number) => Math.round(value * 1000) / 1000
+
+/** The wall a new inside starts with: a tenth of the section's narrower side, at least 1 mm. */
+export function defaultWallOf(shape: FigureEvaluatedShape): number {
+  const section = shape.extrusion!.section
+  const across =
+    section.kind === 'rectangle'
+      ? Object.values(section.size)
+      : section.kind === 'ellipse'
+        ? Object.values(section.radius).map(r => 2 * r!)
+        : []
+  return Math.max(1, Math.round(Math.min(...(across as number[])) / 10))
+}
+
+/**
+ * The inside as the panel asks for it: the part's own, with one thing changed. A part with none yet gets a default
+ * wall all round, a closed start as thick as the wall and an open end -- a tray standing on its floor.
+ */
+export function cavityRequestOf(shape: FigureEvaluatedShape, patch: Partial<FigureCavityRequest> = {}): FigureCavityRequest {
+  const cavity = shape.cavity
+  return {
+    wall: cavity ? (sameOf(Object.values(cavity.wall)) ?? { ...cavity.wall }) : defaultWallOf(shape),
+    start: cavity?.start ?? { closed: defaultWallOf(shape) },
+    end: cavity?.end ?? 'open',
+    ...patch
+  }
+}
+

package/client/modeller/starting-shape.ts

@@ -0,0 +1,34 @@
+/**
+ * What a person calls a part's shape (ADR-0100 §2.1): the starting shape it reads as -- 상자, 둥근 상자, 위가 열린 상자,
+ * 원기둥, 문틀, 구, 원뿔, 그린 단면. A word for the screen, read from the shape node's own params; it is not a kind of
+ * stored shape, and nothing is decided by it.
+ */
+export type StartingShapeKind = 'cube' | 'rounded-box' | 'hollow-box' | 'cylinder' | 'portal' | 'sphere' | 'frustum' | 'polygon'
+
+export function startingShapeKindOf(shape: { op: string; params?: Record<string, unknown> } | undefined): StartingShapeKind | undefined {
+  const p = shape?.params ?? {}
+  if (shape?.op === 'revolve@1') return p.profile === 'taper' ? 'frustum' : 'sphere'
+  if (shape?.op !== 'extrude@1') return undefined
+  if (p.section === 'ellipse') return 'cylinder'
+  if (p.section === 'polygon') return 'polygon'
+  if (p.section === 'portal') return 'portal'
+  if (p.cavity) return 'hollow-box'
+  return p.corner === 'round' ? 'rounded-box' : 'cube'
+}
+
+/**
+ * The same word for an evaluated body, when only the shape the kernel evaluated is in hand (a row of the parts list):
+ * a door frame is the section with jambs, a drawn section the rest of the drawn ones.
+ */
+export function startingShapeKindOfBody(shape: { provider?: string; dimensions?: Record<string, number>; extrusion?: { section: { kind: string; corner?: unknown } }; cavity?: unknown; revolution?: { profile: { kind: string } } } | undefined): StartingShapeKind | undefined {
+  if (shape?.revolution) return shape.revolution.profile.kind === 'taper' ? 'frustum' : 'sphere'
+  const s = shape?.extrusion?.section
+  if (!s) return undefined
+  if (s.kind === 'ellipse') return 'cylinder'
+  if (s.kind === 'polygon') return shape!.dimensions?.jamb !== undefined ? 'portal' : 'polygon'
+  if (shape!.cavity) return 'hollow-box'
+  return s.corner ? 'rounded-box' : 'cube'
+}
+
+/** Whether a body is round across -- a circle or an ellipse pushed, anything turned: it takes a segment count. */
+export const isRoundBody = (shape: Parameters<typeof startingShapeKindOfBody>[0]) => ['cylinder', 'sphere', 'frustum'].includes(startingShapeKindOfBody(shape) ?? '')

package/dist-client/modeller/clips.d.ts

@@ -34,6 +34,6 @@ export declare const trackEdit: (clip: Clip, track: ClipTrack, patch?: Partial<P
     state: string;
     clip: string;
     keys: ClipKey[];
-    loop: "hold" | "wrap";
+    loop: "wrap" | "hold";
     interpolation: "linear" | "step";
 };

package/dist-client/modeller/command-preview.js

@@ -1,3 +1,4 @@
+import { boxShape, discShape } from './drawn-shapes.js';
 /*
  * A command seen before it is done, as the modeller shows it (ADR-0097 §5.5, designer 2026-09-27): the bodies it would
  * move, translucent where they would stand; the face they would meet, lit; and in words, how far and how each turns --
@@ -25,9 +26,10 @@ export function faceHighlightOf(face) {
     /* Its own x · y · z are the face's two sides and its normal, as the kernel gives them. */
     const r = [0, 1, 2].map(i => [face.u[i], face.normal[i], face.v[i]]);
     const t = [0, 1, 2].map(i => face.centre[i] + face.normal[i] * (LIFT + THICKNESS / 2));
+    /* A plane touching a curved side is a line (Q3): drawn as a narrow strip, never a plate. */
     const shape = face.round
-        ? { provider: 'cylinder', dimensions: { radius: face.size.u / 2, length: THICKNESS } }
-        : { provider: 'box', dimensions: { width: face.size.u, height: THICKNESS, depth: face.size.v } };
+        ? discShape(face.size.u / 2, THICKNESS)
+        : boxShape(Math.max(face.size.u, THICKNESS), THICKNESS, Math.max(face.size.v, THICKNESS));
     /* Solid: a translucent plate over a light face was hardly seen (2026-09-27, :3391); it covers the face it names. */
     return { id: TARGET_FACE, shape, pose: { r, t }, material: { token: TARGET_FACE } };
 }

package/dist-client/modeller/command-preview.js.map

@@ -1 +1 @@
-{"version":3,"file":"command-preview.js","sourceRoot":"","sources":["../../client/modeller/command-preview.ts"],"names":[],"mappings":"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","sourcesContent":["import type { FigureBodyMove, FigureClipLoss, FigureFaceArea, FigureRowReading } from '@hatiolab/figure-model'\n\nimport type { FigureRenderPart } from './renderer.js'\n\n/*\n * A command seen before it is done, as the modeller shows it (ADR-0097 §5.5, designer 2026-09-27): the bodies it would\n * move, translucent where they would stand; the face they would meet, lit; and in words, how far and how each turns --\n * the turn as figure-model gives it, one axis and one angle in the figure's frame.\n */\n\n/* The material tokens of what a command would do: the bodies where they would stand, and the face they would meet. */\nexport const PREVIEW = '__preview'\nexport const TARGET_FACE = '__target-face'\n\nexport type Say = (key: string, params?: Record<string, string>) => string\n\n/** A preview as the editor holds it: bound to the figure, version and command it was worked out for. */\nexport interface HeldPreview {\n  context: string\n  revision: number\n  /** The command, as text: a preview for another command is not this one's. */\n  key: string\n  geometry?: unknown[]\n  moves?: FigureBodyMove[]\n  /** Bodies it would draw that are not drawn now: a row's copies. */\n  added?: string[]\n  /** The row it would make, read on the preview's figure. */\n  row?: FigureRowReading\n  clipsWouldGo?: FigureClipLoss[]\n  face?: FigureFaceArea\n  /** Whether a face was asked for and could not be shown. */\n  faceUnknown?: boolean\n  /** Why the command would be refused; nothing else is shown then. */\n  refused?: string\n}\n\n/** The moving bodies where they would stand, drawn translucent. The ones that stay are not drawn twice. */\nexport function ghostPartsOf(preview: HeldPreview | undefined): FigureRenderPart[] {\n  if (!preview?.geometry || !(preview.moves?.length || preview.added?.length)) return []\n  const moving = new Set([...(preview.moves ?? []).map(m => m.body), ...(preview.added ?? [])])\n  return (preview.geometry as FigureRenderPart[])\n    .filter(body => body && typeof body === 'object' && 'shape' in body && 'pose' in body && moving.has(body.id))\n    .map(body => ({ ...body, id: `${PREVIEW}:${body.id}`, material: { token: PREVIEW, transparent: true } }))\n}\n\n/** How thick the lit face is, and how far off the face it floats, so it neither hides nor flickers with it. */\nconst THICKNESS = 2\nconst LIFT = 1\n\n/** The face the part would meet, lit: a thin plate over a flat face, a thin disc over a round one. */\nexport function faceHighlightOf(face: FigureFaceArea | undefined): FigureRenderPart | null {\n  if (!face) return null\n  /* Its own x · y · z are the face's two sides and its normal, as the kernel gives them. */\n  const r = [0, 1, 2].map(i => [face.u[i]!, face.normal[i]!, face.v[i]!])\n  const t = [0, 1, 2].map(i => face.centre[i]! + face.normal[i]! * (LIFT + THICKNESS / 2))\n  const shape: FigureRenderPart['shape'] = face.round\n    ? { provider: 'cylinder', dimensions: { radius: face.size.u / 2, length: THICKNESS } }\n    : { provider: 'box', dimensions: { width: face.size.u, height: THICKNESS, depth: face.size.v } }\n  /* Solid: a translucent plate over a light face was hardly seen (2026-09-27, :3391); it covers the face it names. */\n  return { id: TARGET_FACE, shape, pose: { r, t }, material: { token: TARGET_FACE } }\n}\n\nconst mm = (v: number) => `${v > 0 ? '+' : v < 0 ? '−' : ''}${Math.abs(Math.round(v * 10) / 10).toLocaleString()}`\n\n/**\n * What the command would do, in words: the part's own move and turn, what goes with it, the clips it would stop, and\n * why nothing can be shown when the command would be refused.\n */\nexport function previewWordsOf(preview: HeldPreview | undefined, part: string, say: Say): string[] {\n  if (!preview) return []\n  if (preview.refused) return [say('figure.text.preview-refused', { reason: preview.refused })]\n  /* A row: what it would be, read as drawn; its part does not move, it is copied. */\n  if (preview.row) return [...rowWordsOf(preview.row, say), ...(preview.clipsWouldGo?.length ? [say('figure.text.preview-clips', { clips: preview.clipsWouldGo.map(c => c.clip).join(', ') })] : [])]\n  const words: string[] = []\n  const own = preview.moves?.find(m => m.body === part)\n  if (!own) words.push(say('figure.text.preview-stays'))\n  else {\n    const axes = (['x', 'y', 'z'] as const).map((axis, i) => [axis, own.translate[i]!] as const).filter(([, v]) => Math.abs(v) >= 0.05)\n    if (axes.length) words.push(say('figure.text.preview-moves', { by: axes.map(([axis, v]) => `${axis.toUpperCase()} ${mm(v)}`).join(' · ') }))\n    if (own.turn) {\n      /* Signed by the right hand about the axis, as the figure's frame has it. */\n      const degrees = mm(own.turn.degrees)\n      words.push(\n        typeof own.turn.axis === 'string'\n          ? say('figure.text.preview-turns-named', { axis: own.turn.axis.toUpperCase(), degrees })\n          : say('figure.text.preview-turns-slanted', { axis: own.turn.axis.map(v => v.toFixed(2)).join(', '), degrees })\n      )\n    }\n  }\n  /* What goes with it: parts fastened to it, each row once, with its count. */\n  const others = new Map<string, number>()\n  for (const m of preview.moves ?? []) if (m.part !== part) others.set(m.part, (others.get(m.part) ?? 0) + 1)\n  if (others.size)\n    words.push(say('figure.text.preview-carries', { parts: [...others].map(([name, n]) => (n > 1 ? say('figure.text.preview-copies', { part: name, n: String(n) }) : name)).join(', ') }))\n  if (preview.clipsWouldGo?.length) words.push(say('figure.text.preview-clips', { clips: preview.clipsWouldGo.map(c => c.clip).join(', ') }))\n  if (preview.faceUnknown) words.push(say('figure.text.preview-face-unknown'))\n  return words\n}\n\n/** A row in words, as figure-model reads it from what is drawn: how many, how far apart, what is left at the ends, what rides it. */\nexport function rowWordsOf(row: FigureRowReading | undefined, say: Say): string[] {\n  if (!row) return []\n  const words = [\n    row.pitch !== undefined\n      ? say('figure.text.row-count-pitch', { part: row.part, count: String(row.count), pitch: String(row.pitch), axis: row.axis.toUpperCase() })\n      : say('figure.text.row-count-uneven', { part: row.part, count: String(row.count), axis: row.axis.toUpperCase() })\n  ]\n  if (!row.margins) words.push(say('figure.text.row-ends-unknown'))\n  else if (row.centred) words.push(say('figure.text.row-ends-centred', { mm: String(row.margins.low) }))\n  else words.push(say('figure.text.row-ends', { low: String(row.margins.low), high: String(row.margins.high) }))\n  if (row.companions.length) words.push(say('figure.text.row-companions', { parts: row.companions.map(c => say('figure.text.preview-copies', { part: c.part, n: String(c.count) })).join(', ') }))\n  return words\n}\n"]}
+{"version":3,"file":"command-preview.js","sourceRoot":"","sources":["../../client/modeller/command-preview.ts"],"names":[],"mappings":"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","sourcesContent":["import type { FigureBodyMove, FigureClipLoss, FigureFaceArea, FigureRowReading } from '@hatiolab/figure-model'\n\nimport type { FigureRenderPart } from './renderer.js'\nimport { boxShape, discShape } from './drawn-shapes.js'\n\n/*\n * A command seen before it is done, as the modeller shows it (ADR-0097 §5.5, designer 2026-09-27): the bodies it would\n * move, translucent where they would stand; the face they would meet, lit; and in words, how far and how each turns --\n * the turn as figure-model gives it, one axis and one angle in the figure's frame.\n */\n\n/* The material tokens of what a command would do: the bodies where they would stand, and the face they would meet. */\nexport const PREVIEW = '__preview'\nexport const TARGET_FACE = '__target-face'\n\nexport type Say = (key: string, params?: Record<string, string>) => string\n\n/** A preview as the editor holds it: bound to the figure, version and command it was worked out for. */\nexport interface HeldPreview {\n  context: string\n  revision: number\n  /** The command, as text: a preview for another command is not this one's. */\n  key: string\n  geometry?: unknown[]\n  moves?: FigureBodyMove[]\n  /** Bodies it would draw that are not drawn now: a row's copies. */\n  added?: string[]\n  /** The row it would make, read on the preview's figure. */\n  row?: FigureRowReading\n  clipsWouldGo?: FigureClipLoss[]\n  face?: FigureFaceArea\n  /** Whether a face was asked for and could not be shown. */\n  faceUnknown?: boolean\n  /** Why the command would be refused; nothing else is shown then. */\n  refused?: string\n}\n\n/** The moving bodies where they would stand, drawn translucent. The ones that stay are not drawn twice. */\nexport function ghostPartsOf(preview: HeldPreview | undefined): FigureRenderPart[] {\n  if (!preview?.geometry || !(preview.moves?.length || preview.added?.length)) return []\n  const moving = new Set([...(preview.moves ?? []).map(m => m.body), ...(preview.added ?? [])])\n  return (preview.geometry as FigureRenderPart[])\n    .filter(body => body && typeof body === 'object' && 'shape' in body && 'pose' in body && moving.has(body.id))\n    .map(body => ({ ...body, id: `${PREVIEW}:${body.id}`, material: { token: PREVIEW, transparent: true } }))\n}\n\n/** How thick the lit face is, and how far off the face it floats, so it neither hides nor flickers with it. */\nconst THICKNESS = 2\nconst LIFT = 1\n\n/** The face the part would meet, lit: a thin plate over a flat face, a thin disc over a round one. */\nexport function faceHighlightOf(face: FigureFaceArea | undefined): FigureRenderPart | null {\n  if (!face) return null\n  /* Its own x · y · z are the face's two sides and its normal, as the kernel gives them. */\n  const r = [0, 1, 2].map(i => [face.u[i]!, face.normal[i]!, face.v[i]!])\n  const t = [0, 1, 2].map(i => face.centre[i]! + face.normal[i]! * (LIFT + THICKNESS / 2))\n  /* A plane touching a curved side is a line (Q3): drawn as a narrow strip, never a plate. */\n  const shape: FigureRenderPart['shape'] = face.round\n    ? discShape(face.size.u / 2, THICKNESS)\n    : boxShape(Math.max(face.size.u, THICKNESS), THICKNESS, Math.max(face.size.v, THICKNESS))\n  /* Solid: a translucent plate over a light face was hardly seen (2026-09-27, :3391); it covers the face it names. */\n  return { id: TARGET_FACE, shape, pose: { r, t }, material: { token: TARGET_FACE } }\n}\n\nconst mm = (v: number) => `${v > 0 ? '+' : v < 0 ? '−' : ''}${Math.abs(Math.round(v * 10) / 10).toLocaleString()}`\n\n/**\n * What the command would do, in words: the part's own move and turn, what goes with it, the clips it would stop, and\n * why nothing can be shown when the command would be refused.\n */\nexport function previewWordsOf(preview: HeldPreview | undefined, part: string, say: Say): string[] {\n  if (!preview) return []\n  if (preview.refused) return [say('figure.text.preview-refused', { reason: preview.refused })]\n  /* A row: what it would be, read as drawn; its part does not move, it is copied. */\n  if (preview.row) return [...rowWordsOf(preview.row, say), ...(preview.clipsWouldGo?.length ? [say('figure.text.preview-clips', { clips: preview.clipsWouldGo.map(c => c.clip).join(', ') })] : [])]\n  const words: string[] = []\n  const own = preview.moves?.find(m => m.body === part)\n  if (!own) words.push(say('figure.text.preview-stays'))\n  else {\n    const axes = (['x', 'y', 'z'] as const).map((axis, i) => [axis, own.translate[i]!] as const).filter(([, v]) => Math.abs(v) >= 0.05)\n    if (axes.length) words.push(say('figure.text.preview-moves', { by: axes.map(([axis, v]) => `${axis.toUpperCase()} ${mm(v)}`).join(' · ') }))\n    if (own.turn) {\n      /* Signed by the right hand about the axis, as the figure's frame has it. */\n      const degrees = mm(own.turn.degrees)\n      words.push(\n        typeof own.turn.axis === 'string'\n          ? say('figure.text.preview-turns-named', { axis: own.turn.axis.toUpperCase(), degrees })\n          : say('figure.text.preview-turns-slanted', { axis: own.turn.axis.map(v => v.toFixed(2)).join(', '), degrees })\n      )\n    }\n  }\n  /* What goes with it: parts fastened to it, each row once, with its count. */\n  const others = new Map<string, number>()\n  for (const m of preview.moves ?? []) if (m.part !== part) others.set(m.part, (others.get(m.part) ?? 0) + 1)\n  if (others.size)\n    words.push(say('figure.text.preview-carries', { parts: [...others].map(([name, n]) => (n > 1 ? say('figure.text.preview-copies', { part: name, n: String(n) }) : name)).join(', ') }))\n  if (preview.clipsWouldGo?.length) words.push(say('figure.text.preview-clips', { clips: preview.clipsWouldGo.map(c => c.clip).join(', ') }))\n  if (preview.faceUnknown) words.push(say('figure.text.preview-face-unknown'))\n  return words\n}\n\n/** A row in words, as figure-model reads it from what is drawn: how many, how far apart, what is left at the ends, what rides it. */\nexport function rowWordsOf(row: FigureRowReading | undefined, say: Say): string[] {\n  if (!row) return []\n  const words = [\n    row.pitch !== undefined\n      ? say('figure.text.row-count-pitch', { part: row.part, count: String(row.count), pitch: String(row.pitch), axis: row.axis.toUpperCase() })\n      : say('figure.text.row-count-uneven', { part: row.part, count: String(row.count), axis: row.axis.toUpperCase() })\n  ]\n  if (!row.margins) words.push(say('figure.text.row-ends-unknown'))\n  else if (row.centred) words.push(say('figure.text.row-ends-centred', { mm: String(row.margins.low) }))\n  else words.push(say('figure.text.row-ends', { low: String(row.margins.low), high: String(row.margins.high) }))\n  if (row.companions.length) words.push(say('figure.text.row-companions', { parts: row.companions.map(c => say('figure.text.preview-copies', { part: c.part, n: String(c.count) })).join(', ') }))\n  return words\n}\n"]}

package/dist-client/modeller/drawn-shapes.d.ts

@@ -0,0 +1,44 @@
+/**
+ * Shapes the modeller draws of its own -- a lit face, a joint's fan, a slide's line -- written as the shapes figure-model
+ * evaluates (ADR-0100): a section pushed along Y, centred. things-scene's one builder draws them as it draws a part.
+ */
+export interface DrawnShape {
+    provider: 'extrude';
+    dimensions: Record<string, number>;
+    extrusion: {
+        axis: 'y';
+        section: DrawnSection;
+        start: number;
+        end: number;
+    };
+}
+type DrawnSection = {
+    kind: 'rectangle';
+    size: {
+        x: number;
+        z: number;
+    };
+} | {
+    kind: 'ellipse';
+    radius: {
+        x: number;
+        z: number;
+    };
+} | {
+    kind: 'polygon';
+    points: Array<{
+        id: string;
+        x: number;
+        z: number;
+    }>;
+};
+/** A box: width along X, height along Y, depth along Z. */
+export declare const boxShape: (width: number, height: number, depth: number) => DrawnShape;
+/** A disc of a radius, `height` thick along Y. */
+export declare const discShape: (radius: number, height: number) => DrawnShape;
+/** A section in X-Z, `height` thick along Y. */
+export declare const sectionShape: (points: ReadonlyArray<{
+    x: number;
+    z: number;
+}>, height: number) => DrawnShape;
+export {};

package/dist-client/modeller/drawn-shapes.js

@@ -0,0 +1,12 @@
+const centred = (section, height) => ({
+    provider: 'extrude',
+    dimensions: { length: height },
+    extrusion: { axis: 'y', section, start: -height / 2, end: height / 2 }
+});
+/** A box: width along X, height along Y, depth along Z. */
+export const boxShape = (width, height, depth) => centred({ kind: 'rectangle', size: { x: width, z: depth } }, height);
+/** A disc of a radius, `height` thick along Y. */
+export const discShape = (radius, height) => centred({ kind: 'ellipse', radius: { x: radius, z: radius } }, height);
+/** A section in X-Z, `height` thick along Y. */
+export const sectionShape = (points, height) => centred({ kind: 'polygon', points: points.map((p, i) => ({ id: `p${i + 1}`, x: p.x, z: p.z })) }, height);
+//# sourceMappingURL=drawn-shapes.js.map

package/dist-client/modeller/drawn-shapes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"drawn-shapes.js","sourceRoot":"","sources":["../../client/modeller/drawn-shapes.ts"],"names":[],"mappings":"AAcA,MAAM,OAAO,GAAG,CAAC,OAAqB,EAAE,MAAc,EAAc,EAAE,CAAC,CAAC;IACtE,QAAQ,EAAE,SAAS;IACnB,UAAU,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;IAC9B,SAAS,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,EAAE;CACvE,CAAC,CAAA;AAEF,2DAA2D;AAC3D,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,KAAa,EAAE,MAAc,EAAE,KAAa,EAAc,EAAE,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;AAE1J,kDAAkD;AAClD,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,MAAc,EAAE,MAAc,EAAc,EAAE,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;AAE/I,gDAAgD;AAChD,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,MAA+C,EAAE,MAAc,EAAc,EAAE,CAC1G,OAAO,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA","sourcesContent":["/**\n * Shapes the modeller draws of its own -- a lit face, a joint's fan, a slide's line -- written as the shapes figure-model\n * evaluates (ADR-0100): a section pushed along Y, centred. things-scene's one builder draws them as it draws a part.\n */\nexport interface DrawnShape {\n  provider: 'extrude'\n  dimensions: Record<string, number>\n  extrusion: { axis: 'y'; section: DrawnSection; start: number; end: number }\n}\ntype DrawnSection =\n  | { kind: 'rectangle'; size: { x: number; z: number } }\n  | { kind: 'ellipse'; radius: { x: number; z: number } }\n  | { kind: 'polygon'; points: Array<{ id: string; x: number; z: number }> }\n\nconst centred = (section: DrawnSection, height: number): DrawnShape => ({\n  provider: 'extrude',\n  dimensions: { length: height },\n  extrusion: { axis: 'y', section, start: -height / 2, end: height / 2 }\n})\n\n/** A box: width along X, height along Y, depth along Z. */\nexport const boxShape = (width: number, height: number, depth: number): DrawnShape => centred({ kind: 'rectangle', size: { x: width, z: depth } }, height)\n\n/** A disc of a radius, `height` thick along Y. */\nexport const discShape = (radius: number, height: number): DrawnShape => centred({ kind: 'ellipse', radius: { x: radius, z: radius } }, height)\n\n/** A section in X-Z, `height` thick along Y. */\nexport const sectionShape = (points: ReadonlyArray<{ x: number; z: number }>, height: number): DrawnShape =>\n  centred({ kind: 'polygon', points: points.map((p, i) => ({ id: `p${i + 1}`, x: p.x, z: p.z })) }, height)\n"]}

package/dist-client/modeller/editor.d.ts

@@ -6,6 +6,7 @@ import type { FigureProductSession } from './product-session.js';
 import './canvas.js';
 import './figure-parts.js';
 import './figure-material-panel.js';
+import './figure-section-panel.js';
 import './figure-links.js';
 import './figure-controls.js';
 import './figure-clips.js';
@@ -196,12 +197,6 @@ export declare class FigureEditor extends LitElement {
     private lastAnchors;
     /** The figure's controls: try a value, name it, set its range and travel time, keep the pose. */
     private renderControls;
-    /**
-     * "Follow the size and keep where the figure is placed" (ADR-0097): figure-model plans it from the figure as it is now,
-     * and the whole plan is one step of the history. A refusal with a way on -- move the part onto the plane, replace how
-     * its position is worked out -- asks in the app's prompt and plans again with that choice; any other says why.
-     */
-    private resizeWithPlacement;
     /** One command, one step of the history. A refusal a person can meet here is said in their words. */
     private linkCommand;
     private changeField;