@things-factory/figure-ui 10.1.241 → 10.1.244

package/client/graphql/store.ts

@@ -1,6 +1,6 @@
 import gql from 'graphql-tag'
 import { client } from '@operato/graphql'
-import { fetchFigure } from './index.js'
+import { fetchFigure, updateFigure } from './index.js'
 import { reached } from './reached.js'
 import type { FigureProductStore, FigureProductRecord } from '../modeller/product-session.js'
 
@@ -57,5 +57,6 @@ export const figureProductStore: FigureProductStore = {
     const result = response.data?.saveFigure as FigureProductRecord | undefined
     if (!result?.id || !result.source) throw Error('서버가 저장 결과를 돌려주지 않았습니다.')
     return result
-  }
+  },
+  updateCatalog: (id, patch) => updateFigure(id, patch)
 }

package/client/modeller/editor.ts

@@ -8,7 +8,7 @@ import { openPopup } from '@operato/layout'
 import { OxPrompt } from '@operato/popup'
 import { customElement, property, state } from 'lit/decorators.js'
 import { live } from 'lit/directives/live.js'
-import { figureFastenAxesOf, figurePartFaceOf, PART_LIMIT, parseFigureRecipe, resolveFigureRecipe, figurePartCountOf, figurePartIdFor, figureRecipeIdFor, figureSizeEditOf, figureSizeEditorOf, figureSectionMeasuresOf, figurePlaneAlignChanges, type FigurePlaneContact, figureRowOf, type FigureRowReading, figureFaceOverhangOf, type FigureFaceOverhang } from '@hatiolab/figure-model'
+import { parseFigureAsset, figureFastenAxesOf, figurePartFaceOf, PART_LIMIT, parseFigureRecipe, resolveFigureRecipe, figurePartCountOf, figurePartIdFor, figureRecipeIdFor, figureSizeEditOf, figureSizeEditorOf, figureSectionMeasuresOf, figurePlaneAlignChanges, type FigurePlaneContact, figureRowOf, type FigureRowReading, figureFaceOverhangOf, type FigureFaceOverhang } from '@hatiolab/figure-model'
 import type { RecipeTemplate } from './recipes.js'
 import './figure-recipe-catalog.js'
 import type { FigureAsset, FigureAuthoringAction, FigureEvaluatedShape, FigureInputChange, FigurePartEdit, FigurePrimitiveCreation, FigureProposalStep, FigureRecipe, FigureRecipeValue, FigurePlacement, FigureFaceMappingNeed, FigureFaceRemap } from '@hatiolab/figure-model'
@@ -28,6 +28,10 @@ import './figure-fasten-dialog.js'
 import './figure-controls.js'
 import './figure-clips.js'
 import './figure-data-panel.js'
+import type { FigurePreview } from './figure-preview.js'
+import './figure-save-conflict.js'
+import type { SaveConflictChoice } from './figure-save-conflict.js'
+import { saveConflictChangesOf, type SaveConflictChanges } from './save-conflict.js'
 import './figure-preview.js'
 import './figure-settings.js'
 import { DEFAULT_VIEW, type ViewSettings } from '@things-factory/figure-viewer/dist-client/figure-view.js'
@@ -118,6 +122,11 @@ export class FigureEditor extends LitElement {
   /** Why the last recipe was refused, in the kernel's words. */
   @state() private recipeError = ''
   @property({ type: Number }) revision = 0
+  /**
+   * The page in front (the shell's `active`). A page left keeps its editor, on the window: a Backspace pressed on
+   * another page removed the part picked here, out of sight (2026-11-01 audit). Being on the document is not being seen.
+   */
+  @property({ type: Boolean }) active = true
   /** The 「?」 beside a group's title and the sentence it opens. */
   private readonly help = new HelpToggles(this)
   /** The cost line the parts list shows, from the maturity report. */
@@ -262,12 +271,18 @@ export class FigureEditor extends LitElement {
        * The section editor open takes the keys for its own: Esc cancels it, Delete deletes a point, Ctrl+Z undoes a point.
        * Heard here first, they deselected the part, deleted the part and undid the figure's last step (2026-09-30).
        */
-      return !!view && !view.loading && !view.saving && !!view.context && this.isConnected && !this.sectionEditing
+      return !!view && !view.loading && !view.saving && !!view.context && this.isConnected && this.active && !this.sectionEditing
     },
+    previewing: () => this.middle === 'preview',
     scene: () => this.renderRoot.querySelector<FigureCanvas>('figure-canvas'),
     selected: () => this.selected,
     act: action => this.keyAction(action)
   })
