@things-factory/figure-ui 10.1.147 → 10.1.149

package/client/bootstrap.ts

@@ -1,7 +1,10 @@
+import { getPathInfo } from '@operato/utils'
+import { setFigureMeshResolver } from '@hatiolab/things-scene'
+
 /**
  * 클라이언트 부트스트랩.
  *
- * 지금은 등록할 것이 없다. 그래도 이 파일을 두는 이유는 `things-factory.config.js` 가
+ * 메시 부품의 파일을 어디서 받는지를 things-scene 에 알린다(ADR-0129). 이 파일을 두는 다른 이유는 `things-factory.config.js` 가
  * `bootstrap` 을 가리키기 때문이고, 데이터 그리드용 편집기·렌더러나 속성 편집기를
  * 붙이게 되면 여기가 그 자리다(`board-ui/client/bootstrap.ts` 가 그 예다).
  *
@@ -12,5 +15,10 @@
  * 올리는 것은 운영자가 메뉴를 만들어 `figure-list` 를 가리키게 하는 일이다.
  */
 export default function bootstrap() {
-  // 등록할 것이 생기면 여기에 둔다.
+  /*
+    Where a mesh part's file is fetched from on this server (ADR-0129 decision 8): `/figure-mesh/:hash`, behind the
+    figure permission. The domain part is read when a file is asked for, as the thumbnails read it -- the domain can
+    change while the app runs.
+  */
+  setFigureMeshResolver(hash => `${getPathInfo(location.pathname).contextPath}/figure-mesh/${hash}`)
 }

package/client/graphql/index.ts

@@ -475,3 +475,23 @@ export async function fetchRecipeGuide(name: string, lang: string): Promise<stri
   })
   return unwrap<{ guide?: string } | null>(response, 'figureRecipeTemplate')?.guide ?? ''
 }
+
+/**
+ * A GLB for a mesh part (ADR-0129): the server reads it, keeps it by its hash and answers what it holds. A file a board
+ * cannot draw is refused with the reason in the screen's words.
+ */
+export async function uploadFigureMesh(file: File): Promise<import('../modeller/mesh-import.js').MeshUpload> {
+  const response = await client.mutate({
+    mutation: gql`
+      mutation UploadFigureMesh($file: Upload!) {
+        uploadFigureMesh(file: $file) {
+          hash
+          summary
+        }
+      }
+    `,
+    variables: { file },
+    context: { hasUpload: true }
+  })
+  return unwrap(response, 'uploadFigureMesh')
+}

package/client/modeller/canvas.ts

@@ -7,6 +7,7 @@ import type { FigureRenderPart } from './renderer.js'
 import { DEFAULT_VIEW, sceneLook, WORKBENCH, type ViewSettings } from './figure-view.js'
 import { boardFor, changedKeys, componentOf, gizmoResultOf, type Board, type ScaleAnchor } from './stage-model.js'
 import { JOINT_FAN } from './joint-fan.js'
+import { SLOT_MARK } from './slot-layout-host.js'
 import { PREVIEW, TARGET_FACE } from './command-preview.js'
 import { ownerOf } from './fields.js'
 
