@goodandready/dsh-image-gen 0.10.35 → 0.11.0

package/lib/comfy-workflow-helpers.js

@@ -0,0 +1,161 @@
+// comfy-workflow-helpers.js — ComfyUI workflow JSON parser and placeholder interpolator (#157)
+
+/**
+ * Validates whether an input is a valid ComfyUI API workflow object.
+ * An API workflow is either { [nodeId]: { class_type, inputs } } or { prompt: { [nodeId]: ... } }.
+ *
+ * @param {any} raw
+ * @returns {object} normalized prompt graph { [nodeId]: { class_type, inputs } }
+ */
+export function validateComfyWorkflow(raw) {
+  let graph = raw
+  if (typeof raw === 'string') {
+    const trimmed = raw.trim()
+    if (!trimmed) throw new Error('ComfyUI workflow JSON is empty')
+    try {
+      graph = JSON.parse(trimmed)
+    } catch (e) {
+      throw new Error(`ComfyUI workflow is not valid JSON: ${e.message}`)
+    }
+  }
+
+  if (!graph || typeof graph !== 'object' || Array.isArray(graph)) {
+    throw new Error('ComfyUI workflow must be a JSON object')
+  }
+
+  // Handle nested { prompt: { ... } } wrapper
+  if (graph.prompt && typeof graph.prompt === 'object' && !Array.isArray(graph.prompt)) {
+    graph = graph.prompt
+  }
+
+  const nodeIds = Object.keys(graph)
+  if (nodeIds.length === 0) {
+    throw new Error('ComfyUI workflow contains no nodes')
+  }
+
+  for (const id of nodeIds) {
+    const node = graph[id]
+    if (!node || typeof node !== 'object' || Array.isArray(node)) {
+      throw new Error(`ComfyUI node "${id}" must be an object`)
+    }
+    if (!node.class_type || typeof node.class_type !== 'string') {
+      throw new Error(`ComfyUI node "${id}" missing required "class_type" property`)
+    }
+  }
+
+  return graph
+}
+
+/**
+ * Recursively replaces placeholders in a ComfyUI workflow template.
+ * Supported placeholders:
+ * - {{prompt}}
+ * - {{negativePrompt}}
+ * - {{seed}} (converted to number when exact match)
+ * - {{width}} (converted to number when exact match)
+ * - {{height}} (converted to number when exact match)
+ * - {{steps}} (converted to number when exact match)
+ * - {{cfg}} (converted to number when exact match)
+ * - {{model}}
+ * - {{image}}
+ *
+ * @param {object} workflowGraph
+ * @param {object} ctx
+ * @returns {object} interpolated workflow clone
+ */
+export function interpolateComfyWorkflow(workflowGraph, ctx) {
+  const promptVal = String(ctx.prompt ?? '')
+  const negVal = String(ctx.negativePrompt ?? '')
+  const seedVal = Number.isFinite(ctx.seed) ? ctx.seed : 0
+  const widthVal = Number.isFinite(ctx.width) ? ctx.width : 1024
+  const heightVal = Number.isFinite(ctx.height) ? ctx.height : 1024
+  const stepsVal = Number.isFinite(ctx.steps) ? ctx.steps : 20
+  const cfgVal = Number.isFinite(ctx.cfg) ? ctx.cfg : 7
+  const modelVal = String(ctx.model ?? 'v1-5-pruned-emaonly.safetensors')
+  const imageVal = String(ctx.image ?? '')
+
+  function transformValue(val) {
+    if (typeof val === 'string') {
+      const trimmed = val.trim()
+      // Numeric exact replacements
+      if (trimmed === '{{seed}}') return seedVal
+      if (trimmed === '{{width}}') return widthVal
+      if (trimmed === '{{height}}') return heightVal
+      if (trimmed === '{{steps}}') return stepsVal
+      if (trimmed === '{{cfg}}') return cfgVal
+
+      // General string replacements
+      return val
+        .replace(/\{\{prompt\}\}/g, promptVal)
+        .replace(/\{\{negativePrompt\}\}/g, negVal)
+        .replace(/\{\{negative_prompt\}\}/g, negVal)
+        .replace(/\{\{seed\}\}/g, String(seedVal))
+        .replace(/\{\{width\}\}/g, String(widthVal))
+        .replace(/\{\{height\}\}/g, String(heightVal))
+        .replace(/\{\{steps\}\}/g, String(stepsVal))
+        .replace(/\{\{cfg\}\}/g, String(cfgVal))
+        .replace(/\{\{model\}\}/g, modelVal)
+        .replace(/\{\{image\}\}/g, imageVal)
+    }
+    if (Array.isArray(val)) {
+      return val.map(transformValue)
+    }
+    if (val && typeof val === 'object') {
+      const out = {}
+      for (const [k, v] of Object.entries(val)) {
+        out[k] = transformValue(v)
+      }
+      return out
+    }
+    return val
+  }
+
+  return transformValue(workflowGraph)
+}
+
+/**
+ * Builds the default 7-node standard ComfyUI workflow graph.
+ */
+export function buildDefaultComfyWorkflow({ prompt, negativePrompt, seed, width, height, model, steps, cfg }) {
+  return {
+    '3': {
+      class_type: 'KSampler',
+      inputs: {
+        seed: seed ?? 0,
+        steps: steps ?? 20,
+        cfg: cfg ?? 7,
+        sampler_name: 'euler',
+        scheduler: 'normal',
+        denoise: 1,
+        model: ['4', 0],
+        positive: ['6', 0],
+        negative: ['7', 0],
+        latent_image: ['5', 0],
+      },
+    },
+    '4': {
+      class_type: 'CheckpointLoaderSimple',
+      inputs: { ckpt_name: model || 'v1-5-pruned-emaonly.safetensors' },
+    },
+    '5': {
+      class_type: 'EmptyLatentImage',
+      inputs: { width, height, batch_size: 1 },
+    },
+    '6': {
+      class_type: 'CLIPTextEncode',
+      inputs: { text: prompt || '', clip: ['4', 1] },
+    },
+    '7': {
+      class_type: 'CLIPTextEncode',
+      inputs: { text: negativePrompt || '', clip: ['4', 1] },
+    },
+    '8': {
+      class_type: 'VAEDecode',
+      inputs: { samples: ['3', 0], vae: ['4', 2] },
+    },
+    '9': {
+      class_type: 'SaveImage',
+      inputs: { filename_prefix: 'dsh', images: ['8', 0] },
+    },
+  }
+}

