@goodandready/dsh-image-gen 0.11.20 → 0.11.22

package/lib/tools/processing-basic.js

@@ -15,7 +15,7 @@ import {
   saveAttachmentSafe,
 } from '../providers.js'
 import { buildDualOutputMarkdown } from '../resolve-image.js'
-import { assertBudgetAvailable } from '../cost-meter.js'
+import { assertBudgetAvailable, recordSpend } from '../cost-meter.js'
 import { trackAndAssertLoopGuard } from '../loop-guard.js'
 import { sanitizeErrorAndLogs } from '../security.js'
 
@@ -55,6 +55,7 @@ export function registerProcessingTools(ctx, deps) {
             const source = await resolveSource(ctx, exec, args.image)
             if (!source || !source.bytes) throw new Error('Source image not found: ' + args.image)
           const cfg = live()
+          assertBudgetAvailable(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 }
@@ -67,6 +68,7 @@ export function registerProcessingTools(ctx, deps) {
           await mkdir(outDir, { recursive: true })
           const filePath = path.join(outDir, name)
           await writeFile(filePath, res.bytes)
+          recordSpend(0.02, { ctx, meta: { tool: 'remove_background', model: args.model || 'fal-ai/birefnet' } })
           const summary = buildDualOutputMarkdown({
             action: 'background removed',
             filePath,
@@ -124,6 +126,7 @@ export function registerProcessingTools(ctx, deps) {
             const source = await resolveSource(ctx, exec, args.image)
             if (!source || !source.bytes) throw new Error('Source image not found: ' + args.image)
           const cfg = live()
+          assertBudgetAvailable(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 }
@@ -136,6 +139,7 @@ export function registerProcessingTools(ctx, deps) {
           await mkdir(outDir, { recursive: true })
           const filePath = path.join(outDir, name)
           await writeFile(filePath, res.bytes)
+          recordSpend(0.025, { ctx, meta: { tool: 'upscale_image', scale: args.scale } })
           const summary = buildDualOutputMarkdown({
             action: `upscaled (${args.scale || 2}x)`,
             filePath,
@@ -269,6 +273,7 @@ export function registerProcessingTools(ctx, deps) {
           await mkdir(outDir, { recursive: true })
           const filePath = path.join(outDir, name)
           await writeFile(filePath, res.bytes)
+          recordSpend(0.05, { ctx, meta: { tool: 'blend_images' } })
           const summary = buildDualOutputMarkdown({
             action: 'blended composition',
             filePath,

package/lib/tools/style-matrix.js

@@ -14,6 +14,7 @@ import {
   saveAttachmentSafe,
 } from '../providers.js'
 import { resolveFallbackChain, executeWithFallback } from '../fallback-router.js'
+import { assertBudgetAvailable, calculateGenerationCost, recordSpend } from '../cost-meter.js'
 import {
   normalizeMatrixStyles,
   buildMatrixCellPrompt,
@@ -129,6 +130,15 @@ export function registerStyleMatrixTools(ctx, deps) {
           let subscriptionImages
           try { subscriptionImages = ctx.get && ctx.get('subscriptionImages') } catch (_err) { subscriptionImages = undefined }
 
+          const cellCount = activeStyles.length
+          const estimatedCost = calculateGenerationCost({
+            provider,
+            model: cfg.model || cfg.customModel || 'default',
+            size: cfg.defaultSize || '1024x1024',
+            count: cellCount,
+          })
+          assertBudgetAvailable(estimatedCost, cfg.dailyBudgetUsd)
+
           const chain = resolveFallbackChain(provider, cfg.fallbackProviders, PROVIDER_KEYS)
           const quadrantIds = ['A', 'B', 'C', 'D']
           const matrixId = `matrix-${Date.now().toString(36)}`
@@ -168,6 +178,12 @@ export function registerStyleMatrixTools(ctx, deps) {
               name: filename,
             })
 
+            const cellCost = Number(gen.cost) || +(estimatedCost / cellCount).toFixed(4)
+            recordSpend(cellCost, {
+              ctx,
+              meta: { provider, model: cfg.model || cfg.customModel, prompt: cellPrompt, seed: cellSeed },
+            })
+
             const filePath = path.join(outDir, filename)
             await writeFile(filePath, gen.bytes)
 

package/lib/tools/theme-pair.js

@@ -13,6 +13,7 @@ import {
   saveAttachmentSafe,
 } from '../providers.js'
 import { resolveFallbackChain, executeWithFallback } from '../fallback-router.js'
+import { assertBudgetAvailable, calculateGenerationCost, recordSpend } from '../cost-meter.js'
 import { renderToolOutput } from '../attachment-helper.js'
 import {
   THEME_STYLES,
@@ -121,6 +122,14 @@ export function registerThemePairTools(ctx, deps) {
           })
 
           const primaryProvider = cfg.provider || 'fal'
+          const estimatedCost = calculateGenerationCost({
+            provider: primaryProvider,
+            model: cfg.model || cfg.customModel || 'default',
+            size: cfg.defaultSize || '1024x1024',
+            count: 2,
+          })
+          assertBudgetAvailable(estimatedCost, cfg.dailyBudgetUsd)
+
           const chain = resolveFallbackChain(primaryProvider, cfg.fallbackChain)
           const baseSeed = typeof args.seed === 'number' ? args.seed : Math.floor(Math.random() * 1000000)
 
@@ -160,6 +169,11 @@ export function registerThemePairTools(ctx, deps) {
             width: lightGen.width || aspectPixels[0],
             height: lightGen.height || aspectPixels[1],
           })
+          const halfCost = +(estimatedCost / 2).toFixed(4)
+          recordSpend(Number(lightGen.cost) || halfCost, {
+            ctx,
+            meta: { provider: primaryProvider, model: cfg.model || cfg.customModel, prompt: lightPrompt },
+          })
           const lightUrl = lightAttachment.attachmentId ? `/dsh-image-gen/image?id=${encodeURIComponent(lightAttachment.attachmentId)}` : ''
 
           // 2. Generate Dark theme variant (using matched seed)
@@ -190,6 +204,10 @@ export function registerThemePairTools(ctx, deps) {
             width: darkGen.width || aspectPixels[0],
             height: darkGen.height || aspectPixels[1],
           })
+          recordSpend(Number(darkGen.cost) || halfCost, {
+            ctx,
+            meta: { provider: primaryProvider, model: cfg.model || cfg.customModel, prompt: darkPrompt },
+          })
           const darkUrl = darkAttachment.attachmentId ? `/dsh-image-gen/image?id=${encodeURIComponent(darkAttachment.attachmentId)}` : ''
 
           // Sidecars

package/lib/tools/ui-asset.js

@@ -15,6 +15,7 @@ import {
   saveAttachmentSafe,
 } from '../providers.js'
 import { resolveFallbackChain, executeWithFallback } from '../fallback-router.js'
+import { assertBudgetAvailable, calculateGenerationCost, recordSpend } from '../cost-meter.js'
 import { buildDualOutputMarkdown } from '../resolve-image.js'
 import {
   UI_ASSET_TYPES,
@@ -161,6 +162,14 @@ export function registerUiAssetTools(ctx, deps) {
             },
           )
 
+          const estimatedCost = calculateGenerationCost({
+            provider,
+            model: cfg.model || cfg.customModel || 'default',
+            size: cfg.defaultSize || '1024x1024',
+            count: 1,
+          })
+          assertBudgetAvailable(estimatedCost, cfg.dailyBudgetUsd)
+
           const chain = resolveFallbackChain(provider, cfg.fallbackProviders, PROVIDER_KEYS)
           const seedVal = args.seed ?? Math.floor(Math.random() * 100000)
 
@@ -201,6 +210,12 @@ export function registerUiAssetTools(ctx, deps) {
             name: filename,
           })
 
+          const effectiveCost = Number(gen.cost) || estimatedCost
+          recordSpend(effectiveCost, {
+            ctx,
+            meta: { provider, model: cfg.model || cfg.customModel, prompt: synthesizedPrompt, seed: seedVal },
+          })
+
           const sessionCwd = exec.agent?.session?.header?.cwd
           const targetDir = cfg.outputDir || 'generated/images'
           const outDir = path.resolve(sessionCwd || process.cwd(), targetDir)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-image-gen",
-  "version": "0.11.20",
+  "version": "0.11.22",
   "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",