@@ -95,6 +96,8 @@ export class FigureCanvas extends LitElement {
    */
   @property({ attribute: false }) ghost: FigureRenderPart[] = []
   @property({ attribute: false }) highlight: FigureRenderPart | null = null
+  /** The slots a slot layout unfolds to (ADR-0118), as boxes of what each allows: shown, never picked, never saved. */
+  @property({ attribute: false }) marks: FigureRenderPart[] = []
 
   @query('div[stage]') private stage!: HTMLDivElement
 
@@ -124,7 +127,7 @@ export class FigureCanvas extends LitElement {
 
   protected updated(changed: PropertyValues) {
     if (!this.hasUpdated) return
-    if (['parts', 'palette', 'context', 'fan', 'anchors', 'ghost', 'highlight'].some(key => changed.has(key))) this.standUp()
+    if (['parts', 'palette', 'context', 'fan', 'anchors', 'ghost', 'highlight', 'marks'].some(key => changed.has(key))) this.standUp()
     if (changed.has('view')) this.applyView()
     if (changed.has('selected')) this.showSelected()
   }
@@ -223,7 +226,8 @@ export class FigureCanvas extends LitElement {
     /* The fan in the accent colour, translucent; `capturable: false` keeps clicks, the marquee and the gizmo off it. */
     const fan = this.fan ? componentOf(this.fan, { ...this.palette, [JOINT_FAN]: this.palette['palette.accent'] ?? FAN_COLOUR }, this.board!) : null
     const accent = this.palette['palette.accent'] ?? FAN_COLOUR
-    const shown = [...(fan ? [fan] : []), ...this.ghost.map(part => componentOf(part, { ...this.palette, [PREVIEW]: accent, [TARGET_FACE]: accent }, this.board!)), ...(this.highlight ? [componentOf(this.highlight, { ...this.palette, [TARGET_FACE]: accent }, this.board!)] : [])]
+    const slots = this.marks.map(part => componentOf(part, { ...this.palette, [SLOT_MARK]: this.palette['palette.secondary'] ?? accent }, this.board!))
+    const shown = [...(fan ? [fan] : []), ...slots, ...this.ghost.map(part => componentOf(part, { ...this.palette, [PREVIEW]: accent, [TARGET_FACE]: accent }, this.board!)), ...(this.highlight ? [componentOf(this.highlight, { ...this.palette, [TARGET_FACE]: accent }, this.board!)] : [])]
     return [...parts, ...shown.filter((c): c is Record<string, unknown> => !!c).map(c => ({ ...c, capturable: false, locked: true }))]
   }
 

package/client/modeller/carrier-declaration.ts

@@ -0,0 +1,63 @@
+/*
+ * A figure that is a carrier type declares so (ADR-0123): the CARRIERTYPE code a material handling system reports, and
+ * the carrier's physical size in mm. Kept apart from the element so it is tested without a browser.
+ *
+ * The rule is figure-model's (`carrierDeclarationRefusal`); the field asks it before sending `set-carrier`, so a value
+ * the kernel refuses is said beside the field and never becomes a step of the history. The size is what the author
+ * types, never read off the occupied room.
+ */
+import { carrierDeclarationRefusal, FIGURE_CARRIER_TYPE_MAX, normalizeCarrierType, type FigureAsset, type FigureAuthoringAction } from '@hatiolab/figure-model'
+
+type Say = (key: string, params: Record<string, string>) => string
+type Declaration = NonNullable<FigureAsset['carrier']>
+
+export const CARRIER_AXES = ['width', 'length', 'height'] as const
+export type CarrierAxis = (typeof CARRIER_AXES)[number]
+
+/** What the field holds while the author types: the code and the three lengths as typed. */
+export type CarrierDraft = { type: string } & Record<CarrierAxis, string>
+
+/** The field's values for a declaration, or blank for a figure that declares none. */
+export function carrierDraftOf(carrier?: Declaration): CarrierDraft {
+  return {
+    type: carrier?.type ?? '',
+    width: carrier ? String(carrier.dimensions.width) : '',
+    length: carrier ? String(carrier.dimensions.length) : '',
+    height: carrier ? String(carrier.dimensions.height) : ''
+  }
+}
+
+/** Whether the field says what is declared already: nothing to send. */
+export function draftIsDeclared(draft: CarrierDraft, carrier?: Declaration): boolean {
+  const declared = carrierDraftOf(carrier)
+  return normalizeCarrierType(draft.type) === declared.type && CARRIER_AXES.every(axis => Object.is(lengthOf(draft[axis]), lengthOf(declared[axis])))
+}
+
+/** A typed length as a number; blank is no length. */
+const lengthOf = (typed: string) => (typed.trim() === '' ? Number.NaN : Number(typed))
+
+/**
+ * The `set-carrier` command for what the field holds, or why the kernel would refuse it in the author's words. The
+ * code is sent as the kernel stores it (trimmed, upper case).
+ */
+export function carrierCommandOf(draft: CarrierDraft, say: Say): { action: FigureAuthoringAction } | { refusal: string } {
+  const carrier = {
+    type: normalizeCarrierType(draft.type),
+    dimensions: { width: lengthOf(draft.width), length: lengthOf(draft.length), height: lengthOf(draft.height) }
+  }
+  const refused = carrierDeclarationRefusal(carrier)
+  if (refused) return { refusal: carrierRefusalOf(refused, carrier.type, say) }
+  return { action: { kind: 'set-carrier', carrier } }
+}
+
+/**
+ * A carrier declaration refused, said from its code and path (ADR-0127): the code missing or too long, or the length
+ * the path names. The kernel's English is never shown; a code the field has no words for is said with the code.
+ */
+export function carrierRefusalOf(refused: { code: string; path: string }, type: string, say: Say): string {
+  if (refused.code === 'CARRIER_TYPE')
+    return type ? say('figure.text.carrier-type-too-long', { max: String(FIGURE_CARRIER_TYPE_MAX) }) : say('figure.text.carrier-type-required', {})
+  const axis = CARRIER_AXES.find(one => refused.path.endsWith(`.${one}`))
+  if (refused.code === 'CARRIER_DIMENSIONS' && axis) return say('figure.text.carrier-length-positive', { axis: say(`figure.label.carrier-${axis}`, {}) })
+  return say('figure.text.edit-refused', { code: refused.code })
+}

package/client/modeller/editor.ts

@@ -2,7 +2,7 @@ import { LitElement, html, css, nothing, type PropertyValues } from 'lit'
 import { i18next } from '@operato/i18n'
 import type { OxThreePane } from '@operato/layout'
 import '@operato/layout'
-import { notify } from '@operato/layout'
+import { notify, openPopup } from '@operato/layout'
 import { OxPrompt } from '@operato/popup'
 import { customElement, property, state } from 'lit/decorators.js'
 import { live } from 'lit/directives/live.js'
@@ -35,6 +35,12 @@ import { ScrollbarStyles } from '@operato/styles'
 import { alignChanges, canMirror, mirrorChanges, type AlignTool } from './align.js'
 import type { FigurePaletteKind, FigurePartRow } from './figure-parts.js'
 import { paletteRecipe } from './palette.js'
+import { meshChoicesOf, meshPartIdOf, meshPartOf } from './mesh-import.js'
+import './figure-mesh-choice.js'
+import { uploadFigureMesh } from '../graphql/index.js'
+import { slotMarksOf } from './slot-layout-host.js'
+
+const NO_MARKS: FigureRenderPart[] = []
 import { apexOver, drawnOf } from './section-drawing.js'
 import { END_FACE } from './section-controls.js'
 import type { FigureCanvas } from './canvas.js'
@@ -43,7 +49,7 @@ import { nudgeOf, placementOf, type ScaleAnchor } from './stage-model.js'
 /** The numbers a rule gives a part's position, turn and size, per axis, for the cells that have no field. */
 type HeldValues = { position?: number[]; rotation?: number[]; size?: (number | undefined)[]; sizeRuled?: boolean }
 import { roomRefitRowsOf } from './occupancy.js'
-import { editRefusalOf, inDeclaredRoom, inputRangeRefusalOf, narrowingRetryOf, partRefusalOf, placementRefusalOf, recipeRefusalOf, removalNoticeOf, sizeRangeRefusalOf } from './refusals.js'
+import { editRefusalOf, inDeclaredRoom, narrowingRetryOf, partNameRefusalOf, partRefusalOf, placedRefusalOf, recipeRefusalOf, removalNoticeOf } from './refusals.js'
 import type { FigureRenderPart } from './renderer.js'
 import type { FigureBudgetLine } from './maturity.js'
 import { endPlaceKeyOf, fieldWordsOf, followOf, measureNow, partSummaryOf, instanceRangeOf, instanceRangeToDeclare, proportionToFollow, rangeDiffers, rangeWith, turnsAboutAJoint, valueNow } from './links.js'
@@ -709,8 +715,7 @@ export class FigureEditor extends LitElement {
       this.changed()
     } catch (error) {
       if (this.askClipLoss(error, () => this.run(action))) return
-      const say = (key: string, params: Record<string, string>) => i18next.t(key, params)
-      this.error = sizeRangeRefusalOf(error, say) ?? inputRangeRefusalOf(error, say) ?? this.said(error)
+      this.error = this.said(error)
     } finally {
       /* Committed or refused, the value in hand is gone: the figure as it stands is drawn again. */
       this.live = NOTHING_LIVE
@@ -806,6 +811,39 @@ export class FigureEditor extends LitElement {
       this.selected = part.id
     })
   }
+  /**
+   * A GLB made into a mesh part (ADR-0129): the server reads and keeps it, the author picks the whole file or one node
+   * of it, and the part is added as one step of the history, standing where it stood in the file. A file the server
+   * refuses is said in its words; nothing is added.
+   */
+  private async importMesh(file: File) {
+    if (!this.session) return
+    let upload: Awaited<ReturnType<typeof uploadFigureMesh>>
+    try {
+      upload = await uploadFigureMesh(file)
+    } catch (error) {
+      this.error = this.said(error)
+      return
+    }
+    const choices = meshChoicesOf(upload)
+    /* Only the whole file and the one node that is all of it: there is nothing to choose between. */
+    const choice =
+      choices.length <= 2
+        ? {}
+        : await openPopup(html`<figure-mesh-choice .choices=${choices}></figure-mesh-choice>`, {
+            backdrop: true,
+            size: 'small',
+            title: i18next.t('figure.title.choose-mesh-part')
+          }).result
+    if (!choice) return
+    const node = upload.summary.nodes.find(n => n.index === (choice as { node?: number }).node)
+    this.run(() => {
+      const taken = new Set(this.session!.read().geometry.map(g => g.id))
+      const id = meshPartIdOf(node?.name ?? file.name.replace(/\.glb$/i, ''), taken)
+      this.session!.add(meshPartOf(upload, choice as { node?: number }, id))
+      this.selected = id
+    })
+  }
   /**
    * The list's own operations, as part edits — each one step of the session's history. The copy and the moved
    * part stay selected.
@@ -979,12 +1017,7 @@ export class FigureEditor extends LitElement {
       this.error = ''
       this.changed()
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error)
-      this.error = /carried by a joint/.test(message)
-        ? i18next.t('figure.text.gizmo-joint-places', { part: partLabelOf(id) })
-        : /is fastened to/.test(message)
-          ? i18next.t('figure.text.gizmo-fastening-places', { part: partLabelOf(id) })
-          : this.said(error)
+      this.error = placedRefusalOf(error, partLabelOf(id), (key, params) => i18next.t(key, params)) ?? this.said(error)
       this.requestUpdate()
     }
   }
@@ -1104,13 +1137,8 @@ export class FigureEditor extends LitElement {
       this.changed()
     } catch (error) {
       input.value = from
-      const code = (error as { code?: string })?.code
-      this.error =
-        code === 'PART_ID'
-          ? i18next.t(/^[a-zA-Z][a-zA-Z0-9_-]*$/.test(name) ? 'figure.text.part-name-taken' : 'figure.text.part-name-invalid', { name })
-          : error instanceof Error
-            ? error.message
-            : String(error)
+      /* Whether a name is a name is the kernel's rule, said from its refusal (ADR-0127), not checked again here. */
+      this.error = partNameRefusalOf(error, (key, params) => i18next.t(key, params)) ?? this.said(error)
     }
   }
   /** Size response, fastening and motion for the selected part, as authoring commands. */
