@goodandready/dsh-image-gen 0.10.35 → 0.11.1

package/lib/tools/processing-advanced.js

@@ -7,48 +7,16 @@ import { defineTool } from '@deepseek-ai/dsh-tools'
 import path from 'node:path'
 import { mkdir, writeFile } from 'node:fs/promises'
 import {
-  computeGenerationHash,
-  IMAGE_SIZES,
-  tryGenerate,
-  fallbackOrder,
-  embedPngMetadata,
-  removeBackgroundFal,
-  upscaleImageFal,
-  traceToSvg,
-  estimateCost,
-  estimateSharpnessAndVariance,
-  applyStylePreset,
-  resolveStylePreset,
-  blendImagesFal,
   toLosslessJson,
   saveAttachmentSafe,
 } from '../providers.js'
-import { resolveConversationImage, analyzeImageWithVision, buildDualOutputMarkdown } from '../resolve-image.js'
-import { sanitizeNegativePrompt, supportsNegativePrompt } from '../negative-sanitizer.js'
-import { executeWithQualityGate } from '../quality-gate.js'
-import { calculateGenerationCost, recordSpend, assertBudgetAvailable } from '../cost-meter.js'
-import { trackAndAssertLoopGuard } from '../loop-guard.js'
 import { sanitizeErrorAndLogs } from '../security.js'
