@goodandready/dsh-image-gen 0.10.6 → 0.10.8

package/README.md

@@ -1,3 +1,9 @@
+
+## 🚀 Updates v0.10.8: Lossless JSON Unification, Dual-Output & Strict Validation (#199)
+- **Lossless JSON & Dual-Output Unification**: `upscale_image`, `remove_background`, `blend_images`, and `vectorize_image` now consistently return `toLosslessJson` and formatted markdown `summary` for text-only LLMs.
+- **Strict Input Image Validation**: `extract_design_tokens`, `image_to_css_gradient`, and `check_image_contrast` explicitly validate source image readability instead of silent fallback.
+- **Unit Testing Suite**: Added `test/tool-consistency.test.mjs` covering tokenization, gradient generator, and PWA suite.
+
 # 📦 @goodandready/dsh-image-gen
 
 <div align="center">
@@ -70,6 +76,13 @@
 - **React Cleanup (#139)**: removed dead state hooks from `FalImageCard`.
 - **Complete Localization (#140)**: eliminated hardcoded strings, wiring comprehensive dictionaries for en, ru, and zh.
 
+
+### 🚀 What's New in v0.10.7 (#197)
+* **Robust Error Formatting**: completely prevents `[object Object]` from appearing in provider refusal chains, extracting deep `.message`, `.detail`, and `.error` objects cleanly.
+* **Deduplicated Provider Prefixes**: eliminates redundant `codex: codex: ...` prefixes.
+* **FAL Credential Aliasing**: seamless fallback between `FAL_API_KEY` and `FAL_KEY` in credentials and environment.
+* **Subscription Aspect Ratio Mapping**: maps aspect ratios (`16:9`, `3:2`, `9:16`, `2:3`) to appropriate subscription dimensions (`1536x1024` / `1024x1536`) instead of falling back to default square `1024x1024`.
+
 ## 🎨 Supported Generation Backends
 
 * **`fal`** (Default): FAL.ai queue for FLUX.1, SDXL, Clarity Upscaler, and BiRefNet.

package/README.ru.md

@@ -116,6 +116,12 @@ graph LR
 ---
 
 
+
+## 🚀 Обновления v0.10.8: унификация Lossless JSON, Dual-Output и строгая валидация (#199)
+- **Унификация Lossless JSON и Dual-Output**: Инструменты `upscale_image`, `remove_background`, `blend_images`, `vectorize_image` теперь гарантированно возвращают валидный `toLosslessJson` и генерируют структурированный `summary` с превью для текстовых LLM.
+- **Строгая валидация входных изображений**: В инструментах `extract_design_tokens`, `image_to_css_gradient` и `check_image_contrast` добавлена явная проверка существования файла с информативной ошибкой (`Image not found or unreadable: <path>`).
+- **Сквозное модульное тестирование**: Добавлен тест-сьют `test/tool-consistency.test.mjs` для проверки отказоустойчивости дизайн- и PWA-инструментов.
+
 ## 🚀 Обновления v0.10.4: жизненный цикл Cordis, полнота настроек и интернационализация
 - **Жизненный цикл Cordis (#136)**: регистрация всех 7 инструментов обёрнута в `ctx.effect` для штатной отписки при перезагрузке плагина.
 - **Полнота настроек в GUI (#137)**: в карточку настроек добавлены поля для Replicate, SeaDream, Gemini, Local ComfyUI/A1111, пресетов стилей и LLM-улучшителя.

package/lib/index.js

@@ -33,6 +33,7 @@ import {
   pixelDiff,
   normalizeCount,
   tryGenerate,
+  resolveApiKeyCandidates,
   fallbackOrder,
   normalizeMediaType,
   embedPngMetadata,
@@ -354,14 +355,18 @@ export function slugify(input) {
 /** Resolve an API key for one call (credentials service first, then env). */
 export async function resolveApiKey(ctx, ref) {
   if (!ref) return ''
-  try {
-    const resolved = await ctx.credentials.resolve(credentialRef(ref))
-    if (resolved && resolved.value) return resolved.value
-  } catch {
-    // fall through to the environment
+  const candidates = resolveApiKeyCandidates(ref)
+
+  for (const candidate of candidates) {
+    try {
+      const resolved = await ctx.credentials.resolve(credentialRef(candidate))
+      if (resolved && resolved.value) return resolved.value
+    } catch {
+      // fall through to the environment
+    }
+    const fromEnv = process.env[candidate]
+    if (fromEnv) return fromEnv
   }
-  const fromEnv = process.env[ref]
-  if (fromEnv) return fromEnv
   throw new Error(
     `API key not configured: set credential/env "${ref}" (Web: Settings → Credentials, or add "${ref}: <key>" to $DSH_HOME/.credentials.yaml)`,
   )
@@ -813,7 +818,7 @@ export function apply(ctx, config) {
         const effectiveGuidance = styleInfo.guidanceScale
         const providers = makeProviders(
           { fetchImpl: fetch, resolveKey: (ref) => resolveApiKey(ctx, ref), cfg, subscriptionImages },
-          { prompt: effectivePrompt, size, format, seed: args.seed, signal: exec.signal, negativePrompt: effectiveNegative, guidanceScale: effectiveGuidance, source, mask, strength: args.strength, quality: args.quality, style: args.style, aspectPixels },
+          { prompt: effectivePrompt, size, format, seed: args.seed, signal: exec.signal, negativePrompt: effectiveNegative, guidanceScale: effectiveGuidance, source, mask, strength: args.strength, quality: args.quality, style: args.style, aspectPixels, aspectRatio: args.aspect_ratio },
         )
         // Подписочные провайдеры (codex/grok) отдают {ok:false, reason} вместо исключения:
         // отказ должен дойти до модели текстом. Без проверки execute шёл дальше с пустыми
@@ -1065,14 +1070,25 @@ export function apply(ctx, config) {
         const filePath = path.join(outDir, name)
         await writeFile(filePath, res.bytes)
         const localUrl = '/dsh-image-gen/image?id=' + encodeURIComponent(attachment.attachmentId)
-        return {
+        const summary = buildDualOutputMarkdown({
+          action: 'background removed',
+          filePath,
+          width: res.width || attachment.width,
+          height: res.height || attachment.height,
+          mediaType: 'image/png',
+          provider: 'fal',
+          model: args.model || 'fal-ai/birefnet',
+          attachmentId: attachment.attachmentId,
+        })
+        return toLosslessJson({
+          summary,
           path: filePath,
           url: localUrl,
           width: res.width || attachment.width,
           height: res.height || attachment.height,
           format: 'png',
           attachment,
-        }
+        })
       },
     }),
   )
@@ -1123,14 +1139,25 @@ export function apply(ctx, config) {
         const filePath = path.join(outDir, name)
         await writeFile(filePath, res.bytes)
         const localUrl = '/dsh-image-gen/image?id=' + encodeURIComponent(attachment.attachmentId)
-        return {
+        const summary = buildDualOutputMarkdown({
+          action: `upscaled (${args.scale || 2}x)`,
+          filePath,
+          width: res.width || attachment.width,
+          height: res.height || attachment.height,
+          mediaType: 'image/png',
+          provider: 'fal',
+          model: 'fal-ai/clarity-upscaler',
+          attachmentId: attachment.attachmentId,
+        })
+        return toLosslessJson({
+          summary,
           path: filePath,
           url: localUrl,
           scale: args.scale || 2,
           width: res.width || attachment.width,
           height: res.height || attachment.height,
           attachment,
-        }
+        })
       },
     }),
   )
@@ -1168,11 +1195,13 @@ export function apply(ctx, config) {
         await mkdir(outDir, { recursive: true })
         const filePath = path.join(outDir, name)
         await writeFile(filePath, res.bytes)
-        return {
+        const summary = `### Vectorized SVG Export\n- **File**: ${filePath}\n- **Format**: SVG (XML vector)\n- **Color mode**: ${args.color_mode || 'color'}\n- **Palette size**: ${res.palette ? res.palette.length : 16} colors\n`
+        return toLosslessJson({
+          summary,
           path: filePath,
           svg: res.svg,
           format: 'svg',
-        }
+        })
       },
     }),
   )
