@goodandready/dsh-image-gen 0.11.12 → 0.11.13

package/lib/client.js

@@ -3076,6 +3076,12 @@ window.__ModuleLoader__.load({
         'smart_crop_image',
         'export_asset_pack',
         'generate_ui_asset',
+        'generate_character_sheet',
+        'replace_image_text',
+        'beautify_diagram',
+        'generate_seamless_pattern',
+        'generate_spritesheet',
+        'sketch_to_image',
       ]
 
       for (const toolName of toolviewTools) {

package/lib/index.js

@@ -312,7 +312,10 @@ export function apply(ctx, rawConfig) {
       }
       try {
         const u = new URL(req.url, 'http://localhost')
-        const provider = u.searchParams.get('provider') || config.provider || 'fal'
+        const qProvider = u.searchParams.get('provider')
+        const provider = (typeof qProvider === 'string' && qProvider.trim())
+          || (typeof config?.provider === 'string' && config.provider.trim())
+          || 'fal'
         const deps = {
           fetchImpl: fetch,
           resolveKey: (ref) => resolveApiKey(ctx, ref),

package/lib/providers.js

@@ -378,7 +378,7 @@ export async function blendImagesFal({ fetchImpl, resolveKey, cfg }, { images, w
 /** @internal — direct provider call path for integration tests */
 export async function editImageDirect(deps, job) {
   const providers = makeProviders(deps, job)
-  const providerKey = job.provider || deps.cfg.defaultProvider || 'fal'
+  const providerKey = (typeof job?.provider === 'string' && job.provider.trim()) || (typeof deps?.cfg?.provider === 'string' && deps.cfg.provider.trim()) || (typeof deps?.cfg?.defaultProvider === 'string' && deps.cfg.defaultProvider.trim()) || 'fal'
   const fn = providers[providerKey] || providers.fal || providers.custom
   if (!fn) throw new Error(`Provider "${providerKey}" does not support image editing`)
   return fn(job.seed, job.prompt)
@@ -391,7 +391,7 @@ export async function varyImageDirect(deps, job) {
     ...job,
     strength: job.variationStrength ?? job.strength ?? 0.35,
   })
-  const providerKey = job.provider || deps.cfg.defaultProvider || 'fal'
+  const providerKey = (typeof job?.provider === 'string' && job.provider.trim()) || (typeof deps?.cfg?.provider === 'string' && deps.cfg.provider.trim()) || (typeof deps?.cfg?.defaultProvider === 'string' && deps.cfg.defaultProvider.trim()) || 'fal'
   const fn = providers[providerKey] || providers.fal || providers.custom
   if (!fn) throw new Error(`Provider "${providerKey}" does not support image variations`)
   return fn(job.seed, job.prompt)
@@ -428,7 +428,11 @@ export function toLosslessJson(val) {
 export async function testProviderConnection(deps, providerId) {
   const { fetchImpl = fetch, resolveKey, cfg } = deps
   const start = Date.now()
-  const p = (providerId || cfg.defaultProvider || 'fal').toLowerCase()
+  const rawProvider = (typeof providerId === 'string' && providerId.trim())
+    || (typeof cfg?.provider === 'string' && cfg.provider.trim())
+    || (typeof cfg?.defaultProvider === 'string' && cfg.defaultProvider.trim())
+    || 'fal'
+  const p = rawProvider.toLowerCase()
 
   try {
     if (p === 'fal') {

package/lib/security.js

@@ -64,7 +64,8 @@ export function enforceSecurePermissions(filePath) {
   try {
     chmodSync(filePath, 0o600)
     return true
-  } catch {
+  } catch (_err) {
+    /* non-fatal: permission change error */
     return false
   }
 }
@@ -143,7 +144,7 @@ export function extractHostName(hostHeader) {
   try {
     const url = new URL(`http://${trimmed}`)
     return url.hostname.replace(/^\[|\]$/g, '')
-  } catch {
+  } catch (_err) {
     return trimmed.replace(/^\[|\]$/g, '').split(':')[0] || ''
   }
 }
@@ -210,7 +211,7 @@ export function isTrustedLocalRequest(req) {
       if (url.host.toLowerCase() !== host.toLowerCase()) {
         return false
       }
-    } catch {
+    } catch (_err) {
       return false
     }
   }
@@ -226,7 +227,7 @@ export function isTrustedLocalRequest(req) {
       if (!isLoopbackAddress(refererHostName) && !isPrivateLanAddress(refererHostName)) {
         return false
       }
-    } catch {
+    } catch (_err) {
       return false
     }
   }

package/lib/settings-route.js

@@ -79,7 +79,7 @@ export function registerSettingsRoutes(ctx, { live, getSettingsApi, setLiveConfi
       let payload
       try {
         payload = JSON.parse(buf.toString('utf8') || '{}')
-      } catch {
+      } catch (_err) {
         res.writeHead(400, { 'Content-Type': 'application/json' })
         res.end(JSON.stringify({ ok: false, error: 'invalid JSON' }))
         return

package/lib/tools/character-sheet.js

@@ -89,11 +89,7 @@ export function registerCharacterSheetTools(ctx, deps) {
               },
             },
           },
-          render: (result, renderCtx) =>
-            renderToolOutput(result, renderCtx, {
-              title: (res) => `Character Sheet (${res.layout || 'turnaround'}) — ${res.style || 'concept_art'}`,
-              subtitle: (res) => (res.views ? `Views: ${res.views.join(' | ')}` : ''),
-            }),
+          render: (_args, value) => renderToolOutput(value),
         },
         async execute(args, execCtx) {
           const cfg = live.value

package/lib/tools/diagram.js

@@ -85,11 +85,7 @@ export function registerDiagramTools(ctx, deps) {
               },
             },
           },
-          render: (result, renderCtx) =>
-            renderToolOutput(result, renderCtx, {
-              title: (res) => `3D Architecture Diagram — ${res.title || res.style || 'Isometric'}`,
-              subtitle: (res) => (res.detectedNodes?.length ? `Nodes: ${res.detectedNodes.slice(0, 4).join(', ')}` : ''),
-            }),
+          render: (_args, value) => renderToolOutput(value),
         },
         async execute(args, execCtx) {
           const cfg = live?.value || (typeof live === 'function' ? live() : {})

package/lib/tools/generation.js

@@ -1,22 +1,4 @@
 import { registerGenerationPackTool } from './generation-pack.js'
-
-/** Run an array of async task functions with a concurrency cap */
-async function asyncPool(tasks, concurrency = 3) {
-  const results = new Array(tasks.length)
-  let nextIdx = 0
-  async function worker() {
-    while (nextIdx < tasks.length) {
-      const idx = nextIdx++
-      results[idx] = await tasks[idx]()
-    }
-  }
-  const workers = Array.from({ length: Math.min(concurrency, tasks.length) }, () => worker())
-  await Promise.all(workers)
-  return results
-}
-
-// generation — image-gen tools (generate_image, generate_image_pack). Extracted from apply() (#216).
-
 import { defineTool } from '@deepseek-ai/dsh-tools'
 import path from 'node:path'
 import { mkdir, writeFile } from 'node:fs/promises'
@@ -53,6 +35,22 @@ import {
   cachedResult,
 } from '../history.js'
 
+// generation — image-gen tools (generate_image, generate_image_pack). Extracted from apply() (#216).
+
+/** Run an array of async task functions with a concurrency cap */
+async function asyncPool(tasks, concurrency = 3) {
+  const results = new Array(tasks.length)
+  let nextIdx = 0
+  async function worker() {
+    while (nextIdx < tasks.length) {
+      const idx = nextIdx++
+      results[idx] = await tasks[idx]()
+    }
+  }
+  const workers = Array.from({ length: Math.min(concurrency, tasks.length) }, () => worker())
+  await Promise.all(workers)
+  return results
+}
 
 export function registerGenerationTools(ctx, deps) {
   const {
@@ -344,7 +342,7 @@ export function registerGenerationTools(ctx, deps) {
       // Subscriptions service is optional: without it, subscription providers
       // gracefully decline while other providers continue functioning.
         let subscriptionImages
-        try { subscriptionImages = ctx.get && ctx.get('subscriptionImages') } catch { subscriptionImages = undefined }
+        try { subscriptionImages = ctx.get && ctx.get('subscriptionImages') } catch (_err) { subscriptionImages = undefined }
 
         const source = args.source_image ? await resolveSource(ctx, exec, args.source_image) : undefined
         const mask = args.mask ? await resolveSource(ctx, exec, args.mask) : undefined
@@ -358,7 +356,8 @@ export function registerGenerationTools(ctx, deps) {
         if (faceRefInput) {
           try {
             resolvedFaceRef = await resolveSource(ctx, exec, faceRefInput)
-          } catch {
+          } catch (_err) {
+            /* non-fatal: face_reference resolve fallback */
             resolvedFaceRef = { url: faceRefInput }
           }
           const facePlan = buildFaceConsistencyPrompt({

package/lib/tools/style-matrix.js

@@ -126,7 +126,7 @@ export function registerStyleMatrixTools(ctx, deps) {
 
           const provider = PROVIDER_KEYS.includes(cfg.provider) ? cfg.provider : 'fal'
           let subscriptionImages
-          try { subscriptionImages = ctx.get && ctx.get('subscriptionImages') } catch { subscriptionImages = undefined }
+          try { subscriptionImages = ctx.get && ctx.get('subscriptionImages') } catch (_err) { subscriptionImages = undefined }
 
           const chain = resolveFallbackChain(provider, cfg.fallbackProviders, PROVIDER_KEYS)
           const quadrantIds = ['A', 'B', 'C', 'D']

package/lib/tools/ui-asset.js

@@ -145,7 +145,7 @@ export function registerUiAssetTools(ctx, deps) {
 
           const provider = PROVIDER_KEYS.includes(cfg.provider) ? cfg.provider : 'fal'
           let subscriptionImages
-          try { subscriptionImages = ctx.get && ctx.get('subscriptionImages') } catch { subscriptionImages = undefined }
+          try { subscriptionImages = ctx.get && ctx.get('subscriptionImages') } catch (_err) { subscriptionImages = undefined }
 
           const providers = makeProviders(
             { fetchImpl: fetch, resolveKey: (ref) => resolveApiKey(ctx, ref), cfg, subscriptionImages },

package/lib/tools/vision-ocr.js

@@ -39,7 +39,7 @@ export function registerVisionOcrTools(ctx, deps) {
           },
           replacements: {
             type: 'array',
-            description: 'Array of text replacements: [{ find: "Old Text", replace: "Новый Текст", bbox: [x1,y1,x2,y2] }].',
+            description: 'Array of text replacements: [{ find: "Old Text", replace: "New Text", bbox: [x1,y1,x2,y2] }].',
             items: {
               type: 'object',
               additionalProperties: true,
@@ -109,11 +109,7 @@ export function registerVisionOcrTools(ctx, deps) {
               },
             },
           },
-          render: (result, renderCtx) =>
-            renderToolOutput(result, renderCtx, {
-              title: (res) => `Text Replaced (${res.replacedCount || 0} inscriptions)`,
-              subtitle: (res) => (res.bboxes?.length ? `Detected regions: ${res.bboxes.length}` : ''),
-            }),
+          render: (_args, value) => renderToolOutput(value),
         },
         async execute(args, execCtx) {
           const cfg = live?.value || (typeof live === 'function' ? live() : {})
@@ -145,8 +141,8 @@ export function registerVisionOcrTools(ctx, deps) {
                   if (gRes?.bbox && gRes.bbox.length === 4) {
                     bbox = gRes.bbox
                   }
-                } catch {
-                  // non-fatal vision_ground fallback
+                } catch (_err) {
+                  /* non-fatal: vision_ground fallback */
                 }
               }
             }
@@ -168,7 +164,7 @@ export function registerVisionOcrTools(ctx, deps) {
             const defaultBox = [150, 420, 850, 520]
             bboxes.push(defaultBox)
             overlayItems.push({
-              text: args.target_language === 'ru' ? 'Заголовок' : 'Localized Text',
+              text: 'Localized Text',
               bbox: defaultBox,
               color: args.font_color || '#FFFFFF',
             })
@@ -216,8 +212,8 @@ export function registerVisionOcrTools(ctx, deps) {
             )
             inpaintedBytes = inpaintResult.bytes
             inpaintedUrl = inpaintResult.url
-          } catch {
-            // If inpaint provider unavailable, keep source bytes and proceed with overlay
+          } catch (_err) {
+            /* non-fatal: inpaint provider unavailable; use source bytes */
             inpaintedBytes = source.bytes
           }
 

package/lib/updater.js

@@ -39,7 +39,7 @@ export function isTrustedUpdateRequest(request) {
       (isLoopbackAddress(hostName) || isPrivateLanAddress(hostName)) &&
       url.host.toLowerCase() === host.toLowerCase()
     )
-  } catch {
+  } catch (_err) {
     return false
   }
 }

package/package.json

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