@dickpy/dsh-imagegen 1.5.5 → 1.5.6

package/src/gallery-store.ts

@@ -10,15 +10,15 @@
 
 import { promises as fs } from 'node:fs'
 import { createHash } from 'node:crypto'
-import { homedir } from 'node:os'
 import path from 'node:path'
 import type { GenerateMode, HistoryEntry, HistoryEntryInput } from './protocol.ts'
 import { notifyImageSaved } from './storage-sync.ts'
+import { imageDataRoot } from './image-storage-path.ts'
 
-const HISTORY_DIR = path.join(homedir(), '.dsh', 'dsh-imagegen')
-const GALLERY_DIR = path.join(HISTORY_DIR, 'gallery')
-const INDEX_PATH = path.join(GALLERY_DIR, 'index.json')
-const IMAGES_DIR = path.join(GALLERY_DIR, 'images')
+function historyDir(): string { return imageDataRoot() }
+function galleryDir(): string { return path.join(imageDataRoot(), 'gallery') }
+function indexPath(): string { return path.join(galleryDir(), 'index.json') }
+function imagesDir(): string { return path.join(galleryDir(), 'images') }
 
 /** One gallery entry carries the same wire shape as a history entry. */
 export interface GalleryAppendResult {
@@ -114,13 +114,13 @@ function fingerprint(input: HistoryEntryInput): string | undefined {
 
 /** Ensure the storage directories exist. */
 async function ensureDirs(): Promise<void> {
-  await fs.mkdir(IMAGES_DIR, { recursive: true })
+  await fs.mkdir(imagesDir(), { recursive: true })
 }
 
 /** Read the index, tolerating a missing/corrupt file. */
 async function readIndex(): Promise<StoredEntry[]> {
   try {
-    const raw = await fs.readFile(INDEX_PATH, 'utf8')
+    const raw = await fs.readFile(indexPath(), 'utf8')
     const parsed: unknown = JSON.parse(raw)
     if (parsed === null || typeof parsed !== 'object') return []
     const entries = (parsed as { entries?: unknown }).entries
@@ -135,9 +135,9 @@ async function readIndex(): Promise<StoredEntry[]> {
 async function writeIndex(entries: StoredEntry[]): Promise<void> {
   await ensureDirs()
   const payload: IndexFile = { entries }
-  const tmp = `${INDEX_PATH}.tmp-${process.pid}`
+  const tmp = `${indexPath()}.tmp-${process.pid}`
   await fs.writeFile(tmp, JSON.stringify(payload), 'utf8')
-  await fs.rename(tmp, INDEX_PATH)
+  await fs.rename(tmp, indexPath())
 }
 
 /** Structural guard for a stored entry. */
@@ -164,7 +164,7 @@ function isStoredEntry(value: unknown): value is StoredEntry {
 /** Remove one entry's image files (best effort). */
 async function removeEntryFiles(entry: StoredEntry): Promise<void> {
   for (const image of entry.images) {
-    try { await fs.rm(path.join(IMAGES_DIR, image.file), { force: true }) } catch { /* ignore */ }
+    try { await fs.rm(path.join(imagesDir(), image.file), { force: true }) } catch { /* ignore */ }
   }
 }
 
@@ -223,8 +223,8 @@ export async function appendGallery(input: HistoryEntryInput): Promise<GalleryAp
       for (let index = 0; index < input.images.length; index++) {
         const image = input.images[index]!
         const file = `${prefix}-${index}.${extensionOf(image.mime)}`
-        await fs.writeFile(path.join(IMAGES_DIR, file), Buffer.from(image.b64, 'base64'))
-        notifyImageSaved('gallery', path.join(IMAGES_DIR, file))
+        await fs.writeFile(path.join(imagesDir(), file), Buffer.from(image.b64, 'base64'))
+        notifyImageSaved('gallery', path.join(imagesDir(), file))
         storedImages.push({
           file,
           mime: image.mime,
@@ -303,7 +303,7 @@ export async function readGalleryImage(file: string): Promise<{ data: Buffer; mi
   // store writes — so the route can never escape the images directory.
   if (!/^[a-zA-Z0-9][a-zA-Z0-9-]*-[0-9]+\.(png|jpg|jpeg|webp|gif)$/.test(file)) return undefined
   try {
-    const data = await fs.readFile(path.join(IMAGES_DIR, file))
+    const data = await fs.readFile(path.join(imagesDir(), file))
     return { data, mime: mimeOfFile(file) }
   } catch {
     return undefined

package/src/generation-runtime.ts

@@ -38,8 +38,8 @@ export class ImageGenerationRuntime {
     private readonly resolve: () => ChannelsView,
     private readonly history: HistorySink = { append: appendHistory },
   ) {
-    // A comparison can contain up to four models; let those tasks run at the
-    // same time while still applying a small host-wide concurrency limit.
+    // Every task runs in parallel up to this small host-wide limit; a
+    // four-model comparison fits within it in a single wave.
     this.queue = new GenerationTaskQueue((request, signal) => this.run(request, signal), 4)
   }
 

package/src/history-store.ts

@@ -9,14 +9,14 @@
  */
 
 import { promises as fs } from 'node:fs'
-import { homedir } from 'node:os'
 import path from 'node:path'
 import { HISTORY_MAX, type GenerateMode, type HistoryEntry, type HistoryEntryInput } from './protocol.ts'
 import { notifyImageSaved } from './storage-sync.ts'
+import { imageDataRoot } from './image-storage-path.ts'
 
-const HISTORY_DIR = path.join(homedir(), '.dsh', 'dsh-imagegen')
-const INDEX_PATH = path.join(HISTORY_DIR, 'index.json')
-const IMAGES_DIR = path.join(HISTORY_DIR, 'images')
+function historyDir(): string { return imageDataRoot() }
+function indexPath(): string { return path.join(historyDir(), 'index.json') }
+function imagesDir(): string { return path.join(historyDir(), 'images') }
 
 // History mutations read and replace one shared index. Serialize them so
 // overlapping requests cannot each read an old index and lose the other's row.
@@ -95,13 +95,13 @@ function safeId(id: string): string {
 
 /** Ensure the storage directories exist. */
 async function ensureDirs(): Promise<void> {
-  await fs.mkdir(IMAGES_DIR, { recursive: true })
+  await fs.mkdir(imagesDir(), { recursive: true })
 }
 
 /** Read the index, tolerating a missing/corrupt file. */
 async function readIndex(): Promise<StoredEntry[]> {
   try {
-    const raw = await fs.readFile(INDEX_PATH, 'utf8')
+    const raw = await fs.readFile(indexPath(), 'utf8')
     const parsed: unknown = JSON.parse(raw)
     if (parsed === null || typeof parsed !== 'object') return []
     const entries = (parsed as { entries?: unknown }).entries
@@ -116,9 +116,9 @@ async function readIndex(): Promise<StoredEntry[]> {
 async function writeIndex(entries: StoredEntry[]): Promise<void> {
   await ensureDirs()
   const payload: IndexFile = { entries }
-  const tmp = `${INDEX_PATH}.tmp-${process.pid}`
+  const tmp = `${indexPath()}.tmp-${process.pid}`
   await fs.writeFile(tmp, JSON.stringify(payload), 'utf8')
-  await fs.rename(tmp, INDEX_PATH)
+  await fs.rename(tmp, indexPath())
 }
 
 /** Structural guard for a stored entry. */
@@ -145,7 +145,7 @@ function isStoredEntry(value: unknown): value is StoredEntry {
 /** Remove one entry's image files (best effort). */
 async function removeEntryFiles(entry: StoredEntry): Promise<void> {
   for (const image of entry.images) {
-    try { await fs.rm(path.join(IMAGES_DIR, image.file), { force: true }) } catch { /* ignore */ }
+    try { await fs.rm(path.join(imagesDir(), image.file), { force: true }) } catch { /* ignore */ }
   }
 }
 
@@ -196,8 +196,8 @@ export async function appendHistory(input: HistoryEntryInput): Promise<HistoryEn
       for (let index = 0; index < input.images.length; index++) {
         const image = input.images[index]!
         const file = `${prefix}-${index}.${extensionOf(image.mime)}`
-        await fs.writeFile(path.join(IMAGES_DIR, file), Buffer.from(image.b64, 'base64'))
-        notifyImageSaved('history', path.join(IMAGES_DIR, file))
+        await fs.writeFile(path.join(imagesDir(), file), Buffer.from(image.b64, 'base64'))
+        notifyImageSaved('history', path.join(imagesDir(), file))
         storedImages.push({
           file,
           mime: image.mime,
@@ -267,7 +267,7 @@ export async function readHistoryImage(file: string): Promise<{ data: Buffer; mi
   // store writes — so the route can never escape the images directory.
   if (!/^[a-zA-Z0-9][a-zA-Z0-9-]*-[0-9]+\.(png|jpg|jpeg|webp|gif)$/.test(file)) return undefined
   try {
-    const data = await fs.readFile(path.join(IMAGES_DIR, file))
+    const data = await fs.readFile(path.join(imagesDir(), file))
     return { data, mime: mimeOfFile(file) }
   } catch {
     return undefined

package/src/image-storage-path.ts

@@ -0,0 +1,12 @@
+import { homedir } from 'node:os'
+import path from 'node:path'
+
+const DEFAULT_ROOT = path.join(process.env.DSH_HOME?.trim() || path.join(homedir(), '.dsh'), 'dsh-imagegen')
+let root = DEFAULT_ROOT
+
+export function imageDataRoot(): string { return root }
+
+export function setImageDataRoot(value: string | undefined): void {
+  const trimmed = value?.trim()
+  root = trimmed === undefined || trimmed === '' ? DEFAULT_ROOT : path.resolve(trimmed)
+}

package/src/index.ts

@@ -37,6 +37,7 @@ function mimeOfPath(filePath: string): string {
 import { ImageGenerationRuntime, type ChannelsView, type RuntimeChannel } from './generation-runtime.ts'
 import { registerAgentImageTools } from './agent-image-tools.ts'
 import { registerEditImageCommand } from './edit-image-command.ts'
+import { setImageDataRoot } from './image-storage-path.ts'
 import { presetById } from './presets.ts'
 
 /** Stable cordis plugin name. */
@@ -89,6 +90,8 @@ export interface Config {
   promptApiKey?: string
   /** Chat model used to expand short image prompts. */
   promptModel?: string
+  /** Local root for generated/history/gallery/canvas images. Empty keeps the default under DSH_HOME. */
+  localStoragePath?: string
   /** Sync saved images to an S3-compatible object store (COS / OSS / Qiniu S3 …). */
   storageEnabled?: boolean
   /** S3-compatible endpoint URL including the bucket (virtual-hosted or path style). */
@@ -133,6 +136,7 @@ export const Config: z<Config> = z.object({
   promptApiUrl: z.string().default(''),
   promptApiKey: z.string().role('secret').default(''),
   promptModel: z.string().default(''),
+  localStoragePath: z.string().default(''),
   storageEnabled: z.boolean().default(false),
   storageEndpoint: z.string().default(''),
   storageRegion: z.string().default(''),
@@ -227,6 +231,7 @@ export function apply(ctx: Context, config?: Config): (() => void) | void {
   let current: () => Config = () => config ?? {}
   const resolve = (): EffectiveConfig => {
     const value = current() ?? {}
+    setImageDataRoot(value.localStoragePath)
     let channels = normalizeChannels(value.channels)
     // Settings scopes are deep-frozen by the host. Legacy migration adds the
     // synthesized default-channel secret, so always work on a detached copy.

package/src/protocol.ts

@@ -8,7 +8,7 @@
 export const IMAGEGEN_SETTINGS_NAMESPACE = 'dsh-imagegen'
 
 /** Published package version shared by the host updater and the client UI. */
-export const PLUGIN_VERSION = '1.5.5'
+export const PLUGIN_VERSION = '1.5.6'
 
 /** Same-origin route family (loopback-only, mirroring the dsh-ssh fence). */
 export const SETTINGS_API = {
@@ -324,7 +324,9 @@ export interface CanvasDocument {
   title: string
   revision: number
   viewport: CanvasViewport
-  background: 'dots' | 'lines' | 'blank'
+  background: 'dots' | 'lines' | 'diagonal' | 'checker' | 'blank' | 'image'
+  /** Custom background image URL (a canvas asset) when background is 'image'. */
+  backgroundImage?: string
   nodes: CanvasNode[]
   connections: CanvasConnection[]
   createdAt: number
@@ -413,6 +415,10 @@ export interface GenerateRequest extends EcommerceTaskMeta {
   detail: string
   /** Reference image as a data URL (edit mode only). */
   image?: string
+  /** Additional reference images as data URLs (edit mode only). The first
+   *  image stays in `image`; providers that accept several references get them
+   *  all, single-reference providers see `image` alone. */
+  images?: string[]
   /** Original reference-image name, retained in the history entry. */
   refName?: string
   /** Channel this request targets (the host falls back to the default when

package/src/routes.ts

@@ -187,6 +187,9 @@ function parseGenerateRequest(body: Record<string, unknown>): GenerateRequest |
     n: typeof body.n === 'number' ? body.n : 1,
     detail: typeof body.detail === 'string' ? body.detail : '',
     ...typeof body.image === 'string' && body.image !== '' ? { image: body.image } : {},
+    ...Array.isArray(body.images)
+      ? { images: body.images.filter((item): item is string => typeof item === 'string' && item !== '').slice(0, 4) }
+      : {},
     ...typeof body.refName === 'string' && body.refName !== '' ? { refName: body.refName } : {},
     ...typeof body.channelId === 'string' && body.channelId !== '' ? { channelId: body.channelId } : {},
     ...typeof body.comparisonId === 'string' && body.comparisonId !== '' ? { comparisonId: body.comparisonId } : {},

package/src/task-queue.ts

@@ -10,7 +10,6 @@ export class GenerationTaskQueue {
   private readonly controllers = new Map<string, AbortController>()
   private readonly listeners = new Set<GenerationTaskListener>()
   private running = 0
-  private serialRunning = false
 
   constructor(
     private readonly run: (request: GenerateRequest, signal: AbortSignal) => Promise<GenerateResult>,
@@ -51,16 +50,16 @@ export class GenerationTaskQueue {
     return previous === undefined ? undefined : this.submit(previous.request)
   }
 
+  /** Start queued tasks while capacity remains. Plain submissions and
+   * comparison batches alike run in parallel up to the host-wide limit, so one
+   * slow upstream can no longer hold back unrelated generations. */
   private drain(): void {
     while (this.running < Math.max(1, this.concurrency)) {
-      const task = this.tasks.find(item => item.status === 'queued'
-        && (this.running === 0 || (item.request.comparisonId !== undefined && !this.serialRunning)))
+      const task = this.tasks.find(item => item.status === 'queued')
       if (task === undefined) return
       this.running += 1
-      if (task.request.comparisonId === undefined) this.serialRunning = true
       void this.runTask(task).finally(() => {
         this.running -= 1
-        if (task.request.comparisonId === undefined) this.serialRunning = false
         this.drain()
       })
     }