+  /** 「화면 맞춤」 fits the canvas in front: in the preview it fitted the edit canvas hidden behind it (2026-11-01 audit). */
+  private fitShown() {
+    if (this.middle === 'preview') this.renderRoot.querySelector<FigurePreview>('figure-preview')?.fitView()
+    else this.renderRoot.querySelector<FigureCanvas>('figure-canvas')?.fit()
+  }
   /** The part Ctrl+C took: pasted as the kernel's duplicate. Not kept past the editor, nor written anywhere. */
   private copied = ''
   /** A copied part still in the figure is duplicated -- a part of its own, named by figure-model; one gone, nothing. */
@@ -467,12 +482,54 @@ export class FigureEditor extends LitElement {
       await promise
       this.error = ''
     } catch (error) {
+      /* Another editor saved first: the ways on are asked, not a refusal said that saving again would only repeat. */
+      if (this.session.read().conflict) void this.resolveConflict()
       /* Not reached: whether it was written is not known, and the edits are still here -- said so, not "not saved". */
-      this.error = (error as { code?: string })?.code === 'SAVE_UNREACHABLE' ? i18next.t('figure.text.save-unreachable') : this.said(error)
+      else this.error = (error as { code?: string })?.code === 'SAVE_UNREACHABLE' ? i18next.t('figure.text.save-unreachable') : this.said(error)
     } finally {
       this.changed()
     }
   }
