@goodandready/dsh-image-gen 0.10.0 → 0.10.1

package/lib/client.js

@@ -808,17 +808,38 @@ window.__ModuleLoader__.load({
       }
     }
 
-    function FalImageCard(props) {
+function FalImageCard(props) {
       const block = props.block
       const running = !('kind' in (block || {}))
       const failed = block && (block.isError || block.error !== undefined)
       const parsed = readResult(block)
-      const [editing, setEditing] = react.useState(false)
 
-      const [inpaintOpen, setInpaintOpen] = react.useState(false)
+      let args = {}
+      try {
+        const raw = (block && (block.call ? block.call.argsRaw : block.argsRaw)) || ''
+        if (raw) args = JSON.parse(raw)
+      } catch (e) { /* ignore */ }
 
+      let prompt = ''
+      try {
+        const raw = (block && (block.call ? block.call.argsRaw : block.argsRaw)) || ''
+        prompt = raw ? (JSON.parse(raw).prompt || '') : ''
+      } catch (e) { prompt = '' }
+
+      const repeatText = (() => {
+        const parts = [String(args.prompt || '').trim()]
+        const size = args.image_size || args.size
+        const seed = args.seed
+        if (size) parts.push(`Размер: ${size}`)
+        if (seed !== undefined) parts.push(`Сид: ${seed}`)
+        return parts.filter(Boolean).join(', ')
+      })()
+
+      const [editing, setEditing] = react.useState(false)
+      const [inpaintOpen, setInpaintOpen] = react.useState(false)
       const [compareSlider, setCompareSlider] = react.useState(50)
       const [showCompare, setShowCompare] = react.useState(false)
+      const [editText, setEditText] = react.useState('')
 
       const onEditPrompt = () => {
         const textToInsert = prompt || repeatText || ''
@@ -883,12 +904,7 @@ window.__ModuleLoader__.load({
         sendActionPrompt(`Удали фон у этого изображения: remove_background(image: "${ref}")`)
       }
 
-      const [editText, setEditText] = react.useState('')
-      let prompt = ''
-      try {
-        const raw = (block && (block.call ? block.call.argsRaw : block.argsRaw)) || ''
-        prompt = raw ? (JSON.parse(raw).prompt || '') : ''
-      } catch (e) { prompt = '' }
+
 
       const head = react.createElement('div', { className: 'fal-head' },
         running ? 'Генерирую изображение…' : failed ? 'Генерация не удалась' : 'Изображение')
@@ -897,19 +913,7 @@ window.__ModuleLoader__.load({
       // промптом и параметрами, извлечёнными из исходного вызова инструмента.
       // Дальше модель сама решает, как сгенерировать, — это просто повторный
       // запрос, а не вызов инструмента из карточки.
-      let args = {}
-      try {
-        const raw = (block && (block.call ? block.call.argsRaw : block.argsRaw)) || ''
-        if (raw) args = JSON.parse(raw)
-      } catch (e) { /* ignore */ }
-      const repeatText = (() => {
-        const parts = [String(args.prompt || '').trim()]
-        const size = args.image_size || args.size
-        const seed = args.seed
-        if (size) parts.push(`Размер: ${size}`)
-        if (seed !== undefined) parts.push(`Сид: ${seed}`)
-        return parts.filter(Boolean).join(', ')
-      })()
+
       const repeat = async () => {
         try {
           const sessions = props.sessions

package/lib/index.js

@@ -16,6 +16,7 @@ import z from '@deepseek-ai/schemastery'
 import { defineTool } from '@deepseek-ai/dsh-tools'
 import { credentialRef } from '@deepseek-ai/dsh-credentials'
 import { mkdir, readFile, writeFile } from 'node:fs/promises'
+import { existsSync, unlinkSync, accessSync } from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
 import {
@@ -217,7 +218,12 @@ export async function resolveSource(ctx, exec, ref) {
   }
   const p = path.resolve(sessionCwd || process.cwd(), ref)
   const bytes = await readFile(p)
-  return { bytes, mediaType: 'image/png' }
+  const ext = path.extname(p).toLowerCase()
+  const mediaType = ext === '.jpg' || ext === '.jpeg' ? 'image/jpeg'
+    : ext === '.webp' ? 'image/webp'
+    : ext === '.svg' ? 'image/svg+xml'
+    : 'image/png'
+  return { bytes, mediaType }
 }
 
 export function slugify(input) {
@@ -295,7 +301,7 @@ export async function findCached(entries, seed, prompt) {
 /** Вернуть запись из кэша, если файл существует; иначе undefined. */
 export async function cachedResult(entry) {
   if (!entry || !entry.path) return undefined
-  try { require('node:fs').accessSync(entry.path) } catch (e) { return undefined }
+  if (!entry.path || !existsSync(entry.path)) return undefined
   return {
     path: entry.path,
     url: entry.attachmentId ? `/dsh-image-gen/image?id=${encodeURIComponent(entry.attachmentId)}` : '',
@@ -326,8 +332,8 @@ export async function pruneHistory(entries, pruneDays) {
   for (const e of entries) {
     const created = e.createdAt ? Date.parse(e.createdAt) : NaN
     if (Number.isFinite(created) && created < cutoff) {
-      try { require('node:fs').unlinkSync(e.path) } catch (err) { /* файл уже удалён */ }
-      try { require('node:fs').unlinkSync(e.path.replace(/\.[^.]+$/, '.json')) } catch (err) { /* sidecar */ }
+      try { unlinkSync(e.path) } catch (err) { /* файл уже удалён */ }
+      try { unlinkSync(e.path.replace(/\.[^.]+$/, '.json')) } catch (err) { /* sidecar */ }
       continue
     }
     kept.push(e)
@@ -494,7 +500,7 @@ export function apply(ctx, config) {
         res.end(JSON.stringify({ error: 'GET only' }))
         return
       }
-      const exists = (p) => { try { return require('node:fs').existsSync(p) } catch { return false } }
+      const exists = (p) => existsSync(p)
       const entries = await readHistory()
       const withThumbs = filterHistory(entries, exists).map((e) => ({
         ...e,
@@ -589,7 +595,7 @@ export function apply(ctx, config) {
       output: {
         schema: {
           type: 'object',
-          additionalProperties: false,
+          additionalProperties: true,
           properties: {
             path: { type: 'string' },
             url: { type: 'string' },
@@ -664,12 +670,14 @@ export function apply(ctx, config) {
         const source = args.source_image ? await resolveSource(ctx, exec, args.source_image) : undefined
         const mask = args.mask ? await resolveSource(ctx, exec, args.mask) : undefined
         const enhanced = await enhancePrompt(ctx, cfg, args.prompt, exec.signal, provider)
-        const styleSuffix = cfg.stylePreset ? `, ${cfg.stylePreset}` : ''
-        const styledPrompt = args.style ? applyStylePreset(enhanced.prompt, args.style) : enhanced.prompt;
-        const effectivePrompt = styledPrompt + styleSuffix
+        const effectiveStyle = args.style || cfg.stylePreset
+        const styleInfo = resolveStylePreset(effectiveStyle, args.negative_prompt, args.guidance_scale)
+        const effectivePrompt = styleInfo.promptSuffix ? `${enhanced.prompt}, ${styleInfo.promptSuffix}` : enhanced.prompt
+        const effectiveNegative = styleInfo.negativePrompt
+        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: args.negative_prompt, guidanceScale: args.guidance_scale, 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 },
         )
         // Подписочные провайдеры (codex/grok) отдают {ok:false, reason} вместо исключения:
         // отказ должен дойти до модели текстом. Без проверки execute шёл дальше с пустыми
@@ -734,13 +742,28 @@ export function apply(ctx, config) {
             }), null, 2),
           )
 
+          const cacheHash = computeGenerationHash({
+            provider,
+            model: cfg.model,
+            prompt: promptArg,
+            seed: gen.seed,
+            size: args.image_size || cfg.defaultSize,
+            style: args.style || cfg.stylePreset,
+          })
           const entry = {
             path: filePath,
             prompt: promptArg,
             provider,
+            model: cfg.model,
             size,
             format,
             seed: gen.seed,
+            cacheHash,
+            thumbnailUrl: localUrl,
+            width: gen.width || attachment.width,
+            height: gen.height || attachment.height,
+            mediaType,
+            bytes: attachment.bytes,
             createdAt: new Date().toISOString(),
             attachmentId: attachment.attachmentId,
           }

package/lib/providers.js

@@ -238,7 +238,7 @@ export async function pollStatus(fetchImpl, statusUrl, key, signal, pollInterval
         }, { once: true })
       }
     })
-    if (signal.aborted) throw new Error('FAL generation cancelled')
+    if (signal?.aborted) throw new Error('FAL generation cancelled')
     const res = await fetchImpl(statusUrl, { headers: { Authorization: falAuthHeader(key) }, signal })
     const data = await res.json().catch(() => ({}))
     const status = data.status
@@ -540,7 +540,7 @@ export function makeProviders(deps, job) {
     const deadline = Date.now() + cfg.timeoutMs
     let attempt = 0
     for (;;) {
-      if (signal.aborted) throw new Error('Local ComfyUI generation cancelled')
+      if (signal?.aborted) throw new Error('Local ComfyUI generation cancelled')
       if (Date.now() > deadline) throw new Error(`Local ComfyUI timed out after ${cfg.timeoutMs} ms`)
       const cDelay = calculateBackoff(attempt++, cfg.pollIntervalMs || 1000, 5000)
       await new Promise((resolve) => {
@@ -663,7 +663,7 @@ export function makeProviders(deps, job) {
       const deadline = Date.now() + (cfg.timeoutMs || 180000)
       let attempt = 0
     while (pred.status !== 'succeeded') {
-        if (signal.aborted) throw new Error('Replicate generation cancelled')
+        if (signal?.aborted) throw new Error('Replicate generation cancelled')
         if (Date.now() > deadline) throw new Error('Replicate generation timed out')
         if (pred.status === 'failed' || pred.status === 'canceled') {
           throw new Error(`Replicate failed: ${pred.error || 'unknown error'}`)

package/package.json

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