@@ -1227,13 +1256,24 @@ export function apply(ctx, config) {
         const filePath = path.join(outDir, name)
         await writeFile(filePath, res.bytes)
         const localUrl = '/dsh-image-gen/image?id=' + encodeURIComponent(attachment.attachmentId)
-        return {
+        const summary = buildDualOutputMarkdown({
+          action: 'blended composition',
+          filePath,
+          width: res.width || attachment.width,
+          height: res.height || attachment.height,
+          mediaType: 'image/png',
+          provider: 'fal',
+          model: 'fal-ai/image-blend',
+          attachmentId: attachment.attachmentId,
+        })
+        return toLosslessJson({
+          summary,
           path: filePath,
           url: localUrl,
           width: res.width || attachment.width,
           height: res.height || attachment.height,
           attachment,
-        }
+        })
       },
     }),
   )
@@ -1605,12 +1645,13 @@ export function apply(ctx, config) {
         if (!colors || colors.length === 0) {
           if (args.image) {
             const source = await resolveSource(ctx, exec, args.image)
-            if (source && source.bytes) {
-              colors = extractSampleColorsFromBuffer(source.bytes)
+            if (!source || !source.bytes) {
+              throw new Error('Image not found or unreadable: ' + args.image)
             }
+            colors = extractSampleColorsFromBuffer(source.bytes)
           }
         }
-        return extractDesignTokens(colors, { prefix: args.prefix })
+        return toLosslessJson(extractDesignTokens(colors, { prefix: args.prefix }))
       },
     }),
   )
