@things-factory/figure-ui 10.1.241 → 10.1.244

package/client/modeller/save-conflict.ts

@@ -0,0 +1,91 @@
+import type { FigureAsset } from '@hatiolab/figure-model'
+
+/*
+ * A save refused because the server holds another source than the one this editor opened (FIGURE_SOURCE_CONFLICT):
+ * what differs between the edits on screen and the server's latest, by part, so the person chooses with it in view --
+ * keep the edits as a copy, look at the latest, or write over it (2026-11-01 audit item 6). Read apart from the screen
+ * so the rule is tested without a browser.
+ */
+
+export interface SaveConflictChanges {
+  /** Parts on both sides, made differently. */
+  changed: string[]
+  /** Parts only the edits on screen have. */
+  mineOnly: string[]
+  /** Parts only the server's latest has. */
+  theirsOnly: string[]
+  /** Something not of one part differs too: the name, the figure's inputs, its capabilities, its clips... */
+  otherChanged: boolean
+}
+
+interface Node {
+  id: string
+  op: string
+}
+interface Model {
+  nodes: Node[]
+  constants?: { id: string }[]
+  inputs?: { id: string }[]
+}
+
+type Look = { target?: unknown }
+const looksOf = (asset: FigureAsset) => ((asset as unknown as { appearance?: Look[] }).appearance ?? [])
+
+/** Every node, constant and input by id, each with the values the figure gives it; a part's look under the part. */
+function itemsOf(asset: FigureAsset): Map<string, string> {
+  const model = asset.document.model as unknown as Model
+  const design = (asset.designInputs ?? {}) as Record<string, unknown>
+  const state = (asset.stateDefaults ?? {}) as Record<string, unknown>
+  const items = new Map<string, string>()
+  for (const node of model.nodes) items.set(node.id, JSON.stringify(['node', node]))
+  for (const constant of model.constants ?? []) items.set(constant.id, JSON.stringify(['constant', constant]))
+  for (const input of model.inputs ?? []) items.set(input.id, JSON.stringify(['input', input, design[input.id] ?? null, state[input.id] ?? null]))
+  const looks = new Map<string, Look[]>()
+  for (const look of looksOf(asset)) if (typeof look.target === 'string') looks.set(look.target, [...(looks.get(look.target) ?? []), look])
+  for (const [target, of] of looks) items.set(`${target}.appearance`, JSON.stringify(['look', of]))
+  return items
+}
+
+/**
+ * A part and all it is made of: figure-model names a part's nodes, constants and inputs under it (`lid.shape`,
+ * `lid.size.y`), and its arguments point at their outputs, not at node ids.
+ */
+function closureOf(asset: FigureAsset, part: string): Set<string> {
+  return new Set([...itemsOf(asset).keys()].filter(id => id === part || id.startsWith(part + '.')))
+}
+
+const partsOf = (asset: FigureAsset) => (asset.document.model as unknown as Model).nodes.filter(node => node.op === 'place@1').map(node => node.id)
+
+const madeOf = (items: Map<string, string>, ids: Set<string>) => JSON.stringify([...ids].sort().map(id => [id, items.get(id) ?? null]))
+
+/** Everything of an asset but its items: its name, palette, the look not of one part, capabilities, version. */
+function restOf(asset: FigureAsset): string {
+  const { document, designInputs: _design, stateDefaults: _state, appearance: _looks, ...rest } = asset as FigureAsset & Record<string, unknown>
+  const { model: _model, ...documentRest } = document as unknown as Record<string, unknown>
+  return JSON.stringify([rest, documentRest, looksOf(asset).filter(look => typeof look.target !== 'string')])
+}
+
+export function saveConflictChangesOf(mine: FigureAsset, theirs: FigureAsset): SaveConflictChanges {
+  const mineItems = itemsOf(mine),
+    theirItems = itemsOf(theirs)
+  const mineParts = partsOf(mine),
+    theirParts = partsOf(theirs)
+  const covered = new Set<string>()
+  const changed: string[] = []
+  for (const part of mineParts) {
+    const ours = closureOf(mine, part)
+    ours.forEach(id => covered.add(id))
+    if (!theirParts.includes(part)) continue
+    const their = closureOf(theirs, part)
+    their.forEach(id => covered.add(id))
+    if (madeOf(mineItems, ours) !== madeOf(theirItems, their)) changed.push(part)
+  }
+  for (const part of theirParts) if (!mineParts.includes(part)) closureOf(theirs, part).forEach(id => covered.add(id))
+  const outside = (items: Map<string, string>) => JSON.stringify([...items].filter(([id]) => !covered.has(id)).sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0)))
+  return {
+    changed,
+    mineOnly: mineParts.filter(part => !theirParts.includes(part)),
+    theirsOnly: theirParts.filter(part => !mineParts.includes(part)),
+    otherChanged: restOf(mine) !== restOf(theirs) || outside(mineItems) !== outside(theirItems)
+  }
+}