@@ -1237,9 +1265,7 @@ export class FigureEditor extends LitElement {
           ? i18next.t('figure.text.follow-would-loop')
           : code === 'FASTEN_CYCLE' || code === 'ATTACH_CYCLE'
             ? i18next.t('figure.text.fasten-would-loop')
-            : sizeRangeRefusalOf(error, (key, params) => i18next.t(key, params)) ??
-              placementRefusalOf(error, (key, params) => i18next.t(key, params)) ??
-              this.said(error)
+            : this.said(error)
       return false
     }
   }
@@ -1596,13 +1622,7 @@ export class FigureEditor extends LitElement {
       this.changed()
     } catch (error) {
       input.value = String(field.value)
-      const code = (error as { code?: string })?.code
-      const message = error instanceof Error ? error.message : String(error)
-      const found = /\((\d[\d.]*) mm\) a pitch under ([\d.]+) mm makes more than (\d+)/.exec(message)
-      this.error =
-        code === 'INPUT_RANGE' && found
-          ? i18next.t('figure.text.repeat-pitch-too-small', { length: Number(found[1]).toLocaleString(), min: found[2], limit: found[3] })
-          : this.said(error)
+      this.error = this.said(error)
     }
   }
   /** Choose a part, from the list, the canvas or a place row. A figure-level tab gives way to the part's properties. */