package/lib/index.js

@@ -46,6 +46,7 @@ import {
 import { buildDualOutputMarkdown, resolveConversationImage, analyzeImageWithVision } from './resolve-image.js'
 import { registerAllTools } from './register-tools.js'
 import { registerPluginUpdater } from './updater.js'
+import { registerVaultRoutes } from './vault.js'
 
 
 export { IMAGE_SIZES, OUTPUT_FORMATS, PROVIDER_KEYS, buildSidecar, normalizeMediaType, resolveConversationImage, analyzeImageWithVision }
@@ -566,6 +567,9 @@ export function apply(ctx, config) {
     },
   }), 'dsh-image-gen: history route')
 
+  // Vault route (#159)
+  registerVaultRoutes(ctx)
+
   // Tool registrations live in register-tools.js; each tool is a labeled ctx.effect (#216).
   registerAllTools(ctx, {
     config,

package/lib/providers/backends/local.js

@@ -4,6 +4,11 @@ import {
   calculateBackoff,
   extractComfyNodeErrors,
 } from '../shared-helpers.js'
+import {
+  validateComfyWorkflow,
+  interpolateComfyWorkflow,
+  buildDefaultComfyWorkflow,
+} from '../../comfy-workflow-helpers.js'
 
 /**
  * @param {fetchImpl: Function, resolveKey: Function, cfg: object} deps
@@ -65,17 +70,34 @@ export function createLocalGenerator(deps, job) {
 
     // ComfyUI: submit via /prompt, poll /history/{prompt_id} until completed.
     const promptId = `dsh-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`
-    const workflow = {
-      prompt: {
-        '3': { class_type: 'KSampler', inputs: { seed: seedArg ?? 0, steps: cfg.localSteps ?? 20, cfg: cfg.localCfg ?? 7, sampler_name: 'euler', scheduler: 'normal', denoise: 1, model: ['4', 0], positive: ['6', 0], negative: ['7', 0], latent_image: ['5', 0] } },
-        '4': { class_type: 'CheckpointLoaderSimple', inputs: { ckpt_name: cfg.localModel || 'v1-5-pruned-emaonly.safetensors' } },
-        '5': { class_type: 'EmptyLatentImage', inputs: { width, height, batch_size: 1 } },
-        '6': { class_type: 'CLIPTextEncode', inputs: { text: promptArg, clip: ['4', 1] } },
-        '7': { class_type: 'CLIPTextEncode', inputs: { text: negativePrompt || '', clip: ['4', 1] } },
-        '8': { class_type: 'VAEDecode', inputs: { samples: ['3', 0], vae: ['4', 2] } },
-        '9': { class_type: 'SaveImage', inputs: { filename_prefix: 'dsh', images: ['8', 0] } },
-      },
+    let workflowGraph
+    if (cfg.comfyWorkflowJson) {
+      const template = validateComfyWorkflow(cfg.comfyWorkflowJson)
+      workflowGraph = interpolateComfyWorkflow(template, {
+        prompt: promptArg,
+        negativePrompt: negativePrompt || '',
+        seed: seedArg ?? 0,
+        width,
+        height,
+        steps: cfg.localSteps ?? 20,
+        cfg: cfg.localCfg ?? 7,
+        model: cfg.localModel,
+        image: source && source.bytes ? Buffer.from(source.bytes).toString('base64') : '',
+      })
+    } else {
+      workflowGraph = buildDefaultComfyWorkflow({
+        prompt: promptArg,
+        negativePrompt,
+        seed: seedArg,
+        width,
+        height,
+        model: cfg.localModel,
+        steps: cfg.localSteps,
+        cfg: cfg.localCfg,
+      })
     }
+
+    const workflow = { prompt: workflowGraph }
     const submit = await fetchImpl(`${base}/prompt`, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
@@ -133,4 +155,4 @@ export function createLocalGenerator(deps, job) {
     }
   }
   return local
-}
+}

package/lib/register-tools.js

@@ -14,6 +14,7 @@ import { registerResponsiveTools } from './tools/responsive.js'
 import { registerAnchorTools } from './tools/anchor.js'
 import { registerUiAssetTools } from './tools/ui-asset.js'
 import { registerStyleMatrixTools } from './tools/style-matrix.js'
+import { registerThemePairTools } from './tools/theme-pair.js'
 
 /**
  * Registers every image-gen tool on the host tools service.
@@ -35,4 +36,5 @@ export function registerAllTools(ctx, deps) {
   registerAnchorTools(ctx, deps)
   registerUiAssetTools(ctx, deps)
   registerStyleMatrixTools(ctx, deps)
-}
+  registerThemePairTools(ctx, deps)
+}

package/lib/theme-pair-helpers.js

@@ -0,0 +1,83 @@
+// theme-pair-helpers.js — helper functions for generate_theme_pair (#189)
+
+export const THEME_STYLES = [
+  'minimalist',
+  'isometric',
+  'flat',
+  '3d_render',
+  'lineart',
+  'cyberpunk',
+  'claymorphism',
+  'glassmorphism',
+]
+
+/**
+ * Synthesizes prompt directives for light and dark theme variants.
+ * @param {object} opts
+ * @param {string} opts.prompt - Core user prompt
+ * @param {string} [opts.style] - Aesthetic style
+ * @param {number} [opts.darkContrastBoost=1.2] - Contrast boost multiplier for dark theme
+ * @returns {{ lightPrompt: string, darkPrompt: string }}
+ */
+export function buildThemePairPrompts({ prompt, style, darkContrastBoost = 1.2 }) {
+  const cleanPrompt = String(prompt || '').trim()
+  const styleDirective = style ? `, in ${style} aesthetic style` : ''
+
+  const lightDirectives = [
+    'light mode color palette',
+    'clean pure white background (#ffffff)',
+    'soft ambient occlusion shadows',
+    'balanced crisp natural daylight illumination',
+    'subtle pastel secondary accents',
+    'high daytime readability',
+  ].join(', ')
+
+  const contrastNotes = (darkContrastBoost && darkContrastBoost > 1.0)
+    ? `enhanced ${Math.round(darkContrastBoost * 100)}% dynamic range highlights, luminous neon edge glow`
+    : 'luminous subtle edge glow'
+
+  const darkDirectives = [
+    'dark mode color palette',
+    'deep dark slate or obsidian background (#0f172a, #18181b)',
+    contrastNotes,
+    'vibrant high-contrast focal points',
+    'sleek night UI aesthetics',
+    'eye-comfort calibrated dark surface tones',
+  ].join(', ')
+
+  const lightPrompt = `${cleanPrompt}${styleDirective}, ${lightDirectives}`
+  const darkPrompt = `${cleanPrompt}${styleDirective}, ${darkDirectives}`
+
+  return { lightPrompt, darkPrompt }
+}
+
+/**
+ * Builds responsive HTML/CSS snippets for adaptive theme switching.
+ * @param {object} opts
+ * @param {string} opts.lightSrc - Light image path or url
+ * @param {string} opts.darkSrc - Dark image path or url
+ * @param {string} [opts.alt] - Alt text
+ * @returns {{ html: string, css: string }}
+ */
+export function buildThemePairSnippet({ lightSrc, darkSrc, alt = 'Theme adaptive graphic' }) {
+  const html = `<picture class="dsh-theme-pair">
+  <source srcset="${darkSrc}" media="(prefers-color-scheme: dark)">
+  <img src="${lightSrc}" alt="${alt}" loading="lazy">
+</picture>`
+
+  const css = `/* CSS media-query & class-based dark theme switching */
+.dsh-theme-pair img {
+  max-width: 100%;
+  height: auto;
+  display: block;
+  border-radius: 8px;
+  transition: opacity 0.3s ease;
+}
+
+/* Optional manual class override: <body class="dark"> or <html class="dark"> */
+:is(.dark, [data-theme="dark"]) .dsh-theme-pair img {
+  content: url("${darkSrc}");
+}`
+
+  return { html, css }
+}

package/lib/tools/theme-pair.js

@@ -0,0 +1,251 @@
+// theme-pair.js — generate_theme_pair tool (#189).
+// Synchronized dual generation of light and dark theme visuals with adaptive CSS snippets.
+
+import { defineTool } from '@deepseek-ai/dsh-tools'
+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 { renderToolOutput } from '../attachment-helper.js'
+import {
+  THEME_STYLES,
+  buildThemePairPrompts,
+  buildThemePairSnippet,
+} from '../theme-pair-helpers.js'
+
+export function registerThemePairTools(ctx, deps) {
+  const {
+    live,
+    slugify,
+    resolveApiKey,
+  } = deps
+
+  ctx.effect(() => {
+    ctx.tools.register(
+      defineTool({
+        name: 'generate_theme_pair',
+        description:
+          'Generate synchronized dual illustrations or UI graphics designed specifically for light and dark application themes. '
+          + 'Produces both light (#FFFFFF clean backdrop) and dark (#0F172A obsidian backdrop with luminous accents) variants with matched composition, plus ready-to-use HTML/CSS responsive markup.',
+        parameters: {
+          prompt: {
+            type: 'string',
+            required: true,
+            description: 'Core subject or illustration motif, e.g. "cloud server network topology" or "productivity dashboard banner".',
+          },
+          aspect_ratio: {
+            type: 'string',
+            enum: Object.keys(ASPECT_RATIOS),
+            description: 'Aspect ratio for both variants: "1:1", "16:9", "4:3", etc. (default: "16:9").',
+          },
+          style: {
+            type: 'string',
+            enum: THEME_STYLES,
+            description: 'Visual style aesthetic (default: "minimalist").',
+          },
+          dark_contrast_boost: {
+            type: 'number',
+            description: 'Multiplier for glow and highlight contrast in the dark variant (default: 1.2).',
+          },
+          output_name: {
+            type: 'string',
+            description: 'Base filename prefix for the pair (default: auto-slugified from prompt).',
+          },
+          seed: {
+            type: 'integer',
+            description: 'Base random seed to synchronize composition between variants.',
+          },
+        },
+        output: {
+          schema: {
+            type: 'object',
+            additionalProperties: true,
+            properties: {
+              summary: { type: 'string' },
+              prompt: { type: 'string' },
+              style: { type: 'string' },
+              light: {
+                type: 'object',
+                additionalProperties: true,
+                properties: {
+                  path: { type: 'string' },
+                  url: { type: 'string' },
+                  attachment: { type: 'object', additionalProperties: true },
+                },
+              },
+              dark: {
+                type: 'object',
+                additionalProperties: true,
+                properties: {
+                  path: { type: 'string' },
+                  url: { type: 'string' },
+                  attachment: { type: 'object', additionalProperties: true },
+                },
+              },
+              html_snippet: { type: 'string' },
+              css_snippet: { type: 'string' },
+            },
+          },
+          render(_args, value) {
+            return renderToolOutput(value)
+          },
+        },
+        isConcurrencySafe: () => false,
+        async execute(args, exec) {
+          const cfg = live()
+          if (cfg.enabled === false) {
+            throw new Error('Image generation is disabled in settings.')
+          }
+
+          const prompt = String(args.prompt || '').trim()
+          if (!prompt) {
+            throw new Error('Prompt is required for generate_theme_pair')
+          }
+
+          const style = THEME_STYLES.includes(args.style) ? args.style : 'minimalist'
+          const aspectRatio = args.aspect_ratio || '16:9'
+          const aspectPixels = ASPECT_RATIOS[aspectRatio] || [1344, 768]
+          const darkContrastBoost = typeof args.dark_contrast_boost === 'number' ? args.dark_contrast_boost : 1.2
+
+          const { lightPrompt, darkPrompt } = buildThemePairPrompts({
+            prompt,
+            style,
+            darkContrastBoost,
+          })
+
+          const primaryProvider = cfg.provider || 'fal'
+          const chain = resolveFallbackChain(primaryProvider, cfg.fallbackChain)
+          const baseSeed = typeof args.seed === 'number' ? args.seed : Math.floor(Math.random() * 1000000)
+
+          const sessionCwd = exec.agent?.session?.header?.cwd
+          const targetDir = cfg.outputDir || 'generated/images'
+          const outDir = path.resolve(sessionCwd || process.cwd(), targetDir)
+          await mkdir(outDir, { recursive: true })
+
+          const slug = args.output_name ? slugify(args.output_name) : slugify(prompt).slice(0, 36)
+          const ts = Date.now().toString(36)
+
+          // 1. Generate Light theme variant
+          const lightJob = {
+            prompt: lightPrompt,
+            format: 'png',
+            aspectPixels,
+            aspectRatio,
+            seed: baseSeed,
+            signal: exec.signal,
+          }
+          const lightGen = await executeWithFallback({
+            chain,
+            liveConfig: cfg,
+            makeProvidersFn: (deps, job) => makeProviders(deps, job),
+            resolveApiKeyFn: resolveApiKey,
+            job: lightJob,
+          })
+
+          const lightFilename = `${slug}-light-${ts}.png`
+          const lightPath = path.join(outDir, lightFilename)
+          await writeFile(lightPath, lightGen.bytes)
+
+          const lightAttachment = await saveAttachmentSafe(ctx, {
+            bytes: lightGen.bytes,
+            mediaType: 'image/png',
+            filename: lightFilename,
+            width: lightGen.width || aspectPixels[0],
+            height: lightGen.height || aspectPixels[1],
+          })
+          const lightUrl = lightAttachment.attachmentId ? `/dsh-image-gen/image?id=${encodeURIComponent(lightAttachment.attachmentId)}` : ''
+
+          // 2. Generate Dark theme variant (using matched seed)
+          const darkJob = {
+            prompt: darkPrompt,
+            format: 'png',
+            aspectPixels,
+            aspectRatio,
+            seed: baseSeed,
+            signal: exec.signal,
+          }
+          const darkGen = await executeWithFallback({
+            chain,
+            liveConfig: cfg,
+            makeProvidersFn: (deps, job) => makeProviders(deps, job),
+            resolveApiKeyFn: resolveApiKey,
+            job: darkJob,
+          })
+
+          const darkFilename = `${slug}-dark-${ts}.png`
+          const darkPath = path.join(outDir, darkFilename)
+          await writeFile(darkPath, darkGen.bytes)
+
+          const darkAttachment = await saveAttachmentSafe(ctx, {
+            bytes: darkGen.bytes,
+            mediaType: 'image/png',
+            filename: darkFilename,
+            width: darkGen.width || aspectPixels[0],
+            height: darkGen.height || aspectPixels[1],
+          })
+          const darkUrl = darkAttachment.attachmentId ? `/dsh-image-gen/image?id=${encodeURIComponent(darkAttachment.attachmentId)}` : ''
+
+          // Sidecars
+          await writeFile(
+            path.join(outDir, `${slug}-pair-${ts}.json`),
+            JSON.stringify(buildSidecar({
+              prompt,
+              style,
+              aspectRatio,
+              size: `${aspectPixels[0]}x${aspectPixels[1]}`,
+              format: 'png',
+              seed: baseSeed,
+              light: { path: lightPath, url: lightUrl, attachmentId: lightAttachment.attachmentId },
+              dark: { path: darkPath, url: darkUrl, attachmentId: darkAttachment.attachmentId },
+              cost: (lightGen.cost || 0) + (darkGen.cost || 0),
+            }), null, 2),
+          )
+
+          const { html, css } = buildThemePairSnippet({
+            lightSrc: lightFilename,
+            darkSrc: darkFilename,
+            alt: prompt,
+          })
+
+          const summary = `Generated Theme Pair (${style}, ${aspectRatio}):\n`
+            + `- Light: ${lightFilename} (seed: ${baseSeed})\n`
+            + `- Dark: ${darkFilename} (seed: ${baseSeed})\n\n`
+            + `\`\`\`html\n${html}\n\`\`\``
+
+          return toLosslessJson({
+            summary,
+            prompt,
+            style,
+            aspect_ratio: aspectRatio,
+            light: {
+              path: lightPath,
+              url: lightUrl,
+              filename: lightFilename,
+              width: lightGen.width || aspectPixels[0],
+              height: lightGen.height || aspectPixels[1],
+              attachment: lightAttachment,
+            },
+            dark: {
+              path: darkPath,
+              url: darkUrl,
+              filename: darkFilename,
+              width: darkGen.width || aspectPixels[0],
+              height: darkGen.height || aspectPixels[1],
+              attachment: darkAttachment,
+            },
+            html_snippet: html,
+            css_snippet: css,
+            attachment: lightAttachment,
+          })
+        },
+      }),
+    )
+  }, 'dsh-image-gen: tool generate_theme_pair')
+}