@dickpy/dsh-imagegen 1.0.20 → 1.1.0

package/src/client/api.ts

@@ -3,7 +3,7 @@
  * data access path the panel uses — plain fetch, same origin.
  */
 
-import { GALLERY_API, GENERATE_API, HISTORY_API, TEMPLATES_API, UPDATE_API, type GenerateRequest, type GenerateResult, type HistoryEntry, type HistoryEntryInput, type TemplateListResult, type TemplateRefreshResult, type UpdateInfo } from '../protocol.ts'
+import { GALLERY_API, GENERATE_API, HISTORY_API, PROMPT_ENHANCE_API, TASK_API, TEMPLATES_API, UPDATE_API, type GenerateRequest, type GenerateResult, type GenerationTask, type HistoryEntry, type HistoryEntryInput, type TemplateListResult, type TemplateRefreshResult, type UpdateInfo } from '../protocol.ts'
 
 /** Error carrying the route's JSON error message. */
 export class ImageGenApiError extends Error {
@@ -73,6 +73,37 @@ export class ImageGenApi {
     }
   }
 
+  /** Ask the configured chat model to expand a concise image prompt. */
+  async enhancePrompt(prompt: string): Promise<string> {
+    const response = await fetch(PROMPT_ENHANCE_API.enhance, {
+      method: 'POST',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify({ prompt }),
+    })
+    const body = await readEnvelope<{ ok: true; prompt: string }>(response)
+    return body.prompt
+  }
+
+  async taskSubmit(request: GenerateRequest): Promise<GenerationTask> {
+    const response = await fetch(TASK_API.submit, { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify(request) })
+    return (await readEnvelope<{ ok: true; task: GenerationTask }>(response)).task
+  }
+
+  async taskList(): Promise<GenerationTask[]> {
+    const response = await fetch(TASK_API.list, { method: 'POST' })
+    return (await readEnvelope<{ ok: true; tasks: GenerationTask[] }>(response)).tasks
+  }
+
+  async taskCancel(id: string): Promise<GenerationTask> {
+    const response = await fetch(TASK_API.cancel, { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ id }) })
+    return (await readEnvelope<{ ok: true; task: GenerationTask }>(response)).task
+  }
+
+  async taskRetry(id: string): Promise<GenerationTask> {
+    const response = await fetch(TASK_API.retry, { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ id }) })
+    return (await readEnvelope<{ ok: true; task: GenerationTask }>(response)).task
+  }
+
   /** List the host-persisted history (newest first). */
   async historyList(): Promise<HistoryEntry[]> {
     const response = await fetch(HISTORY_API.list, { method: 'POST' })
@@ -135,6 +166,11 @@ export class ImageGenApi {
     return body.entries
   }
 
+  async gallerySetTags(id: string, tags: string[]): Promise<HistoryEntry[]> {
+    const response = await fetch(GALLERY_API.tags, { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ id, tags }) })
+    return (await readEnvelope<{ ok: true; entries: HistoryEntry[] }>(response)).entries
+  }
+
   /** Fetch the prompt-template library (bundled snapshot or refreshed copy). */
   async templatesList(): Promise<TemplateListResult> {
     const response = await fetch(TEMPLATES_API.list, { method: 'POST' })

package/src/client/locales.ts

@@ -13,7 +13,20 @@ export const zh = {
   // prompt
   'prompt.placeholder': '描述你想要的画面，例如：一只戴着宇航员头盔的橘猫，在月球上举起望远镜，水彩风格，柔和光线…',
   'prompt.required': '请输入提示词',
-  'prompt.count': '{count}/2000',
+  'prompt.count': '{count}',
+  'prompt.enhance': '增强',
+  'prompt.enhancing': '增强中…',
+  'prompt.enhanceHint': '使用已配置的对话模型扩写提示词',
+  'prompt.configTitle': '请先配置提示词增强模型',
+  'prompt.configHint': '已打开设置。进入「插件 → AI 生图」，填写或复用 API 地址和密钥，选择对话模型并保存。',
+  'tasks.title': '生成任务',
+  'tasks.queued': '排队中',
+  'tasks.running': '生成中',
+  'tasks.completed': '已完成',
+  'tasks.failed': '失败',
+  'tasks.cancelled': '已取消',
+  'tasks.cancel': '取消',
+  'tasks.retry': '重试',
   // parameters
   'params.size': '尺寸',
   'params.quality': '清晰度',
@@ -42,6 +55,11 @@ export const zh = {
   'detail.hint': '透传参数，部分 gpt-image-2 网关支持；官方接口请保持「自动」',
   // footer
   'model.label': '模型',
+  'compare.enable': '多模型对比',
+  'compare.models': '参与对比的模型',
+  'compare.title': '多模型结果对比',
+  'compare.fullscreen': '全屏对比',
+  'compare.selectRequired': '请至少选择一个对比模型',
   'generate': '开始生成',
   'generating': '生成中…',
   // edit reference image
@@ -67,6 +85,11 @@ export const zh = {
   'history.delete': '删除',
   'history.images': '张',
   'history.viewing': '历史 · {time}',
+  'history.search': '搜索提示词或模型…',
+  'history.model': '模型筛选',
+  'history.ratio': '比例筛选',
+  'history.allModels': '全部模型',
+  'history.allRatios': '全部比例',
   // gallery
   'gallery.title': '画廊',
   'gallery.categories': '分类',
@@ -74,6 +97,7 @@ export const zh = {
   'gallery.gpt': 'gpt-image-2',
   'gallery.grok': 'grok-imagine-image',
   'gallery.ratio': '画面比例',
+  'gallery.tags': '标签',
   'gallery.filterHint': '按生成模式、模型和比例筛选画廊',
   'gallery.count': '· 共 {count} 幅',
   'gallery.viewMode': '视图模式',
@@ -83,6 +107,19 @@ export const zh = {
   'gallery.newest': '最新发布',
   'gallery.oldest': '最早发布',
   'gallery.untitled': '未命名作品',
+  'gallery.search': '搜索作品或模型…',
+  'gallery.tagsPlaceholder': '标签，用逗号分隔',
+  'gallery.tagsApply': '添加标签',
+  'gallery.editTags': '编辑标签',
+  'gallery.tagsEditShort': '编辑',
+  'gallery.tagsSave': '保存',
+  'gallery.tagsCancel': '取消',
+  'gallery.selected': '已选 {count} 项',
+  'gallery.selectionDone': '完成选择',
+  'gallery.selectionClear': '取消选择',
+  'gallery.downloadSelected': '下载所选',
+  'gallery.exportJson': '导出 JSON',
+  'gallery.select': '选择作品',
   'gallery.add': '加入画廊',
   'gallery.added': '已加入画廊',
   'gallery.already': '已在画廊中',
@@ -107,6 +144,12 @@ export const zh = {
   'preview.addToEdit': '添加到图生图',
   // config banner
   'config.missing': '尚未配置 API：请前往「设置 → 插件 → 可配置」为 AI 生图填写 api_url 与 api_key。',
+  'config.generationTitle': '请先配置生图 API',
+  'config.generationHint': '已自动打开 DSH「设置 → 插件 → AI 生图」。填写生图 API 地址与 API 密钥，保存后即可开始生成。',
+  'config.enhancementTitle': '请先配置提示词增强模型',
+  'config.enhancementHint': '已自动打开 DSH「设置 → 插件 → AI 生图」。填写或复用对话 API 地址和密钥，选择对话模型并保存。',
+  'config.disabledTitle': 'AI 生图插件已停用',
+  'config.disabledHint': '已自动打开 DSH「设置 → 插件 → AI 生图」。开启「启用插件」后即可生成图片。',
   'config.configured': '已连接 {url}',
   'config.disabled': '插件已停用，请在设置中重新启用。',
   'connection.connected': '已连接',
@@ -128,6 +171,17 @@ export const zh = {
   'settings.apiKeyHint': 'Bearer 密钥，明文存于本机设置文档；界面只显示是否已设置',
   'settings.apiKeySet': '已保存密钥；输入新值可更换，点击「清除」可删除',
   'settings.apiKeyClear': '清除',
+  'settings.promptEnhanceTitle': '提示词增强模型',
+  'settings.promptEnhanceHint': '用于将简短描述扩写为更完整的生图提示词；留空的地址和密钥会复用生图配置。',
+  'settings.promptApiUrl': '对话 API 地址（可选）',
+  'settings.promptApiUrlHint': 'OpenAI 兼容基址；留空则复用图像 API 地址。',
+  'settings.promptApiKey': '对话 API 密钥（可选）',
+  'settings.promptApiKeyHint': '留空则复用图像 API 密钥。',
+  'settings.promptModel': '对话模型',
+  'settings.promptModelHint': '选择或填写支持 /chat/completions 的模型。',
+  'settings.promptModelsFetch': '获取可用模型',
+  'settings.promptModelsLoading': '正在获取…',
+  'settings.promptModelsSelect': '选择一个模型',
   'settings.announceToAgent': '向 Agent 播报本插件',
   'settings.announceToAgentHint': '开启后，本插件的存在与能力会写入每个 Agent 的系统提示词',
   'settings.enabled': '启用插件',
@@ -186,7 +240,20 @@ export const en: Record<keyof typeof zh, string> = {
   'mode.edit': 'Image to Image',
   'prompt.placeholder': 'Describe the picture you want, e.g. an orange cat in an astronaut helmet raising a telescope on the moon, watercolor style, soft light…',
   'prompt.required': 'Enter a prompt first',
-  'prompt.count': '{count}/2000',
+  'prompt.count': '{count}',
+  'prompt.enhance': 'Enhance',
+  'prompt.enhancing': 'Enhancing…',
+  'prompt.enhanceHint': 'Expand the prompt with the configured chat model',
+  'prompt.configTitle': 'Configure a prompt enhancement model first',
+  'prompt.configHint': 'Settings has opened. Go to Plugins → AI Image, configure or reuse an API URL and key, choose a chat model, then save.',
+  'tasks.title': 'Generation tasks',
+  'tasks.queued': 'Queued',
+  'tasks.running': 'Generating',
+  'tasks.completed': 'Completed',
+  'tasks.failed': 'Failed',
+  'tasks.cancelled': 'Cancelled',
+  'tasks.cancel': 'Cancel',
+  'tasks.retry': 'Retry',
   'params.size': 'Size',
   'params.quality': 'Quality',
   'params.count': 'Count',
@@ -213,6 +280,11 @@ export const en: Record<keyof typeof zh, string> = {
   'detail.high': 'High',
   'detail.hint': 'Passthrough parameter supported by some gpt-image-2 gateways; keep "Auto" for official endpoints',
   'model.label': 'Model',
+  'compare.enable': 'Multi-model comparison',
+  'compare.models': 'Models to compare',
+  'compare.title': 'Multi-model comparison',
+  'compare.fullscreen': 'Fullscreen comparison',
+  'compare.selectRequired': 'Select at least one model',
   'generate': 'Generate',
   'generating': 'Generating…',
   'edit.upload': 'Click or drag to upload a reference image',
@@ -235,12 +307,18 @@ export const en: Record<keyof typeof zh, string> = {
   'history.delete': 'Delete',
   'history.images': 'images',
   'history.viewing': 'History · {time}',
+  'history.search': 'Search prompt or model…',
+  'history.model': 'Model filter',
+  'history.ratio': 'Ratio filter',
+  'history.allModels': 'All models',
+  'history.allRatios': 'All ratios',
   'gallery.title': 'Gallery',
   'gallery.categories': 'Categories',
   'gallery.all': 'All works',
   'gallery.gpt': 'gpt-image-2',
   'gallery.grok': 'grok-imagine-image',
   'gallery.ratio': 'Aspect ratio',
+  'gallery.tags': 'Tags',
   'gallery.filterHint': 'Filter by mode, model, and aspect ratio',
   'gallery.count': '· {count} works',
   'gallery.viewMode': 'View mode',
@@ -250,6 +328,19 @@ export const en: Record<keyof typeof zh, string> = {
   'gallery.newest': 'Newest',
   'gallery.oldest': 'Oldest',
   'gallery.untitled': 'Untitled work',
+  'gallery.search': 'Search works or models…',
+  'gallery.tagsPlaceholder': 'Tags, comma separated',
+  'gallery.tagsApply': 'Add tags',
+  'gallery.editTags': 'Edit tags',
+  'gallery.tagsEditShort': 'Edit',
+  'gallery.tagsSave': 'Save',
+  'gallery.tagsCancel': 'Cancel',
+  'gallery.selected': '{count} selected',
+  'gallery.selectionDone': 'Done selecting',
+  'gallery.selectionClear': 'Clear selection',
+  'gallery.downloadSelected': 'Download selected',
+  'gallery.exportJson': 'Export JSON',
+  'gallery.select': 'Select work',
   'gallery.add': 'Add to gallery',
   'gallery.added': 'Added to gallery',
   'gallery.already': 'Already in gallery',
@@ -272,6 +363,12 @@ export const en: Record<keyof typeof zh, string> = {
   'preview.copied': 'Copied',
   'preview.addToEdit': 'Add to image to image',
   'config.missing': 'API not configured: open "Settings → Plugins → Configurable" and fill in api_url and api_key for AI Image.',
+  'config.generationTitle': 'Configure the image API first',
+  'config.generationHint': 'DSH Settings → Plugins → AI Image has opened. Enter the image API URL and API key, then save before generating.',
+  'config.enhancementTitle': 'Configure a prompt enhancement model first',
+  'config.enhancementHint': 'DSH Settings → Plugins → AI Image has opened. Configure or reuse a chat API URL and key, choose a chat model, then save.',
+  'config.disabledTitle': 'The AI Image plugin is disabled',
+  'config.disabledHint': 'DSH Settings → Plugins → AI Image has opened. Enable the plugin, then generate images.',
   'config.configured': 'Connected to {url}',
   'config.disabled': 'The plugin is disabled — re-enable it in Settings.',
   'connection.connected': 'Connected',
@@ -291,6 +388,17 @@ export const en: Record<keyof typeof zh, string> = {
   'settings.apiKeyHint': 'Bearer key, stored in plaintext in the local settings document; the UI only shows whether it is set',
   'settings.apiKeySet': 'A key is stored; type a new value to replace it, or click "Clear" to remove it',
   'settings.apiKeyClear': 'Clear',
+  'settings.promptEnhanceTitle': 'Prompt enhancement model',
+  'settings.promptEnhanceHint': 'Expands short requests into complete image prompts. Blank URL and key reuse the image API configuration.',
+  'settings.promptApiUrl': 'Chat API URL (optional)',
+  'settings.promptApiUrlHint': 'OpenAI-compatible base URL. Leave blank to reuse the image API URL.',
+  'settings.promptApiKey': 'Chat API key (optional)',
+  'settings.promptApiKeyHint': 'Leave blank to reuse the image API key.',
+  'settings.promptModel': 'Chat model',
+  'settings.promptModelHint': 'Select or enter a model supporting /chat/completions.',
+  'settings.promptModelsFetch': 'Fetch available models',
+  'settings.promptModelsLoading': 'Fetching…',
+  'settings.promptModelsSelect': 'Select a model',
   'settings.announceToAgent': 'Announce this plugin to agents',
   'settings.announceToAgentHint': 'When on, the plugin presence and capabilities are written into every agent system prompt',
   'settings.enabled': 'Enable plugin',

package/src/client/panel.module.css

@@ -319,6 +319,35 @@ html[data-dsh-imagegen-active]:not([data-dsh-taskboard-active]):not([data-dsh-ss
   overflow: hidden;
 }
 
+.taskTray {
+  position: absolute;
+  z-index: 6;
+  top: 12px;
+  right: 12px;
+  width: min(360px, calc(100% - 24px));
+  overflow: hidden;
+  border: 1px solid var(--dsw-alias-border-l2);
+  border-radius: 9px;
+  background: color-mix(in srgb, var(--dsw-alias-bg-layer-1) 92%, transparent);
+  box-shadow: 0 8px 24px rgb(0 0 0 / 12%);
+  backdrop-filter: blur(10px);
+}
+
+.taskTrayHeader { display: flex; justify-content: space-between; padding: 8px 10px; color: var(--dsw-alias-label-primary); font-size: 12px; font-weight: 600; border-bottom: 1px solid var(--dsw-alias-border-l1); }
+.taskRow { display: grid; grid-template-columns: auto minmax(0, 1fr) auto; gap: 7px; align-items: center; padding: 7px 10px; border-top: 1px solid var(--dsw-alias-border-l1); }
+.taskRow:first-of-type { border-top: 0; }
+.taskStatus { color: var(--dsw-alias-label-tertiary); font-size: 11px; white-space: nowrap; }
+.taskRow[data-status='running'] .taskStatus { color: var(--dsw-alias-brand-primary); }
+.taskRow[data-status='failed'] .taskStatus { color: var(--dsw-alias-label-error); }
+.taskPrompt { overflow: hidden; color: var(--dsw-alias-label-secondary); font-size: 11px; text-overflow: ellipsis; white-space: nowrap; }
+.taskRow button { padding: 2px 7px; border: 0; border-radius: 5px; color: var(--dsw-alias-label-secondary); background: var(--dsw-alias-bg-layer-2); cursor: pointer; font: inherit; font-size: 11px; }
+.taskRow button:hover { color: var(--dsw-alias-brand-primary); }
+
+.configGuide { position: fixed; inset: 0; z-index: 1100; display: grid; place-items: center; padding: 20px; background: rgb(0 0 0 / 35%); }
+.configGuideBody { display: flex; width: min(360px, 100%); flex-direction: column; gap: 12px; padding: 18px; border: 1px solid var(--dsw-alias-border-l2); border-radius: 10px; color: var(--dsw-alias-label-primary); background: var(--dsw-alias-bg-layer-1); box-shadow: 0 14px 40px rgb(0 0 0 / 20%); }
+.configGuideBody span { color: var(--dsw-alias-label-secondary); font-size: 13px; line-height: 1.55; }
+.configGuideBody button { align-self: flex-end; min-height: 30px; padding: 0 12px; border: 0; border-radius: 7px; color: var(--dsw-alias-bg-layer-1); background: var(--dsw-alias-brand-primary); cursor: pointer; font: inherit; font-size: 12px; }
+
 /* --- history column (far right) ------------------------------------------------ */
 
 .history {
@@ -345,6 +374,36 @@ html[data-dsh-imagegen-active]:not([data-dsh-taskboard-active]):not([data-dsh-ss
   flex: none;
 }
 
+.historyFilters {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 6px;
+  padding: 8px 10px;
+  border-bottom: 1px solid var(--dsw-alias-border-l1);
+}
+
+.historySearch,
+.historyFilters select,
+.gallerySearch {
+  min-width: 0;
+  min-height: 29px;
+  box-sizing: border-box;
+  padding: 0 8px;
+  border: 1px solid var(--dsw-alias-border-l2);
+  border-radius: 7px;
+  color: var(--dsw-alias-label-primary);
+  background: var(--dsw-alias-bg-layer-2);
+  font: inherit;
+  font-size: 11px;
+}
+
+.historySearch { grid-column: 1 / -1; }
+.gallerySearch { width: 156px; }
+.galleryTagInput { width: 130px; min-height: 29px; box-sizing: border-box; padding: 0 8px; border: 1px solid var(--dsw-alias-border-l2); border-radius: 7px; color: var(--dsw-alias-label-primary); background: var(--dsw-alias-bg-layer-2); font: inherit; font-size: 11px; }
+.galleryBulkButton { min-height: 29px; padding: 0 8px; border: 1px solid var(--dsw-alias-border-l2); border-radius: 7px; color: var(--dsw-alias-label-secondary); background: var(--dsw-alias-bg-layer-1); cursor: pointer; font: inherit; font-size: 11px; }
+.galleryBulkButton:hover:not(:disabled) { color: var(--dsw-alias-brand-primary); border-color: var(--dsw-alias-brand-primary); }
+.galleryBulkButton:disabled { opacity: .45; cursor: default; }
+
 .historyTitle {
   font-size: 13px;
   font-weight: 600;
@@ -663,6 +722,26 @@ html[data-dsh-imagegen-active]:not([data-dsh-taskboard-active]):not([data-dsh-ss
   transform: translateY(0);
 }
 
+.enhanceButton {
+  height: 26px;
+  margin-left: auto;
+  padding: 0 11px;
+  border: 1px solid var(--dsw-alias-border-l2);
+  border-radius: 999px;
+  color: var(--dsw-alias-label-secondary);
+  background: var(--dsw-alias-bg-layer-2);
+  font: inherit;
+  font-size: 12px;
+  cursor: pointer;
+}
+
+.enhanceButton:hover:not(:disabled) {
+  color: var(--dsw-alias-brand-primary);
+  border-color: var(--dsw-alias-brand-primary);
+}
+
+.enhanceButton:disabled { opacity: 0.5; cursor: default; }
+
 .promptCount {
   font-size: 11px;
   color: var(--dsw-alias-label-tertiary);
@@ -1376,22 +1455,62 @@ html[data-dsh-imagegen-active]:not([data-dsh-taskboard-active]):not([data-dsh-ss
 .galleryRatioList { display: flex; flex-wrap: wrap; gap: 6px; }
 .galleryRatio { padding: 6px 10px; border: 0; border-radius: 999px; color: var(--dsw-alias-label-secondary); background: var(--dsw-alias-bg-layer-2); cursor: pointer; font-size: 12px; }
 .galleryRatio[data-active] { color: var(--dsw-alias-brand-primary); background: color-mix(in srgb, var(--dsw-alias-brand-primary) 13%, transparent); }
+.galleryTagFilterList { display: flex; flex-wrap: wrap; gap: 6px; }
+.galleryTagFilter { display: inline-flex; align-items: center; gap: 5px; min-width: 0; max-width: 100%; min-height: 27px; padding: 0 8px; border: 1px solid var(--dsw-alias-border-l1); border-radius: 6px; color: var(--dsw-alias-label-secondary); background: var(--dsw-alias-bg-layer-2); cursor: pointer; font: inherit; font-size: 11px; }
+.galleryTagFilter span:first-child { overflow: hidden; max-width: 112px; text-overflow: ellipsis; white-space: nowrap; }
+.galleryTagFilter span:last-child { color: var(--dsw-alias-label-tertiary); font-size: 10px; }
+.galleryTagFilter:hover, .galleryTagFilter[data-active] { color: var(--dsw-alias-brand-primary); background: color-mix(in srgb, var(--dsw-alias-brand-primary) 10%, transparent); }
 .galleryFilterNote { margin: 20px 4px 0; color: var(--dsw-alias-label-quaternary); font-size: 11px; line-height: 1.5; }
 .galleryWorkspace { position: absolute; inset: 0; display: flex; width: 100%; height: 100%; min-width: 0; min-height: 0; flex-direction: column; overflow: hidden; padding: 22px 24px 26px; box-sizing: border-box; }
 .galleryToolbar { display: flex; align-items: center; justify-content: space-between; gap: 16px; flex: none; min-width: 0; margin-bottom: 18px; }
 .galleryHeading { display: inline; margin: 0; color: var(--dsw-alias-label-primary); font-size: 20px; font-weight: 700; }
 .galleryCount { margin-left: 8px; color: var(--dsw-alias-label-tertiary); font-size: 13px; }
 .galleryToolbarActions { display: flex; align-items: center; gap: 10px; min-width: 0; flex-wrap: wrap; }
+.gallerySelectMode, .galleryBulkButton, .gallerySelectionClear { min-height: 30px; padding: 0 10px; border: 1px solid var(--dsw-alias-border-l1); border-radius: 7px; color: var(--dsw-alias-label-secondary); background: var(--dsw-alias-bg-layer-1); cursor: pointer; font: inherit; font-size: 12px; }
+.gallerySelectMode:hover, .gallerySelectMode[data-active], .galleryBulkButton:hover:not(:disabled) { color: var(--dsw-alias-brand-primary); border-color: color-mix(in srgb, var(--dsw-alias-brand-primary) 38%, var(--dsw-alias-border-l1)); background: color-mix(in srgb, var(--dsw-alias-brand-primary) 11%, transparent); }
+.galleryBulkButton:disabled { cursor: not-allowed; opacity: .45; }
+.gallerySelectionBar { display: flex; align-items: center; gap: 10px; flex: none; min-width: 0; margin: -4px 0 16px; padding: 10px 12px; border: 1px solid color-mix(in srgb, var(--dsw-alias-brand-primary) 35%, var(--dsw-alias-border-l1)); border-radius: 9px; background: color-mix(in srgb, var(--dsw-alias-brand-primary) 7%, var(--dsw-alias-bg-layer-1)); }
+.gallerySelectionBar strong { flex: none; color: var(--dsw-alias-brand-primary); font-size: 12px; }
+.gallerySelectionClear { margin-left: auto; }
+.gallerySelectionClear:hover { color: var(--dsw-alias-label-primary); background: var(--dsw-alias-bg-layer-2); }
+.galleryTagInput, .gallerySearch { min-width: 0; height: 30px; padding: 0 10px; border: 1px solid var(--dsw-alias-border-l1); border-radius: 7px; outline: none; color: var(--dsw-alias-label-primary); background: var(--dsw-alias-bg-layer-1); font: inherit; font-size: 12px; }
+.galleryTagInput { flex: 1 1 190px; }
+.galleryTagInput:focus, .gallerySearch:focus { border-color: var(--dsw-alias-brand-primary); }
 .galleryViewToggle { display: flex; padding: 3px; border: 1px solid var(--dsw-alias-border-l1); border-radius: 9px; background: var(--dsw-alias-bg-layer-1); }
 .galleryViewToggle button, .gallerySort, .galleryClear { min-height: 30px; padding: 0 10px; border: 0; border-radius: 7px; color: var(--dsw-alias-label-secondary); background: transparent; cursor: pointer; font: inherit; font-size: 12px; }
 .galleryViewToggle button[data-active], .galleryViewToggle button:hover, .gallerySort:hover, .galleryClear:hover { color: var(--dsw-alias-brand-primary); background: color-mix(in srgb, var(--dsw-alias-brand-primary) 11%, transparent); }
 .gallerySort { border: 1px solid var(--dsw-alias-border-l1); background: var(--dsw-alias-bg-layer-1); }
 .galleryClear { border: 1px solid var(--dsw-alias-border-l1); }
+.compareControl { display: flex; flex-direction: column; gap: 6px; margin: 0 0 10px; }
+.compareToggle, .compareModelChoices label { display: flex; align-items: center; gap: 6px; color: var(--dsw-alias-label-secondary); font-size: 12px; cursor: pointer; }
+.compareToggle input, .compareModelChoices input { accent-color: var(--dsw-alias-brand-primary); }
+.compareModelChoices { display: flex; flex-wrap: wrap; gap: 6px; }
+.compareModelChoices label { padding: 4px 6px; border: 1px solid var(--dsw-alias-border-l1); border-radius: 5px; font-size: 10px; }
+.comparisonBoard { position: absolute; z-index: 4; top: 126px; right: 14px; bottom: 14px; left: 14px; display: flex; flex-direction: column; overflow: hidden; border: 1px solid var(--dsw-alias-border-l2); border-radius: 8px; background: var(--dsw-alias-bg-layer-1); box-shadow: 0 8px 24px rgb(0 0 0 / 12%); }
+.comparisonBoard > header { display: flex; align-items: center; justify-content: space-between; padding: 10px 12px; border-bottom: 1px solid var(--dsw-alias-border-l1); }
+.comparisonBoard > header div { display: flex; align-items: baseline; gap: 7px; }
+.comparisonBoard > header strong { color: var(--dsw-alias-label-primary); font-size: 13px; }
+.comparisonBoard > header span { color: var(--dsw-alias-label-tertiary); font-size: 11px; }
+.comparisonBoard > header button { min-height: 28px; padding: 0 9px; border: 1px solid var(--dsw-alias-border-l1); border-radius: 5px; color: var(--dsw-alias-label-secondary); background: var(--dsw-alias-bg-layer-2); cursor: pointer; font: inherit; font-size: 11px; }
+.comparisonGrid { display: grid; flex: 1; grid-template-columns: repeat(auto-fit, minmax(220px, 1fr)); gap: 12px; overflow: auto; padding: 12px; }
+.comparisonGrid article { display: flex; min-width: 0; flex-direction: column; gap: 7px; }
+.comparisonGrid article > strong { color: var(--dsw-alias-label-primary); font-size: 12px; }
+.comparisonGrid article > span { display: grid; min-height: 160px; place-items: center; color: var(--dsw-alias-label-tertiary); background: var(--dsw-alias-bg-layer-2); font-size: 12px; }
+.comparisonGrid img { display: block; width: 100%; min-height: 160px; max-height: calc(100vh - 260px); object-fit: contain; background: var(--dsw-alias-bg-base); }
+.comparisonFullscreen { position: fixed; z-index: 1200; inset: 0; overflow: auto; padding: 54px 24px 24px; background: rgb(0 0 0 / 92%); }
+.comparisonFullscreenGrid { display: grid; min-height: 100%; grid-template-columns: repeat(auto-fit, minmax(300px, 1fr)); align-items: start; gap: 18px; }
+.comparisonFullscreen figure { min-width: 0; margin: 0; }
+.comparisonFullscreen figcaption { margin-bottom: 8px; color: #fff; font-size: 13px; font-weight: 600; }
+.comparisonFullscreen img { display: block; width: 100%; margin-bottom: 10px; background: #111; }
 .galleryMasonry { display: grid; flex: 1 1 auto; width: 100%; height: 0; max-width: 100%; min-width: 0; min-height: 0; box-sizing: border-box; grid-template-columns: repeat(3, minmax(0, 1fr)); grid-auto-rows: max-content; align-content: start; gap: 16px; overflow-y: scroll; overflow-x: hidden; overscroll-behavior: contain; padding: 2px 8px 16px 2px; scrollbar-width: thin; scrollbar-color: var(--dsw-alias-border-l2) transparent; }
 .galleryMasonry::-webkit-scrollbar { width: 8px; }
 .galleryMasonry::-webkit-scrollbar-thumb { background: var(--dsw-alias-border-l2); border-radius: 999px; }
-.galleryCard { display: block; width: 100%; margin: 0; overflow: hidden; border: 1px solid var(--dsw-alias-border-l1); border-radius: 14px; background: var(--dsw-alias-bg-layer-1); box-shadow: 0 5px 18px rgb(24 32 54 / 7%); }
+.galleryCard { position: relative; display: block; width: 100%; margin: 0; overflow: hidden; border: 1px solid var(--dsw-alias-border-l1); border-radius: 14px; background: var(--dsw-alias-bg-layer-1); box-shadow: 0 5px 18px rgb(24 32 54 / 7%); }
+.galleryCard[data-selected] { border-color: var(--dsw-alias-brand-primary); box-shadow: 0 0 0 2px color-mix(in srgb, var(--dsw-alias-brand-primary) 26%, transparent), 0 5px 18px rgb(24 32 54 / 7%); }
+.gallerySelect { position: absolute; z-index: 2; top: 9px; right: 9px; display: grid; width: 26px; height: 26px; place-items: center; border: 1px solid rgb(255 255 255 / 75%); border-radius: 7px; background: rgb(0 0 0 / 58%); cursor: pointer; }
+.gallerySelect input { width: 16px; height: 16px; margin: 0; accent-color: var(--dsw-alias-brand-primary); cursor: pointer; }
 .galleryImageButton { position: relative; display: block; width: 100%; padding: 0; border: 0; background: var(--dsw-alias-bg-base); cursor: zoom-in; }
+.galleryImageButton[data-selecting] { cursor: pointer; }
 .galleryImage { display: block; width: 100%; aspect-ratio: 4 / 3; object-fit: cover; }
 .galleryMasonry[data-view='masonry'] .galleryCard:nth-child(3n + 1) .galleryImage { aspect-ratio: 4 / 5; }
 .galleryMasonry[data-view='masonry'] .galleryCard:nth-child(3n + 2) .galleryImage { aspect-ratio: 4 / 3; }
@@ -1403,6 +1522,15 @@ html[data-dsh-imagegen-active]:not([data-dsh-taskboard-active]):not([data-dsh-ss
 .galleryCardInfo strong, .galleryCardInfo small { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
 .galleryCardInfo strong { color: var(--dsw-alias-label-primary); font-size: 12px; }
 .galleryCardInfo small { color: var(--dsw-alias-label-tertiary); font-size: 10px; }
+.galleryTags { display: flex; flex-wrap: wrap; gap: 4px; margin-top: 4px; }
+.galleryTags button { overflow: hidden; max-width: 96px; min-height: 19px; padding: 1px 6px; border: 0; border-radius: 4px; color: var(--dsw-alias-brand-primary); background: color-mix(in srgb, var(--dsw-alias-brand-primary) 10%, transparent); cursor: pointer; font: inherit; font-size: 10px; line-height: 1.35; text-overflow: ellipsis; white-space: nowrap; }
+.galleryTags button:hover { background: color-mix(in srgb, var(--dsw-alias-brand-primary) 17%, transparent); }
+.galleryTags .galleryTagEdit { flex: none; color: var(--dsw-alias-label-tertiary); background: transparent; }
+.galleryTagEditor { display: flex; align-items: center; gap: 6px; padding: 0 12px 10px 48px; }
+.galleryTagEditor input { min-width: 0; flex: 1; height: 27px; padding: 0 8px; border: 1px solid var(--dsw-alias-border-l2); border-radius: 6px; outline: none; color: var(--dsw-alias-label-primary); background: var(--dsw-alias-bg-layer-2); font: inherit; font-size: 11px; }
+.galleryTagEditor input:focus { border-color: var(--dsw-alias-brand-primary); }
+.galleryTagEditor button { height: 27px; padding: 0 8px; border: 1px solid var(--dsw-alias-border-l2); border-radius: 6px; color: var(--dsw-alias-label-secondary); background: var(--dsw-alias-bg-layer-1); cursor: pointer; font: inherit; font-size: 11px; }
+.galleryTagEditor button[type='submit'] { color: var(--dsw-alias-brand-primary); }
 .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); }
 

package/src/client/settings-card.module.css

@@ -247,6 +247,48 @@
   color: var(--dsw-alias-label-tertiary);
 }
 
+.sectionDivider {
+  height: 1px;
+  margin: 18px 0 14px;
+  background: var(--dsw-alias-border-l2);
+}
+
+.sectionTitle {
+  margin: 0;
+  color: var(--dsw-alias-label-primary);
+  font-size: 14px;
+  line-height: 1.4;
+}
+
+.sectionHint {
+  margin: -4px 0 2px;
+  color: var(--dsw-alias-label-tertiary);
+  font-size: 12px;
+  line-height: 1.5;
+}
+
+.modelFetchRow {
+  display: flex;
+  gap: 8px;
+  align-items: center;
+}
+
+.modelFetch,
+.modelChoices {
+  min-height: 32px;
+  border: 1px solid var(--dsw-alias-border-l2);
+  border-radius: 7px;
+  background: var(--dsw-alias-bg-layer-3);
+  color: var(--dsw-alias-label-secondary);
+  font: inherit;
+  font-size: 12px;
+}
+
+.modelFetch { padding: 0 10px; cursor: pointer; }
+.modelFetch:hover:not(:disabled) { color: var(--dsw-alias-brand-primary); border-color: var(--dsw-alias-brand-primary); }
+.modelFetch:disabled { opacity: 0.5; cursor: default; }
+.modelChoices { min-width: 0; flex: 1; padding: 0 8px; }
+
 /* --- footer (mirror of the official card footer) ------------------------------ */
 
 .footer {

package/src/client/settings-scope.ts

@@ -22,6 +22,9 @@ export interface ImageGenConfig {
   announceToAgent?: boolean
   apiUrl?: string
   apiKey?: string
+  promptApiUrl?: string
+  promptApiKey?: string
+  promptModel?: string
 }
 
 /** Wire shape of one namespace view from the bridge. */
@@ -79,6 +82,8 @@ class BridgeScopeController<T> implements SettingsScope<T> {
   private readonly store: SnapshotStore<SettingsScopeSnapshot<T>>
   /** Whether the namespace currently holds a stored secret (e.g. apiKey). */
   private readonly keySet: SnapshotStore<boolean>
+  /** Individual secret presence bits, keyed by the settings field name. */
+  private readonly secretSets: SnapshotStore<Record<string, boolean>>
   private tail: Promise<void> = Promise.resolve()
   private disposed = false
 
@@ -96,6 +101,7 @@ class BridgeScopeController<T> implements SettingsScope<T> {
       mode: 'host',
     })
     this.keySet = createSnapshotStore(false)
+    this.secretSets = createSnapshotStore({})
   }
 
   getSnapshot(): SettingsScopeSnapshot<T> {
@@ -112,6 +118,16 @@ class BridgeScopeController<T> implements SettingsScope<T> {
     return this.keySet.subscribe(listener)
   }
 
+  /** Whether a specific secret field currently has a stored value. */
+  getSecretSetSnapshot(field: string): boolean {
+    return this.secretSets.getSnapshot()[field] === true
+  }
+
+  /** Observe changes to individual secret-field presence bits. */
+  subscribeSecretSets(listener: () => void): () => void {
+    return this.secretSets.subscribe(listener)
+  }
+
   subscribe(listener: () => void): () => void {
     return this.store.subscribe(listener)
   }
@@ -164,6 +180,7 @@ class BridgeScopeController<T> implements SettingsScope<T> {
         draft.writable = writable === true
       })
       this.keySet.set(false)
+      this.secretSets.set({})
       return
     }
     this.accept(view, writable)
@@ -200,7 +217,9 @@ class BridgeScopeController<T> implements SettingsScope<T> {
       // card binds without a narrowing decoder.
       draft.value = view.value as T
     })
-    this.keySet.set(Array.isArray(view.secrets) && view.secrets.some(secret => secret.set))
+    const secretSets = Object.fromEntries((view.secrets ?? []).map(secret => [secret.path.join('.'), secret.set]))
+    this.keySet.set(Object.values(secretSets).some(Boolean))
+    this.secretSets.set(secretSets)
   }
 }
 
@@ -210,6 +229,8 @@ export interface ImageGenScope extends SettingsScope<ImageGenConfig> {
   load(): Promise<void>
   getKeySetSnapshot(): boolean
   subscribeKeySet(listener: () => void): () => void
+  getSecretSetSnapshot(field: string): boolean
+  subscribeSecretSets(listener: () => void): () => void
 }
 
 /**

package/src/engine.ts

@@ -212,6 +212,7 @@ async function requestOneImage(
   upstream: UpstreamConfig,
   request: GenerateRequest,
   params: ReturnType<typeof effectiveParams>,
+  signal?: AbortSignal,
 ): Promise<GeneratedImage[]> {
   const headers: Record<string, string> = {
     authorization: `Bearer ${upstream.apiKey.trim()}`,
@@ -264,7 +265,7 @@ async function requestOneImage(
       method: 'POST',
       headers,
       body,
-      signal: AbortSignal.timeout(UPSTREAM_TIMEOUT_MS),
+      signal: signal === undefined ? AbortSignal.timeout(UPSTREAM_TIMEOUT_MS) : AbortSignal.any([signal, AbortSignal.timeout(UPSTREAM_TIMEOUT_MS)]),
     })
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error)
@@ -312,14 +313,14 @@ async function requestOneImage(
  * parameter is never sent, because Responses-API-based gateways reject it as
  * `tools[0].n`), then the results are flattened in order.
  */
-export async function generateImage(upstream: UpstreamConfig, request: GenerateRequest): Promise<GenerateResult> {
+export async function generateImage(upstream: UpstreamConfig, request: GenerateRequest, options: { signal?: AbortSignal } = {}): Promise<GenerateResult> {
   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')
   const params = effectiveParams(request)
   const count = effectiveCount(request)
   const batches = await Promise.all(
-    Array.from({ length: count }, () => requestOneImage(baseUrl, upstream, request, params)),
+    Array.from({ length: count }, () => requestOneImage(baseUrl, upstream, request, params, options.signal)),
   )
   return { images: batches.flat() }
 }

package/src/gallery-store.ts

@@ -60,6 +60,7 @@ interface StoredEntry {
   images: StoredImage[]
   hash?: string
   refName?: string
+  tags?: string[]
 }
 
 /** The index.json shape. */
@@ -171,6 +172,7 @@ function toWire(entry: StoredEntry): HistoryEntry {
       ...image.revisedPrompt === undefined ? {} : { revisedPrompt: image.revisedPrompt },
     })),
     ...entry.refName === undefined ? {} : { refName: entry.refName },
+    ...entry.tags === undefined ? {} : { tags: entry.tags },
   }
 }
 
@@ -242,6 +244,18 @@ export async function removeGallery(id: string): Promise<HistoryEntry[]> {
   })
 }
 
+/** Replace the user-managed labels for one gallery entry. */
+export async function updateGalleryTags(id: string, tags: string[]): Promise<HistoryEntry[]> {
+  return mutateGallery(async () => {
+    const normalized = [...new Set(tags.map(tag => tag.trim()).filter(Boolean))].slice(0, 20)
+    const entries = await readIndex()
+    const target = entries.find(entry => entry.id === id)
+    if (target !== undefined) target.tags = normalized
+    await writeIndex(entries)
+    return entries.map(toWire)
+  })
+}
+
 /** Remove every entry (and all image files). */
 export async function clearGallery(): Promise<HistoryEntry[]> {
   return mutateGallery(async () => {
@@ -263,4 +277,4 @@ export async function readGalleryImage(file: string): Promise<{ data: Buffer; mi
   } catch {
     return undefined
   }
-}
+}