@dickpy/dsh-imagegen 1.3.0 → 1.5.0

package/src/client/sidebar-entry.ts

@@ -1,144 +1,190 @@
-/**
- * Sidebar entry injection.
- *
- * dsh's sidebar shell exposes no slot an external plugin can register into,
- * so — following the dsh-ssh / task-board precedent of DOM-level extension —
- * the entry row is injected after the shell's New Session button (after the
- * sibling plugin family block). The injection self-heals: a MutationObserver
- * watches the sidebar root and re-inserts the row whenever a React re-render
- * displaces it (re-insertion happens in the same frame, before paint).
- *
- * The row is plain DOM (no React tree) so it can never disturb the shell's
- * reconciliation; the panel view it toggles is a separate React root mounted
- * in the center column (see mount.tsx).
- */
-
-import type { ImageGenController } from './controller.ts'
-import css from './panel.module.css'
-
-/** Stable data attribute identifying the injected entry row. */
-export const ENTRY_SELECTOR = '[data-dsh-imagegen-entry]'
-
-/** Inline icon (matches the shell's 16px nav-icon look): a picture glyph. */
-const ICON = '<svg viewBox="0 0 16 16" width="14" height="14" fill="none" stroke="currentColor" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><rect x="2" y="2.5" width="12" height="11" rx="1.5"/><circle cx="5.6" cy="5.8" r="1"/><path d="M2.5 12.5l3.6-3.4 2.4 2.2 3-3 2 2.4"/></svg>'
-
-/** Family entry selectors of sibling plugins (relative placement anchor). */
-const FAMILY_ENTRY_SELECTOR = '[data-dsh-taskboard-entry], [data-dsh-ssh-entry], [data-dsh-imagegen-entry]'
-
-/** Find the sidebar shell root element, or undefined while not yet mounted. */
-function sidebarRoot(): HTMLElement | undefined {
-  const column = document.querySelector<HTMLElement>('[data-pane="sidebar"], [class*="sidebarCol"]')
-  if (column === null) return undefined
-  const logoOwner = column.querySelector<HTMLElement>('[class*="logoRow"]')?.parentElement
-  return logoOwner ?? (column.firstElementChild as HTMLElement | undefined)
-}
-
-/** The New Session button: nested in the logo row on current shells, a direct child on legacy shells. */
-function newSessionButton(root: HTMLElement): HTMLButtonElement | undefined {
-  const nested = root.querySelector<HTMLButtonElement>('button[class*="newSession"]')
-  if (nested !== null) return nested
-  for (const child of root.children) {
-    if (child.tagName === 'BUTTON') return child as HTMLButtonElement
-  }
-  return undefined
-}
-
-/** Build the entry row (a detached button; insert once the shell is up). */
-function createEntry(controller: ImageGenController, label: string, tooltip: string): HTMLButtonElement {
-  const entry = document.createElement('button')
-  entry.type = 'button'
-  entry.dataset.dshImagegenEntry = ''
-  entry.className = css.entry
-  entry.setAttribute('aria-label', label)
-  entry.setAttribute('title', tooltip)
-  entry.innerHTML = '<span class="' + css.entryIcon + '">' + ICON + '</span><span class="' + css.entryLabel + '">' + label + '</span>'
-  entry.addEventListener('click', () => { controller.toggle() })
-  return entry
-}
-
-/** Re-insert the entry after the family block (task board → ssh → imagegen). */
-function placeEntry(root: HTMLElement, entry: HTMLButtonElement): boolean {
-  const button = newSessionButton(root)
-  if (button === undefined) return false
-  if (entry.parentElement !== root) {
-    // Position relative to the family block, never relative to transient
-    // logoRow geometry: every family plugin that self-heals during a
-    // re-render then lands in the same relative order.
-    const row = button.closest('[class*="logoRow"]')
-    const base = (row !== null && row.parentElement === root) ? row : button
-    const family = Array.from(root.children).filter(
-      (el): el is HTMLElement => el instanceof HTMLElement && el.matches(FAMILY_ENTRY_SELECTOR),
-    )
-    const anchor = family.length > 0 ? family[family.length - 1].nextElementSibling : base.nextElementSibling
-    root.insertBefore(entry, anchor)
-  }
-  return true
-}
-
-/**
- * Mount the sidebar entry, waiting for the shell to render and self-healing
- * on later React re-renders.
- * @param controller - the panel controller the entry toggles.
- * @param label - the entry label (localized).
- * @param tooltip - the entry tooltip (localized).
- * @returns disposer removing the entry and its observers.
- */
-export function mountSidebarEntry(controller: ImageGenController, label: string, tooltip: string): () => void {
-  const entry = createEntry(controller, label, tooltip)
-  let root: HTMLElement | undefined
-  let placed = false
-
-  const tryPlace = (): void => {
-    if (root !== undefined && !root.isConnected) {
-      rootObserver.disconnect()
-      root = undefined
-      placed = false
-    }
-    if (placed) {
-      if (document.body.contains(entry)) return
-      rootObserver.disconnect()
-      root = undefined
-      placed = false
-    }
-    root ??= sidebarRoot()
-    if (root === undefined) return
-    placed = placeEntry(root, entry)
-    if (placed) {
-      rootObserver.observe(root, { childList: true, subtree: true })
-    }
-  }
-
-  // Body-level watcher retained as the "whole rebuild" fallback.
-  const waitObserver = new MutationObserver(() => { tryPlace() })
-  waitObserver.observe(document.body, { childList: true, subtree: true })
-
-  // Self-heal: if a React re-render displaces the row, re-insert it in the
-  // same frame (microtask before paint -> no visible flicker).
-  const rootObserver = new MutationObserver(() => {
-    if (root === undefined || !root.isConnected) {
-      placed = false
-      tryPlace()
-      return
-    }
-    if (!root.contains(entry)) {
-      placed = placeEntry(root, entry)
-    }
-  })
-
-  // Reflect the panel's open state on the row (active highlight).
-  const syncActive = () => {
-    if (controller.getSnapshot().panelOpen) entry.dataset.active = 'true'
-    else delete entry.dataset.active
-  }
-  const unsubscribe = controller.subscribe(syncActive)
-  syncActive()
-
-  tryPlace()
-
-  return () => {
-    waitObserver.disconnect()
-    rootObserver.disconnect()
-    unsubscribe()
-    entry.remove()
-  }
-}
+/**
+ * Replace the shell's standalone New Session affordance with a two-tab entry:
+ * New Session and Image Generation. When image generation is active, the
+ * plugin also uses the shell's region area as a dedicated history surface;
+ * the original workspace/session tree remains underneath and is restored when
+ * the panel closes.
+ */
+
+import type { ImageGenController } from './controller.ts'
+import css from './panel.module.css'
+
+/** Stable selector for the injected two-tab host. */
+export const ENTRY_SELECTOR = '[data-dsh-imagegen-session-tabs]'
+/** Stable selector for the history surface in the shell region area. */
+export const HISTORY_HOST_SELECTOR = '[data-dsh-imagegen-history-host]'
+
+/** Inline picture glyph kept deliberately small for the sidebar rail. */
+const IMAGE_ICON = '<svg viewBox="0 0 16 16" width="14" height="14" fill="none" stroke="currentColor" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><rect x="2" y="2.5" width="12" height="11" rx="1.5"/><circle cx="5.6" cy="5.8" r="1"/><path d="M2.5 12.5l3.6-3.4 2.4 2.2 3-3 2 2.4"/></svg>'
+
+/** Inline plus glyph for the new-session tab. */
+const NEW_SESSION_ICON = '<svg viewBox="0 0 16 16" width="14" height="14" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" aria-hidden="true"><path d="M8 3v10M3 8h10"/></svg>'
+
+/** Find the sidebar shell root, or undefined while it is not mounted. */
+function sidebarRoot(): HTMLElement | undefined {
+  const column = document.querySelector<HTMLElement>('[data-pane="sidebar"], [class*="sidebarCol"]')
+  if (column === null) return undefined
+  const logoOwner = column.querySelector<HTMLElement>('[class*="logoRow"]')?.parentElement
+  return logoOwner ?? (column.firstElementChild as HTMLElement | undefined)
+}
+
+/** The shell-owned New Session button across current and legacy shells. */
+function newSessionButton(root: HTMLElement): HTMLButtonElement | undefined {
+  return root.querySelector<HTMLButtonElement>(
+    'button[data-dsh-part="new-session"], button[class*="newSession"]',
+  ) ?? Array.from(root.children).find(
+    (child): child is HTMLButtonElement => child instanceof HTMLElement && child.tagName === 'BUTTON',
+  )
+}
+
+/** Locate the shell region that normally contains workspaces and sessions. */
+function regionArea(root: HTMLElement): HTMLElement | undefined {
+  return root.querySelector<HTMLElement>('[class*="regionArea"]') ?? undefined
+}
+
+function makeTab(
+  label: string,
+  tooltip: string,
+  icon: string,
+  onClick: () => void,
+): HTMLButtonElement {
+  const tab = document.createElement('button')
+  tab.type = 'button'
+  tab.className = css.sessionTab
+  tab.setAttribute('aria-label', label)
+  tab.setAttribute('title', tooltip)
+  tab.innerHTML = `<span class="${css.sessionTabIcon}">${icon}</span><span class="${css.sessionTabLabel}">${label}</span>`
+  tab.addEventListener('click', onClick)
+  return tab
+}
+
+function hideShellButton(button: HTMLButtonElement): void {
+  button.dataset.dshImagegenOriginal = ''
+  button.setAttribute('aria-hidden', 'true')
+  button.tabIndex = -1
+  button.style.display = 'none'
+}
+
+function restoreShellButton(button: HTMLButtonElement): void {
+  button.style.removeProperty('display')
+  button.removeAttribute('aria-hidden')
+  button.removeAttribute('tabindex')
+  delete button.dataset.dshImagegenOriginal
+}
+
+/** Mount or repair the two-tab host at the shell's New Session position. */
+function placeTabs(
+  root: HTMLElement,
+  controller: ImageGenController,
+  newSessionLabel: string,
+  newSessionTooltip: string,
+  imageLabel: string,
+  imageTooltip: string,
+): HTMLDivElement | undefined {
+  const button = newSessionButton(root)
+  if (button === undefined) return undefined
+
+  const existing = root.querySelector<HTMLDivElement>(ENTRY_SELECTOR)
+  if (existing !== null && existing.parentElement === button.parentElement) {
+    hideShellButton(button)
+    return existing
+  }
+
+  existing?.remove()
+  const tabs = document.createElement('div')
+  tabs.dataset.dshImagegenSessionTabs = ''
+  tabs.className = css.sessionTabs
+  tabs.setAttribute('role', 'tablist')
+  tabs.setAttribute('aria-label', imageTooltip)
+
+  const newSessionTab = makeTab(newSessionLabel, newSessionTooltip, NEW_SESSION_ICON, () => {
+    controller.close()
+    button.click()
+  })
+  const imageTab = makeTab(imageLabel, imageTooltip, IMAGE_ICON, () => {
+    controller.open()
+  })
+  newSessionTab.dataset.dshImagegenTab = 'new-session'
+  imageTab.dataset.dshImagegenTab = 'image'
+  tabs.append(newSessionTab, imageTab)
+
+  button.parentElement?.insertBefore(tabs, button)
+  hideShellButton(button)
+  return tabs
+}
+
+/** Mount an overlay host over the workspace/session tree for image history. */
+function placeHistoryHost(root: HTMLElement): HTMLDivElement | undefined {
+  const region = regionArea(root)
+  if (region === undefined) return undefined
+  const existing = region.querySelector<HTMLDivElement>(HISTORY_HOST_SELECTOR)
+  if (existing !== null) return existing
+  const host = document.createElement('div')
+  host.dataset.dshImagegenHistoryHost = ''
+  host.className = css.sidebarHistoryHost
+  region.append(host)
+  return host
+}
+
+/**
+ * Mount the two tabs and self-heal after React rebuilds the sidebar. The
+ * shell-owned button is restored by the disposer so unloading the plugin
+ * leaves the host unchanged.
+ */
+export function mountSidebarEntry(
+  controller: ImageGenController,
+  newSessionLabel: string,
+  newSessionTooltip: string,
+  imageLabel: string,
+  imageTooltip: string,
+): () => void {
+  let root: HTMLElement | undefined
+  let tabs: HTMLDivElement | undefined
+  let historyHost: HTMLDivElement | undefined
+  let originalButton: HTMLButtonElement | undefined
+
+  const syncActive = (): void => {
+    if (tabs === undefined) return
+    const newTab = tabs.querySelector<HTMLElement>('[data-dsh-imagegen-tab="new-session"]')
+    const imageTab = tabs.querySelector<HTMLElement>('[data-dsh-imagegen-tab="image"]')
+    if (controller.getSnapshot().panelOpen) {
+      if (newTab !== null) delete newTab.dataset.active
+      if (imageTab !== null) imageTab.dataset.active = ''
+    } else {
+      if (newTab !== null) newTab.dataset.active = ''
+      if (imageTab !== null) delete imageTab.dataset.active
+    }
+  }
+
+  const ensure = (): void => {
+    if (root !== undefined && !root.isConnected) {
+      root = undefined
+      tabs = undefined
+      historyHost = undefined
+      originalButton = undefined
+    }
+    root ??= sidebarRoot()
+    if (root === undefined) return
+    root.dataset.dshImagegenSidebarRoot = ''
+    const button = newSessionButton(root)
+    if (button === undefined) return
+    originalButton ??= button
+    tabs = placeTabs(root, controller, newSessionLabel, newSessionTooltip, imageLabel, imageTooltip)
+    historyHost = placeHistoryHost(root)
+    syncActive()
+  }
+
+  const bodyObserver = new MutationObserver(ensure)
+  bodyObserver.observe(document.body, { childList: true, subtree: true })
+  const unsubscribe = controller.subscribe(syncActive)
+  ensure()
+
+  return () => {
+    bodyObserver.disconnect()
+    unsubscribe()
+    tabs?.remove()
+    historyHost?.remove()
+    if (originalButton !== undefined && originalButton.isConnected) restoreShellButton(originalButton)
+    if (root !== undefined) delete root.dataset.dshImagegenSidebarRoot
+  }
+}