package/client/pages/figure-modeller-page.ts

@@ -3,10 +3,10 @@ import { customElement, state } from 'lit/decorators.js'
 import { navigate, PageView } from '@operato/shell'
 import { getPathInfo } from '@operato/utils'
 import { modellerPathOf } from '../modeller/modeller-route.js'
-import { createFigureProductSession } from '../modeller/product-session.js'
+import { createFigureProductSession, type FigureCatalogPatch } from '../modeller/product-session.js'
 import { figureProductStore } from '../graphql/store.js'
 import { i18next } from '@operato/i18n'
-import { fetchFigure, fetchFigureCategories, fetchFigureNamespaces, fetchFigureTypeNames, updateFigure } from '../graphql/index.js'
+import { fetchFigure, fetchFigureCategories, fetchFigureNamespaces, fetchFigureTypeNames } from '../graphql/index.js'
 import { figureProposalOutcome } from '../figure-assistant.js'
 import { availableRecipes, recipeGuide } from '../modeller/recipe-source.js'
 import type { RecipeTemplate } from '../modeller/recipes.js'
@@ -141,13 +141,15 @@ export class FigureModellerPage extends PageView {
   @state() private row: { state?: 'draft' | 'released'; version: number; namespace?: string; type?: string; category?: string; tags?: string[] } = {
     version: 0
   }
-  @state() private typeError = ''
   /** Why a command from the side did nothing. Shown beside the tabs — the editor stays, since nothing in it was lost. */
   @state() private commandError = ''
   /** What the verdict says blocks release now, handed to the editor's bar. */
   @state() private releaseBlockers: FigureGateFinding[] = []
   @state() private budget?: FigureBudgetLine
   private wasDirty = false
+  private wasSaving = false
+  /** The row reading asked last: an answer to an earlier one, come back after, is not the row now. */
+  private rowReading = 0
   private titled?: string | null
   /** The figure the AI dock was last told about - another id is another conversation. */
   private assistantFor?: string
@@ -229,8 +231,21 @@ export class FigureModellerPage extends PageView {
       navigate(modellerPathOf({ id: view.id }), true)
     }
     /* 저장이 끝난 순간 행을 다시 읽는다 — 발행된 피규어를 고쳐 저장하면 서버가 초안으로 내린다. */
-    if (this.wasDirty && !view.dirty && !view.saving && view.id) this.readRow(view.id)
+    /*
+      Read again after every save that ends, not only one that leaves nothing unsaved: a field changed while it was
+      being written is still held, and is compared with what the row holds now (2026-11-01 second re-check).
+    */
+    if (view.id && !view.saving && ((this.wasDirty && !view.dirty) || this.wasSaving)) {
+      /*
+        What the save wrote is the row's from the moment it answered: the next change is compared with it at once, not
+        with the row as it was until the reading comes back -- a value typed in between was let go, then written over
+        (2026-11-01 third re-check). The old ones do not flash back either.
+      */
+      if (this.wasSaving) this.row = { ...this.row, ...view.catalogWritten }
+      this.readRow(view.id)
+    }
     this.wasDirty = !!view.dirty
+    this.wasSaving = !!view.saving
   }
   /*
     A released figure changed on the server -- its source saved, or its category or tags -- comes back a draft, and a
@@ -242,8 +257,10 @@ export class FigureModellerPage extends PageView {
     if (before === 'released' && after === 'draft') notify({ level: 'info', message: i18next.t('figure.text.released-now-draft') })
   }
   private async readRow(id: string) {
+    const reading = ++this.rowReading
     try {
       const figure = await fetchFigure(id)
+      if (reading !== this.rowReading) return
       if (this.session.read().id === id) this.toldDemoted(this.row.state, figure.state)
       if (this.session.read().id === id)
         this.row = {
@@ -279,15 +296,24 @@ export class FigureModellerPage extends PageView {
       this.row = { ...this.row, type: wanted || undefined }
       return
     }
-    if (!wanted || wanted === this.row.type) return
-    try {
-      const result = await updateFigure(id, { type: wanted })
-      this.typeError = ''
-      this.row = { ...this.row, type: result.figure.type }
-    } catch (error) {
-      this.typeError = error instanceof Error ? error.message : String(error)
-      input.value = this.row.type ?? ''
+    if (!wanted) {
+      input.value = this.shownRow().type ?? ''
+      return
     }
+    this.editCatalog({ type: wanted })
+  }
+  /**
+   * Category, tags and type: the catalogue's, kept on the row, not in the asset -- held by the session and written by
+   * 「저장」 with the figure (2026-11-01 audit item 5). The server's refusal is said where a save's is.
+   */
+  private editCatalog(patch: FigureCatalogPatch) {
+    const { type, category, tags } = this.row
+    this.session.editCatalog(patch, { type, category, tags })
+    this.changed()
+  }
+  /** The row as the screen shows it: what the server holds, with the catalogue fields changed and not saved yet. */
+  private shownRow() {
+    return { ...this.row, ...this.session.read().catalog }
   }
   /** A command from the properties tab — rename, the mounting face. */
   private onCommand = (event: Event) => {
@@ -312,29 +338,18 @@ export class FigureModellerPage extends PageView {
           : String(error)
     }
   }
