@goodandready/dsh-image-gen 0.11.23 → 0.11.25

package/lib/attachment-helper.js

@@ -1,6 +1,6 @@
 import path from 'node:path'
 import { mkdir, writeFile } from 'node:fs/promises'
-import { saveAttachmentSafe, buildSidecar, toLosslessJson } from './providers.js'
+import { saveAttachmentSafe, buildSidecar, toLosslessJson, ensureImageFormat } from './providers.js'
 import { recordSpend } from './cost-meter.js'
 import { buildDualOutputMarkdown } from './resolve-image.js'
 
@@ -21,6 +21,10 @@ export async function saveAndAttachResult(ctx, exec, cfg, {
   args = {},
   action = 'generated',
 }) {
+  const targetFormat = format || (mediaType ? mediaType.replace('image/', '') : undefined)
+  const formatted = await ensureImageFormat(bytes, targetFormat, { fallbackMime: mediaType })
+  bytes = formatted.bytes
+  mediaType = formatted.mediaType
   const { attachment, localUrl } = await saveAttachmentSafe(ctx, { bytes, mediaType, name })
 
   const sessionCwd = exec?.agent?.session?.header?.cwd

package/lib/client.js

@@ -264,6 +264,40 @@ window.__ModuleLoader__.load({
       }
     }
 
+    function arrayField(field) {
+      return {
+        field,
+        format: (value) => (Array.isArray(value) ? value.join(', ') : typeof value === 'string' ? value : ''),
+        parse: (text) => {
+          if (text === '') return { kind: 'clear' }
+          const items = text.split(',').map((s) => s.trim()).filter(Boolean)
+          return { kind: 'set', value: items }
+        },
+      }
+    }
+
+    function jsonField(field) {
+      return {
+        field,
+        format: (value) => {
+          if (typeof value === 'string') return value
+          if (value && typeof value === 'object') {
+            try { return JSON.stringify(value, null, 2) } catch { return '' }
+          }
+          return ''
+        },
+        parse: (text) => {
+          if (text === '') return { kind: 'clear' }
+          try {
+            JSON.parse(text)
+            return { kind: 'set', value: text }
+          } catch (_) {
+            return void 0
+          }
+        },
+      }
+    }
+
     const PROVIDERS = ['fal', 'custom', 'codex', 'grok', 'local', 'seedream', 'gemini', 'replicate']
     const IMAGE_SIZES = ['landscape_4_3', 'landscape_16_9', 'portrait_4_3', 'portrait_16_9', 'square', 'square_hd']
     const OUTPUT_FORMATS = ['png', 'jpeg', 'webp']
@@ -328,10 +362,11 @@ window.__ModuleLoader__.load({
       // Backward-compat aliases for tests
       { field: 'localComfyUrl', spec: textField('localComfyUrl'), kind: 'text', labelKey: 'f.localComfyUrl', hintKey: 'f.localComfyUrlHint', placeholderKey: 'p.localComfyUrl', when: ['local'], tab: 'provider' },
       { field: 'localA1111Url', spec: textField('localA1111Url'), kind: 'text', labelKey: 'f.localA1111Url', hintKey: 'f.localA1111UrlHint', placeholderKey: 'p.localA1111Url', when: ['local'], tab: 'provider' },
+      { field: 'comfyWorkflowJson', spec: jsonField('comfyWorkflowJson'), kind: 'text', labelKey: 'f.comfyWorkflowJson', hintKey: 'f.comfyWorkflowJsonHint', placeholderKey: 'p.comfyWorkflowJson', when: ['local'], tab: 'provider' },
 
       // Provider: Codex / Grok
       { field: 'subscriptionQuality', spec: selectField('subscriptionQuality', ['', 'low', 'medium', 'high']), kind: 'select', options: ['', 'low', 'medium', 'high'], labelKey: 'f.subscriptionQuality', hintKey: 'f.subscriptionQualityHint', when: ['codex', 'grok'], tab: 'provider' },
-      { field: 'fallbackProviders', spec: textField('fallbackProviders'), kind: 'text', labelKey: 'f.fallbackProviders', hintKey: 'f.fallbackProvidersHint', placeholderKey: 'p.fallbackProviders', tab: 'provider' },
+      { field: 'fallbackProviders', spec: arrayField('fallbackProviders'), kind: 'text', labelKey: 'f.fallbackProviders', hintKey: 'f.fallbackProvidersHint', placeholderKey: 'p.fallbackProviders', tab: 'provider' },
 
       // Enhancer & Style
       { field: 'autoEnhancePrompt', spec: booleanField('autoEnhancePrompt'), kind: 'select', options: ['true', 'false'], labelKey: 'f.autoEnhancePrompt', hintKey: 'f.autoEnhancePromptHint', tab: 'enhancer' },
@@ -2548,6 +2583,9 @@ window.__ModuleLoader__.load({
       'f.localA1111Url': 'Local A1111 URL (Legacy)',
       'f.localA1111UrlHint': 'Direct Automatic1111 endpoint URL.',
       'p.localA1111Url': 'http://127.0.0.1:7860',
+      'f.comfyWorkflowJson': 'ComfyUI Workflow JSON',
+      'f.comfyWorkflowJsonHint': 'Custom ComfyUI API workflow graph (JSON) with {{prompt}} placeholders.',
+      'p.comfyWorkflowJson': '{"3": {"class_type": "KSampler", ...}}',
 
       'f.subscriptionQuality': 'Subscription Quality',
       'f.subscriptionQualityHint': 'Target quality profile when using Codex or Grok subscriptions.',
@@ -2824,6 +2862,9 @@ window.__ModuleLoader__.load({
       'f.localA1111Url': '本地 A1111 地址 (Legacy)',
       'f.localA1111UrlHint': '直接指向 Automatic1111 的服务地址。',
       'p.localA1111Url': 'http://127.0.0.1:7860',
+      'f.comfyWorkflowJson': 'ComfyUI 工作流 JSON',
+      'f.comfyWorkflowJsonHint': '包含 {{prompt}} 等占位符的自定义 ComfyUI API 工作流 JSON。',
+      'p.comfyWorkflowJson': '{"3": {"class_type": "KSampler", ...}}',
 
       'f.subscriptionQuality': '订阅质量',
       'f.subscriptionQualityHint': 'Codex 或 Grok 订阅通道的质量档位。',
@@ -3009,31 +3050,80 @@ window.__ModuleLoader__.load({
           const target = activeTarget || resolveActiveScope(ctx)
           const snap = target?.getSnapshot ? target.getSnapshot() : null
           if (snap?.status === 'ready' && snap.writable && target.set) return target.set(key, val)
+          const prevValue = httpSnapshot.value
           httpSnapshot = { ...httpSnapshot, value: { ...httpSnapshot.value, [key]: val } }
           notify()
           try {
-            await fetch('/dsh-image-gen/config', {
+            const res = await fetch('/dsh-image-gen/config', {
               method: 'PUT',
               headers: { 'Content-Type': 'application/json' },
               body: JSON.stringify({ [key]: val }),
             })
-          } catch { /* ignore */ }
+            if (!res.ok) {
+              let errText = `Failed to update setting (HTTP ${res.status})`
+              try {
+                const errData = await res.json()
+                if (errData?.error) errText = errData.error
+              } catch { /* ignore */ }
+              httpSnapshot = { ...httpSnapshot, value: prevValue }
+              notify()
+              throw new Error(errText)
+            }
+            const data = await res.json()
+            if (!data.ok) {
+              httpSnapshot = { ...httpSnapshot, value: prevValue }
+              notify()
+              throw new Error(data.error || 'Failed to update setting')
+            }
+            if (data.config) {
+              httpSnapshot = { status: 'ready', writable: true, value: data.config }
+              notify()
+            }
+            return data
+          } catch (err) {
+            httpSnapshot = { ...httpSnapshot, value: prevValue }
+            notify()
+            throw err
+          }
         },
         async delete(key) {
           const target = activeTarget || resolveActiveScope(ctx)
           const snap = target?.getSnapshot ? target.getSnapshot() : null
-          if (snap?.status === 'ready' && snap.writable && target.delete) return target.delete(key)
+          if (snap?.status === 'ready' && snap.writable && (target.delete || target.reset)) {
+            if (target.delete) return target.delete(key)
+            if (target.reset) return target.reset(key)
+          }
+          const prevValue = httpSnapshot.value
           const nextVal = { ...httpSnapshot.value }
           delete nextVal[key]
           httpSnapshot = { ...httpSnapshot, value: nextVal }
           notify()
           try {
-            await fetch('/dsh-image-gen/config', {
+            const res = await fetch('/dsh-image-gen/config', {
               method: 'PUT',
               headers: { 'Content-Type': 'application/json' },
-              body: JSON.stringify({ [key]: undefined }),
+              body: JSON.stringify({ resetFields: [key] }),
             })
-          } catch { /* ignore */ }
+            if (!res.ok) {
+              httpSnapshot = { ...httpSnapshot, value: prevValue }
+              notify()
+              throw new Error(`Failed to reset setting (HTTP ${res.status})`)
+            }
+            const data = await res.json()
+            if (!data.ok) {
+              httpSnapshot = { ...httpSnapshot, value: prevValue }
+              notify()
+              throw new Error(data.error || 'Failed to reset setting')
+            }
+            if (data.config) {
+              httpSnapshot = { status: 'ready', writable: true, value: data.config }
+              notify()
+            }
+          } catch (err) {
+            httpSnapshot = { ...httpSnapshot, value: prevValue }
+            notify()
+            throw err
+          }
         },
         subscribe(fn) {
           listeners.add(fn)

package/lib/commands.js

@@ -85,11 +85,14 @@ export function registerImageCommand(ctx, deps) {
       const size = flags.size || cfg.defaultSize || 'square'
       const format = flags.format || cfg.defaultFormat || 'png'
       const aspectRatio = flags.aspect || flags.aspect_ratio || cfg.defaultAspectRatio
-      const effectiveStyle = flags.style || cfg.stylePreset
+      const effectivePreset = (flags.style_preset !== undefined && flags.style_preset !== null && flags.style_preset !== '')
+        ? flags.style_preset
+        : (flags.style || cfg.stylePreset || cfg.defaultStylePreset)
       const seed = flags.seed ? Number(flags.seed) : Math.floor(Math.random() * 2147483647)
 
-      const styleInfo = resolveStylePreset(effectiveStyle, flags.negative_prompt, flags.guidance_scale)
-      const effectivePrompt = applyStylePreset(prompt, effectiveStyle)
+      const styleInfo = resolveStylePreset(effectivePreset, flags.negative_prompt, flags.guidance_scale)
+      const effectivePrompt = styleInfo.promptSuffix ? `${prompt}, ${styleInfo.promptSuffix}` : prompt
+      const effectiveNegative = styleInfo.negativePrompt || flags.negative_prompt || cfg.negativePrompt
 
       const job = {
         prompt: effectivePrompt,
@@ -99,6 +102,9 @@ export function registerImageCommand(ctx, deps) {
         aspectPixels: aspectRatio ? ASPECT_RATIOS[aspectRatio] : undefined,
         seed,
         signal: invocation?.signal,
+        negativePrompt: effectiveNegative,
+        guidanceScale: styleInfo.guidanceScale ?? flags.guidance_scale,
+        style: flags.style,
       }
 
       const pdeps = {

package/lib/config-schema.js

@@ -176,8 +176,8 @@ export const Config = z.object({
     .volatile(),
   geminiModel: z
     .string()
-    .description('Google Gemini Imagen model identifier.')
-    .default('imagen-3.0-generate-002')
+    .description('Google Gemini image generation model identifier.')
+    .default('gemini-2.0-flash-exp-image-generation')
     .volatile(),
   geminiKeyEnv: z
     .string()
@@ -215,6 +215,34 @@ export const Config = z.object({
     .description('CFG scale for local generation.')
     .default(7.0)
     .volatile(),
+  comfyWorkflowJson: z
+    .string()
+    .description('Custom ComfyUI API workflow JSON template with {{prompt}}, {{seed}}, etc. placeholders.')
+    .default('')
+    .volatile(),
+  localComfyUrl: z
+    .string()
+    .description('Legacy alias for ComfyUI URL.')
+    .default('')
+    .volatile(),
+  localA1111Url: z
+    .string()
+    .description('Legacy alias for A1111 URL.')
+    .default('')
+    .volatile(),
+  enableLlmEnhancer: z
+    .boolean()
+    .description('Legacy alias for enhancePrompt.')
+    .default(false)
+    .volatile(),
+  cacheTtlDays: z
+    .number()
+    .min(0)
+    .max(3650)
+    .step(1)
+    .description('Legacy alias for pruneDays.')
+    .default(0)
+    .volatile(),
   subscriptionQuality: z
     .string()
     .description('Image quality tier for subscription accounts: "standard" or "hd".')
@@ -354,6 +382,26 @@ export function sanitizeRaw(raw) {
   if (cleaned.localKind === 'automatic1111') {
     cleaned.localKind = 'a1111'
   }
+  // Coerce string fallbackProviders to array (#369)
+  if (typeof cleaned.fallbackProviders === 'string') {
+    cleaned.fallbackProviders = cleaned.fallbackProviders
+      .split(',')
+      .map((s) => s.trim())
+      .filter(Boolean)
+  }
+  // Migrate legacy fields (#369)
+  if (cleaned.localComfyUrl && !cleaned.localBaseURL && cleaned.localKind === 'comfyui') {
+    cleaned.localBaseURL = cleaned.localComfyUrl
+  }
+  if (cleaned.localA1111Url && !cleaned.localBaseURL && cleaned.localKind === 'a1111') {
+    cleaned.localBaseURL = cleaned.localA1111Url
+  }
+  if (typeof cleaned.enableLlmEnhancer === 'boolean' && cleaned.enhancePrompt === undefined) {
+    cleaned.enhancePrompt = cleaned.enableLlmEnhancer
+  }
+  if (typeof cleaned.cacheTtlDays === 'number' && cleaned.cacheTtlDays > 0 && cleaned.pruneDays === undefined) {
+    cleaned.pruneDays = cleaned.cacheTtlDays
+  }
   return cleaned
 }
 

package/lib/generation-helpers.js

@@ -13,6 +13,7 @@ import {
   embedPngMetadata,
   resolveStylePreset,
   saveAttachmentSafe,
+  ensureImageFormat,
 } from './providers.js'
 import { enhancePrompt } from './prompt-enhancer.js'
 import { buildFaceConsistencyPrompt, getSessionAnchor, applyAnchorPromptHints } from './anchor-helpers.js'
@@ -23,6 +24,7 @@ import {
   readHistory,
   writeHistory,
   pruneHistory,
+  appendHistoryEntry,
 } from './history.js'
 
 /** Run an array of async task functions with a concurrency cap */
@@ -62,8 +64,10 @@ export function validateGenerationParams(cfg, args) {
 /** 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)
+  const candidatePreset = (args.style_preset !== undefined && args.style_preset !== null && args.style_preset !== '')
+    ? args.style_preset
+    : (cfg.stylePreset || cfg.defaultStylePreset)
+  const styleInfo = resolveStylePreset(candidatePreset, args.negative_prompt, args.guidance_scale)
   let effectivePrompt = styleInfo.promptSuffix ? `${enhanced.prompt}, ${styleInfo.promptSuffix}` : enhanced.prompt
   let effectiveNegative = styleInfo.negativePrompt
   const activeAnchor = getSessionAnchor(sessionId)
@@ -132,8 +136,10 @@ export async function saveGeneratedImageArtifact({
   estimatedCost,
   totalCount,
 }) {
-  const mediaType = gen.mediaType || 'image/png'
-  let bytes = gen.bytes
+  const targetFormat = format || (args.output_format || cfg.defaultFormat)
+  const formatted = await ensureImageFormat(gen.bytes, targetFormat, { fallbackMime: gen.mediaType })
+  let bytes = formatted.bytes
+  const mediaType = formatted.mediaType || 'image/png'
   if (mediaType === 'image/png') {
     bytes = embedPngMetadata(bytes, {
       prompt: promptArg,
@@ -189,7 +195,10 @@ export async function saveGeneratedImageArtifact({
     prompt: promptArg,
     seed: gen.seed,
     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: format || args.output_format || cfg.defaultFormat || 'png',
     aspectRatio: args.aspect_ratio || cfg.defaultAspectRatio,
     negativePrompt: args.negative_prompt || cfg.negativePrompt,
@@ -229,13 +238,10 @@ export async function saveGeneratedImageArtifact({
     attachmentId: attachment.attachmentId,
   }
   // Save to history (#385: historyLimit=0 skips history retention; bounds guard against negative values)
+  // #365: Atomic transaction with file lock prevents read-modify-write race during concurrent batches
   const historyLimit = typeof cfg.historyLimit === 'number' ? Math.max(0, Math.floor(cfg.historyLimit)) : 50
   if (historyLimit > 0) {
-    let current = await readHistory()
-    current = await pruneHistory(current, cfg.pruneDays)
-    current.unshift(entry)
-    if (current.length > historyLimit) current.length = historyLimit
-    await writeHistory(current)
+    await appendHistoryEntry(entry, { pruneDays: cfg.pruneDays, historyLimit })
   }
 
   // #167: Record spend in cost meter

package/lib/history.js

@@ -1,9 +1,30 @@
 import path from 'node:path'
 import os from 'node:os'
 import { existsSync, unlinkSync, chmodSync, readdirSync, statSync } from 'node:fs'
-import { readFile, writeFile, mkdir } from 'node:fs/promises'
+import { readFile, mkdir } from 'node:fs/promises'
+import { withFileLock, writeFileAtomic } from '@deepseek-ai/dsh-atomic-write'
 import { enforceSecurePermissions } from './security.js'
 
+let inMemoryLockQueue = Promise.resolve()
+
+/** Execute an operation with in-process queue + cross-process file lock (#365) */
+export async function withHistoryLock(operation, options = { waitMs: 5000 }) {
+  const file = historyFile()
+  const dir = path.dirname(file)
+  try {
+    await mkdir(dir, { recursive: true, mode: 0o700 })
+    try { chmodSync(dir, 0o700) } catch (_err) { /* non-fatal permission repair */ }
+  } catch (_err) { /* non-fatal mkdir */ }
+
+  const runWithLocks = async () => {
+    return await withFileLock(file, operation, options)
+  }
+
+  const next = inMemoryLockQueue.then(runWithLocks, runWithLocks)
+  inMemoryLockQueue = next.catch(() => {})
+  return await next
+}
+
 export function historyFile() {
   return path.join(process.env.DSH_HOME || path.join(os.homedir(), '.dsh'), 'dsh-image-gen', 'history.json')
 }
@@ -104,21 +125,50 @@ export async function readHistory() {
     const raw = await readFile(historyFile(), 'utf-8')
     const parsed = JSON.parse(raw)
     return Array.isArray(parsed) ? parsed : []
-  } catch (e) {
+  } catch (_e) {
     return []
   }
 }
 
-/** Save history to disk file (atomic overwrite). */
+/** Save history to disk file (atomic overwrite with 0600 mode via dsh-atomic-write). */
 export async function writeHistory(entries) {
   try {
     const file = historyFile()
     const dir = path.dirname(file)
     await mkdir(dir, { recursive: true, mode: 0o700 })
     try { chmodSync(dir, 0o700) } catch (_err) { /* non-fatal permission repair */ }
-    await writeFile(file, JSON.stringify(entries, null, 2), { mode: 0o600 })
+    await writeFileAtomic(file, JSON.stringify(entries, null, 2), {
+      mode: 0o600,
+      dirMode: 0o700,
+    })
     enforceSecurePermissions(file)
-  } catch (e) { /* history write failure is non-fatal */ }
+  } catch (_e) { /* history write failure is non-fatal */ }
+}
+
+/**
+ * Atomically append an entry to history, running read -> prune -> unshift -> write
+ * under an exclusive lock transaction (#365).
+ */
+export async function appendHistoryEntry(entry, { pruneDays = 0, historyLimit = 50 } = {}) {
+  if (!entry || historyLimit <= 0) return []
+  return await withHistoryLock(async () => {
+    let current = await readHistory()
+    if (pruneDays > 0) {
+      current = await pruneHistory(current, pruneDays)
+    }
+    const existingIdx = current.findIndex(
+      (e) => (entry.attachmentId && e.attachmentId === entry.attachmentId) || (entry.path && e.path === entry.path)
+    )
+    if (existingIdx !== -1) {
+      current.splice(existingIdx, 1)
+    }
+    current.unshift(entry)
+    if (current.length > historyLimit) {
+      current.length = historyLimit
+    }
+    await writeHistory(current)
+    return current
+  })
 }
 
 /** Filter entries whose files exist on disk; newest first. */

package/lib/index.js

@@ -114,6 +114,74 @@ export { buildEnhancePromptSystemMessage } from './prompt-enhancer.js'
  *  Canonical implementation lives in prompt-enhancer.js; re-exported for backwards compat. */
 export { enhancePrompt } from './prompt-enhancer.js'
 
+export function createSettingsAdapter(svc, { ns = NS, getLive = () => ({}), setLive = () => {} } = {}) {
+  if (!svc) return undefined
+  if (typeof svc.replace === 'function' || typeof svc.update === 'function' || typeof svc.mutate === 'function') {
+    const getRevision = () => {
+      try {
+        return svc.describe?.().find((row) => row.ns === ns)?.revision
+      } catch (_) {
+        return undefined
+      }
+    }
+    return {
+      get: () => getLive(),
+      replace: async (next) => {
+        const parsed = plainConfig(Config(structuredClone(plainConfig(next))))
+        const payload = volatileConfig(parsed)
+        if (typeof svc.replace === 'function') {
+          await svc.replace(ns, payload, getRevision())
+        } else if (typeof svc.update === 'function') {
+          await svc.update(ns, payload, getRevision())
+        } else if (typeof svc.mutate === 'function') {
+          await svc.mutate(ns, payload, getRevision())
+        } else {
+          throw new Error('Settings service has no replace, update, or mutate method')
+        }
+        setLive(parsed)
+        return parsed
+      },
+      update: async (patch) => {
+        const merged = plainConfig(Config({ ...publicConfig(getLive()), ...plainConfig(patch) }))
+        const payload = volatileConfig(merged)
+        if (typeof svc.update === 'function') {
+          await svc.update(ns, payload, getRevision())
+        } else if (typeof svc.replace === 'function') {
+          await svc.replace(ns, payload, getRevision())
+        } else if (typeof svc.mutate === 'function') {
+          await svc.mutate(ns, payload, getRevision())
+        } else {
+          throw new Error('Settings service has no update, replace, or mutate method')
+        }
+        setLive(merged)
+        return merged
+      },
+      delete: async (key) => {
+        const base = structuredClone(plainConfig(getLive()) || {})
+        delete base[key]
+        const merged = plainConfig(Config(base))
+        const payload = volatileConfig(merged)
+        if (typeof svc.replace === 'function') {
+          await svc.replace(ns, payload, getRevision())
+        } else if (typeof svc.update === 'function') {
+          await svc.update(ns, payload, getRevision())
+        } else if (typeof svc.mutate === 'function') {
+          await svc.mutate(ns, payload, getRevision())
+        } else {
+          throw new Error('Settings service has no replace, update, or mutate method')
+        }
+        setLive(merged)
+        return merged
+      },
+      watch: (cb) => {
+        if (typeof svc.watch === 'function') return svc.watch(cb)
+        return () => {}
+      },
+    }
+  }
+  return undefined
+}
+
 export function apply(ctx, rawConfig) {
   const config = ensureConfig(rawConfig)
   const baseConfig = plainConfig(config)
@@ -130,50 +198,18 @@ export function apply(ctx, rawConfig) {
 
   let settingsApi
   let currentLiveConfig = null
+  let toolController = null
   let getConfig = () => currentLiveConfig || config
   const live = () => plainConfig(getConfig() ?? {})
 
-  const createSettingsAdapter = (svc) => {
-    if (!svc) return undefined
-    if (typeof svc.replace === 'function' || typeof svc.update === 'function' || typeof svc.mutate === 'function') {
-      const getRevision = () => {
-        try {
-          return svc.describe?.().find((row) => row.ns === NS)?.revision
-        } catch (_) {
-          return undefined
-        }
-      }
-      return {
-        get: () => live(),
-        replace: async (next) => {
-          const parsed = plainConfig(Config(structuredClone(plainConfig(next))))
-          currentLiveConfig = parsed
-          const payload = volatileConfig(parsed)
-          if (typeof svc.replace === 'function') {
-            await svc.replace(NS, payload, getRevision())
-          } else if (typeof svc.update === 'function') {
-            await svc.update(NS, payload, getRevision())
-          }
-          return parsed
-        },
-        update: async (patch) => {
-          const merged = plainConfig(Config({ ...publicConfig(live()), ...plainConfig(patch) }))
-          currentLiveConfig = merged
-          const payload = volatileConfig(merged)
-          if (typeof svc.update === 'function') {
-            await svc.update(NS, payload, getRevision())
-          } else if (typeof svc.replace === 'function') {
-            await svc.replace(NS, payload, getRevision())
-          }
-          return merged
-        },
-        watch: (cb) => {
-          if (typeof svc.watch === 'function') return svc.watch(cb)
-          return () => {}
-        },
+  const onConfigUpdated = () => {
+    try {
+      toolController?.sync?.()
+    } catch (err) {
+      if (typeof ctx.logger?.warn === 'function') {
+        ctx.logger.warn(`[dsh-image-gen] reactive tool sync failed: ${err?.message || err}`)
       }
     }
-    return undefined
   }
 
   let settingsSvc = null
@@ -194,12 +230,20 @@ export function apply(ctx, rawConfig) {
     if (!next) return false
     currentLiveConfig = next
     getConfig = () => currentLiveConfig || config
+    onConfigUpdated()
     return true
   }
 
   ctx.inject(['settings'], (sctx) => {
     settingsSvc = sctx.settings
-    settingsApi = createSettingsAdapter(sctx.settings)
+    settingsApi = createSettingsAdapter(sctx.settings, {
+      ns: NS,
+      getLive: live,
+      setLive: (c) => {
+        currentLiveConfig = c
+        onConfigUpdated()
+      },
+    })
     adoptServed()
     sctx.effect(() => () => {
       getConfig = () => config
@@ -291,7 +335,10 @@ export function apply(ctx, rawConfig) {
   registerSettingsRoutes(ctx, {
     live,
     getSettingsApi: () => settingsApi,
-    setLiveConfig: (c) => { currentLiveConfig = c },
+    setLiveConfig: (c) => {
+      currentLiveConfig = c
+      onConfigUpdated()
+    },
   })
 
   // One-click plugin updater route per DSH standard
@@ -398,7 +445,7 @@ export function apply(ctx, rawConfig) {
     resolveApiKey,
   })
 
-  registerAllTools(ctx, {
+  toolController = registerAllTools(ctx, {
     config: baseConfig,
     live,
     saveAndAttachResult,
@@ -406,4 +453,8 @@ export function apply(ctx, rawConfig) {
     slugify,
     resolveApiKey,
   })
+
+  ctx.effect(() => () => {
+    toolController?.dispose?.()
+  }, 'dsh-image-gen: tool registration cleanup')
 }

package/lib/provider-utils.js

@@ -117,6 +117,7 @@ export function computeGenerationHash({
   seed,
   size,
   style,
+  stylePreset,
   format,
   aspectRatio,
   negativePrompt,
@@ -144,6 +145,7 @@ export function computeGenerationHash({
     String(seed ?? ''),
     String(size || '').trim().toLowerCase(),
     String(style || '').trim().toLowerCase(),
+    String(stylePreset || '').trim().toLowerCase(),
     String(format || '').trim().toLowerCase(),
     String(aspectRatio || '').trim().toLowerCase(),
     String(negativePrompt || '').trim(),