package/src/edit-image-command.ts

@@ -0,0 +1,110 @@
+/** Direct `/edit_image` command for editing the latest image in the session. */
+
+import type { Context } from '@deepseek-ai/cordis'
+import type { CommandResult } from '@deepseek-ai/dsh-commands'
+import type { AttachmentStore, ImageAttachmentRef } from '@deepseek-ai/dsh-attachment'
+import type {} from '@deepseek-ai/dsh-commands'
+import type {} from '@deepseek-ai/dsh-attachment'
+import {
+  submitAgentImageEdit,
+  type AgentImageToolConfig,
+} from './agent-image-tools.ts'
+import type { ImageGenerationRuntime } from './generation-runtime.ts'
+
+function isImageReference(value: unknown): value is ImageAttachmentRef {
+  if (typeof value !== 'object' || value === null || Array.isArray(value)) return false
+  const ref = value as Record<string, unknown>
+  return typeof ref.attachmentId === 'string'
+    && (ref.mediaType === 'image/png' || ref.mediaType === 'image/jpeg' || ref.mediaType === 'image/webp' || ref.mediaType === 'image/gif')
+    && Number.isInteger(ref.bytes) && (ref.bytes as number) > 0
+    && Number.isInteger(ref.width) && (ref.width as number) > 0
+    && Number.isInteger(ref.height) && (ref.height as number) > 0
+}
+
+function imageInContent(value: unknown): ImageAttachmentRef | undefined {
+  if (!Array.isArray(value)) return undefined
+  for (let index = value.length - 1; index >= 0; index -= 1) {
+    const block = value[index]
+    if (typeof block !== 'object' || block === null || Array.isArray(block)) continue
+    const raw = block as Record<string, unknown>
+    if (raw.type === 'image' && isImageReference(raw.attachment)) return raw.attachment
+    if (raw.type === 'tool-result') {
+      const nested = imageInContent(raw.content)
+      if (nested !== undefined) return nested
+    }
+  }
+  return undefined
+}
+
+/** Pick the newest image explicitly attached to this command invocation. */
+function imageInInvocation(value: unknown): ImageAttachmentRef | undefined {
+  if (!Array.isArray(value)) return undefined
+  for (let index = value.length - 1; index >= 0; index -= 1) {
+    const block = value[index]
+    if (typeof block !== 'object' || block === null || Array.isArray(block)) continue
+    const raw = block as Record<string, unknown>
+    if (raw.type === 'image' && isImageReference(raw.attachment)) return raw.attachment
+  }
+  return undefined
+}
+
+/** Find the newest durable image reference, including nested tool results. */
+export function latestSessionImage(messages: readonly unknown[]): ImageAttachmentRef | undefined {
+  for (let index = messages.length - 1; index >= 0; index -= 1) {
+    const message = messages[index]
+    if (typeof message !== 'object' || message === null || Array.isArray(message)) continue
+    const image = imageInContent((message as { content?: unknown }).content)
+    if (image !== undefined) return image
+  }
+  return undefined
+}
+
+function commandError(error: unknown): CommandResult {
+  const text = error instanceof Error ? error.message : String(error)
+  return { kind: 'error', text: text.trim() === '' ? '图片编辑失败。' : text }
+}
+
+/** Register the host-side command; it never sends the command line to a chat model. */
+export function registerEditImageCommand(
+  ctx: Context,
+  runtime: ImageGenerationRuntime,
+  resolve: () => AgentImageToolConfig,
+  pendingImages?: {
+    get: (sessionId: string) => ImageAttachmentRef | undefined
+    consume: (sessionId: string, ref: ImageAttachmentRef) => void
+  },
+): () => void {
+  return ctx.commands.register({
+    name: 'edit_image',
+    description: 'Edit the latest image in this conversation with the plugin image model',
+    // `images` is understood by the newer host command protocol. Keep the
+    // source compatible with older development-only command typings.
+    input: { hint: 'Describe how to modify the latest image', images: true } as { hint: string; images: boolean },
+    async handler(invocation): Promise<CommandResult> {
+      const prompt = invocation.rawInput.trim()
+      if (prompt === '') return { kind: 'error', text: '请提供图片修改描述，例如：/edit_image 把背景改成夜景' }
+      const invocationImage = imageInInvocation((invocation as typeof invocation & { attachments?: readonly unknown[] }).attachments)
+      // A staged composer image is newer than anything already committed to
+      // the session, so it must win when the user explicitly adds a preview
+      // or gallery image before running the command.
+      const pendingImage = pendingImages?.get(String(invocation.agent.id))
+      const durableImage = latestSessionImage(invocation.agent.session.deriveMessages())
+      const sourceImage = invocationImage ?? pendingImage ?? durableImage
+      if (sourceImage === undefined) return { kind: 'error', text: '当前对话没有可用图片，请先上传图片或把画廊图片加入对话。' }
+      try {
+        const task = await submitAgentImageEdit(ctx.attachments as Pick<AttachmentStore, 'readImage'>, runtime, resolve, {
+          prompt,
+          sourceImage,
+          signal: invocation.signal,
+        })
+        if (task.status === 'completed') {
+          if (pendingImage !== undefined) pendingImages?.consume(String(invocation.agent.id), pendingImage)
+          return { kind: 'success', text: '图片编辑已完成，可在 AI 生图面板查看结果。' }
+        }
+        return { kind: 'error', text: task.error ?? `图片编辑${task.status === 'cancelled' ? '已取消' : '失败'}。` }
+      } catch (error) {
+        return commandError(error)
+      }
+    },
+  })
+}

