@volter/editor-blender 0.1.3 → 0.1.5

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

@@ -1050,6 +1050,7 @@ export async function handleBlenderCommand(cmd: {
     };
   try {
     const project = cmd.type === 'blender-start' ? string(cmd, 'project') : null;
+    let requestedDocument = typeof cmd['document'] === 'string' ? cmd['document'] : undefined;
     if (cmd.type === 'blender-stop' || (cmd.type === 'blender-start' && cmd['fresh'] === true)) {
       // Do not invalidate history or discard the worker if persistence fails.
       await runtime?.stop();
@@ -1064,13 +1065,30 @@ export async function handleBlenderCommand(cmd: {
       // build's answer that nothing here opens that address; the Model
       // document is this package's own contribution, so it is a build without
       // `@volter/editor-blender` rather than a broken call.
-      const opened = await host.workspace.open({ kind: 'document', id: 'blender:runtime' });
+      // During startup the Model may not have mounted/bound yet. Resolve the
+      // real declared table, including custom entry ids. A generic fallback
+      // exists only in projects that have no file-backed Model of their own.
+      const table = await host.project.documentTable();
+      const models = table.entries.filter(entry => entry.kind === 'model');
+      const entry = requestedDocument !== undefined
+        ? models.find(candidate => candidate.source?.path === requestedDocument)
+        : models.find(candidate => candidate.id === (boundModel?.entryId ?? table.default))
+          ?? (models.length === 1 ? models[0] : undefined);
+      if (!entry) return {
+        ok: false,
+        error: requestedDocument !== undefined
+          ? `No declared Model document names ${requestedDocument}.`
+          : `Choose a Model document before starting Blender. Available: ${models.map(model => model.id).join(', ') || '(none)'}.`,
+      };
+      const entryId = entry.id;
+      requestedDocument = entry.source?.path;
+      const opened = await host.workspace.open({ kind: 'document', id: entryId });
       if (!opened)
         return {
           ok: false,
           error:
-            'blender-start could not open the Blender Model document: nothing in this editor ' +
-            "opens {kind: 'document', id: 'blender:runtime'} (it ships with @volter/editor-blender).",
+            `blender-start could not open the Blender Model document ${entryId}: nothing in this editor ` +
+            'opens that document (the Model document ships with @volter/editor-blender).',
         };
     }
     const session = blenderRuntime();
@@ -1081,8 +1099,8 @@ export async function handleBlenderCommand(cmd: {
         // `blender-start` that named none is asking for the session this tab
         // is showing, not for a second file beside it.
         const document =
-          typeof cmd['document'] === 'string'
-            ? cmd['document']
+          requestedDocument !== undefined
+            ? requestedDocument
             : (boundModel?.blend ?? DEFAULT_BLENDER_DOCUMENT);
         return { ok: true, data: { ...(await session.start(project!, document)) } };
       }

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.3",
+  "version": "0.1.5",
   "publishConfig": {
     "access": "public"
   },
@@ -61,8 +61,8 @@
     ]
   },
   "dependencies": {
-    "@volter/blender-engine": "0.1.3",
-    "@volter/editor-threejs": "0.5.60",
+    "@volter/blender-engine": "0.1.5",
+    "@volter/editor-threejs": "0.5.62",
     "zod": "^4.3.6"
   },
   "peerDependencies": {