@dickpy/dsh-imagegen 1.3.0 → 1.5.0

package/src/history-store.ts

@@ -49,6 +49,13 @@ interface StoredEntry {
   refName?: string
   channelId?: string
   channel?: string
+  comparisonId?: string
+  comparisonModels?: string[]
+  workflow?: 'ecommerce'
+  projectId?: string
+  projectName?: string
+  slotKey?: string
+  slotLabel?: string
 }
 
 /** The index.json shape. */
@@ -119,6 +126,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 => {
@@ -155,6 +167,13 @@ function toWire(entry: StoredEntry): HistoryEntry {
     ...entry.refName === undefined ? {} : { refName: entry.refName },
     ...entry.channel === undefined ? {} : { channel: entry.channel },
     ...entry.channelId === undefined ? {} : { channelId: entry.channelId },
+    ...entry.comparisonId === undefined ? {} : { comparisonId: entry.comparisonId },
+    ...entry.comparisonModels === undefined ? {} : { comparisonModels: entry.comparisonModels },
+    ...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 },
   }
 }
 
@@ -199,6 +218,13 @@ export async function appendHistory(input: HistoryEntryInput): Promise<HistoryEn
       ...input.refName === undefined ? {} : { refName: input.refName },
       ...input.channelId === undefined ? {} : { channelId: input.channelId },
       ...input.channel === undefined ? {} : { channel: input.channel },
+      ...input.comparisonId === undefined ? {} : { comparisonId: input.comparisonId },
+      ...input.comparisonModels === undefined ? {} : { comparisonModels: input.comparisonModels },
+      ...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()]
     const kept = merged.slice(0, HISTORY_MAX)

package/src/image-models.ts

@@ -4,7 +4,7 @@
  * allow-list because OpenAI-compatible gateways rarely advertise modalities.
  */
 
