@volter/editor-blender 0.1.4 → 0.1.6

package/contributions/blender-properties-model.ts

@@ -166,6 +166,10 @@ let frameSubscription: (() => void) | null = null;
 const inFlight = new Set<string>();
 /** The subject the last context was read for, so a re-render does not refetch. */
 let readFor: string | null = null;
+/** Reads belong to a model revision and selected subject, not merely a path.
+ * A late answer for a deleted duplicate must not overwrite the new selection. */
+let readGeneration = 0;
+let contextRequest = 0;
 
 function publish(next: Partial<BlenderPropertiesState>, tabsMayHaveChanged = false): void {
   state = { ...state, ...next };
@@ -204,8 +208,10 @@ export function blenderPropertiesState(): BlenderPropertiesState {
  *  values it had. */
 function onEngineMoved(): void {
   const subject = readFor;
+  readGeneration += 1;
+  inFlight.clear();
   readFor = null;
-  publish({ views: new Map() });
+  publish({ context: null, views: new Map(), error: null, loading: subject !== null });
   if (subject !== null) scheduleContextRead(subject);
 }
 
@@ -264,11 +270,17 @@ function watchFrames(): void {
 async function readContext(key: string): Promise<void> {
   const collection = key.startsWith('collection:') ? key.slice('collection:'.length) : null;
   const object = collection === null && key !== '' ? key : null;
+  if (readFor !== key) {
+    readGeneration += 1;
+    inFlight.clear();
+  }
+  const generation = readGeneration;
+  const request = ++contextRequest;
   readFor = key;
-  publish({ loading: true, object, collection });
+  publish({ loading: true, object, collection, context: null, error: null, views: new Map() });
   try {
     const context = await blenderRnaContext(object ?? undefined, collection ?? undefined);
-    if (readFor !== key) return;
+    if (generation !== readGeneration || request !== contextRequest) return;
     // ALWAYS a tab-rail notification, and that is a correction rather than a
     // convenience: the gate a tab matches on is BOTH the subject this context
     // was read for and the tab list, so comparing only the list missed the
@@ -279,7 +291,7 @@ async function readContext(key: string): Promise<void> {
     // disappeared on the first selection and only came back on a re-select.
     publish({ context, loading: false, error: null }, true);
   } catch (error) {
-    if (readFor !== key) return;
+    if (generation !== readGeneration || request !== contextRequest) return;
     publish({ context: null, loading: false, error: describe(error) }, true);
   }
 }
@@ -305,8 +317,10 @@ export function blenderRnaViewFor(path: string): BlenderRnaView | undefined {
   if (held !== undefined) return held;
   if (inFlight.has(path) || !blenderSessionStarted()) return undefined;
   inFlight.add(path);
+  const generation = readGeneration;
   void blenderRna(path)
     .then((view) => {
+      if (generation !== readGeneration) return;
       inFlight.delete(path);
       if (view === null) return;
       const views = new Map(state.views);
@@ -314,6 +328,7 @@ export function blenderRnaViewFor(path: string): BlenderRnaView | undefined {
       publish({ views, error: null });
     })
     .catch((error: unknown) => {
+      if (generation !== readGeneration) return;
       inFlight.delete(path);
       publish({ error: describe(error) });
     });

package/host/blender-runtime-host.ts

@@ -650,13 +650,24 @@ let captureLifetime: AbortController | null = null;
  *  terminate, and the host door only exists inside a running editor. */
 let watchingSessionEnd = false;
 
+/** Diagnostics must not prevent teardown if the host has already detached. */
+function beginBlenderWork(label: string): () => void {
+  try {
+    const end = editorHost().session.beginWork(`Blender: ${label}`);
+    return () => { try { end(); } catch { /* preserve the operation's result */ } };
+  } catch { return () => {}; }
+}
+
 function terminateBlenderRuntime(): void {
-  invalidateBlenderHistory();
-  captureLifetime?.abort();
-  captureLifetime = null;
-  runtime?.terminate();
-  runtime = null;
-  lastCapture = null;
+  const end = beginBlenderWork('invalidating history and releasing runtime');
+  try {
+    invalidateBlenderHistory();
+    captureLifetime?.abort();
+    captureLifetime = null;
+    runtime?.terminate();
+    runtime = null;
+    lastCapture = null;
+  } finally { end(); }
 }
 
 // THE ENGINE DIES WITH THE SESSION, whether or not the tab can. A page told
@@ -707,6 +718,7 @@ export function blenderRuntime(): BlenderRuntime {
   captureLifetime = lifetime;
   let photographing = false;
   runtime = new BlenderRuntime({
+    work: beginBlenderWork,
     history: (entries) => {
       const owner = runtime;
       if (!owner) throw new Error('Blender history arrived before its runtime');
@@ -736,7 +748,9 @@ export function blenderRuntime(): BlenderRuntime {
     },
     present: async (frame, description, capture) => {
       const documentId = presentationDocumentId();
-      const view = await runtimeView();
+      const endWait = beginBlenderWork('waiting for Model presenter');
+      let view: RuntimeView;
+      try { view = await runtimeView(); } finally { endWait(); }
       lifetime.signal.throwIfAborted();
       if (presentationDocumentId() !== documentId)
         throw new Error('Blender document changed before its frame could be presented');
@@ -747,7 +761,11 @@ export function blenderRuntime(): BlenderRuntime {
       // still-running worker (`blender-runtime-view.ts::applyFrame` says how).
       // A document that answers `applyFrame` without one reports no `held` at
       // all, rather than a wrong `null`.
-      const applied = view.applyFrame(frame) as { held?: unknown } | null | undefined;
+      const endApply = beginBlenderWork('applying frame to Model');
+      const applied = (() => {
+        try { return view.applyFrame(frame) as { held?: unknown } | null | undefined; }
+        finally { endApply(); }
+      })();
       const reports = typeof applied === 'object' && applied !== null && 'held' in applied;
       const held = reports ? (applied.held as { session: string; revision: number } | null) : null;
       const answer = (capture: unknown): PresentAnswer => ({
@@ -893,6 +911,7 @@ export function blenderRuntime(): BlenderRuntime {
         await snapshot.prepare(renderCamera);
         assertBinding();
         const captureOptions = {
+          effect: snapshot.effect,
           width: render.width,
           height: render.height,
           transparent: render.transparent === true,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@volter/editor-blender",
   "author": "Volter AI, Inc.",
   "license": "AGPL-3.0-only AND GPL-3.0-or-later",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "publishConfig": {
     "access": "public"
   },
@@ -61,13 +61,13 @@
     ]
   },
   "dependencies": {
-    "@volter/blender-engine": "0.1.4",
-    "@volter/editor-threejs": "0.5.61",
+    "@volter/blender-engine": "0.1.6",
+    "@volter/editor-threejs": "0.5.63",
     "zod": "^4.3.6"
   },
   "peerDependencies": {
-    "@volter/editor-sdk": "*",
-    "@volter/editor-project": "*",
+    "@volter/editor-sdk": "0.5.63",
+    "@volter/editor-project": "0.5.63",
     "react": "^19.0.0",
     "three": "^0.180.0"
   },