@goodandready/dsh-image-gen 0.10.5 → 0.10.6

package/lib/index.js

@@ -45,6 +45,7 @@ import {
   applyStylePreset,
   resolveStylePreset,
   blendImagesFal,
+  toLosslessJson,
 } from './providers.js'
 
 import { resolveConversationImage, analyzeImageWithVision, buildDualOutputMarkdown } from './resolve-image.js'
@@ -131,7 +132,7 @@ export async function saveAndAttachResult(ctx, exec, cfg, {
     attachmentId: attachment.attachmentId,
   })
 
-  return {
+  return toLosslessJson({
     summary,
     path: filePath,
     url: deliverAs === 'image' && sourceUrl ? sourceUrl : localUrl,
@@ -149,7 +150,7 @@ export async function saveAndAttachResult(ctx, exec, cfg, {
       height: attachment.height,
       name: attachment.name,
     },
-  }
+  })
 }
 
 export const name = 'dsh-image-gen'
@@ -916,7 +917,7 @@ export function apply(ctx, config) {
             height: gen.height || attachment.height,
             seed: gen.seed,
             prompt: promptArg,
-            originalPrompt: enhanced.enhanced ? args.prompt : undefined,
+            ...(enhanced.enhanced ? { originalPrompt: args.prompt } : {}),
             cost: gen.cost,
             format: mediaType.replace('image/', ''),
             attachment: {
@@ -988,7 +989,7 @@ export function apply(ctx, config) {
           cost: first.cost,
           attachmentId: first.attachment?.attachmentId || 'N/A',
         })
-        return { summary: dualOutputSummary, channel: provider, provider, model: cfg.model || cfg.customModel, ...first, images }
+        return toLosslessJson({ summary: dualOutputSummary, channel: provider, provider, model: cfg.model || cfg.customModel, ...first, images })
       },
     }),
   )
@@ -1288,11 +1289,11 @@ export function apply(ctx, config) {
           throw new Error(`All aspect ratio generations failed in pack: ${warnings.join('; ')}`)
         }
 
-        return {
+        return toLosslessJson({
           images: results,
           count: results.length,
-          warnings: warnings.length ? warnings : undefined,
-        }
+          ...(warnings.length ? { warnings } : {}),
+        })
       },
     }),
   )
@@ -1414,7 +1415,7 @@ export function apply(ctx, config) {
         if (vision.summary) {
           result.visionAnalysis = vision.summary
         }
-        return result
+        return toLosslessJson(result)
       },
     }),
   )
@@ -1535,10 +1536,10 @@ export function apply(ctx, config) {
         }
 
         const first = results[0]
-        return {
+        return toLosslessJson({
           ...first,
           variations: results.map((r) => ({ path: r.path, attachmentId: r.attachment?.attachmentId, seed: r.seed })),
-        }
+        })
       },
     }),
   )

package/lib/providers.js

@@ -983,3 +983,26 @@ export async function varyImageDirect(deps, job) {
   if (!fn) throw new Error(`Provider "${providerKey}" does not support image variations`)
   return fn(job.seed, job.prompt)
 }
+
+/**
+ * Recursively removes any property with an undefined value so the result satisfies
+ * DSH lossless JSON requirements (dsh-util-values isJsonValue).
+ *
+ * @param {any} val
+ * @returns {any}
+ */
+export function toLosslessJson(val) {
+  if (val === null || typeof val === 'boolean' || typeof val === 'string') return val
+  if (typeof val === 'number') return Number.isFinite(val) && !Object.is(val, -0) ? val : null
+  if (Array.isArray(val)) return val.map(toLosslessJson)
+  if (typeof val === 'object' && val !== null) {
+    const res = {}
+    for (const [k, v] of Object.entries(val)) {
+      if (v !== undefined) {
+        res[k] = toLosslessJson(v)
+      }
+    }
+    return res
+  }
+  return null
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-image-gen",
-  "version": "0.10.5",
+  "version": "0.10.6",
   "description": "Image generation for DeepSeek Harness: a generate_image tool with pluggable providers — the FAL queue, any OpenAI-compatible images API, or a ChatGPT/Grok subscription with no API key at all. The picture is shown inline in the conversation; the model receives either a link (works with any chat model) or the image itself (needs dsh-vision-bridge or a vision-capable model).",
   "keywords": [
     "deepseek-harness",