@goodandready/dsh-image-gen 0.11.21 → 0.11.22

package/lib/attachment-helper.js

@@ -1,6 +1,7 @@
 import path from 'node:path'
 import { mkdir, writeFile } from 'node:fs/promises'
 import { saveAttachmentSafe, buildSidecar, toLosslessJson } from './providers.js'
+import { recordSpend } from './cost-meter.js'
 import { buildDualOutputMarkdown } from './resolve-image.js'
 
 export async function saveAndAttachResult(ctx, exec, cfg, {
@@ -47,6 +48,19 @@ export async function saveAndAttachResult(ctx, exec, cfg, {
     }), null, 2),
   )
 
+  const effectiveCost = Number(cost) || 0
+  if (effectiveCost > 0) {
+    recordSpend(effectiveCost, {
+      ctx,
+      meta: {
+        provider,
+        model: model || cfg.model || cfg.customModel || 'default',
+        prompt,
+        seed,
+      },
+    })
+  }
+
   const summary = buildDualOutputMarkdown({
     action,
     filePath,

package/lib/commands.js

@@ -2,7 +2,7 @@
 
 import { makeProviders, resolveStylePreset, applyStylePreset } from './providers.js'
 import { ASPECT_RATIOS } from './providers/shared-helpers.js'
-import { calculateGenerationCost } from './cost-meter.js'
+import { calculateGenerationCost, assertBudgetAvailable } from './cost-meter.js'
 
 /**
  * Parse raw slash command arguments: /image <prompt> [--flags]
@@ -74,6 +74,13 @@ export function registerImageCommand(ctx, deps) {
       }
 
       const cfg = typeof live === 'function' ? live() : (deps.config || {})
+      if (cfg && cfg.enabled === false) {
+        return {
+          kind: 'error',
+          text: 'Image generation is disabled in settings (dsh-image-gen.enabled is false); enable it in Settings → Image generation.',
+          toString() { return this.text },
+        }
+      }
       const provider = flags.provider || cfg.provider || 'fal'
       const size = flags.size || cfg.defaultSize || 'square'
       const format = flags.format || cfg.defaultFormat || 'png'
@@ -101,6 +108,14 @@ export function registerImageCommand(ctx, deps) {
         ctx,
       }
 
+      const cost = calculateGenerationCost({
+        provider,
+        model: cfg.model || cfg.customModel || 'default',
+        size,
+        count: 1,
+      })
+      assertBudgetAvailable(cost, cfg.dailyBudgetUsd)
+
       const providerFactory = deps.makeProviders || makeProviders
       const providers = providerFactory(pdeps, job)
       const generateFn = providers[provider] || providers.fal || providers.custom
@@ -113,13 +128,6 @@ export function registerImageCommand(ctx, deps) {
       const stem = `${safeSlug}-${Date.now().toString(36)}`
       const name = `${stem}.${format}`
 
-      const cost = calculateGenerationCost({
-        provider,
-        model: cfg.model || cfg.customModel || 'default',
-        size,
-        count: 1,
-      })
-
       const attached = await saveAndAttachResult(ctx, invocation, cfg, {
         bytes: result.bytes,
         mediaType: result.mediaType || 'image/png',

package/lib/config-schema.js

@@ -100,11 +100,17 @@ export const Config = z.object({
     .volatile(),
   pollIntervalMs: z
     .number()
+    .min(0)
+    .max(60000)
+    .step(1)
     .description('Polling interval for FAL queue status in milliseconds.')
     .default(500)
     .volatile(),
   timeoutMs: z
     .number()
+    .min(1000)
+    .max(600000)
+    .step(1)
     .description('Hard timeout for image generation in milliseconds.')
     .default(180000)
     .volatile(),
@@ -180,8 +186,8 @@ export const Config = z.object({
     .default('GEMINI_API_KEY')
     .volatile(),
   localKind: z
-    .string()
-    .description('Local generation backend kind: "automatic1111" (WebUI) or "comfyui".')
+    .union([z.const('automatic1111'), z.const('a1111'), z.const('comfyui')])
+    .description('Local generation backend kind: "automatic1111" / "a1111" (WebUI) or "comfyui".')
     .default('automatic1111')
     .volatile(),
   localBaseURL: z
@@ -196,11 +202,16 @@ export const Config = z.object({
     .volatile(),
   localSteps: z
     .number()
+    .min(1)
+    .max(150)
+    .step(1)
     .description('Sampling steps for local generation.')
     .default(20)
     .volatile(),
   localCfg: z
     .number()
+    .min(1)
+    .max(30)
     .description('CFG scale for local generation.')
     .default(7.0)
     .volatile(),
@@ -231,6 +242,9 @@ export const Config = z.object({
     .volatile(),
   enhanceBelowChars: z
     .number()
+    .min(0)
+    .max(5000)
+    .step(1)
     .description('Prompts shorter than this character count trigger prompt enhancement.')
     .default(40)
     .volatile(),
@@ -251,11 +265,17 @@ export const Config = z.object({
     .volatile(),
   historyLimit: z
     .number()
-    .description('Maximum number of generation history records to retain in ~/.dsh/image-gen-history.json.')
+    .min(0)
+    .max(50000)
+    .step(1)
+    .description('Maximum number of generation history records to retain in ~/.dsh/image-gen-history.json (0 = disable history retention).')
     .default(500)
     .volatile(),
   pruneDays: z
     .number()
+    .min(0)
+    .max(3650)
+    .step(1)
     .description('Prune history records older than this many days (0 = disable time-based pruning).')
     .default(30)
     .volatile(),
@@ -266,11 +286,16 @@ export const Config = z.object({
     .volatile(),
   dailyBudgetUsd: z
     .number()
+    .min(0)
+    .max(100000)
     .description('Daily image generation spending budget in USD. 0 (default) disables limit enforcement.')
     .default(0)
     .volatile(),
   loopGuardLimit: z
     .number()
+    .min(0)
+    .max(1000)
+    .step(1)
     .description('Maximum consecutive image generations per session without user interaction. 0 disables protection.')
     .default(3)
     .volatile(),