@things-factory/figure-ui 10.1.13 → 10.1.15

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

@@ -8,13 +8,13 @@ import { shouldStartNewFigure } from '../modeller/new-figure-entry.js'
 import '../modeller/figure-parts.js'
 import '../modeller/figure-inspector.js'
 
-import { css, html } from 'lit'
+import { css, html, nothing } from 'lit'
 import { customElement, state } from 'lit/decorators.js'
 
 import { i18next, localize } from '@operato/i18n'
 import { navigate, PageView } from '@operato/shell'
 import { openOverlay } from '@operato/layout'
-import { requestFigureAI } from '../modeller/figure-ai-target.js'
+import { requestFigureAI, consumePendingFigureProposal } from '../modeller/figure-ai-target.js'
 import { validate } from '@hatiolab/figure-model'
 import type { DetailLevel, FigureSource, PrimitiveKind } from '@hatiolab/figure-model'
 
@@ -188,90 +188,9 @@ export class FigureModellerPage extends FigureModellerPageBase {
       display: none;
     }
 
-    /*
-      머리줄 — 이름 · 타입 · 미저장 표시 · 말로 시키는 줄 · 저장을 **한 줄에** 담는다.
-
-      이름은 페이지 제목에도 나온다(셸이 context.title 로 그린다). 그래도 여기 입력칸을 두는
-      이유는 **고치는 자리**가 필요해서다 — 제목은 읽는 것이고 이 칸은 바꾸는 것이다. 두 줄로
-      벌리는 대신 한 줄에 모아 캔버스에 높이를 넘긴다.
-    */
-    div[header] {
-      display: flex;
-      align-items: center;
-      gap: var(--spacing-medium, 8px);
-      padding: var(--spacing-medium, 8px) var(--spacing-large, 12px);
-      border-bottom: 1px solid var(--md-sys-color-outline-variant);
-    }
-    button[ai-support] {
-      height: 28px;
-      padding: 0 12px;
-      border: 1px solid var(--md-sys-color-outline-variant);
-      border-radius: 6px;
-      background: var(--md-sys-color-primary-container);
-      color: var(--md-sys-color-on-primary-container);
-      font: inherit;
-      cursor: pointer;
-    }
-    input[name] {
-      flex: none;
-      width: 180px;
-      padding: 5px 9px;
-      font: var(--input-field-font, inherit);
-      font-size: 0.82rem;
-      color: var(--md-sys-color-on-surface);
-      background-color: var(--md-sys-color-surface-container-lowest);
-      border: 1px solid var(--md-sys-color-outline-variant);
-      border-radius: 6px;
-    }
-    /* 타입 이름은 만든 뒤 고칠 수 없다 — 그 사실이 화면에서 보여야 한다 */
-    code[type] {
-      padding: 4px 8px;
-      font-family: var(--mono-font, monospace);
-      font-size: 0.76rem;
-      color: var(--md-sys-color-on-surface-variant, var(--md-sys-color-on-surface));
-      background-color: var(--md-sys-color-surface-container);
-      border-radius: 6px;
-    }
-    span[dirty] {
-      font: var(--label-font, inherit);
-      font-size: 0.74rem;
-      color: var(--md-sys-color-tertiary);
-    }
     div[spacer] {
       flex: 1;
     }