-export const DEFAULT_IMAGE_MODELS = ['gpt-image-2', 'grok-imagine-image', 'nanobanana2', 'nanobanana2-lite', 'nanobanana-pro', 'seedream-5.0-pro'] as const
+export const DEFAULT_IMAGE_MODELS = ['gpt-image-2', 'grok-imagine-image', 'nanobanana2', 'nanobanana2-lite', 'nanobanana-pro', 'seedream-5.0-pro', 'glm-image'] as const
 
 /** Normalize user-entered model identifiers and retain a usable legacy default. */
 export function normalizeImageModels(value: unknown): string[] {

package/src/index.ts

@@ -14,19 +14,22 @@ import z from 'schemastery'
 import type {} from '@deepseek-ai/dsh-host-webserver'
 // Type-only: pulls the systemPrompt Context merge (announcement section).
 import type {} from '@deepseek-ai/dsh-system-prompt'
+// Type-only: pulls the human slash-command registry Context merge.
+import type {} from '@deepseek-ai/dsh-commands'
 import type {} from '@deepseek-ai/dsh-tools'
-import type {} from '@deepseek-ai/dsh-attachment'
+import type { ImageAttachmentRef } from '@deepseek-ai/dsh-attachment'
 import { IMAGEGEN_SETTINGS_NAMESPACE, type ChannelConfig, type ModelMapping } from './protocol.ts'
 import { makeRoutes, type SettingsSeam } from './routes.ts'
 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 { presetById } from './presets.ts'
 
 /** Stable cordis plugin name. */
 export const name = 'imagegen'
 
 /** Services required before the surfaces can mount. */
-export const inject = ['webServer', 'systemPrompt']
+export const inject = ['webServer', 'systemPrompt', 'commands']
 
 // Internals re-exported for smoke tests and host-side debugging; the plugin
 // contract only requires name / inject / Config / apply.
@@ -34,6 +37,7 @@ export { makeRoutes } from './routes.ts'
 export { generateImage, ImageGenError } from './engine.ts'
 export { ImageGenerationRuntime } from './generation-runtime.ts'
 export { registerAgentImageTools } from './agent-image-tools.ts'
+export { latestSessionImage, registerEditImageCommand } from './edit-image-command.ts'
 export { appendGallery, clearGallery, listGallery, readGalleryImage, removeGallery, updateGalleryTags } from './gallery-store.ts'
 export { listTemplates, readTemplateImage, refreshTemplates, clearTemplateMemo } from './templates-store.ts'
 export { checkForUpdate, clearUpdateCache, compareVersions, CURRENT_VERSION, installUpdate, profileFromProcess } from './updater.ts'
@@ -111,7 +115,7 @@ const DEFAULT_ALLOW_AGENT_IMAGE_GENERATION = true
 const SECTION_ORDER = 150
 
 /** Model-facing announcement: plugin presence, capabilities, and limits. */
-export const IMAGEGEN_GUIDANCE = '本机已安装 dsh-imagegen 插件（DSH AI 生图）：侧边栏「AI 生图」入口。能力：通过「渠道」对接 OpenAI 兼容图像生成 API（每个渠道 = 一个 API 端点 + 各自的模型目录），支持文生图（/images/generations）与图生图（/images/edits，上传参考图，grok-imagine 模型按官方 JSON image_url 协议发送，nanobanana 系列按 aspect_ratio / image_size 参数协议发送；seedream 系列统一走 /images/generations，参考图以 JSON image 数组发送）。API 地址与密钥在 GUI 设置中按渠道配置，密钥仅存于本机设置文档；生成请求由本地宿主代理转发，结果以 base64 返回面板，可预览与下载。模型只能使用用户在各渠道配置目录中的模型；模型出现在 /models 中不等于其网关原生支持生图协议，遇到 Qwen、Gemini 等非 OpenAI 生图协议时应如实说明上游兼容性。可一键把满意的图片加入「画廊」。内置「提示词模板库」（面板提示词框左下角「模板库」按钮）：打包 awesome-gpt-image-2 的数百条提示词案例，可搜索、筛选与复用。Agent 可直接调用 `generate_image` 提交文生图，也可用 `edit_image` 图生图；默认保持工具调用等待直到任务完成，完成图片显示在工具调用对应的左侧结果区域，模型收到状态和附件引用，不会额外伪造用户消息。若明确需要后台执行，可传 `wait_for_completion: false`，之后再用 `get_image_generation_task` 查询；不要反复轮询。限制：生成消耗上游 API 额度；图片内容由上游模型生成，可能不符合预期或包含不适宜内容；api_key 以明文存储在设置文档中；参考图会发送至所配置的 API 服务；模板库在线刷新与参考图首次加载需要访问 vibeui.top。用户提到「生图 / 绘画 / 生成图片 / 文生图 / 图生图 / 画廊 / 提示词模板」时即指本插件，请据此协作。'
+export const IMAGEGEN_GUIDANCE = '本机已安装 dsh-imagegen 插件（DSH AI 生图）：侧边栏「AI 生图」入口。能力：通过「渠道」对接 OpenAI 兼容图像生成 API（每个渠道 = 一个 API 端点 + 各自的模型目录），支持文生图（/images/generations）与图生图（/images/edits，上传参考图，grok-imagine 模型按官方 JSON image_url 协议发送，nanobanana 系列按 aspect_ratio / image_size 参数协议发送；seedream 系列统一走 /images/generations，参考图以 JSON image 数组发送；智谱 `glm-image` 使用官方 `/api/paas/v4/images/generations`，当前仅支持文生图）。API 地址与密钥在 GUI 设置中按渠道配置，密钥仅存于本机设置文档；生成请求由本地宿主代理转发，结果以 base64 返回面板，可预览与下载。模型只能使用用户在各渠道配置目录中的模型；检测模型时会过滤聊天、Embedding 等非图片模型，但模型出现在 /models 中仍不等于其网关原生支持生图协议，遇到 Qwen、Gemini 等非 OpenAI 生图协议时应如实说明上游兼容性。可一键把满意的图片加入「画廊」。内置「提示词模板库」（面板提示词框左下角「模板库」按钮）：打包 awesome-gpt-image-2 的数百条提示词案例，可搜索、筛选与复用。Agent 可直接调用 `generate_image` 提交文生图，也可用 `edit_image` 图生图；默认保持工具调用等待直到任务完成，完成图片显示在工具调用对应的左侧结果区域，模型收到状态和附件引用，不会额外伪造用户消息。用户也可以使用 `/edit_image <修改描述>`，命令会直接读取当前对话最近图片并调用插件图片模型，不经过对话模型的图片能力检查。若明确需要后台执行，可传 `wait_for_completion: false`，之后再用 `get_image_generation_task` 查询；不要反复轮询。限制：生成消耗上游 API 额度；图片内容由上游模型生成，可能不符合预期或包含不适宜内容；api_key 以明文存储在设置文档中；参考图会发送至所配置的 API 服务；模板库在线刷新与参考图首次加载需要访问 vibeui.top。用户提到「生图 / 绘画 / 生成图片 / 文生图 / 图生图 / 画廊 / 提示词模板」时即指本插件，请据此协作。'
 
 /** Append the live channel × model table so an Agent can honor user choices. */
 function guidanceFor(channels: RuntimeChannel[], defaultChannelId: string): string {
@@ -235,6 +239,7 @@ export function apply(ctx: Context, config?: Config): void {
   // entry points; Agent tools wait for their task result by default and render
   // images in the tool result instead of injecting a synthetic user message.
   const runtime = new ImageGenerationRuntime(channelsView)
+  const pendingConversationImages = new Map<string, ImageAttachmentRef>()
 
   // The route family mounts once, gated on the settings seam (the bridge
   // serves it; without the seam there is nothing to expose). Route handlers
@@ -267,6 +272,7 @@ export function apply(ctx: Context, config?: Config): void {
             return [...new Set(value.channels.flatMap(channel => channel.models.map(model => model.alias)))]
           },
           attachments: sctx.attachments,
+          pendingConversationImages,
           runtime,
         })
         const disposers = routes.map(route => ctx.webServer.register(route))
@@ -276,16 +282,29 @@ export function apply(ctx: Context, config?: Config): void {
     )
   })
 