@@ -1643,12 +1684,13 @@ export function apply(ctx, config) {
         if (!colors || colors.length === 0) {
           if (args.image) {
             const source = await resolveSource(ctx, exec, args.image)
-            if (source && source.bytes) {
-              colors = extractSampleColorsFromBuffer(source.bytes)
+            if (!source || !source.bytes) {
+              throw new Error('Image not found or unreadable: ' + args.image)
             }
+            colors = extractSampleColorsFromBuffer(source.bytes)
           }
         }
-        return generateCssGradient(colors, args.type || 'mesh')
+        return toLosslessJson(generateCssGradient(colors, args.type || 'mesh'))
       },
     }),
   )
@@ -1684,12 +1726,13 @@ export function apply(ctx, config) {
         if (!colors || colors.length === 0) {
           if (args.image) {
             const source = await resolveSource(ctx, exec, args.image)
-            if (source && source.bytes) {
-              colors = extractSampleColorsFromBuffer(source.bytes)
+            if (!source || !source.bytes) {
+              throw new Error('Image not found or unreadable: ' + args.image)
             }
+            colors = extractSampleColorsFromBuffer(source.bytes)
           }
         }
-        return checkWcagContrast(colors, args.text_color || '#ffffff')
+        return toLosslessJson(checkWcagContrast(colors, args.text_color || '#ffffff'))
       },
     }),
   )
@@ -1764,7 +1807,7 @@ export function apply(ctx, config) {
         },
       },
       async execute(args, exec) {
-        return generatePwaIconSuite({
+        const res = await generatePwaIconSuite({
           name: args.name || 'App',
           shortName: args.short_name || args.name || 'App',
           themeColor: args.theme_color || '#0f172a',
@@ -1772,6 +1815,7 @@ export function apply(ctx, config) {
           iconsDir: args.icons_dir || 'icons',
           sourcePath: args.image || null,
         })
+        return toLosslessJson(res)
       },
     }),
   )

package/lib/providers.js

@@ -1,3 +1,14 @@
+/**
+ * Возвращает список кандидатов для имени ключа API с учётом известных алиасов (напр. FAL_API_KEY <-> FAL_KEY).
+ */
+export function resolveApiKeyCandidates(ref) {
+  if (!ref) return []
+  const candidates = [ref]
+  if (ref === 'FAL_API_KEY') candidates.push('FAL_KEY')
+  else if (ref === 'FAL_KEY') candidates.push('FAL_API_KEY')
+  return candidates
+}
+
 
 export const PROVIDER_MAX_COUNTS = {
   fal: 4,
@@ -145,6 +156,81 @@ export function isFatalClientError(error) {
   )
 }
 