-    button[save] {
-      padding: 6px 16px;
-      font: var(--label-font, inherit);
-      font-size: 0.76rem;
-      font-weight: 600;
-      color: var(--md-sys-color-on-primary, #fff);
-      background-color: var(--md-sys-color-primary);
-      border: none;
-      border-radius: 6px;
-      cursor: pointer;
-    }
-    button[save][disabled] {
-      opacity: 0.4;
-      cursor: default;
-    }
-
-    /*
-      저장이 거절된 사유. 단추 **바로 왼쪽**에 둔다 — 누른 자리에서 답을 봐야 한다. 길면 줄이지만
-      전문은 title 로 남긴다(서버 문장이 길 수 있다).
-    */
-    span[save-failed] {
-      max-width: 280px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      padding: 4px 8px;
-      font: var(--label-font, inherit);
-      font-size: 0.72rem;
-      color: var(--md-sys-color-on-error-container, var(--md-sys-color-on-surface));
-      background-color: var(--md-sys-color-error-container);
-      border-radius: 6px;
-    }
 
     /*
       칸을 벡터 저작도구의 관례대로 놓는다 — 왼쪽에 무엇이 있나(레이어), 오른쪽에
@@ -294,16 +213,17 @@ export class FigureModellerPage extends FigureModellerPageBase {
     }
 
     /*
-      편집 · 미리보기 전환.
+      편집 · 미리보기 전환 및 조작 띠.
 
       가운데 칸 위에 얇게 둔다. 무엇을 보고 있는지가 늘 보여야 하고, 두 화면이 같은
       자리를 쓰므로 어느 쪽인지 모르면 편집이 안 먹는 것처럼 읽힌다.
     */
     div[modes] {
       display: flex;
+      align-items: center;
       flex: none;
       gap: 2px;
-      padding: 5px var(--spacing-medium, 8px);
+      padding: 4px var(--spacing-medium, 8px);
       border-bottom: 1px solid var(--md-sys-color-outline-variant);
     }
     div[modes] button[mode] {
@@ -324,13 +244,36 @@ export class FigureModellerPage extends FigureModellerPageBase {
       color: var(--md-sys-color-on-primary-container);
       background-color: var(--md-sys-color-primary-container);
     }
-
-    /*
-      양쪽 칸을 접는 손잡이. 띠의 양 끝, 접히는 칸 바로 옆이다.
-
-      접었을 때 남는 것이 이것 하나뿐이므로 **접는 자리와 펴는 자리가 같아야 한다.**
-      다른 데 두면 접고 나서 되돌릴 곳을 찾아야 한다.
-    */
+    div[modes] div[separator] {
+      width: 1px;
+      height: 16px;
+      margin: 0 4px;
+      background-color: var(--md-sys-color-outline-variant);
+    }
+    div[modes] button[history] {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 26px;
+      height: 26px;
+      padding: 0;
+      color: var(--md-sys-color-on-surface-variant, var(--md-sys-color-on-surface));
+      background: none;
+      border: none;
+      border-radius: 6px;
+      cursor: pointer;
+    }
+    div[modes] button[history]:hover:not([disabled]) {
+      background-color: var(--md-sys-color-surface-container);
+      color: var(--md-sys-color-on-surface);
+    }
+    div[modes] button[history][disabled] {
+      opacity: 0.3;
+      cursor: default;
+    }
+    div[modes] button[history] md-icon {
+      --md-icon-size: 18px;
+    }
     div[modes] button[collapse] {
       display: flex;
       align-items: center;
@@ -348,6 +291,67 @@ export class FigureModellerPage extends FigureModellerPageBase {
     div[modes] button[collapse] md-icon {
       --md-icon-size: 18px;
     }
+    div[modes] span[dirty] {
+      align-self: center;
+      margin-right: 6px;
+      font: var(--label-font, inherit);
+      font-size: 0.72rem;
+      color: var(--md-sys-color-tertiary);
+    }
+    div[modes] span[save-failed] {
+      align-self: center;
+      max-width: 240px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      margin-right: 6px;
+      padding: 3px 7px;
+      font: var(--label-font, inherit);
+      font-size: 0.7rem;
+      color: var(--md-sys-color-on-error-container, var(--md-sys-color-on-surface));
+      background-color: var(--md-sys-color-error-container);
+      border-radius: 4px;
+    }
+    div[modes] button[save] {
+      padding: 4px 14px;
+      margin-right: 4px;
+      font: var(--label-font, inherit);
+      font-size: 0.74rem;
+      font-weight: 600;
+      color: var(--md-sys-color-on-primary, #fff);
+      background-color: var(--md-sys-color-primary);
+      border: none;
+      border-radius: 6px;
+      cursor: pointer;
+    }
+    div[modes] button[save]:hover:not([disabled]) {
+      box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
+    }
+    div[modes] button[save][disabled] {
+      opacity: 0.35;
+      cursor: default;
+    }
+    div[modes] button[ai-support] {
+      display: inline-flex;
+      align-items: center;
+      gap: 4px;
+      padding: 3px 10px;
+      margin-right: 6px;
+      font: var(--label-font, inherit);
+      font-size: 0.74rem;
+      font-weight: 600;
+      color: var(--md-sys-color-primary);
+      background: var(--md-sys-color-primary-container);
+      border: 1px solid var(--md-sys-color-outline-variant);
+      border-radius: 6px;
+      cursor: pointer;
+    }
+    div[modes] button[ai-support]:hover {
+      background-color: var(--md-sys-color-surface-container-high);
+    }
+    div[modes] button[ai-support] md-icon {
+      --md-icon-size: 15px;
+    }
 
     /*
       후보가 오면 가운데를 둘로 나눈다.
@@ -534,6 +538,86 @@ export class FigureModellerPage extends FigureModellerPageBase {
       line-height: 1.5;
       color: var(--md-sys-color-error);
     }
+    .save-modal-backdrop {
+      position: fixed;
+      inset: 0;
+      background: rgba(0, 0, 0, 0.5);
+      backdrop-filter: blur(2px);
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      z-index: 1000;
+    }
+    .save-modal-card {
+      background: var(--md-sys-color-surface-container-high, #fff);
+      color: var(--md-sys-color-on-surface, #1f1f1f);
+      border-radius: 12px;
+      padding: 24px;
+      width: 380px;
+      max-width: 90vw;
+      box-shadow: 0 12px 36px rgba(0, 0, 0, 0.28);
+      display: flex;
+      flex-direction: column;
+      gap: 12px;
+    }
+    .save-modal-title {
+      margin: 0;
+      font-size: 1.15rem;
+      font-weight: 700;
+    }
+    .save-modal-desc {
+      margin: 0;
+      font-size: 0.8rem;
+      color: var(--md-sys-color-on-surface-variant, #666);
+    }
+    .save-modal-field {
+      display: flex;
+      flex-direction: column;
+      gap: 4px;
+    }
+    .save-modal-field label {
+      font-size: 0.76rem;
+      font-weight: 600;
+      color: var(--md-sys-color-on-surface-variant, #555);
+    }
+    .save-modal-field input {
+      padding: 8px 10px;
+      border: 1px solid var(--md-sys-color-outline, #ccc);
+      border-radius: 6px;
+      font-size: 0.88rem;
+      background: var(--md-sys-color-surface, #fff);
+      color: inherit;
+    }
+    .save-modal-error {
+      color: var(--md-sys-color-error, #b00020);
+      font-size: 0.78rem;
+    }
+    .save-modal-actions {
+      display: flex;
+      justify-content: flex-end;
+      gap: 8px;
+      margin-top: 8px;
+    }
+    .save-modal-actions button {
+      padding: 6px 14px;
+      border-radius: 6px;
+      font-size: 0.82rem;
+      cursor: pointer;
+      border: none;
+    }
+    .save-modal-actions .btn-cancel {
+      background: none;
+      color: var(--md-sys-color-on-surface, inherit);
+    }
+    .save-modal-actions .btn-confirm {
+      background: var(--md-sys-color-primary, #0066cc);
+      color: var(--md-sys-color-on-primary, #fff);
+      font-weight: 600;
+    }
+    .save-modal-actions .btn-confirm:disabled {
+      opacity: 0.5;
+      cursor: not-allowed;
+    }
   `
 
   /** 편집 중인 Figure. 새로 만드는 중이면 `id` 가 없다. */
@@ -575,11 +659,21 @@ export class FigureModellerPage extends FigureModellerPageBase {
    * 미저장 표시(`dirty`)는 그대로 남으므로 데이터를 잃지는 않았다. 잃은 것은 **사유**다.
    */
   @state() private saveFailure = ''
+  @state() private showSaveModal = false
+  @state() private saveModalType = ''
+  @state() private saveModalName = ''
+  @state() private saveModalError = ''
   /** 저작 보조 또는 발행 게이트가 연 후보 검토 세션. 받기 전에는 정본이 아니다. */
   @state() private proposalSession?: ProposalSession
   /** 인라인 요청창과 AI 도크가 함께 쓰는 현재 Figure의 제한된 세션 피드백. */
   @state() private proposalFeedback: ProposalFeedback[] = []
 
+  @state() private undoStack: { board?: BoardModel; parts: PartModel[]; selected: number }[] = []
+  @state() private redoStack: { board?: BoardModel; parts: PartModel[]; selected: number }[] = []
+  @state() private sceneRevision = 0
+  private lastCoalesceKey?: string
+  private lastHistoryTime = 0
+
   /**
    * 저장 형식으로 변환한 것. 씬 모델이 바뀔 때만 다시 만든다.
    *
@@ -627,11 +721,59 @@ export class FigureModellerPage extends FigureModellerPageBase {
 
   private acceptDockProposal = (event: Event) => {
     const detail = (event as CustomEvent).detail
-    if (!this.active || (detail?.figureId ?? '') !== (this.figure?.id ?? '')) return
-    if (detail?.draftType && detail.draftType !== this.folded?.type) return
-    if (detail?.baseSource && detail.baseSource !== JSON.stringify(this.folded)) return
-    this.receive(detail.proposal)
-    detail.accepted = true
+    if (!detail) return
+    if (detail?.baseSource && detail.baseSource !== JSON.stringify(this.folded)) {
+      try {
+        const parsedBase = typeof detail.baseSource === 'string' ? JSON.parse(detail.baseSource) : detail.baseSource
+        if (parsedBase?.type && this.folded?.type && parsedBase.type !== this.folded.type) {
+          // type 불일치 시에만 차단하고 그 외 미세 차이는 수용
+        }
+      } catch {
+        // ignore
+      }
+    }
+    const source = detail?.source || (detail?.proposal?.source ? (typeof detail.proposal.source === 'string' ? JSON.parse(detail.proposal.source) : detail.proposal.source) : undefined)
+    if (source) {
+      this.applySourceDirectly(source, detail.proposal)
+      detail.accepted = true
+    }
+  }
+
+  private onFigureAiStage = (event: Event) => {
+    const detail = (event as CustomEvent).detail
+    const source = detail?.source || (detail?.proposal?.source ? (typeof detail.proposal.source === 'string' ? JSON.parse(detail.proposal.source) : detail.proposal.source) : undefined)
+    if (source) {
+      this.applySourceDirectly(source, detail.proposal)
+    }
+  }
+
+  private applySourceDirectly(rawSource: any, proposal?: any) {
+    const source = typeof rawSource === 'string' ? JSON.parse(rawSource) : rawSource
+    if (!source || !Array.isArray(source.parts)) return
+
+    this.recordHistory()
+    try {
+      const { board, parts } = fromFigureSource(source)
+      this.board = board
+      this.parts = parts
+      this.dirty = true
+      this.selected = parts.length ? 0 : -1
+
+      if (source.type) {
+        this.figure = { ...(this.figure || {}), type: source.type } as Figure
+        if (this.board) {
+          this.board = { ...this.board, figureType: source.type }
+        }
+      }
+
+      this.proposalSession = undefined
+      this.sceneRevision++
+
+      this.requestUpdate()
+      document.dispatchEvent(new CustomEvent('notify', { detail: { message: `${source.type || 'Figure'} 모델이 3D 뷰어에 반영되었습니다.` } }))
+    } catch (e) {
+      console.error('[FigureModeller] Failed to apply AI proposal source:', e)
+    }
   }
 
   private proposalBaseSource?: string
@@ -640,15 +782,42 @@ export class FigureModellerPage extends FigureModellerPageBase {
     super.connectedCallback()
     window.addEventListener('figure-ai-context-request', this.announceAiContext)
     window.addEventListener('figure-ai-review', this.acceptDockProposal)
+    window.addEventListener('figure-ai-stage', this.onFigureAiStage)
+    window.addEventListener('figure-save-request', this.onSaveRequest)
+    window.addEventListener('keydown', this.handleKeyDown)
   }
 
   disconnectedCallback() {
+    window.removeEventListener('keydown', this.handleKeyDown)
+    window.removeEventListener('figure-save-request', this.onSaveRequest)
+    window.removeEventListener('figure-ai-stage', this.onFigureAiStage)
     window.removeEventListener('figure-ai-context-request', this.announceAiContext)
     window.removeEventListener('figure-ai-review', this.acceptDockProposal)
     window.dispatchEvent(new CustomEvent('figure-ai-context', { detail: undefined }))
     super.disconnectedCallback()
   }
 
+  private onSaveRequest = () => {
+    if (this.active) this.save()
+  }
+
+  private handleKeyDown = (e: KeyboardEvent) => {
+    if (!this.active || this.mode !== 'edit' || this.proposalSession) return
+    const target = e.composedPath()[0] as HTMLElement | undefined
+    const tag = target?.tagName?.toLowerCase()
+    if (tag === 'input' || tag === 'textarea' || target?.isContentEditable) return
+
+    if ((e.metaKey || e.ctrlKey) && !e.altKey) {
+      if (e.key === 'z' && !e.shiftKey) {
+        e.preventDefault()
+        this.undo()
+      } else if ((e.key === 'z' && e.shiftKey) || e.key === 'y') {
+        e.preventDefault()
+        this.redo()
+      }
+    }
+  }
+
   get context() {
     return {
       title: this.figure?.name ?? i18next.t('figure.title.new-figure'),
@@ -670,32 +839,12 @@ export class FigureModellerPage extends FigureModellerPageBase {
     const source = this.folded
 
     return html`
-      <div header>
-        <!--
-          이름과 타입은 **속성 패널**에 있다(figure-inspector 의 도형 절). 여기 있던 이름 칸은
-          하네스 시절의 자리였다 — 앱에서는 셸이 페이지 제목으로 같은 이름을 그리므로 글자가 두 번
-          나오고, 캔버스가 주인공인 화면에서 그만큼 높이를 잃었다.
-        -->
-        ${this.dirty ? html`<span dirty>${i18next.t('figure.text.unsaved-changes')}</span>` : ''}
-        <!--
-          말로 시키는 줄이 머리줄의 남는 폭을 쓴다. 따로 두면 화면 위가 두 줄이 되고, 그 위 줄은
-          이름을 페이지 제목과 겹쳐 적는다.
-        -->
-        <button ai-support @click=${() => {
-          requestFigureAI({ figureId: this.figure?.id, source: this.folded })
-          openOverlay('figure-ai-dock', { backdrop: false })
-        }}>AI 지원</button>
-        ${this.saveFailure ? html`<span save-failed title=${this.saveFailure}>${this.saveFailure}</span>` : ''}
-        <button save ?disabled=${!this.canSave} @click=${() => this.save()}>
-          ${this.saving ? i18next.t('figure.text.saving-figure') : i18next.t('figure.button.save')}
-        </button>
-      </div>
-
       <div
         edits
         ?collapse-left=${this.collapsed.left}
         ?collapse-right=${this.collapsed.right}
         @figure-rename=${(e: CustomEvent) => this.rename(e.detail.name)}
+        @figure-type-change=${(e: CustomEvent) => this.typeChanged(e.detail.type)}
         @figure-catalog=${(e: CustomEvent) => this.catalog(e.detail)}
         @figure-released=${(e: CustomEvent) => this.released(e.detail.figure)}
         @figure-reverted=${() => this.figure?.id && this.load(this.figure.id)}
@@ -731,10 +880,12 @@ export class FigureModellerPage extends FigureModellerPageBase {
                   <div lane>
                     <h4>${i18next.t('figure.label.now')}</h4>
                     <figure-canvas
+                      .figureId=${this.figure?.id || this.figure?.type}
                       .board=${this.board}
                       .parts=${this.parts}
                       .picked=${this.pickedName}
                       .view=${this.view}
+                      .revision=${this.sceneRevision}
                     ></figure-canvas>
                   </div>
                   <div lane candidate>
@@ -755,9 +906,12 @@ export class FigureModellerPage extends FigureModellerPageBase {
             : this.mode === 'preview'
               ? html`<figure-preview .source=${source}></figure-preview>`
               : html`<figure-canvas
+                  .figureId=${this.figure?.id || this.figure?.type}
                   .board=${this.board}
                   .parts=${this.parts}
                   .picked=${this.pickedName}
+                  .view=${this.view}
+                  .revision=${this.sceneRevision}
                 ></figure-canvas>`}
         </div>
 
@@ -777,6 +931,7 @@ export class FigureModellerPage extends FigureModellerPageBase {
           @update-view=${(e: CustomEvent) => (this.view = e.detail.view)}
         ></figure-side>
       </div>
+      ${this.renderSaveModal()}
     `
   }
 
@@ -811,7 +966,44 @@ export class FigureModellerPage extends FigureModellerPageBase {
 
     return html`<div modes>
       ${this.renderCollapse('left')}${this.proposalSession ? '' : html`${one('edit')}${one('preview')}`}
+      ${this.mode === 'edit' && !this.proposalSession
+        ? html`
+            <div separator></div>
+            <button
+              history
+              ?disabled=${this.undoStack.length === 0}
+              title="${i18next.t('figure.button.undo')} (Ctrl+Z)"
+              @click=${() => this.undo()}
+            >
+              <md-icon>undo</md-icon>
+            </button>
+            <button
+              history
+              ?disabled=${this.redoStack.length === 0}
+              title="${i18next.t('figure.button.redo')} (Ctrl+Y)"
+              @click=${() => this.redo()}
+            >
+              <md-icon>redo</md-icon>
+            </button>
+          `
+        : ''}
       <div spacer></div>
+      <button
+        ai-support
+        title=${i18next.t('figure.button.ask')}
+        @click=${() => {
+          requestFigureAI({ figureId: this.figure?.id, source: this.folded })
+          openOverlay('figure-ai-dock', { backdrop: false })
+        }}
+      >
+        <md-icon>auto_awesome</md-icon>
+        <span>AI</span>
+      </button>
+      ${this.saveFailure ? html`<span save-failed title=${this.saveFailure}>${this.saveFailure}</span>` : ''}
+      ${this.dirty ? html`<span dirty>${i18next.t('figure.text.unsaved-changes')}</span>` : ''}
+      <button save ?disabled=${!this.canSave} @click=${() => this.save()}>
+        ${this.saving ? i18next.t('figure.text.saving-figure') : i18next.t('figure.button.save')}
+      </button>
       ${this.renderCollapse('right')}
     </div>`
   }
@@ -1013,6 +1205,7 @@ export class FigureModellerPage extends FigureModellerPageBase {
     if (!this.proposalSession) return
     if (this.proposalBaseSource !== undefined && this.proposalBaseSource !== JSON.stringify(this.folded)) return
 
+    this.recordHistory()
     const taken = proposals.applyProposal(this.folded, this.proposalSession.source, this.proposalSession.picked)
     const { board, parts } = fromFigureSource(taken)
 
@@ -1069,7 +1262,11 @@ export class FigureModellerPage extends FigureModellerPageBase {
    * 저장이 거절되면 `dirty` 를 그대로 두므로 다시 누를 수 있다.
    */
   private get canSave(): boolean {
-    if (this.saving || !this.dirty || !this.folded || !this.figure?.name) {
+    if (this.saving || !this.dirty || !this.folded) {
+      return false
+    }
+    // 기존 저장된 모델은 이름이 있어야 바로 저장 가능. 신규 모델은 저장 팝업에서 이름을 입력할 수 있음
+    if (this.figure?.id && !this.figure?.name) {
       return false
     }
     return validate(this.folded).errors.length === 0
@@ -1084,9 +1281,13 @@ export class FigureModellerPage extends FigureModellerPageBase {
     const id = lifecycle?.resourceId
 
     if (id) {
-      if (id !== this.figure?.id) {
+      if (changes.active || id !== this.figure?.id) {
         await this.load(id)
       }
+      const pending = consumePendingFigureProposal()
+      if (pending?.source) {
+        this.applySourceDirectly(pending.source, pending.proposal)
+      }
       return
     }
 
@@ -1102,10 +1303,37 @@ export class FigureModellerPage extends FigureModellerPageBase {
       들고 있는 것이 **저장된 도형이면**(id 가 있으면) 새로 시작한다. 아직 저장 안 한 새 도형을
       들고 있으면 그대로 둔다 — 페이지를 다시 들렀다고 저작 중인 것을 버리지 않는다.
     */
+    if (!this.figure) {
+      this.startNew()
+      const pending = consumePendingFigureProposal()
+      if (pending?.source) {
+        this.applySourceDirectly(pending.source, pending.proposal)
+      }
+      return
+    }
+
+    if (this.figure.id) {
+      this.startNew()
+      const pending = consumePendingFigureProposal()
+      if (pending?.source) {
+        this.applySourceDirectly(pending.source, pending.proposal)
+      }
+      return
+    }
+
     if (shouldStartNewFigure(changes, !!this.figure, this.figure?.id)) {
       this.startNew()
+      const pending = consumePendingFigureProposal()
+      if (pending?.source) {
+        this.applySourceDirectly(pending.source, pending.proposal)
+      }
       return
     }
+
+    const pending = consumePendingFigureProposal()
+    if (pending?.source) {
+      this.applySourceDirectly(pending.source, pending.proposal)
+    }
   }
 
   private loadGeneration = 0
@@ -1149,6 +1377,9 @@ export class FigureModellerPage extends FigureModellerPageBase {
     this.selected = -1
     this.dirty = false
     this.violations = []
+    this.undoStack = []
+    this.redoStack = []
+    this.lastCoalesceKey = undefined
   }
 
   private startNew() {
@@ -1168,6 +1399,9 @@ export class FigureModellerPage extends FigureModellerPageBase {
     this.selected = -1
     this.dirty = true
     this.violations = []
+    this.undoStack = []
+    this.redoStack = []
+    this.lastCoalesceKey = undefined
   }
 
   private rename(name: string) {
@@ -1177,6 +1411,15 @@ export class FigureModellerPage extends FigureModellerPageBase {
     this.dirty = true
   }
 
+  private typeChanged(type: string) {
+    if (!type || this.figure?.id) return
+    const sanitized = type.replace(/[^A-Za-z0-9_]/g, '_').toUpperCase()
+    if (this.board) this.board.figureType = sanitized
+    this.figure = { ...this.figure, type: sanitized } as Figure
+    this.folded = this.board ? toFigureSource(this.board, this.parts) : undefined
+    this.dirty = true
+  }
+
   /**
    * 분류와 태그를 고친다.
    *
@@ -1190,13 +1433,62 @@ export class FigureModellerPage extends FigureModellerPageBase {
     this.dirty = true
   }
 
+  private snapshotState(): { board?: BoardModel; parts: PartModel[]; selected: number } {
+    return {
+      board: this.board ? structuredClone(this.board) : undefined,
+      parts: structuredClone(this.parts),
+      selected: this.selected
+    }
+  }
+
+  private recordHistory(coalesceKey?: string) {
+    const now = Date.now()
+    if (coalesceKey && this.lastCoalesceKey === coalesceKey && now - this.lastHistoryTime < 600) {
+      this.lastHistoryTime = now
+      return
+    }
+
+    this.lastCoalesceKey = coalesceKey
+    this.lastHistoryTime = now
+
+    this.undoStack = [...this.undoStack.slice(-49), this.snapshotState()]
+    this.redoStack = []
+  }
+
+  private undo() {
+    if (this.undoStack.length === 0) return
+    const prev = this.undoStack[this.undoStack.length - 1]
+    this.undoStack = this.undoStack.slice(0, -1)
+    this.redoStack = [this.snapshotState(), ...this.redoStack.slice(0, 49)]
+
+    this.board = prev.board ? structuredClone(prev.board) : undefined
+    this.parts = structuredClone(prev.parts)
+    this.selected = this.parts.length ? Math.max(-1, Math.min(prev.selected, this.parts.length - 1)) : -1
+    this.dirty = true
+    this.lastCoalesceKey = undefined
+  }
+
+  private redo() {
+    if (this.redoStack.length === 0) return
+    const next = this.redoStack[0]
+    this.redoStack = this.redoStack.slice(1)
+    this.undoStack = [...this.undoStack.slice(-49), this.snapshotState()]
+
+    this.board = next.board ? structuredClone(next.board) : undefined
+    this.parts = structuredClone(next.parts)
+    this.selected = this.parts.length ? Math.max(-1, Math.min(next.selected, this.parts.length - 1)) : -1
+    this.dirty = true
+    this.lastCoalesceKey = undefined
+  }
+
   /**
    * 부품 목록을 갈아 끼운다.
    *
    * 편집 규칙은 `part-edits` 가 갖는다 — 화면과 테스트가 같은 것을 쓰게 하려고 떼어
    * 놓았다. 여기서는 결과를 담고 선택 인덱스를 정리한다.
    */
-  private put(parts: PartModel[], selected = this.selected) {
+  private put(parts: PartModel[], selected = this.selected, coalesceKey?: string) {
+    this.recordHistory(coalesceKey)
     this.parts = parts
     this.selected = Math.min(selected, parts.length - 1)
     this.dirty = true
@@ -1221,7 +1513,7 @@ export class FigureModellerPage extends FigureModellerPageBase {
   }
 
   private updatePart(index: number, part: PartModel) {
-    this.put(edits.updatePart(this.parts, index, part))
+    this.put(edits.updatePart(this.parts, index, part), this.selected, `part:${part.name || index}`)
   }
 
   /**
@@ -1231,6 +1523,7 @@ export class FigureModellerPage extends FigureModellerPageBase {
    * 고칠 때마다 부품 목록이 새 배열이 되고, 그리는 쪽이 전부 다시 그린다.
    */
   private updateBoard(board: BoardModel) {
+    this.recordHistory('board')
     this.board = board
     this.dirty = true
   }
@@ -1248,6 +1541,7 @@ export class FigureModellerPage extends FigureModellerPageBase {
   private changeDetailLevel(level: DetailLevel) {
     if (!this.board) return
 
+    this.recordHistory('detailLevel')
     this.board = { ...this.board, detailLevel: level }
     this.dirty = true
   }
@@ -1286,7 +1580,7 @@ export class FigureModellerPage extends FigureModellerPageBase {
    */
   private partChanged(name: string, part: PartModel) {
     const at = this.parts.findIndex(item => item.name === name)
-    if (at >= 0) this.put(edits.updatePart(this.parts, at, part))
+    if (at >= 0) this.put(edits.updatePart(this.parts, at, part), this.selected, `drag:${name}`)
   }
 
   /**
@@ -1372,71 +1666,137 @@ export class FigureModellerPage extends FigureModellerPageBase {
     }
   }
 
-  private async save() {
+  private save() {
     if (!this.canSave || !this.folded || !this.figure) {
       return
     }
 
+    if (!this.figure.id) {
+      // 신규 저장: 타입 코드와 표시 이름을 명확히 팝업으로 확인/입력받음
+      let defaultType = this.board?.figureType || this.figure.type || ''
+      if (!defaultType || defaultType.startsWith('FIGURE_')) {
+        defaultType = 'FIGURE'
+      }
+      this.saveModalType = defaultType
+      this.saveModalName = this.figure.name || ''
+      this.saveModalError = ''
+      this.showSaveModal = true
+      return
+    }
+
+    void this.doSave()
+  }
+
+  private async doSave() {
+    if (!this.folded || !this.figure) return
+
     this.saving = true
     this.saveFailure = ''
-    try {
-      const sourceJson = JSON.stringify(this.folded)
-      /*
-        보이는 것을 그대로 찍어 함께 보낸다.
+    this.saveModalError = ''
 
-        카드가 그림 없이 서 있으면 카탈로그에서 무엇인지 못 고른다. 찍는 자리를 저장에 두는 이유는
-        **그 순간이 정본이 바뀌는 순간**이라서다 — 따로 찍는 절차를 두면 그림과 정본이 갈린다.
+    try {
+      if (!this.figure.id) {
+        const typeToSave = (this.saveModalType || this.board?.figureType || this.figure.type || 'FIGURE').trim().toUpperCase()
+        const nameToSave = (this.saveModalName || this.figure.name || typeToSave).trim()
 
-        못 찍으면 보내지 않는다(`undefined`). 빈 그림을 넣어 「그림이 있다」고 말하지 않는다.
-      */
-      const thumbnail = await captureThumbnail(this.board, this.parts)
+        if (!typeToSave) {
+          throw new Error('타입 이름을 입력하세요.')
+        }
 
-      if (this.figure.id) {
-        const result = await updateFigure(this.figure.id, {
-          name: this.figure.name,
-          /*
-            카탈로그의 값도 함께 보낸다. 화면에서 고쳐 놓고 저장에 안 실으면 저장 뒤에 조용히
-            사라진다 — 저작자는 저장했다고 보고 다시 열면 없다.
-          */
-          category: this.figure.category,
-          tags: this.figure.tags,
-          source: sourceJson,
-          thumbnail
-        })
-        this.figure = result.figure
-        this.violations = result.violations
-      } else {
-        // 새로 만들 때만 타입 이름이 정해진다. 이미 쓰이는 이름이면 저장 전에 막는다 —
-        // 만든 뒤에는 고칠 수 없으므로 여기서 걸러야 한다.
         const taken = await fetchFigureTypeNames()
-        if (taken.includes(this.folded.type)) {
-          throw new Error(i18next.t('figure.text.type-name-already-taken', { type: this.folded.type }))
+        if (taken.includes(typeToSave)) {
+          throw new Error(i18next.t('figure.text.type-name-already-taken', { type: typeToSave }))
         }
 
+        if (this.board) this.board.figureType = typeToSave
+        this.figure = { ...this.figure, type: typeToSave, name: nameToSave }
+        this.folded = { ...this.folded, type: typeToSave }
+        const sourceJson = JSON.stringify(this.folded)
+        const thumbnail = await captureThumbnail(this.board, this.parts)
+
         const result = await createFigure({
-          type: this.folded.type,
-          name: this.figure.name,
+          type: typeToSave,
+          name: nameToSave,
           category: this.figure.category,
           tags: this.figure.tags,
           source: sourceJson,
           thumbnail
         })
+
         this.figure = result.figure
         this.violations = result.violations
+        this.showSaveModal = false
+        this.dirty = false
         navigate(`figure-modeller/${result.figure.id}`)
+        return
+      }
+
+      // 기존 모델 업데이트: folded.type이 figure.type과 일치하도록 보장
+      if (this.figure.type && this.folded.type !== this.figure.type) {
+        this.folded = { ...this.folded, type: this.figure.type }
+        if (this.board) this.board.figureType = this.figure.type
       }
+      const sourceJson = JSON.stringify(this.folded)
+      const thumbnail = await captureThumbnail(this.board, this.parts)
 
+      const result = await updateFigure(this.figure.id, {
+        name: this.figure.name,
+        category: this.figure.category,
+        tags: this.figure.tags,
+        source: sourceJson,
+        thumbnail
+      })
+      this.figure = result.figure
+      this.violations = result.violations
       this.dirty = false
     } catch (e) {
-      /*
-        **서버가 말한 사유를 그대로 올린다.** 여기서 문장을 다시 지으면 무엇이 걸렸는지 알 수 없다 —
-        타입 이름이 이미 쓰였다는 것과 권한이 없다는 것은 저작자가 할 일이 다르다.
-
-        `dirty` 는 건드리지 않는다. 저장이 안 됐으므로 미저장인 것이 사실이다.
-      */
-      this.saveFailure = (e as Error).message
+      const msg = (e as Error).message
+      this.saveFailure = msg
+      this.saveModalError = msg
     } finally {
       this.saving = false
     }
   }
+
+  private renderSaveModal() {
+    if (!this.showSaveModal) return nothing
+
+    return html`
+      <div class="save-modal-backdrop" @click=${(e: Event) => { if (e.target === e.currentTarget) this.showSaveModal = false }}>
+        <div class="save-modal-card" role="dialog" aria-modal="true">
+          <h3 class="save-modal-title">${i18next.t('figure.title.save-new-figure', { defaultValue: '도형 초안 저장' })}</h3>
+          <p class="save-modal-desc">${i18next.t('figure.text.save-new-figure-desc', { defaultValue: '보드와 캔버스에서 식별할 고유 타입 코드와 이름을 정합니다.' })}</p>
+
+          <div class="save-modal-field">
+            <label>${i18next.t('figure.label.figure-type', { defaultValue: '타입 코드 (영문 대문자)' })}</label>
+            <input
+              .value=${this.saveModalType}
+              placeholder="예: OHT, AGV_LIFTER"
+              @input=${(e: Event) => (this.saveModalType = (e.target as HTMLInputElement).value.trim().toUpperCase())}
+            />
+          </div>
+
+          <div class="save-modal-field">
+            <label>${i18next.t('figure.label.name', { defaultValue: '도형 이름' })}</label>
+            <input
+              .value=${this.saveModalName}
+              placeholder="예: 오버헤드 호이스트 트랜스포트"
+              @input=${(e: Event) => (this.saveModalName = (e.target as HTMLInputElement).value)}
+            />
+          </div>
+
+          ${this.saveModalError ? html`<div class="save-modal-error">${this.saveModalError}</div>` : nothing}
+
+          <div class="save-modal-actions">
+            <button class="btn-cancel" @click=${() => (this.showSaveModal = false)}>
+              ${i18next.t('figure.button.cancel', { defaultValue: '취소' })}
+            </button>
+            <button class="btn-confirm" ?disabled=${this.saving || !this.saveModalType} @click=${() => this.doSave()}>
+              ${this.saving ? i18next.t('figure.text.saving-figure', { defaultValue: '저장 중...' }) : i18next.t('figure.button.save', { defaultValue: '저장' })}
+            </button>
+          </div>
+        </div>
+      </div>
+    `
+  }
 }