-  ctx.inject(['tools', 'attachments'], (tctx) => {
-    tctx.effect(() => registerAgentImageTools(tctx, runtime, () => {
-      const value = resolve()
-      return {
-        enabled: value.enabled,
-        allowAgentImageGeneration: value.allowAgentImageGeneration,
-        channels: value.channels,
-        defaultChannelId: value.defaultChannelId,
+  ctx.inject(['tools', 'attachments', 'commands'], (tctx) => {
+    tctx.effect(() => {
+      const resolveAgentConfig = () => {
+        const value = resolve()
+        return {
+          enabled: value.enabled,
+          allowAgentImageGeneration: value.allowAgentImageGeneration,
+          channels: value.channels,
+          defaultChannelId: value.defaultChannelId,
+        }
       }
-    }), 'dsh-imagegen: agent image tools')
+      const disposeTools = registerAgentImageTools(tctx, runtime, resolveAgentConfig)
+      const disposeCommand = registerEditImageCommand(tctx, runtime, resolveAgentConfig, {
+        get: sessionId => pendingConversationImages.get(sessionId),
+        consume: (sessionId, ref) => {
+          if (pendingConversationImages.get(sessionId)?.attachmentId === ref.attachmentId) pendingConversationImages.delete(sessionId)
+        },
+      })
+      return () => {
+        disposeCommand()
+        disposeTools()
+      }
+    }, 'dsh-imagegen: agent image tools and commands')
   })
 
   // System-prompt announcement (toggled by settings changes).

package/src/model-catalog.ts

@@ -8,7 +8,7 @@
  * Framework-free (pure data + regex), safe for the client bundle to inline.
  */
 
-export type ModelFamily = 'gpt-image' | 'dall-e' | 'grok' | 'nanobanana' | 'seedream' | 'unknown'
+export type ModelFamily = 'gpt-image' | 'dall-e' | 'grok' | 'nanobanana' | 'seedream' | 'zhipu' | 'unknown'
 
 /** Capability/identity annotation for one model id. */
 export interface ModelCatalogEntry {
@@ -69,6 +69,14 @@ const ENTRIES: Record<Exclude<ModelFamily, 'unknown'>, Omit<ModelCatalogEntry, '
     supportsAspectRatio: true,
     qualityTiers: ['1K', '2K'],
   },
+  zhipu: {
+    label: 'GLM-Image',
+    labelZh: '智谱图像',
+    known: true,
+    supportsEdit: false,
+    supportsAspectRatio: false,
+    qualityTiers: ['HD'],
+  },
 }
 
 /** Official Gemini image ids served by Nano Banana gateways. */
@@ -89,10 +97,19 @@ export function describeModel(model: string): ModelCatalogEntry {
   if (/^grok-imagine(?:-|$)/.test(id)) return { family: 'grok', ...ENTRIES.grok }
   if (/^nanobanana/i.test(id) || NANOBANANA_GEMINI_IDS.has(id)) return { family: 'nanobanana', ...ENTRIES.nanobanana }
   if (/^(?:doubao-)?seedream/i.test(id)) return { family: 'seedream', ...ENTRIES.seedream }
+  if (/^(?:glm-image|cogview(?:-|$))/i.test(id)) return { family: 'zhipu', ...ENTRIES.zhipu }
   return { family: 'unknown', label: 'unknown', labelZh: '未知协议', known: false, supportsEdit: true, supportsAspectRatio: false, qualityTiers: [] }
 }
 
+/** Conservative fallback for providers whose /models response only has ids.
+ *  Metadata-aware filtering lives in prompt-enhancer.ts; this catches common
+ *  image model naming conventions without treating every unknown model as an
+ *  image model. */
+export function isLikelyImageModelId(model: string): boolean {
+  return /(?:^|[-_.])(?:image|img|diffusion|flux|cogview|imagen|seedream|nanobanana|grok-imagine|dall-e|stable-diffusion|sdxl|pixart|kolors|ideogram|midjourney|recraft|hunyuan|jimeng|wanx|hidream|playground)(?:$|[-_.])/i.test(model.trim())
+}
+
 /** The family a model id routes its request through. */
 export function modelFamily(model: string): ModelFamily {
   return describeModel(model).family
-}
+}

package/src/presets.ts

@@ -40,10 +40,18 @@ export const IMAGE_PRESETS: PresetProvider[] = [
     id: 'openai-official',
     name: 'OpenAI 官方',
     apiUrl: 'https://api.openai.com/v1',
-    hint: 'OpenAI 官方接口：gpt-image-2 / dall-e-3',
+    hint: 'OpenAI 官方图像生成接口',
     models: [
       { alias: 'gpt-image-2', id: 'gpt-image-2' },
-      { alias: 'dall-e-3', id: 'dall-e-3' },
+    ],
+  },
+  {
+    id: 'zhipu-official',
+    name: '智谱 AI 官方',
+    apiUrl: 'https://open.bigmodel.cn/api/paas/v4',
+    hint: '智谱官方 GLM-Image 图像生成接口',
+    models: [
+      { alias: 'glm-image', id: 'glm-image' },
     ],
   },
   {
@@ -60,4 +68,4 @@ export const IMAGE_PRESETS: PresetProvider[] = [
 /** Look up one built-in provider by id. */
 export function presetById(id: string): PresetProvider | undefined {
   return IMAGE_PRESETS.find(preset => preset.id === id)
-}
+}

package/src/prompt-enhancer.ts

@@ -1,5 +1,7 @@
 /** OpenAI-compatible chat helpers used by the optional prompt-enhancement UI. */
 
+import { isLikelyImageModelId } from './model-catalog.ts'
+
 export interface PromptModelConfig {
   apiUrl: string
   apiKey: string
@@ -34,15 +36,71 @@ async function responseJson(response: Response): Promise<Record<string, unknown>
   return body as Record<string, unknown>
 }
 
-/** List candidates exposed by an OpenAI-compatible endpoint. */
-export async function listOpenAIModels(config: ModelListConfig): Promise<string[]> {
+type ModelRecord = Record<string, unknown> & { id: string }
+
+async function listModelRecords(config: ModelListConfig): Promise<ModelRecord[]> {
   if (config.apiUrl.trim() === '') throw new Error('API URL is required')
   const response = await fetch(endpoint(config.apiUrl, '/models'), { headers: headers(config.apiKey) })
   const body = await responseJson(response)
   const data = Array.isArray(body.data) ? body.data : []
-  return [...new Set(data
-    .flatMap(item => item !== null && typeof item === 'object' && typeof (item as { id?: unknown }).id === 'string' ? [(item as { id: string }).id.trim()] : [])
-    .filter(Boolean))]
+  return data.flatMap(item => {
+    if (item === null || typeof item !== 'object' || typeof (item as { id?: unknown }).id !== 'string') return []
+    const id = (item as { id: string }).id.trim()
+    return id === '' ? [] : [{ ...(item as Record<string, unknown>), id }]
+  })
+}
+
+function textOf(value: unknown): string[] {
+  if (typeof value === 'string') return [value]
+  if (!Array.isArray(value)) return []
+  return value.filter((item): item is string => typeof item === 'string')
+}
+
+function hasImageGenerationCapability(record: ModelRecord): boolean | undefined {
+  const capability = record.capabilities
+  if (capability !== null && typeof capability === 'object') {
+    const values = capability as Record<string, unknown>
+    for (const key of ['image_generation', 'imageGeneration', 'text_to_image', 'textToImage', 'image_gen']) {
+      if (typeof values[key] === 'boolean') return values[key]
+    }
+    const serialized = JSON.stringify(values).toLowerCase()
+    if (/image[ _-]?generation|text[ _-]?to[ _-]?image/.test(serialized)) return true
+  }
+
+  const taskText = [
+    ...textOf(record.task),
+    ...textOf(record.task_type),
+    ...textOf(record.taskType),
+    ...textOf(record.type),
+    ...textOf(record.model_type),
+    ...textOf(record.modelType),
+    ...textOf(record.tasks),
+    ...textOf(record.description),
+  ].join(' ').toLowerCase()
+  if (/image[ _-]?generation|text[ _-]?to[ _-]?image|image[ _-]?gen/.test(taskText)) return true
+  if (/^image(?:[ _-]?generation)?$/.test(taskText.trim())) return true
+  if (/embedding|rerank|moderation|transcri|speech|audio|video|chat[ _-]?completion/.test(taskText)) return false
+
+  for (const key of ['output_modalities', 'outputModalities', 'supported_output_modalities']) {
+    const modalities = textOf(record[key]).map(value => value.toLowerCase())
+    if (modalities.length > 0) return modalities.includes('image')
+  }
+  return undefined
+}
+
+function isImageModelRecord(record: ModelRecord): boolean {
+  return hasImageGenerationCapability(record) ?? isLikelyImageModelId(record.id)
+}
+
+/** List candidates exposed by an OpenAI-compatible endpoint. */
+export async function listOpenAIModels(config: ModelListConfig): Promise<string[]> {
+  return [...new Set((await listModelRecords(config)).map(record => record.id))]
+    .sort((a, b) => a.localeCompare(b))
+}
+
+/** List only models that advertise or conventionally represent image generation. */
+export async function listImageModels(config: ModelListConfig): Promise<string[]> {
+  return [...new Set((await listModelRecords(config)).filter(isImageModelRecord).map(record => record.id))]
     .sort((a, b) => a.localeCompare(b))
 }
 

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.3.0'
+export const PLUGIN_VERSION = '1.5.0'
 
 /** Same-origin route family (loopback-only, mirroring the dsh-ssh fence). */
 export const SETTINGS_API = {
@@ -36,6 +36,9 @@ export const PRESETS_API = '/api/dsh-imagegen/presets' as const
 /** Loopback-only image reader for Agent tool-result previews. */
 export const AGENT_IMAGE_API = '/api/dsh-imagegen/agent-image' as const
 
+/** Store the current composer image for the direct edit_image command. */
+export const CONVERSATION_IMAGE_API = '/api/dsh-imagegen/conversation-image' as const
+
 /**
  * Host-computed per-channel usage counters (generation-count badges in the
  * settings card): entries are tallied from the persisted history and gallery
@@ -149,8 +152,47 @@ export interface TemplateRefreshResult {
 /** Generation modes. */
 export type GenerateMode = 'text' | 'edit'
 
+/** Metadata shared by the ecommerce product-set workflow. */
+export interface EcommerceTaskMeta {
+  workflow?: 'ecommerce'
+  projectId?: string
+  projectName?: string
+  slotKey?: string
+  slotLabel?: string
+}
+
+/** Role an uploaded product asset plays in the ecommerce workflow. 'none' is
+ *  only used as a slot selection meaning "generate without a reference". */
+export type EcommerceRefRole = 'none' | 'product' | 'packaging' | 'detail' | 'style'
+
+/** One planned image slot in a product set. */
+export interface ProductSetSlot {
+  key: string
+  label: string
+  description: string
+  count: number
+  enabled: boolean
+  /** Which uploaded asset role this slot uses as its edit reference. */
+  refRole?: EcommerceRefRole
+}
+
+/** A browser-local ecommerce product-set draft. */
+export interface ProductSetDraft {
+  projectId: string
+  projectName: string
+  category: string
+  platform: string
+  language: string
+  size: string
+  productName: string
+  sellingPoints: string
+  protectedFeatures: string
+  styleHint: string
+  slots: ProductSetSlot[]
+}
+
 /** A client → host generate request (what the panel collects). */
-export interface GenerateRequest {
+export interface GenerateRequest extends EcommerceTaskMeta {
   /** text-to-image (images/generations) or image-to-image (images/edits). */
   mode: GenerateMode
   /**
@@ -191,6 +233,10 @@ export interface GenerateRequest {
   /** Upstream model id actually sent to the gateway (host-filled from the
    *  alias mapping; defaults to `model` when absent). */
   upstream?: string
+  /** Stable client-created id shared by the tasks in one comparison run. */
+  comparisonId?: string
+  /** All model aliases selected for one comparison run. */
+  comparisonModels?: string[]
 }
 
 /** One generated image, normalized host-side to base64 so the browser never
@@ -254,7 +300,7 @@ export interface PresetProviderView {
 
 export type GenerationTaskStatus = 'queued' | 'running' | 'completed' | 'failed' | 'cancelled'
 
-export interface GenerationTask {
+export interface GenerationTask extends EcommerceTaskMeta {
   id: string
   request: GenerateRequest
   status: GenerationTaskStatus
@@ -285,7 +331,7 @@ export interface HistoryImageRef {
 }
 
 /** A saved generation as the browser consumes it (metadata + served images). */
-export interface HistoryEntry {
+export interface HistoryEntry extends EcommerceTaskMeta {
   id: string
   createdAt: number
   mode: GenerateMode
@@ -304,10 +350,14 @@ export interface HistoryEntry {
   channelId?: string
   /** Channel display name snapshot (survives channel deletion). */
   channel?: string
+  /** Stable id shared by the history entries in one comparison run. */
+  comparisonId?: string
+  /** Model aliases included in the comparison run. */
+  comparisonModels?: string[]
 }
 
 /** A history entry the client submits for persistence (images still carry base64). */
-export interface HistoryEntryInput {
+export interface HistoryEntryInput extends EcommerceTaskMeta {
   id: string
   createdAt: number
   mode: GenerateMode
@@ -323,4 +373,8 @@ export interface HistoryEntryInput {
   channelId?: string
   /** Channel display name snapshot (survives channel deletion). */
   channel?: string
+  /** Stable id shared by the history entries in one comparison run. */
+  comparisonId?: string
+  /** Model aliases included in the comparison run. */
+  comparisonModels?: string[]
 }

package/src/routes.ts

@@ -8,10 +8,10 @@
 import type { IncomingMessage, ServerResponse } from 'node:http'
 import { randomUUID } from 'node:crypto'
 import type { WebRoute } from '@deepseek-ai/dsh-host-webserver'
-import type { ImageAttachmentRef, ImageMediaType } from '@deepseek-ai/dsh-attachment'
+import type { ImageAttachmentRef, ImageMediaType, SaveImageAttachment } from '@deepseek-ai/dsh-attachment'
 import { SettingsConflictError, settingsNamespace, type SettingsDescriptor } from '@deepseek-ai/dsh-settings'
 import type { UpstreamConfig } from './engine.ts'
-import { enhancePrompt, listOpenAIModels, listPromptModels, type PromptModelConfig } from './prompt-enhancer.ts'
+import { enhancePrompt, listImageModels, listPromptModels, type PromptModelConfig } from './prompt-enhancer.ts'
 import { normalizeImageModels } from './image-models.ts'
 import { ImageGenerationRuntime, type ChannelsView } from './generation-runtime.ts'
 import { appendHistory, clearHistory, listHistory, readHistoryImage, removeHistory } from './history-store.ts'
@@ -19,7 +19,7 @@ import { appendGallery, clearGallery, listGallery, readGalleryImage, removeGalle
 import { listTemplates, readTemplateImage, refreshTemplates } from './templates-store.ts'
 import { checkForUpdate, CURRENT_VERSION, installUpdate } from './updater.ts'
 import { IMAGE_PRESETS } from './presets.ts'
-import { AGENT_IMAGE_API, GALLERY_API, GENERATE_API, HISTORY_API, IMAGEGEN_SETTINGS_NAMESPACE, IMAGE_MODEL_API, PRESETS_API, PROMPT_ENHANCE_API, SETTINGS_API, TASK_API, TEMPLATES_API, UPDATE_API, USAGE_API, type GeneratedImage, type GenerateRequest, type HistoryEntry, type HistoryEntryInput, type ModelMapping, type PresetProviderView, type TemplateListResult, type TemplateRefreshResult } from './protocol.ts'
+import { AGENT_IMAGE_API, CONVERSATION_IMAGE_API, GALLERY_API, GENERATE_API, HISTORY_API, IMAGEGEN_SETTINGS_NAMESPACE, IMAGE_MODEL_API, PRESETS_API, PROMPT_ENHANCE_API, SETTINGS_API, TASK_API, TEMPLATES_API, UPDATE_API, USAGE_API, type GeneratedImage, type GenerateRequest, type HistoryEntry, type HistoryEntryInput, type ModelMapping, type PresetProviderView, type TemplateListResult, type TemplateRefreshResult } from './protocol.ts'
 
 /** Cap on JSON request bodies (settings ops and generate payloads are small). */
 const MAX_JSON_BODY_BYTES = 24 * 1024 * 1024
@@ -49,6 +49,11 @@ export interface ImageGenRoutesDeps {
   /** Host attachment storage used by Agent tool-result previews. */
   attachments?: {
     readImage: (ref: ImageAttachmentRef) => Promise<{ ref: ImageAttachmentRef; data: Uint8Array }>
+    saveImage?: (input: SaveImageAttachment) => Promise<ImageAttachmentRef>
+  }
+  /** Latest composer image staged for the direct edit_image command. */
+  pendingConversationImages?: {
+    set: (sessionId: string, ref: ImageAttachmentRef) => void
   }
   /** Overrideable history backend, primarily for host integration tests. */
   history?: {
@@ -133,6 +138,9 @@ function messageOf(error: unknown): string {
 function parseGenerateRequest(body: Record<string, unknown>): GenerateRequest | undefined {
   const prompt = typeof body.prompt === 'string' ? body.prompt.trim() : ''
   if (prompt === '') return undefined
+  const comparisonModels = Array.isArray(body.comparisonModels)
+    ? [...new Set(body.comparisonModels.filter((model): model is string => typeof model === 'string').map(model => model.trim()).filter(Boolean))]
+    : []
   return {
     mode: body.mode === 'edit' ? 'edit' : 'text',
     model: typeof body.model === 'string' ? body.model : '',
@@ -144,6 +152,13 @@ function parseGenerateRequest(body: Record<string, unknown>): GenerateRequest |
     ...typeof body.image === 'string' && body.image !== '' ? { image: body.image } : {},
     ...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 } : {},
+    ...comparisonModels.length > 1 ? { comparisonModels } : {},
+    ...body.workflow === 'ecommerce' ? { workflow: 'ecommerce' as const } : {},
+    ...typeof body.projectId === 'string' && body.projectId !== '' ? { projectId: body.projectId } : {},
+    ...typeof body.projectName === 'string' && body.projectName !== '' ? { projectName: body.projectName } : {},
+    ...typeof body.slotKey === 'string' && body.slotKey !== '' ? { slotKey: body.slotKey } : {},
+    ...typeof body.slotLabel === 'string' && body.slotLabel !== '' ? { slotLabel: body.slotLabel } : {},
   }
 }
 
@@ -169,6 +184,9 @@ function parseHistoryEntryInput(body: Record<string, unknown>): HistoryEntryInpu
       ...typeof image.revisedPrompt === 'string' ? { revisedPrompt: image.revisedPrompt } : {},
     })
   }
+  const comparisonModels = Array.isArray(entry.comparisonModels)
+    ? [...new Set(entry.comparisonModels.filter((model): model is string => typeof model === 'string').map(model => model.trim()).filter(Boolean))]
+    : []
   return {
     id: entry.id,
     createdAt: entry.createdAt,
@@ -183,6 +201,13 @@ function parseHistoryEntryInput(body: Record<string, unknown>): HistoryEntryInpu
     ...typeof entry.refName === 'string' ? { refName: entry.refName } : {},
     ...typeof entry.channelId === 'string' ? { channelId: entry.channelId } : {},
     ...typeof entry.channel === 'string' ? { channel: entry.channel } : {},
+    ...typeof entry.comparisonId === 'string' ? { comparisonId: entry.comparisonId } : {},
+    ...comparisonModels.length > 1 ? { comparisonModels } : {},
+    ...entry.workflow === 'ecommerce' ? { workflow: 'ecommerce' as const } : {},
+    ...typeof entry.projectId === 'string' ? { projectId: entry.projectId } : {},
+    ...typeof entry.projectName === 'string' ? { projectName: entry.projectName } : {},
+    ...typeof entry.slotKey === 'string' ? { slotKey: entry.slotKey } : {},
+    ...typeof entry.slotLabel === 'string' ? { slotLabel: entry.slotLabel } : {},
   }
 }
 
@@ -231,6 +256,13 @@ function isImageMediaType(value: string): value is ImageMediaType {
   return value === 'image/png' || value === 'image/jpeg' || value === 'image/webp' || value === 'image/gif'
 }
 
+function imageDataUrl(value: string): { mediaType: ImageMediaType; data: Uint8Array } | undefined {
+  const match = /^data:(image\/(?:png|jpeg|webp|gif));base64,(.*)$/su.exec(value.trim())
+  if (match === null || match[1] === undefined || match[2] === undefined) return undefined
+  const data = Buffer.from(match[2], 'base64')
+  return data.byteLength === 0 ? undefined : { mediaType: match[1] as ImageMediaType, data }
+}
+
 /** Project one settings descriptor onto the bridge wire view. */
 function toView(descriptor: SettingsDescriptor): Record<string, unknown> {
   return {
@@ -341,6 +373,32 @@ export function makeRoutes(deps: ImageGenRoutesDeps): WebRoute[] {
   }
 
   return [
+    // ---------------------------- composer image for /edit_image (exact)
+    ...(deps.attachments?.saveImage === undefined || deps.pendingConversationImages === undefined ? [] : [{
+      kind: 'exact' as const,
+      path: CONVERSATION_IMAGE_API,
+      handler: async (req: IncomingMessage, res: ServerResponse) => {
+        if (!guard(req, res, 'POST')) return
+        const body = await readJsonBody(req, MAX_JSON_BODY_BYTES)
+        const sessionId = typeof body?.sessionId === 'string' ? body.sessionId.trim() : ''
+        const dataUrl = typeof body?.dataUrl === 'string' ? imageDataUrl(body.dataUrl) : undefined
+        if (sessionId === '' || dataUrl === undefined) {
+          writeJson(res, 200, { ok: false, code: 'bad-request', message: 'sessionId and image data are required' })
+          return
+        }
+        try {
+          const ref = await deps.attachments!.saveImage!({
+            data: dataUrl.data,
+            mediaType: dataUrl.mediaType,
+            ...typeof body?.name === 'string' && body.name.trim() !== '' ? { name: body.name.trim() } : {},
+          })
+          deps.pendingConversationImages!.set(sessionId, ref)
+          writeJson(res, 200, { ok: true })
+        } catch (error) {
+          writeJson(res, 200, { ok: false, code: 'image-save-failed', message: messageOf(error) })
+        }
+      },
+    } satisfies WebRoute]),
     // ------------------------------------ Agent tool-result image (prefix)
     ...(deps.attachments === undefined ? [] : [{
       kind: 'prefix' as const,
@@ -393,7 +451,7 @@ export function makeRoutes(deps: ImageGenRoutesDeps): WebRoute[] {
           apiKey: typeof body?.apiKey === 'string' && body.apiKey.trim() !== '' ? body.apiKey.trim() : (stored?.apiKey ?? ''),
         }
         try {
-          writeJson(res, 200, { ok: true, models: await listOpenAIModels(upstream) })
+          writeJson(res, 200, { ok: true, models: await listImageModels(upstream) })
         } catch (error) {
           writeJson(res, 200, { ok: false, code: 'image-models-failed', message: messageOf(error) })
         }