@@ -1799,6 +1819,19 @@ export class FigureEditor extends LitElement {
     const trying = this.middle === 'preview' ? this.renderRoot.querySelector<HTMLElement & { tried?: () => { clips?: Record<string, number>; controls?: Record<string, number> } | undefined }>('figure-preview')?.tried?.() : undefined
     return { ...(this.selected ? { part: this.selected } : {}), ...(trying ? { trying } : {}) }
   }
+  /**
+   * The slots the figure's slot layout unfolds to, where they fall now (ADR-0118): drawn while the places are being
+   * edited. Made again only when the evaluation is new, so the canvas is not stood up again for nothing.
+   */
+  private slotMarks(view: { bindings?: readonly unknown[] }, asset: unknown) {
+    const places = view.bindings ?? []
+    if (this.slotMarksDrawn?.of !== places) {
+      const layout = (asset as { document?: { capabilities?: { slotLayout?: { layout: never } } } })?.document?.capabilities?.slotLayout?.layout
+      this.slotMarksDrawn = { of: places, marks: slotMarksOf(places as never, layout) as never }
+    }
+    return this.slotMarksDrawn.marks
+  }
+  private slotMarksDrawn?: { of: readonly unknown[]; marks: FigureRenderPart[] }
   private choose(id: string) {
     /* A copy on the canvas selects its repeat: the part the author made. */
     this.selected = id ? ownerOf(id) : id
@@ -2057,6 +2090,7 @@ export class FigureEditor extends LitElement {
           @show-model-settings=${() => this.showModelSettings()}
           ?locked=${unavailable}
           @add-part=${(e: CustomEvent) => this.add(e.detail.kind)}
+          @import-mesh=${(e: CustomEvent) => this.importMesh(e.detail.file)}
           .recipeCount=${this.templates.length}
           @open-recipe-catalog=${() => ((this.catalogOpen = true), (this.recipeError = ''))}
           @select-part=${(e: CustomEvent) => this.choose(e.detail.id)}
@@ -2096,6 +2130,7 @@ export class FigureEditor extends LitElement {
           .fan=${this.fanOf(shown, live)}
           .ghost=${this.previewShown().ghost}
           .highlight=${this.previewShown().highlight}
+          .marks=${this.tab === 'capability' ? this.slotMarks(view, asset) : NO_MARKS}
           .palette=${view.palette ?? {}}
           .context=${view.context ?? ''}
           .selected=${this.selected}

package/client/modeller/figure-carrier.ts

@@ -0,0 +1,117 @@
+import { css, html, LitElement, nothing, type PropertyValues } from 'lit'
+import { customElement, property, state } from 'lit/decorators.js'
+import { live } from 'lit/directives/live.js'
+
+import { i18next, localize } from '@operato/i18n'
+import type { FigureAsset, FigureAuthoringAction } from '@hatiolab/figure-model'
+
+import { CARRIER_AXES, carrierCommandOf, carrierDraftOf, draftIsDeclared, type CarrierAxis, type CarrierDraft } from './carrier-declaration.js'
+import { SidePanelStyles } from './side-panel-styles.js'
+
+const AXIS_LETTER: Record<CarrierAxis, string> = { width: 'W', length: 'L', height: 'H' }
+
+/**
+ * 캐리어 — the CARRIERTYPE code and physical size a carrier figure declares (ADR-0123), in the properties tab.
+ *
+ * Declaring and clearing are `set-carrier` commands, sent up as `command` like the tab's others, so the page runs them as
+ * steps of the session's history: undo takes them back and they are saved with the figure. A value the kernel refuses
+ * is said here and sends nothing.
+ */
+@customElement('figure-carrier')
+export class FigureCarrier extends localize(i18next)(LitElement) {
+  static styles = [SidePanelStyles, css`
+    div[row] {
+      display: flex;
+      gap: 6px;
+    }
+    div[row] > button[act] {
+      flex: 1;
+      margin-top: 0;
+    }
+    small[role='alert'] {
+      color: var(--md-sys-color-error);
+    }
+  `]
+
+  /** What the figure on screen declares; absent when it is not a carrier type. */
+  @property({ attribute: false }) carrier?: FigureAsset['carrier']
+  @state() private draft: CarrierDraft = carrierDraftOf()
+  @state() private refusal = ''
+  /* The declaration the field was last filled from: other edits draw the tab again and must not wipe what is being typed. */
+  private filledFrom?: string
+
+  willUpdate(changed: PropertyValues<this>) {
+    if (!changed.has('carrier')) return
+    const declared = JSON.stringify(this.carrier ?? null)
+    if (declared === this.filledFrom) return
+    this.filledFrom = declared
+    this.draft = carrierDraftOf(this.carrier)
+    this.refusal = ''
+  }
+
+  render() {
+    const pending = !draftIsDeclared(this.draft, this.carrier)
+    return html`<section>
+      <h3>${i18next.t('figure.label.group-carrier')}</h3>
+      <div field>
+        <label for="carrier-type">${i18next.t('figure.label.carrier-type')}</label>
+        <input
+          id="carrier-type"
+          .value=${live(this.draft.type)}
+          placeholder=${i18next.t('figure.text.carrier-type-placeholder')}
+          @input=${(e: Event) => this.type('type', e)}
+          @keydown=${this.enter}
+        />
+      </div>
+      <div vector-row>
+        <label>${i18next.t('figure.label.carrier-size')} <span unit>mm</span></label>
+        <div triple>
+          ${CARRIER_AXES.map(
+            axis => html`<div cell>
+              <span axis>${AXIS_LETTER[axis]}</span>
+              <input
+                type="number"
+                min="0"
+                step="any"
+                aria-label=${i18next.t(`figure.label.carrier-${axis}`)}
+                .value=${live(this.draft[axis])}
+                @input=${(e: Event) => this.type(axis, e)}
+                @keydown=${this.enter}
+              />
+            </div>`
+          )}
+        </div>
+      </div>
+      ${this.refusal ? html`<small role="alert">${this.refusal}</small>` : nothing}
+      <div row>
+        <button act ?disabled=${!pending} @click=${this.declare}>
+          <md-icon>check</md-icon>${i18next.t('figure.button.declare-carrier')}
+        </button>
+        <button act ?disabled=${!this.carrier} @click=${this.clear}>
+          <md-icon>close</md-icon>${i18next.t('figure.button.clear-carrier')}
+        </button>
+      </div>
+    </section>`
+  }
+
+  private type(key: keyof CarrierDraft, event: Event) {
+    this.draft = { ...this.draft, [key]: (event.target as HTMLInputElement).value }
+    this.refusal = ''
+  }
+
+  private enter = (event: KeyboardEvent) => {
+    if (event.key === 'Enter' && !draftIsDeclared(this.draft, this.carrier)) this.declare()
+  }
+
+  private declare = () => {
+    const made = carrierCommandOf(this.draft, (key, params) => i18next.t(key, params))
+    if ('refusal' in made) this.refusal = made.refusal
+    else this.command(made.action)
+  }
+
+  private clear = () => this.command({ kind: 'set-carrier', carrier: null })
+
+  private command(action: FigureAuthoringAction) {
+    this.dispatchEvent(new CustomEvent('command', { detail: { action }, bubbles: true, composed: true }))
+  }
+}

package/client/modeller/figure-cavity-drawing.ts

@@ -5,7 +5,7 @@ import { ref } from 'lit/directives/ref.js'
 import { i18next, localize } from '@operato/i18n'
 import { figureCavitySectionOf } from '@hatiolab/figure-model'
 import type { FigureAuthoringAction, FigureCavityRequest, FigureEvaluatedShape, FigureSection } from '@hatiolab/figure-model'
-import { cavityRefusalOf, cavityWorkingOf, END_FACE, endToggled, mm, SIDE_FACE, sideWallLimitOf, wallDragged } from './section-controls.js'
+import { cavityRefusalWordsOf, cavityWorkingOf, END_FACE, endToggled, mm, SIDE_FACE, wallDragged } from './section-controls.js'
 
 type Axis = 'x' | 'y' | 'z'
 
@@ -87,14 +87,8 @@ export class FigureCavityDrawing extends localize(i18next)(LitElement) {
 
   /** What the kernel would refuse, in words; for one side's wall, the most that side can be with the opposite kept. */
   private judge(w: NonNullable<ReturnType<typeof cavityWorkingOf>>, side?: string): string {
-    const ask = cavityRefusalOf(this.body!.shape, this.request(w))
-    if (!ask) return ''
-    if (ask.code === 'wall-too-thick')
-      return i18next.t('figure.text.section-wall-over', {
-        max: String(this.perSide && side ? mm(sideWallLimitOf(this.body!.shape, w.wall, side)) : ask.max)
-      })
-    if (ask.code === 'ends-too-thick') return i18next.t('figure.text.section-ends-over', { max: String(ask.max) })
-    return i18next.t('figure.text.section-not-positive')
+    const words = cavityRefusalWordsOf(this.body!.shape, w, this.perSide, side)
+    return words ? i18next.t(words.key, words.params) : ''
   }
 
   /** The working inside while dragging: drawn, judged, and previewed behind when the kernel would take it. */

package/client/modeller/figure-first-save.ts

@@ -7,15 +7,12 @@ import { CommonPopupStyles, FormFieldStyles } from '@operato/styles'
 import '@material/web/button/filled-button.js'
 import '@material/web/button/text-button.js'
 
-import { firstSaveRefusalOf, releasableType, suggestTypeOf, typeOf, type FirstSave } from './first-save.js'
+import { firstSaveRefusalOf, offeredTypeOf, releasableType, typeOf, type FirstSave } from './first-save.js'
 
 /**
  * The first save of a new figure: its type and its name, asked once, in the suite's popup look.
  * Closes with the answer, or with nothing when cancelled -- then nothing is saved.
  */
-/** The shape of an identifier the modeller offers (`suggestTypeOf`'s random form). */
-const OFFERED = /^fig-[0-9a-z]{6}$/
-
 @customElement('figure-first-save')
 export class FigureFirstSave extends LitElement {
   static styles = [
@@ -61,9 +58,9 @@ export class FigureFirstSave extends LitElement {
   */
   willUpdate(changed: Map<string, unknown>) {
     if (!(changed.has('type') || changed.has('taken'))) return
-    const offeredAndTaken = OFFERED.test(this.type) && this.taken.includes(this.type)
-    if (!this.type || offeredAndTaken) this.type = this.suggested = suggestTypeOf(this.name, this.taken)
-    else if (OFFERED.test(this.type)) this.suggested = this.type
+    const offer = offeredTypeOf(this.type, this.name, this.taken)
+    this.type = offer.type
+    if (offer.suggested !== undefined) this.suggested = offer.suggested
   }
 
   render() {

package/client/modeller/figure-history-panel.ts

@@ -14,6 +14,7 @@ import { getPathInfo } from '@operato/utils'
 import { fetchFigureVersions, fetchReplacedDrafts, inspectFigure, releaseFigure, revertFigureVersion, undoFigureRevert } from '../graphql/index.js'
 import type { KeptDraft } from '../graphql/index.js'
 import { afterRevertAnswer, revertOutcomeUnknown, revertRequestFor } from './revert-request.js'
+import { packageHrefOf } from './modeller-route.js'
 import type { RevertRequest } from './revert-request.js'
 import type { FigureGateFinding, FigureInspection, FigureVersion } from '../types.js'
 import { OxPrompt } from '@operato/popup'
@@ -433,9 +434,7 @@ export class FigureHistoryPanel extends localize(i18next)(LitElement) {
 
   /** Where one released version downloads as a package file, or undefined before the figure has a full name. */
   private packageHref(version: number): string | undefined {
-    if (!this.figureNamespace || !this.figureType) return undefined
-    const { contextPath } = getPathInfo(location.pathname)
-    return `${contextPath}/figure-package?refs=${encodeURIComponent(`${this.figureNamespace}/${this.figureType}@${version}`)}`
+    return packageHrefOf(getPathInfo(location.pathname).contextPath, this.figureNamespace, this.figureType, version)
   }
 
   private renderVersion(version: FigureVersion) {