@deepblend/dsh-blender-tool 0.7.0 → 0.8.1

package/lib/committed-preview.js

@@ -8,7 +8,12 @@ const PNG_SIGNATURE = Buffer.from([137, 80, 78, 71, 13, 10, 26, 10])
 
 /** Attach the receipt's existing preview, with no compile, render or output-time IO. */
 export async function attachCommittedPreview(ctx, exec, resolved, value, { projectId, summary }) {
-  const artifact = summary?.previews?.[0]
+  return attachVerifiedRenderedImage(ctx, exec, resolved, value, { projectId,
+    revision: summary?.revision, digest: summary?.digest, artifact: summary?.previews?.[0], kind: 'preview' })
+}
+
+/** Read the rendered receipt's pixels once; preserve successful rendering if attachment fails. */
+export async function attachVerifiedRenderedImage(ctx, exec, resolved, value, { projectId, revision, digest, artifact, kind }) {
   if (!artifact) return value
   const cancelled = () => {
     if (exec?.signal?.aborted) throw new BlenderError(BlenderErrorCode.ABORTED,
@@ -16,18 +21,20 @@ export async function attachCommittedPreview(ctx, exec, resolved, value, { proje
   }
   try {
     cancelled()
-    const revision = summary.revision
-    if (typeof projectId !== 'string' || !projectId || !/^r[0-9]{4,}$/.test(revision) ||
-        !/^[a-f0-9]{64}$/.test(summary.digest) || artifact.kind !== 'preview' ||
-        artifact.sourceRevision !== revision || artifact.sourceDigest !== summary.digest ||
+    if (!['preview', 'contact-sheet'].includes(kind) || typeof projectId !== 'string' || !projectId || !/^r[0-9]{4,}$/.test(revision) ||
+        !/^[a-f0-9]{64}$/.test(digest) || artifact.kind !== kind ||
+        artifact.sourceRevision !== revision || artifact.sourceDigest !== digest ||
         artifact.mime !== 'image/png' || typeof artifact.path !== 'string' ||
-        !artifact.path.startsWith(`revisions/${revision}/previews/`) ||
+        !artifact.path.startsWith(`revisions/${revision}/${kind === 'contact-sheet' ? 'contact-sheets' : 'previews'}/`) ||
         artifact.path.split('/').some(part => !part || part === '.' || part === '..') ||
         !/^[a-f0-9]{64}$/.test(artifact.sha256) ||
         !Number.isSafeInteger(artifact.bytes) || artifact.bytes <= 0 || artifact.bytes > MAX_IMAGE_BYTES ||
-        !Number.isSafeInteger(artifact.width) || artifact.width <= 0 || artifact.width > 2048 ||
-        !Number.isSafeInteger(artifact.height) || artifact.height <= 0 || artifact.height > 2048 ||
-        typeof artifact.cameraId !== 'string' || !artifact.cameraId || !Number.isSafeInteger(artifact.frame) ||
+        !Number.isSafeInteger(artifact.width) || artifact.width <= 0 || artifact.width > (kind === 'contact-sheet' ? 8192 : 2048) ||
+        !Number.isSafeInteger(artifact.height) || artifact.height <= 0 || artifact.height > (kind === 'contact-sheet' ? 8192 : 2048) ||
+        (kind === 'preview' && (typeof artifact.cameraId !== 'string' || !artifact.cameraId || !Number.isSafeInteger(artifact.frame))) ||
+        (kind === 'contact-sheet' && (artifact.slot !== 'preview-current' || !Array.isArray(artifact.views) || artifact.views.length === 0 ||
+          artifact.views.length > 64 || new Set(artifact.views).size !== artifact.views.length ||
+          artifact.views.some(id => typeof id !== 'string' || !id))) ||
         typeof resolved.studio.readArtifact !== 'function') throw new Error('Invalid saved preview receipt')
     const read = await resolved.studio.readArtifact({ projectId, path: artifact.path })
     cancelled()
@@ -39,19 +46,23 @@ export async function attachCommittedPreview(ctx, exec, resolved, value, { proje
       throw new Error('Saved PNG differs from its receipt')
     }
     const attached = await persistVerifiedPng(resolved.attachments, read.bytes, artifact,
-      `preview-${revision}-${artifact.cameraId}-${artifact.frame}.png`, exec?.signal)
+      kind === 'contact-sheet' ? `preview-sheet-${revision}.png` : `preview-${revision}-${artifact.cameraId}-${artifact.frame}.png`, exec?.signal)
     cancelled()
     return await imageForCallingModel(ctx, exec, {
       ...value, image: attached.image,
-      imageSource: { ...artifact, projectId, revision, digest: summary.digest },
-      text: value.text + '\n\nThe image uses the preview already saved with this revision; no extra render was started.' +
+      imageSource: { ...artifact, projectId, revision, digest },
+      text: value.text + (kind === 'contact-sheet'
+        ? '\n\nThe verified contact sheet contains the views just rendered and saved; no additional render or reviewer call was started.'
+        : '\n\nThe image uses the preview already saved with this revision; no extra render was started.') +
         (attached.note ? '\n' + attached.note : ''),
     })
   } catch (cause) {
     cancelled()
     if (cause?.code === BlenderErrorCode.ABORTED) throw cause
     return { ...value, image: null,
-      text: value.text + '\n\nThe revision remains saved, but its preview could not be verified and attached here. ' +
+      text: value.text + (kind === 'contact-sheet'
+        ? '\n\nThe rendered views remain saved, but their contact sheet could not be verified and attached here. '
+        : '\n\nThe revision remains saved, but its preview could not be verified and attached here. ') +
         'The model has not seen this image. Use the receipt to inspect the saved artifact; do not recreate the project or repeat the render to repair an attachment.' }
   }
 }

package/lib/visual-tools.js

@@ -40,6 +40,7 @@
  */
 
 import { defineTool } from '@deepseek-ai/dsh-tools'
+import { attachVerifiedRenderedImage } from './committed-preview.js'
 import { imageForCallingModel } from './image-delivery.js'
 
 import { BlenderWarningCode, warning } from '@deepblend/dsh-blender-contracts'
@@ -87,7 +88,7 @@ function previewViews(ctx) {
     description:
       'Render a MULTI-VIEW preview of a revision in one go: the active camera, a three-quarter angle, a ' +
       'top-down view and a subject close-up, all from one Blender process, and measure each one. Returns ' +
-      'the images\' paths, a composed contact sheet, and per-view measurements. Rendering does NOT create a ' +
+      'the saved images, a verified contact sheet attached for the calling model, and per-view measurements. Rendering does NOT create a ' +
       'revision — a preview observes a scene rather than changing it — so this is always safe to call and ' +
       'never needs a baseRevision. Use it to look at a scene; use blender_visual_review when you also want a ' +
       'score and a judgment.\n\n' + MEASUREMENT_GLOSSARY,
@@ -114,12 +115,12 @@ function previewViews(ctx) {
         description: 'Override the preview profile\'s sample count; a value above the configured budget is reduced and reported.',
       },
     },
-    output: TOOL_OUTPUT,
+    output: TOOL_OUTPUT_WITH_IMAGE,
     async execute(args, exec) {
       const resolved = resolveStudio(ctx)
       if (resolved.unavailable !== undefined) return { ok: false, ...resolved.unavailable }
       try {
-        const { data, canonicalWarnings } = await canonicalCall(resolved.studio.renderViews({
+        const { data, canonicalWarnings } = await canonicalCall(Promise.resolve(resolved.studio.renderViews({
           ...definedFields({
             projectId: args.projectId,
             revision: args.revision,
@@ -130,7 +131,7 @@ function previewViews(ctx) {
             samples: args.samples,
           }),
           signal: exec.signal,
-        }), warning)
+        })).then(({ pngs, ...metadata }) => metadata), warning)
         const scored = resolved.studio.scoreVisualViews({ views: data.views, subjectId: data.subjectId })
         const notes = [
           `Revision: ${data.revision}`,
@@ -149,13 +150,15 @@ function previewViews(ctx) {
         const sheet = (data.revisionPreviews ?? data.contactSheets ?? [])
         notes.push('')
         notes.push('The paths are relative to the project directory. The measured score is what the automated')
-        notes.push('scorer makes of these pixels; call blender_visual_review to score AND hear what a vision')
-        notes.push('model sees on the contact sheet.')
-        return {
+        notes.push('scorer makes of these pixels. Inspect the attached sheet directly; use blender_visual_review')
+        notes.push('when you need a separate vision reviewer judgement, not just to obtain these images.')
+        return await attachVerifiedRenderedImage(ctx, exec, resolved, {
           ok: true,
           text: renderSuccess(`Rendered ${data.views.length} view(s) of ${data.revision}.`, { ...data, score: scored.score, issues: scored.issues }, { notes, warnings: [...(data.warnings ?? []), ...canonicalWarnings] }),
           data: { ...data, score: scored.score, issues: scored.issues, sheet },
-        }
+        }, { projectId: args.projectId, revision: data.revision, digest: data.digest,
+          artifact: data.previewSheets?.current, kind: 'contact-sheet' })
+
       } catch (cause) {
         const failure = renderFailure(cause, 'PREVIEW_VIEWS_FAILED')
         return { ok: false, ...failure }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deepblend/dsh-blender-tool",
-  "version": "0.7.0",
+  "version": "0.8.1",
   "type": "module",
   "description": "Agent-preset tool consumer: registers the model-visible DeepBlend Blender tools. Publishes no service.",
   "main": "lib/index.js",
@@ -11,7 +11,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@deepblend/dsh-blender-contracts": "0.7.0"
+    "@deepblend/dsh-blender-contracts": "0.8.1"
   },
   "license": "MIT",
   "repository": {