@things-factory/figure-ui 10.1.15 → 10.1.16

package/dist-client/pages/figure-modeller-page.js

@@ -147,32 +147,31 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
                 detail: { figureId: this.figure?.id, source: this.folded }
             }));
         };
-        this.acceptDockProposal = (event) => {
+        /*
+          `detail.staged` is the dock's answer to "did anything actually happen to my candidate". The
+          listener is synchronous, so the dock reads it right after dispatching and only then tells the
+          chat card to say so. It used to be called `accepted`, which claimed more than it knew — the
+          page had put the candidate somewhere, not the person had agreed to it.
+        */
+        this.receiveDockProposal = (event) => {
             const detail = event.detail;
             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);
+            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;
+                detail.staged = this.openProposalForReview(source, detail.proposal);
             }
         };
         this.onFigureAiStage = (event) => {
             const detail = event.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);
+                this.openProposalForReview(source, detail.proposal);
             }
         };
         this.onSaveRequest = () => {
@@ -727,36 +726,73 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
             }));
         }
     }
-    applySourceDirectly(rawSource, proposal) {
+    /**
+     * A candidate from the dock opens the review lane. It does not become the draft.
+     *
+     * This used to write `board` and `parts` straight onto the working draft and then set
+     * `proposalSession = undefined` — the dock's candidate overwrote what the author had open and
+     * erased the lane built to review it. There was no moment where the person said yes, and a
+     * draft has no version history to go back to, so the previous work was simply gone.
+     *
+     * `ai-client-base`'s analysis contract states this as a literal type: `approvalRequired: true`,
+     * and of `proposal`, "It is never an instruction to mutate canonical state." The in-page
+     * `figure-ask` entrance already honoured it through `openAiProposal`; the dock entrance is now
+     * the same door. Applying is what the take button does, from the lane, per change.
+     *
+     * ## Why the overwrite was there — so it does not come back
+     *
+     * The dock opened the review lane originally. Before `c42a0b63df` this handler read:
+     *
+     *     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)
+     *
+     * Three guards, each a silent `return`, and the last compared a serialized source byte for byte.
+     * Any difference that changed nothing at all dropped the candidate with no message, so the dock
+     * would report a candidate and the screen would show none.
+     *
+     * The `ox-assistant-chat` migration fixed that by replacing the path rather than the guards, and
+     * the review lane went out with them — `applySourceDirectly` wrote straight to the draft, and
+     * cleared `proposalSession` on the way past. **Nobody decided that reviews were unwanted here.**
+     * It was the cost of loosening a guard by deleting what stood around it.
+     *
+     * So the guards are gone and stay gone, and the lane is back. If a candidate ever seems not to
+     * arrive, the thing to look for is a silent `return` on this path — not the lane.
+     *
+     * Returns whether the lane opened, so the dock can tell the chat whether to say it staged.
+     */
+    openProposalForReview(rawSource, proposal) {
         const source = typeof rawSource === 'string' ? JSON.parse(rawSource) : rawSource;
         if (!source || !Array.isArray(source.parts))
-            return;
-        this.recordHistory();
+            return false;
         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 };
-                if (this.board) {
-                    this.board = { ...this.board, figureType: source.type };
-                }
-            }
-            this.proposalSession = undefined;
-            this.sceneRevision++;
+            /*
+              The dock sends a FigureProposal whose metrics sit at the top level; the staged-on-navigate
+              path carries the raw tool result, which nests them under score/cost. Read both rather than
+              making one of the two entrances reshape its payload.
+            */
+            this.proposalSession = proposalSessions.openAiProposal(this.folded, {
+                source: JSON.stringify(source),
+                grade: proposal?.grade ?? proposal?.score?.grade,
+                triangles: proposal?.triangles ?? proposal?.cost?.triangles,
+                groups: proposal?.groups ?? proposal?.cost?.groups,
+                attempts: proposal?.attempts,
+                quality: proposal?.quality
+            });
+            this.mode = 'edit';
             this.requestUpdate();
-            document.dispatchEvent(new CustomEvent('notify', { detail: { message: `${source.type || 'Figure'} 모델이 3D 뷰어에 반영되었습니다.` } }));
+            return true;
         }
         catch (e) {
-            console.error('[FigureModeller] Failed to apply AI proposal source:', e);
+            console.error('[FigureModeller] Failed to open the AI candidate for review:', e);
+            return false;
         }
     }
     connectedCallback() {
         super.connectedCallback();
         window.addEventListener('figure-ai-context-request', this.announceAiContext);
-        window.addEventListener('figure-ai-review', this.acceptDockProposal);
+        window.addEventListener('figure-ai-review', this.receiveDockProposal);
         window.addEventListener('figure-ai-stage', this.onFigureAiStage);
         window.addEventListener('figure-save-request', this.onSaveRequest);
         window.addEventListener('keydown', this.handleKeyDown);
@@ -766,7 +802,7 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
         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.removeEventListener('figure-ai-review', this.receiveDockProposal);
         window.dispatchEvent(new CustomEvent('figure-ai-context', { detail: undefined }));
         super.disconnectedCallback();
     }
@@ -1216,7 +1252,7 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
             }
             const pending = consumePendingFigureProposal();
             if (pending?.source) {
-                this.applySourceDirectly(pending.source, pending.proposal);
+                this.openProposalForReview(pending.source, pending.proposal);
             }
             return;
         }
@@ -1236,7 +1272,7 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
             this.startNew();
             const pending = consumePendingFigureProposal();
             if (pending?.source) {
-                this.applySourceDirectly(pending.source, pending.proposal);
+                this.openProposalForReview(pending.source, pending.proposal);
             }
             return;
         }
@@ -1244,7 +1280,7 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
             this.startNew();
             const pending = consumePendingFigureProposal();
             if (pending?.source) {
-                this.applySourceDirectly(pending.source, pending.proposal);
+                this.openProposalForReview(pending.source, pending.proposal);
             }
             return;
         }
@@ -1252,13 +1288,13 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
             this.startNew();
             const pending = consumePendingFigureProposal();
             if (pending?.source) {
-                this.applySourceDirectly(pending.source, pending.proposal);
+                this.openProposalForReview(pending.source, pending.proposal);
             }
             return;
         }
         const pending = consumePendingFigureProposal();
         if (pending?.source) {
-            this.applySourceDirectly(pending.source, pending.proposal);
+            this.openProposalForReview(pending.source, pending.proposal);
         }
     }
     async load(id) {