@dickpy/dsh-imagegen 1.5.3 → 1.5.5

package/src/client/panel.module.css

@@ -488,13 +488,26 @@ html[data-dsh-imagegen-active] .sidebarHistoryHost {
   flex: 1;
 }
 
-.generation {
-  display: flex;
-  width: 100%;
-  gap: 14px;
-  min-width: 0;
-  min-height: 0;
-}
+.generation {
+  display: flex;
+  width: 100%;
+  gap: 14px;
+  min-width: 0;
+  min-height: 0;
+}
+
+/* The canvas workspace owns the full generation surface. Keep the classic
+   config/result DOM mounted so switching tabs remains instantaneous, but hide
+   those siblings while the scene graph is active. */
+.generation[data-workspace='canvas'] {
+  display: flex;
+  height: 100%;
+}
+
+.generation[data-workspace='canvas'] > .config,
+.generation[data-workspace='canvas'] > .canvas {
+  display: none !important;
+}
 
 .config {
   display: flex;
@@ -846,29 +859,43 @@ html[data-dsh-imagegen-active] .sidebarHistoryHost {
 
 .historyActions {
   display: flex;
-  gap: 6px;
+  gap: 4px;
   justify-content: flex-end;
 }
 
-.historyAction {
-  padding: 2px 8px;
-  font: inherit;
-  font-size: 11.5px;
-  color: var(--dsw-alias-label-secondary);
+/* Compact icon actions on each history row: chat / gallery / trash. */
+.historyIconAction {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 26px;
+  height: 24px;
+  padding: 0;
+  border: 1px solid transparent;
+  border-radius: 7px;
   background: transparent;
-  border: 1px solid var(--dsw-alias-border-l2);
-  border-radius: 999px;
+  color: var(--dsw-alias-label-tertiary);
   cursor: pointer;
 }
 
-.historyAction:hover {
+.historyIconAction:hover {
   color: var(--dsw-alias-label-primary);
-  border-color: var(--dsw-alias-label-dimmed);
+  background: var(--dsw-alias-interactive-bg-hover);
 }
 
-.historyAction[data-danger]:hover {
-  color: var(--dsw-alias-label-error);
-  border-color: var(--dsw-alias-label-error);
+.historyIconAction:focus-visible {
+  outline: 2px solid var(--dsw-alias-brand-primary);
+  outline-offset: 1px;
+}
+
+.historyIconAction:disabled {
+  opacity: 0.5;
+  cursor: default;
+}
+
+.historyIconAction[data-danger]:hover {
+  color: var(--dsw-alias-state-error);
+  background: color-mix(in srgb, var(--dsw-alias-state-error) 10%, transparent);
 }
 
 /* --- cards (system-aligned rounded group chrome) ------------------------------ */
@@ -887,30 +914,36 @@ html[data-dsh-imagegen-active] .sidebarHistoryHost {
 .ecommerceWorkspace {
   display: flex;
   flex-direction: column;
-  gap: 16px;
-  max-width: 720px;
+  gap: 18px;
+  max-width: 760px;
   margin: 0 auto;
-  padding: 6px 2px 12px;
+  padding: 10px 8px 18px;
 }
 
 /* Flat sections in the CapyAI style: plain headings, no card boxes. */
 .ecommerceSection {
   display: flex;
   flex-direction: column;
-  gap: 8px;
-  padding: 0;
+  gap: 10px;
+  padding: 0 0 16px;
   border: none;
+  border-bottom: 1px solid var(--dsw-alias-border-l1);
   border-radius: 0;
   background: transparent;
 }
 
+.ecommerceSection:last-of-type {
+  padding-bottom: 4px;
+  border-bottom: none;
+}
+
 .ecommerceSection h3 {
-  margin: 0;
-  font-size: 13.5px;
-  font-weight: 600;
+  margin: 0 0 2px;
+  font-size: 14px;
+  font-weight: 650;
   display: flex;
   align-items: baseline;
-  gap: 6px;
+  gap: 7px;
 }
 
 .ecommerceSectionHint {
@@ -919,13 +952,14 @@ html[data-dsh-imagegen-active] .sidebarHistoryHost {
   color: var(--dsw-alias-label-tertiary);
 }
 
-.ecommerceSection input:not([type="checkbox"]), .ecommerceSection select, .ecommerceSection textarea { box-sizing: border-box; width: 100%; padding: 8px 10px; color: var(--dsw-alias-label-primary); background: var(--dsw-alias-bg-layer-3); border: 1px solid var(--dsw-alias-border-l2); border-radius: 8px; font: inherit; }
-.ecommerceSection textarea { min-height: 60px; resize: vertical; }
+.ecommerceSection input:not([type="checkbox"]), .ecommerceSection select, .ecommerceSection textarea { box-sizing: border-box; width: 100%; padding: 9px 11px; color: var(--dsw-alias-label-primary); background: var(--dsw-alias-bg-layer-3); border: 1px solid var(--dsw-alias-border-l2); border-radius: 9px; font: inherit; }
+.ecommerceSection input:not([type="checkbox"]):focus-visible, .ecommerceSection select:focus-visible, .ecommerceSection textarea:focus-visible { outline: 2px solid var(--dsw-alias-brand-primary); outline-offset: 1px; }
+.ecommerceSection textarea { min-height: 68px; resize: vertical; line-height: 1.5; }
 
 .ecommerceField {
   display: flex;
   flex-direction: column;
-  gap: 4px;
+  gap: 5px;
   min-width: 0;
 }
 
@@ -937,7 +971,7 @@ html[data-dsh-imagegen-active] .sidebarHistoryHost {
 .ecommerceParamGrid {
   display: grid;
   grid-template-columns: 1fr 1fr;
-  gap: 10px 8px;
+  gap: 12px 10px;
 }
 
 .ecommerceUploadHero {
@@ -963,6 +997,11 @@ html[data-dsh-imagegen-active] .sidebarHistoryHost {
   background: var(--dsw-alias-interactive-bg-hover);
 }
 
+.ecommerceUploadHero:focus-visible, .ecommerceAssetAdd:focus-visible, .ecommerceSlotCard:focus-visible, .ecommerceAdvancedToggle:focus-visible, .ecommerceAsset button:focus-visible {
+  outline: 2px solid var(--dsw-alias-brand-primary);
+  outline-offset: 2px;
+}
+
 .ecommerceUploadHero span {
   font-size: 12px;
 }
@@ -2598,6 +2637,17 @@ html[data-dsh-imagegen-chat-collapsed] [data-dsh-imagegen-chat-resizer] {
 .galleryRemove { flex: none; width: 24px; height: 24px; padding: 0; border: 0; border-radius: 50%; color: var(--dsw-alias-label-tertiary); background: transparent; cursor: pointer; font-size: 18px; }
 .galleryRemove:hover { color: var(--dsw-alias-state-error); background: var(--dsw-alias-bg-layer-2); }
 
+@media (max-width: 760px) {
+  .ecommerceParamGrid { grid-template-columns: 1fr; }
+  .ecommerceStructureGrid { grid-template-columns: repeat(2, minmax(0, 1fr)); }
+  .ecommerceAssets { grid-template-columns: repeat(2, minmax(0, 1fr)); }
+}
+
+@media (max-width: 420px) {
+  .ecommerceWorkspace { padding-inline: 2px; }
+  .ecommerceStructureGrid, .ecommerceAssets { grid-template-columns: 1fr; }
+}
+
 @media (max-width: 1100px) {
   .galleryMasonry { grid-template-columns: repeat(2, minmax(0, 1fr)); }
 }

package/src/engine.ts

@@ -184,8 +184,14 @@ function requestSignal(source: AbortSignal | undefined, timeoutMs: number): { si
   }
 }
 
-/** Content-type extension hints for URL-fetched images. */
-function mimeOfExtension(path: string): string | undefined {
+/** Whether an error was produced by a requestSignal budget timeout. These can
+ * surface from the fetch call itself or from reading the response body, so the
+ * budget must stay armed until the body has been consumed. */
+function isBudgetTimeout(error: unknown): boolean {
+  return (error instanceof DOMException || error instanceof Error) && error.name === 'TimeoutError'
+}
+
+/** Content-type extension hints for URL-fetched images. */function mimeOfExtension(path: string): string | undefined {
   const match = /\.([a-z0-9]+)$/i.exec(path)
   if (match === null) return undefined
   switch (match[1]!.toLowerCase()) {
@@ -339,6 +345,7 @@ function effectiveCount(request: GenerateRequest): number {
 async function normalizeItem(
   item: Record<string, unknown>,
   upstream: UpstreamConfig,
+  signal?: AbortSignal,
 ): Promise<{ b64: string; mime: string; revisedPrompt?: string }> {
   const revisedPrompt = typeof item.revised_prompt === 'string' ? item.revised_prompt : undefined
   if (typeof item.b64_json === 'string' && item.b64_json.trim() !== '') {
@@ -356,30 +363,181 @@ async function normalizeItem(
     if (parsed === undefined) throw new ImageGenError('upstream returned a malformed data: url')
     return { b64: parsed.base64, mime: detectImageMime(Buffer.from(parsed.base64, 'base64')) ?? parsed.mime, revisedPrompt }
   }
-  const budget = requestSignal(undefined, IMAGE_FETCH_TIMEOUT_MS)
-  let response: Response
+  const budget = requestSignal(signal, IMAGE_FETCH_TIMEOUT_MS)
   try {
-    response = await fetch(url, {
-      ...isPresignedUrl(url) || upstream.apiKey === ''
-        ? {}
-        : { headers: { authorization: `Bearer ${upstream.apiKey}` } },
-      signal: budget.signal,
-    })
-  } catch (error) {
-    throw new ImageGenError(`failed to fetch the generated image url: ${error instanceof Error ? error.message : String(error)}`)
+    let response: Response
+    try {
+      response = await fetch(url, {
+        ...isPresignedUrl(url) || upstream.apiKey === ''
+          ? {}
+          : { headers: { authorization: `Bearer ${upstream.apiKey}` } },
+        signal: budget.signal,
+      })
+    } catch (error) {
+      throw new ImageGenError(`failed to fetch the generated image url: ${error instanceof Error ? error.message : String(error)}`)
+    }
+    if (!response.ok) {
+      throw new ImageGenError(`failed to fetch the generated image url: HTTP ${response.status}`)
+    }
+    // Budget stays armed through the body read so a stalled download cannot hang the task.
+    const buffer = Buffer.from(await response.arrayBuffer())
+    const contentType = response.headers.get('content-type')
+    const mime = detectImageMime(buffer)
+      ?? (contentType !== null && contentType !== ''
+      ? contentType.split(';')[0]!.trim()
+      : mimeOfExtension(url) ?? 'image/png')
+    return { b64: buffer.toString('base64'), mime, revisedPrompt }
   } finally {
     budget.dispose()
   }
-  if (!response.ok) {
-    throw new ImageGenError(`failed to fetch the generated image url: HTTP ${response.status}`)
+}
+
+/** Expand a provider image item whose URL may be a string or an array. */
+function imageItemsOf(value: unknown): Array<Record<string, unknown>> {
+  if (value === null || typeof value !== 'object') return []
+  const item = value as Record<string, unknown>
+  if (Array.isArray(item.url)) {
+    return item.url.filter((url): url is string => typeof url === 'string' && url !== '').map(url => ({ ...item, url }))
+  }
+  return [item]
+}
+
+/** Return the data records from the response shapes shared by sync gateways. */
+function dataRecordsOf(payload: Record<string, unknown>): Array<Record<string, unknown>> | undefined {
+  const data = Array.isArray(payload.data)
+    ? payload.data
+    : payload.data !== null && typeof payload.data === 'object'
+      ? [payload.data]
+      : Array.isArray(payload.images)
+        ? payload.images
+        : Array.isArray(payload.output)
+          ? payload.output
+          : undefined
+  if (data === undefined) return undefined
+  return data.filter((entry): entry is Record<string, unknown> => entry !== null && typeof entry === 'object')
+}
+
+const ASYNC_PENDING_STATUSES = new Set(['submitted', 'pending', 'processing', 'running', 'in_progress', 'queued'])
+const ASYNC_COMPLETED_STATUSES = new Set(['completed', 'succeeded', 'success', 'done'])
+const ASYNC_FAILED_STATUSES = new Set(['failed', 'failure', 'cancelled', 'canceled', 'error'])
+const ASYNC_POLL_MAX_MS = 240_000
+const ASYNC_POLL_REQUEST_TIMEOUT_MS = 30_000
+
+/** Read a provider error message from the common nested locations. */
+function asyncErrorMessage(payload: unknown, fallback: string): string {
+  if (payload !== null && typeof payload === 'object') {
+    const record = payload as Record<string, unknown>
+    const candidates: unknown[] = [record.message, record.error]
+    const data = record.data
+    const entries = Array.isArray(data) ? data : [data]
+    for (const entry of entries) {
+      if (entry === null || typeof entry !== 'object') continue
+      const item = entry as Record<string, unknown>
+      candidates.push(item.message, item.error)
+      const nested = item.error
+      if (nested !== null && typeof nested === 'object') candidates.push((nested as Record<string, unknown>).message)
+    }
+    for (const candidate of candidates) {
+      if (typeof candidate === 'string' && candidate.trim() !== '') return candidate
+      if (candidate !== null && typeof candidate === 'object') {
+        const message = (candidate as Record<string, unknown>).message
+        if (typeof message === 'string' && message.trim() !== '') return message
+      }
+    }
+  }
+  return fallback
+}
+
+/** Wait between async-provider polls, but wake immediately when cancelled. */
+function waitForPoll(ms: number, signal?: AbortSignal): Promise<void> {
+  return new Promise((resolve, reject) => {
+    if (signal?.aborted === true) {
+      reject(signal.reason ?? new DOMException('The operation was aborted.', 'AbortError'))
+      return
+    }
+    const onAbort = () => {
+      clearTimeout(timer)
+      signal?.removeEventListener('abort', onAbort)
+      reject(signal?.reason ?? new DOMException('The operation was aborted.', 'AbortError'))
+    }
+    const done = () => {
+      signal?.removeEventListener('abort', onAbort)
+      resolve()
+    }
+    const timer = setTimeout(done, ms)
+    timer.unref()
+    signal?.addEventListener('abort', onAbort, { once: true })
+  })
+}
+
+/**
+ * Poll one apib/apimart-style provider task until it yields image records.
+ * The total deadline is shared by every poll and the final image downloads;
+ * local task cancellation propagates through every request and sleep.
+ */
+async function pollAsyncTask(
+  baseUrl: string,
+  upstream: UpstreamConfig,
+  taskId: string,
+  signal?: AbortSignal,
+): Promise<Array<Record<string, unknown>>> {
+  const deadline = Date.now() + ASYNC_POLL_MAX_MS
+  let delay = 1000
+  while (Date.now() < deadline) {
+    const remaining = deadline - Date.now()
+    const budget = requestSignal(signal, Math.min(ASYNC_POLL_REQUEST_TIMEOUT_MS, remaining))
+    try {
+      let response: Response
+      try {
+        response = await fetch(`${baseUrl}/tasks/${encodeURIComponent(taskId)}`, {
+          method: 'GET',
+          headers: { authorization: `Bearer ${upstream.apiKey.trim()}` },
+          signal: budget.signal,
+        })
+      } catch (error) {
+        if (signal?.aborted === true) throw new ImageGenError('任务已取消', 'cancelled')
+        if (isBudgetTimeout(error)) throw new ImageGenError('上游异步任务轮询超时', 'upstream-timeout')
+        throw new ImageGenError(`无法轮询上游异步任务：${error instanceof Error ? error.message : String(error)}`, 'upstream-unreachable')
+      }
+      let payload: unknown
+      try {
+        payload = await response.json()
+      } catch (error) {
+        if (isBudgetTimeout(error)) throw new ImageGenError('上游异步任务轮询超时', 'upstream-timeout')
+        throw new ImageGenError(`上游任务接口返回了非 JSON 响应（HTTP ${response.status}）`, 'upstream-invalid')
+      }
+      if (!response.ok || payload === null || typeof payload !== 'object') {
+        throw new ImageGenError(asyncErrorMessage(payload, `上游任务轮询失败（HTTP ${response.status}）`), 'upstream-rejected')
+      }
+      const record = payload as Record<string, unknown>
+      const data = record.data
+      const statusRecord = Array.isArray(data) ? data[0] : data !== null && typeof data === 'object' ? data : record
+      const statusValue = statusRecord !== null && typeof statusRecord === 'object'
+        ? (statusRecord as Record<string, unknown>).status
+        : undefined
+      const status = typeof statusValue === 'string' ? statusValue.toLowerCase() : ''
+      if (ASYNC_FAILED_STATUSES.has(status)) {
+        throw new ImageGenError(asyncErrorMessage(payload, `上游异步任务失败（${status || 'unknown'}）`), 'upstream-rejected')
+      }
+      const nested = statusRecord !== null && typeof statusRecord === 'object' ? statusRecord as Record<string, unknown> : record
+      const result = nested.result ?? (nested.output !== null && typeof nested.output === 'object' ? (nested.output as Record<string, unknown>).result : undefined) ?? record.result
+      const resultRecord = result !== null && typeof result === 'object' ? result as Record<string, unknown> : undefined
+      const images = resultRecord?.images ?? (nested.images ?? record.images)
+      if (ASYNC_COMPLETED_STATUSES.has(status) || images !== undefined) {
+        const items = Array.isArray(images) ? images.flatMap(imageItemsOf) : imageItemsOf(images)
+        if (items.length > 0) return items
+        if (ASYNC_COMPLETED_STATUSES.has(status)) throw new ImageGenError('上游异步任务完成但没有图片结果', 'upstream-empty')
+      }
+      if (status !== '' && !ASYNC_PENDING_STATUSES.has(status) && !ASYNC_COMPLETED_STATUSES.has(status)) {
+        throw new ImageGenError(`上游返回了未知异步任务状态：${status}`, 'upstream-invalid')
+      }
+    } finally {
+      budget.dispose()
+    }
+    await waitForPoll(Math.min(delay, Math.max(1, deadline - Date.now())), signal)
+    delay = Math.min(5000, delay * 2)
   }
-  const buffer = Buffer.from(await response.arrayBuffer())
-  const contentType = response.headers.get('content-type')
-  const mime = detectImageMime(buffer)
-    ?? (contentType !== null && contentType !== ''
-    ? contentType.split(';')[0]!.trim()
-    : mimeOfExtension(url) ?? 'image/png')
-  return { b64: buffer.toString('base64'), mime, revisedPrompt }
+  throw new ImageGenError('上游异步任务轮询超时（240 秒）', 'upstream-timeout')
 }
 
 /**
@@ -461,58 +619,57 @@ async function requestOneImage(
   }
 
   const budget = requestSignal(signal, UPSTREAM_TIMEOUT_MS)
-  let response: Response
   try {
-    // Seedream has no /images/edits endpoint: both modes hit generations.
-    const endpoint = request.mode === 'edit' && !isSeedream(params.model)
-      ? '/images/edits'
-      : '/images/generations'
-    response = await fetch(`${baseUrl}${endpoint}`, {
-      method: 'POST',
-      headers,
-      body,
-      signal: budget.signal,
-    })
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error)
-    if (/aborter/i.test(message) || /timeout/i.test(message)) {
-      throw new ImageGenError('上游接口响应超时（240 秒）', 'upstream-timeout')
+    let response: Response
+    try {
+      // Seedream has no /images/edits endpoint: both modes hit generations.
+      const endpoint = request.mode === 'edit' && !isSeedream(params.model)
+        ? '/images/edits'
+        : '/images/generations'
+      response = await fetch(`${baseUrl}${endpoint}`, {
+        method: 'POST',
+        headers,
+        body,
+        signal: budget.signal,
+      })
+    } catch (error) {
+      if (isBudgetTimeout(error)) throw new ImageGenError('上游接口响应超时（240 秒）', 'upstream-timeout')
+      if (signal?.aborted === true) throw new ImageGenError('任务已取消', 'cancelled')
+      throw new ImageGenError(`无法连接上游接口：${error instanceof Error ? error.message : String(error)}`, 'upstream-unreachable')
     }
-    throw new ImageGenError(`无法连接上游接口：${message}`, 'upstream-unreachable')
-  } finally {
-    budget.dispose()
-  }
 
-  let payload: unknown
-  try {
-    payload = await response.json()
-  } catch {
-    throw new ImageGenError(`上游接口返回了非 JSON 响应（HTTP ${response.status}）`, 'upstream-invalid')
-  }
-  if (!response.ok || payload === null || typeof payload !== 'object') {
-    throw new ImageGenError(upstreamMessage(payload, response.status), 'upstream-rejected')
-  }
+    let payload: unknown
+    try {
+      // The budget stays armed through the body read: a gateway that returns
+      // headers but never completes the body must not hang the task forever.
+      payload = await response.json()
+    } catch (error) {
+      if (isBudgetTimeout(error)) throw new ImageGenError('上游接口响应超时（240 秒）', 'upstream-timeout')
+      if (signal?.aborted === true) throw new ImageGenError('任务已取消', 'cancelled')
+      throw new ImageGenError(`上游接口返回了非 JSON 响应（HTTP ${response.status}）`, 'upstream-invalid')
+    }
+    if (!response.ok || payload === null || typeof payload !== 'object') {
+      throw new ImageGenError(upstreamMessage(payload, response.status), 'upstream-rejected')
+    }
 
-  const record = payload as Record<string, unknown>
-  const data = Array.isArray(record.data)
-    ? record.data
-    : Array.isArray(record.images)
-      ? record.images
-      : Array.isArray(record.output)
-        ? record.output
-        : undefined
-  if (data === undefined) {
-    throw new ImageGenError('上游响应缺少 data 数组', 'upstream-invalid')
-  }
-  if (data.length === 0) {
-    throw new ImageGenError('上游返回了 0 张图片', 'upstream-empty')
-  }
-  return Promise.all(data.map(async (entry) => {
-    if (entry === null || typeof entry !== 'object') {
-      throw new ImageGenError('上游响应包含无效的图片条目', 'upstream-invalid')
+    const record = payload as Record<string, unknown>
+    const data = dataRecordsOf(record)
+    if (data === undefined) {
+      throw new ImageGenError('上游响应缺少 data 数组', 'upstream-invalid')
     }
-    return normalizeItem(entry as Record<string, unknown>, upstream)
-  }))
+    if (data.length === 0) {
+      throw new ImageGenError('上游返回了 0 张图片', 'upstream-empty')
+    }
+    const asyncEntries = data.filter(entry => typeof entry.task_id === 'string' && entry.task_id.trim() !== '')
+    if (asyncEntries.length > 0) {
+      const asyncRecords = (await Promise.all(asyncEntries.map(entry => pollAsyncTask(baseUrl, upstream, entry.task_id as string, signal)))).flat()
+      if (asyncRecords.length === 0) throw new ImageGenError('上游异步任务完成但没有图片结果', 'upstream-empty')
+      return Promise.all(asyncRecords.flatMap(imageItemsOf).map(item => normalizeItem(item, upstream, signal)))
+    }
+    return Promise.all(data.flatMap(imageItemsOf).map(item => normalizeItem(item, upstream, signal)))
+  } finally {
+    budget.dispose()
+  }
 }
 
 /**
@@ -559,36 +716,36 @@ async function generateQwenImage(
   }
 
   const budget = requestSignal(options.signal, UPSTREAM_TIMEOUT_MS)
-  let response: Response
   try {
-    response = await fetch(`${baseUrl}/services/aigc/multimodal-generation/generation`, {
-      method: 'POST',
-      headers: {
-        authorization: `Bearer ${upstream.apiKey.trim()}`,
-        'content-type': 'application/json',
-      },
-      body: JSON.stringify(body),
-      signal: budget.signal,
-    })
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error)
-    if (/aborter/i.test(message) || /timeout/i.test(message)) {
-      throw new ImageGenError('上游接口响应超时（240 秒）', 'upstream-timeout')
+    let response: Response
+    try {
+      response = await fetch(`${baseUrl}/services/aigc/multimodal-generation/generation`, {
+        method: 'POST',
+        headers: {
+          authorization: `Bearer ${upstream.apiKey.trim()}`,
+          'content-type': 'application/json',
+        },
+        body: JSON.stringify(body),
+        signal: budget.signal,
+      })
+    } catch (error) {
+      if (isBudgetTimeout(error)) throw new ImageGenError('上游接口响应超时（240 秒）', 'upstream-timeout')
+      if (options.signal?.aborted === true) throw new ImageGenError('任务已取消', 'cancelled')
+      throw new ImageGenError(`无法连接上游接口：${error instanceof Error ? error.message : String(error)}`, 'upstream-unreachable')
     }
-    throw new ImageGenError(`无法连接上游接口：${message}`, 'upstream-unreachable')
-  } finally {
-    budget.dispose()
-  }
 
-  let payload: unknown
-  try {
-    payload = await response.json()
-  } catch {
-    throw new ImageGenError(`上游接口返回了非 JSON 响应（HTTP ${response.status}）`, 'upstream-invalid')
-  }
-  if (!response.ok || payload === null || typeof payload !== 'object') {
-    throw new ImageGenError(upstreamMessage(payload, response.status), 'upstream-rejected')
-  }
+    let payload: unknown
+    try {
+      // Budget stays armed through the body read (same rationale as the OpenAI path).
+      payload = await response.json()
+    } catch (error) {
+      if (isBudgetTimeout(error)) throw new ImageGenError('上游接口响应超时（240 秒）', 'upstream-timeout')
+      if (options.signal?.aborted === true) throw new ImageGenError('任务已取消', 'cancelled')
+      throw new ImageGenError(`上游接口返回了非 JSON 响应（HTTP ${response.status}）`, 'upstream-invalid')
+    }
+    if (!response.ok || payload === null || typeof payload !== 'object') {
+      throw new ImageGenError(upstreamMessage(payload, response.status), 'upstream-rejected')
+    }
 
   // output.choices[].message.content[] mixes text and { image: url } items.
   const record = payload as Record<string, unknown>
@@ -617,6 +774,9 @@ async function generateQwenImage(
     return { b64: normalized.b64, mime: normalized.mime }
   }))
   return { images }
+  } finally {
+    budget.dispose()
+  }
 }
 
 /**

package/src/gallery-store.ts

@@ -13,6 +13,7 @@ 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'
 
 const HISTORY_DIR = path.join(homedir(), '.dsh', 'dsh-imagegen')
 const GALLERY_DIR = path.join(HISTORY_DIR, 'gallery')
@@ -68,6 +69,7 @@ interface StoredEntry {
   projectName?: string
   slotKey?: string
   slotLabel?: string
+  canvas?: HistoryEntryInput['canvas']
 }
 
 /** The index.json shape. */
@@ -192,6 +194,7 @@ function toWire(entry: StoredEntry): HistoryEntry {
     ...entry.projectName === undefined ? {} : { projectName: entry.projectName },
     ...entry.slotKey === undefined ? {} : { slotKey: entry.slotKey },
     ...entry.slotLabel === undefined ? {} : { slotLabel: entry.slotLabel },
+    ...entry.canvas === undefined ? {} : { canvas: entry.canvas },
   }
 }
 
@@ -221,6 +224,7 @@ export async function appendGallery(input: HistoryEntryInput): Promise<GalleryAp
         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))
         storedImages.push({
           file,
           mime: image.mime,
@@ -251,6 +255,7 @@ export async function appendGallery(input: HistoryEntryInput): Promise<GalleryAp
       ...input.projectName === undefined ? {} : { projectName: input.projectName },
       ...input.slotKey === undefined ? {} : { slotKey: input.slotKey },
       ...input.slotLabel === undefined ? {} : { slotLabel: input.slotLabel },
+      ...input.canvas === undefined ? {} : { canvas: input.canvas },
     }
     const merged = [entry, ...await readIndex()]
     await writeIndex(merged)

package/src/generation-runtime.ts

@@ -75,6 +75,7 @@ export class ImageGenerationRuntime {
         ...request.projectName === undefined ? {} : { projectName: request.projectName },
         ...request.slotKey === undefined ? {} : { slotKey: request.slotKey },
         ...request.slotLabel === undefined ? {} : { slotLabel: request.slotLabel },
+        ...request.canvas === undefined ? {} : { canvas: request.canvas },
       })
       return { ...result, history }
     } catch (error) {