@goodandready/dsh-image-gen 0.11.0 → 0.11.2

package/lib/client.js

@@ -1751,27 +1751,25 @@ window.__ModuleLoader__.load({
           onLoad: () => setLoaded(true),
         }) : null
       )
-    }// 105-inpaint-canvas.js — Interactive in-chat canvas drawing overlay for inpainting (#285).
+    }// 105-inpaint-canvas.js — Interactive in-chat canvas drawing overlay for inpainting (#285, #301).
 
-    function InpaintCanvasOverlay({ react, t, parsed, onClose }) {
+    function InpaintCanvas(props) {
+      const { imgUrl, targetRef, onClose, t } = props
       const canvasRef = react.useRef(null)
       const isDrawingRef = react.useRef(false)
+      const undoStackRef = react.useRef([])
       const [brushSize, setBrushSize] = react.useState(24)
-      const [toolMode, setToolMode] = react.useState('brush')
-      const [inpaintPrompt, setInpaintPrompt] = react.useState('')
-      const [copied, setCopied] = react.useState(false)
+      const [toolMode, setToolMode] = react.useState('brush') // 'brush' | 'eraser'
       const [hasStrokes, setHasStrokes] = react.useState(false)
-      const undoStackRef = react.useRef([])
-
-      const imgUrl = (parsed && (parsed.url || (parsed.attachment && attachmentImageUrl(parsed.attachment)))) || ''
-      const targetRef = (parsed && (parsed.attachment?.attachmentId || parsed.path || parsed.url)) || 'current image'
+      const [copied, setCopied] = react.useState(false)
+      const [inpaintPrompt, setInpaintPrompt] = react.useState('')
 
       const initCanvas = react.useCallback(() => {
         const canvas = canvasRef.current
         if (!canvas) return
         const ctx = canvas.getContext('2d')
         if (!ctx) return
-        ctx.fillStyle = '#000000'
+        ctx.fillStyle = 'black'
         ctx.fillRect(0, 0, canvas.width, canvas.height)
         undoStackRef.current = [ctx.getImageData(0, 0, canvas.width, canvas.height)]
       }, [])
@@ -1780,9 +1778,7 @@ window.__ModuleLoader__.load({
         initCanvas()
       }, [initCanvas])
 
-      function getPos(e) {
-        const canvas = canvasRef.current
-        if (!canvas) return { x: 0, y: 0 }
+      function getPos(e, canvas) {
         const rect = canvas.getBoundingClientRect()
         const clientX = e.touches ? e.touches[0].clientX : e.clientX
         const clientY = e.touches ? e.touches[0].clientY : e.clientY
@@ -1796,42 +1792,40 @@ window.__ModuleLoader__.load({
 
       function startDraw(e) {
         if (e.touches && e.touches.length > 1) return
-        e.preventDefault()
         const canvas = canvasRef.current
         if (!canvas) return
         const ctx = canvas.getContext('2d')
         if (!ctx) return
-
         isDrawingRef.current = true
-        const pos = getPos(e)
+        const pos = getPos(e, canvas)
+        ctx.beginPath()
+        ctx.moveTo(pos.x, pos.y)
         ctx.lineWidth = brushSize
         ctx.lineCap = 'round'
         ctx.lineJoin = 'round'
-        const color = toolMode === 'eraser' ? '#000000' : '#ffffff'
+        const color = toolMode === 'eraser' ? 'black' : 'white'
         ctx.strokeStyle = color
         ctx.fillStyle = color
 
-        ctx.beginPath()
         ctx.arc(pos.x, pos.y, brushSize / 2, 0, Math.PI * 2)
         ctx.fill()
         ctx.beginPath()
         ctx.moveTo(pos.x, pos.y)
+        setHasStrokes(true)
       }
 
       function draw(e) {
         if (!isDrawingRef.current) return
         if (e.touches && e.touches.length > 1) return
-        e.preventDefault()
         const canvas = canvasRef.current
         if (!canvas) return
         const ctx = canvas.getContext('2d')
         if (!ctx) return
-
-        const pos = getPos(e)
+        const pos = getPos(e, canvas)
         ctx.lineWidth = brushSize
         ctx.lineCap = 'round'
         ctx.lineJoin = 'round'
-        const color = toolMode === 'eraser' ? '#000000' : '#ffffff'
+        const color = toolMode === 'eraser' ? 'black' : 'white'
         ctx.strokeStyle = color
         ctx.lineTo(pos.x, pos.y)
         ctx.stroke()
@@ -2005,7 +1999,7 @@ window.__ModuleLoader__.load({
               borderRadius: '8px',
               overflow: 'hidden',
               border: '1px solid var(--dsw-alias-border-l2)',
-              background: '#000000',
+              background: 'black',
               margin: '4px 0',
               userSelect: 'none',
               touchAction: 'none',
@@ -2071,9 +2065,11 @@ window.__ModuleLoader__.load({
         )
       )
     }
-// 106-style-matrix-view.js — 2×2 Style Matrix toolview with Blind A/B Compare (#286).
+    var InpaintCanvasOverlay = InpaintCanvas
+// 106-style-matrix-view.js — 2×2 Style Matrix toolview with Blind A/B Compare (#286, #297, #301).
 
     function StyleMatrixCard(props) {
+      const t = props.t || ((k) => k)
       const block = props.block || {}
       const parsed = react.useMemo(() => {
         const raw = block.output || block.text || ''
@@ -2166,7 +2162,7 @@ window.__ModuleLoader__.load({
               left: 0,
               right: 0,
               bottom: 0,
-              background: 'rgba(0,0,0,0.85)',
+              background: 'var(--dsw-alias-bg-overlay, rgb(0 0 0 / 85%))',
               display: 'flex',
               alignItems: 'center',
               justifyContent: 'center',
@@ -2183,8 +2179,8 @@ window.__ModuleLoader__.load({
         ) : null
       )
     }
-    // -------------------------------------------------------------- Theme Pair Toolview (#189)
-    function ThemePairToolView(props) {
+    // -------------------------------------------------------------- Theme Pair Toolview (#189, #296)
+    function ThemePairView(props) {
       const block = props.block
       const t = props.t || ((k) => k)
       const [copiedHtml, setCopiedHtml] = react.useState(false)
@@ -2285,11 +2281,14 @@ window.__ModuleLoader__.load({
           ) : null
         ) : null
       )
-    }    const en = {
+    }
+    var ThemePairToolView = ThemePairView
+    const en = {
       'settings.navLabel': 'Image Studio',
       'settings.title': 'Image Studio',
       'settings.description': 'AI Image generation, inpainting, variations, upscale & vectorization.',
-      'settings.unavailable': 'Plugin settings are initializing. They will appear automatically in a few seconds.',
+      'settings.unavailable': 'Plugin settings are unavailable: the host settings namespace is not ready.',
+      'settings.loading': 'Loading plugin settings…',
       'settings.unsaved': 'Unsaved changes',
       'settings.saving': 'Saving…',
       'settings.save': 'Save settings',
@@ -2602,6 +2601,7 @@ window.__ModuleLoader__.load({
       'settings.reset': '重置',
       'settings.invalidNumber': '请输入有效数值',
       'settings.unavailable': '设置命名空间当前不可用。',
+      'settings.loading': '正在加载插件设置…',
 
       'f.enabled': '启用图像生成',
       'f.enabledHint': '关闭后将禁用所有图像生成及处理工具。',
@@ -2766,46 +2766,19 @@ window.__ModuleLoader__.load({
     }
 
     // -------------------------------------------------------------- Registration & Apply
-    // Dual compatibility with DSH 0.1.5-rc.3 (settingsScope) and 0.1.6+ (configForms) (#291)
+    // Dual compatibility with DSH 0.1.5-rc.3 (settingsScope) and 0.1.6+ (configForms) (#291, #295)
     const inject = ['slots', 'locale', 'sessions']
 
     function resolveActiveScope(ctx) {
       if (!ctx) return null
-      if (ctx.get && typeof ctx.get === 'function') {
-        try {
-          const lan = ctx.get('lanSettings')
-          if (lan && typeof lan.get === 'function') {
-            const s = lan.get(SETTINGS_NS)
-            if (s) return s
-          }
-        } catch (_) { /* scope unavailable */ }
-        try {
-          const cf = ctx.get('configForms')
-          if (cf && typeof cf.get === 'function') {
-            const s = cf.get(SETTINGS_NS)
-            if (s) return s
-          }
-        } catch (_) { /* scope unavailable */ }
-        try {
-          const ss = ctx.get('settingsScope')
-          if (ss && typeof ss.bind === 'function') {
-            const s = ss.bind({ namespace: SETTINGS_NS })
-            if (s) return s
-          }
-        } catch (_) { /* scope unavailable */ }
-      }
-      if (ctx.configForms && typeof ctx.configForms.get === 'function') {
-        try {
-          const s = ctx.configForms.get(SETTINGS_NS)
-          if (s) return s
-        } catch (_) { /* scope unavailable */ }
-      }
-      if (ctx.settingsScope && typeof ctx.settingsScope.bind === 'function') {
-        try {
-          const s = ctx.settingsScope.bind({ namespace: SETTINGS_NS })
-          if (s) return s
-        } catch (_) { /* scope unavailable */ }
-      }
+      try {
+        const lan = (ctx.get && ctx.get('lanSettings')) || ctx.lanSettings
+        if (lan?.get) return lan.get(SETTINGS_NS)
+        const cf = (ctx.get && ctx.get('configForms')) || ctx.configForms
+        if (cf?.get) return cf.get(SETTINGS_NS)
+        const ss = (ctx.get && ctx.get('settingsScope')) || ctx.settingsScope
+        if (ss?.bind) return ss.bind({ namespace: SETTINGS_NS })
+      } catch (_) { /* scope unavailable */ }
       return null
     }
 
@@ -2813,70 +2786,93 @@ window.__ModuleLoader__.load({
       const listeners = new Set()
       let activeTarget = resolveActiveScope(ctx)
       let activeUnsub = null
+      let httpSnapshot = { status: 'loading', writable: true, value: {} }
+
+      const notify = () => { for (const fn of listeners) fn() }
+
+      const syncHttpConfig = () => {
+        if (typeof fetch !== 'function') return
+        fetch('/dsh-image-gen/config', { cache: 'no-store' })
+          .then((r) => r.json())
+          .then((data) => {
+            if (data && data.ok && data.config) {
+              httpSnapshot = { status: 'ready', writable: true, value: data.config }
+              notify()
+            }
+          })
+          .catch(() => {})
+      }
+      syncHttpConfig()
 
       const bindTarget = (target) => {
         if (!target || target === activeTarget) return
         if (typeof activeUnsub === 'function') {
-          try { activeUnsub() } catch (_) { /* scope unavailable */ }
+          try { activeUnsub() } catch { /* ignore */ }
           activeUnsub = null
         }
         activeTarget = target
         if (typeof activeTarget.subscribe === 'function') {
           try {
-            activeUnsub = activeTarget.subscribe(() => {
-              for (const fn of listeners) fn()
-            })
-          } catch (_) { /* scope unavailable */ }
+            activeUnsub = activeTarget.subscribe(notify)
+          } catch { /* ignore */ }
         }
-        for (const fn of listeners) fn()
+        notify()
       }
 
-      if (activeTarget && typeof activeTarget.subscribe === 'function') {
-        try {
-          activeUnsub = activeTarget.subscribe(() => {
-            for (const fn of listeners) fn()
-          })
-        } catch (_) { /* scope unavailable */ }
+      if (activeTarget?.subscribe) {
+        try { activeUnsub = activeTarget.subscribe(notify) } catch { /* ignore */ }
       }
 
       if (typeof ctx?.inject === 'function') {
         try {
           ctx.inject(['configForms'], (sctx) => {
-            try {
-              const s = sctx?.configForms?.get?.(SETTINGS_NS)
-              if (s) bindTarget(s)
-            } catch (_) { /* scope unavailable */ }
+            const s = sctx?.configForms?.get?.(SETTINGS_NS)
+            if (s) bindTarget(s)
           })
-        } catch (_) { /* scope unavailable */ }
-        try {
           ctx.inject(['settingsScope'], (sctx) => {
-            try {
-              const s = sctx?.settingsScope?.bind?.({ namespace: SETTINGS_NS })
-              if (s) bindTarget(s)
-            } catch (_) { /* scope unavailable */ }
+            const s = sctx?.settingsScope?.bind?.({ namespace: SETTINGS_NS })
+            if (s) bindTarget(s)
           })
-        } catch (_) { /* scope unavailable */ }
+        } catch { /* ignore */ }
       }
 
       return {
         getSnapshot() {
           const target = activeTarget || resolveActiveScope(ctx)
-          if (target && typeof target.getSnapshot === 'function') {
-            return target.getSnapshot()
-          }
-          return { status: 'unavailable', writable: false, value: {} }
+          const snap = target?.getSnapshot ? target.getSnapshot() : null
+          if (snap?.status === 'ready' && snap.writable) return snap
+          if (httpSnapshot.status === 'ready') return httpSnapshot
+          return snap || httpSnapshot
         },
         async set(key, val) {
           const target = activeTarget || resolveActiveScope(ctx)
-          if (target && typeof target.set === 'function') {
-            return target.set(key, val)
-          }
+          const snap = target?.getSnapshot ? target.getSnapshot() : null
+          if (snap?.status === 'ready' && snap.writable && target.set) return target.set(key, val)
+          httpSnapshot = { ...httpSnapshot, value: { ...httpSnapshot.value, [key]: val } }
+          notify()
+          try {
+            await fetch('/dsh-image-gen/config', {
+              method: 'PUT',
+              headers: { 'Content-Type': 'application/json' },
+              body: JSON.stringify({ [key]: val }),
+            })
+          } catch { /* ignore */ }
         },
         async delete(key) {
           const target = activeTarget || resolveActiveScope(ctx)
-          if (target && typeof target.delete === 'function') {
-            return target.delete(key)
-          }
+          const snap = target?.getSnapshot ? target.getSnapshot() : null
+          if (snap?.status === 'ready' && snap.writable && target.delete) return target.delete(key)
+          const nextVal = { ...httpSnapshot.value }
+          delete nextVal[key]
+          httpSnapshot = { ...httpSnapshot, value: nextVal }
+          notify()
+          try {
+            await fetch('/dsh-image-gen/config', {
+              method: 'PUT',
+              headers: { 'Content-Type': 'application/json' },
+              body: JSON.stringify({ [key]: undefined }),
+            })
+          } catch { /* ignore */ }
         },
         subscribe(fn) {
           listeners.add(fn)
@@ -2905,27 +2901,17 @@ window.__ModuleLoader__.load({
         if (typeof ctx.slots.inject === 'function') {
           try {
             ctx.slots.inject(slotName, () => {
-              try {
-                return registerFn()
-              } catch (err) {
-                console.warn('[dsh-image-gen] Error registering slot ' + slotName + ':', err)
-              }
+              try { return registerFn() } catch (err) { console.warn('[dsh-image-gen] Slot err ' + slotName + ':', err) }
             })
             return
-          } catch (err) {
-            console.warn('[dsh-image-gen] Failed to inject slot ' + slotName + ':', err)
-          }
+          } catch (err) { console.warn('[dsh-image-gen] Failed inject ' + slotName + ':', err) }
         }
         if (typeof ctx.slots.register === 'function') {
-          try {
-            registerFn()
-          } catch (err) {
-            console.warn('[dsh-image-gen] Failed direct registration for ' + slotName + ':', err)
-          }
+          try { registerFn() } catch (err) { console.warn('[dsh-image-gen] Direct reg err ' + slotName + ':', err) }
         }
       }
 
-      // Register toolviews for all 8 visual tools
+      // Register toolviews for all visual tools
       const toolviewTools = [
         'generate_image',
         'edit_image',
@@ -2981,7 +2967,6 @@ window.__ModuleLoader__.load({
         )
       )
 
-
       // Native Sidebar Right Pane Tab & BetterSidebar
       if (typeof ctx.inject === 'function') {
         try {
@@ -3035,7 +3020,7 @@ window.__ModuleLoader__.load({
               console.warn('[dsh-image-gen] native sidebar registration failed', e)
             }
           })
-        } catch (e) { /* native sidebar unavailable */ }
+        } catch (_) { /* native sidebar unavailable */ }
 
         try {
           ctx.inject(['betterSidebar'], (sctx) => {
@@ -3053,7 +3038,7 @@ window.__ModuleLoader__.load({
               console.warn('[dsh-image-gen] betterSidebar registerTab failed', e)
             }
           })
-        } catch (e) { /* betterSidebar unavailable */ }
+        } catch (_) { /* betterSidebar unavailable */ }
       }
 
       // Conversation header utilities chip (quick-access gallery button in chat header)
@@ -3070,22 +3055,7 @@ window.__ModuleLoader__.load({
         )
       )
 
-      // List seat (plugins.item)
-      registerSlotWhenReady('plugins.item', () =>
-        ctx.slots.register(
-          {
-            name: 'plugins.item',
-            id: 'dsh-image-gen',
-            order: 60,
-            label: () => 'Image Studio',
-            locale: NS,
-            inject: () => cardOnce().inject(),
-          },
-          (props) => react.createElement(ErrorBoundary, null, react.createElement(FalSettingsCard, props))
-        )
-      )
-
-      // Settings card item (legacy seat, kept as a fallback)
+      // Settings card item — sole slot registration for settings card (#208, #300)
       registerSlotWhenReady('settings.plugin.item', () =>
         ctx.slots.register(
           {
@@ -3098,7 +3068,6 @@ window.__ModuleLoader__.load({
         )
       )
     }
-
     // -------------------------------------------------------------- Asset Vault View (#159)
     function AssetVaultView(props) {
       const { ctx, onSelectAsset } = props
@@ -3146,7 +3115,7 @@ window.__ModuleLoader__.load({
       }, [q, provider, aspect, sort])
 
       const handleDelete = (id) => {
-        if (!confirm('Are you sure you want to delete this asset?')) return
+        if (!window.confirm('Are you sure you want to delete this asset?')) return
         fetch('/dsh-image-gen/vault?id=' + encodeURIComponent(id), { method: 'DELETE' })
           .then((r) => r.json())
           .then((res) => {
@@ -3342,7 +3311,7 @@ window.__ModuleLoader__.load({
       const [isFullscreen, setIsFullscreen] = react.useState(false)
       const [layoutGrid, setLayoutGrid] = react.useState('1x1') // '1x1' | '2x2' | '1x4'
       const [prompt, setPrompt] = react.useState(() => {
-        try { return localStorage.getItem('dsh_studio_prompt') || '' } catch (_) { return '' }
+        try { return window.localStorage.getItem('dsh_studio_prompt') || '' } catch (_) { return '' }
       })
       const [stylePreset, setStylePreset] = react.useState('none')
       const [aspectRatio, setAspectRatio] = react.useState('1:1')
@@ -3381,7 +3350,7 @@ window.__ModuleLoader__.load({
 
       const updatePrompt = (val) => {
         setPrompt(val)
-        try { localStorage.setItem('dsh_studio_prompt', val) } catch (_) { /* storage unavailable */ }
+        try { window.localStorage.setItem('dsh_studio_prompt', val) } catch (_) { /* storage unavailable */ }
       }
 
       const handleSelectFromVault = (asset) => {

package/lib/fallback-router.js

@@ -35,6 +35,25 @@ export function isFatalPromptError(error) {
 export function isRetryableProviderError(error) {
   if (isFatalPromptError(error)) return false
   const msg = (error?.message || String(error || '')).toLowerCase()
+
+  // Non-retryable: authentication, authorization, or invalid request / client configuration errors
+  if (
+    msg.includes('401') ||
+    msg.includes('403') ||
+    msg.includes('unauthorized') ||
+    msg.includes('forbidden') ||
+    msg.includes('invalid api key') ||
+    msg.includes('invalid key') ||
+    msg.includes('api key missing') ||
+    msg.includes('api_key_invalid') ||
+    msg.includes('bad request') ||
+    msg.includes('invalid argument') ||
+    msg.includes('invalid parameter') ||
+    msg.includes('400')
+  ) {
+    return false
+  }
+
   return (
     msg.includes('429') ||
     msg.includes('rate limit') ||
@@ -57,10 +76,9 @@ export function isRetryableProviderError(error) {
     msg.includes('balance is insufficient') ||
     msg.includes('quota') ||
     msg.includes('credit') ||
-    msg.includes('unauthorized') ||
-    msg.includes('401') ||
-    msg.includes('invalid api key') ||
     msg.includes('econnrefused') ||
+    msg.includes('econnreset') ||
+    msg.includes('etimedout') ||
     msg.includes('enotfound') ||
     msg.includes('fetch failed') ||
     msg.includes('network')
@@ -150,6 +168,10 @@ export async function executeWithFallback(generators, chain, seed, prompt, optio
         throw new Error(`Content or policy error on ${providerKey} (not cascading): ${formatted}`)
       }
 
+      if (!isRetryableProviderError(err)) {
+        throw new Error(`Non-retryable provider error on ${providerKey} (not cascading): ${formatted}`)
+      }
+
       if (logger && typeof logger.warn === 'function') {
         logger.warn(`[dsh-image-gen] Provider ${providerKey} failed: ${formatted}. Trying next candidate...`)
       }