@goodandready/dsh-image-gen 0.11.15 → 0.11.17

package/lib/client.js

@@ -3235,18 +3235,22 @@ window.__ModuleLoader__.load({
         )
       )
 
-      // Settings card item — sole slot registration for settings card (#208, #300)
-      registerSlotWhenReady('settings.plugin.item', () =>
-        ctx.slots.register(
-          {
-            name: 'settings.plugin.item',
-            key: SETTINGS_NS,
-            locale: NS,
-            inject: () => cardOnce().inject(),
-          },
-          (props) => react.createElement(ErrorBoundary, null, react.createElement(FalSettingsCard, props))
+      // Settings card — settings.plugin.item was retired before DSH 0.1.7-rc.2, so
+      // the card was mounted on no seat at all and had no configuration UI. Both
+      // seats below exist in 0.1.7-rc.2 and 0.2.0 (#208, #300).
+      for (const seat of ['plugins.item', 'plugins.row.config']) {
+        registerSlotWhenReady(seat, () =>
+          ctx.slots.register(
+            {
+              name: seat,
+              key: SETTINGS_NS,
+              locale: NS,
+              inject: () => cardOnce().inject(),
+            },
+            (props) => react.createElement(ErrorBoundary, null, react.createElement(FalSettingsCard, props))
+          )
         )
-      )
+      }
     }
     // -------------------------------------------------------------- Asset Vault View (#159, #304)
     function AssetVaultView(props) {

package/lib/index.js

@@ -73,9 +73,6 @@ export const name = '@goodandready/dsh-image-gen'
 /** Settings namespace the Web card edits. */
 const NS = 'dsh-image-gen'
 
-// The plugin was previously named dsh-fal-image-gen. Any settings saved
-// under the legacy namespace are read as fallback and migrated once on startup.
-const LEGACY_NS = 'dsh-fal-image-gen'
 export const inject = ['tools', 'attachments', 'credentials', 'webServer', 'settings', 'llm', 'systemPrompt']
 
 export function slugify(input) {
@@ -105,24 +102,6 @@ export async function resolveApiKey(ctx, ref) {
   return ''
 }
 
-/**
- * If the user configured the plugin under its old name (dsh-fal-image-gen), copy
- * those settings forward into dsh-image-gen once so existing keys and choices
- * are preserved. Only touches values that the user actually modified.
- */
-function migrateLegacySettings(sctx, scope) {
-  try {
-    if (!scope || typeof scope.update !== 'function') return
-    const legacyScope = sctx.settings.get?.(LEGACY_NS)
-    if (!legacyScope) return
-    const legacy = legacyScope.get?.()
-    if (!legacy || typeof legacy !== 'object') return
-    scope.update(structuredClone(legacy))
-  } catch (_) {
-    // Settings migration skipped — fallback to default schema configuration
-  }
-}
-
 /** Collect text chunks from llm.stream iterator.
  *  Canonical implementation lives in prompt-enhancer.js; re-exported for backwards compat. */
 export { collectText } from './prompt-enhancer.js'
@@ -167,7 +146,7 @@ export function apply(ctx, rawConfig) {
       return {
         get: () => live(),
         replace: async (next) => {
-          const parsed = Config(structuredClone(plainConfig(next)))
+          const parsed = plainConfig(Config(structuredClone(plainConfig(next))))
           currentLiveConfig = parsed
           const payload = volatileConfig(parsed)
           if (typeof svc.replace === 'function') {
@@ -178,7 +157,7 @@ export function apply(ctx, rawConfig) {
           return parsed
         },
         update: async (patch) => {
-          const merged = Config({ ...publicConfig(live()), ...plainConfig(patch) })
+          const merged = plainConfig(Config({ ...publicConfig(live()), ...plainConfig(patch) }))
           currentLiveConfig = merged
           const payload = volatileConfig(merged)
           if (typeof svc.update === 'function') {
@@ -197,29 +176,56 @@ export function apply(ctx, rawConfig) {
     return undefined
   }
 
+  let settingsSvc = null
+
+  const readServedConfig = () => {
+    if (typeof settingsSvc?.describe !== 'function') return null
+    try {
+      const row = settingsSvc.describe().find((r) => r?.ns === NS)
+      if (!row || row.status !== 'ready' || !row.value) return null
+      return Config(structuredClone(plainConfig(row.value)))
+    } catch (_) {
+      return null
+    }
+  }
+
+  const adoptServed = () => {
+    const next = readServedConfig()
+    if (!next) return false
+    currentLiveConfig = next
+    getConfig = () => currentLiveConfig || config
+    return true
+  }
+
   ctx.inject(['settings'], (sctx) => {
-    if (typeof sctx.settings?.register === 'function') {
-      const scope = sctx.settings.register(NS, Config, { base: config })
-      settingsApi = scope
-      migrateLegacySettings(sctx, scope)
-      getConfig = () => (scope?.get?.() ?? config) ?? config
-      sctx.effect(() => () => {
-        getConfig = () => config
-        settingsApi = undefined
-      })
-    } else {
-      settingsApi = createSettingsAdapter(sctx.settings)
-      if (typeof sctx.settings?.describe === 'function') {
+    settingsSvc = sctx.settings
+    settingsApi = createSettingsAdapter(sctx.settings)
+    adoptServed()
+    sctx.effect(() => () => {
+      getConfig = () => config
+      settingsApi = undefined
+    })
+  })
+
+  // DSH 0.1.7-rc.2 and 0.2.0 share this contract: the Loader re-merges volatile
+  // profile entries in place and announces it with loader/volatile-update.
+  // settings.register exists in neither release, so the branch that used it was
+  // dead code and the card's writes never reached the host.
+  if (typeof ctx.on === 'function') {
+    try {
+      ctx.on('loader/volatile-update', () => {
         try {
-          sctx.settings.describe(NS, Config)
-        } catch (_) { /* bestEffort */ }
-      }
-      sctx.effect(() => () => {
-        getConfig = () => config
-        settingsApi = undefined
+          adoptServed()
+        } catch (err) {
+          const msg = `[dsh-image-gen] settings refresh failed: ${err?.message || err}`
+          if (typeof ctx.logger?.warn === 'function') ctx.logger.warn(msg)
+        }
       })
+    } catch (err) {
+      const msg = `[dsh-image-gen] volatile-update subscription failed: ${err?.message || err}`
+      if (typeof ctx.logger?.warn === 'function') ctx.logger.warn(msg)
     }
-  })
+  }
 
   // Serve the stored image so the tool card can show it inline.
   const imageHandler = async (req, res) => {

package/lib/settings-route.js

@@ -103,7 +103,7 @@ export function registerSettingsRoutes(ctx, { live, getSettingsApi, setLiveConfi
 
       try {
         const base = plainConfig(live()) || {}
-        const merged = Config({ ...base, ...raw })
+        const merged = plainConfig(Config({ ...base, ...raw }))
         const settingsApi = getSettingsApi ? getSettingsApi() : null
         if (settingsApi && typeof settingsApi.replace === 'function') {
           await settingsApi.replace(merged)

package/package.json

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