@goodandready/dsh-image-gen 0.11.22 → 0.11.24

package/lib/settings-route.js

@@ -1,3 +1,4 @@
+import { validateComfyWorkflow } from './comfy-workflow-helpers.js'
 // lib/settings-route.js
 // REST endpoints for plugin settings (/dsh-image-gen/config, /dsh-image-gen/status) (#295, #300).
 // Provides HTTP read/write fallback when DSH core is accessed over network.
@@ -92,23 +93,72 @@ export function registerSettingsRoutes(ctx, { live, getSettingsApi, setLiveConfi
         return
       }
 
+      const resetFields = []
+      if (Array.isArray(payload?.resetFields)) {
+        resetFields.push(...payload.resetFields)
+      } else if (Array.isArray(payload?.reset)) {
+        resetFields.push(...payload.reset)
+      } else if (typeof payload?.resetField === 'string') {
+        resetFields.push(payload.resetField)
+      }
+
+      // Coerce fallbackProviders string to array (#369)
+      if (typeof raw.fallbackProviders === 'string') {
+        raw.fallbackProviders = raw.fallbackProviders
+          .split(',')
+          .map((s) => s.trim())
+          .filter(Boolean)
+      }
+
+      // Validate comfyWorkflowJson if non-empty string (#369)
+      if (typeof raw.comfyWorkflowJson === 'string' && raw.comfyWorkflowJson.trim() !== '') {
+        try {
+          validateComfyWorkflow(raw.comfyWorkflowJson)
+        } catch (err) {
+          res.writeHead(400, { 'Content-Type': 'application/json' })
+          res.end(JSON.stringify({ ok: false, error: `Invalid comfyWorkflowJson: ${err.message}` }))
+          return
+        }
+      }
+
       const allowedKeys = new Set(Object.keys(Config.dict || {}))
-      for (const k of Object.keys(raw)) {
+      for (const k of resetFields) {
+        if (!allowedKeys.has(k)) {
+          res.writeHead(400, { 'Content-Type': 'application/json' })
+          res.end(JSON.stringify({ ok: false, error: `unknown config field to reset: ${k}` }))
+          return
+        }
+      }
+
+      for (const [k, v] of Object.entries(raw)) {
+        if (k === 'resetFields' || k === 'reset' || k === 'resetField') continue
         if (!allowedKeys.has(k)) {
           res.writeHead(400, { 'Content-Type': 'application/json' })
           res.end(JSON.stringify({ ok: false, error: `unknown config field: ${k}` }))
           return
         }
+        if (v === null) {
+          resetFields.push(k)
+        }
       }
 
       try {
-        const base = plainConfig(live()) || {}
-        const merged = plainConfig(Config({ ...base, ...raw }))
+        const base = structuredClone(plainConfig(live()) || {})
+        for (const k of resetFields) {
+          delete base[k]
+        }
+        for (const [k, v] of Object.entries(raw)) {
+          if (k === 'resetFields' || k === 'reset' || k === 'resetField') continue
+          if (v !== null && v !== undefined) {
+            base[k] = v
+          }
+        }
+        const merged = plainConfig(Config(base))
         const settingsApi = getSettingsApi ? getSettingsApi() : null
         if (settingsApi && typeof settingsApi.replace === 'function') {
           await settingsApi.replace(merged)
         } else if (settingsApi && typeof settingsApi.update === 'function') {
-          await settingsApi.update(raw)
+          await settingsApi.update(merged)
         } else if (typeof setLiveConfig === 'function') {
           setLiveConfig(merged)
         }

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,10 +7,12 @@ 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'
@@ -24,7 +26,7 @@ import {
 export function registerCharacterSheetTools(ctx, deps) {
   const {
     live,
-    slugify,
+    slugify = (s) => String(s || '').toLowerCase().replace(/[^a-z0-9]+/g, '-'),
     resolveApiKey,
   } = deps
 
@@ -78,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,
@@ -89,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({
@@ -105,73 +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 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 aspectPixels = ASPECT_RATIOS[sheetPlan.aspectRatio] || ASPECT_RATIOS['16:9']
+          const fallbackChain = resolveFallbackChain(provider, cfg.fallbackProviders, PROVIDER_KEYS)
 
           const estimatedCost = calculateGenerationCost({
-            provider: activeProvider,
+            provider,
             model: cfg.model || cfg.customModel || 'default',
             size: cfg.defaultSize || '1024x1024',
             count: 1,
           })
           assertBudgetAvailable(estimatedCost, cfg.dailyBudgetUsd)
 
-          const jobPayload = {
-            prompt: sheetPlan.prompt,
-            negativePrompt: sheetPlan.negativePrompt,
-            aspectRatio: sheetPlan.aspectRatio,
-            aspectPixels,
-            format: 'png',
-            seed,
-            quality: 'high',
-          }
-
-          const { result: genResult, provider: usedProvider } = await executeWithFallback(
-            fallbackChain,
+          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')
+          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 })
-            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) {
+            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
           }
 
-          recordSpend(Number(genResult.cost) || estimatedCost, {
+          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,
@@ -181,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,9 +6,12 @@ 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'
@@ -21,7 +23,7 @@ import {
 export function registerDiagramTools(ctx, deps) {
   const {
     live,
-    slugify,
+    slugify = (s) => String(s || '').toLowerCase().replace(/[^a-z0-9]+/g, '-'),
     resolveApiKey,
   } = deps
 
@@ -75,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,
@@ -85,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({
@@ -101,70 +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']
 
+          let subscriptionImages
+          try { subscriptionImages = ctx.get && ctx.get('subscriptionImages') } catch (_err) { subscriptionImages = undefined }
+
+          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: activeProvider,
+            provider,
             model: cfg.model || cfg.customModel || 'default',
             size: cfg.defaultSize || '1024x1024',
             count: 1,
           })
           assertBudgetAvailable(estimatedCost, cfg.dailyBudgetUsd)
 
-          const jobPayload = {
-            prompt: plan.prompt,
-            negativePrompt: plan.negativePrompt,
-            aspectRatio: plan.aspectRatio,
-            aspectPixels,
-            format: 'png',
-            seed,
-            quality: 'high',
-          }
-
-          const { result: genResult, provider: usedProvider } = await executeWithFallback(
-            fallbackChain,
+          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
           }
 
-          recordSpend(Number(genResult.cost) || estimatedCost, {
+          const effectiveCost = Number(gen.cost) || estimatedCost
+          recordSpend(effectiveCost, {
             ctx,
             meta: { provider: usedProvider, model: cfg.model || cfg.customModel, prompt: plan.prompt, seed },
           })
 
-          return {
+          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,
@@ -173,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)
         },
       })
     )