@goodandready/dsh-image-gen 0.11.21 → 0.11.23

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/custom.js

@@ -23,16 +23,27 @@ export function createCustomGenerator(deps, job) {
 
     // Empty key reference indicates unauthenticated gateway.
     const key = cfg.customKeyEnv ? await resolveKey(cfg.customKeyEnv) : ''
-    const headers = { 'Content-Type': 'application/json' }
+    const isEdit = Boolean(source && source.bytes)
+    const headers = {}
+    if (!isEdit) {
+      headers['Content-Type'] = 'application/json'
+    }
     if (key) headers.Authorization = `Bearer ${key}`
 
     // Omit response_format; modern models return either base64 or URL.
-    const endpoint = buildEndpointUrl(base, source ? 'images/edits' : 'images/generations')
+    const endpoint = buildEndpointUrl(base, isEdit ? 'images/edits' : 'images/generations')
     const res = await fetchImpl(endpoint, {
       method: 'POST',
       headers,
-      body: source
-        ? buildEditForm({ source, mask, prompt: promptArg, size: cfg.customSize || (aspectPixels ? aspectPixels.join('x') : SIZE_PIXELS[size]) || size, strength })
+      body: isEdit
+        ? buildEditForm({
+            model: cfg.customModel,
+            source,
+            mask,
+            prompt: promptArg,
+            size: cfg.customSize || (aspectPixels ? aspectPixels.join('x') : SIZE_PIXELS[size]) || size,
+            strength,
+          })
         : JSON.stringify({
             model: cfg.customModel,
             prompt: promptArg,

package/lib/providers/backends/local.js

@@ -24,7 +24,14 @@ 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 rawKind = cfg.localKind || 'a1111'
+    const kind = (rawKind === 'a1111' || rawKind === 'automatic1111')
+      ? 'a1111'
+      : (rawKind === 'comfyui' ? 'comfyui' : null)
+
+    if (!kind) {
+      throw new Error(`Unknown local generation backend kind "${rawKind}". Expected "a1111" or "comfyui".`)
+    }
 
     if (kind === 'a1111') {
       const isImg2Img = Boolean(source && source.bytes)

package/lib/providers/shared-helpers.js

@@ -86,8 +86,9 @@ export async function pollStatus(fetchImpl, statusUrl, key, signal, pollInterval
   }
 }
 
-export function buildEditForm({ source, mask, prompt, size, strength }) {
+export function buildEditForm({ source, mask, prompt, size, strength, model }) {
   const form = new FormData()
+  if (model) form.append('model', model)
   form.append('image', new Blob([source.bytes], { type: source.mediaType || 'image/png' }), 'source.png')
   if (mask) form.append('mask', new Blob([mask.bytes], { type: mask.mediaType || 'image/png' }), 'mask.png')
   form.append('prompt', prompt)

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

@@ -1,5 +1,5 @@
-import { sanitizeErrorAndLogs } from '../security.js'
-// character-sheet.js — generate_character_sheet tool (#181).
+import { buildDualOutputMarkdown } from '../resolve-image.js'
+// character-sheet.js — generate_character_sheet tool (#181, #358).
 // Generates multi-angle character model sheets and turnarounds with visual consistency.
 
 import { defineTool } from '@deepseek-ai/dsh-tools'
@@ -7,12 +7,15 @@ import path from 'node:path'
 import { mkdir, writeFile } from 'node:fs/promises'
 import {
   ASPECT_RATIOS,
+  PROVIDER_KEYS,
   buildSidecar,
   makeProviders,
   toLosslessJson,
   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,
@@ -23,7 +26,7 @@ import {
 export function registerCharacterSheetTools(ctx, deps) {
   const {
     live,
-    slugify,
+    slugify = (s) => String(s || '').toLowerCase().replace(/[^a-z0-9]+/g, '-'),
     resolveApiKey,
   } = deps
 
@@ -77,6 +80,8 @@ export function registerCharacterSheetTools(ctx, deps) {
               },
               seed: { type: 'integer' },
               provider: { type: 'string' },
+              path: { type: 'string' },
+              url: { type: 'string' },
               attachment: {
                 type: 'object',
                 additionalProperties: true,
@@ -88,13 +93,24 @@ export function registerCharacterSheetTools(ctx, deps) {
                   byteSize: { type: 'integer' },
                 },
               },
+              _fallback: {
+                type: 'object',
+                additionalProperties: true,
+              },
             },
           },
           render: (_args, value) => renderToolOutput(value),
         },
         async execute(args, execCtx) {
-          const cfg = live.value
-          const activeProvider = args.provider || cfg.activeProvider || 'fal'
+          const cfg = typeof live === 'function' ? live() : (live?.value || {})
+          if (cfg.enabled === false) {
+            throw new Error('Image generation is disabled in settings.')
+          }
+
+          const provider = PROVIDER_KEYS.includes(args.provider || cfg.provider)
+            ? (args.provider || cfg.provider)
+            : (PROVIDER_KEYS.includes(cfg.provider) ? cfg.provider : 'fal')
+
           const seed = typeof args.seed === 'number' ? args.seed : Math.floor(Math.random() * 2147483647)
 
           const sheetPlan = buildCharacterSheetPrompt({
@@ -104,60 +120,98 @@ export function registerCharacterSheetTools(ctx, deps) {
             negativePrompt: args.negativePrompt,
           })
 
-          const providers = makeProviders({
-            fetchImpl: fetch,
-            resolveKey: (id) => resolveApiKey(cfg, id),
-            cfg,
-          })
+          const aspectPixels = ASPECT_RATIOS[sheetPlan.aspectRatio] || ASPECT_RATIOS['16:9']
 
-          const fallbackChain = resolveFallbackChain(activeProvider, cfg)
+          let subscriptionImages
+          try { subscriptionImages = ctx.get && ctx.get('subscriptionImages') } catch (_err) { subscriptionImages = undefined }
 
-          const aspectPixels = ASPECT_RATIOS[sheetPlan.aspectRatio] || ASPECT_RATIOS['16:9']
+          const providers = makeProviders(
+            { fetchImpl: fetch, resolveKey: (ref) => resolveApiKey(ctx, ref), cfg, subscriptionImages },
+            {
+              prompt: sheetPlan.prompt,
+              negativePrompt: sheetPlan.negativePrompt,
+              size: 'custom',
+              format: 'png',
+              seed,
+              signal: execCtx?.signal,
+              aspectPixels,
+              aspectRatio: sheetPlan.aspectRatio,
+              quality: 'high',
+            },
+          )
 
-          const jobPayload = {
-            prompt: sheetPlan.prompt,
-            negativePrompt: sheetPlan.negativePrompt,
-            aspectRatio: sheetPlan.aspectRatio,
-            aspectPixels,
-            format: 'png',
-            seed,
-            quality: 'high',
-          }
+          const fallbackChain = resolveFallbackChain(provider, cfg.fallbackProviders, PROVIDER_KEYS)
 
-          const { result: genResult, provider: usedProvider } = await executeWithFallback(
-            fallbackChain,
+          const estimatedCost = calculateGenerationCost({
+            provider,
+            model: cfg.model || cfg.customModel || 'default',
+            size: cfg.defaultSize || '1024x1024',
+            count: 1,
+          })
+          assertBudgetAvailable(estimatedCost, cfg.dailyBudgetUsd)
+
+          const gen = await executeWithFallback(
             providers,
-            jobPayload,
-            { signal: execCtx?.signal }
+            fallbackChain,
+            seed,
+            sheetPlan.prompt,
+            { logger: ctx.logger },
           )
 
+          const usedProvider = gen._fallback?.providerUsed || provider
+          const finalBytes = gen.bytes
           const timestamp = Date.now()
           const safeSlug = slugify(args.prompt.slice(0, 30)) || 'character-sheet'
           const filename = `character-sheet-${sheetPlan.layout}-${safeSlug}-${timestamp}.png`
 
           let attachment = null
-          if (genResult.bytes) {
-            const outDir = path.resolve(process.cwd(), cfg.outputDir || 'output')
-            await mkdir(outDir, { recursive: true })
-            const diskPath = path.join(outDir, filename)
-            await writeFile(diskPath, Buffer.from(genResult.bytes))
+          let localUrl = ''
+          let diskPath = ''
+          if (finalBytes) {
+            const saveRes = await saveAttachmentSafe(ctx, {
+              bytes: finalBytes,
+              mediaType: 'image/png',
+              name: filename,
+            })
+            attachment = saveRes?.attachment || null
+            localUrl = saveRes?.localUrl || ''
 
-            attachment = await saveAttachmentSafe(
-              ctx,
-              Buffer.from(genResult.bytes),
-              'image/png',
-              filename,
-              diskPath
-            )
-          } else if (genResult.url) {
+            const sessionCwd = execCtx?.agent?.session?.header?.cwd
+            const targetDir = cfg.outputDir || 'generated/images'
+            const outDir = path.resolve(sessionCwd || process.cwd(), targetDir)
+            await mkdir(outDir, { recursive: true })
+            diskPath = path.join(outDir, filename)
+            await writeFile(diskPath, Buffer.from(finalBytes))
+          } else if (gen.url) {
             attachment = {
-              url: genResult.url,
+              url: gen.url,
               mediaType: 'image/png',
               filename,
             }
+            localUrl = gen.url
           }
 
+          const effectiveCost = Number(gen.cost) || estimatedCost
+          recordSpend(effectiveCost, {
+            ctx,
+            meta: { provider: usedProvider, model: cfg.model || cfg.customModel, prompt: sheetPlan.prompt, seed },
+          })
+
+          const dualOutput = buildDualOutputMarkdown({
+            action: 'generated',
+            filePath: diskPath || filename,
+            width: aspectPixels[0],
+            height: aspectPixels[1],
+            mediaType: 'image/png',
+            seed,
+            provider: usedProvider,
+            model: cfg.model || cfg.customModel || 'character-sheet',
+            cost: gen.cost,
+            attachmentId: attachment?.attachmentId,
+          })
+
           const response = {
+            summary: dualOutput,
             prompt: sheetPlan.prompt,
             characterDescription: args.prompt,
             layout: sheetPlan.layout,
@@ -167,16 +221,13 @@ export function registerCharacterSheetTools(ctx, deps) {
             seed,
             provider: usedProvider,
             attachment,
+            path: diskPath,
+            url: localUrl,
+            attachmentId: attachment?.attachmentId,
+            _fallback: gen._fallback,
           }
 
-          if (attachment?.attachmentId) {
-            response.attachmentId = attachment.attachmentId
-          }
-          if (attachment?.url) {
-            response.url = attachment.url
-          }
-
-          return response
+          return toLosslessJson(response)
         },
       })
     )

package/lib/tools/diagram.js

@@ -1,5 +1,4 @@
-import { sanitizeErrorAndLogs } from '../security.js'
-// diagram.js — beautify_diagram tool (#185).
+// diagram.js — beautify_diagram tool (#185, #359).
 // Transforms raw Mermaid / Graphviz diagrams into high-end 3D isometric architectural illustrations.
 
 import { defineTool } from '@deepseek-ai/dsh-tools'
@@ -7,10 +6,14 @@ import path from 'node:path'
 import { mkdir, writeFile } from 'node:fs/promises'
 import {
   ASPECT_RATIOS,
+  PROVIDER_KEYS,
   makeProviders,
+  toLosslessJson,
   saveAttachmentSafe,
 } from '../providers.js'
+import { buildDualOutputMarkdown } from '../resolve-image.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,
@@ -20,7 +23,7 @@ import {
 export function registerDiagramTools(ctx, deps) {
   const {
     live,
-    slugify,
+    slugify = (s) => String(s || '').toLowerCase().replace(/[^a-z0-9]+/g, '-'),
     resolveApiKey,
   } = deps
 
@@ -74,6 +77,8 @@ export function registerDiagramTools(ctx, deps) {
               prompt: { type: 'string' },
               seed: { type: 'integer' },
               provider: { type: 'string' },
+              path: { type: 'string' },
+              url: { type: 'string' },
               attachment: {
                 type: 'object',
                 additionalProperties: true,
@@ -84,13 +89,24 @@ export function registerDiagramTools(ctx, deps) {
                   filename: { type: 'string' },
                 },
               },
+              _fallback: {
+                type: 'object',
+                additionalProperties: true,
+              },
             },
           },
           render: (_args, value) => renderToolOutput(value),
         },
         async execute(args, execCtx) {
-          const cfg = live?.value || (typeof live === 'function' ? live() : {})
-          const activeProvider = args.provider || cfg.activeProvider || 'fal'
+          const cfg = typeof live === 'function' ? live() : (live?.value || {})
+          if (cfg.enabled === false) {
+            throw new Error('Image generation is disabled in settings.')
+          }
+
+          const provider = PROVIDER_KEYS.includes(args.provider || cfg.provider)
+            ? (args.provider || cfg.provider)
+            : (PROVIDER_KEYS.includes(cfg.provider) ? cfg.provider : 'fal')
+
           const seed = typeof args.seed === 'number' ? args.seed : Math.floor(Math.random() * 2147483647)
 
           const plan = buildDiagramIllustrationPrompt({
@@ -100,57 +116,98 @@ export function registerDiagramTools(ctx, deps) {
             aspectRatio: args.aspect_ratio || '16:9',
           })
 
-          const providers = makeProviders({
-            fetchImpl: fetch,
-            resolveKey: (id) => resolveApiKey(cfg, id),
-            cfg,
-          })
-          const fallbackChain = resolveFallbackChain(activeProvider, cfg)
           const aspectPixels = ASPECT_RATIOS[plan.aspectRatio] || ASPECT_RATIOS['16:9']
 
-          const jobPayload = {
-            prompt: plan.prompt,
-            negativePrompt: plan.negativePrompt,
-            aspectRatio: plan.aspectRatio,
-            aspectPixels,
-            format: 'png',
-            seed,
-            quality: 'high',
-          }
+          let subscriptionImages
+          try { subscriptionImages = ctx.get && ctx.get('subscriptionImages') } catch (_err) { subscriptionImages = undefined }
 
-          const { result: genResult, provider: usedProvider } = await executeWithFallback(
-            fallbackChain,
+          const providers = makeProviders(
+            { fetchImpl: fetch, resolveKey: (ref) => resolveApiKey(ctx, ref), cfg, subscriptionImages },
+            {
+              prompt: plan.prompt,
+              negativePrompt: plan.negativePrompt,
+              size: 'custom',
+              format: 'png',
+              seed,
+              signal: execCtx?.signal,
+              aspectPixels,
+              aspectRatio: plan.aspectRatio,
+              quality: 'high',
+            },
+          )
+
+          const fallbackChain = resolveFallbackChain(provider, cfg.fallbackProviders, PROVIDER_KEYS)
+
+          const estimatedCost = calculateGenerationCost({
+            provider,
+            model: cfg.model || cfg.customModel || 'default',
+            size: cfg.defaultSize || '1024x1024',
+            count: 1,
+          })
+          assertBudgetAvailable(estimatedCost, cfg.dailyBudgetUsd)
+
+          const gen = await executeWithFallback(
             providers,
-            jobPayload,
-            { signal: execCtx?.signal }
+            fallbackChain,
+            seed,
+            plan.prompt,
+            { logger: ctx.logger },
           )
 
-          const outDir = path.resolve(process.cwd(), cfg.outputDir || 'output')
-          await mkdir(outDir, { recursive: true })
+          const usedProvider = gen._fallback?.providerUsed || provider
+          const finalBytes = gen.bytes
           const timestamp = Date.now()
           const safeSlug = slugify(args.title || 'architecture-diagram') || 'diagram'
           const filename = `diagram-3d-${safeSlug}-${timestamp}.png`
 
           let attachment = null
-          if (genResult.bytes) {
-            const diskPath = path.join(outDir, filename)
-            await writeFile(diskPath, Buffer.from(genResult.bytes))
-            attachment = await saveAttachmentSafe(
-              ctx,
-              Buffer.from(genResult.bytes),
-              'image/png',
-              filename,
-              diskPath
-            )
-          } else if (genResult.url) {
+          let localUrl = ''
+          let diskPath = ''
+          if (finalBytes) {
+            const saveRes = await saveAttachmentSafe(ctx, {
+              bytes: finalBytes,
+              mediaType: 'image/png',
+              name: filename,
+            })
+            attachment = saveRes?.attachment || null
+            localUrl = saveRes?.localUrl || ''
+
+            const sessionCwd = execCtx?.agent?.session?.header?.cwd
+            const targetDir = cfg.outputDir || 'generated/images'
+            const outDir = path.resolve(sessionCwd || process.cwd(), targetDir)
+            await mkdir(outDir, { recursive: true })
+            diskPath = path.join(outDir, filename)
+            await writeFile(diskPath, Buffer.from(finalBytes))
+          } else if (gen.url) {
             attachment = {
-              url: genResult.url,
+              url: gen.url,
               mediaType: 'image/png',
               filename,
             }
+            localUrl = gen.url
           }
 
-          return {
+          const effectiveCost = Number(gen.cost) || estimatedCost
+          recordSpend(effectiveCost, {
+            ctx,
+            meta: { provider: usedProvider, model: cfg.model || cfg.customModel, prompt: plan.prompt, seed },
+          })
+
+          const dualOutput = buildDualOutputMarkdown({
+            action: 'generated',
+            filePath: diskPath || filename,
+            width: aspectPixels[0],
+            height: aspectPixels[1],
+            mediaType: 'image/png',
+            seed,
+            provider: usedProvider,
+            model: cfg.model || cfg.customModel || 'beautify-diagram',
+            cost: gen.cost,
+            attachmentId: attachment?.attachmentId,
+          })
+
+          const response = {
+            summary: dualOutput,
             title: args.title || 'System Architecture',
             style: plan.style,
             aspectRatio: plan.aspectRatio,
@@ -159,9 +216,13 @@ export function registerDiagramTools(ctx, deps) {
             seed,
             provider: usedProvider,
             attachment,
-            url: attachment?.url,
+            path: diskPath,
+            url: localUrl,
             attachmentId: attachment?.attachmentId,
+            _fallback: gen._fallback,
           }
+
+          return toLosslessJson(response)
         },
       })
     )

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({