@goodandready/dsh-image-gen 0.11.21 → 0.11.22

package/lib/provider-utils.js

@@ -105,14 +105,53 @@ export function formatA1111Parameters(metadata = {}) {
 import { createHash } from 'node:crypto'
 
 /** Deterministic sha256 hash for image generation caching. */
-export function computeGenerationHash({ provider, model, prompt, seed, size, style }) {
+/**
+ * Deterministic sha256 hash for image generation caching (#170, #357).
+ * Incorporates full provider job identity: provider, model, prompt, seed, size, style,
+ * format, aspect ratio, negative prompt, quality, strength, and source/mask image content hashes.
+ */
+export function computeGenerationHash({
+  provider,
+  model,
+  prompt,
+  seed,
+  size,
+  style,
+  format,
+  aspectRatio,
+  negativePrompt,
+  quality,
+  strength,
+  sourceImage,
+  maskImage,
+  reference,
+} = {}) {
+  const hashContent = (item) => {
+    if (!item) return ''
+    if (Buffer.isBuffer(item)) return createHash('sha256').update(item).digest('hex').slice(0, 16)
+    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 String(item).trim()
+  }
+
   const norm = [
+    'v2', // namespace versioning (#357)
     String(provider || '').trim().toLowerCase(),
     String(model || '').trim().toLowerCase(),
     String(prompt || '').trim(),
     String(seed ?? ''),
     String(size || '').trim().toLowerCase(),
     String(style || '').trim().toLowerCase(),
+    String(format || '').trim().toLowerCase(),
+    String(aspectRatio || '').trim().toLowerCase(),
+    String(negativePrompt || '').trim(),
+    String(quality || '').trim().toLowerCase(),
+    strength !== undefined && strength !== null ? String(strength) : '',
+    hashContent(sourceImage),
+    hashContent(maskImage),
+    hashContent(reference),
   ].join('|')
   return createHash('sha256').update(norm).digest('hex')
 }

package/lib/providers/backends/local.js

@@ -24,7 +24,7 @@ export function createLocalGenerator(deps, job) {
     const base = String(cfg.localBaseURL || '').replace(/\/+$/, '')
     if (!base) throw new Error('Local image provider: server address is not configured (Settings → Image generation)')
     const [width, height] = pxSize(aspectPixels, size)
-    const kind = cfg.localKind === 'a1111' ? 'a1111' : 'comfyui'
+    const kind = (cfg.localKind === 'a1111' || cfg.localKind === 'automatic1111') ? 'a1111' : 'comfyui'
 
     if (kind === 'a1111') {
       const isImg2Img = Boolean(source && source.bytes)

package/lib/register-tools.js

@@ -26,6 +26,31 @@ import { registerDiagramTools } from './tools/diagram.js'
  * @param {object} deps shared runtime from apply()
  */
 export function registerAllTools(ctx, deps) {
+  const originalToolsRegister = ctx?.tools?.register ? ctx.tools.register.bind(ctx.tools) : null
+  const wrappedTools = originalToolsRegister ? Object.create(ctx.tools, {
+    register: {
+      value: (def) => {
+        const originalExecute = def.execute
+        const wrappedDef = {
+          ...def,
+          execute: async (args, exec) => {
+            const currentCfg = typeof deps.live === 'function' ? deps.live() : (deps.config || {})
+            if (currentCfg && currentCfg.enabled === false) {
+              throw new Error('Image generation is disabled in settings (dsh-image-gen.enabled is false); enable it in Settings → Image generation.')
+            }
+            return originalExecute(args, exec)
+          },
+        }
+        return originalToolsRegister(wrappedDef)
+      },
+      writable: true,
+      configurable: true,
+    },
+  }) : ctx?.tools
+
+  const targetCtx = originalToolsRegister ? Object.create(ctx, {
+    tools: { value: wrappedTools, writable: true, configurable: true }
+  }) : ctx
   const cfg = typeof deps.live === 'function' ? deps.live() : (deps.config || {})
   const profile = cfg.toolsetProfile || 'minimal'
   const isAll = profile === 'all'
@@ -36,37 +61,37 @@ export function registerAllTools(ctx, deps) {
   const creative = isAll || Boolean(sets.creative || cfg.toolsetCreative)
 
   // 1. Core tools: generate_image, edit_image, inspect_image_quality (<= 3 tools in minimal)
-  registerGenerationTools(ctx, deps, { coreOnly: !creative })
-  registerEditingTools(ctx, deps, { coreOnly: !processing })
-  registerInspectTools(ctx, deps, { coreOnly: !processing })
+  registerGenerationTools(targetCtx, deps, { coreOnly: !creative })
+  registerEditingTools(targetCtx, deps, { coreOnly: !processing })
+  registerInspectTools(targetCtx, deps, { coreOnly: !processing })
 
   // 2. Processing toolset
   if (processing) {
-    registerProcessingTools(ctx, deps)
-    registerProcessingAdvancedTools(ctx, deps)
-    registerVisionOcrTools(ctx, deps)
+    registerProcessingTools(targetCtx, deps)
+    registerProcessingAdvancedTools(targetCtx, deps)
+    registerVisionOcrTools(targetCtx, deps)
   }
 
   // 3. Design toolset
   if (design) {
-    registerAnchorTools(ctx, deps)
-    registerUiAssetTools(ctx, deps)
-    registerStyleMatrixTools(ctx, deps)
-    registerThemePairTools(ctx, deps)
-    registerCharacterSheetTools(ctx, deps)
-    registerDiagramTools(ctx, deps)
+    registerAnchorTools(targetCtx, deps)
+    registerUiAssetTools(targetCtx, deps)
+    registerStyleMatrixTools(targetCtx, deps)
+    registerThemePairTools(targetCtx, deps)
+    registerCharacterSheetTools(targetCtx, deps)
+    registerDiagramTools(targetCtx, deps)
   }
 
   // 4. Frontend toolset
   if (frontend) {
-    registerFrontendTools(ctx, deps)
-    registerResponsiveTools(ctx, deps)
+    registerFrontendTools(targetCtx, deps)
+    registerResponsiveTools(targetCtx, deps)
   }
 
   // 5. Creative toolset
   if (creative) {
-    registerSketchTools(ctx, deps)
-    registerSpritesheetTools(ctx, deps)
-    registerPatternTools(ctx, deps)
+    registerSketchTools(targetCtx, deps)
+    registerSpritesheetTools(targetCtx, deps)
+    registerPatternTools(targetCtx, deps)
   }
 }

package/lib/tools/character-sheet.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 {
   CHARACTER_SHEET_LAYOUTS,
@@ -114,6 +115,14 @@ export function registerCharacterSheetTools(ctx, deps) {
 
           const aspectPixels = ASPECT_RATIOS[sheetPlan.aspectRatio] || ASPECT_RATIOS['16:9']
 
+          const estimatedCost = calculateGenerationCost({
+            provider: activeProvider,
+            model: cfg.model || cfg.customModel || 'default',
+            size: cfg.defaultSize || '1024x1024',
+            count: 1,
+          })
+          assertBudgetAvailable(estimatedCost, cfg.dailyBudgetUsd)
+
           const jobPayload = {
             prompt: sheetPlan.prompt,
             negativePrompt: sheetPlan.negativePrompt,
@@ -157,6 +166,11 @@ export function registerCharacterSheetTools(ctx, deps) {
             }
           }
 
+          recordSpend(Number(genResult.cost) || estimatedCost, {
+            ctx,
+            meta: { provider: usedProvider, model: cfg.model || cfg.customModel, prompt: sheetPlan.prompt, seed },
+          })
+
           const response = {
             prompt: sheetPlan.prompt,
             characterDescription: args.prompt,

package/lib/tools/diagram.js

@@ -11,6 +11,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 {
   DIAGRAM_3D_STYLES,
@@ -108,6 +109,14 @@ export function registerDiagramTools(ctx, deps) {
           const fallbackChain = resolveFallbackChain(activeProvider, cfg)
           const aspectPixels = ASPECT_RATIOS[plan.aspectRatio] || ASPECT_RATIOS['16:9']
 
+          const estimatedCost = calculateGenerationCost({
+            provider: activeProvider,
+            model: cfg.model || cfg.customModel || 'default',
+            size: cfg.defaultSize || '1024x1024',
+            count: 1,
+          })
+          assertBudgetAvailable(estimatedCost, cfg.dailyBudgetUsd)
+
           const jobPayload = {
             prompt: plan.prompt,
             negativePrompt: plan.negativePrompt,
@@ -150,6 +159,11 @@ export function registerDiagramTools(ctx, deps) {
             }
           }
 
+          recordSpend(Number(genResult.cost) || estimatedCost, {
+            ctx,
+            meta: { provider: usedProvider, model: cfg.model || cfg.customModel, prompt: plan.prompt, seed },
+          })
+
           return {
             title: args.title || 'System Architecture',
             style: plan.style,

package/lib/tools/editing.js

@@ -84,6 +84,9 @@ export function registerEditingTools(ctx, deps, options = {}) {
         async execute(args, exec) {
           try {
             const cfg = live()
+            if (cfg && cfg.enabled === false) {
+              throw new Error('Image generation is disabled in settings (dsh-image-gen.enabled is false); enable it in Settings → Image generation.')
+            }
             trackAndAssertLoopGuard(exec?.agent?.session?.id || 'default', { limit: cfg.loopGuardLimit })
             const estimatedCostEdit = calculateGenerationCost({
               provider: cfg.provider || 'fal',
@@ -219,6 +222,9 @@ export function registerEditingTools(ctx, deps, options = {}) {
         async execute(args, exec) {
           try {
             const cfg = live()
+            if (cfg && cfg.enabled === false) {
+              throw new Error('Image generation is disabled in settings (dsh-image-gen.enabled is false); enable it in Settings → Image generation.')
+            }
             trackAndAssertLoopGuard(exec?.agent?.session?.id || 'default', { limit: cfg.loopGuardLimit })
             const count = normalizeCount(args.count || 1)
             const estimatedCostVary = calculateGenerationCost({
@@ -357,6 +363,9 @@ export function registerEditingTools(ctx, deps, options = {}) {
         async execute(args, exec) {
           try {
             const cfg = live()
+            if (cfg && cfg.enabled === false) {
+              throw new Error('Image generation is disabled in settings (dsh-image-gen.enabled is false); enable it in Settings → Image generation.')
+            }
             trackAndAssertLoopGuard(exec?.agent?.session?.id || 'default', { limit: cfg.loopGuardLimit })
             const count = normalizeCount(args.count || 1)
             const estimatedCost = calculateGenerationCost({