@goodandready/dsh-image-gen 0.8.7 → 0.8.9

package/lib/client.js

@@ -18,6 +18,24 @@ window.__ModuleLoader__.load({
     let react_jsx_runtime = require('react/jsx-runtime')
     let runtime = require('@deepseek-ai/dsh-client-runtime/client')
 
+    // Ядровый шеврон раскрытия; в урезанной сборке — запасной SVG той же формы.
+    let ChevronIcon = null
+    try {
+      const primitives = require('@deepseek-ai/dsh-client-ui-primitives')
+      ChevronIcon = primitives && primitives.IconChevronDownOutline14
+    } catch (noPrimitives) {
+      ChevronIcon = null
+    }
+    const ChevronIconNode = ChevronIcon || react.createElement('svg', {
+      width: 14, height: 14, viewBox: '0 0 14 14', 'aria-hidden': true,
+      style: { display: 'block' },
+    }, react.createElement('path', {
+      d: 'M3 5.5 L7 9.5 L11 5.5',
+      fill: 'none', stroke: 'currentColor', strokeWidth: 1.5,
+      strokeLinecap: 'round', strokeLinejoin: 'round',
+    }))
+
+
     // ---------------------------------------------------------------- css
     const css =
       '.fal_card{border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-3);border-radius:12px;list-style:none}' +
@@ -55,7 +73,12 @@ window.__ModuleLoader__.load({
       '.fal_input:disabled,.fal_select:disabled{opacity:.6}' +
       '.fal_hint{color:var(--dsw-alias-label-secondary);margin:0;font-size:12px}' +
       '.fal_invalid{color:var(--dsw-alias-state-error-primary);margin:0;font-size:12px}' +
-      '.fal_sep{height:1px;background:var(--dsw-alias-border-l2);margin:2px 0 0}'
+      '.fal_sep{height:1px;background:var(--dsw-alias-border-l2);margin:2px 0 0}' +
+      '.fal_gallery{display:grid;grid-template-columns:repeat(auto-fill,minmax(120px,1fr));gap:10px;margin-top:12px}' +
+      '.fal_galleryItem{display:flex;flex-direction:column;gap:4px;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;overflow:hidden}' +
+      '.fal_galleryImg{width:100%;height:90px;object-fit:cover;display:block}' +
+      '.fal_galleryMeta{font-size:11px;color:var(--dsw-alias-label-secondary);padding:4px 6px}' +
+      '.fal_galleryEmpty{color:var(--dsw-alias-label-secondary);font-size:12px;margin-top:12px}'
     const tagId = 'dsh-image-gen/settings-card.module.css'
     if (typeof document !== 'undefined' && document.querySelector('style[data-plugin-css=' + JSON.stringify(tagId) + ']') === null) {
       const tag = document.createElement('style')
@@ -92,6 +115,11 @@ window.__ModuleLoader__.load({
       save: 'fal_save',
       select: 'fal_select',
       sep: 'fal_sep',
+      gallery: 'fal_gallery',
+      galleryItem: 'fal_galleryItem',
+      galleryImg: 'fal_galleryImg',
+      galleryMeta: 'fal_galleryMeta',
+      galleryEmpty: 'fal_galleryEmpty',
     }
 
     // -------------------------------------------------------------- chrome
@@ -134,7 +162,7 @@ window.__ModuleLoader__.load({
                 ],
               }),
               state.dirty ? react_jsx_runtime.jsx('span', { className: cssDefault.pending, children: props.t('settings.unsaved') }) : null,
-              react_jsx_runtime.jsx('span', { className: cssDefault.chevron + (open ? ' ' + cssDefault.chevronOpen : ''), children: '\u25be' }),
+              react_jsx_runtime.jsx('span', { className: cssDefault.chevron + (open ? ' ' + cssDefault.chevronOpen : ''), children: ChevronIconNode }),
             ],
           }),
           open
@@ -424,18 +452,18 @@ window.__ModuleLoader__.load({
     /** Field specs in display order. */
     const FIELDS = [
       { field: 'provider', spec: selectField('provider', PROVIDERS), kind: 'select', options: PROVIDERS, labelKey: 'f.provider', hintKey: 'f.providerHint', providerNeeds: { fal: 'ключ FAL', custom: 'адрес + ключ', codex: 'подписка ChatGPT', grok: 'подписка Grok', local: 'адрес сервера' } },
-      { field: 'model', spec: textField('model'), kind: 'text', labelKey: 'f.model', hintKey: 'f.modelHint', placeholderKey: 'p.model' },
-      { field: 'apiKeyEnv', spec: textField('apiKeyEnv'), kind: 'text', labelKey: 'f.apiKeyEnv', hintKey: 'f.apiKeyEnvHint', placeholderKey: 'p.apiKeyEnv' },
-      { field: 'baseURL', spec: textField('baseURL'), kind: 'text', labelKey: 'f.baseURL', hintKey: 'f.baseURLHint', placeholderKey: 'p.baseURL' },
+      { field: 'model', spec: textField('model'), kind: 'text', labelKey: 'f.model', hintKey: 'f.modelHint', placeholderKey: 'p.model', when: ['fal'] },
+      { field: 'apiKeyEnv', spec: textField('apiKeyEnv'), kind: 'text', labelKey: 'f.apiKeyEnv', hintKey: 'f.apiKeyEnvHint', placeholderKey: 'p.apiKeyEnv', when: ['fal'] },
+      { field: 'baseURL', spec: textField('baseURL'), kind: 'text', labelKey: 'f.baseURL', hintKey: 'f.baseURLHint', placeholderKey: 'p.baseURL', when: ['fal'] },
       { field: 'defaultSize', spec: selectField('defaultSize', IMAGE_SIZES), kind: 'select', options: IMAGE_SIZES, labelKey: 'f.defaultSize', hintKey: 'f.defaultSizeHint', sizePixels: SIZE_PIXELS },
       { field: 'defaultFormat', spec: selectField('defaultFormat', OUTPUT_FORMATS), kind: 'select', options: OUTPUT_FORMATS, labelKey: 'f.defaultFormat', hintKey: 'f.defaultFormatHint' },
-      { field: 'pollIntervalMs', spec: numberField('pollIntervalMs'), kind: 'number', labelKey: 'f.pollIntervalMs', hintKey: 'f.pollIntervalMsHint', placeholderKey: 'p.pollIntervalMs' },
-      { field: 'timeoutMs', spec: numberField('timeoutMs'), kind: 'number', labelKey: 'f.timeoutMs', hintKey: 'f.timeoutMsHint', placeholderKey: 'p.timeoutMs' },
+      { field: 'pollIntervalMs', spec: numberField('pollIntervalMs'), kind: 'number', labelKey: 'f.pollIntervalMs', hintKey: 'f.pollIntervalMsHint', placeholderKey: 'p.pollIntervalMs', when: ['fal'] },
+      { field: 'timeoutMs', spec: numberField('timeoutMs'), kind: 'number', labelKey: 'f.timeoutMs', hintKey: 'f.timeoutMsHint', placeholderKey: 'p.timeoutMs', when: ['fal'] },
       { field: 'deliverAs', spec: selectField('deliverAs', DELIVERY_MODES), kind: 'select', options: DELIVERY_MODES, labelKey: 'f.deliverAs', hintKey: 'f.deliverAsHint' },
-      { field: 'customBaseURL', spec: textField('customBaseURL'), kind: 'text', labelKey: 'f.customBaseURL', hintKey: 'f.customBaseURLHint', placeholderKey: 'p.customBaseURL' },
-      { field: 'customModel', spec: textField('customModel'), kind: 'text', labelKey: 'f.customModel', hintKey: 'f.customModelHint', placeholderKey: 'p.customModel' },
-      { field: 'customKeyEnv', spec: textField('customKeyEnv'), kind: 'text', labelKey: 'f.customKeyEnv', hintKey: 'f.customKeyEnvHint', placeholderKey: 'p.customKeyEnv' },
-      { field: 'customSize', spec: textField('customSize'), kind: 'text', labelKey: 'f.customSize', hintKey: 'f.customSizeHint', placeholderKey: 'p.customSize' },
+      { field: 'customBaseURL', spec: textField('customBaseURL'), kind: 'text', labelKey: 'f.customBaseURL', hintKey: 'f.customBaseURLHint', placeholderKey: 'p.customBaseURL', when: ['custom'] },
+      { field: 'customModel', spec: textField('customModel'), kind: 'text', labelKey: 'f.customModel', hintKey: 'f.customModelHint', placeholderKey: 'p.customModel', when: ['custom'] },
+      { field: 'customKeyEnv', spec: textField('customKeyEnv'), kind: 'text', labelKey: 'f.customKeyEnv', hintKey: 'f.customKeyEnvHint', placeholderKey: 'p.customKeyEnv', when: ['custom'] },
+      { field: 'customSize', spec: textField('customSize'), kind: 'text', labelKey: 'f.customSize', hintKey: 'f.customSizeHint', placeholderKey: 'p.customSize', when: ['custom'] },
       { field: 'outputDir', spec: textField('outputDir'), kind: 'text', labelKey: 'f.outputDir', hintKey: 'f.outputDirHint', placeholderKey: 'p.outputDir' },
     ]
 
@@ -465,10 +493,68 @@ window.__ModuleLoader__.load({
     }
 
     /** Render the plugin settings card. */
+    /** Галерея истории генераций: тянет /history и рендерит миниатюры. */
+    function HistoryGallery(props) {
+      const [entries, setEntries] = react.useState([])
+      const [loading, setLoading] = react.useState(true)
+      const [filter, setFilter] = react.useState('')
+      react.useEffect(() => {
+        let cancelled = false
+        fetch('/dsh-image-gen/history')
+          .then((r) => r.json())
+          .then((data) => { if (!cancelled) { setEntries(Array.isArray(data) ? data : []); setLoading(false) } })
+          .catch(() => { if (!cancelled) setLoading(false) })
+        return () => { cancelled = true }
+      }, [])
+      const t = props.t
+      if (loading) return react_jsx_runtime.jsx('p', { className: cssDefault.galleryEmpty, children: t('history.loading') })
+      if (!entries.length) return react_jsx_runtime.jsx('p', { className: cssDefault.galleryEmpty, children: t('history.empty') })
+      const providers = [...new Set(entries.map((e) => e.provider).filter(Boolean))]
+      const filtered = filter ? entries.filter((e) => e.provider === filter) : entries
+      return react_jsx_runtime.jsxs('div', {
+        className: cssDefault.gallery,
+        children: [
+          react_jsx_runtime.jsx('select', {
+            className: cssDefault.select,
+            value: filter,
+            onChange: (e) => setFilter(e.target.value),
+            children: [
+              react_jsx_runtime.jsx('option', { value: '', children: t('history.all') }),
+              providers.map((p) => react_jsx_runtime.jsx('option', { value: p, children: p }, p)),
+            ],
+          }),
+          filtered.map((e) =>
+          react_jsx_runtime.jsxs('a', {
+            className: cssDefault.galleryItem,
+            key: e.path,
+            href: e.thumbnailUrl || '#',
+            target: '_blank',
+            rel: 'noreferrer',
+            children: [
+              e.thumbnailUrl ? react_jsx_runtime.jsx('img', { className: cssDefault.galleryImg, src: e.thumbnailUrl, alt: e.prompt || '', loading: 'lazy' }) : null,
+              react_jsx_runtime.jsx('div', { className: cssDefault.galleryMeta, children: `${e.provider || ''} · ${e.size || ''}` }),
+              e.seed !== undefined ? react_jsx_runtime.jsx('button', {
+                type: 'button',
+                className: 'fal-repeat',
+                onClick: (ev) => {
+                  ev.preventDefault()
+                  ev.stopPropagation()
+                  try { navigator.clipboard.writeText(String(e.seed)) } catch (err) { /* нет доступа к буферу */ }
+                },
+              }, `seed ${e.seed}`) : null,
+            ],
+          }),
+          ),
+        ],
+      })
+    }
+
     function FalSettingsCard(props) {
       const { t } = props
       const state = props.useFalSettingsCard((snapshot) => snapshot)
       const disabled = !state.writable
+      const currentProvider = (state.provider && state.provider.text) || 'fal'
+      const visibleFields = FIELDS.filter((entry) => !entry.when || entry.when.includes(currentProvider))
       const fieldProps = {
         overriddenLabel: t('settings.overridden'),
         resetLabel: t('settings.reset'),
@@ -484,7 +570,7 @@ window.__ModuleLoader__.load({
         onDiscard: props.discard,
         children: [
           react_jsx_runtime.jsx('p', { className: cssDefault.hint, children: t('settings.credentialHint') }),
-          FIELDS.map((entry) =>
+          visibleFields.map((entry) =>
             react_jsx_runtime.jsx(
               Field,
               {
@@ -498,6 +584,9 @@ window.__ModuleLoader__.load({
               entry.field,
             ),
           ),
+          react_jsx_runtime.jsx('div', { className: cssDefault.sep, key: 'hsep' }),
+          react_jsx_runtime.jsx('p', { className: cssDefault.hint, key: 'hlabel', children: t('history.title') }),
+          react_jsx_runtime.jsx(HistoryGallery, { t, key: 'history' }),
         ],
       })
     }
@@ -583,6 +672,10 @@ window.__ModuleLoader__.load({
       'p.customKeyEnv': 'Example: OPENAI_API_KEY',
       'p.customSize': 'Example: 1024x1024',
       'p.outputDir': 'Example: generated/images',
+      'history.title': 'Generation history',
+      'history.all': 'All providers',
+      'history.empty': 'No generations yet',
+      'history.loading': 'Loading…',
     }
 
     const ru = {
@@ -642,6 +735,10 @@ window.__ModuleLoader__.load({
       'p.customKeyEnv': 'Пример: OPENAI_API_KEY',
       'p.customSize': 'Пример: 1024x1024',
       'p.outputDir': 'Пример: generated/images',
+      'history.title': 'История генераций',
+      'history.all': 'Все провайдеры',
+      'history.empty': 'Ещё нет генераций',
+      'history.loading': 'Загрузка…',
     }
 
     // ── карточка результата generate_image ────────────────────────────────
@@ -701,6 +798,8 @@ window.__ModuleLoader__.load({
       const running = !('kind' in (block || {}))
       const failed = block && (block.isError || block.error !== undefined)
       const parsed = readResult(block)
+      const [editing, setEditing] = react.useState(false)
+      const [editText, setEditText] = react.useState('')
       let prompt = ''
       try {
         const raw = (block && (block.call ? block.call.argsRaw : block.argsRaw)) || ''
@@ -805,6 +904,43 @@ window.__ModuleLoader__.load({
           onClick: repeat,
         }, 'Повторить генерацию'))
       }
+      if (!running && !failed) {
+        if (editing) {
+          body.push(react.createElement('input', {
+            key: 'editinput',
+            type: 'text',
+            className: 'fal-input',
+            value: editText,
+            placeholder: prompt || 'Новый промпт',
+            onChange: (e) => setEditText(e.target.value),
+          }))
+          body.push(react.createElement('button', {
+            key: 'editsend',
+            type: 'button',
+            className: 'fal-repeat',
+            onClick: async () => {
+              const text = (editText || prompt || '').trim()
+              if (!text) return
+              try {
+                const sessions = props.sessions
+                const current = sessions && sessions.list && sessions.list.current
+                const binding = current && sessions.binding(current)
+                const session = binding && binding.session
+                if (session && session.prompt) await session.prompt([{ type: 'text', text }], 'queue')
+              } catch (e) { /* контур сам покажет */ }
+              setEditing(false)
+              setEditText('')
+            },
+          }, 'Отправить'))
+        } else {
+          body.push(react.createElement('button', {
+            key: 'edit',
+            type: 'button',
+            className: 'fal-repeat',
+            onClick: () => { setEditText(prompt || ''); setEditing(true) },
+          }, 'Изменить промпт'))
+        }
+      }
       if (!running && !failed && downloadUrl) {
         body.push(react.createElement('a', {
           key: 'download',

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 os from 'node:os'
 import path from 'node:path'
 import {
   IMAGE_SIZES,
@@ -23,6 +24,8 @@ import {
   PROVIDER_KEYS,
   buildSidecar,
   makeProviders,
+  ASPECT_RATIOS,
+  pixelDiff,
   normalizeCount,
   tryGenerate,
   fallbackOrder,
@@ -128,6 +131,22 @@ export const Config = z.object({
     .number()
     .description('provider=local: CFG scale.')
     .default(7),
+  seedreamKeyEnv: z
+    .string()
+    .description('provider=seedream: credential reference / env var holding the API key.')
+    .default('SEEDREAM_API_KEY'),
+  seedreamModel: z
+    .string()
+    .description('provider=seedream: model id, e.g. seedream-4.0.')
+    .default('seedream-4.0'),
+  geminiKeyEnv: z
+    .string()
+    .description('provider=gemini: credential reference / env var holding the Google API key.')
+    .default('GEMINI_API_KEY'),
+  geminiModel: z
+    .string()
+    .description('provider=gemini: model id, e.g. gemini-2.0-flash-exp-image-generation.')
+    .default('gemini-2.0-flash-exp-image-generation'),
   outputDir: z
     .string()
     .description('Where generated images are saved. A relative path resolves against the session working directory; an absolute path is used as given.')
@@ -136,6 +155,10 @@ export const Config = z.object({
     .number()
     .description('How many recent generations to keep in the in-memory history list.')
     .default(50),
+  pruneDays: z
+    .number()
+    .description('Delete generated files and history entries older than this many days. 0 (default) disables pruning.')
+    .default(0),
   enhancePrompt: z
     .boolean()
     .description('Expand a short prompt into a detailed one through the chat model before generating. Off by default.')
@@ -148,6 +171,18 @@ export const Config = z.object({
     .number()
     .description('Only enhance prompts shorter than this many characters.')
     .default(200),
+  stylePreset: z
+    .string()
+    .description('Optional style suffix appended to the prompt before generation. Empty (default) means no style is applied and the prompt is used as-is.')
+    .default(''),
+  cacheBySeed: z
+    .boolean()
+    .description('If the same seed+prompt was already generated (present in history), return the cached result instead of generating again. Off by default.')
+    .default(false),
+  cacheByPrompt: z
+    .boolean()
+    .description('If the same prompt was already generated (present in history), return the cached result instead of generating again. Off by default.')
+    .default(false),
 })
 
 /** Keep a file stem safe for the filesystem. */
@@ -214,8 +249,73 @@ function migrateLegacySettings(sctx, scope) {
   }
 }
 
-/** In-memory история генераций (пополняется в execute, где доступен cwd). */
-const history = []
+/** Каталог истории: общий для всех устройств, переживает рестарт. */
+export function historyFile() {
+  return path.join(process.env.DSH_HOME || path.join(os.homedir(), '.dsh'), 'dsh-image-gen', 'history.json')
+}
+
+/** Прочитать историю из файла (пусто, если файла нет). */
+/** Найти запись истории по seed+prompt, если файл ещё существует. */
+/** Найти запись истории по промпту (без учёта seed), если файл существует. */
+export async function findCachedByPrompt(entries, prompt) {
+  return entries.find((e) => e.prompt === prompt)
+}
+
+export async function findCached(entries, seed, prompt) {
+  if (seed === undefined) return undefined
+  return entries.find((e) => e.seed === seed && e.prompt === prompt)
+}
+
+/** Вернуть запись из кэша, если файл существует; иначе undefined. */
+export async function cachedResult(entry) {
+  if (!entry || !entry.path) return undefined
+  try { require('node:fs').accessSync(entry.path) } catch (e) { return undefined }
+  return {
+    path: entry.path,
+    url: entry.attachmentId ? `/dsh-image-gen/image?id=${encodeURIComponent(entry.attachmentId)}` : '',
+    width: 0,
+    height: 0,
+    seed: entry.seed,
+    prompt: entry.prompt,
+    format: 'png',
+    cached: true,
+    attachment: entry.attachmentId ? { attachmentId: entry.attachmentId, mediaType: 'image/png', bytes: 0, width: 0, height: 0, name: '' } : undefined,
+  }
+}
+
+/** Удалить файлы и записи истории старше pruneDays дней. */
+export async function pruneHistory(entries, pruneDays) {
+  if (!pruneDays || pruneDays <= 0) return entries
+  const cutoff = Date.now() - pruneDays * 86400000
+  const kept = []
+  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) { /* файл уже удалён */ }
+      continue
+    }
+    kept.push(e)
+  }
+  return kept
+}
+
+export async function readHistory() {
+  try {
+    const raw = await readFile(historyFile(), 'utf-8')
+    const parsed = JSON.parse(raw)
+    return Array.isArray(parsed) ? parsed : []
+  } catch (e) {
+    return []
+  }
+}
+
+/** Записать историю в файл (перезапись целиком). */
+export async function writeHistory(entries) {
+  try {
+    await mkdir(path.dirname(historyFile()), { recursive: true })
+    await writeFile(historyFile(), JSON.stringify(entries, null, 2))
+  } catch (e) { /* история не критична */ }
+}
 
 /** Отфильтровать записи, чьи файлы ещё существуют; новые первыми. */
 export function filterHistory(entries, exists) {
@@ -349,8 +449,13 @@ export function apply(ctx, config) {
         return
       }
       const exists = (p) => { try { return require('node:fs').existsSync(p) } catch { return false } }
+      const entries = await readHistory()
+      const withThumbs = filterHistory(entries, exists).map((e) => ({
+        ...e,
+        thumbnailUrl: e.attachmentId ? `/dsh-image-gen/image?id=${encodeURIComponent(e.attachmentId)}` : '',
+      }))
       res.writeHead(200, { 'Content-Type': 'application/json' })
-      res.end(JSON.stringify(filterHistory(history, exists)))
+      res.end(JSON.stringify(withThumbs))
     },
   }), 'dsh-image-gen: history route')
 
@@ -373,6 +478,11 @@ export function apply(ctx, config) {
           type: 'string',
           description: `One of: ${IMAGE_SIZES.join(', ')}. Default: ${config.defaultSize}.`,
         },
+        aspect_ratio: {
+          type: 'string',
+          enum: ['1:1', '16:9', '9:16', '4:3', '3:4'],
+          description: 'Optional aspect ratio; overrides image_size when both are given. Sent as width/height to providers that accept pixels.',
+        },
         seed: {
           type: 'integer',
           description: 'Optional seed for reproducible output.',
@@ -390,6 +500,16 @@ export function apply(ctx, config) {
           type: 'integer',
           description: 'Number of variations to generate in one call, 1-4 (default 1). Cost scales with count.',
         },
+        prompts: {
+          type: 'array',
+          items: {
+            oneOf: [
+              { type: 'string' },
+              { type: 'object', additionalProperties: false, properties: { text: { type: 'string' } } },
+            ],
+          },
+          description: 'Optional list of prompts (strings or {text}); one image is generated per prompt. When set, overrides count and the single prompt.',
+        },
         negative_prompt: {
           type: 'string',
           description: 'Optional text describing what NOT to draw; sent to providers that support it (ignored otherwise).',
@@ -398,6 +518,15 @@ export function apply(ctx, config) {
           type: 'number',
           description: 'Optional prompt adherence (e.g. 1-20); sent to providers that support it (ignored otherwise).',
         },
+        quality: {
+          type: 'string',
+          enum: ['low', 'medium', 'high'],
+          description: 'Optional quality for providers that support it (seedream, gemini). Ignored otherwise.',
+        },
+        style: {
+          type: 'string',
+          description: 'Optional style preset for providers that support it (seedream, gemini). Ignored otherwise.',
+        },
         source_image: {
           type: 'string',
           description: 'Optional path to an image file or an attachment id (sha256:...) to edit instead of drawing from scratch. Only providers that support image editing accept it; others refuse with a clear reason.',
@@ -472,10 +601,11 @@ export function apply(ctx, config) {
         const cfg = live()
         const provider = PROVIDER_KEYS.includes(cfg.provider) ? cfg.provider : 'fal'
         const deliverAs = cfg.deliverAs
-        const size = args.image_size ?? cfg.defaultSize
-        if (!IMAGE_SIZES.includes(size)) {
+        const size = args.aspect_ratio ? 'custom' : (args.image_size ?? cfg.defaultSize)
+        if (!args.aspect_ratio && !IMAGE_SIZES.includes(size)) {
           throw new Error(`Invalid image_size "${size}". One of: ${IMAGE_SIZES.join(', ')}`)
         }
+        const aspectPixels = args.aspect_ratio ? ASPECT_RATIOS[args.aspect_ratio] : undefined
         const format = args.output_format ?? cfg.defaultFormat
         if (!OUTPUT_FORMATS.includes(format)) {
           throw new Error(`Invalid output_format "${format}". One of: ${OUTPUT_FORMATS.join(', ')}`)
@@ -488,22 +618,23 @@ 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)
-        const effectivePrompt = enhanced.prompt
+        const styleSuffix = cfg.stylePreset ? `, ${cfg.stylePreset}` : ''
+        const effectivePrompt = enhanced.prompt + styleSuffix
         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 },
+          { 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 },
         )
         // Подписочные провайдеры (codex/grok) отдают {ok:false, reason} вместо исключения:
         // отказ должен дойти до модели текстом. Без проверки execute шёл дальше с пустыми
         // байтами, и пользователь получал битую карточку вместо внятного отказа.
         const guard = (generated) => { if (generated && generated.ok === false) throw new Error(generated.reason) }
-        const one = async (jobSeed, providerKey) => {
-          const gen = await providers[providerKey](jobSeed)
+        const one = async (jobSeed, providerKey, promptArg = effectivePrompt) => {
+          const gen = await providers[providerKey](jobSeed, promptArg)
           guard(gen)
           const bytes = gen.bytes
           const mediaType = gen.mediaType
           const extension = mediaType === 'image/jpeg' ? 'jpg' : mediaType === 'image/webp' ? 'webp' : 'png'
-          const stem = `${slugify(args.output_name || effectivePrompt)}-${Date.now().toString(36)}-${jobSeed}`
+          const stem = `${slugify(args.output_name || promptArg)}-${Date.now().toString(36)}-${jobSeed}`
           const name = `${stem}.${extension}`
 
           const attachment = await ctx.attachments.saveImage({
@@ -529,7 +660,7 @@ export function apply(ctx, config) {
           await writeFile(
             path.join(outDir, `${stem}.json`),
             JSON.stringify(buildSidecar({
-              prompt: effectivePrompt,
+              prompt: promptArg,
               size,
               format,
               seed: gen.seed,
@@ -544,17 +675,21 @@ export function apply(ctx, config) {
             }), null, 2),
           )
 
-          history.unshift({
+          const entry = {
             path: filePath,
-            prompt: effectivePrompt,
+            prompt: promptArg,
             provider,
             size,
             format,
             seed: gen.seed,
             createdAt: new Date().toISOString(),
             attachmentId: attachment.attachmentId,
-          })
-          if (history.length > (cfg.historyLimit || 50)) history.length = cfg.historyLimit || 50
+          }
+          let current = await readHistory()
+          current = await pruneHistory(current, cfg.pruneDays)
+          current.unshift(entry)
+          if (current.length > (cfg.historyLimit || 50)) current.length = cfg.historyLimit || 50
+          await writeHistory(current)
 
           return {
             path: filePath,
@@ -562,7 +697,7 @@ export function apply(ctx, config) {
             width: gen.width || attachment.width,
             height: gen.height || attachment.height,
             seed: gen.seed,
-            prompt: effectivePrompt,
+            prompt: promptArg,
             originalPrompt: enhanced.enhanced ? args.prompt : undefined,
             cost: gen.cost,
             format: mediaType.replace('image/', ''),
@@ -577,19 +712,58 @@ export function apply(ctx, config) {
           }
         }
 
-        const count = normalizeCount(args.count)
         const seedBase = args.seed ?? Math.floor(Math.random() * 100000)
         // Fallback-цепочка: пробуем текущий провайдер, при отказе — следующий
         // по порядку (fal → custom → codex → grok), собирая причины отказов.
         const order = fallbackOrder(provider)
-        const generators = Object.fromEntries(PROVIDER_KEYS.map((k) => [k, (s) => one(s, k)]))
+        const generators = Object.fromEntries(PROVIDER_KEYS.map((k) => [k, (s, p) => one(s, k, p)]))
         const images = []
-        for (let i = 0; i < count; i += 1) {
-          images.push(await tryGenerate(generators, order, seedBase + i))
+        const historyEntries = (cfg.cacheBySeed || cfg.cacheByPrompt) ? await readHistory() : []
+        const batchPrompts = Array.isArray(args.prompts) && args.prompts.length ? args.prompts : null
+        if (batchPrompts) {
+          for (let i = 0; i < batchPrompts.length; i += 1) {
+            const item = batchPrompts[i]
+            const text = typeof item === 'string' ? item : (item && item.text) || ''
+            const cached = cfg.cacheBySeed ? await cachedResult(findCached(historyEntries, seedBase + i, text)) : (cfg.cacheByPrompt ? await cachedResult(findCachedByPrompt(historyEntries, text)) : undefined)
+            images.push(cached || await tryGenerate(generators, order, seedBase + i, text))
+          }
+        } else {
+          const count = normalizeCount(args.count)
+          for (let i = 0; i < count; i += 1) {
+            const cached = cfg.cacheBySeed ? await cachedResult(findCached(historyEntries, seedBase + i, effectivePrompt)) : (cfg.cacheByPrompt ? await cachedResult(findCachedByPrompt(historyEntries, effectivePrompt)) : undefined)
+            images.push(cached || await tryGenerate(generators, order, seedBase + i))
+          }
         }
         const first = images[0]
         return { ...first, images }
       },
     }),
   )
+
+  // Сравнение двух изображений: доля различающихся пикселей.
+  ctx.tools.register(
+    defineTool({
+      name: 'compare_images',
+      description: 'Compare two images (paths or attachment ids) and report the fraction of differing pixels. Use to check how much an edit changed the original.',
+      parameters: {
+        image_a: { type: 'string', required: true, description: 'Path or attachment id of the first image.' },
+        image_b: { type: 'string', required: true, description: 'Path or attachment id of the second image.' },
+      },
+      output: {
+        schema: {
+          type: 'object',
+          additionalProperties: false,
+          properties: {
+            diffRatio: { type: 'number' },
+            error: { type: 'string' },
+          },
+        },
+      },
+      async execute(args, exec) {
+        const a = await resolveSource(ctx, exec, args.image_a)
+        const b = await resolveSource(ctx, exec, args.image_b)
+        return pixelDiff(a && a.bytes, b && b.bytes)
+      },
+    }),
+  )
 }

package/lib/providers.js

@@ -7,7 +7,7 @@
 // Сеть приходит параметром (fetchImpl), ключ — через resolveKey, поэтому оба
 // провайдера проверяются юнит-тестами без единого реального запроса.
 
-export const PROVIDER_KEYS = ['fal', 'custom', 'codex', 'grok', 'local']
+export const PROVIDER_KEYS = ['fal', 'custom', 'codex', 'grok', 'local', 'seedream', 'gemini']
 
 /** Привести count из аргумента инструмента к диапазону 1..4. */
 /** Порядок провайдеров для fallback: основной первым, остальные по PROVIDER_KEYS. */
@@ -21,11 +21,11 @@ export function fallbackOrder(primary) {
  * @param generators - массив функций (key, seed) => Promise<generated>.
  * @param order - порядок ключей, длина = generators.length.
  */
-export async function tryGenerate(generators, order, seed) {
+export async function tryGenerate(generators, order, seed, promptArg) {
   const refusals = []
   for (const key of order) {
     try {
-      const produced = await generators[key](seed)
+      const produced = await generators[key](seed, promptArg)
       return produced
     } catch (e) {
       refusals.push(`${key}: ${e.message || String(e)}`)
@@ -159,6 +159,21 @@ export async function pollStatus(fetchImpl, statusUrl, key, signal, pollInterval
  */
 
 /** Именованный размер -> [width, height] для локальных API. */
+/** Соотношения сторон -> [w,h] (в пикселях, по базовой стороне 1024). */
+export const ASPECT_RATIOS = {
+  '1:1': [1024, 1024],
+  '16:9': [1344, 768],
+  '9:16': [768, 1344],
+  '4:3': [1152, 896],
+  '3:4': [896, 1152],
+}
+
+/** Размер в пикселях: aspectPixels (если задан) или из именованного размера. */
+export function pxSize(aspectPixels, size) {
+  if (aspectPixels) return aspectPixels
+  return sizeToPixels(size)
+}
+
 export function sizeToPixels(size) {
   const px = SIZE_PIXELS[size]
   if (!px) return [1024, 1024]
@@ -177,13 +192,24 @@ export function buildEditForm({ source, mask, prompt, size, strength }) {
   return form
 }
 
+/** Сравнить два изображения: доля различающихся пикселей (0..1). */
+export async function pixelDiff(a, b) {
+  if (!a || !b) return { error: 'missing image' }
+  if (a.length !== b.length) return { error: 'size mismatch', diffRatio: 1 }
+  let diff = 0
+  for (let i = 0; i < a.length; i += 1) {
+    if (a[i] !== b[i]) diff += 1
+  }
+  return { diffRatio: diff / a.length }
+}
+
 export function makeProviders(deps, job) {
   const { fetchImpl, resolveKey, cfg } = deps
-  const { prompt, size, format, seed, signal, negativePrompt, guidanceScale, source, mask, strength } = job
+  const { prompt, size, format, seed, signal, negativePrompt, guidanceScale, source, mask, strength, quality, style, aspectPixels } = job
 
-  async function fal(seedArg = seed) {
+  async function fal(seedArg = seed, promptArg = prompt) {
     const key = await resolveKey(cfg.apiKeyEnv)
-    const body = { prompt, image_size: size, num_images: 1 }
+    const body = { prompt: promptArg, image_size: size, num_images: 1 }
     if (seedArg !== undefined) body.seed = seedArg
     if (negativePrompt !== undefined) body.negative_prompt = negativePrompt
     if (guidanceScale !== undefined) body.guidance_scale = guidanceScale
@@ -218,7 +244,7 @@ export function makeProviders(deps, job) {
   }
 
   // Любой OpenAI-совместимый API картинок. Один запрос вместо очереди FAL.
-  async function custom(seedArg = seed) {
+  async function custom(seedArg = seed, promptArg = prompt) {
     const base = String(cfg.customBaseURL || '').replace(/\/+$/, '')
     if (!base) throw new Error('Custom image provider: base URL is not configured (Settings → Image generation)')
     if (!cfg.customModel) throw new Error('Custom image provider: model is not configured')
@@ -236,12 +262,12 @@ export function makeProviders(deps, job) {
       method: 'POST',
       headers,
       body: source
-        ? buildEditForm({ source, mask, prompt, size: cfg.customSize || SIZE_PIXELS[size] || size, strength })
+        ? buildEditForm({ source, mask, prompt: promptArg, size: cfg.customSize || (aspectPixels ? aspectPixels.join('x') : SIZE_PIXELS[size]) || size, strength })
         : JSON.stringify({
             model: cfg.customModel,
-            prompt,
+            prompt: promptArg,
             n: 1,
-            size: cfg.customSize || SIZE_PIXELS[size] || size,
+            size: cfg.customSize || (aspectPixels ? aspectPixels.join('x') : SIZE_PIXELS[size]) || size,
             ...(negativePrompt !== undefined ? { negative_prompt: negativePrompt } : {}),
             ...(guidanceScale !== undefined ? { guidance_scale: guidanceScale } : {}),
           }),
@@ -291,7 +317,7 @@ export function makeProviders(deps, job) {
   // только запрос и разбор ответа. Токен сюда не попадает вовсе — служба
   // отдаёт готовую картинку, а не ключ доступа.
   function subscription(provider) {
-    return async function generate(seedArg = seed) {
+    return async function generate(seedArg = seed, promptArg = prompt) {
       if (source) {
         return { ok: false, provider, reason: `${provider}: не умеет править изображения — используйте fal, custom или local` }
       }
@@ -307,7 +333,7 @@ export function makeProviders(deps, job) {
       try {
         produced = await images.generate({
           provider,
-          prompt,
+          prompt: promptArg,
           size: SUBSCRIPTION_SIZES[size] || '1024x1024',
           quality: cfg.subscriptionQuality || undefined,
           signal,
@@ -333,15 +359,15 @@ export function makeProviders(deps, job) {
   }
 
   // Локальная генерация: ComfyUI (очередь + опрос) или Automatic1111 (txt2img).
-  async function local(seedArg = seed) {
+  async function local(seedArg = seed, promptArg = prompt) {
     const base = String(cfg.localBaseURL || '').replace(/\/+$/, '')
     if (!base) throw new Error('Local image provider: server address is not configured (Settings → Image generation)')
-    const [width, height] = sizeToPixels(size)
+    const [width, height] = pxSize(aspectPixels, size)
     const kind = cfg.localKind === 'a1111' ? 'a1111' : 'comfyui'
 
     if (kind === 'a1111') {
       const body = {
-        prompt,
+        prompt: promptArg,
         negative_prompt: negativePrompt,
         width,
         height,
@@ -379,7 +405,7 @@ export function makeProviders(deps, job) {
         '3': { class_type: 'KSampler', inputs: { seed: seedArg ?? 0, steps: cfg.localSteps ?? 20, cfg: cfg.localCfg ?? 7, sampler_name: 'euler', scheduler: 'normal', denoise: 1, model: ['4', 0], positive: ['6', 0], negative: ['7', 0], latent_image: ['5', 0] } },
         '4': { class_type: 'CheckpointLoaderSimple', inputs: { ckpt_name: cfg.localModel || 'v1-5-pruned-emaonly.safetensors' } },
         '5': { class_type: 'EmptyLatentImage', inputs: { width, height, batch_size: 1 } },
-        '6': { class_type: 'CLIPTextEncode', inputs: { text: prompt, clip: ['4', 1] } },
+        '6': { class_type: 'CLIPTextEncode', inputs: { text: promptArg, clip: ['4', 1] } },
         '7': { class_type: 'CLIPTextEncode', inputs: { text: negativePrompt || '', clip: ['4', 1] } },
         '8': { class_type: 'VAEDecode', inputs: { samples: ['3', 0], vae: ['4', 2] } },
         '9': { class_type: 'SaveImage', inputs: { filename_prefix: 'dsh', images: ['8', 0] } },
@@ -429,5 +455,62 @@ export function makeProviders(deps, job) {
     }
   }
 
-  return { fal, custom, codex: subscription('codex'), grok: subscription('grok'), local }
+  // Seedream (ByteDance): OpenAI-совместимый API картинок.
+  async function seedream(seedArg = seed, promptArg = prompt) {
+    const key = await resolveKey(cfg.seedreamKeyEnv)
+    const base = 'https://api.bytedanceapi.com/v1'
+    const res = await fetchImpl(`${base}/images/generations`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${key}` },
+      body: JSON.stringify({
+        model: cfg.seedreamModel || 'seedream-4.0',
+        prompt: promptArg,
+        n: 1,
+        size: (aspectPixels ? aspectPixels.join('x') : SIZE_PIXELS[size]) || size,
+        ...(negativePrompt !== undefined ? { negative_prompt: negativePrompt } : {}),
+        ...(quality !== undefined ? { quality } : {}),
+        ...(style !== undefined ? { style } : {}),
+      }),
+      signal,
+    })
+    const data = await res.json().catch(() => ({}))
+    if (!res.ok) {
+      const detail = data?.error?.message || JSON.stringify(data).slice(0, 600)
+      throw new Error(`Seedream failed (HTTP ${res.status}): ${detail}`)
+    }
+    const item = data?.data?.[0]
+    if (!item) throw new Error('Seedream returned no images')
+    if (item.b64_json) {
+      return { bytes: Buffer.from(item.b64_json, 'base64'), mediaType: normalizeMediaType('image/png', format), width: 0, height: 0, seed: seedArg ?? 0, sourceUrl: '' }
+    }
+    if (!item.url) throw new Error('Seedream returned neither b64_json nor url')
+    const dl = await fetchImpl(item.url, { signal })
+    if (!dl.ok) throw new Error(`Seedream download failed (HTTP ${dl.status})`)
+    return { bytes: Buffer.from(await dl.arrayBuffer()), mediaType: normalizeMediaType('image/png', format), width: 0, height: 0, seed: seedArg ?? 0, sourceUrl: item.url }
+  }
+
+  // Gemini (Google): images.generate через GenAI API.
+  async function gemini(seedArg = seed, promptArg = prompt) {
+    const key = await resolveKey(cfg.geminiKeyEnv)
+    const model = cfg.geminiModel || 'gemini-2.0-flash-exp-image-generation'
+    const res = await fetchImpl(`https://generativelanguage.googleapis.com/v1beta/models/${model}:generateContent?key=${encodeURIComponent(key)}`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({
+        contents: [{ parts: [{ text: promptArg }] }],
+        generationConfig: { responseModalities: ['IMAGE'], ...(quality !== undefined ? { imageConfig: { imageQuality: quality } } : {}), ...(style !== undefined ? { imageConfig: { imageStyle: style } } : {}) },
+      }),
+      signal,
+    })
+    const data = await res.json().catch(() => ({}))
+    if (!res.ok) {
+      const detail = data?.error?.message || JSON.stringify(data).slice(0, 600)
+      throw new Error(`Gemini failed (HTTP ${res.status}): ${detail}`)
+    }
+    const part = data?.candidates?.[0]?.content?.parts?.find((p) => p.inlineData?.data)
+    if (!part) throw new Error('Gemini returned no image')
+    return { bytes: Buffer.from(part.inlineData.data, 'base64'), mediaType: normalizeMediaType(part.inlineData.mimeType || 'image/png', format), width: 0, height: 0, seed: seedArg ?? 0, sourceUrl: '' }
+  }
+
+  return { fal, custom, codex: subscription('codex'), grok: subscription('grok'), local, seedream, gemini }
 }

package/package.json

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