@dickpy/dsh-imagegen 1.5.2 → 1.5.4

package/src/index.ts

@@ -8,9 +8,10 @@
  */
 
 import type { Context } from '@deepseek-ai/cordis'
+import { readFileSync } from 'node:fs'
+import path from 'node:path'
 import { installSettingsSectionCompat, settingsNamespaceCompat } from './settings-compat.ts'
-import z from 'schemastery'
-// Type-only: pulls the webServer Context merge (route registration).
+import z from 'schemastery'// Type-only: pulls the webServer Context merge (route registration).
 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'
@@ -21,6 +22,18 @@ 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 { syncAllTemplates } from './templates-store.ts'
+import { setStorageSyncHandler, putObject, type StorageSyncConfig } from './storage-sync.ts'
+
+/** Content type for a saved image file name (object uploads). */
+function mimeOfPath(filePath: string): string {
+  switch (path.extname(filePath).toLowerCase()) {
+    case '.jpg':
+    case '.jpeg': return 'image/jpeg'
+    case '.webp': return 'image/webp'
+    case '.gif': return 'image/gif'
+    default: return 'image/png'
+  }
+}
 import { ImageGenerationRuntime, type ChannelsView, type RuntimeChannel } from './generation-runtime.ts'
 import { registerAgentImageTools } from './agent-image-tools.ts'
 import { registerEditImageCommand } from './edit-image-command.ts'
@@ -42,6 +55,7 @@ export { latestSessionImage, registerEditImageCommand } from './edit-image-comma
 export { appendGallery, clearGallery, listGallery, readGalleryImage, removeGallery, updateGalleryTags } from './gallery-store.ts'
 export { listTemplates, readTemplateImage, refreshTemplates, sampleTemplates, syncAllTemplates, clearTemplateMemo } from './templates-store.ts'
 export { addTemplateFavorite, clearTemplateFavoritesMemo, listTemplateFavorites, removeTemplateFavorite } from './template-favorites.ts'
+export { putObject, setStorageSyncHandler, testStorage, type StorageSyncConfig } from './storage-sync.ts'
 export { checkForUpdate, clearUpdateCache, compareVersions, CURRENT_VERSION, installUpdate, profileFromProcess } from './updater.ts'
 
 /** The branded settings namespace of this plugin (the card edits it). */