-  /**
-   * Category and tags — the catalogue's, kept on the row, not in the asset. Written at once; the server's
-   * refusal is shown as it gave it.
-   */
-  private onCatalog = async (event: Event) => {
+  private onCatalog = (event: Event) => {
     const patch = (event as CustomEvent).detail as { category?: string; tags?: string[] }
-    const id = this.session.read().id
-    if (!id || !patch) return
-    try {
-      const result = await updateFigure(id, patch)
-      this.commandError = ''
-      /* The server's answer on its state too: a category changed on a released figure made it a draft, and the badge stayed. */
-      this.toldDemoted(this.row.state, result.figure.state)
-      this.row = {
-        ...this.row,
-        category: result.figure.category ?? undefined,
-        tags: result.figure.tags ?? undefined,
-        ...(result.figure.state ? { state: result.figure.state as 'draft' | 'released' } : {}),
-        ...(result.figure.version !== undefined ? { version: result.figure.version ?? 0 } : {})
-      }
-    } catch (error) {
-      this.commandError = error instanceof Error ? error.message : String(error)
-    }
+    if (this.session.read().id && patch) this.editCatalog(patch)
+  }
+  /*
+    The edits kept as a copy after a conflict: a new figure from here. The row and address of the figure left are let
+    go, so the first save asks a new identifier and the copy's address replaces this one once saved.
+  */
+  private detached = () => {
+    this.row = { version: 0 }
+    this.routeId = undefined
+    this.withdrawAssistant()
   }
   private released = (event: Event) => {
     const figure = (event as CustomEvent).detail?.figure
@@ -376,10 +391,11 @@ export class FigureModellerPage extends PageView {
   }
   /*
     Reloading or closing the tab is not a move the shell asks `canDeactivate` about: a new figure not yet saved was lost
-    without a word (2026-09-26). The browser's own question is the only one it allows there.
+    without a word (2026-09-26). The browser's own question is the only one it allows there. Asked for a page left
+    behind too: the shell keeps it, with its edits, and closing the tab loses them all the same (2026-11-01 audit).
   */
   private holdUnsaved = (event: BeforeUnloadEvent) => {
-    if (!this.active || !this.session.read().dirty) return
+    if (!this.session.read().dirty) return
     event.preventDefault()
     event.returnValue = ''
   }
@@ -444,7 +460,6 @@ export class FigureModellerPage extends PageView {
       if (id) {
         /* The row is read after the figure opens; until then the last figure's type must not stand in the field (C2). */
         this.row = { version: 0 }
-        this.typeError = ''
         const opening = this.session.open(id, { discard })
         this.changed()
         await opening
@@ -452,7 +467,6 @@ export class FigureModellerPage extends PageView {
       } else {
         this.session.startNew({ discard, name: i18next.t('figure.text.new-figure-name') })
         this.row = { version: 0 }
-        this.typeError = ''
         this.takeNewFigureProposal()
       }
       this.routeId = id
@@ -517,16 +531,18 @@ export class FigureModellerPage extends PageView {
   render() {
     if (this.error) return html`<p role="alert" class="error">${this.error}</p>`
     const view = this.session.read()
+    const shown = this.shownRow()
     /* A new figure's third way to start: the app's assistant dock, with a request put in its input for the author to finish and send (B, U04). */
-    return html`<figure-editor .session=${this.session} .releaseState=${this.row} .releaseBlockers=${this.releaseBlockers} .templates=${this.templates} .guideOf=${this.guideOf} .thumbnailOf=${this.thumbnailOf} .firstSave=${this.askFirstSave} .revision=${this.revision} .budget=${this.budget} aiDraft @ask-ai-draft=${() => askAssistant({ draft: i18next.t('figure.text.ai-draft-request') })} @changed=${this.changed}>
+    return html`<figure-editor .session=${this.session} .releaseState=${this.row} .releaseBlockers=${this.releaseBlockers} .templates=${this.templates} .guideOf=${this.guideOf} .thumbnailOf=${this.thumbnailOf} .firstSave=${this.askFirstSave} .revision=${this.revision} .budget=${this.budget} ?active=${this.active} aiDraft @figure-detached=${this.detached} @ask-ai-draft=${() => askAssistant({ draft: i18next.t('figure.text.ai-draft-request') })} @changed=${this.changed}>
       ${this.commandError ? html`<p slot="notice" fit-error role="alert">${this.commandError}</p>` : ''}
       <figure-properties
         slot="figure"
         .revision=${this.session.revisionNow()}
         .figureId=${view.id}
-        .figureCategory=${this.row.category}
+        .figureCategory=${shown.category}
+        .figureCategorySaved=${this.row.category}
         .figureCategories=${this.categories}
-        .figureTags=${this.row.tags}
+        .figureTags=${shown.tags}
         @command=${this.onCommand}
         @catalog=${this.onCatalog}
       >
@@ -535,11 +551,10 @@ export class FigureModellerPage extends PageView {
             ${this.row.version > 0
               ? html`<code>${this.row.type}</code><small>${i18next.t('figure.text.type-name-cannot-change')}</small>`
               : html`<input
-                  .value=${this.row.type ?? ''}
+                  .value=${shown.type ?? ''}
                   placeholder=${i18next.t('figure.text.figure-type-placeholder')}
                   @change=${this.renameType}
                 />`}
-            ${this.typeError ? html`<small role="alert">${this.typeError}</small>` : ''}
           </label>
       </figure-properties>
       <figure-verdict

package/dist-client/graphql/store.js

@@ -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';
 /** source is sent intact. No conversion into the old parts/base authoring representation. */
 export const figureProductStore = {
@@ -58,6 +58,7 @@ export const figureProductStore = {
         if (!result?.id || !result.source)
             throw Error('서버가 저장 결과를 돌려주지 않았습니다.');
         return result;
-    }
+    },
+    updateCatalog: (id, patch) => updateFigure(id, patch)
 };
 //# sourceMappingURL=store.js.map

package/dist-client/graphql/store.js.map

@@ -1 +1 @@
-{"version":3,"file":"store.js","sourceRoot":"","sources":["../../client/graphql/store.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,aAAa,CAAA;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAGtC,6FAA6F;AAC7F,MAAM,CAAC,MAAM,kBAAkB,GAAuB;IACpD,KAAK,CAAC,IAAI,CAAC,EAAE;QACX,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,EAAE,CAAC,CAAA;QACpC,IAAI,CAAC,MAAM,EAAE,MAAM;YAAE,MAAM,KAAK,CAAC,kBAAkB,CAAC,CAAA;QACpD,OAAO,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAA;IACjD,CAAC;IACD,4GAA4G;IAC5G,KAAK,CAAC,QAAQ,CAAC,EAAE;QACf,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC;YAClC,KAAK,EAAE,GAAG,CAAA;;;;;;;;;OAST;YACD,SAAS,EAAE,EAAE,EAAE,EAAE;YACjB,WAAW,EAAE,cAAc;SAC5B,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,EAAE,MAAkG,CAAA;QAChI,IAAI,CAAC,MAAM,EAAE,MAAM;YAAE,MAAM,KAAK,CAAC,kBAAkB,CAAC,CAAA;QACpD,OAAO,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC,aAAa,IAAI,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAA;IACtH,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,OAAO;QAChB,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;YAC3C,QAAQ,EAAE,GAAG,CAAA;;;;;;;;;;;;;;;;OAgBZ;YACD,SAAS,EAAE,OAAO;SACnB,CAAC,CAAC,CAAA;QACH,IAAI,QAAQ,CAAC,MAAM,EAAE,MAAM;YACzB,MAAM,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,IAAI,EAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAwC,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAA;QACnK,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,EAAE,UAA6C,CAAA;QAC3E,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM;YAAE,MAAM,KAAK,CAAC,wBAAwB,CAAC,CAAA;QACxE,OAAO,MAAM,CAAA;IACf,CAAC;CACF,CAAA","sourcesContent":["import gql from 'graphql-tag'\nimport { client } from '@operato/graphql'\nimport { fetchFigure } from './index.js'\nimport { reached } from './reached.js'\nimport type { FigureProductStore, FigureProductRecord } from '../modeller/product-session.js'\n\n/** source is sent intact. No conversion into the old parts/base authoring representation. */\nexport const figureProductStore: FigureProductStore = {\n  async load(id) {\n    const record = await fetchFigure(id)\n    if (!record?.source) throw Error('Figure 정본이 없습니다.')\n    return { id: record.id, source: record.source }\n  },\n  /* What the server holds of every field a save writes, read back after a save whose outcome is not known. */\n  async readBack(id) {\n    const response = await client.query({\n      query: gql`\n        query ($id: String!) {\n          figure(id: $id) {\n            id\n            source\n            thumbnailHash\n            type\n          }\n        }\n      `,\n      variables: { id },\n      fetchPolicy: 'network-only'\n    })\n    const figure = response.data?.figure as { id: string; source: string; thumbnailHash?: string | null; type?: string } | undefined\n    if (!figure?.source) throw Error('Figure 정본이 없습니다.')\n    return { id: figure.id, source: figure.source, thumbnailHash: figure.thumbnailHash ?? undefined, type: figure.type }\n  },\n  async save(request) {\n    const response = await reached(client.mutate({\n      mutation: gql`\n        mutation SaveFigure($source: String!, $id: String, $expectedSource: String, $creationId: String, $thumbnail: String, $type: String, $proposalKeys: [String!], $namespace: String) {\n          saveFigure(\n            source: $source\n            id: $id\n            expectedSource: $expectedSource\n            creationId: $creationId\n            thumbnail: $thumbnail\n            type: $type\n            proposalKeys: $proposalKeys\n            namespace: $namespace\n          ) {\n            id\n            source\n          }\n        }\n      `,\n      variables: request\n    }))\n    if (response.errors?.length)\n      throw Object.assign(Error(response.errors.map(e => e.message).join('\\n')), { code: (response.errors[0] as { extensions?: { code?: string } }).extensions?.code })\n    const result = response.data?.saveFigure as FigureProductRecord | undefined\n    if (!result?.id || !result.source) throw Error('서버가 저장 결과를 돌려주지 않았습니다.')\n    return result\n  }\n}\n"]}
+{"version":3,"file":"store.js","sourceRoot":"","sources":["../../client/graphql/store.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,aAAa,CAAA;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAGtC,6FAA6F;AAC7F,MAAM,CAAC,MAAM,kBAAkB,GAAuB;IACpD,KAAK,CAAC,IAAI,CAAC,EAAE;QACX,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,EAAE,CAAC,CAAA;QACpC,IAAI,CAAC,MAAM,EAAE,MAAM;YAAE,MAAM,KAAK,CAAC,kBAAkB,CAAC,CAAA;QACpD,OAAO,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAA;IACjD,CAAC;IACD,4GAA4G;IAC5G,KAAK,CAAC,QAAQ,CAAC,EAAE;QACf,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC;YAClC,KAAK,EAAE,GAAG,CAAA;;;;;;;;;OAST;YACD,SAAS,EAAE,EAAE,EAAE,EAAE;YACjB,WAAW,EAAE,cAAc;SAC5B,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,EAAE,MAAkG,CAAA;QAChI,IAAI,CAAC,MAAM,EAAE,MAAM;YAAE,MAAM,KAAK,CAAC,kBAAkB,CAAC,CAAA;QACpD,OAAO,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC,aAAa,IAAI,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAA;IACtH,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,OAAO;QAChB,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;YAC3C,QAAQ,EAAE,GAAG,CAAA;;;;;;;;;;;;;;;;OAgBZ;YACD,SAAS,EAAE,OAAO;SACnB,CAAC,CAAC,CAAA;QACH,IAAI,QAAQ,CAAC,MAAM,EAAE,MAAM;YACzB,MAAM,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,IAAI,EAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAwC,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAA;QACnK,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,EAAE,UAA6C,CAAA;QAC3E,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM;YAAE,MAAM,KAAK,CAAC,wBAAwB,CAAC,CAAA;QACxE,OAAO,MAAM,CAAA;IACf,CAAC;IACD,aAAa,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,EAAE,KAAK,CAAC;CACtD,CAAA","sourcesContent":["import gql from 'graphql-tag'\nimport { client } from '@operato/graphql'\nimport { fetchFigure, updateFigure } from './index.js'\nimport { reached } from './reached.js'\nimport type { FigureProductStore, FigureProductRecord } from '../modeller/product-session.js'\n\n/** source is sent intact. No conversion into the old parts/base authoring representation. */\nexport const figureProductStore: FigureProductStore = {\n  async load(id) {\n    const record = await fetchFigure(id)\n    if (!record?.source) throw Error('Figure 정본이 없습니다.')\n    return { id: record.id, source: record.source }\n  },\n  /* What the server holds of every field a save writes, read back after a save whose outcome is not known. */\n  async readBack(id) {\n    const response = await client.query({\n      query: gql`\n        query ($id: String!) {\n          figure(id: $id) {\n            id\n            source\n            thumbnailHash\n            type\n          }\n        }\n      `,\n      variables: { id },\n      fetchPolicy: 'network-only'\n    })\n    const figure = response.data?.figure as { id: string; source: string; thumbnailHash?: string | null; type?: string } | undefined\n    if (!figure?.source) throw Error('Figure 정본이 없습니다.')\n    return { id: figure.id, source: figure.source, thumbnailHash: figure.thumbnailHash ?? undefined, type: figure.type }\n  },\n  async save(request) {\n    const response = await reached(client.mutate({\n      mutation: gql`\n        mutation SaveFigure($source: String!, $id: String, $expectedSource: String, $creationId: String, $thumbnail: String, $type: String, $proposalKeys: [String!], $namespace: String) {\n          saveFigure(\n            source: $source\n            id: $id\n            expectedSource: $expectedSource\n            creationId: $creationId\n            thumbnail: $thumbnail\n            type: $type\n            proposalKeys: $proposalKeys\n            namespace: $namespace\n          ) {\n            id\n            source\n          }\n        }\n      `,\n      variables: request\n    }))\n    if (response.errors?.length)\n      throw Object.assign(Error(response.errors.map(e => e.message).join('\\n')), { code: (response.errors[0] as { extensions?: { code?: string } }).extensions?.code })\n    const result = response.data?.saveFigure as FigureProductRecord | undefined\n    if (!result?.id || !result.source) throw Error('서버가 저장 결과를 돌려주지 않았습니다.')\n    return result\n  },\n  updateCatalog: (id, patch) => updateFigure(id, patch)\n}\n"]}

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

@@ -13,6 +13,7 @@ import './figure-fasten-dialog.js';
 import './figure-controls.js';
 import './figure-clips.js';
 import './figure-data-panel.js';
+import './figure-save-conflict.js';
 import './figure-preview.js';
 import './figure-settings.js';
 import './figure-capability-panel.js';
@@ -45,6 +46,11 @@ export declare class FigureEditor extends LitElement {
     /** Why the last recipe was refused, in the kernel's words. */
     private recipeError;
     revision: number;
+    /**
+     * 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.
+     */
+    active: boolean;
     /** The 「?」 beside a group's title and the sentence it opens. */
     private readonly help;
     /** The cost line the parts list shows, from the maturity report. */
@@ -116,6 +122,8 @@ export declare class FigureEditor extends LitElement {
      */
     private renderGizmoTools;
     private keys;
+    /** 「화면 맞춤」 fits the canvas in front: in the preview it fitted the edit canvas hidden behind it (2026-11-01 audit). */
+    private fitShown;
     /** 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. */
@@ -166,6 +174,12 @@ export declare class FigureEditor extends LitElement {
     private holdAction;
     private changed;
     private save;
+    /**
+     * 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 resolveConflict;
     private add;
     /**
      * A GLB made into a mesh part (ADR-0129): the server reads and keeps it, the author picks the whole file or one node

package/dist-client/modeller/editor.js

@@ -6,9 +6,10 @@ import { isMacOS } from '@operato/utils';
 import { unitWord } from './unit-words.js';
 import '@operato/layout';
 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, figureRowOf, figureFaceOverhangOf } from '@hatiolab/figure-model';
+import { parseFigureAsset, figureFastenAxesOf, figurePartFaceOf, PART_LIMIT, parseFigureRecipe, resolveFigureRecipe, figurePartCountOf, figurePartIdFor, figureRecipeIdFor, figureSizeEditOf, figureSizeEditorOf, figureSectionMeasuresOf, figurePlaneAlignChanges, figureRowOf, figureFaceOverhangOf } from '@hatiolab/figure-model';
 import './figure-recipe-catalog.js';
 import { captureFigureThumbnail } from './thumbnail.js';
 import { drawableFigureParts } from './renderer.js';
@@ -25,6 +26,8 @@ import './figure-fasten-dialog.js';
 import './figure-controls.js';
 import './figure-clips.js';
 import './figure-data-panel.js';
+import './figure-save-conflict.js';
+import { saveConflictChangesOf } from './save-conflict.js';
 import './figure-preview.js';
 import './figure-settings.js';
 import { DEFAULT_VIEW } from '@things-factory/figure-viewer/dist-client/figure-view.js';
@@ -79,6 +82,11 @@ let FigureEditor = class FigureEditor extends LitElement {
         /** Why the last recipe was refused, in the kernel's words. */
         this.recipeError = '';
         this.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.
+         */
+        this.active = true;
         /** The 「?」 beside a group's title and the sentence it opens. */
         this.help = new HelpToggles(this);
         this.selected = '';
@@ -132,8 +140,9 @@ let FigureEditor = 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('figure-canvas'),
             selected: () => this.selected,
             act: action => this.keyAction(action)
@@ -234,6 +243,13 @@ let FigureEditor = class FigureEditor extends LitElement {
         </button>`)}
     </span>`;
     }
+    /** 「화면 맞춤」 fits the canvas in front: in the preview it fitted the edit canvas hidden behind it (2026-11-01 audit). */
+    fitShown() {
+        if (this.middle === 'preview')
+            this.renderRoot.querySelector('figure-preview')?.fitView();
+        else
+            this.renderRoot.querySelector('figure-canvas')?.fit();
+    }
     /** A copied part still in the figure is duplicated -- a part of its own, named by figure-model; one gone, nothing. */
     pasteCopied() {
         const asset = this.session?.revisionNow()?.asset;
@@ -449,13 +465,62 @@ let FigureEditor = class FigureEditor extends LitElement {
             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?.code === 'SAVE_UNREACHABLE' ? i18next.t('figure.text.save-unreachable') : this.said(error);
+            else
+                this.error = error?.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.
+     */
+    async resolveConflict() {
+        const session = this.session;
+        const latest = session.read().conflict?.latest;
+        const mine = session.revisionNow()?.asset;
+        let changes = 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;
+        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();
+        }
+    }
     add(kind) {
         if (!this.session)
             return;
@@ -1634,7 +1699,7 @@ let FigureEditor = 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>`;
     }
@@ -1675,6 +1740,7 @@ let FigureEditor = 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) => {
             /* Held for a choice of where things go: the editor stays open, the choice shown in it. */
@@ -1837,7 +1903,7 @@ let FigureEditor = 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('figure-canvas')?.fit()}
+        @canvas-fit=${() => this.fitShown()}
       >
         ${this.renderGizmoTools(!unavailable && this.middle === 'edit')}
         ${this.renderOverlayButton('view', 'wb_sunny', 'figure.label.tab-environment')}
@@ -2178,6 +2244,10 @@ __decorate([
     property({ type: Number }),
     __metadata("design:type", Object)
 ], FigureEditor.prototype, "revision", void 0);
+__decorate([
+    property({ type: Boolean }),
+    __metadata("design:type", Object)
+], FigureEditor.prototype, "active", void 0);
 __decorate([
     property({ attribute: false }),
     __metadata("design:type", Object)