@deepblend/dsh-blender-provider-local 0.2.12 → 0.2.14

package/lib/index.js

@@ -591,6 +591,14 @@ export default class LocalBlenderRuntime extends Service {
   /** The kept Blender for `sessionActions`, and the timer that closes it when it goes quiet. */
   _session = null
   _sessionTimer = null
+  /**
+   * Which transport the kept session came from: `configured`, `discovered` or `spawned`.
+   *
+   * Recorded rather than inferred, because "is this deployment driving the user's Blender or one of
+   * its own" is the first question anybody asks of a Live Bridge that behaves unexpectedly — and the
+   * only place that knows is the branch that chose.
+   */
+  _sessionOrigin = null
 
   /**
    * @param {import('@deepseek-ai/cordis').Context} ctx
@@ -1021,12 +1029,39 @@ export default class LocalBlenderRuntime extends Service {
    */
   async _keptSession() {
     if (this._session !== null && !this._session.closed) return this._session
-    const socket = this.config.sessionSocket
-    // THE USER'S BLENDER, when they have named one. `attachSession` owns the refusal and its message;
-    // this only decides which of the two transports the configured actions travel over.
-    this._session = typeof socket === 'string' && socket.length > 0
-      ? await this.attachSession(socket)
-      : await this.openSession()
+
+    const configured = this.config.sessionSocket
+    if (typeof configured === 'string' && configured.length > 0) {
+      // NAMED BY THE OPERATOR, so it is used and a failure is theirs to see. `attachSession` owns the
+      // refusal and its message; this only decides which transport the configured actions travel over.
+      this._session = await this.attachSession(configured)
+      this._sessionOrigin = 'configured'
+      return this._session
+    }
+
+    // DISCOVERY, WHICH IS NOT A GUESS. The convention says a bridge listens at
+    // `<workspace>/.deepblend/bridge.sock`, and a deployment that opted into sessions should not have
+    // to write that path down as well. A GUESS asserts and fails when it is wrong; this CHECKS and
+    // falls back — something answering at the conventional path is used, and nothing answering means
+    // exactly what happened before this existed. The wrong-blender check still applies to whatever is
+    // found, so discovery cannot attach to another workspace's Blender.
+    const conventional = join(this.workspaceRoot, '.deepblend', 'bridge.sock')
+    if (existsSync(conventional)) {
+      const found = await this.attachSession(conventional).then(
+        session => session,
+        () => null,
+      )
+      if (found !== null) {
+        this._session = found
+        this._sessionOrigin = 'discovered'
+        return this._session
+      }
+      // A file that exists and does not answer is the state a crash leaves; the bridge replaces it
+      // when it starts again, and until then this deployment spawns its own Blender as before.
+    }
+
+    this._session = await this.openSession()
+    this._sessionOrigin = 'spawned'
     return this._session
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deepblend/dsh-blender-provider-local",
-  "version": "0.2.12",
+  "version": "0.2.14",
   "type": "module",
   "description": "Local Blender Provider: the BlenderRuntime Service over ctx.subprocess (batch execution).",
   "main": "lib/index.js",
@@ -11,7 +11,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@deepblend/dsh-blender-contracts": "0.2.12"
+    "@deepblend/dsh-blender-contracts": "0.2.14"
   },
   "license": "MIT",
   "repository": {

package/python/bootstrap.py

@@ -227,6 +227,22 @@ def action_compile_scene(request, options):
         "engine": report["engine"],
         "requestedEngine": report["requestedEngine"],
         "profileName": report["profileName"],
+        # THE RIGS THIS SCENE DECLARES, with their bones. A count alone would say an armature exists;
+        # a rig is only useful if the bones are the ones the spec named, so the names travel with it and
+        # a test can read them back rather than trust the count.
+        "armatures": [
+            {
+                "id": armature_id,
+                "object": report["armatureNames"].get(armature_id),
+                "bones": [
+                    {"name": bone["name"], "parent": bone.get("parent")}
+                    for bone in armature_entry["bones"]
+                ],
+            }
+            for armature_id, armature_entry in (
+                (entry["id"], entry) for entry in (spec.get("armatures") or [])
+            )
+        ],
         "validation": validation,
         "sceneFingerprint": scene_fingerprint(spec, describe_objects()),
     }

package/python/deepblend_scene.py

@@ -1324,6 +1324,57 @@ def assign_view_transform(scene, name):
 # ---------------------------------------------------------------------------
 
 
+ARMATURE_PREFIX = "db_arm__"
+
+
+def build_armature(entry, guard):
+    """Create one armature and its bones, and return the object.
+
+    WHY BONES ARE RESOLVED IN A SECOND PASS: the schema lets a bone name its parent without requiring
+    the parent to be declared first, because a rig's declaration should read like the skeleton rather
+    than like its storage order. So every bone is created as a root, and the parents are applied
+    afterwards — with an unknown parent reported rather than silently ignored, since a bone that
+    quietly has no parent is a rig that deforms differently from what the file says.
+    """
+    armature_id = entry["id"]
+    data = bpy.data.armatures.new("%s%s" % (ARMATURE_PREFIX, armature_id))
+    obj = bpy.data.objects.new("%s%s" % (ARMATURE_PREFIX, armature_id), data)
+    bpy.context.scene.collection.objects.link(obj)
+    obj["deepblend_id"] = armature_id
+    obj["deepblend_kind"] = "armature"
+
+    transform = entry.get("transform") or {}
+    apply_transform(obj, transform)
+
+    # Edit mode is the only place `edit_bones` exists, and Blender's own context management is what
+    # makes it available — a manual mode switch without this leaves the object in a state the rest of
+    # the compile does not expect.
+    bpy.context.view_layer.objects.active = obj
+    bpy.ops.object.mode_set(mode="EDIT")
+    try:
+        created = {}
+        for bone in entry["bones"]:
+            edit_bone = data.edit_bones.new(bone["name"])
+            edit_bone.head = tuple(float(value) for value in bone["head"])
+            edit_bone.tail = tuple(float(value) for value in bone["tail"])
+            created[bone["name"]] = edit_bone
+        for bone in entry["bones"]:
+            parent = bone.get("parent")
+            if parent is None:
+                continue
+            if parent not in created:
+                raise ActionError(
+                    "SCENE_SPEC_INVALID",
+                    'bone "%s" of armature "%s" names parent "%s", which the same armature does not declare'
+                    % (bone["name"], armature_id, parent),
+                )
+            created[bone["name"]].parent = created[parent]
+    finally:
+        bpy.ops.object.mode_set(mode="OBJECT")
+
+    return obj
+
+
 def build_scene(spec, options, guard):
     """Compile a SceneSpec into a live Blender scene.
 
@@ -1372,6 +1423,13 @@ def build_scene(spec, options, guard):
 
     assets = {asset["id"]: asset for asset in spec.get("assets") or []}
 
+    # ARMATURES BEFORE ENTITIES: an entity that is skinned to one has to find it already there. Nothing
+    # binds yet — that is the next slice — but the order is the one that will not have to change.
+    report_progress("build_armatures", 30)
+    armature_objects = {}
+    for entry in spec.get("armatures") or []:
+        armature_objects[entry["id"]] = build_armature(entry, guard)
+
     report_progress("build_entities", 35)
     entity_objects = {}
     entity_positions = {}
@@ -1501,6 +1559,7 @@ def build_scene(spec, options, guard):
         "requestedEngine": requested_engine,
         "profileName": profile_name,
         "entityObjectNames": {key: value.name for key, value in entity_objects.items()},
+        "armatureNames": {key: value.name for key, value in armature_objects.items()},
         "cameraNames": {key: value.name for key, value in cameras.items()},
     }