@goodandready/dsh-image-gen 0.11.22 → 0.11.24

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/config-schema.js

@@ -186,9 +186,9 @@ export const Config = z.object({
     .default('GEMINI_API_KEY')
     .volatile(),
   localKind: z
-    .union([z.const('automatic1111'), z.const('a1111'), z.const('comfyui')])
-    .description('Local generation backend kind: "automatic1111" / "a1111" (WebUI) or "comfyui".')
-    .default('automatic1111')
+    .union([z.const('a1111'), z.const('comfyui'), z.const('automatic1111')])
+    .description('Local generation backend kind: "a1111" (WebUI) or "comfyui".')
+    .default('a1111')
     .volatile(),
   localBaseURL: 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".')
@@ -351,6 +379,29 @@ export function sanitizeRaw(raw) {
     }
     cleaned[k] = v
   }
+  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/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/providers/backends/custom.js

@@ -23,16 +23,27 @@ export function createCustomGenerator(deps, job) {
 
     // Empty key reference indicates unauthenticated gateway.
     const key = cfg.customKeyEnv ? await resolveKey(cfg.customKeyEnv) : ''
-    const headers = { 'Content-Type': 'application/json' }
+    const isEdit = Boolean(source && source.bytes)
+    const headers = {}
+    if (!isEdit) {
+      headers['Content-Type'] = 'application/json'
+    }
     if (key) headers.Authorization = `Bearer ${key}`
 
     // Omit response_format; modern models return either base64 or URL.
-    const endpoint = buildEndpointUrl(base, source ? 'images/edits' : 'images/generations')
+    const endpoint = buildEndpointUrl(base, isEdit ? 'images/edits' : 'images/generations')
     const res = await fetchImpl(endpoint, {
       method: 'POST',
       headers,
-      body: source
-        ? buildEditForm({ source, mask, prompt: promptArg, size: cfg.customSize || (aspectPixels ? aspectPixels.join('x') : SIZE_PIXELS[size]) || size, strength })
+      body: isEdit
+        ? buildEditForm({
+            model: cfg.customModel,
+            source,
+            mask,
+            prompt: promptArg,
+            size: cfg.customSize || (aspectPixels ? aspectPixels.join('x') : SIZE_PIXELS[size]) || size,
+            strength,
+          })
         : JSON.stringify({
             model: cfg.customModel,
             prompt: promptArg,

package/lib/providers/backends/local.js

@@ -24,7 +24,14 @@ export function createLocalGenerator(deps, job) {
     const base = String(cfg.localBaseURL || '').replace(/\/+$/, '')
     if (!base) throw new Error('Local image provider: server address is not configured (Settings → Image generation)')
     const [width, height] = pxSize(aspectPixels, size)
-    const kind = (cfg.localKind === 'a1111' || cfg.localKind === 'automatic1111') ? 'a1111' : 'comfyui'
+    const rawKind = cfg.localKind || 'a1111'
+    const kind = (rawKind === 'a1111' || rawKind === 'automatic1111')
+      ? 'a1111'
+      : (rawKind === 'comfyui' ? 'comfyui' : null)
+
+    if (!kind) {
+      throw new Error(`Unknown local generation backend kind "${rawKind}". Expected "a1111" or "comfyui".`)
+    }
 
     if (kind === 'a1111') {
       const isImg2Img = Boolean(source && source.bytes)

package/lib/providers/shared-helpers.js

@@ -86,8 +86,9 @@ export async function pollStatus(fetchImpl, statusUrl, key, signal, pollInterval
   }
 }
 
-export function buildEditForm({ source, mask, prompt, size, strength }) {
+export function buildEditForm({ source, mask, prompt, size, strength, model }) {
   const form = new FormData()
+  if (model) form.append('model', model)
   form.append('image', new Blob([source.bytes], { type: source.mediaType || 'image/png' }), 'source.png')
   if (mask) form.append('mask', new Blob([mask.bytes], { type: mask.mediaType || 'image/png' }), 'mask.png')
   form.append('prompt', prompt)

package/lib/register-tools.js

@@ -1,5 +1,6 @@
-// register-tools.js — orchestrates all image-gen tool registrations (#216, #337).
+// register-tools.js — orchestrates all image-gen tool registrations (#216, #337, #384).
 // Supports 'minimal' (default: <= 3 core tools), 'all' (all 30 tools), and 'custom' (toggled toolsets).
+// Reactively updates tool registrations when toolsetProfile or toolsets change.
 
 import { registerGenerationTools } from './tools/generation.js'
 import { registerProcessingTools } from './tools/processing-basic.js'
@@ -20,12 +21,16 @@ import { registerVisionOcrTools } from './tools/vision-ocr.js'
 import { registerDiagramTools } from './tools/diagram.js'
 
 /**
- * Registers every image-gen tool on the host tools service according to toolsetProfile (#337).
+ * Registers every image-gen tool on the host tools service according to toolsetProfile (#337, #384).
  *
  * @param {object} ctx cordis context
  * @param {object} deps shared runtime from apply()
+ * @returns {object} { sync, dispose, getRegisteredNames }
  */
 export function registerAllTools(ctx, deps) {
+  let activeDisposers = []
+  const registeredNames = new Set()
+
   const originalToolsRegister = ctx?.tools?.register ? ctx.tools.register.bind(ctx.tools) : null
   const wrappedTools = originalToolsRegister ? Object.create(ctx.tools, {
     register: {
@@ -41,7 +46,23 @@ export function registerAllTools(ctx, deps) {
             return originalExecute(args, exec)
           },
         }
-        return originalToolsRegister(wrappedDef)
+        const res = originalToolsRegister(wrappedDef)
+        registeredNames.add(def.name)
+        if (typeof res === 'function') {
+          activeDisposers.push(res)
+        } else {
+          activeDisposers.push(() => {
+            if (typeof ctx.tools?.unregister === 'function') {
+              ctx.tools.unregister(def.name)
+            } else if (typeof ctx.tools?.delete === 'function') {
+              ctx.tools.delete(def.name)
+            } else if (Array.isArray(ctx.tools?.list)) {
+              const idx = ctx.tools.list.findIndex((t) => t.name === def.name)
+              if (idx !== -1) ctx.tools.list.splice(idx, 1)
+            }
+          })
+        }
+        return res
       },
       writable: true,
       configurable: true,
@@ -51,47 +72,95 @@ export function registerAllTools(ctx, deps) {
   const targetCtx = originalToolsRegister ? Object.create(ctx, {
     tools: { value: wrappedTools, writable: true, configurable: true }
   }) : ctx
-  const cfg = typeof deps.live === 'function' ? deps.live() : (deps.config || {})
-  const profile = cfg.toolsetProfile || 'minimal'
-  const isAll = profile === 'all'
-  const sets = cfg.toolsets || {}
-  const design = isAll || Boolean(sets.design || cfg.toolsetDesign)
-  const processing = isAll || Boolean(sets.processing || cfg.toolsetProcessing)
-  const frontend = isAll || Boolean(sets.frontend || cfg.toolsetFrontend)
-  const creative = isAll || Boolean(sets.creative || cfg.toolsetCreative)
 
-  // 1. Core tools: generate_image, edit_image, inspect_image_quality (<= 3 tools in minimal)
-  registerGenerationTools(targetCtx, deps, { coreOnly: !creative })
-  registerEditingTools(targetCtx, deps, { coreOnly: !processing })
-  registerInspectTools(targetCtx, deps, { coreOnly: !processing })
+  function doRegister(cfg) {
+    const profile = cfg.toolsetProfile || 'minimal'
+    const isAll = profile === 'all'
+    const sets = cfg.toolsets || {}
+    const design = isAll || Boolean(sets.design || cfg.toolsetDesign)
+    const processing = isAll || Boolean(sets.processing || cfg.toolsetProcessing)
+    const frontend = isAll || Boolean(sets.frontend || cfg.toolsetFrontend)
+    const creative = isAll || Boolean(sets.creative || cfg.toolsetCreative)
+
+    // 1. Core tools: generate_image, edit_image, inspect_image_quality (<= 3 tools in minimal)
+    registerGenerationTools(targetCtx, deps, { coreOnly: !creative })
+    registerEditingTools(targetCtx, deps, { coreOnly: !processing })
+    registerInspectTools(targetCtx, deps, { coreOnly: !processing })
+
+    // 2. Processing toolset
+    if (processing) {
+      registerProcessingTools(targetCtx, deps)
+      registerProcessingAdvancedTools(targetCtx, deps)
+      registerVisionOcrTools(targetCtx, deps)
+    }
+
+    // 3. Design toolset
+    if (design) {
+      registerAnchorTools(targetCtx, deps)
+      registerUiAssetTools(targetCtx, deps)
+      registerStyleMatrixTools(targetCtx, deps)
+      registerThemePairTools(targetCtx, deps)
+      registerCharacterSheetTools(targetCtx, deps)
+      registerDiagramTools(targetCtx, deps)
+    }
 
-  // 2. Processing toolset
-  if (processing) {
-    registerProcessingTools(targetCtx, deps)
-    registerProcessingAdvancedTools(targetCtx, deps)
-    registerVisionOcrTools(targetCtx, deps)
+    // 4. Frontend toolset
+    if (frontend) {
+      registerFrontendTools(targetCtx, deps)
+      registerResponsiveTools(targetCtx, deps)
+    }
+
+    // 5. Creative toolset
+    if (creative) {
+      registerSketchTools(targetCtx, deps)
+      registerSpritesheetTools(targetCtx, deps)
+      registerPatternTools(targetCtx, deps)
+    }
   }
 
-  // 3. Design toolset
-  if (design) {
-    registerAnchorTools(targetCtx, deps)
-    registerUiAssetTools(targetCtx, deps)
-    registerStyleMatrixTools(targetCtx, deps)
-    registerThemePairTools(targetCtx, deps)
-    registerCharacterSheetTools(targetCtx, deps)
-    registerDiagramTools(targetCtx, deps)
+  function dispose() {
+    for (const d of activeDisposers) {
+      if (typeof d === 'function') {
+        try { d() } catch (err) {
+          // Disposer cleanup errors are safely ignored on tool rebuild
+        }
+      }
+    }
+    activeDisposers = []
+    registeredNames.clear()
   }
 
-  // 4. Frontend toolset
-  if (frontend) {
-    registerFrontendTools(targetCtx, deps)
-    registerResponsiveTools(targetCtx, deps)
+  function computeKey(cfg) {
+    const profile = cfg.toolsetProfile || 'minimal'
+    const isAll = profile === 'all'
+    const sets = cfg.toolsets || {}
+    return JSON.stringify({
+      profile,
+      design: isAll || Boolean(sets.design || cfg.toolsetDesign),
+      processing: isAll || Boolean(sets.processing || cfg.toolsetProcessing),
+      frontend: isAll || Boolean(sets.frontend || cfg.toolsetFrontend),
+      creative: isAll || Boolean(sets.creative || cfg.toolsetCreative),
+    })
   }
 
-  // 5. Creative toolset
-  if (creative) {
-    registerSketchTools(targetCtx, deps)
-    registerSpritesheetTools(targetCtx, deps)
-    registerPatternTools(targetCtx, deps)
+  let currentKey = ''
+  function sync() {
+    const currentCfg = typeof deps.live === 'function' ? deps.live() : (deps.config || {})
+    const key = computeKey(currentCfg)
+    if (key === currentKey) return
+    currentKey = key
+    dispose()
+    doRegister(currentCfg)
+  }
+
+  // Initial registration
+  const initialCfg = typeof deps.live === 'function' ? deps.live() : (deps.config || {})
+  currentKey = computeKey(initialCfg)
+  doRegister(initialCfg)
+
+  return {
+    sync,
+    dispose,
+    getRegisteredNames: () => Array.from(registeredNames),
   }
 }