-import { getCachedGeneration, setCachedGeneration } from '../generation-cache.js'
-import {
-  extractDesignTokens,
-  generateCssGradient,
-  checkWcagContrast,
-  optimizeSvgContent,
-  generatePwaIconSuite,
-  extractSampleColorsFromBuffer,
-} from '../frontend-assets.js'
-
-
 
 export function registerProcessingAdvancedTools(ctx, deps) {
   const {
-    config,
     live,
-    saveAndAttachResult,
     resolveSource,
     slugify,
-    resolveApiKey,
   } = deps
 
   ctx.effect(() => {

package/lib/tools/processing-basic.js

@@ -7,44 +7,21 @@ import { defineTool } from '@deepseek-ai/dsh-tools'
 import path from 'node:path'
 import { mkdir, writeFile } from 'node:fs/promises'
 import {
-  computeGenerationHash,
-  IMAGE_SIZES,
-  tryGenerate,
-  fallbackOrder,
-  embedPngMetadata,
   removeBackgroundFal,
   upscaleImageFal,
   traceToSvg,
-  estimateCost,
-  estimateSharpnessAndVariance,
-  applyStylePreset,
-  resolveStylePreset,
   blendImagesFal,
   toLosslessJson,
   saveAttachmentSafe,
 } from '../providers.js'
-import { resolveConversationImage, analyzeImageWithVision, buildDualOutputMarkdown } from '../resolve-image.js'
-import { sanitizeNegativePrompt, supportsNegativePrompt } from '../negative-sanitizer.js'
-import { executeWithQualityGate } from '../quality-gate.js'
-import { calculateGenerationCost, recordSpend, assertBudgetAvailable } from '../cost-meter.js'
+import { buildDualOutputMarkdown } from '../resolve-image.js'
+import { assertBudgetAvailable } from '../cost-meter.js'
 import { trackAndAssertLoopGuard } from '../loop-guard.js'
 import { sanitizeErrorAndLogs } from '../security.js'
-import { getCachedGeneration, setCachedGeneration } from '../generation-cache.js'
-import {
-  extractDesignTokens,
-  generateCssGradient,
-  checkWcagContrast,
-  optimizeSvgContent,
-  generatePwaIconSuite,
-  extractSampleColorsFromBuffer,
-} from '../frontend-assets.js'
-
 
 export function registerProcessingTools(ctx, deps) {
   const {
-    config,
     live,
-    saveAndAttachResult,
     resolveSource,
     slugify,
     resolveApiKey,

package/lib/tools/style-matrix.js

@@ -14,7 +14,6 @@ import {
 } from '../providers.js'
 import { resolveFallbackChain, executeWithFallback } from '../fallback-router.js'
 import {
-  DEFAULT_MATRIX_STYLES,
   normalizeMatrixStyles,
   buildMatrixCellPrompt,
   formatMatrixMarkdown,
@@ -127,7 +126,7 @@ export function registerStyleMatrixTools(ctx, deps) {
 
           const provider = PROVIDER_KEYS.includes(cfg.provider) ? cfg.provider : 'fal'
           let subscriptionImages
-          try { subscriptionImages = ctx.get && ctx.get('subscriptionImages') } catch (_) { subscriptionImages = undefined }
+          try { subscriptionImages = ctx.get && ctx.get('subscriptionImages') } catch { subscriptionImages = undefined }
 
           const chain = resolveFallbackChain(provider, cfg.fallbackProviders, PROVIDER_KEYS)
           const quadrantIds = ['A', 'B', 'C', 'D']

package/lib/tools/theme-pair.js

@@ -0,0 +1,250 @@
+// 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,
+  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')
+}

package/lib/tools/ui-asset.js

@@ -123,7 +123,7 @@ export function registerUiAssetTools(ctx, deps) {
 
           const provider = PROVIDER_KEYS.includes(cfg.provider) ? cfg.provider : 'fal'
           let subscriptionImages
-          try { subscriptionImages = ctx.get && ctx.get('subscriptionImages') } catch (_) { subscriptionImages = undefined }
+          try { subscriptionImages = ctx.get && ctx.get('subscriptionImages') } catch { subscriptionImages = undefined }
 
           const providers = makeProviders(
             { fetchImpl: fetch, resolveKey: (ref) => resolveApiKey(ctx, ref), cfg, subscriptionImages },

package/lib/updater.js

@@ -3,7 +3,6 @@ import { existsSync, readFileSync } from 'node:fs'
 import { readFile } from 'node:fs/promises'
 import { homedir } from 'node:os'
 import { basename, dirname, isAbsolute, resolve } from 'node:path'
-import { fileURLToPath } from 'node:url'
 import { isLoopbackAddress, isPrivateLanAddress, extractHostName } from './security.js'
 
 /**
@@ -21,14 +20,6 @@ function header(request, name) {
   return Array.isArray(value) ? value[0] : value
 }
 
-function isLoopback(value) {
-  return isLoopbackAddress(value)
-}
-
-function isPrivateLan(value) {
-  return isPrivateLanAddress(value)
-}
-
 export function isTrustedUpdateRequest(request) {
   if (header(request, UPDATE_HEADER) !== '1') return false
   const remote = request.socket?.remoteAddress

package/lib/vault.js

@@ -0,0 +1,183 @@
+import { existsSync, unlinkSync } from 'node:fs'
+import { readHistory, writeHistory } from './history.js'
+import { isTrustedLocalRequest } from './security.js'
+
+/**
+ * Match image dimensions against an aspect ratio label or ratio value.
+ */
+export function matchAspectRatio(width, height, targetAspect) {
+  if (!targetAspect || targetAspect === 'any' || targetAspect === 'all') return true
+  if (!width || !height) return false
+  const ratio = width / height
+
+  switch (targetAspect) {
+    case '1:1':
+    case 'square':
+      return Math.abs(ratio - 1.0) < 0.1
+    case '16:9':
+    case 'landscape':
+      return Math.abs(ratio - (16 / 9)) < 0.15
+    case '9:16':
+    case 'portrait':
+      return Math.abs(ratio - (9 / 16)) < 0.15
+    case '4:3':
+      return Math.abs(ratio - (4 / 3)) < 0.15
+    case '3:4':
+      return Math.abs(ratio - (3 / 4)) < 0.15
+    case '21:9':
+    case 'ultrawide':
+      return Math.abs(ratio - (21 / 9)) < 0.2
+    default:
+      return true
+  }
+}
+
+/**
+ * Filter, sort, and paginate vault entries with path sanitization.
+ */
+export function filterVaultEntries(entries, options = {}, existsFn = existsSync) {
+  const {
+    q = '',
+    provider = '',
+    aspect = '',
+    sort = 'newest',
+    offset = 0,
+    limit = 30,
+  } = options
+
+  const safeOffset = Math.max(0, Number.parseInt(offset, 10) || 0)
+  const safeLimit = Math.min(100, Math.max(1, Number.parseInt(limit, 10) || 30))
+  const cleanQ = String(q).trim().toLowerCase()
+  const cleanProvider = String(provider).trim().toLowerCase()
+
+  const existing = (Array.isArray(entries) ? entries : []).filter((e) => e && e.path && existsFn(e.path))
+
+  const filtered = existing.filter((e) => {
+    if (cleanQ && !String(e.prompt || '').toLowerCase().includes(cleanQ)) {
+      return false
+    }
+    if (cleanProvider && String(e.provider || '').toLowerCase() !== cleanProvider) {
+      return false
+    }
+    if (aspect && !matchAspectRatio(e.width, e.height, aspect)) {
+      return false
+    }
+    return true
+  })
+
+  filtered.sort((a, b) => {
+    const timeA = a.createdAt ? Date.parse(a.createdAt) : 0
+    const timeB = b.createdAt ? Date.parse(b.createdAt) : 0
+    if (sort === 'oldest') {
+      return timeA - timeB
+    }
+    return timeB - timeA
+  })
+
+  const total = filtered.length
+  const sliced = filtered.slice(safeOffset, safeOffset + safeLimit)
+
+  const items = sliced.map((e) => {
+    const { path: _discardPath, ...safeEntry } = e
+    return {
+      id: e.id || e.attachmentId || String(e.createdAt || Math.random()),
+      ...safeEntry,
+      thumbnailUrl: e.thumbnailUrl || (e.attachmentId ? `/dsh-image-gen/image?id=${encodeURIComponent(e.attachmentId)}` : ''),
+      url: e.attachmentId ? `/dsh-image-gen/image?id=${encodeURIComponent(e.attachmentId)}` : '',
+    }
+  })
+
+  return {
+    items,
+    total,
+    offset: safeOffset,
+    limit: safeLimit,
+    hasMore: safeOffset + safeLimit < total,
+  }
+}
+
+/**
+ * Delete entry and associated disk files (image + sidecar json).
+ */
+export async function deleteVaultEntry(id) {
+  if (!id) return { success: false, error: 'Missing entry id' }
+  const entries = await readHistory()
+  const idx = entries.findIndex((e) => e.id === id || e.attachmentId === id)
+  if (idx === -1) {
+    return { success: false, error: 'Vault entry not found' }
+  }
+
+  const [entry] = entries.splice(idx, 1)
+  if (entry && entry.path) {
+    try {
+      unlinkSync(entry.path)
+    } catch { /* ignore missing file */ }
+    try {
+      unlinkSync(entry.path.replace(/\.[^.]+$/, '.json'))
+    } catch { /* ignore missing sidecar */ }
+  }
+
+  await writeHistory(entries)
+  return { success: true, id }
+}
+
+/**
+ * Register vault HTTP routes on DSH webServer.
+ */
+export function registerVaultRoutes(ctx) {
+  ctx.effect(() => ctx.webServer.register({
+    kind: 'exact',
+    path: '/dsh-image-gen/vault',
+    handler: async (req, res) => {
+      if (!isTrustedLocalRequest(req)) {
+        res.writeHead(403, { 'Content-Type': 'application/json' })
+        res.end(JSON.stringify({ error: 'forbidden' }))
+        return
+      }
+
+      if (req.method === 'GET') {
+        const u = new URL(req.url, 'http://localhost')
+        const q = u.searchParams.get('q') || ''
+        const provider = u.searchParams.get('provider') || ''
+        const aspect = u.searchParams.get('aspect') || ''
+        const sort = u.searchParams.get('sort') || 'newest'
+        const offset = u.searchParams.get('offset') || '0'
+        const limit = u.searchParams.get('limit') || '30'
+
+        const entries = await readHistory()
+        const result = filterVaultEntries(entries, { q, provider, aspect, sort, offset, limit })
+        res.writeHead(200, { 'Content-Type': 'application/json' })
+        res.end(JSON.stringify({ ok: true, ...result }))
+        return
+      }
+
+      if (req.method === 'DELETE') {
+        const u = new URL(req.url, 'http://localhost')
+        let id = u.searchParams.get('id')
+
+        if (!id) {
+          try {
+            const chunks = []
+            for await (const chunk of req) chunks.push(chunk)
+            const body = JSON.parse(Buffer.concat(chunks).toString('utf-8'))
+            id = body.id
+          } catch { /* body parse error */ }
+        }
+
+        if (!id) {
+          res.writeHead(400, { 'Content-Type': 'application/json' })
+          res.end(JSON.stringify({ ok: false, error: 'Missing id parameter' }))
+          return
+        }
+
+        const result = await deleteVaultEntry(id)
+        res.writeHead(result.success ? 200 : 404, { 'Content-Type': 'application/json' })
+        res.end(JSON.stringify({ ok: result.success, ...result }))
+        return
+      }
+
+      res.writeHead(405, { 'Content-Type': 'application/json' })
+      res.end(JSON.stringify({ error: 'Method not allowed' }))
+    },
+  }), 'dsh-image-gen: vault route')
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-image-gen",
-  "version": "0.10.35",
+  "version": "0.11.1",
   "description": "Image generation for DeepSeek Harness: a generate_image tool with pluggable providers — the FAL queue, any OpenAI-compatible images API, or a ChatGPT/Grok subscription with no API key at all. The picture is shown inline in the conversation; the model receives either a link (works with any chat model) or the image itself (needs dsh-vision-bridge or a vision-capable model).",
   "keywords": [
     "deepseek-harness",
@@ -71,5 +71,11 @@
   "scripts": {
     "test": "node scripts/build-client.mjs && node --check lib/client.js && node --test test/*.test.mjs",
     "build:client": "node scripts/build-client.mjs"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "devDependencies": {
+    "@deepseek-ai/schemastery": "^3.18.1"
   }
 }