package/src/engine.ts

@@ -79,6 +79,15 @@ function isSeedream(model: string): boolean {
   return modelFamily(model) === 'seedream'
 }
 
+/** Whether the model uses the official Zhipu image-generation contract. */
+function isZhipuImage(model: string): boolean {
+  return modelFamily(model) === 'zhipu'
+}
+
+function isGlmImage(model: string): boolean {
+  return /^glm-image(?:-|$)/i.test(model.trim())
+}
+
 /** Whether this is the official Volcengine Ark model naming convention. */
 function isVolcSeedream(model: string): boolean {
   return /^doubao-seedream(?:-|$)/i.test(model.trim())
@@ -163,6 +172,22 @@ function bareBase64(value: string): string {
   return parsed !== undefined && parsed.base64 !== undefined ? parsed.base64 : value
 }
 
+/** Whether a result URL carries cloud-storage signing credentials. */
+function isPresignedUrl(value: string): boolean {
+  let url: URL
+  try {
+    url = new URL(value)
+  } catch {
+    return false
+  }
+  const params = new Set(Array.from(url.searchParams.keys(), key => key.toLowerCase()))
+  if (params.has('x-goog-signature') || params.has('x-goog-credential')) return true
+  if (params.has('x-amz-signature') || params.has('x-amz-credential')) return true
+  return params.has('signature') && (
+    params.has('expires') || params.has('googleaccessid') || params.has('awsaccesskeyid')
+  )
+}
+
 /** Clamp the requested image count into the API-accepted range. */
 function clampCount(n: number): number {
   if (!Number.isFinite(n)) return 1
@@ -234,6 +259,18 @@ function effectiveParams(request: GenerateRequest): {
       response_format: isVolcSeedream(model) ? 'url' : 'b64_json',
     }
   }
+  // Zhipu's official image API accepts OpenAI-style JSON but uses its own
+  // quality vocabulary. GLM-Image currently supports hd only; CogView uses
+  // the standard tier. Size remains a valid custom pixel size for both.
+  if (isZhipuImage(model)) {
+    return {
+      model,
+      ...request.size !== '' && request.size !== 'auto' && OPENAI_SIZE_BY_RATIO[request.size] !== undefined
+        ? { size: OPENAI_SIZE_BY_RATIO[request.size] }
+        : {},
+      quality: isGlmImage(model) ? 'hd' : 'standard',
+    }
+  }
   // OpenAI-compatible endpoints: nearest pixel size, clarity tiers mapped to
   // the quality levels (1k→low / 2k→medium / 4k→high), detail passthrough.
   return {
@@ -261,9 +298,11 @@ async function normalizeItem(
   upstream: UpstreamConfig,
 ): Promise<{ b64: string; mime: string; revisedPrompt?: string }> {
   const revisedPrompt = typeof item.revised_prompt === 'string' ? item.revised_prompt : undefined
-  if (typeof item.b64_json === 'string') {
+  if (typeof item.b64_json === 'string' && item.b64_json.trim() !== '') {
     const b64 = bareBase64(item.b64_json)
-    return { b64, mime: detectImageMime(Buffer.from(b64, 'base64')) ?? 'image/png', revisedPrompt }
+    if (b64.trim() !== '') {
+      return { b64, mime: detectImageMime(Buffer.from(b64, 'base64')) ?? 'image/png', revisedPrompt }
+    }
   }
   if (typeof item.url !== 'string' || item.url === '') {
     throw new ImageGenError('upstream image item has neither b64_json nor url')
@@ -278,9 +317,9 @@ async function normalizeItem(
   let response: Response
   try {
     response = await fetch(url, {
-      headers: {
-        ...upstream.apiKey === '' ? {} : { authorization: `Bearer ${upstream.apiKey}` },
-      },
+      ...isPresignedUrl(url) || upstream.apiKey === ''
+        ? {}
+        : { headers: { authorization: `Bearer ${upstream.apiKey}` } },
       signal: budget.signal,
     })
   } catch (error) {
@@ -443,6 +482,9 @@ export async function generateImage(upstream: UpstreamConfig, request: GenerateR
   const baseUrl = upstream.apiUrl.trim().replace(/\/+$/, '')
   if (baseUrl === '') throw new ImageGenError('api_url 未配置：请先在「设置 → 插件 → 可配置」中填写', 'config-missing')
   if (upstream.apiKey.trim() === '') throw new ImageGenError('api_key 未配置：请先在「设置 → 插件 → 可配置」中填写', 'config-missing')
+  if (request.mode === 'edit' && isZhipuImage(wireModel(request))) {
+    throw new ImageGenError('智谱 GLM-Image 当前仅支持文生图，请切换到文生图模式或选择支持图生图的模型', 'edit-unsupported')
+  }
   const params = effectiveParams(request)
   const count = effectiveCount(request)
   const batches = await Promise.all(

package/src/gallery-store.ts

@@ -63,6 +63,11 @@ interface StoredEntry {
   tags?: string[]
   channelId?: string
   channel?: string
+  workflow?: 'ecommerce'
+  projectId?: string
+  projectName?: string
+  slotKey?: string
+  slotLabel?: string
 }
 
 /** The index.json shape. */
@@ -140,6 +145,11 @@ function isStoredEntry(value: unknown): value is StoredEntry {
   return typeof entry.id === 'string'
     && typeof entry.createdAt === 'number'
     && (entry.mode === 'text' || entry.mode === 'edit')
+    && (entry.workflow === undefined || entry.workflow === 'ecommerce')
+    && (entry.projectId === undefined || typeof entry.projectId === 'string')
+    && (entry.projectName === undefined || typeof entry.projectName === 'string')
+    && (entry.slotKey === undefined || typeof entry.slotKey === 'string')
+    && (entry.slotLabel === undefined || typeof entry.slotLabel === 'string')
     && typeof entry.prompt === 'string'
     && Array.isArray(entry.images)
     && entry.images.every(image => {
@@ -177,6 +187,11 @@ function toWire(entry: StoredEntry): HistoryEntry {
     ...entry.tags === undefined ? {} : { tags: entry.tags },
     ...entry.channel === undefined ? {} : { channel: entry.channel },
     ...entry.channelId === undefined ? {} : { channelId: entry.channelId },
+    ...entry.workflow === undefined ? {} : { workflow: entry.workflow },
+    ...entry.projectId === undefined ? {} : { projectId: entry.projectId },
+    ...entry.projectName === undefined ? {} : { projectName: entry.projectName },
+    ...entry.slotKey === undefined ? {} : { slotKey: entry.slotKey },
+    ...entry.slotLabel === undefined ? {} : { slotLabel: entry.slotLabel },
   }
 }
 
@@ -231,6 +246,11 @@ export async function appendGallery(input: HistoryEntryInput): Promise<GalleryAp
       ...input.refName === undefined ? {} : { refName: input.refName },
       ...input.channelId === undefined ? {} : { channelId: input.channelId },
       ...input.channel === undefined ? {} : { channel: input.channel },
+      ...input.workflow === undefined ? {} : { workflow: input.workflow },
+      ...input.projectId === undefined ? {} : { projectId: input.projectId },
+      ...input.projectName === undefined ? {} : { projectName: input.projectName },
+      ...input.slotKey === undefined ? {} : { slotKey: input.slotKey },
+      ...input.slotLabel === undefined ? {} : { slotLabel: input.slotLabel },
     }
     const merged = [entry, ...await readIndex()]
     await writeIndex(merged)

package/src/generation-runtime.ts

@@ -38,7 +38,9 @@ export class ImageGenerationRuntime {
     private readonly resolve: () => ChannelsView,
     private readonly history: HistorySink = { append: appendHistory },
   ) {
-    this.queue = new GenerationTaskQueue((request, signal) => this.run(request, signal))
+    // 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.
+    this.queue = new GenerationTaskQueue((request, signal) => this.run(request, signal), 4)
   }
 
   async run(request: GenerateRequest, signal?: AbortSignal): Promise<GenerateResult> {
@@ -66,10 +68,17 @@ export class ImageGenerationRuntime {
         ...request.refName === undefined ? {} : { refName: request.refName },
         ...request.channelId === undefined ? {} : { channelId: request.channelId },
         ...request.channel === undefined ? {} : { channel: request.channel },
+        ...request.comparisonId === undefined ? {} : { comparisonId: request.comparisonId },
+        ...request.comparisonModels === undefined ? {} : { comparisonModels: request.comparisonModels },
+        ...request.workflow === undefined ? {} : { workflow: request.workflow },
+        ...request.projectId === undefined ? {} : { projectId: request.projectId },
+        ...request.projectName === undefined ? {} : { projectName: request.projectName },
+        ...request.slotKey === undefined ? {} : { slotKey: request.slotKey },
+        ...request.slotLabel === undefined ? {} : { slotLabel: request.slotLabel },
       })
       return { ...result, history }
     } catch (error) {
       return { ...result, historyError: error instanceof Error ? error.message : String(error) }
     }
   }
-}
+}