+  /**
+   * After a conflict (2026-11-01 audit item 6): what differs from the server's latest, and the way on the person
+   * chooses. A copy is a new figure saved by the first save's question; the latest opens in a new tab at this figure's
+   * address, the edits staying here; writing over is asked once more, since the other's change is lost.
+   */
+  private async resolveConflict() {
+    const session = this.session!
+    const latest = session.read().conflict?.latest
+    const mine = session.revisionNow()?.asset
+    let changes: SaveConflictChanges | null = null
+    try {
+      changes = latest && mine ? saveConflictChangesOf(mine, parseFigureAsset(latest)) : null
+    } catch {
+      /* A latest this figure-model cannot read is not compared; it is still offered to keep a copy or to look at it. */
+    }
+    const choice = await openPopup(html`<figure-save-conflict .changes=${changes}></figure-save-conflict>`, {
+      backdrop: true,
+      size: 'small',
+      title: i18next.t('figure.title.save-conflict')
+    }).result as SaveConflictChoice | undefined
+    if (this.session !== session || !session.read().conflict) return
+    if (choice === 'latest') window.open(location.href, '_blank', 'noopener')
+    else if (choice === 'copy') {
+      session.detachAsCopy()
+      /* The page forgets the row of the figure left: the copy's identifier is asked, not the other's offered. */
+      this.dispatchEvent(new CustomEvent('figure-detached', { bubbles: true, composed: true }))
+      this.changed()
+      await this.save()
+    } else if (choice === 'overwrite') {
+      const agreed = await OxPrompt.open({
+        type: 'warning',
+        text: i18next.t('figure.text.overwrite-latest-warning'),
+        confirmButton: { text: i18next.t('figure.button.overwrite-latest') },
+        cancelButton: { text: i18next.t('figure.button.keep-editing') }
+      })
+      if (!agreed || this.session !== session || !session.read().conflict) return
+      session.overwriteConflict()
+      await this.save()
+    }
+  }
   private add(kind: FigurePaletteKind) {
     if (!this.session) return
     this.run(() => {
@@ -1608,7 +1665,7 @@ export class FigureEditor extends LitElement {
       whatever is picked: the size tab was 「반응형」 with nothing picked and 「배치」 with a part (sweep 2026-10-27 J2).
     */
     const name = i18next.t('figure.label.tab-short-' + tab)
-    return html`<button tab ?on=${this.tab === tab} title=${label} aria-label=${name} @click=${() => (this.tab = tab)}>
+    return html`<button tab ?on=${this.tab === tab} aria-pressed=${String(this.tab === tab)} title=${label} aria-label=${name} @click=${() => (this.tab = tab)}>
       <md-icon>${icon}</md-icon><span tab-label aria-hidden="true">${name}</span>
     </button>`
   }
@@ -1647,6 +1704,7 @@ export class FigureEditor extends LitElement {
       .kept=${kept}
       .pointBlocked=${this.pointBlockedOf(drawn)}
       .revision=${this.session?.read().revision ?? 0}
+      ?active=${this.active}
       .faceMapping=${this.faceMapping?.from === 'section-editor' ? this.faceMapping.need : undefined}
       @command=${(e: CustomEvent) => {
         /* Held for a choice of where things go: the editor stays open, the choice shown in it. */
@@ -1806,7 +1864,7 @@ export class FigureEditor extends LitElement {
         .pane=${this.panes}
         @canvas-undo=${() => this.run(() => this.session!.undo())}
         @canvas-redo=${() => this.run(() => this.session!.redo())}
-        @canvas-fit=${() => this.renderRoot.querySelector<FigureCanvas>('figure-canvas')?.fit()}
+        @canvas-fit=${() => this.fitShown()}
       >
         ${this.renderGizmoTools(!unavailable && this.middle === 'edit')}
         ${this.renderOverlayButton('view', 'wb_sunny', 'figure.label.tab-environment')}

package/client/modeller/figure-parts.ts

@@ -137,7 +137,8 @@ export class FigureParts extends localize(i18next)(LitElement) {
         border-color: var(--md-sys-color-primary);
         background: var(--md-sys-color-primary-container);
       }
-      button[model-root]:focus-visible {
+      button[model-root]:focus-visible,
+      button[pick]:focus-visible {
         outline: 2px solid var(--md-sys-color-primary);
         outline-offset: 1px;
       }
@@ -405,6 +406,19 @@ export class FigureParts extends localize(i18next)(LitElement) {
       li[selected] md-icon {
         color: inherit;
       }
+      button[pick] {
+        display: flex;
+        flex: 1;
+        min-width: 0;
+        padding: 0;
+        font: inherit;
+        color: inherit;
+        text-align: start;
+        background: none;
+        border: none;
+        border-radius: 4px;
+        cursor: pointer;
+      }
       span[label] {
         flex: 1;
         min-width: 0;
@@ -652,6 +666,7 @@ export class FigureParts extends localize(i18next)(LitElement) {
   private renderRow(part: FigurePartRow, index: number) {
     const selected = part.id === this.selected
     const off = !!part.hidden
+    /* The row is picked by the keyboard too, by its name's button: the eye was the only stop on a row, and it does not pick (2026-11-01 audit). */
     return html`
       <li
         ?selected=${selected}
@@ -671,11 +686,11 @@ export class FigureParts extends localize(i18next)(LitElement) {
           <md-icon>${off ? 'visibility_off' : 'visibility'}</md-icon>
         </button>
         <md-icon>${KIND_ICON[part.kind] ?? 'deployed_code'}</md-icon>
-        <span label title=${part.id}
+        <button pick aria-pressed=${String(selected)}><span label title=${part.id}
           >${partLabelOf(part.id)}${part.copies ? html` <small copies>× ${part.copies}</small>` : nothing}${part.invisible ? html`<small>${i18next.t('figure.label.state-hidden')}</small>` : nothing}${part.fastenedTo
             ? html`<small fastened-to title=${i18next.t('figure.label.fastened-to')}>${part.fastenedTo}</small>`
             : nothing}</span
-        >
+        ></button>
         ${selected ? this.renderOps(part.id, index) : nothing}
       </li>
     `

package/client/modeller/figure-preview.ts

@@ -479,7 +479,7 @@ export class FigurePreview extends localize(i18next)(LitElement) {
   }
 
   /** The figure as stretched, whole in view: done once the slider is let go, so the ground does not slide under a drag. */
-  private fitView() {
+  fitView() {
     this.scene?.fit?.('ratio')
     this.scene?.root?.fitCameraToModel?.()
   }

package/client/modeller/figure-properties.ts

@@ -28,8 +28,8 @@ const PLACEMENTS: Placement[] = ['floor', 'ceiling', 'center', 'wall']
  * Two kinds of change leave this tab, and it does neither itself:
  *  - `command` carries an authoring command (rename, where it stands, taking the mounting face off). The page runs
  *    it through the session, so it is one step of the same undo history as every other edit, and is saved with it.
- *  - `catalog` carries a change to the row (category, tags). Those are not in the asset; the page writes them
- *    to the saved row at once, so they need a saved figure.
+ *  - `catalog` carries a change to the row (category, tags). Those are not in the asset; the page holds them and
+ *    「저장」 writes them to the saved row with the figure, so they need a saved figure. They are not undone.
  */
 @customElement('figure-properties')
 export class FigureProperties extends localize(i18next)(LitElement) {
@@ -61,6 +61,8 @@ export class FigureProperties extends localize(i18next)(LitElement) {
   @property({ type: String }) figureCategory?: string
   /** The categories the server allows (LV figure-server design G5): chosen from, and fixed once set. Null: free text. */
   @property({ attribute: false }) figureCategories?: string[] | null
+  /** The category the server holds: with a vocabulary it is fixed; one chosen and not saved yet may be chosen again. */
+  @property({ type: String }) figureCategorySaved?: string
   @property({ type: Array }) figureTags?: string[]
   private facts(): FigureFigureFacts | undefined {
     try {
@@ -122,8 +124,9 @@ export class FigureProperties extends localize(i18next)(LitElement) {
   private renderName(facts: FigureFigureFacts) {
     return html`
       <div field>
-        <label>${i18next.t('figure.label.name')}</label>
+        <label for="figure-name">${i18next.t('figure.label.name')}</label>
         <input
+          id="figure-name"
           .value=${facts.name}
           placeholder=${i18next.t('figure.text.figure-display-name')}
           @change=${(event: Event) => {
@@ -148,8 +151,9 @@ export class FigureProperties extends localize(i18next)(LitElement) {
     const current = facts.placement ?? 'floor'
     return html`
       <div field>
-        <label>${i18next.t('figure.label.figure-placement')}</label>
+        <label for="figure-placement">${i18next.t('figure.label.figure-placement')}</label>
         <select
+          id="figure-placement"
           .value=${live(current)}
           @change=${(event: Event) => {
             const select = event.target as HTMLSelectElement
@@ -213,17 +217,19 @@ export class FigureProperties extends localize(i18next)(LitElement) {
     const saved = !!this.figureId
     return html`
       <div field>
-        <label>${i18next.t('figure.label.category')}</label>
+        <label for="figure-category">${i18next.t('figure.label.category')}</label>
         ${this.figureCategories?.length
           ? html`<select
+              id="figure-category"
               category
-              ?disabled=${!saved || !!this.figureCategory}
+              ?disabled=${!saved || !!this.figureCategorySaved}
               @change=${(e: Event) => this.catalog({ category: (e.target as HTMLSelectElement).value })}
             >
               ${this.figureCategory ? nothing : html`<option value="" selected disabled>${i18next.t('figure.text.category-choose')}</option>`}
               ${this.figureCategories.map(code => html`<option value=${code} ?selected=${code === this.figureCategory}>${code}</option>`)}
             </select>`
           : html`<input
+              id="figure-category"
               .value=${this.figureCategory ?? ''}
               ?disabled=${!saved}
               placeholder=${i18next.t('figure.text.category-placeholder')}
@@ -231,8 +237,9 @@ export class FigureProperties extends localize(i18next)(LitElement) {
             />`}
       </div>
       <div field>
-        <label>${i18next.t('figure.label.tags')}</label>
+        <label for="figure-tags">${i18next.t('figure.label.tags')}</label>
         <input
+          id="figure-tags"
           .value=${(this.figureTags ?? []).join(', ')}
           ?disabled=${!saved}
           placeholder=${i18next.t('figure.text.tags-placeholder')}

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

@@ -0,0 +1,73 @@
+import { LitElement, html, css, nothing } from 'lit'
+import { customElement, property } from 'lit/decorators.js'
+import { i18next } from '@operato/i18n'
+import { closePopup } from '@operato/popup'
+import '@operato/popup/ox-popup-actions.js'
+import { CommonPopupStyles } from '@operato/styles'
+import '@material/web/button/filled-button.js'
+import '@material/web/button/outlined-button.js'
+import '@material/web/button/text-button.js'
+
+import { partLabelOf } from './fields.js'
+import type { SaveConflictChanges } from './save-conflict.js'
+
+/** What the person chose after a conflict; nothing when closed -- the edits stay, unsaved. */
+export type SaveConflictChoice = 'copy' | 'latest' | 'overwrite'
+
+/**
+ * A save refused because another editor saved this figure first (2026-11-01 audit item 6). The edits stay on screen;
+ * what differs from the server's latest is said by part, and the ways on are offered: keep the edits as a copy (first,
+ * since nothing is lost), look at the latest in a new tab, or write the edits over it.
+ */
+@customElement('figure-save-conflict')
+export class FigureSaveConflict extends LitElement {
+  static styles = [
+    CommonPopupStyles,
+    css`
+      :host {
+        overflow-y: auto;
+      }
+      ul {
+        margin: 0;
+        padding-inline-start: 18px;
+        font-size: var(--popup-font-size-small);
+      }
+      li span {
+        color: var(--md-sys-color-on-surface-variant);
+      }
+      div[ways] {
+        display: grid;
+        gap: 6px;
+      }
+    `
+  ]
+
+  /** What differs from the server's latest; null when the latest could not be read. */
+  @property({ attribute: false }) changes: SaveConflictChanges | null = null
+
+  render() {
+    const changes = this.changes
+    const line = (key: string, parts: string[]) =>
+      parts.length ? html`<li><span>${i18next.t(key)}</span> ${parts.map(partLabelOf).join(', ')}</li>` : nothing
+    return html`
+      <div class="what">${i18next.t('figure.text.save-conflict-desc')}</div>
+      ${changes
+        ? html`<ul differs>
+            ${line('figure.label.conflict-changed', changes.changed)} ${line('figure.label.conflict-mine-only', changes.mineOnly)}
+            ${line('figure.label.conflict-theirs-only', changes.theirsOnly)}
+            ${changes.otherChanged ? html`<li>${i18next.t('figure.text.conflict-other-changed')}</li>` : nothing}
+          </ul>`
+        : html`<div class="note">${i18next.t('figure.text.conflict-latest-unread')}</div>`}
+      <div ways>
+        <md-filled-button copy @click=${() => closePopup(this, 'copy')}>${i18next.t('figure.button.save-as-copy')}</md-filled-button>
+        <md-outlined-button latest @click=${() => closePopup(this, 'latest')}>${i18next.t('figure.button.open-latest')}</md-outlined-button>
+        ${changes
+          ? html`<md-text-button overwrite @click=${() => closePopup(this, 'overwrite')}>${i18next.t('figure.button.overwrite-latest')}</md-text-button>`
+          : nothing}
+      </div>
+      <ox-popup-actions>
+        <md-text-button slot="cancel" @click=${() => closePopup(this)}>${i18next.t('figure.button.keep-editing')}</md-text-button>
+      </ox-popup-actions>
+    `
+  }
+}

package/client/modeller/figure-section-editor.ts

@@ -273,6 +273,8 @@ export class FigureSectionEditor extends localize(i18next)(LitElement) {
   @property({ attribute: false }) pointBlocked = ''
   /** The figure's revision now; the editor remembers the one it opened at. */
   @property({ type: Number }) revision = 0
+  /** The page in front, as the modeller has it: a page left keeps this editor on the window, and its keys are not its (2026-11-01 audit item 1). */
+  @property({ type: Boolean }) active = true
   /** What stands on the faces the last apply takes away (ADR-0100 A8): asked here, where the edit was made. */
   @property({ attribute: false }) faceMapping?: FigureFaceMappingNeed
   /** Narrow: the outline or the solid behind. */
@@ -344,6 +346,7 @@ export class FigureSectionEditor extends localize(i18next)(LitElement) {
    * would take Esc as "select nothing" and Delete as "delete the part".
    */
   private keys = (e: KeyboardEvent) => {
+    if (!this.active) return
     const inField = (e.composedPath()[0] as HTMLElement)?.tagName === 'INPUT'
     /* A number being typed in the inside's drawing: Esc there puts the number back, not the editor away. */
     if (inField && e.composedPath().some(el => (el as HTMLElement).tagName === 'FIGURE-CAVITY-DRAWING')) return

package/client/modeller/keys.ts

@@ -31,6 +31,11 @@ export interface KeyLike {
    * Passing a key the scene already took would toggle the gizmo off again.
    */
   inScene?: boolean
+  /**
+   * The preview is in front: it shows the figure, it does not edit it. A key that adds, takes away or moves a part is
+   * not taken there -- Backspace removed the part picked in the edit canvas, now hidden (2026-11-01 audit).
+   */
+  previewing?: boolean
 }
 
 const TYPING = new Set(['INPUT', 'SELECT', 'TEXTAREA'])
@@ -43,12 +48,13 @@ export function keyActionOf(e: KeyLike, selected: string): KeyAction | null {
   if (mod && key === 'z') return e.shiftKey ? 'redo' : 'undo'
   if (mod && key === 'y') return 'redo'
   if (mod && key === 'c') return selected ? 'copy' : 'hold'
-  if (mod && key === 'v') return e.shiftKey ? 'hold' : 'paste'
+  if (mod && key === 'v') return e.shiftKey || e.previewing ? 'hold' : 'paste'
   if (mod && key === 'x') return 'hold'
   if (!selected) return null
+  if (!mod && key === 'escape') return 'deselect'
+  if (e.previewing) return null
   if (mod && key === 'd') return 'duplicate'
   if (!mod && (key === 'delete' || key === 'backspace')) return 'remove'
-  if (!mod && key === 'escape') return 'deselect'
   if (!mod && !e.shiftKey && !e.inScene && GIZMO_KEYS[key]) return GIZMO_KEYS[key]
   return null
 }

package/client/modeller/modeller-keys.ts

@@ -5,6 +5,8 @@ import { keyActionOf, type KeyAction } from './keys.js'
 export interface ModellerKeysHost {
   /** Whether the modeller takes keys now: a figure open, not loading or saving, and no section editor open. */
   taking(): boolean
+  /** Whether the preview is in front of the edit canvas: it takes no key that edits parts (`keys.ts`). */
+  previewing(): boolean
   /** The scene, whose keys the modeller's are too. */
   scene(): Element | null
   selected(): string
@@ -49,7 +51,8 @@ export class ModellerKeys implements ReactiveController {
         shiftKey: e.shiftKey,
         altKey: e.altKey,
         target: path[0] as HTMLElement,
-        inScene: !!canvas && path.includes(canvas)
+        inScene: !!canvas && path.includes(canvas),
+        previewing: this.of.previewing()
       },
       this.of.selected()
     )

package/client/modeller/product-session.ts

@@ -35,6 +35,17 @@ export interface FigureProductRecord {
   source: string
 }
 
+/**
+ * The row's catalogue fields -- the type (before release), the category, the tags. Kept on the row, not in the asset,
+ * and saved with it by 「저장」: written at once on change, they stayed after 「저장하지 않고 떠나기」 and the save
+ * button never lit for them (2026-11-01 audit item 5).
+ */
+export interface FigureCatalogPatch {
+  type?: string
+  category?: string
+  tags?: string[]
+}
+
 /** Persistence is injected; neither the model engine nor the renderer owns the product ID. */
 export interface FigureProductStore {
   load(id: string): Promise<FigureProductRecord>
@@ -54,8 +65,12 @@ export interface FigureProductStore {
     /** Keys of the AI proposals whose steps the source holds: the server records them with the save. */
     proposalKeys?: string[]
   }): Promise<FigureProductRecord>
+  /** Writes the row's catalogue fields of a saved figure. */
+  updateCatalog(id: string, patch: FigureCatalogPatch): Promise<unknown>
 }
 
+const sameValue = (a: unknown, b: unknown) => JSON.stringify(a ?? null) === JSON.stringify(b ?? null)
+
 /** Product lifecycle boundary. A late response can never change another editor's asset or ID. */
 export function createFigureProductSession(store: FigureProductStore) {
   const workspace = createFigureEditorWorkspace()
@@ -73,6 +88,22 @@ export function createFigureProductSession(store: FigureProductStore) {
   */
   let done: Array<string | undefined> = [],
     undone: Array<string | undefined> = []
+  /*
+    A save refused because the server holds another source than the one opened (FIGURE_SOURCE_CONFLICT, not one of
+    this session's own sends): the edits stay, and the server's latest is kept here to compare with and, if the person
+    says so, to write over (2026-11-01 audit item 6). Undefined source: the latest could not be read.
+  */
+  let conflict: { source?: string } | undefined
+  /* The catalogue fields changed and not saved yet; none of the history -- undo is the figure's steps. */
+  let catalog: FigureCatalogPatch = {}
+  /* The catalogue fields a save is writing now: what the row will hold, not what it held, until it is done. */
+  let catalogSending: FigureCatalogPatch | undefined
+  /*
+    The catalogue fields the last save wrote, known to be on the row from the moment it answered: a screen compares
+    with them before it has read the row again (2026-11-01 third re-check). Empty from the start of each save.
+  */
+  let catalogWritten: FigureCatalogPatch = {}
+  const catalogHeld = () => Object.keys(catalog).length > 0
   /* The author's size ends the last step moved without being asked (ADR-0087 decision 6), told once. */
   let fitted: FigureSizeRangeFit[] = []
   function tracked<T>(kind: 'do' | 'undo' | 'redo', run: () => T, tag?: string, setsRange = false): T {
@@ -94,7 +125,8 @@ export function createFigureProductSession(store: FigureProductStore) {
     conversation is anchored on it, and its first save inserts the row under it, so the name holds across that save.
   */
   function read() {
-    return { ...workspace.read(), id, creationId, loading, saving, error }
+    const view = workspace.read()
+    return { ...view, dirty: view.dirty || catalogHeld(), catalog: { ...catalog }, catalogWritten: { ...catalogWritten }, conflict: conflict ? { latest: conflict.source } : undefined, id, creationId, loading, saving, error }
   }
   /*
     The version on screen, one object for as long as it is the version: the workspace hands out one asset per version
@@ -146,12 +178,15 @@ export function createFigureProductSession(store: FigureProductStore) {
     error = undefined
     saving = false
     creationId = undefined
+    catalog = {}
+    catalogWritten = {}
+    conflict = undefined
     done = []
     undone = []
   }
   function canLeave(discard: boolean) {
     if (saving) throw Error('저장이 끝난 뒤 모델을 전환해 주세요.')
-    if (workspace.read().dirty && !discard) throw Error('저장하지 않은 변경이 있습니다.')
+    if ((workspace.read().dirty || catalogHeld()) && !discard) throw Error('저장하지 않은 변경이 있습니다.')
   }
   return {
     read,
@@ -162,6 +197,52 @@ export function createFigureProductSession(store: FigureProductStore) {
      * -- the server writes over it only while it still holds this. Nothing for a figure not saved yet.
      */
     confirmedSource: () => (id ? baseline : undefined),
+    /**
+     * A catalogue field changed, held for the next save; one changed back to what the row holds (`saved`) is no
+     * change. Only a saved figure has a row to write: a new figure's type goes with its first save. Taken while a save
+     * is on its way too: the field shows it, so it is held for the save after (2026-11-01 re-check). A field that save
+     * is writing is held whatever it is changed to -- back to the old value too, which the save is about to replace;
+     * the save done lets go only of a value it wrote (2026-11-01 second re-check).
+     */
+    editCatalog(patch: FigureCatalogPatch, saved: FigureCatalogPatch) {
+      if (!id) throw refusal('SESSION_NOT_SAVED', '먼저 저장해 주세요.')
+      const next = { ...catalog }
+      for (const key of Object.keys(patch) as (keyof FigureCatalogPatch)[]) {
+        if (!(catalogSending && key in catalogSending) && sameValue(patch[key], saved[key])) delete next[key]
+        else (next as Record<string, unknown>)[key] = patch[key]
+      }
+      catalog = next
+      return read()
+    },
+    /**
+     * After a conflict, the edits written over the server's latest: the next save expects that latest, so it goes
+     * through only while the server still holds it -- a third change meanwhile is a conflict again.
+     */
+    overwriteConflict() {
+      if (saving) throw refusal('SESSION_SAVING', '저장이 끝난 뒤 편집해 주세요.')
+      if (!conflict?.source) throw refusal('SESSION_NO_CONFLICT', '덮어쓸 최신본을 읽지 못했습니다.')
+      baseline = conflict.source
+      conflict = undefined
+      unconfirmed.clear()
+      return read()
+    },
+    /**
+     * After a conflict, the edits kept as a figure of their own: from here they are a new figure, under a new creation
+     * id, saved by the first save's question; the figure they came from is left as the server holds it.
+     */
+    detachAsCopy() {
+      if (saving) throw refusal('SESSION_SAVING', '저장이 끝난 뒤 편집해 주세요.')
+      if (!conflict) throw refusal('SESSION_NO_CONFLICT', '충돌한 저장이 없습니다.')
+      id = undefined
+      baseline = undefined
+      creationId = crypto.randomUUID()
+      conflict = undefined
+      /* The category and tags changed go with the copy, written once its first save gives it a row; its type is asked anew. */
+      const { type: _type, ...kept } = catalog
+      catalog = kept
+      unconfirmed.clear()
+      return read()
+    },
     /** A new figure, named in the screen's language by the page: the session has no words of its own. */
     startNew({ discard = false, name }: { discard?: boolean; name: string }) {
       canLeave(discard)
@@ -301,8 +382,30 @@ export function createFigureProductSession(store: FigureProductStore) {
       const exported = workspace.export(control)
       /* Read with the text it goes with: an edit while saving is not what this save holds. */
       const proposalKeys = inEffect()
+      const sentCatalog = { ...catalog }
       saving = true
+      catalogSending = sentCatalog
+      catalogWritten = {}
       try {
+        /* Only the catalogue changed: the source is not written again -- a released figure would be made a draft for nothing. */
+        if (id === undefined || workspace.read().dirty) await saveSource()
+        if (requestEpoch !== epoch) return read()
+        if (id !== undefined && Object.keys(sentCatalog).length) {
+          await store.updateCatalog(id, sentCatalog)
+          if (requestEpoch !== epoch) return read()
+          catalogWritten = sentCatalog
+          /* What was sent is saved; a field changed again while it was on its way stays held. */
+          const next = { ...catalog }
+          for (const key of Object.keys(sentCatalog) as (keyof FigureCatalogPatch)[]) if (sameValue(next[key], sentCatalog[key])) delete next[key]
+          catalog = next
+        }
+      } finally {
+        if (requestEpoch === epoch) saving = false
+        catalogSending = undefined
+      }
+      return read()
+
+      async function saveSource() {
         let record: FigureProductRecord
         try {
           record = await store.save({ id, source: exported.text, expectedSource: baseline, creationId, thumbnail, proposalKeys, ...(id || !type ? {} : { type }), ...(id || !namespace ? {} : { namespace }) })
@@ -341,6 +444,7 @@ export function createFigureProductSession(store: FigureProductStore) {
             record = await store.save({ id, source: exported.text, expectedSource: baseline, creationId, thumbnail, proposalKeys, ...(id || !type ? {} : { type }), ...(id || !namespace ? {} : { namespace }) })
           } else {
             if (code === 'SAVE_UNREACHABLE') unconfirmed.set(exported.text, { thumbnail })
+            if (code === 'FIGURE_SOURCE_CONFLICT' && requestEpoch === epoch) conflict = { source: landed?.source }
             throw error
           }
         }
@@ -352,15 +456,13 @@ export function createFigureProductSession(store: FigureProductStore) {
         id = record.id
         baseline = record.source
         unconfirmed.clear()
+        conflict = undefined
         /*
           Edited while it was saving: what was sent is saved, the edits since are not -- they stay, and the model stays
           unsaved (the workspace refuses a stale acknowledgement). Never marked saved, never wiped.
         */
         if (workspace.read().revision === exported.revision) workspace.acknowledgeSaved(exported)
-      } finally {
-        if (requestEpoch === epoch) saving = false
       }
-      return read()
     }
   }
 }