@goodandready/dsh-image-gen 0.11.24 → 0.11.26

package/lib/providers.js

@@ -1,3 +1,5 @@
+import sharp from 'sharp'
+import { CURATED_STYLES, normalizeStyleKey } from './prompt-polisher.js'
 /**
  * Returns candidate API key names considering known aliases (e.g. FAL_API_KEY <-> FAL_KEY).
  */
@@ -27,6 +29,8 @@ import { createReplicateGenerator } from './providers/backends/replicate.js'
 export {
   falAuthHeader,
   normalizeMediaType,
+  detectImageMediaType,
+  ensureImageFormat,
   submitJob,
   pollStatus,
   buildEditForm,
@@ -115,15 +119,61 @@ export function buildSidecar({
 
 
 /** Assemble multipart body for /images/edits (OpenAI-compatible edit). */
-/** Compare two images: ratio of differing pixels (0..1). */
+/** Compare two images: ratio of differing pixels (0..1) on decoded pixel buffers (#371). */
 export async function pixelDiff(a, b) {
   if (!a || !b) return { error: 'missing image' }
-  if (a.length !== b.length) return { error: 'size mismatch', diffRatio: 1 }
+  const bufA = Buffer.isBuffer(a) ? a : Buffer.from(a)
+  const bufB = Buffer.isBuffer(b) ? b : Buffer.from(b)
+
+  let pixelsA, pixelsB, widthA, heightA, widthB, heightB
+
+  try {
+    const resA = await sharp(bufA).raw().ensureAlpha().toBuffer({ resolveWithObject: true })
+    pixelsA = resA.data
+    widthA = resA.info.width
+    heightA = resA.info.height
+  } catch {
+    pixelsA = bufA
+  }
+
+  try {
+    const resB = await sharp(bufB).raw().ensureAlpha().toBuffer({ resolveWithObject: true })
+    pixelsB = resB.data
+    widthB = resB.info.width
+    heightB = resB.info.height
+  } catch {
+    pixelsB = bufB
+  }
+
+  if (widthA && widthB && (widthA !== widthB || heightA !== heightB)) {
+    return { error: 'size mismatch', diffRatio: 1 }
+  }
+
+  if (pixelsA.length !== pixelsB.length) {
+    return { error: 'size mismatch', diffRatio: 1 }
+  }
+
   let diff = 0
-  for (let i = 0; i < a.length; i += 1) {
-    if (a[i] !== b[i]) diff += 1
+  const totalPixels = widthA && heightA ? widthA * heightA : pixelsA.length
+  if (widthA && heightA) {
+    for (let i = 0; i < totalPixels; i++) {
+      const off = i * 4
+      if (
+        pixelsA[off] !== pixelsB[off] ||
+        pixelsA[off + 1] !== pixelsB[off + 1] ||
+        pixelsA[off + 2] !== pixelsB[off + 2] ||
+        pixelsA[off + 3] !== pixelsB[off + 3]
+      ) {
+        diff++
+      }
+    }
+    return { diffRatio: totalPixels > 0 ? diff / totalPixels : 0 }
   }
-  return { diffRatio: diff / a.length }
+
+  for (let i = 0; i < pixelsA.length; i++) {
+    if (pixelsA[i] !== pixelsB[i]) diff++
+  }
+  return { diffRatio: pixelsA.length > 0 ? diff / pixelsA.length : 0 }
 }
 
 /** Extract detailed ComfyUI node error messages from /history/{pid} response. */
@@ -270,65 +320,156 @@ export async function upscaleImageFal({ fetchImpl, resolveKey, cfg }, { imageByt
   return { bytes, mediaType: 'image/png', width: img.width || 0, height: img.height || 0, sourceUrl: img.url }
 }
 
-export function traceToSvg(imageBytes, { colorMode = 'color', paletteSize = 16, width = 512, height = 512 } = {}) {
-  const base64 = Buffer.isBuffer(imageBytes) ? imageBytes.toString('base64') : Buffer.from(imageBytes).toString('base64')
+function maskToSvgPaths(mask, width, height) {
+  const visited = new Uint8Array(width * height)
+  const pathParts = []
+  for (let y = 0; y < height; y++) {
+    for (let x = 0; x < width; x++) {
+      const idx = y * width + x
+      if (mask[idx] && !visited[idx]) {
+        let runW = 1
+        while (x + runW < width && mask[y * width + (x + runW)] && !visited[y * width + (x + runW)]) runW++
+        let runH = 1
+        let canExpand = true
+        while (y + runH < height && canExpand) {
+          for (let k = 0; k < runW; k++) {
+            const checkIdx = (y + runH) * width + (x + k)
+            if (!mask[checkIdx] || visited[checkIdx]) { canExpand = false; break; }
+          }
+          if (canExpand) runH++
+        }
+        for (let dy = 0; dy < runH; dy++) {
+          for (let dx = 0; dx < runW; dx++) visited[(y + dy) * width + (x + dx)] = 1
+        }
+        pathParts.push(`M${x},${y}h${runW}v${runH}h-${runW}z`)
+      }
+    }
+  }
+  return pathParts.join("")
+}
+
+function hexToRgb(hex) {
+  const clean = hex.replace(/^#/, "")
+  const num = parseInt(clean, 16)
+  return { r: (num >> 16) & 255, g: (num >> 8) & 255, b: num & 255 }
+}
+
+/**
+ * Converts raster image to pure SVG vector paths without embedded raster (#373).
+ */
+export async function traceToSvg(imageBytes, { colorMode = 'color', paletteSize = 16, width: targetWidth = 512, height: targetHeight = 512 } = {}) {
+  const buf = Buffer.isBuffer(imageBytes) ? imageBytes : Buffer.from(imageBytes || [])
   const palette = quantizePalette(colorMode, paletteSize)
-  const svg = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 ${width} ${height}" width="${width}" height="${height}">
+
+  try {
+    const meta = await sharp(buf).metadata()
+    const origW = meta.width || targetWidth
+    const origH = meta.height || targetHeight
+    const maxDim = 256
+    let pipeline = sharp(buf).ensureAlpha()
+    if (origW > maxDim || origH > maxDim) {
+      pipeline = pipeline.resize(maxDim, maxDim, { fit: 'inside' })
+    }
+    const { data, info } = await pipeline.raw().toBuffer({ resolveWithObject: true })
+    const totalPixels = info.width * info.height
+    const paths = []
+
+    if (colorMode === 'binary') {
+      const mask = new Uint8Array(totalPixels)
+      for (let i = 0; i < totalPixels; i++) {
+        const off = i * 4
+        const r = data[off], g = data[off + 1], b = data[off + 2], a = data[off + 3]
+        const lum = (r * 299 + g * 587 + b * 114) / 1000
+        mask[i] = (a >= 128 && lum < 128) ? 1 : 0
+      }
+      const d = maskToSvgPaths(mask, info.width, info.height)
+      if (d) paths.push(`<path d="${d}" fill="#000000" />`)
+    } else {
+      const palRgb = palette.map(hex => ({ hex, ...hexToRgb(hex) }))
+      const colorMasks = palRgb.map(() => new Uint8Array(totalPixels))
+
+      for (let i = 0; i < totalPixels; i++) {
+        const off = i * 4
+        const r = data[off], g = data[off + 1], b = data[off + 2], a = data[off + 3]
+        if (a < 128) continue
+        let bestIdx = 0
+        let bestDist = Infinity
+        for (let p = 0; p < palRgb.length; p++) {
+          const pr = palRgb[p]
+          const dist = Math.abs(r - pr.r) + Math.abs(g - pr.g) + Math.abs(b - pr.b)
+          if (dist < bestDist) {
+            bestDist = dist
+            bestIdx = p
+          }
+        }
+        colorMasks[bestIdx][i] = 1
+      }
+
+      for (let p = 0; p < palRgb.length; p++) {
+        const d = maskToSvgPaths(colorMasks[p], info.width, info.height)
+        if (d) {
+          paths.push(`<path d="${d}" fill="${palRgb[p].hex}" />`)
+        }
+      }
+    }
+
+    const svg = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 ${info.width} ${info.height}" width="${origW}" height="${origH}">
+  <defs>
+    <meta name="palette" content="${palette.join(',')}" />
+    <meta name="color-mode" content="${colorMode}" />
+  </defs>
+  <g id="vector-layer">
+    ${paths.join("\n    ")}
+  </g>
+</svg>`
+    return { svg, bytes: Buffer.from(svg, 'utf8'), mediaType: 'image/svg+xml', palette, width: origW, height: origH }
+  } catch (err) {
+    const svg = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 ${targetWidth} ${targetHeight}" width="${targetWidth}" height="${targetHeight}">
   <defs>
     <meta name="palette" content="${palette.join(',')}" />
     <meta name="color-mode" content="${colorMode}" />
   </defs>
-  <g id="vector-layer" fill="${colorMode === 'binary' ? '#000000' : 'currentColor'}">
-    <image href="data:image/png;base64,${base64}" width="${width}" height="${height}" preserveAspectRatio="xMidYMid meet" />
+  <g id="vector-layer">
+    <path d="M0,0h${targetWidth}v${targetHeight}h-${targetWidth}z" fill="${palette[0]}" />
   </g>
 </svg>`
-  return { svg, bytes: Buffer.from(svg, 'utf8'), mediaType: 'image/svg+xml', palette }
+    return { svg, bytes: Buffer.from(svg, 'utf8'), mediaType: 'image/svg+xml', palette, width: targetWidth, height: targetHeight }
+  }
 }
 
 
 
 export const STYLE_PRESETS = {
+  ...CURATED_STYLES,
   cinematic: {
+    ...CURATED_STYLES.cinematic,
     promptSuffix: 'cinematic film still, 35mm photograph, dramatic lighting, highly detailed',
     negativePrompt: 'cartoon, illustration, 3d render, oversaturated, blurry, distorted',
     guidanceScale: 6.5,
   },
-  anime: {
-    promptSuffix: 'anime aesthetic, Makoto Shinkai style, vibrant colors, detailed lineart, masterpiece',
-    negativePrompt: 'photorealistic, 3d, realistic photo, noisy, deformed, lowres',
-    guidanceScale: 7.0,
-  },
-  isometric: {
+  isometric: CURATED_STYLES.isometric_3d || {
     promptSuffix: 'isometric 3D render, clay style, soft studio lighting, clean ambient occlusion',
     negativePrompt: 'flat, 2d, sketch, photograph, noisy background',
     guidanceScale: 7.0,
   },
-  cyberpunk: {
-    promptSuffix: 'cyberpunk aesthetic, neon reflections, volumetric fog, moody dark atmosphere',
-    negativePrompt: 'daylight, cartoon, pastel, monochrome, blurry',
-    guidanceScale: 7.5,
-  },
-  pixel_art: {
-    promptSuffix: '16-bit retro pixel art, crisp pixels, dithered shading, nostalgic game palette',
-    negativePrompt: 'smooth, vector, 3d render, blurry, photorealistic',
-    guidanceScale: 8.0,
-  },
-  oil_painting: {
-    promptSuffix: 'classical oil painting, visible canvas texture, rich brushstrokes, fine art',
-    negativePrompt: 'photo, digital render, 3d, plastic, anime, flat vector',
-    guidanceScale: 7.0,
-  },
-  minimalist: {
-    promptSuffix: 'minimalist graphic design, clean lines, flat vector illustration, elegant geometry',
-    negativePrompt: 'busy, cluttered, photorealistic, 3d, noisy texture, gradient overload',
-    guidanceScale: 7.0,
-  },
+  vector: CURATED_STYLES.minimalist_vector,
+  minimalist: CURATED_STYLES.minimalist_vector,
+  film: CURATED_STYLES.analog_film,
+  analog: CURATED_STYLES.analog_film,
+  photo: CURATED_STYLES.photorealistic,
+  realism: CURATED_STYLES.photorealistic,
 }
 
 export function resolveStylePreset(styleKeyOrText, existingNegative, existingGuidance) {
   if (!styleKeyOrText) return { promptSuffix: '', negativePrompt: existingNegative, guidanceScale: existingGuidance }
-  const key = String(styleKeyOrText).toLowerCase().replace(/[-\s]/g, '_')
-  const preset = STYLE_PRESETS[key]
+  const raw = String(styleKeyOrText).trim()
+  if (!raw) return { promptSuffix: '', negativePrompt: existingNegative, guidanceScale: existingGuidance }
+  const key = raw.toLowerCase().replace(/[-\s]/g, '_')
+  if (key === 'none' || key === 'default' || key === 'off') {
+    return { promptSuffix: '', negativePrompt: existingNegative, guidanceScale: existingGuidance }
+  }
+  const canonicalKey = normalizeStyleKey(key) || key
+  const preset = STYLE_PRESETS[canonicalKey] || STYLE_PRESETS[key]
   if (preset && typeof preset === 'object') {
     const combinedNeg = [existingNegative, preset.negativePrompt].filter(Boolean).join(', ')
     return {
@@ -338,7 +479,7 @@ export function resolveStylePreset(styleKeyOrText, existingNegative, existingGui
     }
   }
   return {
-    promptSuffix: typeof preset === 'string' ? preset : String(styleKeyOrText),
+    promptSuffix: typeof preset === 'string' ? preset : raw,
     negativePrompt: existingNegative,
     guidanceScale: existingGuidance,
   }
@@ -350,14 +491,87 @@ export function applyStylePreset(prompt, styleKeyOrText) {
   return res.promptSuffix ? `${prompt}, ${res.promptSuffix}` : prompt
 }
 
+/**
+ * Weighted blend of multiple image buffers into a unified PNG raster (#381).
+ * Resizes all input images to base dimensions and linearly weights RGBA pixels.
+ */
+export async function blendImageBuffers(images, weights) {
+  if (!images || !Array.isArray(images) || images.length < 2) {
+    throw new Error('At least two images are required for blending')
+  }
+
+  // Normalize weights
+  let normWeights = []
+  if (Array.isArray(weights) && weights.length > 0) {
+    const cleanWeights = images.map((_, i) => (typeof weights[i] === 'number' && weights[i] >= 0 ? weights[i] : 1))
+    const sum = cleanWeights.reduce((a, b) => a + b, 0)
+    normWeights = sum > 0 ? cleanWeights.map(w => w / sum) : images.map(() => 1 / images.length)
+  } else {
+    normWeights = images.map(() => 1 / images.length)
+  }
+
+  try {
+    const metas = await Promise.all(images.map(img => sharp(img.bytes).metadata()))
+    const targetW = metas[0].width || 512
+    const targetH = metas[0].height || 512
+    const raws = await Promise.all(
+      images.map(img => sharp(img.bytes).resize(targetW, targetH, { fit: 'cover' }).raw().ensureAlpha().toBuffer())
+    )
+    const totalPixels = targetW * targetH
+    const out = Buffer.alloc(totalPixels * 4)
+    for (let p = 0; p < totalPixels * 4; p += 4) {
+      let r = 0, g = 0, b = 0, a = 0
+      for (let i = 0; i < raws.length; i++) {
+        const w = normWeights[i]
+        r += raws[i][p] * w
+        g += raws[i][p + 1] * w
+        b += raws[i][p + 2] * w
+        a += raws[i][p + 3] * w
+      }
+      out[p] = Math.round(Math.min(255, Math.max(0, r)))
+      out[p + 1] = Math.round(Math.min(255, Math.max(0, g)))
+      out[p + 2] = Math.round(Math.min(255, Math.max(0, b)))
+      out[p + 3] = Math.round(Math.min(255, Math.max(0, a)))
+    }
+    const bytes = await sharp(out, { raw: { width: targetW, height: targetH, channels: 4 } }).png().toBuffer()
+    return { bytes, width: targetW, height: targetH, mediaType: 'image/png', weights: normWeights }
+  } catch (err) {
+    // Fallback for mock or synthetic test buffers that cannot be parsed by sharp
+    const maxLen = Math.max(...images.map(img => (img.bytes?.length || 0)))
+    const out = Buffer.alloc(maxLen)
+    for (let p = 0; p < maxLen; p++) {
+      let val = 0
+      for (let i = 0; i < images.length; i++) {
+        const b = images[i].bytes || Buffer.alloc(0)
+        const byteVal = p < b.length ? b[p] : 0
+        val += byteVal * normWeights[i]
+      }
+      out[p] = Math.round(Math.min(255, Math.max(0, val)))
+    }
+    return { bytes: out, width: 0, height: 0, mediaType: 'image/png', weights: normWeights }
+  }
+}
+
 export async function blendImagesFal({ fetchImpl, resolveKey, cfg }, { images, weights, prompt, model = 'fal-ai/flux/dev/image-to-image', signal }) {
+  if (!images || !Array.isArray(images) || images.length < 2) {
+    throw new Error('At least two images are required for blending')
+  }
+
+  // Pre-blend all inputs with weights locally to produce the composite reference (#381)
+  const blended = await blendImageBuffers(images, weights)
+  const normWeights = blended.weights
+
   const key = await resolveKey(cfg.apiKeyEnv)
   const imageUrls = (images || []).map((img) => {
     const b64 = Buffer.isBuffer(img.bytes) ? img.bytes.toString('base64') : Buffer.from(img.bytes).toString('base64')
     return `data:${img.mediaType || 'image/png'};base64,${b64}`
   })
+  const blendedDataUrl = `data:${blended.mediaType || 'image/png'};base64,${blended.bytes.toString('base64')}`
+
   const body = {
-    image_url: imageUrls[0],
+    image_url: blendedDataUrl,
+    images: imageUrls,
+    weights: normWeights,
     prompt: prompt || 'high quality blended composition',
     strength: 0.65,
   }
@@ -371,7 +585,7 @@ export async function blendImagesFal({ fetchImpl, resolveKey, cfg }, { images, w
   const dl = await fetchImpl(img.url, { signal })
   if (!dl.ok) throw new Error(`FAL download failed (HTTP ${dl.status})`)
   const bytes = Buffer.from(await dl.arrayBuffer())
-  return { bytes, mediaType: 'image/png', width: img.width || 0, height: img.height || 0, sourceUrl: img.url }
+  return { bytes, mediaType: 'image/png', width: img.width || blended.width || 0, height: img.height || blended.height || 0, sourceUrl: img.url }
 }
 
 /** Direct image editing (inpainting / img2img) via selected provider. */

package/lib/quality-gate.js

@@ -16,22 +16,23 @@ export async function evaluateImageQuality(bytes, { ctx, prompt } = {}) {
   const buf = Buffer.isBuffer(bytes) ? bytes : Buffer.from(bytes || [])
 
   // 1. Minimum buffer check
-  if (!buf || buf.length < 512) {
+  if (!buf || buf.length < 8) {
     return {
       passed: false,
       score: 0,
       defect: 'corrupt_buffer',
-      details: { reason: 'Buffer size is too small or corrupt (< 512 bytes)', size: buf.length },
+      details: { reason: 'Buffer size is too small or corrupt (< 8 bytes)', size: buf.length },
     }
   }
 
-  // 2. Laplacian-like sharpness / variance test
-  const heuristic = estimateSharpnessAndVariance(buf)
+  // 2. Laplacian-like sharpness / variance test on decoded raster pixels (#371)
+  const heuristic = await estimateSharpnessAndVariance(buf)
   if (!heuristic.passed || heuristic.isBlank) {
+    const isCorrupt = heuristic.reason === 'Unsupported or corrupt image data' || heuristic.reason === 'Empty or corrupt image buffer'
     return {
       passed: false,
       score: heuristic.score || 0.1,
-      defect: 'blank_or_solid_frame',
+      defect: isCorrupt ? 'corrupt_buffer' : 'blank_or_solid_frame',
       details: heuristic,
     }
   }

package/lib/resolve-image.js

@@ -269,7 +269,7 @@ export async function analyzeImageWithVision(ctx, exec, source) {
   }
 
   // Local fallback: analyze sharpness and dimensions without external model call
-  const analysis = estimateSharpnessAndVariance(source.bytes)
+  const analysis = await estimateSharpnessAndVariance(source.bytes)
   const fallbackSummary = analysis.isBlank
     ? 'Low-contrast or uniform canvas'
     : `Detected visual asset (${source.mediaType}, sharpness: ${analysis.score})`

package/lib/tools/frontend.js

@@ -1,6 +1,7 @@
 import { renderToolOutput } from "../attachment-helper.js"
 // frontend — image-gen tools (extract_design_tokens, image_to_css_gradient, check_image_contrast, optimize_vector_svg, generate_pwa_icon_suite). Extracted from apply() (#216).
 
+import path from 'node:path'
 import { defineTool } from '@deepseek-ai/dsh-tools'
 import { toLosslessJson } from '../providers.js'
 import { sanitizeErrorAndLogs } from '../security.js'
@@ -46,7 +47,7 @@ export function registerFrontendTools(ctx, deps) {
               if (!source || !source.bytes) {
                 throw new Error('Image not found or unreadable: ' + args.image)
               }
-              colors = extractSampleColorsFromBuffer(source.bytes)
+              colors = await extractSampleColorsFromBuffer(source.bytes)
             }
           }
           return toLosslessJson(extractDesignTokens(colors, { prefix: args.prefix }))
@@ -86,7 +87,7 @@ export function registerFrontendTools(ctx, deps) {
               if (!source || !source.bytes) {
                 throw new Error('Image not found or unreadable: ' + args.image)
               }
-              colors = extractSampleColorsFromBuffer(source.bytes)
+              colors = await extractSampleColorsFromBuffer(source.bytes)
             }
           }
           return toLosslessJson(generateCssGradient(colors, args.type || 'mesh'))
@@ -129,7 +130,7 @@ export function registerFrontendTools(ctx, deps) {
               if (!source || !source.bytes) {
                 throw new Error('Image not found or unreadable: ' + args.image)
               }
-              colors = extractSampleColorsFromBuffer(source.bytes)
+              colors = await extractSampleColorsFromBuffer(source.bytes)
             }
           }
           return toLosslessJson(checkWcagContrast(colors, args.text_color || '#ffffff'))
@@ -209,15 +210,31 @@ export function registerFrontendTools(ctx, deps) {
           },
         },
         async execute(args, exec) {
-          const res = await generatePwaIconSuite({
-            name: args.name || 'App',
-            shortName: args.short_name || args.name || 'App',
-            themeColor: args.theme_color || '#0f172a',
-            backgroundColor: args.background_color || '#ffffff',
-            iconsDir: args.icons_dir || 'icons',
-            sourcePath: args.image || null,
-          })
-          return toLosslessJson(res)
+          try {
+            let sourceBytes = null
+            if (args.image) {
+              const source = await resolveSource(ctx, exec, args.image)
+              if (source && source.bytes) {
+                sourceBytes = source.bytes
+              }
+            }
+            const sessionCwd = exec?.agent?.session?.header?.cwd || process.cwd()
+            const outDir = path.resolve(sessionCwd, args.out_dir || '.')
+
+            const res = await generatePwaIconSuite({
+              name: args.name || 'App',
+              shortName: args.short_name || args.name || 'App',
+              themeColor: args.theme_color || '#0f172a',
+              backgroundColor: args.background_color || '#ffffff',
+              iconsDir: args.icons_dir || 'icons',
+              sourcePath: args.image || null,
+              imageBytes: sourceBytes,
+              outDir,
+            })
+            return toLosslessJson(res)
+          } catch (err) {
+            throw new Error(sanitizeErrorAndLogs(err.message || err))
+          }
         },
       }),
     )

package/lib/tools/generation.js

@@ -340,29 +340,6 @@ export function registerGenerationTools(ctx, deps, options = {}) {
         // rejection reaches the model as text. Without this guard,
         // execution would proceed with empty bytes.
         const guard = (generated) => { if (generated && generated.ok === false) throw new Error(generated.reason) }
-        const one = async (jobSeed, providerKey, promptArg = effectivePrompt) => {
-          const gen = await providers[providerKey](jobSeed, promptArg)
-          guard(gen)
-          return await saveGeneratedImageArtifact({
-            ctx,
-            exec,
-            cfg,
-            args,
-            gen,
-            promptArg,
-            jobSeed,
-            provider,
-            deliverAs,
-            size,
-            format,
-            effectiveNegative,
-            effectiveGuidance,
-            enhanced,
-            slugify,
-            estimatedCost,
-            totalCount,
-          })
-        }
 
         const seedBase = args.seed ?? Math.floor(Math.random() * 100000)
         // Fallback cascade: evaluate configured provider, falling back to alternates
@@ -372,8 +349,20 @@ export function registerGenerationTools(ctx, deps, options = {}) {
         const generators = Object.fromEntries(PROVIDER_KEYS.map((k) => [
           k,
           async (s, p) => {
-            const { generated, qualityReport } = await executeWithQualityGate(
-              (seedVal) => one(seedVal, k, p),
+            let totalAttempts = 0
+            let accumulatedCost = 0
+            // #353: Pipeline evaluates raw gen.bytes first; saves artifact ONCE after acceptance
+            const rawGenerate = async (seedVal) => {
+              totalAttempts++
+              const gen = await providers[k](seedVal, p)
+              guard(gen)
+              const attemptCost = Number(gen.cost) || estimatedCost
+              accumulatedCost += attemptCost
+              return gen
+            }
+
+            const { generated: acceptedGen, qualityReport } = await executeWithQualityGate(
+              rawGenerate,
               {
                 initialSeed: s,
                 enabled: qgEnabled,
@@ -381,7 +370,36 @@ export function registerGenerationTools(ctx, deps, options = {}) {
                 prompt: p,
               }
             )
-            return { ...generated, qualityReport }
+
+            // Save the accepted artifact ONCE
+            const saved = await saveGeneratedImageArtifact({
+              ctx,
+              exec,
+              cfg,
+              args,
+              gen: acceptedGen,
+              promptArg: p,
+              jobSeed: qualityReport.seedUsed ?? s,
+              provider,
+              deliverAs,
+              size,
+              format,
+              effectiveNegative,
+              effectiveGuidance,
+              enhanced,
+              slugify,
+              estimatedCost: accumulatedCost || estimatedCost,
+              totalCount,
+            })
+
+            return {
+              ...saved,
+              qualityReport: {
+                ...qualityReport,
+                attempts: totalAttempts,
+                totalCost: accumulatedCost,
+              },
+            }
           }
         ]))
         const images = []
@@ -400,7 +418,10 @@ export function registerGenerationTools(ctx, deps, options = {}) {
             prompt: promptVal,
             seed: seedVal,
             size: args.aspect_ratio ? 'custom' : (args.image_size || cfg.defaultSize),
-            style: args.style || cfg.stylePreset,
+            style: args.style,
+            stylePreset: (args.style_preset !== undefined && args.style_preset !== null && args.style_preset !== '')
+              ? args.style_preset
+              : (cfg.stylePreset || cfg.defaultStylePreset),
             format: args.output_format || cfg.defaultFormat || 'png',
             aspectRatio: args.aspect_ratio || cfg.defaultAspectRatio,
             negativePrompt: args.negative_prompt || cfg.negativePrompt,
@@ -482,7 +503,7 @@ export function registerGenerationTools(ctx, deps, options = {}) {
           images.push(...parallelResults)
         }
         const first = images[0]
-        const dualOutputSummary = buildDualOutputMarkdown({
+        let dualOutputSummary = buildDualOutputMarkdown({
           action: 'generated',
           filePath: first.path,
           width: first.width,
@@ -494,6 +515,9 @@ export function registerGenerationTools(ctx, deps, options = {}) {
           cost: first.cost,
           attachmentId: first.attachment?.attachmentId || 'N/A',
         })
+        if (first.qualityReport?.exhausted) {
+          dualOutputSummary += `\n\n> ⚠️ **Quality Gate Warning**: Visual quality checks failed after ${first.qualityReport.attempts || 3} attempts (${first.qualityReport.defect || 'defect detected'}). Image retained with potential defects.`
+        }
         return toLosslessJson({ summary: dualOutputSummary, channel: provider, provider, model: cfg.model || cfg.customModel, _fallback: first._fallback, anchor: activeAnchor ? { label: activeAnchor.label, mode: activeAnchor.mode } : undefined, ...first, images })
       },
     }),

package/lib/tools/inspect.js

@@ -35,7 +35,7 @@ export function registerInspectTools(ctx, deps, options = {}) {
           try {
             const a = await resolveSource(ctx, exec, args.image_a)
             const b = await resolveSource(ctx, exec, args.image_b)
-            return pixelDiff(a && a.bytes, b && b.bytes)
+            return await pixelDiff(a && a.bytes, b && b.bytes)
           } catch (err) {
             throw new Error(sanitizeErrorAndLogs(err.message || err))
           }
@@ -69,7 +69,7 @@ export function registerInspectTools(ctx, deps, options = {}) {
           try {
             const source = await resolveSource(ctx, exec, args.image)
             if (!source || !source.bytes) throw new Error('Image not found: ' + args.image)
-            const analysis = estimateSharpnessAndVariance(source.bytes)
+            const analysis = await estimateSharpnessAndVariance(source.bytes)
             const elementNote = args.expected_elements ? ` Verified presence of: ${args.expected_elements}.` : ''
             return {
               qualityScore: analysis.score,

package/lib/tools/pattern.js

@@ -99,11 +99,15 @@ export function registerPatternTools(ctx, deps) {
             const filePath = path.join(outDir, name)
             await writeFile(filePath, gen.bytes)
 
-            if (gen.bytes && gen.width && gen.height) {
-              const seamScore = scoreEdgeWrap(new Uint8Array(gen.bytes), gen.width, gen.height)
-              const tiled = tilePixels(new Uint8Array(gen.bytes), gen.width, gen.height, 4, 2, 2)
-              if (exec?.logger?.debug) {
-                exec.logger.debug(`[dsh-image-gen] Pattern seam score: ${seamScore}, 2x2 width: ${tiled.width}`)
+            if (gen.bytes) {
+              try {
+                const { scoreImageEdgeWrap } = await import('../pattern-helpers.js')
+                const seamScore = await scoreImageEdgeWrap(gen.bytes)
+                if (exec?.logger?.debug) {
+                  exec.logger.debug(`[dsh-image-gen] Pattern seam score: ${seamScore}`)
+                }
+              } catch (_e) {
+                // Non-fatal debug metric
               }
             }