+/**
+ * Safely extract a human-readable message from any error, object, or response.
+ * Completely eliminates "[object Object]" and prevents duplicate provider prefixes (e.g. "codex: codex: ...").
+ */
+export function formatErrorMessage(e, providerKey = '') {
+  if (e === null || e === undefined) {
+    return providerKey ? `${providerKey}: unknown error` : 'unknown error'
+  }
+
+  let msg = ''
+  if (typeof e === 'string') {
+    msg = e
+  } else if (typeof e === 'object') {
+    if (typeof e.message === 'string' && e.message && e.message !== '[object Object]') {
+      msg = e.message
+    } else if (typeof e.detail === 'string' && e.detail) {
+      msg = e.detail
+    } else if (e.error) {
+      if (typeof e.error === 'string') msg = e.error
+      else if (typeof e.error.message === 'string') msg = e.error.message
+      else if (typeof e.error.detail === 'string') msg = e.error.detail
+      else {
+        try { msg = JSON.stringify(e.error) } catch {}
+      }
+    } else if (typeof e.statusText === 'string' && e.statusText) {
+      msg = `HTTP ${e.status || ''} ${e.statusText}`.trim()
+    } else if (typeof e.cause === 'string') {
+      msg = e.cause
+    } else if (e.cause && typeof e.cause.message === 'string') {
+      msg = e.cause.message
+    }
+
+    if (!msg || msg === '[object Object]') {
+      try {
+        const json = JSON.stringify(e)
+        if (json && json !== '{}') {
+          msg = json.slice(0, 500)
+        }
+      } catch {}
+    }
+
+    if (!msg || msg === '[object Object]') {
+      const keys = Object.getOwnPropertyNames(e)
+      if (keys.length) {
+        msg = `error [${keys.join(', ')}]`
+      } else {
+        msg = String(e)
+      }
+    }
+  } else {
+    msg = String(e)
+  }
+
+  msg = String(msg || 'unknown error').trim()
+
+  if (providerKey) {
+    const prefixRegex = new RegExp(`^${providerKey}\\s*:\\s*`, 'i')
+    while (prefixRegex.test(msg)) {
+      msg = msg.replace(prefixRegex, '').trim()
+    }
+  }
+
+  if (!msg || msg === '[object Object]') {
+    msg = 'unknown error object'
+  } else if (msg.includes('[object Object]')) {
+    msg = msg.replace(/\[object Object\]/g, 'unknown error object').trim()
+  }
+
+  if (providerKey) {
+    return `${providerKey}: ${msg}`
+  }
+
+  return msg
+}
+
 export async function tryGenerate(generators, order, seed, promptArg) {
   const refusals = []
   for (const key of order) {
@@ -153,9 +239,9 @@ export async function tryGenerate(generators, order, seed, promptArg) {
       return produced
     } catch (e) {
       if (isFatalClientError(e)) {
-        throw new Error(`Client error on provider ${key} (not retrying fallback): ${e.message || String(e)}`)
+        throw new Error(`Client error on provider ${key} (not retrying fallback): ${formatErrorMessage(e, key)}`)
       }
-      refusals.push(`${key}: ${e.message || String(e)}`)
+      refusals.push(formatErrorMessage(e, key))
     }
   }
   throw new Error(`Image generation failed on all providers. ${refusals.join('; ')}`)
@@ -169,6 +255,34 @@ export function normalizeCount(count, max = 4) {
 
 // Размеры, которыми оперируют подписки, — свой набор, не похожий на именованные
 // размеры FAL. Перевод один к одному по смыслу: квадрат, вертикаль, горизонталь.
+/**
+ * Разрешает размер для подписочных сервисов (codex / grok).
+ * Понимает именованные размеры (landscape_16_9 и др.), пропорции (16:9, 3:2, 9:16 и др.)
+ * и размеры в пикселях [width, height], исключая дефолтный квадрат при запросе соотношений сторон.
+ */
+export function resolveSubscriptionSize(size, aspectPixels, aspectRatio) {
+  if (size && SUBSCRIPTION_SIZES[size]) {
+    return SUBSCRIPTION_SIZES[size]
+  }
+  const ratio = String(aspectRatio || '').trim()
+  if (ratio === '16:9' || ratio === '3:2' || ratio === '4:3') {
+    return '1536x1024'
+  }
+  if (ratio === '9:16' || ratio === '2:3' || ratio === '3:4') {
+    return '1024x1536'
+  }
+  if (ratio === '1:1') {
+    return '1024x1024'
+  }
+  if (Array.isArray(aspectPixels) && aspectPixels.length === 2) {
+    const [w, h] = aspectPixels
+    if (w > h) return '1536x1024'
+    if (h > w) return '1024x1536'
+    return '1024x1024'
+  }
+  return '1024x1024'
+}
+
 export const SUBSCRIPTION_SIZES = {
   square_hd: '1024x1024',
   square: '1024x1024',
@@ -349,7 +463,7 @@ export async function pixelDiff(a, b) {
 
 export function makeProviders(deps, job) {
   const { fetchImpl, resolveKey, cfg } = deps
-  const { prompt, size, format, seed, signal, negativePrompt, guidanceScale, source, mask, strength, quality, style, aspectPixels } = job
+  const { prompt, size, format, seed, signal, negativePrompt, guidanceScale, source, mask, strength, quality, style, aspectPixels, aspectRatio } = job
 
   async function fal(seedArg = seed, promptArg = prompt) {
     const key = await resolveKey(cfg.apiKeyEnv)
@@ -498,12 +612,12 @@ export function makeProviders(deps, job) {
         produced = await images.generate({
           provider,
           prompt: promptArg,
-          size: SUBSCRIPTION_SIZES[size] || '1024x1024',
+          size: resolveSubscriptionSize(size, aspectPixels, aspectRatio),
           quality: cfg.subscriptionQuality || undefined,
           signal,
         })
       } catch (e) {
-        return { ok: false, provider, reason: `${provider}: ${String(e && e.message || e)}` }
+        return { ok: false, provider, reason: formatErrorMessage(e, provider) }
       }
       const first = Array.isArray(produced) ? produced[0] : null
       if (!first || !first.b64_json) {

package/package.json

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