@deepblend/dsh-blender-host 0.8.1 → 0.10.0

package/lib/geometry-inspection.js

@@ -0,0 +1,93 @@
+import { mkdirSync, copyFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { randomUUID } from 'node:crypto'
+import { BlenderError, BlenderErrorCode, sceneSpecDigest, specHash, validateGeometrySelection,
+  verifyGeometryReport, GEOMETRY_INSPECTION_LIMITS } from '@deepblend/dsh-blender-contracts'
+import { fileSha256, fileSize, isFile, resolveInside, removeTree } from './paths.js'
+import { verifyAssetBundle, verifyUnbundledGltfAsset, verifyUnbundledObjAsset } from './asset-bundle.js'
+
+function refuse(code, message) { throw new BlenderError(code, `Native geometry inspection: ${message}`) }
+function cancelled(signal) {
+  if (signal?.aborted) refuse(BlenderErrorCode.ABORTED, 'cancelled; the saved source was not changed.')
+}
+
+/** Native values are bound to an immutable revision, never inferred from generator declarations. */
+export async function inspectRevisionGeometry(host, projectId, revision, selection, signal) {
+  const store = host.store, spec = store.readRevisionSpec(projectId, revision)
+  const manifest = store.readRevisionManifest(projectId, revision), digest = sceneSpecDigest(spec)
+  const project = store.projectDirectory(projectId), directory = store.revisionDirectory(projectId, revision)
+  const checkpoint = resolveInside(project, `revisions/${revision}/scene.blend`, 'inspection checkpoint')
+  cancelled(signal)
+  // Validate selection even if the historical checkpoint has no hash evidence.
+  validateGeometrySelection({ ...selection, checkpointSha256: '0'.repeat(64) })
+  if (selection.entityIds.some(id => !(spec.entities ?? []).some(entity => entity.id === id))) refuse(BlenderErrorCode.SCENE_SPEC_INVALID, 'one or more selected entities do not exist in this revision.')
+  if (manifest?.projectId !== projectId || manifest.revision !== revision || manifest.digest !== digest || manifest.specHashAfter !== specHash(spec)) refuse(BlenderErrorCode.SCENE_VALIDATION_FAILED, 'the revision manifest no longer matches its saved scene.')
+  if (!isFile(checkpoint)) refuse(BlenderErrorCode.REVISION_CHECKPOINT_MISSING, 'this revision has no native checkpoint; save a checkpoint before measuring.')
+  if (fileSize(checkpoint) > GEOMETRY_INSPECTION_LIMITS.checkpointBytes) refuse(BlenderErrorCode.SCENE_TOO_HEAVY, 'the native checkpoint exceeds the inspection budget.')
+  const binding = manifest.checkpointBinding
+  let expected
+  if (binding) {
+    if (binding.sourceDigest !== digest || binding.specHash !== manifest.specHashAfter || binding.bytes !== fileSize(checkpoint)) refuse(BlenderErrorCode.SCENE_VALIDATION_FAILED, 'checkpoint binding differs from the selected revision.')
+    expected = binding.sha256
+  } else {
+    // Older immutable revisions retain the producer's exact artifact hash in their compile job.
+    const job = typeof manifest.jobId === 'string' ? store.readJobSafe(projectId, manifest.jobId) : null
+    if (job?.projectId === projectId && job.revision === revision && job.status === 'succeeded' &&
+        ['compile_scene', 'apply_scene_patch'].includes(job.action)) {
+      const matches = (job.artifacts ?? []).filter(a => a.kind === 'blend' && a.path === `revisions/${revision}/scene.blend` && a.bytes === fileSize(checkpoint))
+      if (matches.length === 1) expected = matches[0].sha256
+    }
+  }
+  if (!/^[a-f0-9]{64}$/.test(expected ?? '')) refuse(BlenderErrorCode.UNSUPPORTED_ACTION, 'this historical checkpoint has no verified producer hash; save a new checkpoint before measuring.')
+  if (typeof host.runtime?.inspectGeometry !== 'function') refuse(BlenderErrorCode.RUNTIME_UNAVAILABLE, 'the configured runtime does not support native geometry inspection.')
+  const paths = [join(directory, 'scene-spec.json'), join(directory, 'revision-manifest.json')]
+  if (!binding) paths.push(store.jobPath(projectId, manifest.jobId))
+  const before = new Map(paths.map(path => [path, fileSha256(path)]))
+  const verifySource = () => {
+    cancelled(signal)
+    resolveInside(project, `revisions/${revision}/scene.blend`, 'inspection checkpoint')
+    if (!isFile(checkpoint) || fileSha256(checkpoint) !== expected || [...before].some(([path, hash]) => !isFile(path) || fileSha256(path) !== hash)) refuse(BlenderErrorCode.SCENE_VALIDATION_FAILED, 'the saved source changed; no measurement is accepted.')
+    for (const asset of spec.assets ?? []) {
+      if (!/^[a-f0-9]{64}$/.test(asset.sha256 ?? '') || typeof asset.path !== 'string') refuse(BlenderErrorCode.ASSET_HASH_MISMATCH, `asset ${asset.id} has no pinned source.`)
+      const file = resolveInside(project, asset.path, 'inspection asset')
+      if (!isFile(file) || fileSha256(file) !== asset.sha256) refuse(BlenderErrorCode.ASSET_HASH_MISMATCH, `asset ${asset.id} no longer matches its declared source.`)
+      verifyAssetBundle(project, asset); verifyUnbundledGltfAsset(project, asset); verifyUnbundledObjAsset(project, asset)
+    }
+  }
+  verifySource()
+  const scratch = resolveInside(host.workspaceRoot, join('tmp', `geometry-${randomUUID()}`), 'geometry workspace')
+  mkdirSync(scratch, { recursive: true })
+  try {
+    const snapshot = join(scratch, 'source.blend'); copyFileSync(checkpoint, snapshot)
+    const request = { ...selection, checkpointPath: snapshot, checkpointSha256: expected, signal }
+    if (fileSha256(snapshot) !== expected) refuse(BlenderErrorCode.SCENE_VALIDATION_FAILED, 'the staged native input differs from the saved source.')
+    const result = await host.runtime.inspectGeometry(request)
+    cancelled(signal)
+    if (selection.surfaceSamples !== undefined && result?.report?.schemaVersion === 'deepblend.geometry-inspection/v1') {
+      refuse(BlenderErrorCode.RUNTIME_UNAVAILABLE, 'the runtime does not support local surface samples; upgrade DeepBlend. Ordinary native geometry reads remain available.')
+    }
+    const native = verifyGeometryReport(result?.report, request)
+    verifySource()
+    const hasSamples = selection.surfaceSamples !== undefined
+    return { schemaVersion: hasSamples ? 'deepblend.scene-geometry/v2' : 'deepblend.scene-geometry/v1', projectId, sourceRevision: revision,
+      sourceDigest: digest, sourceSpecHash: manifest.specHashAfter, sourceCheckpointSha256: expected,
+      sourceUnchanged: true, frame: native.frame, objects: native.objects, blenderVersion: native.blenderVersion,
+      ...(hasSamples ? { surfaceSamples: native.surfaceSamples } : {}),
+      excludedMeasurements: hasSamples ? ['globalWallThickness', 'assemblyClearance', 'minimumClearance', 'collision', 'selfIntersection'] :
+        ['wallThickness', 'shellToLinerClearance', 'minimumClearance', 'collision'],
+      execution: { transport: 'batch' }, limitations: [
+        'World-axis spans include rotations, handles and protrusions; they are not intrinsic body dimensions.',
+        'This evaluates saved native mesh geometry, not shader displacement or rendered pixels.',
+        ...(hasSamples ? [
+          'Surface samples are finite local chords along evaluated triangle-face normals, not shader or smoothed shading normals.',
+          'The normalSurfaceChordMm runs from source entry to source exit. Target normalRaySeparationMm runs from source EXIT to target entry along that inward normal and excludes the source chord. Other scene objects are not checked; this is not full assembly free clearance.',
+          'Closed connected consistently wound positive-volume geometry is required, but absence of self-intersections is not certified.',
+          'No global minimum wall thickness, minimum clearance, collision absence, manufacturing safety or artistic approval is established.',
+          'Unmeasured, missed, overlapping, occluded or unsupported samples must remain unavailable, never be replaced by zero or inferred from bounds.',
+          'Search distance is explicitly requested (0.01–500 mm); chord and target search limits are each 100 mm. Epsilon is 0.0001 mm; distances at or below twice epsilon are unavailable.',
+        ] : ['No wall thickness, clearance, collision, topology or artistic approval is established.']),
+        'Do not subtract shell and liner extents or radii to report a gap: both bounds describe outer surfaces, and their difference includes wall material and depends on curvature and orientation.',
+        'Unchanged height, position or scale does not prove that wall thickness or clearance was preserved. Report those conditions as unmeasured unless a separate surface measurement verifies them.',
+      ] }
+  } finally { removeTree(scratch) }
+}

package/lib/index.js

@@ -105,6 +105,7 @@ import { prepareModelBundle, assetPreviewVersion, stageAssetBundle, verifyUnbund
 import { ASSET_LIBRARY_LIMITS, uploadAssetType, checkAssetUpload, hashAssetFile, previewRasterAsset } from './asset-library.js'
 import { ASSET_PREVIEW_TEMPLATE, renderAssetPreview } from './asset-preview.js'
 import { listDiagnostics, renderDiagnostic } from './diagnostic-preview.js'
+import { inspectRevisionGeometry } from './geometry-inspection.js'
 import { inspectReferenceImage, REFERENCE_IMAGE_MAX_BYTES } from './reference-image.js'
 import { createReadStream, linkSync } from 'node:fs'
 import { createHash, randomUUID } from 'node:crypto'
@@ -709,7 +710,7 @@ export default class BlenderStudio extends Service {
    * whole spec on every turn spends its context on fields it is not changing.
    *
    * @param {string} projectId
-   * @param {{ revision?: string, full?: boolean }} [options]
+   * @param {{ revision?: string, full?: boolean, geometry?: { entityIds: string[], frame: number, surfaceSamples?: object[] }, signal?: AbortSignal }} [options]
    * @returns {Promise<Record<string, unknown>>}
    */
   async getScene(projectId, options = {}) {
@@ -723,10 +724,12 @@ export default class BlenderStudio extends Service {
       digest,
     })
     const manifest = this.store.readRevisionManifest(projectId, revision)
+    const geometry = options.geometry === undefined ? undefined : await inspectRevisionGeometry(this, projectId, revision, options.geometry, options.signal)
     return {
       ...summary,
       projectId,
-      isCurrent: revision === record.currentRevision,
+      isCurrent: revision === (geometry ? this.store.readRecord(projectId).currentRevision : record.currentRevision),
+      ...(geometry ? { geometryInspection: geometry } : {}),
       assetParts: (manifest?.assetParts ?? []).map(part => {
         const entity = spec.entities.find(entry => entry.id === part.entityId)
         const asset = spec.assets.find(entry => entry.id === entity?.assetId)

package/lib/recipe-native-source.js

@@ -0,0 +1,29 @@
+/** Refuse to rebuild away native edits not represented by the saved SceneSpec. */
+import { BlenderError, GEOMETRY_INSPECTION_LIMITS } from '@deepblend/dsh-blender-contracts'
+import { fileSha256, fileSize, isFile, resolveInside } from './paths.js'
+
+export function protectRecipeNativeSource(store, projectId, revision) {
+  const project = store.projectDirectory(projectId)
+  const path = resolveInside(project, `revisions/${revision}/scene.blend`, 'recipe checkpoint')
+  const manifest = store.readRevisionManifest(projectId, revision)
+  if (!isFile(path) && !manifest.checkpoint && !manifest.checkpointBinding) return () => {}
+  const conflict = () => { throw new BlenderError('RECIPE_PARAMETER_CONFLICT',
+    'The saved native file was independently changed or has no verified producer hash. Keep that file and reconcile its edits before resizing; no new revision was published.',
+    { detail: { conflicts: [{ entityId: null, property: 'native-checkpoint', revision }] } }) }
+  let expected = manifest.checkpointBinding?.sha256, bytes = manifest.checkpointBinding?.bytes
+  if (!expected) {
+    const job = typeof manifest.jobId === 'string' ? store.readJobSafe(projectId, manifest.jobId) : null
+    if (job?.projectId === projectId && job.revision === revision && job.status === 'succeeded'
+      && ['compile_scene', 'apply_scene_patch'].includes(job.action)) {
+      const matches = (job.artifacts ?? []).filter(a => a.kind === 'blend' && a.path === `revisions/${revision}/scene.blend`)
+      if (matches.length === 1) { expected = matches[0].sha256; bytes = matches[0].bytes }
+    }
+  }
+  const verify = () => {
+    resolveInside(project, `revisions/${revision}/scene.blend`, 'recipe checkpoint')
+    if (!/^[a-f0-9]{64}$/.test(expected ?? '') || !isFile(path)
+      || fileSize(path) !== bytes || bytes > GEOMETRY_INSPECTION_LIMITS.checkpointBytes || fileSha256(path) !== expected) conflict()
+  }
+  verify()
+  return verify
+}

package/lib/revision-transaction.js

@@ -71,6 +71,7 @@ import {
 import { verifyAssetBundle, verifyUnbundledGltfAsset, verifyUnbundledObjAsset } from './asset-bundle.js'
 import { GENESIS_REVISION, parseRevisionId } from './project-store.js'
 import { readRecipeContext } from './recipe-state.js'
+import { protectRecipeNativeSource } from './recipe-native-source.js'
 import {
   fileSha256,
   fileSize,
@@ -314,6 +315,7 @@ export class RevisionTransaction {
           revision: this.store.readRevisionManifest(request.projectId, request.baseRevision),
           parameterState: context.state, preservedCameraIds: planned.preservedCameraIds }
       }
+      const verifyNativeSource = protectRecipeNativeSource(this.store, request.projectId, request.baseRevision)
       const patch = { projectId: request.projectId, baseRevision: request.baseRevision, operations: planned.operations,
         saveCheckpoint: request.saveCheckpoint !== false, renderPreview: request.renderPreview === true,
         idempotencyKey: request.idempotencyKey ?? `recipe-${sha256Canonical({ projectId: request.projectId,
@@ -323,7 +325,7 @@ export class RevisionTransaction {
       const checked = validateScenePatch(patch)
       if (!checked.ok) throw new BlenderError(BlenderErrorCode.SCENE_PATCH_INVALID, checked.summary)
       const state = { ...planned.parameterState, originRevision: context.originRevision }
-      const outcome = await this._applyScenePatch(patch, { ...options, recipeParameters: state })
+      const outcome = await this._applyScenePatch(patch, { ...options, recipeParameters: state, verifyNativeSource })
       const committed = readRecipeContext(this.store, request.projectId, outcome.revision.revision)
       if (!committed?.state) throw new BlenderError('RECIPE_LOCK_INVALID', 'The recorded outcome has no recipe parameter state')
       return { ...outcome, parameterState: committed.state, preservedCameraIds: planned.preservedCameraIds }
@@ -478,6 +480,7 @@ export class RevisionTransaction {
       spec: nextSpec,
       kind: 'scene_patch',
       recipeParameters: options.recipeParameters ?? null,
+      verifyNativeSource: options.verifyNativeSource,
       summary,
       actor: patch.actor ?? null,
       stage: patch.stage ?? null,
@@ -815,6 +818,12 @@ export class RevisionTransaction {
           sourceMaterialSlots: sourceMaterialSlots ?? [], materialSlots: materialSlots ?? [],
         })),
       checkpoint: isFile(join(staging, 'scene.blend')) ? `revisions/${revision}/scene.blend` : null,
+      ...(isFile(join(staging, 'scene.blend')) ? { checkpointBinding: {
+        sha256: fileSha256(join(staging, 'scene.blend')),
+        bytes: fileSize(join(staging, 'scene.blend')),
+        sourceDigest: digest,
+        specHash: plan.specHashAfter ?? specHash(plan.spec),
+      } } : {}),
       previews: previews.map(entry => entry.artifact),
       jobId,
       runtime: {
@@ -886,6 +895,7 @@ export class RevisionTransaction {
     // the whole record so a restore away and back cannot hide behind the same id.
     try {
       this.store.assertProjectWrite(projectId)
+      plan.verifyNativeSource?.()
       const current = this.store.readRecord(projectId)
       if (JSON.stringify(current) !== JSON.stringify(record)) {
         throw new BlenderError(BlenderErrorCode.REVISION_CONFLICT,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deepblend/dsh-blender-host",
-  "version": "0.8.1",
+  "version": "0.10.0",
   "type": "module",
   "description": "DeepBlend Host service: the blenderStudio business facade over the BlenderRuntime seam.",
   "main": "lib/index.js",
@@ -20,7 +20,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@deepblend/dsh-blender-contracts": "0.8.1",
+    "@deepblend/dsh-blender-contracts": "0.10.0",
     "sharp": "0.35.5"
   },
   "license": "MIT",

package/recipes/metal-lamp/recipe.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": "deepblend.recipe/v1",
   "id": "deepblend.metal-lamp",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "title": "香槟金属桌灯",
   "description": "连续旋压灯罩、沿曲面延伸的金属细纹、珐琅内衬、曲线弯臂与贴地线缆。分别调整旋压件和拉丝件的粗糙度，同步调整金属颜色与摄影曝光；灯罩外径联动金属壁与内衬，颈口保持，提供独立内衬检查相机。",
   "author": {
@@ -26,7 +26,9 @@
       "material.procedural",
       "material.procedural.uv",
       "recipe.geometry-bindings",
-      "recipe.lathe-shell-bindings"
+      "recipe.lathe-shell-bindings",
+      "recipe.curve-point-bindings",
+      "recipe.threshold-bindings"
     ]
   },
   "input": {
@@ -43,7 +45,7 @@
     {
       "id": "shade-diameter-mm",
       "title": "灯罩外径（毫米）",
-      "description": "调整实际灯罩外径，联动金属壁和内衬，保持颈口、弯臂、灯泡与关节；不整体缩放。",
+      "description": "调整实际灯罩外径，联动金属壁和内衬；超过230毫米时后移立柱与关节并调整弯臂起段，保持颈口和灯泡。",
       "type": "number",
       "default": 209.8,
       "minimum": 180,
@@ -59,6 +61,94 @@
           "rimHeight": 0.008,
           "neckAnchorHeight": 0.118,
           "multiplier": 0.0005
+        },
+        {
+          "kind": "entity",
+          "entityId": "mast-socket",
+          "property": "location",
+          "axis": "x",
+          "multiplier": -0.00055,
+          "inputFloor": 230
+        },
+        {
+          "kind": "entity",
+          "entityId": "mast-socket-collar",
+          "property": "location",
+          "axis": "x",
+          "multiplier": -0.00055,
+          "inputFloor": 230
+        },
+        {
+          "kind": "entity",
+          "entityId": "upright-mast",
+          "property": "location",
+          "axis": "x",
+          "multiplier": -0.00055,
+          "inputFloor": 230
+        },
+        {
+          "kind": "entity",
+          "entityId": "hinge-body",
+          "property": "location",
+          "axis": "x",
+          "multiplier": -0.00055,
+          "inputFloor": 230
+        },
+        {
+          "kind": "entity",
+          "entityId": "hinge-front-cap",
+          "property": "location",
+          "axis": "x",
+          "multiplier": -0.00055,
+          "inputFloor": 230
+        },
+        {
+          "kind": "entity",
+          "entityId": "hinge-rear-cap",
+          "property": "location",
+          "axis": "x",
+          "multiplier": -0.00055,
+          "inputFloor": 230
+        },
+        {
+          "kind": "entity",
+          "entityId": "hinge-fine-ring",
+          "property": "location",
+          "axis": "x",
+          "multiplier": -0.00055,
+          "inputFloor": 230
+        },
+        {
+          "kind": "entity",
+          "entityId": "hinge-centre-pin",
+          "property": "location",
+          "axis": "x",
+          "multiplier": -0.00055,
+          "inputFloor": 230
+        },
+        {
+          "kind": "curve-point",
+          "entityId": "swept-upper-arm",
+          "pointIndex": 0,
+          "axis": "x",
+          "multiplier": -0.00055,
+          "inputFloor": 230
+        },
+        {
+          "kind": "curve-point",
+          "entityId": "swept-upper-arm",
+          "pointIndex": 1,
+          "axis": "x",
+          "multiplier": -0.00055,
+          "inputFloor": 230
+        },
+        {
+          "kind": "curve-point",
+          "entityId": "swept-upper-arm",
+          "pointIndex": 2,
+          "axis": "x",
+          "multiplier": -0.000275,
+          "inputFloor": 230
         }
       ]
     },