@goodandready/dsh-image-gen 0.11.23 → 0.11.25

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/vault.js

@@ -1,5 +1,5 @@
 import { existsSync, unlinkSync } from 'node:fs'
-import { readHistory, writeHistory } from './history.js'
+import { readHistory, writeHistory, withHistoryLock } from './history.js'
 import { isTrustedLocalRequest } from './security.js'
 
 /**
@@ -133,24 +133,26 @@ export async function readBoundedRequestBody(req, maxBytes = MAX_VAULT_BODY_BYTE
 
 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' }
-  }
+  return await withHistoryLock(async () => {
+    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 */ }
-  }
+    const [entry] = entries.splice(idx, 1)
+    if (entry && entry.path) {
+      try {
+        unlinkSync(entry.path)
+      } catch (_err) { /* ignore missing file */ }
+      try {
+        unlinkSync(entry.path.replace(/\.[^.]+$/, '.json'))
+      } catch (_err) { /* ignore missing sidecar */ }
+    }
 
-  await writeHistory(entries)
-  return { success: true, id }
+    await writeHistory(entries)
+    return { success: true, id }
+  })
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-image-gen",
-  "version": "0.11.23",
+  "version": "0.11.25",
   "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",