@goodandready/dsh-image-gen 0.11.17 → 0.11.19

package/lib/frontend-assets.js

@@ -317,6 +317,20 @@ export function optimizeSvgContent(svgString, options = {}) {
   cleaned = cleaned.replace(/\s*(?:xmlns:inkscape|xmlns:sodipodi|xmlns:sketch|inkscape:[a-z-]+|sodipodi:[a-z-]+|sketch:[a-z-]+)="[^"]*"/gi, '')
   cleaned = cleaned.replace(/<(?:metadata|sodipodi:namedview)[\s\S]*?<\/(?:metadata|sodipodi:namedview)>/gi, '')
 
+  // Security (#374): Strip active/dangerous SVG tags (<script>, <foreignObject>, <iframe>, <embed>, <object>, <applet>)
+  cleaned = cleaned.replace(/<script[\s\S]*?<\/script>/gi, '')
+  cleaned = cleaned.replace(/<script[^>]*\/?>/gi, '')
+  cleaned = cleaned.replace(/<foreignObject[\s\S]*?<\/foreignObject>/gi, '')
+  cleaned = cleaned.replace(/<foreignObject[^>]*\/?>/gi, '')
+  cleaned = cleaned.replace(/<(?:iframe|embed|object|applet)[\s\S]*?<\/(?:iframe|embed|object|applet)>/gi, '')
+  cleaned = cleaned.replace(/<(?:iframe|embed|object|applet)[^>]*\/?>/gi, '')
+
+  // Strip event handler attributes (onload, onerror, onclick, etc.)
+  cleaned = cleaned.replace(/\s+on[a-z]+\s*=\s*(?:"[^"]*"|'[^']*'|[^\s>]+)/gi, '')
+
+  // Strip dangerous URI schemes (javascript:, data:text/html, vbscript:) in href/xlink:href/src/action
+  cleaned = cleaned.replace(/\s+(?:href|xlink:href|src|action)\s*=\s*(?:"\s*(?:javascript|data:text\/html|vbscript):[^"]*"|'\s*(?:javascript|data:text\/html|vbscript):[^']*')/gi, '')
+
   cleaned = cleaned.replace(/\s{2,}/g, ' ')
   cleaned = cleaned.replace(/>\s+</g, '><')
 

package/lib/generation-helpers.js

@@ -0,0 +1,250 @@
+// lib/generation-helpers.js
+// Extracted execution and prompt/caching helpers for generate_image tool (#349).
+
+import path from 'node:path'
+import { mkdir, writeFile } from 'node:fs/promises'
+import {
+  computeGenerationHash,
+  IMAGE_SIZES,
+  OUTPUT_FORMATS,
+  PROVIDER_KEYS,
+  buildSidecar,
+  ASPECT_RATIOS,
+  embedPngMetadata,
+  resolveStylePreset,
+  saveAttachmentSafe,
+} from './providers.js'
+import { enhancePrompt } from './prompt-enhancer.js'
+import { buildFaceConsistencyPrompt, getSessionAnchor, applyAnchorPromptHints } from './anchor-helpers.js'
+import { sanitizeNegativePrompt, supportsNegativePrompt } from './negative-sanitizer.js'
+import { recordSpend } from './cost-meter.js'
+import { setCachedGeneration } from './generation-cache.js'
+import {
+  readHistory,
+  writeHistory,
+  pruneHistory,
+} from './history.js'
+
+/** Run an array of async task functions with a concurrency cap */
+export async function asyncPool(tasks, concurrency = 3) {
+  const results = new Array(tasks.length)
+  let nextIdx = 0
+  async function worker() {
+    while (nextIdx < tasks.length) {
+      const idx = nextIdx++
+      results[idx] = await tasks[idx]()
+    }
+  }
+  const workers = Array.from({ length: Math.min(concurrency, tasks.length) }, () => worker())
+  await Promise.all(workers)
+  return results
+}
+
+/** Validates generation configuration and arguments */
+export function validateGenerationParams(cfg, args) {
+  if (cfg.enabled === false) {
+    throw new Error('Image generation is disabled in settings (dsh-image-gen.enabled is false); enable it in Settings → Image generation.')
+  }
+  const provider = PROVIDER_KEYS.includes(cfg.provider) ? cfg.provider : 'fal'
+  const deliverAs = cfg.deliverAs
+  const size = args.aspect_ratio ? 'custom' : (args.image_size ?? cfg.defaultSize)
+  if (!args.aspect_ratio && !IMAGE_SIZES.includes(size)) {
+    throw new Error(`Invalid image_size "${size}". One of: ${IMAGE_SIZES.join(', ')}`)
+  }
+  const aspectPixels = args.aspect_ratio ? ASPECT_RATIOS[args.aspect_ratio] : undefined
+  const format = args.output_format ?? cfg.defaultFormat
+  if (!OUTPUT_FORMATS.includes(format)) {
+    throw new Error(`Invalid output_format "${format}". One of: ${OUTPUT_FORMATS.join(', ')}`)
+  }
+  return { provider, deliverAs, size, aspectPixels, format }
+}
+
+/** Prepares enhanced prompt, style hints, facial identity, anchors, and sanitized negative prompt */
+export async function prepareGenerationPrompt({ ctx, cfg, args, exec, sessionId, provider, resolveSource }) {
+  const enhanced = await enhancePrompt(ctx, cfg, args.prompt, exec.signal, provider)
+  const effectiveStyle = args.style || cfg.stylePreset
+  const styleInfo = resolveStylePreset(effectiveStyle, args.negative_prompt, args.guidance_scale)
+  let effectivePrompt = styleInfo.promptSuffix ? `${enhanced.prompt}, ${styleInfo.promptSuffix}` : enhanced.prompt
+  let effectiveNegative = styleInfo.negativePrompt
+  const activeAnchor = getSessionAnchor(sessionId)
+  let resolvedFaceRef
+
+  const faceRefInput = args.face_reference || (activeAnchor && (activeAnchor.mode === 'face' || activeAnchor.mode === 'character') ? activeAnchor.image : undefined)
+  if (faceRefInput) {
+    try {
+      resolvedFaceRef = await resolveSource(ctx, exec, faceRefInput)
+    } catch (_err) {
+      /* non-fatal: face_reference resolve fallback */
+      resolvedFaceRef = { url: faceRefInput }
+    }
+    const facePlan = buildFaceConsistencyPrompt({
+      prompt: effectivePrompt,
+      faceStrength: args.face_strength || activeAnchor?.strength,
+      characterName: activeAnchor?.label,
+    })
+    effectivePrompt = facePlan.prompt
+    if (facePlan.negativePrompt) {
+      effectiveNegative = effectiveNegative ? `${effectiveNegative}, ${facePlan.negativePrompt}` : facePlan.negativePrompt
+    }
+  } else if (args.reference_image) {
+    effectivePrompt = `${effectivePrompt}, visual reference anchor`
+  } else if (activeAnchor) {
+    effectivePrompt = applyAnchorPromptHints(activeAnchor, effectivePrompt)
+  }
+
+  // #165: Negative prompt sanitizer for diffusion models
+  if (supportsNegativePrompt(provider, cfg.model || cfg.customModel)) {
+    effectiveNegative = sanitizeNegativePrompt({
+      positivePrompt: effectivePrompt,
+      userNegative: effectiveNegative,
+      autoInjectDefects: true,
+    })
+  }
+
+  return {
+    enhanced,
+    effectivePrompt,
+    effectiveNegative,
+    effectiveGuidance: styleInfo.guidanceScale,
+    styleInfo,
+    activeAnchor,
+    resolvedFaceRef,
+  }
+}
+
+/** Saves generated image to disk, sidecar, history, records spend, and builds return structure */
+export async function saveGeneratedImageArtifact({
+  ctx,
+  exec,
+  cfg,
+  args,
+  gen,
+  promptArg,
+  jobSeed,
+  provider,
+  deliverAs,
+  size,
+  format,
+  effectiveNegative,
+  effectiveGuidance,
+  enhanced,
+  slugify,
+  estimatedCost,
+  totalCount,
+}) {
+  const mediaType = gen.mediaType || 'image/png'
+  let bytes = gen.bytes
+  if (mediaType === 'image/png') {
+    bytes = embedPngMetadata(bytes, {
+      prompt: promptArg,
+      seed: gen.seed,
+      provider,
+      model: cfg.model || cfg.customModel,
+      negative_prompt: effectiveNegative,
+      guidance_scale: effectiveGuidance,
+      width: gen.width,
+      height: gen.height,
+    })
+  }
+  const extension = mediaType === 'image/jpeg' ? 'jpg' : mediaType === 'image/webp' ? 'webp' : 'png'
+  const stem = `${slugify(args.output_name || promptArg)}-${Date.now().toString(36)}-${jobSeed}`
+  const name = `${stem}.${extension}`
+
+  const { attachment, localUrl } = await saveAttachmentSafe(ctx, { bytes, mediaType, name })
+
+  const sessionCwd = exec?.agent?.session?.header?.cwd
+  const targetDir = (args.output_dir && String(args.output_dir).trim()) || cfg.outputDir || 'generated/images'
+  const outDir = path.resolve(sessionCwd || process.cwd(), targetDir)
+  await mkdir(outDir, { recursive: true })
+  const filePath = path.join(outDir, name)
+  await writeFile(filePath, bytes)
+
+  // Sidecar: metadata written alongside image file, making the output
+  // directory self-documenting without external database dependencies.
+  await writeFile(
+    path.join(outDir, `${stem}.json`),
+    JSON.stringify(buildSidecar({
+      prompt: promptArg,
+      size,
+      format,
+      seed: gen.seed,
+      provider,
+      deliverAs,
+      width: gen.width || attachment.width,
+      height: gen.height || attachment.height,
+      mediaType,
+      attachmentId: attachment.attachmentId,
+      url: deliverAs === 'image' && gen.sourceUrl ? gen.sourceUrl : localUrl,
+      cost: gen.cost,
+    }), null, 2),
+  )
+
+  const cacheHash = computeGenerationHash({
+    provider,
+    model: cfg.model || cfg.customModel,
+    prompt: promptArg,
+    seed: gen.seed,
+    size: args.image_size || cfg.defaultSize,
+    style: args.style || cfg.stylePreset,
+  })
+
+  // #170: Store in content-addressed disk cache
+  if (cfg.diskCache !== false) {
+    setCachedGeneration(cacheHash, {
+      bytes,
+      mediaType,
+      width: gen.width || attachment.width,
+      height: gen.height || attachment.height,
+      seed: gen.seed,
+      meta: { prompt: promptArg, provider, model: cfg.model || cfg.customModel, cost: gen.cost },
+    })
+  }
+  const entry = {
+    path: filePath,
+    prompt: promptArg,
+    provider,
+    model: cfg.model,
+    size,
+    format,
+    seed: gen.seed,
+    cacheHash,
+    thumbnailUrl: localUrl,
+    width: gen.width || attachment.width,
+    height: gen.height || attachment.height,
+    mediaType,
+    bytes: attachment.bytes,
+    createdAt: new Date().toISOString(),
+    attachmentId: attachment.attachmentId,
+  }
+  let current = await readHistory()
+  current = await pruneHistory(current, cfg.pruneDays)
+  current.unshift(entry)
+  if (current.length > (cfg.historyLimit || 50)) current.length = cfg.historyLimit || 50
+  await writeHistory(current)
+
+  // #167: Record spend in cost meter
+  recordSpend(gen.cost || (estimatedCost / totalCount), {
+    ctx,
+    meta: { provider, model: cfg.model || cfg.customModel, prompt: promptArg, seed: gen.seed },
+  })
+
+  return {
+    path: filePath,
+    url: deliverAs === 'image' && gen.sourceUrl ? gen.sourceUrl : localUrl,
+    width: gen.width || attachment.width,
+    height: gen.height || attachment.height,
+    seed: gen.seed,
+    prompt: promptArg,
+    ...(enhanced?.enhanced ? { originalPrompt: args.prompt } : {}),
+    cost: gen.cost,
+    format: mediaType.replace('image/', ''),
+    attachment: {
+      attachmentId: attachment.attachmentId,
+      mediaType: attachment.mediaType,
+      bytes: attachment.bytes,
+      width: attachment.width,
+      height: attachment.height,
+      name: attachment.name,
+    },
+  }
+}

package/lib/provider-utils.js

@@ -1,3 +1,4 @@
+import { sanitizeErrorAndLogs } from './security.js'
 // lib/provider-utils.js
 // Shared provider utilities and size/format constants extracted from providers.js (#239)
 
@@ -234,11 +235,12 @@ export function formatErrorMessage(e, providerKey = '') {
     msg = msg.replace(/\[object Object\]/g, 'unknown error object').trim()
   }
 
+  const sanitized = sanitizeErrorAndLogs(msg)
   if (providerKey) {
-    return `${providerKey}: ${msg}`
+    return `${providerKey}: ${sanitized}`
   }
 
-  return msg
+  return sanitized
 }
 
 export function resolveSubscriptionSize(size, aspectPixels, aspectRatio) {

package/lib/resolve-image.js

@@ -1,4 +1,4 @@
-import { readFile, stat } from 'node:fs/promises'
+import { readFile, stat, realpath } from 'node:fs/promises'
 import path from 'node:path'
 import { estimateSharpnessAndVariance } from './providers.js'
 
@@ -186,14 +186,24 @@ export async function resolveConversationImage(ctx, exec, targetRef) {
   }
 
   // 3. Local filesystem resolution with strict workspace containment check
-  const root = sessionCwd ? path.resolve(sessionCwd) : process.cwd()
+  const root = path.resolve(sessionCwd ? sessionCwd : process.cwd())
   const absPath = path.resolve(root, effectiveRef)
   const rel = path.relative(root, absPath)
   if (rel.startsWith('..') || path.isAbsolute(rel)) {
     throw new Error(`Access denied: path "${effectiveRef}" is outside allowed workspace directory "${root}"`)
   }
 
-  const fileStat = await stat(absPath).catch(() => null)
+  const realRoot = await realpath(root).catch(() => root)
+  const realTarget = await realpath(absPath).catch(() => null)
+  if (!realTarget) {
+    throw new Error(`Image file not found: ${effectiveRef}`)
+  }
+  const relReal = path.relative(realRoot, realTarget)
+  if (relReal.startsWith('..') || path.isAbsolute(relReal)) {
+    throw new Error(`Access denied: path "${effectiveRef}" points outside allowed workspace directory "${realRoot}"`)
+  }
+
+  const fileStat = await stat(realTarget).catch(() => null)
   if (!fileStat) {
     throw new Error(`Image file not found: ${effectiveRef}`)
   }
@@ -208,7 +218,7 @@ export async function resolveConversationImage(ctx, exec, targetRef) {
     throw new Error(`Image file too large (${(fileStat.size / (1024 * 1024)).toFixed(1)} MB). Maximum allowed size is 50 MB.`)
   }
 
-  const bytes = await readFile(absPath)
+  const bytes = await readFile(realTarget)
   validateImageSignature(bytes, effectiveRef)
   const mediaType = detectMediaType(absPath, bytes)
   return {

package/lib/resolve-source.js

@@ -1,7 +1,7 @@
 // lib/resolve-source.js — Safe image source resolution for image tools (#317)
 
 import path from 'node:path'
-import { readFile, stat } from 'node:fs/promises'
+import { readFile, stat, realpath } from 'node:fs/promises'
 import { validateImageSignature } from './resolve-image.js'
 
 /** Read source image for editing: filesystem path or attachment id. */
@@ -41,7 +41,17 @@ export async function resolveSource(ctx, exec, ref) {
     throw new Error(`Access denied: path "${ref}" is outside allowed workspace directory "${root}"`)
   }
 
-  const fileStat = await stat(target).catch(() => null)
+  const realRoot = await realpath(root).catch(() => root)
+  const realTarget = await realpath(target).catch(() => null)
+  if (!realTarget) {
+    throw new Error(`Source image not found: ${ref}`)
+  }
+  const relReal = path.relative(realRoot, realTarget)
+  if (relReal.startsWith('..') || path.isAbsolute(relReal)) {
+    throw new Error(`Access denied: path "${ref}" points outside allowed workspace directory "${realRoot}"`)
+  }
+
+  const fileStat = await stat(realTarget).catch(() => null)
   if (!fileStat) {
     throw new Error(`Source image not found: ${ref}`)
   }
@@ -55,7 +65,7 @@ export async function resolveSource(ctx, exec, ref) {
     throw new Error(`Source image too large (${(fileStat.size / (1024 * 1024)).toFixed(1)} MB). Maximum allowed size is 50 MB.`)
   }
 
-  const bytes = await readFile(target)
+  const bytes = await readFile(realTarget)
   validateImageSignature(bytes, ref)
   const ext = path.extname(target).toLowerCase()
   const mediaType = ext === '.jpg' || ext === '.jpeg' ? 'image/jpeg'

package/lib/tools/anchor.js

@@ -1,3 +1,4 @@
+import { sanitizeErrorAndLogs } from '../security.js'
 // anchor.js — set_style_anchor tool (#283).
 // Manages persistent visual style & character reference anchors in session context.
 
@@ -69,6 +70,7 @@ export function registerAnchorTools(ctx, deps) {
         },
         isConcurrencySafe: () => true,
         async execute(args, exec) {
+          try {
           const cfg = live ? live() : {}
           if (cfg.enabled === false) {
             throw new Error('Image generation plugin is disabled in settings.')
@@ -121,6 +123,9 @@ export function registerAnchorTools(ctx, deps) {
             anchor,
             summary,
           })
+          } catch (err) {
+            throw new Error(sanitizeErrorAndLogs(err.message || err))
+          }
         },
       }),
     )

package/lib/tools/character-sheet.js

@@ -1,3 +1,4 @@
+import { sanitizeErrorAndLogs } from '../security.js'
 // character-sheet.js — generate_character_sheet tool (#181).
 // Generates multi-angle character model sheets and turnarounds with visual consistency.
 

package/lib/tools/diagram.js

@@ -1,3 +1,4 @@
+import { sanitizeErrorAndLogs } from '../security.js'
 // diagram.js — beautify_diagram tool (#185).
 // Transforms raw Mermaid / Graphviz diagrams into high-end 3D isometric architectural illustrations.
 

package/lib/tools/generation-pack.js

@@ -1,3 +1,4 @@
+import { sanitizeErrorAndLogs } from '../security.js'
 import { renderToolOutput } from "../attachment-helper.js"
 import { defineTool } from '@deepseek-ai/dsh-tools'
 import { toLosslessJson } from '../providers.js'