@goodandready/dsh-image-gen 0.11.31 → 0.11.32

package/lib/frontend-assets.js

@@ -359,6 +359,61 @@ export function decodeHtmlEntities(str) {
     .replace(/&/gi, '&')
 }
 
+/**
+ * Escapes JSX-sensitive characters in SVG markup so text nodes and unquoted
+ * curly braces cannot be interpreted as JavaScript expressions in TSX export (#406).
+ * Replaces unquoted `{` and `}` outside attribute values with `{` and `}`.
+ * @param {string} content
+ * @returns {string}
+ */
+export function escapeJsxText(content) {
+  if (!content || typeof content !== 'string') return ''
+  let result = ''
+  let inTag = false
+  let quote = null
+
+  for (let i = 0; i < content.length; i++) {
+    const ch = content[i]
+
+    if (!inTag) {
+      if (ch === '<') {
+        inTag = true
+        quote = null
+        result += ch
+      } else if (ch === '{') {
+        result += '&#123;'
+      } else if (ch === '}') {
+        result += '&#125;'
+      } else {
+        result += ch
+      }
+    } else {
+      if (quote) {
+        if (ch === quote) {
+          quote = null
+        }
+        result += ch
+      } else {
+        if (ch === '"' || ch === "'") {
+          quote = ch
+          result += ch
+        } else if (ch === '>') {
+          inTag = false
+          result += ch
+        } else if (ch === '{') {
+          result += '&#123;'
+        } else if (ch === '}') {
+          result += '&#125;'
+        } else {
+          result += ch
+        }
+      }
+    }
+  }
+
+  return result
+}
+
 /**
  * Issue #176: optimize_vector_svg
  * Cleans, sanitizes, and minifies SVG content, normalizes viewBox, and exports React TSX component.
@@ -463,6 +518,8 @@ export function optimizeSvgContent(svgString, options = {}) {
     .replace(/stroke-linejoin=/g, 'strokeLinejoin=')
     .replace(/stroke-miterlimit=/g, 'strokeMiterlimit=')
 
+  jsxBody = escapeJsxText(jsxBody)
+
   const reactTsx = `import React from 'react';
 
 export interface ${componentName}Props extends React.SVGProps<SVGSVGElement> {

package/lib/generation-helpers.js

@@ -2,6 +2,7 @@
 // Extracted execution and prompt/caching helpers for generate_image tool (#349).
 
 import path from 'node:path'
+import { createHash } from 'node:crypto'
 import { mkdir, writeFile } from 'node:fs/promises'
 import {
   computeGenerationHash,
@@ -153,6 +154,10 @@ export async function saveGeneratedImageArtifact({
   estimatedCost,
   totalCount,
   recordSpend: shouldRecordSpend = true,
+  source,
+  mask,
+  resolvedFaceRef,
+  resolvedRefImage,
 }) {
   const targetFormat = format || (args.output_format || cfg.defaultFormat)
   const formatted = await ensureImageFormat(gen.bytes, targetFormat, { fallbackMime: gen.mediaType })
@@ -205,7 +210,11 @@ export async function saveGeneratedImageArtifact({
 
   const effectiveModel = provider === 'custom'
     ? (cfg.customModel || cfg.model || 'dall-e-3')
-    : (cfg.model || cfg.customModel)
+    : (cfg.model || cfg.customModel || 'default')
+
+  const sourceBytes = source && source.bytes ? source.bytes : (args.image || args.source_image)
+  const maskBytes = mask && mask.bytes ? mask.bytes : (args.mask_image || args.mask)
+  const refBytes = (resolvedRefImage && resolvedRefImage.bytes) || (resolvedFaceRef && resolvedFaceRef.bytes) || args.reference_images || args.reference_image
 
   const cacheHash = computeGenerationHash({
     provider,
@@ -222,9 +231,9 @@ export async function saveGeneratedImageArtifact({
     negativePrompt: args.negative_prompt || cfg.negativePrompt,
     quality: args.quality,
     strength: args.strength,
-    sourceImage: args.image || args.source_image,
-    maskImage: args.mask_image || args.mask,
-    reference: args.reference_images || args.reference_image,
+    sourceImage: sourceBytes,
+    maskImage: maskBytes,
+    reference: refBytes,
   })
 
   // #170: Store in content-addressed disk cache
@@ -235,19 +244,32 @@ export async function saveGeneratedImageArtifact({
       width: gen.width || attachment.width,
       height: gen.height || attachment.height,
       seed: gen.seed,
-      meta: { prompt: promptArg, provider, model: cfg.model || cfg.customModel, cost: gen.cost },
+      meta: { prompt: promptArg, provider, model: effectiveModel, cost: gen.cost },
     })
   }
+
+  const sourceHash = (source && source.bytes) ? createHash('sha256').update(source.bytes).digest('hex') : undefined
+  const maskHash = (mask && mask.bytes) ? createHash('sha256').update(mask.bytes).digest('hex') : undefined
+  const refHash = (resolvedRefImage && resolvedRefImage.bytes)
+    ? createHash('sha256').update(resolvedRefImage.bytes).digest('hex')
+    : ((resolvedFaceRef && resolvedFaceRef.bytes) ? createHash('sha256').update(resolvedFaceRef.bytes).digest('hex') : undefined)
+
   const entry = {
     path: filePath,
     prompt: promptArg,
     provider,
-    model: cfg.model,
+    model: effectiveModel,
     size,
     format,
     aspectRatio: args.aspect_ratio || cfg.defaultAspectRatio,
     seed: gen.seed,
     cacheHash,
+    sourceHash,
+    maskHash,
+    refHash,
+    quality: args.quality,
+    style: args.style,
+    strength: args.strength,
     thumbnailUrl: localUrl,
     width: gen.width || attachment.width,
     height: gen.height || attachment.height,

package/lib/history.js

@@ -41,6 +41,22 @@ export async function findCachedByPrompt(entries, prompt, criteria = {}) {
   if (!prompt || !Array.isArray(entries)) return undefined
   return entries.find((e) => {
     if (e.prompt !== prompt) return false
+    if (criteria.cacheHash && e.cacheHash && criteria.cacheHash !== e.cacheHash) return false
+    if (criteria.provider && e.provider && criteria.provider.toLowerCase() !== e.provider.toLowerCase()) return false
+    if (criteria.model && e.model && criteria.model.toLowerCase() !== e.model.toLowerCase()) return false
+    if (criteria.sourceHash !== undefined && e.sourceHash !== undefined && criteria.sourceHash !== e.sourceHash) return false
+    if (criteria.sourceHash && !e.sourceHash) return false
+    if (!criteria.sourceHash && e.sourceHash) return false
+    if (criteria.maskHash !== undefined && e.maskHash !== undefined && criteria.maskHash !== e.maskHash) return false
+    if (criteria.maskHash && !e.maskHash) return false
+    if (!criteria.maskHash && e.maskHash) return false
+    if (criteria.refHash !== undefined && e.refHash !== undefined && criteria.refHash !== e.refHash) return false
+    if (criteria.refHash && !e.refHash) return false
+    if (!criteria.refHash && e.refHash) return false
+    if (criteria.quality !== undefined && e.quality !== undefined && criteria.quality !== e.quality) return false
+    if (criteria.style !== undefined && e.style !== undefined && criteria.style !== e.style) return false
+    if (criteria.strength !== undefined && e.strength !== undefined && criteria.strength !== e.strength) return false
+
     if (criteria.format) {
       const entryFmt = (e.format || (e.mediaType || '').replace('image/', '')).toLowerCase().replace('jpeg', 'jpg')
       const targetFmt = String(criteria.format).toLowerCase().replace('jpeg', 'jpg')
@@ -58,6 +74,22 @@ export async function findCached(entries, seed, prompt, criteria = {}) {
   if (seed === undefined || !Array.isArray(entries)) return undefined
   return entries.find((e) => {
     if (e.seed !== seed || e.prompt !== prompt) return false
+    if (criteria.cacheHash && e.cacheHash && criteria.cacheHash !== e.cacheHash) return false
+    if (criteria.provider && e.provider && criteria.provider.toLowerCase() !== e.provider.toLowerCase()) return false
+    if (criteria.model && e.model && criteria.model.toLowerCase() !== e.model.toLowerCase()) return false
+    if (criteria.sourceHash !== undefined && e.sourceHash !== undefined && criteria.sourceHash !== e.sourceHash) return false
+    if (criteria.sourceHash && !e.sourceHash) return false
+    if (!criteria.sourceHash && e.sourceHash) return false
+    if (criteria.maskHash !== undefined && e.maskHash !== undefined && criteria.maskHash !== e.maskHash) return false
+    if (criteria.maskHash && !e.maskHash) return false
+    if (!criteria.maskHash && e.maskHash) return false
+    if (criteria.refHash !== undefined && e.refHash !== undefined && criteria.refHash !== e.refHash) return false
+    if (criteria.refHash && !e.refHash) return false
+    if (!criteria.refHash && e.refHash) return false
+    if (criteria.quality !== undefined && e.quality !== undefined && criteria.quality !== e.quality) return false
+    if (criteria.style !== undefined && e.style !== undefined && criteria.style !== e.style) return false
+    if (criteria.strength !== undefined && e.strength !== undefined && criteria.strength !== e.strength) return false
+
     if (criteria.format) {
       const entryFmt = (e.format || (e.mediaType || '').replace('image/', '')).toLowerCase().replace('jpeg', 'jpg')
       const targetFmt = String(criteria.format).toLowerCase().replace('jpeg', 'jpg')

package/lib/provider-utils.js

@@ -191,10 +191,13 @@ export function computeGenerationHash({
 } = {}) {
   const hashContent = (item) => {
     if (!item) return ''
-    if (Buffer.isBuffer(item)) return createHash('sha256').update(item).digest('hex').slice(0, 16)
+    if (Buffer.isBuffer(item)) return createHash('sha256').update(item).digest('hex')
     if (typeof item === 'object' && item.bytes) {
       const b = Buffer.isBuffer(item.bytes) ? item.bytes : Buffer.from(item.bytes)
-      return createHash('sha256').update(b).digest('hex').slice(0, 16)
+      return createHash('sha256').update(b).digest('hex')
+    }
+    if (Array.isArray(item)) {
+      return item.map(hashContent).filter(Boolean).join(',')
     }
     return String(item).trim()
   }

package/lib/tools/character-sheet.js

@@ -154,6 +154,7 @@ export function registerCharacterSheetTools(ctx, deps) {
           })
           const reservation = reserveSpend(estimatedCost, cfg.dailyBudgetUsd)
           let gen
+          let committed = false
           try {
             gen = await executeWithFallback(
               providers,
@@ -162,10 +163,6 @@ export function registerCharacterSheetTools(ctx, deps) {
               sheetPlan.prompt,
               { logger: ctx.logger },
             )
-          } catch (err) {
-            reservation.release()
-            throw err
-          }
 
           const usedProvider = gen._fallback?.providerUsed || provider
           const finalBytes = gen.bytes
@@ -205,6 +202,7 @@ export function registerCharacterSheetTools(ctx, deps) {
             ctx,
             meta: { provider: usedProvider, model: cfg.model || cfg.customModel, prompt: sheetPlan.prompt, seed },
           })
+          committed = true
 
           const dualOutput = buildDualOutputMarkdown({
             action: 'generated',
@@ -237,6 +235,11 @@ export function registerCharacterSheetTools(ctx, deps) {
           }
 
           return toLosslessJson(response)
+          } finally {
+            if (!committed) {
+              reservation.release()
+            }
+          }
         },
       })
     )

package/lib/tools/diagram.js

@@ -150,6 +150,7 @@ export function registerDiagramTools(ctx, deps) {
           })
           const reservation = reserveSpend(estimatedCost, cfg.dailyBudgetUsd)
           let gen
+          let committed = false
           try {
             gen = await executeWithFallback(
               providers,
@@ -158,10 +159,6 @@ export function registerDiagramTools(ctx, deps) {
               plan.prompt,
               { logger: ctx.logger },
             )
-          } catch (err) {
-            reservation.release()
-            throw err
-          }
 
           const usedProvider = gen._fallback?.providerUsed || provider
           const finalBytes = gen.bytes
@@ -201,6 +198,7 @@ export function registerDiagramTools(ctx, deps) {
             ctx,
             meta: { provider: usedProvider, model: cfg.model || cfg.customModel, prompt: plan.prompt, seed },
           })
+          committed = true
 
           const dualOutput = buildDualOutputMarkdown({
             action: 'generated',
@@ -232,6 +230,11 @@ export function registerDiagramTools(ctx, deps) {
           }
 
           return toLosslessJson(response)
+          } finally {
+            if (!committed) {
+              reservation.release()
+            }
+          }
         },
       })
     )

package/lib/tools/generation.js

@@ -2,6 +2,7 @@ import { buildPresentationMeta } from '../attachment-helper.js'
 import { registerGenerationPackTool } from './generation-pack.js'
 import { defineTool } from '@deepseek-ai/dsh-tools'
 import path from 'node:path'
+import { createHash } from 'node:crypto'
 import { mkdir, writeFile } from 'node:fs/promises'
 import {
   computeGenerationHash,
@@ -316,8 +317,11 @@ export function registerGenerationTools(ctx, deps, options = {}) {
         let subscriptionImages
         try { subscriptionImages = ctx.get && ctx.get('subscriptionImages') } catch (_err) { subscriptionImages = undefined }
 
-        const source = args.source_image ? await resolveSource(ctx, exec, args.source_image) : undefined
-        const mask = args.mask ? await resolveSource(ctx, exec, args.mask) : undefined
+        const sourceInput = args.source_image || args.image
+        const source = sourceInput ? await resolveSource(ctx, exec, sourceInput) : undefined
+
+        const maskInput = args.mask || args.mask_image
+        const mask = maskInput ? await resolveSource(ctx, exec, maskInput) : undefined
 
         const {
           enhanced,
@@ -383,6 +387,7 @@ export function registerGenerationTools(ctx, deps, options = {}) {
             const rawGenerate = async (seedVal) => {
               const reservation = reserveSpend(perAttemptCost, cfg.dailyBudgetUsd)
               totalAttempts++
+              let committed = false
               try {
                 const gen = await providers[k](seedVal, p)
                 guard(gen)
@@ -392,10 +397,12 @@ export function registerGenerationTools(ctx, deps, options = {}) {
                   ctx,
                   meta: { provider: k, model: cfg.model || cfg.customModel, prompt: p, seed: seedVal },
                 })
+                committed = true
                 return gen
-              } catch (err) {
-                reservation.release()
-                throw err
+              } finally {
+                if (!committed) {
+                  reservation.release()
+                }
               }
             }
 
@@ -429,6 +436,10 @@ export function registerGenerationTools(ctx, deps, options = {}) {
               estimatedCost: accumulatedCost || estimatedCost,
               totalCount,
               recordSpend: false,
+              source,
+              mask,
+              resolvedFaceRef,
+              resolvedRefImage,
             })
 
             return {
@@ -449,7 +460,11 @@ export function registerGenerationTools(ctx, deps, options = {}) {
 
           const effectiveModel = provider === 'custom'
             ? (cfg.customModel || cfg.model || 'dall-e-3')
-            : (cfg.model || cfg.customModel)
+            : (cfg.model || cfg.customModel || 'default')
+
+          const sourceBytes = source && source.bytes ? source.bytes : (args.image || args.source_image)
+          const maskBytes = mask && mask.bytes ? mask.bytes : (args.mask_image || args.mask)
+          const refBytes = (resolvedRefImage && resolvedRefImage.bytes) || (resolvedFaceRef && resolvedFaceRef.bytes) || args.reference_images || args.reference_image
 
           const h = computeGenerationHash({
             provider,
@@ -466,9 +481,9 @@ export function registerGenerationTools(ctx, deps, options = {}) {
             negativePrompt: args.negative_prompt || cfg.negativePrompt,
             quality: args.quality,
             strength: args.strength,
-            sourceImage: args.image || args.source_image,
-            maskImage: args.mask_image || args.mask,
-            reference: args.reference_images || args.reference_image,
+            sourceImage: sourceBytes,
+            maskImage: maskBytes,
+            reference: refBytes,
           })
 
           // #170: Content-addressed disk cache check (<50ms return)
@@ -512,10 +527,25 @@ export function registerGenerationTools(ctx, deps, options = {}) {
           const hPrompt = h
           const found = findCachedGeneration(historyEntries, hPrompt)
           if (found) return await cachedResult(found)
+          const srcHash = (source && source.bytes) ? createHash('sha256').update(source.bytes).digest('hex') : undefined
+          const mskHash = (mask && mask.bytes) ? createHash('sha256').update(mask.bytes).digest('hex') : undefined
+          const rfHash = (resolvedRefImage && resolvedRefImage.bytes)
+            ? createHash('sha256').update(resolvedRefImage.bytes).digest('hex')
+            : ((resolvedFaceRef && resolvedFaceRef.bytes) ? createHash('sha256').update(resolvedFaceRef.bytes).digest('hex') : undefined)
+
           const requestedCriteria = {
+            provider,
+            model: effectiveModel,
+            cacheHash: h,
             format: args.output_format || cfg.defaultFormat || 'png',
             aspectRatio: args.aspect_ratio || cfg.defaultAspectRatio,
             size: args.aspect_ratio ? 'custom' : (args.image_size || cfg.defaultSize),
+            quality: args.quality,
+            style: args.style,
+            strength: args.strength,
+            sourceHash: srcHash,
+            maskHash: mskHash,
+            refHash: rfHash,
           }
           if (cfg.cacheBySeed) {
             const bySeed = await findCached(historyEntries, seedVal, promptVal, requestedCriteria)

package/lib/tools/processing-basic.js

@@ -56,38 +56,49 @@ export function registerProcessingTools(ctx, deps) {
             if (!source || !source.bytes) throw new Error('Source image not found: ' + args.image)
           const cfg = live()
           const resvNobg = reserveSpend(0.02, cfg.dailyBudgetUsd)
-          const res = await removeBackgroundFal(
-            { fetchImpl: fetch, resolveKey: (ref) => resolveApiKey(ctx, ref), cfg },
-            { imageBytes: source.bytes, mediaType: source.mediaType, model: args.model, signal: exec?.signal }
-          )
-          const stem = `${slugify(args.output_name || 'nobg')}-${Date.now().toString(36)}`
-          const name = `${stem}.png`
-          const { attachment, localUrl } = await saveAttachmentSafe(ctx, { bytes: res.bytes, mediaType: 'image/png', name })
-          const sessionCwd = exec?.agent?.session?.header?.cwd
-          const outDir = path.resolve(sessionCwd || process.cwd(), cfg.outputDir || 'generated/images')
-          await mkdir(outDir, { recursive: true })
-          const filePath = path.join(outDir, name)
-          await writeFile(filePath, res.bytes)
-          resvNobg.commit(0.02, { ctx, meta: { tool: 'remove_background', model: args.model || 'fal-ai/birefnet' } })
-          const summary = buildDualOutputMarkdown({
-            action: 'background removed',
-            filePath,
-            width: res.width || attachment.width,
-            height: res.height || attachment.height,
-            mediaType: 'image/png',
-            provider: 'fal',
-            model: args.model || 'fal-ai/birefnet',
-            attachmentId: attachment.attachmentId,
-          })
-          return toLosslessJson({
-            summary,
-            path: filePath,
-            url: localUrl,
-            width: res.width || attachment.width,
-            height: res.height || attachment.height,
-            format: 'png',
-            attachment,
-          })
+          let committed = false
+          try {
+            const res = await removeBackgroundFal(
+              { fetchImpl: fetch, resolveKey: (ref) => resolveApiKey(ctx, ref), cfg },
+              { imageBytes: source.bytes, mediaType: source.mediaType, model: args.model, signal: exec?.signal }
+            )
+            if (!res || !res.bytes) {
+              throw new Error('remove_background provider returned empty or invalid response')
+            }
+            const stem = `${slugify(args.output_name || 'nobg')}-${Date.now().toString(36)}`
+            const name = `${stem}.png`
+            const { attachment, localUrl } = await saveAttachmentSafe(ctx, { bytes: res.bytes, mediaType: 'image/png', name })
+            const sessionCwd = exec?.agent?.session?.header?.cwd
+            const outDir = path.resolve(sessionCwd || process.cwd(), cfg.outputDir || 'generated/images')
+            await mkdir(outDir, { recursive: true })
+            const filePath = path.join(outDir, name)
+            await writeFile(filePath, res.bytes)
+            resvNobg.commit(0.02, { ctx, meta: { tool: 'remove_background', model: args.model || 'fal-ai/birefnet' } })
+            committed = true
+            const summary = buildDualOutputMarkdown({
+              action: 'background removed',
+              filePath,
+              width: res.width || attachment.width,
+              height: res.height || attachment.height,
+              mediaType: 'image/png',
+              provider: 'fal',
+              model: args.model || 'fal-ai/birefnet',
+              attachmentId: attachment.attachmentId,
+            })
+            return toLosslessJson({
+              summary,
+              path: filePath,
+              url: localUrl,
+              width: res.width || attachment.width,
+              height: res.height || attachment.height,
+              format: 'png',
+              attachment,
+            })
+          } finally {
+            if (!committed) {
+              resvNobg.release()
+            }
+          }
           } catch (err) {
             throw new Error(sanitizeErrorAndLogs(err.message || err))
           }
@@ -127,38 +138,49 @@ export function registerProcessingTools(ctx, deps) {
             if (!source || !source.bytes) throw new Error('Source image not found: ' + args.image)
           const cfg = live()
           const resvUpscale = reserveSpend(0.025, cfg.dailyBudgetUsd)
-          const res = await upscaleImageFal(
-            { fetchImpl: fetch, resolveKey: (ref) => resolveApiKey(ctx, ref), cfg },
-            { imageBytes: source.bytes, mediaType: source.mediaType, scale: args.scale, prompt: args.prompt, creativity: args.creativity, signal: exec?.signal }
-          )
-          const stem = `${slugify(args.output_name || 'upscaled')}-${Date.now().toString(36)}`
-          const name = `${stem}.png`
-          const { attachment, localUrl } = await saveAttachmentSafe(ctx, { bytes: res.bytes, mediaType: 'image/png', name })
-          const sessionCwd = exec?.agent?.session?.header?.cwd
-          const outDir = path.resolve(sessionCwd || process.cwd(), cfg.outputDir || 'generated/images')
-          await mkdir(outDir, { recursive: true })
-          const filePath = path.join(outDir, name)
-          await writeFile(filePath, res.bytes)
-          resvUpscale.commit(0.025, { ctx, meta: { tool: 'upscale_image', scale: args.scale } })
-          const summary = buildDualOutputMarkdown({
-            action: `upscaled (${args.scale || 2}x)`,
-            filePath,
-            width: res.width || attachment.width,
-            height: res.height || attachment.height,
-            mediaType: 'image/png',
-            provider: 'fal',
-            model: 'fal-ai/clarity-upscaler',
-            attachmentId: attachment.attachmentId,
-          })
-          return toLosslessJson({
-            summary,
-            path: filePath,
-            url: localUrl,
-            scale: args.scale || 2,
-            width: res.width || attachment.width,
-            height: res.height || attachment.height,
-            attachment,
-          })
+          let committed = false
+          try {
+            const res = await upscaleImageFal(
+              { fetchImpl: fetch, resolveKey: (ref) => resolveApiKey(ctx, ref), cfg },
+              { imageBytes: source.bytes, mediaType: source.mediaType, scale: args.scale, prompt: args.prompt, creativity: args.creativity, signal: exec?.signal }
+            )
+            if (!res || !res.bytes) {
+              throw new Error('upscale_image provider returned empty or invalid response')
+            }
+            const stem = `${slugify(args.output_name || 'upscaled')}-${Date.now().toString(36)}`
+            const name = `${stem}.png`
+            const { attachment, localUrl } = await saveAttachmentSafe(ctx, { bytes: res.bytes, mediaType: 'image/png', name })
+            const sessionCwd = exec?.agent?.session?.header?.cwd
+            const outDir = path.resolve(sessionCwd || process.cwd(), cfg.outputDir || 'generated/images')
+            await mkdir(outDir, { recursive: true })
+            const filePath = path.join(outDir, name)
+            await writeFile(filePath, res.bytes)
+            resvUpscale.commit(0.025, { ctx, meta: { tool: 'upscale_image', scale: args.scale } })
+            committed = true
+            const summary = buildDualOutputMarkdown({
+              action: `upscaled (${args.scale || 2}x)`,
+              filePath,
+              width: res.width || attachment.width,
+              height: res.height || attachment.height,
+              mediaType: 'image/png',
+              provider: 'fal',
+              model: 'fal-ai/clarity-upscaler',
+              attachmentId: attachment.attachmentId,
+            })
+            return toLosslessJson({
+              summary,
+              path: filePath,
+              url: localUrl,
+              scale: args.scale || 2,
+              width: res.width || attachment.width,
+              height: res.height || attachment.height,
+              attachment,
+            })
+          } finally {
+            if (!committed) {
+              resvUpscale.release()
+            }
+          }
           } catch (err) {
             throw new Error(sanitizeErrorAndLogs(err.message || err))
           }
@@ -254,50 +276,61 @@ export function registerProcessingTools(ctx, deps) {
             const cfg = live()
             const sessionId = exec?.agent?.session?.id || exec?.agent?.session?.header?.id || 'session'
             trackAndAssertLoopGuard(sessionId, { limit: cfg.loopGuardLimit, prompt: args.prompt || '', exec })
-            const resvBlend = reserveSpend(0.05, cfg.dailyBudgetUsd)
             const refs = Array.isArray(args.images) ? args.images : [args.images].filter(Boolean)
-          if (refs.length < 2) {
-            throw new Error('At least two images are required for blending')
-          }
-          const sources = []
-          for (const r of refs) {
-            const s = await resolveSource(ctx, exec, r)
-            if (s && s.bytes) sources.push(s)
-          }
-          if (sources.length < 2) {
-            throw new Error('At least two valid images are required to blend')
-          }
-          const res = await blendImagesFal(
-            { fetchImpl: fetch, resolveKey: (ref) => resolveApiKey(ctx, ref), cfg },
-            { images: sources, weights: args.weights, prompt: args.prompt, signal: exec?.signal }
-          )
-          const stem = `${slugify(args.output_name || 'blended')}-${Date.now().toString(36)}`
-          const name = `${stem}.png`
-          const { attachment, localUrl } = await saveAttachmentSafe(ctx, { bytes: res.bytes, mediaType: 'image/png', name })
-          const sessionCwd = exec?.agent?.session?.header?.cwd
-          const outDir = path.resolve(sessionCwd || process.cwd(), cfg.outputDir || 'generated/images')
-          await mkdir(outDir, { recursive: true })
-          const filePath = path.join(outDir, name)
-          await writeFile(filePath, res.bytes)
-          resvBlend.commit(0.05, { ctx, meta: { tool: 'blend_images' } })
-          const summary = buildDualOutputMarkdown({
-            action: 'blended composition',
-            filePath,
-            width: res.width || attachment.width,
-            height: res.height || attachment.height,
-            mediaType: 'image/png',
-            provider: 'fal',
-            model: 'fal-ai/image-blend',
-            attachmentId: attachment.attachmentId,
-          })
-          return toLosslessJson({
-            summary,
-            path: filePath,
-            url: localUrl,
-            width: res.width || attachment.width,
-            height: res.height || attachment.height,
-            attachment,
-          })
+            if (refs.length < 2) {
+              throw new Error('At least two images are required for blending')
+            }
+            const sources = []
+            for (const r of refs) {
+              const s = await resolveSource(ctx, exec, r)
+              if (s && s.bytes) sources.push(s)
+            }
+            if (sources.length < 2) {
+              throw new Error('At least two valid images are required to blend')
+            }
+            const resvBlend = reserveSpend(0.05, cfg.dailyBudgetUsd)
+            let committed = false
+            try {
+              const res = await blendImagesFal(
+                { fetchImpl: fetch, resolveKey: (ref) => resolveApiKey(ctx, ref), cfg },
+                { images: sources, weights: args.weights, prompt: args.prompt, signal: exec?.signal }
+              )
+              if (!res || !res.bytes) {
+                throw new Error('blend_images provider returned empty or invalid response')
+              }
+              const stem = `${slugify(args.output_name || 'blended')}-${Date.now().toString(36)}`
+              const name = `${stem}.png`
+              const { attachment, localUrl } = await saveAttachmentSafe(ctx, { bytes: res.bytes, mediaType: 'image/png', name })
+              const sessionCwd = exec?.agent?.session?.header?.cwd
+              const outDir = path.resolve(sessionCwd || process.cwd(), cfg.outputDir || 'generated/images')
+              await mkdir(outDir, { recursive: true })
+              const filePath = path.join(outDir, name)
+              await writeFile(filePath, res.bytes)
+              resvBlend.commit(0.05, { ctx, meta: { tool: 'blend_images' } })
+              committed = true
+              const summary = buildDualOutputMarkdown({
+                action: 'blended composition',
+                filePath,
+                width: res.width || attachment.width,
+                height: res.height || attachment.height,
+                mediaType: 'image/png',
+                provider: 'fal',
+                model: 'fal-ai/image-blend',
+                attachmentId: attachment.attachmentId,
+              })
+              return toLosslessJson({
+                summary,
+                path: filePath,
+                url: localUrl,
+                width: res.width || attachment.width,
+                height: res.height || attachment.height,
+                attachment,
+              })
+            } finally {
+              if (!committed) {
+                resvBlend.release()
+              }
+            }
           } catch (err) {
             throw new Error(sanitizeErrorAndLogs(err.message || err))
           }

package/lib/tools/style-matrix.js

@@ -146,7 +146,8 @@ export function registerStyleMatrixTools(ctx, deps) {
             count: cellCount,
           })
           const batchReservation = reserveSpend(estimatedCost, cfg.dailyBudgetUsd)
-
+          let committed = false
+          try {
           const chain = resolveFallbackChain(provider, cfg.fallbackProviders, PROVIDER_KEYS)
           const quadrantIds = ['A', 'B', 'C', 'D']
           const matrixId = `matrix-${Date.now().toString(36)}`
@@ -236,6 +237,7 @@ export function registerStyleMatrixTools(ctx, deps) {
             cells,
           })
 
+          committed = true
           return toLosslessJson({
             matrix_id: matrixId,
             base_prompt: basePrompt,
@@ -244,6 +246,11 @@ export function registerStyleMatrixTools(ctx, deps) {
             cells,
             summary,
           })
+          } finally {
+            if (!committed) {
+              batchReservation.release()
+            }
+          }
         },
       }),
     )

package/lib/tools/theme-pair.js

@@ -154,7 +154,8 @@ export function registerThemePairTools(ctx, deps) {
             count: 2,
           })
           const batchReservation = reserveSpend(estimatedCost, cfg.dailyBudgetUsd)
-
+          let committed = false
+          try {
           const chain = resolveFallbackChain(primaryProvider, cfg.fallbackProviders, PROVIDER_KEYS)
           const baseSeed = typeof args.seed === 'number' ? args.seed : Math.floor(Math.random() * 1000000)
 
@@ -277,6 +278,7 @@ export function registerThemePairTools(ctx, deps) {
             + `- Dark: ${darkFilename} (seed: ${baseSeed})\n\n`
             + `\`\`\`html\n${html}\n\`\`\``
 
+          committed = true
           return toLosslessJson({
             summary,
             prompt,
@@ -302,6 +304,11 @@ export function registerThemePairTools(ctx, deps) {
             css_snippet: css,
             attachment: lightAttachment,
           })
+          } finally {
+            if (!committed) {
+              batchReservation.release()
+            }
+          }
         },
       }),
     )

package/lib/tools/ui-asset.js

@@ -173,14 +173,11 @@ export function registerUiAssetTools(ctx, deps) {
           const seedVal = args.seed ?? Math.floor(Math.random() * 100000)
 
           let gen
+          let committed = false
           try {
             gen = await executeWithFallback(providers, chain, seedVal, synthesizedPrompt, {
               logger: ctx.logger,
             })
-          } catch (err) {
-            reservation.release()
-            throw err
-          }
 
           let finalBytes = gen.bytes
           let mediaType = gen.mediaType || 'image/png'
@@ -220,6 +217,7 @@ export function registerUiAssetTools(ctx, deps) {
             ctx,
             meta: { provider, model: cfg.model || cfg.customModel, prompt: synthesizedPrompt, seed: seedVal },
           })
+          committed = true
 
           const sessionCwd = exec?.agent?.session?.header?.cwd
           const targetDir = cfg.outputDir || 'generated/images'
@@ -274,6 +272,11 @@ export function registerUiAssetTools(ctx, deps) {
             attachment,
             _fallback: gen._fallback,
           })
+          } finally {
+            if (!committed) {
+              reservation.release()
+            }
+          }
         },
       }),
     )

package/lib/tools/vision-ocr.js

@@ -254,6 +254,7 @@ export function registerVisionOcrTools(ctx, deps) {
           })
           const reservation = reserveSpend(estimatedCost, cfg.dailyBudgetUsd)
           let gen
+          let committed = false
           try {
             gen = await executeWithFallback(
               providers,
@@ -262,10 +263,6 @@ export function registerVisionOcrTools(ctx, deps) {
               inpaintPrompt,
               { logger: ctx.logger },
             )
-          } catch (err) {
-            reservation.release()
-            throw err
-          }
 
           const inpaintedBytes = gen.bytes
           if (!inpaintedBytes) {
@@ -332,6 +329,7 @@ export function registerVisionOcrTools(ctx, deps) {
             ctx,
             meta: { provider: usedProvider, model: cfg.model || cfg.customModel, prompt: inpaintPrompt, seed },
           })
+          committed = true
 
           const dualOutput = buildDualOutputMarkdown({
             action: 'generated',
@@ -364,6 +362,11 @@ export function registerVisionOcrTools(ctx, deps) {
           }
 
           return toLosslessJson(response)
+          } finally {
+            if (!committed) {
+              reservation.release()
+            }
+          }
         },
       })
     )

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@goodandready/dsh-image-gen",
-  "version": "0.11.31",
-  "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).",
+  "version": "0.11.32",
+  "description": "Image generation for DeepSeek Harness: a generate_image tool with pluggable providers \u2014 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",
     "dsh",