@deepblend/dsh-blender-ui 0.6.0 → 0.6.2

package/lib/client.js

@@ -2822,6 +2822,7 @@ window.__ModuleLoader__.load({
       let live = false
       let loadSequence = 0
       let diffSequence = 0
+      let previewSourceGeneration = 0
       let creationAttempt = null
       const draftStorage = creationDraftStorage(settings)
       let creationDraftId = newCreationKey(), creationDraftRoot = null, persistedCreationSignature = null
@@ -2883,6 +2884,8 @@ window.__ModuleLoader__.load({
       }
       /** Change the snapshot and tell everyone. @param {object} patch */
       const set = (patch) => {
+        if (['projectId', 'projectsRoot', 'activeProjectId']
+          .some(key => Object.hasOwn(patch, key) && patch[key] !== data[key])) previewSourceGeneration += 1
         // Automatic edit images are source snapshots too. They cannot override
         // fresh rows from another store, even when its project/revision IDs match.
         if (Object.hasOwn(patch, 'projectsRoot') && patch.projectsRoot !== data.projectsRoot) {
@@ -4052,10 +4055,27 @@ window.__ModuleLoader__.load({
         },
 
         renderPreview: async () => {
+          const projectId = data.activeProjectId, projectsRoot = data.projectsRoot, generation = previewSourceGeneration
+          if (!projectId || data.previewBusy || data.busy.patch || data.busy.editor || data.busy.assembly || data.busy.restore) return
           setIn('notices', 'preview', null)
           set({ previewBusy: true, previewResult: null })
-          const outcome = await postJson(fetchImpl, projectRoute(target(), '/preview'), { revision: data.selected?.scene?.revision })
-          set({ previewBusy: false, ...(outcome.ok ? { compareMode: 'renders' } : {}) })
+          // A save receipt can arrive before the asynchronous panel refresh.
+          // Resolve the current revision from the Host instead of rendering the
+          // cached scene. A failed read must never fall back to older geometry.
+          const fresh = await readRoute(fetchImpl, `${ROUTES.state}?projectId=${encodeURIComponent(projectId)}&preview=${++tick}`, 'state')
+          if (generation !== previewSourceGeneration || data.activeProjectId !== projectId || data.projectsRoot !== projectsRoot) {
+            set({ previewBusy: false }); return
+          }
+          const selected = fresh.payload?.selected
+          const coherent = fresh.status === 'ok' && fresh.payload.projectsRoot === projectsRoot
+            && selected?.project?.projectId === projectId && selected?.scene?.revision
+            && selected.currentRevision === selected.scene.revision
+          const outcome = coherent
+            ? await postJson(fetchImpl, projectRoute(projectId, '/preview'), { revision: selected.scene.revision })
+            : { ok: false, error: fresh.error || { code: 'UI_PREVIEW_MISMATCH', message: t('preview.sourceMismatch') } }
+          set({ previewBusy: false })
+          if (generation !== previewSourceGeneration || data.activeProjectId !== projectId || data.projectsRoot !== projectsRoot) return
+          if (outcome.ok) set({ compareMode: 'renders' })
           set({
             previewResult: outcome.ok
               ? {
@@ -4137,6 +4157,7 @@ window.__ModuleLoader__.load({
           void load()
         },
         stop() {
+          previewSourceGeneration += 1
           loadSequence += 1
           diffSequence += 1
           closeCreationDraft()
@@ -5337,7 +5358,7 @@ window.__ModuleLoader__.load({
           Button({
             tone: 'primary',
             action: 'render-preview',
-            disabled: state.previewBusy || state.activeProjectId === null,
+            disabled: state.previewBusy || state.activeProjectId === null || state.busy?.patch || state.busy?.editor || state.busy?.assembly || state.busy?.restore,
             onClick: actions.renderPreview,
             children: state.previewBusy ? t('preview.rendering') : t('preview.render'),
           }),

package/lib/index.js

@@ -78,7 +78,7 @@ export const WORKBENCH_PAGE_ROOT_ID = 'deepblend-workbench'
  *      because this page supplies no platform modules: React is a console seed
  *      word, the workbench core does not use it, and `client.js` reads it lazily
  *      precisely so that this call can pass `{}`.
- *   3. `import('@deepblend/dsh-blender-ui')` — the console's own graph row,
+ *   3. Import the mounted bundle client, or the independently installed UI client — the console's own graph row,
  *      fetched from the console's own bundle route. There is no second copy of
  *      the workbench anywhere for this to find.
  *   4. `mountStandalone(root)` — the one function that differs between the faces.
@@ -95,7 +95,10 @@ export function workbenchPageBootstrap(rootId) {
   try {
     await globalThis.__DSH_BOOT_READY__?.promise
     const modules = window.__ModuleLoader__.create({ boot: window.__DSH_BOOT__, staticModules: {} })
-    const bundle = await modules.import('@deepblend/dsh-blender-ui')
+    const ownsBundleClient = (window.__DSH_BOOT__.entries || []).some(entry => entry.id === '@deepblend/dsh-blender-bundle')
+    const bundle = ownsBundleClient
+      ? await modules.import('@deepblend/dsh-blender-bundle')
+      : await modules.import('@deepblend/dsh-blender-ui')
     await bundle.mountStandalone(root)
     root.dataset.deepblendStandalone = 'ready'
   } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deepblend/dsh-blender-ui",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "type": "module",
   "description": "DeepBlend workbench UI: Host half (typed HTTP API) and Web Client half (sidebar, panels, tool cards).",
   "main": "lib/index.js",
@@ -19,7 +19,7 @@
     }
   },
   "dependencies": {
-    "@deepblend/dsh-blender-contracts": "0.6.0"
+    "@deepblend/dsh-blender-contracts": "0.6.2"
   },
   "license": "MIT",
   "repository": {