@@ -75,6 +89,22 @@ export interface Config {
   promptApiKey?: string
   /** Chat model used to expand short image prompts. */
   promptModel?: string
+  /** Sync saved images to an S3-compatible object store (COS / OSS / Qiniu S3 …). */
+  storageEnabled?: boolean
+  /** S3-compatible endpoint URL including the bucket (virtual-hosted or path style). */
+  storageEndpoint?: string
+  /** Provider region for SigV4 scope, e.g. ap-guangzhou / oss-cn-hangzhou. */
+  storageRegion?: string
+  /** Object key prefix, default 'dsh-imagegen'. */
+  storagePrefix?: string
+  /** S3 access key id. */
+  storageAccessKey?: string
+  /** S3 secret access key (stored redacted). */
+  storageSecretKey?: string
+  /** Upload gallery additions (default on when storage is enabled). */
+  storageSyncGallery?: boolean
+  /** Also upload history images. */
+  storageSyncHistory?: boolean
   /* ----- deprecated legacy single-endpoint fields (migrated to channels) ----- */
   /** Legacy base URL; synthesized into the default channel on upgrade. */
   apiUrl?: string
@@ -103,6 +133,14 @@ export const Config: z<Config> = z.object({
   promptApiUrl: z.string().default(''),
   promptApiKey: z.string().role('secret').default(''),
   promptModel: z.string().default(''),
+  storageEnabled: z.boolean().default(false),
+  storageEndpoint: z.string().default(''),
+  storageRegion: z.string().default(''),
+  storagePrefix: z.string().default('dsh-imagegen'),
+  storageAccessKey: z.string().default(''),
+  storageSecretKey: z.string().role('secret').default(''),
+  storageSyncGallery: z.boolean().default(true),
+  storageSyncHistory: z.boolean().default(false),
   apiUrl: z.string().default(''),
   apiKey: z.string().role('secret').default(''),
   imageModels: z.array(z.string()).default([]),
@@ -117,7 +155,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 数组发送；智谱 `glm-image` 使用官方 `/api/paas/v4/images/generations`，当前仅支持文生图）。API 地址与密钥在 GUI 设置中按渠道配置，密钥仅存于本机设置文档；生成请求由本地宿主代理转发，结果以 base64 返回面板，可预览与下载。模型只能使用用户在各渠道配置目录中的模型；检测模型时会过滤聊天、Embedding 等非图片模型，但模型出现在 /models 中仍不等于其网关原生支持生图协议，遇到 Qwen、Gemini 等非 OpenAI 生图协议时应如实说明上游兼容性。可一键把满意的图片加入「画廊」。内置「提示词模板库」（面板提示词框左下角「模板库」按钮）：多来源标签页（精选案例库 / 沧河案例库，后续可扩展），打包 awesome-gpt-image-2 的数百条提示词案例，可搜索、筛选、收藏（星标，宿主持久化）与复用；各来源列表独立刷新，宿主每 12 小时后台自动同步一次。Agent 可直接调用 `generate_image` 提交文生图，也可用 `edit_image` 图生图；默认保持工具调用等待直到任务完成，完成图片显示在工具调用对应的左侧结果区域，模型收到状态和附件引用，不会额外伪造用户消息。用户也可以使用 `/edit_image <修改描述>`，命令会直接读取当前对话最近图片并调用插件图片模型，不经过对话模型的图片能力检查。若明确需要后台执行，可传 `wait_for_completion: false`，之后再用 `get_image_generation_task` 查询；不要反复轮询。限制：生成消耗上游 API 额度；图片内容由上游模型生成，可能不符合预期或包含不适宜内容；api_key 以明文存储在设置文档中；参考图会发送至所配置的 API 服务；模板库在线刷新与参考图首次加载需要访问对应来源站点（vibeui.top / gpt-image2.canghe.ai）。用户提到「生图 / 绘画 / 生成图片 / 文生图 / 图生图 / 画廊 / 提示词模板」时即指本插件，请据此协作。'
+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`，当前仅支持文生图；qwen-image 系列使用阿里云 DashScope 原生接口（api_url 填 https://dashscope.aliyuncs.com/api/v1，不支持 OpenAI 兼容模式，该渠道不可复用于提示词增强，尺寸自动映射为宽*高）。API 地址与密钥在 GUI 设置中按渠道配置，密钥仅存于本机设置文档；生成请求由本地宿主代理转发，结果以 base64 返回面板，可预览与下载。模型只能使用用户在各渠道配置目录中的模型；检测模型时会过滤聊天、Embedding 等非图片模型，但模型出现在 /models 中仍不等于其网关原生支持生图协议，遇到 Qwen、Gemini 等非 OpenAI 生图协议时应如实说明上游兼容性。可一键把满意的图片加入「画廊」。内置「提示词模板库」（面板提示词框左下角「模板库」按钮）：多来源标签页（精选案例库 / 沧河案例库，后续可扩展），打包 awesome-gpt-image-2 的数百条提示词案例，可搜索、筛选、收藏（星标，宿主持久化）与复用；各来源列表独立刷新，宿主每 12 小时后台自动同步一次。Agent 可直接调用 `generate_image` 提交文生图，也可用 `edit_image` 图生图；默认保持工具调用等待直到任务完成，完成图片显示在工具调用对应的左侧结果区域，模型收到状态和附件引用，不会额外伪造用户消息。用户也可以使用 `/edit_image <修改描述>`，命令会直接读取当前对话最近图片并调用插件图片模型，不经过对话模型的图片能力检查。若明确需要后台执行，可传 `wait_for_completion: false`，之后再用 `get_image_generation_task` 查询；不要反复轮询。限制：生成消耗上游 API 额度；图片内容由上游模型生成，可能不符合预期或包含不适宜内容；api_key 以明文存储在设置文档中；参考图会发送至所配置的 API 服务；模板库在线刷新与参考图首次加载需要访问对应来源站点（vibeui.top / gpt-image2.canghe.ai）。用户提到「生图 / 绘画 / 生成图片 / 文生图 / 图生图 / 画廊 / 提示词模板」时即指本插件，请据此协作。'
 
 /** Append the live channel × model table so an Agent can honor user choices. */
 function guidanceFor(channels: RuntimeChannel[], defaultChannelId: string): string {
@@ -175,6 +213,7 @@ export interface EffectiveConfig {
   promptApiUrl: string
   promptApiKey: string
   promptModel: string
+  storage: StorageSyncConfig & { enabled: boolean; syncGallery: boolean; syncHistory: boolean }
 }
 
 /**
@@ -182,7 +221,7 @@ export interface EffectiveConfig {
  * @param ctx - host plugin context carrying webServer/systemPrompt.
  * @param config - resolved plugin config (schema defaults applied by the loader).
  */
-export function apply(ctx: Context, config?: Config): void {
+export function apply(ctx: Context, config?: Config): (() => void) | void {
   // The live source the surfaces read: the settings section once the settings
   // service is attached, the composition entry otherwise.
   let current: () => Config = () => config ?? {}
@@ -226,6 +265,16 @@ export function apply(ctx: Context, config?: Config): void {
       promptApiUrl: typeof value.promptApiUrl === 'string' ? value.promptApiUrl.trim() : '',
       promptApiKey: typeof value.promptApiKey === 'string' ? value.promptApiKey.trim() : '',
       promptModel: typeof value.promptModel === 'string' ? value.promptModel.trim() : '',
+      storage: {
+        enabled: value.storageEnabled ?? false,
+        endpoint: typeof value.storageEndpoint === 'string' ? value.storageEndpoint.trim() : '',
+        region: typeof value.storageRegion === 'string' ? value.storageRegion.trim() : '',
+        accessKey: typeof value.storageAccessKey === 'string' ? value.storageAccessKey.trim() : '',
+        secretKey: typeof value.storageSecretKey === 'string' ? value.storageSecretKey.trim() : '',
+        prefix: typeof value.storagePrefix === 'string' && value.storagePrefix.trim() !== '' ? value.storagePrefix.trim() : 'dsh-imagegen',
+        syncGallery: value.storageSyncGallery ?? true,
+        syncHistory: value.storageSyncHistory ?? false,
+      },
     }
   }
 
@@ -236,6 +285,21 @@ export function apply(ctx: Context, config?: Config): void {
     return { channels: value.channels, defaultChannelId: value.defaultChannelId }
   }
 
+  // Object-storage sync: the image stores announce every file they write; the
+  // handler resolves the live settings and uploads when enabled. Fire and
+  // forget — a sync failure never blocks the save path.
+  setStorageSyncHandler((kind, filePath) => {
+    const storage = resolve().storage
+    if (!storage.enabled || !storage.endpoint.trim() || storage.secretKey.trim() === '') return
+    if (kind === 'gallery' && !storage.syncGallery) return
+    if (kind === 'history' && !storage.syncHistory) return
+    const key = `${storage.prefix}/${kind === 'gallery' ? 'gallery' : 'images'}/${path.basename(filePath)}`
+    const data = readFileSync(filePath)
+    void putObject(storage, key, data, mimeOfPath(filePath)).catch(() => {
+      // Best-effort sync: surfaced through the settings test, never fatal here.
+    })
+  })
+
   // Browser endpoints and Agent tools share the exact same serial queue. This
   // keeps image persistence, cancellation, and retries coherent across both
   // entry points; Agent tools wait for their task result by default and render
@@ -276,6 +340,7 @@ export function apply(ctx: Context, config?: Config): void {
           attachments: sctx.attachments,
           pendingConversationImages,
           runtime,
+          resolveStorage: () => resolve().storage,
         })
         const disposers = routes.map(route => ctx.webServer.register(route))
         // Background template sync: the upstream sources update on their own
@@ -354,4 +419,6 @@ export function apply(ctx: Context, config?: Config): void {
   // Initial registration from the composition entry (covers deployments with
   // no settings service, whose installSettingsSection never fires its hooks).
   sync()
+
+  return () => { setStorageSyncHandler(undefined) }
 }

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' | 'zhipu' | 'unknown'
+export type ModelFamily = 'gpt-image' | 'dall-e' | 'grok' | 'nanobanana' | 'seedream' | 'zhipu' | 'qwen' | 'unknown'
 
 /** Capability/identity annotation for one model id. */
 export interface ModelCatalogEntry {
@@ -77,6 +77,14 @@ const ENTRIES: Record<Exclude<ModelFamily, 'unknown'>, Omit<ModelCatalogEntry, '
     supportsAspectRatio: false,
     qualityTiers: ['HD'],
   },
+  qwen: {
+    label: 'qwen-image',
+    labelZh: '千问图像',
+    known: true,
+    supportsEdit: true,
+    supportsAspectRatio: true,
+    qualityTiers: ['auto'],
+  },
 }
 
 /** Official Gemini image ids served by Nano Banana gateways. */
@@ -98,6 +106,7 @@ export function describeModel(model: string): ModelCatalogEntry {
   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 }
+  if (/^qwen-image(?:[-_.]|$)/i.test(id)) return { family: 'qwen', ...ENTRIES.qwen }
   return { family: 'unknown', label: 'unknown', labelZh: '未知协议', known: false, supportsEdit: true, supportsAspectRatio: false, qualityTiers: [] }
 }
 

package/src/presets.ts

@@ -54,6 +54,21 @@ export const IMAGE_PRESETS: PresetProvider[] = [
       { alias: 'glm-image', id: 'glm-image' },
     ],
   },
+  {
+    id: 'aliyun-dashscope-qwen',
+    name: '阿里云百炼（Qwen-Image）',
+    apiUrl: 'https://dashscope.aliyuncs.com/api/v1',
+    hint: '阿里云百炼 DashScope 原生接口：通义千问 Qwen-Image 系列（该渠道不可复用于提示词增强）',
+    models: [
+      { alias: 'qwen-image-3.0-pro', id: 'qwen-image-3.0-pro' },
+      { alias: 'qwen-image-3.0', id: 'qwen-image-3.0' },
+      { alias: 'qwen-image-2.0-pro', id: 'qwen-image-2.0-pro' },
+      { alias: 'qwen-image-2.0', id: 'qwen-image-2.0' },
+      { alias: 'qwen-image-max', id: 'qwen-image-max' },
+      { alias: 'qwen-image-plus', id: 'qwen-image-plus' },
+      { alias: 'qwen-image', id: 'qwen-image' },
+    ],
+  },
   {
     id: 'xai-grok',
     name: 'xAI（Grok）',

package/src/protocol.ts

@@ -8,7 +8,7 @@
 export const IMAGEGEN_SETTINGS_NAMESPACE = 'dsh-imagegen'
 
 /** Published package version shared by the host updater and the client UI. */
-export const PLUGIN_VERSION = '1.5.2'
+export const PLUGIN_VERSION = '1.5.4'
 
 /** Same-origin route family (loopback-only, mirroring the dsh-ssh fence). */
 export const SETTINGS_API = {
@@ -54,6 +54,14 @@ export const TASK_API = {
   retry: '/api/dsh-imagegen/tasks/retry',
 } as const
 
+/** Reveal the host data directory (saved images) in the OS file manager. */
+export const DATA_FOLDER_API = '/api/dsh-imagegen/data-folder/open' as const
+
+/** Probe the configured S3-compatible object storage. */
+export const STORAGE_API = {
+  test: '/api/dsh-imagegen/storage/test',
+} as const
+
 /** Host-mediated GitHub Release update routes. */
 export const UPDATE_API = {
   check: '/api/dsh-imagegen/update/check',
@@ -88,6 +96,18 @@ export const GALLERY_API = {
   image: '/api/dsh-imagegen/gallery/image',
 } as const
 
+/** Host-persisted infinite canvas projects and their content-addressed assets. */
+export const CANVAS_API = {
+  list: '/api/dsh-imagegen/canvas/list',
+  create: '/api/dsh-imagegen/canvas/create',
+  read: '/api/dsh-imagegen/canvas/read',
+  save: '/api/dsh-imagegen/canvas/save',
+  remove: '/api/dsh-imagegen/canvas/remove',
+  assetUpload: '/api/dsh-imagegen/canvas/asset/upload',
+  assetImport: '/api/dsh-imagegen/canvas/asset/import',
+  asset: '/api/dsh-imagegen/canvas/asset',
+} as const
+
 /** Maximum number of history entries retained host-side (oldest evicted). */
 export const HISTORY_MAX = 50
 
@@ -226,6 +246,100 @@ export interface TemplateFavorite {
 /** Generation modes. */
 export type GenerateMode = 'text' | 'edit'
 
+/** Origin information carried by a generation started from the canvas. */
+export interface CanvasTaskMeta {
+  canvasId: string
+  sourceNodeId?: string
+  /** Legacy v1 annotation workflow; kept so old history entries still parse. */
+  annotationNodeId?: string
+  parentNodeId?: string
+  placement?: 'right' | 'below'
+}
+
+/** One image asset referenced by a canvas node. */
+export interface CanvasAssetRef {
+  assetId: string
+  url: string
+  mime: string
+  bytes: number
+  width: number
+  height: number
+  origin: 'upload' | 'history' | 'gallery' | 'generated'
+  originId?: string
+  entryId?: string
+  imageIndex?: number
+}
+
+export type CanvasNodeType = 'image' | 'text' | 'config'
+
+export interface CanvasViewport {
+  x: number
+  y: number
+  /** Zoom factor. */
+  k: number
+}
+
+/** Free-form per-node state, mirroring the node-graph canvas model. */
+export interface CanvasNodeMetadata {
+  /** Image nodes: the rendered asset. */
+  asset?: CanvasAssetRef
+  status?: 'idle' | 'generating' | 'success' | 'error'
+  error?: string
+  /** Config/image nodes: generation settings. */
+  prompt?: string
+  model?: string
+  size?: string
+  quality?: string
+  /** Config nodes: how many images to generate (1-4). */
+  count?: number
+  /** Config nodes: generation mode (image) or plain writing (text). */
+  mode?: 'image' | 'text'
+  taskId?: string
+  sourceNodeId?: string
+  /** Text nodes. */
+  text?: string
+  fontSize?: number
+}
+
+export interface CanvasNode {
+  id: string
+  type: CanvasNodeType
+  title: string
+  x: number
+  y: number
+  width: number
+  height: number
+  metadata?: CanvasNodeMetadata
+}
+
+export interface CanvasConnection {
+  id: string
+  fromNodeId: string
+  toNodeId: string
+}
+
+export interface CanvasDocument {
+  version: 2
+  id: string
+  title: string
+  revision: number
+  viewport: CanvasViewport
+  background: 'dots' | 'lines' | 'blank'
+  nodes: CanvasNode[]
+  connections: CanvasConnection[]
+  createdAt: number
+  updatedAt: number
+}
+
+export interface CanvasSummary {
+  id: string
+  title: string
+  revision: number
+  nodeCount: number
+  createdAt: number
+  updatedAt: number
+}
+
 /** Metadata shared by the ecommerce product-set workflow. */
 export interface EcommerceTaskMeta {
   workflow?: 'ecommerce'
@@ -257,6 +371,8 @@ export interface ProductSetDraft {
   category: string
   platform: string
   language: string
+  /** Custom copy language when language is 'custom'. */
+  customLanguage?: string
   size: string
   productName: string
   sellingPoints: string
@@ -311,6 +427,8 @@ export interface GenerateRequest extends EcommerceTaskMeta {
   comparisonId?: string
   /** All model aliases selected for one comparison run. */
   comparisonModels?: string[]
+  /** Optional canvas lineage metadata. */
+  canvas?: CanvasTaskMeta
 }
 
 /** One generated image, normalized host-side to base64 so the browser never
@@ -428,6 +546,7 @@ export interface HistoryEntry extends EcommerceTaskMeta {
   comparisonId?: string
   /** Model aliases included in the comparison run. */
   comparisonModels?: string[]
+  canvas?: CanvasTaskMeta
 }
 
 /** A history entry the client submits for persistence (images still carry base64). */
@@ -451,4 +570,5 @@ export interface HistoryEntryInput extends EcommerceTaskMeta {
   comparisonId?: string
   /** Model aliases included in the comparison run. */
   comparisonModels?: string[]
+  canvas?: CanvasTaskMeta
 }