@dickpy/dsh-imagegen 1.2.2 → 1.3.0

package/src/client/channels-form.ts

@@ -0,0 +1,263 @@
+/**
+ * Staged form model for the channel list of the settings card. Mirrors the
+ * CardForm staging pattern (dirty → one save) but for a structured value, so
+ * the card can edit N channels, per-channel keys, and the default-channel
+ * flag, then persist everything in one revision-fenced mutate call.
+ *
+ * Storage rules (dictated by dsh-settings semantics):
+ *  - the whole `channels` array is written wholesale via `path: ['channels']`;
+ *  - every channel's API key lives at `channelSecrets.<channelId>` (a secret
+ *    dict), written per-key so untouched keys are never clobbered by a save
+ *    the reader could not see (keys are redacted out of the wire view);
+ *  - path ops never navigate *inside* the channels array.
+ */
+
+import { createSnapshotStore, type SnapshotStore } from '@deepseek-ai/dsh-client-runtime/client'
+import type { ChannelConfig, ModelMapping } from '../protocol.ts'
+import type { ImageGenScope, SettingsOp } from './settings-scope.ts'
+
+/** One channel as the editor stages it (secrets never travel here). */
+export interface ChannelDraft {
+  id: string
+  preset: string
+  name: string
+  apiUrl: string
+  models: ModelMapping[]
+}
+
+/** One staged key edit for a channel. */
+export type KeyEdit = { kind: 'set'; value: string } | { kind: 'clear' }
+
+/** The state the card renders. */
+export interface ChannelsFormState {
+  /** Staged channel list (the scope value when nothing is staged). */
+  channels: ChannelDraft[]
+  /** Which channels currently hold a stored secret (staged edits included). */
+  keySet: Record<string, boolean>
+  /** The effective default channel id. */
+  defaultChannelId: string
+  /** Whether a save would write anything. */
+  dirty: boolean
+  /** Whether the document accepts writes. */
+  writable: boolean
+  /** Whether a save is crossing the wire. */
+  saving: boolean
+  /** Whether the last save failed (cleared by the next edit or save). */
+  failed: boolean
+}
+
+/** The actions the card's slot entry injects. */
+export interface ChannelsFormActions {
+  /** Replace the whole channel list (add/edit/remove go through here). */
+  setChannels: (channels: ChannelDraft[]) => void
+  /** Stage a key for one channel ('' clears; undefined = no staged change). */
+  setChannelKey: (id: string, value: string | undefined) => void
+  /** Stage the default-channel flag. */
+  setDefaultChannel: (id: string) => void
+  /** Write every staged edit, then re-seed from what the Host accepted. */
+  commit: () => Promise<void>
+  /** Drop every staged edit. */
+  discard: () => void
+}
+
+/** Deep equality over JSON-compatible data (the change predicate). */
+function deepEqualJson(a: unknown, b: unknown): boolean {
+  if (a === b) return true
+  if (typeof a !== 'object' || typeof b !== 'object' || a === null || b === null) return false
+  if (Array.isArray(a) || Array.isArray(b)) {
+    if (!Array.isArray(a) || !Array.isArray(b) || a.length !== b.length) return false
+    return a.every((entry, index) => deepEqualJson(entry, b[index]))
+  }
+  const left = a as Record<string, unknown>
+  const right = b as Record<string, unknown>
+  const keys = Object.keys(left)
+  if (keys.length !== Object.keys(right).length) return false
+  return keys.every(key => key in right && deepEqualJson(left[key], right[key]))
+}
+
+/** Trim and normalize a draft channel (models never carry empty aliases). */
+function stripChannel(channel: ChannelDraft): ChannelDraft {
+  const models = channel.models
+    .map(model => ({ alias: model.alias.trim(), id: model.id.trim() === '' ? model.alias.trim() : model.id.trim() }))
+    .filter(model => model.alias !== '')
+  return {
+    id: channel.id,
+    preset: channel.preset,
+    name: channel.name.trim(),
+    apiUrl: channel.apiUrl.trim(),
+    models: [...new Map(models.map(model => [model.alias, model])).values()],
+  }
+}
+
+export class ChannelsForm {
+  private stagedChannels: ChannelDraft[] | null = null
+  private readonly stagedKeys = new Map<string, KeyEdit>()
+  private stagedDefault: string | null = null
+  private readonly listeners = new Set<() => void>()
+  private saving = false
+  private failed = false
+
+  constructor(private readonly scope: ImageGenScope) {
+    scope.subscribe(() => { this.publish() })
+    scope.subscribeSecretSets(() => { this.publish() })
+  }
+
+  /** Publish a projection of this form, rebuilt on every scope or draft change. */
+  bind<S>(project: () => S): SnapshotStore<S> {
+    const store = createSnapshotStore(project())
+    this.listeners.add(() => { store.set(project()) })
+    return store
+  }
+
+  /** Subscribe to staged and persisted channel changes. */
+  subscribe(listener: () => void): () => void {
+    this.listeners.add(listener)
+    return () => { this.listeners.delete(listener) }
+  }
+
+  /** The staged channel list, or the scope value when nothing is staged. */
+  private channelsValue(): ChannelDraft[] {
+    const view = this.scope.getSnapshot().value as { channels?: ChannelConfig[] } | undefined
+    return this.stagedChannels ?? (Array.isArray(view?.channels) ? view.channels.map(toDraft) : [])
+  }
+
+  /** Whether a channel currently holds a stored or staged secret. */
+  private keyHeld(id: string): boolean {
+    const edit = this.stagedKeys.get(id)
+    if (edit !== undefined) return edit.kind === 'set' && edit.value !== ''
+    return this.scope.getSecretSetSnapshot(`channelSecrets.${id}`)
+  }
+
+  private defaultValue(): string {
+    if (this.stagedDefault !== null) return this.stagedDefault
+    const view = this.scope.getSnapshot().value as { defaultChannelId?: string } | undefined
+    const channels = this.channelsValue()
+    if (view?.defaultChannelId !== undefined && channels.some(channel => channel.id === view.defaultChannelId)) return view.defaultChannelId
+    return channels[0]?.id ?? ''
+  }
+
+  private dirtyValue(): boolean {
+    const channels = this.channelsValue()
+    const stagedChanged = this.stagedChannels !== null && !deepEqualJson(this.stagedChannels, scopeChannelsOf(this.scope))
+    const scopeView = this.scope.getSnapshot().value as { defaultChannelId?: string } | undefined
+    const scopeDefault = scopeView?.defaultChannelId ?? channels[0]?.id ?? ''
+    const defaultChanged = this.stagedDefault !== null && this.stagedDefault !== scopeDefault
+    return stagedChanged || defaultChanged || this.stagedKeys.size > 0
+  }
+
+  /** The card-facing snapshot. */
+  snapshot(): ChannelsFormState {
+    const channels = this.channelsValue()
+    const keySet: Record<string, boolean> = {}
+    for (const channel of channels) keySet[channel.id] = this.keyHeld(channel.id)
+    return {
+      channels,
+      keySet,
+      defaultChannelId: this.defaultValue(),
+      dirty: this.dirtyValue(),
+      writable: this.scope.getSnapshot().writable !== false,
+      saving: this.saving,
+      failed: this.failed,
+    }
+  }
+
+  /** The actions the card's slot registration injects. */
+  actions(): ChannelsFormActions {
+    return {
+      setChannels: (channels) => { this.stageChannels(channels) },
+      setChannelKey: (id, value) => { this.stageKey(id, value) },
+      setDefaultChannel: (id) => { this.stagedDefault = id; this.failed = false; this.publish() },
+      commit: () => this.commit(),
+      discard: () => {
+        if (this.stagedChannels === null && this.stagedKeys.size === 0 && this.stagedDefault === null && !this.failed) return
+        this.stagedChannels = null
+        this.stagedKeys.clear()
+        this.stagedDefault = null
+        this.failed = false
+        this.publish()
+      },
+    }
+  }
+
+  // ------------------------------------------------------------------ staging
+
+  private stageChannels(channels: ChannelDraft[]): void {
+    const cleaned = channels.map(stripChannel)
+    this.stagedChannels = cleaned
+    this.failed = false
+    this.publish()
+  }
+
+  private stageKey(id: string, value: string | undefined): void {
+    if (value === undefined || value.trim() === '') {
+      if (this.keyHeld(id)) this.stagedKeys.set(id, { kind: 'clear' })
+      // An empty key for a key-less channel stages nothing.
+    } else {
+      this.stagedKeys.set(id, { kind: 'set', value: value.trim() })
+    }
+    this.failed = false
+    this.publish()
+  }
+
+  // ----------------------------------------------------------------- save
+
+  /** Build the single batch of path ops a save performs. */
+  private planOps(): SettingsOp[] {
+    const ops: SettingsOp[] = []
+    if (this.stagedChannels !== null) {
+      ops.push({ op: 'set', path: ['channels'], value: this.stagedChannels })
+      // Once channels exist, the legacy flat fields are obsolete (idempotent).
+      ops.push({ op: 'unset', path: ['apiUrl'] })
+      ops.push({ op: 'unset', path: ['apiKey'] })
+      ops.push({ op: 'unset', path: ['imageModels'] })
+    }
+    for (const [id, edit] of this.stagedKeys) {
+      if (edit.kind === 'set') ops.push({ op: 'set', path: ['channelSecrets', id], value: edit.value })
+      else ops.push({ op: 'unset', path: ['channelSecrets', id] })
+    }
+    if (this.stagedDefault !== null) {
+      ops.push({ op: 'set', path: ['defaultChannelId'], value: this.stagedDefault })
+    }
+    return ops
+  }
+
+  /**
+   * Write every staged edit, then re-seed from what the Host accepted.
+   * @returns settlement after the write settles.
+   */
+  async commit(): Promise<void> {
+    if (this.saving) return
+    const ops = this.planOps()
+    if (ops.length === 0) return
+    this.saving = true
+    this.failed = false
+    this.publish()
+    try {
+      await this.scope.mutateOps(ops)
+      this.stagedChannels = null
+      this.stagedKeys.clear()
+      this.stagedDefault = null
+      this.failed = false
+    } catch {
+      this.failed = true
+    } finally {
+      this.saving = false
+      this.publish()
+    }
+  }
+
+  private publish(): void {
+    for (const listener of [...this.listeners]) listener()
+  }
+}
+
+/** Project a stored channel into a draft (secrets never travel in channels). */
+function toDraft(channel: ChannelConfig): ChannelDraft {
+  return { id: channel.id, preset: channel.preset, name: channel.name, apiUrl: channel.apiUrl, models: channel.models.map(model => ({ ...model })) }
+}
+
+/** The scope's current channels value (a plain array), for change detection. */
+function scopeChannelsOf(scope: ImageGenScope): unknown {
+  const view = scope.getSnapshot().value as { channels?: unknown } | undefined
+  return Array.isArray(view?.channels) ? view.channels : []
+}

package/src/client/image-toolview.tsx

@@ -1,8 +1,9 @@
 /** Inline renderer for image-generation tool-result attachments. */
 
 import type { ImageAttachmentRef } from '@deepseek-ai/dsh-attachment'
-import type { ClientContext, ISessions, SessionId, ToolCallBlock } from '@deepseek-ai/dsh-client-runtime/client'
+import type { ClientContext, SessionId, ToolCallBlock } from '@deepseek-ai/dsh-client-runtime/client'
 import { useEffect, useMemo, useState } from 'react'
+import { AGENT_IMAGE_API } from '../protocol.ts'
 import css from './image-toolview.module.css'
 
 /** Owner props supplied by the host's keyed tool-call slot. */
@@ -31,7 +32,9 @@ function isSettled(block: ToolCallBlock): block is Extract<ToolCallBlock, { kind
 
 function imageRefsOf(block: ToolCallBlock): ImageAttachmentRef[] {
   if (!isSettled(block)) return []
-  return block.content.flatMap(content => content.type === 'image' ? [content.attachment] : [])
+  const resultContent = block.resultView?.card === 'generic' ? block.resultView.content ?? [] : []
+  return [...block.content, ...resultContent]
+    .flatMap(content => content.type === 'image' ? [content.attachment] : [])
 }
 
 function textOf(block: ToolCallBlock): string {
@@ -108,16 +111,20 @@ function useAttachmentImages(
 
 /** Register the inline image result view for all image-generation result tools. */
 export function registerImageToolviews(ctx: ClientContext): void {
-  // Older client typings still expose the host-side SessionStore on the
-  // generic Context property. The runtime service itself provides the newer
-  // binding/session face, so resolve it through Cordis and narrow locally.
-  const sessions = ctx.get('sessions') as unknown as ISessions | undefined
-  const load = async (sessionId: SessionId, ref: ImageAttachmentRef): Promise<string> => {
-    const session = sessions?.binding(sessionId)?.session
-    if (session === undefined) throw new Error('当前会话不可用，无法读取图片附件。')
-    const result = await session.readAttachment(ref.attachmentId)
-    if (!result.ok) throw new Error(result.error.message)
-    const blob = new Blob([new Uint8Array(result.value.data)], { type: result.value.attachment.mediaType })
+  const load = async (_sessionId: SessionId, ref: ImageAttachmentRef): Promise<string> => {
+    // Tool-result images intentionally do not occur in model-visible session
+    // content, so session.readAttachment() rejects them. The plugin route
+    // reads the same durable attachment after validating the complete ref.
+    const query = new URLSearchParams({
+      attachment_id: String(ref.attachmentId),
+      media_type: ref.mediaType,
+      bytes: String(ref.bytes),
+      width: String(ref.width),
+      height: String(ref.height),
+    })
+    const response = await fetch(`${AGENT_IMAGE_API}?${query.toString()}`)
+    if (!response.ok) throw new Error(`无法读取图片附件（HTTP ${response.status}）。`)
+    const blob = await response.blob()
     return URL.createObjectURL(blob)
   }
 

package/src/client/locales.ts

@@ -4,7 +4,7 @@
 
 export const zh = {
   'entry.label': 'AI 生图',
-  'entry.tooltip': 'AI 生图面板（gpt-image-2 / grok-imagine-image）',
+  'entry.tooltip': 'AI 生图面板（gpt-image-2 / grok-imagine-image / nanobanana / seedream 系列）',
   'panel.title': 'AI 生图',
   'panel.githubTip': '觉得好用或有建议？欢迎来 GitHub 提 issues、点个 star 支持一下！',
   // mode
@@ -72,6 +72,9 @@ export const zh = {
   'canvas.emptyTitle': '开始你的创作',
   'canvas.emptyHint': '在左侧输入提示词并点击「开始生成」，结果将显示在这里',
   'canvas.error': '生成失败：{error}',
+  'canvas.submitting': '正在加入生成队列…',
+  'canvas.queued': '已加入生成队列',
+  'canvas.queueHint': '当前有 {count} 个任务等待处理',
   'canvas.generating': '正在生成图片…',
   'canvas.elapsed': '已用时 {seconds}s',
   'canvas.images': '本次生成 {count} 张',
@@ -249,11 +252,63 @@ export const zh = {
   'templates.attribution': '模板与图片来自 awesome-gpt-image-2 项目，作者链接见各模板详情',
   'templates.source': '来源：vibeui.top',
   'templates.featured': '精选',
+  // channel management
+  'channels.title': '渠道',
+  'channels.hint': '填写各渠道的 API 地址与密钥即可使用对应模型',
+  'channels.empty': '尚无渠道，点击下方按钮添加',
+  'channels.addProvider': '添加提供方',
+  'channels.addCustom': '添加自定义渠道',
+  'channels.untitled': '未命名渠道',
+  'channels.keySet': '密钥已设置',
+  'channels.keyMissing': '未设置密钥',
+  'channels.modelCount': '{n} 个模型',
+  'channels.noModels': '未配置模型',
+  'channels.defaultLabel': '默认',
+  'channels.statusReady': '可用',
+  'channels.statusIncomplete': '配置未完成',
+  'channels.edit': '编辑',
+  'channels.delete': '删除',
+  'channels.deleteConfirmTitle': '删除渠道「{name}」？该渠道的密钥将被移除；历史与画廊中的记录仍会保留。',
+  'channels.confirm': '确认删除',
+  'channels.cancel': '取消',
+  'channels.editorTitle': '渠道',
+  'channels.editorSaveNote': '改动将随卡片底部「保存」一起生效',
+  'channels.displayName': '显示名称',
+  'channels.apiUrl': 'API 地址',
+  'channels.apiKey': 'API 密钥',
+  'channels.keyReplaceHint': '已配置 — 输入新值可替换',
+  'channels.keyMissingHint': '填写密钥',
+  'channels.keyClear': '清除密钥',
+  'channels.modelCatalogTitle': '模型目录',
+  'channels.noModelsHint': '暂无模型：点击「检测」拉取候选，或手动添加；别名（显示名）默认等于上游模型 id，可自行修改。',
+  'channels.detect': '重新检测',
+  'channels.detecting': '检测中…',
+  'channels.detectSuccess': '连通 ✓ · {n} 个候选',
+  'channels.detectFailed': '检测失败：{error}',
+  'channels.detectOk': '已连接该 API',
+  'channels.modelAliasLabel': '显示名（别名）',
+  'channels.modelIdLabel': '上游模型 id',
+  'channels.generated': '已生成 {n} 次',
+  'channels.unknownProtocol': '未知协议，按通用 OpenAI 协议尝试',
+  'channels.removeModel': '移除模型',
+  'channels.manualAddPlaceholder': '输入模型 id，例如 qwen-image',
+  'channels.addModelConfirm': '添加',
+  'channels.copyFrom': '从其他渠道复制…',
+  'channels.copyApply': '复制',
+  'channels.candidatesTitle': '候选模型（点击加入）',
+  'channels.candidatesQuick': '只勾已收录协议',
+  'channels.deleteThisChannel': '删除此渠道',
+  'channels.setDefault': '设为默认渠道',
+  'channels.presetPickerTitle': '添加提供方',
+  'channels.presetPickerHint': '选择一个内置提供方，仅需填写 API 密钥',
+  'channels.presetModelsHint': '{n} 个预置模型',
+  'channels.presetCustomHint': '自行填写 API 地址、密钥与模型目录',
+  'channels.presetLoadFailed': '加载提供方失败：{error}',
 } as const
 
 export const en: Record<keyof typeof zh, string> = {
   'entry.label': 'AI Image',
-  'entry.tooltip': 'AI image generation studio (gpt-image-2 / grok-imagine-image)',
+  'entry.tooltip': 'AI image generation studio (gpt-image-2 / grok-imagine-image / nanobanana / seedream family)',
   'panel.title': 'AI Image',
   'panel.githubTip': 'Like it or have suggestions? Head to GitHub to open issues and star us!',
   'mode.text': 'Text to Image',
@@ -315,6 +370,9 @@ export const en: Record<keyof typeof zh, string> = {
   'canvas.emptyTitle': 'Start creating',
   'canvas.emptyHint': 'Enter a prompt on the left and click "Generate"; results appear here',
   'canvas.error': 'Generation failed: {error}',
+  'canvas.submitting': 'Adding to the generation queue…',
+  'canvas.queued': 'Added to the generation queue',
+  'canvas.queueHint': '{count} task(s) waiting or generating',
   'canvas.generating': 'Generating images…',
   'canvas.elapsed': 'Elapsed {seconds}s',
   'canvas.images': '{count} image(s) generated',
@@ -486,6 +544,58 @@ export const en: Record<keyof typeof zh, string> = {
   'templates.attribution': 'Templates and images come from the awesome-gpt-image-2 project; author links are on each template',
   'templates.source': 'Source: vibeui.top',
   'templates.featured': 'Featured',
+  // channel management
+  'channels.title': 'Channels',
+  'channels.hint': 'Fill in each channel\'s API URL and key to use its models',
+  'channels.empty': 'No channels yet — add one below',
+  'channels.addProvider': 'Add provider',
+  'channels.addCustom': 'Add custom channel',
+  'channels.untitled': 'Untitled channel',
+  'channels.keySet': 'Key set',
+  'channels.keyMissing': 'Key missing',
+  'channels.modelCount': '{n} model(s)',
+  'channels.noModels': 'No models',
+  'channels.defaultLabel': 'Default',
+  'channels.statusReady': 'Ready',
+  'channels.statusIncomplete': 'Config incomplete',
+  'channels.edit': 'Edit',
+  'channels.delete': 'Delete',
+  'channels.deleteConfirmTitle': 'Delete channel "{name}"? Its key will be removed; history and gallery records are kept.',
+  'channels.confirm': 'Delete',
+  'channels.cancel': 'Cancel',
+  'channels.editorTitle': 'Channel',
+  'channels.editorSaveNote': 'Changes take effect with the card\'s "Save" button',
+  'channels.displayName': 'Display name',
+  'channels.apiUrl': 'API URL',
+  'channels.apiKey': 'API key',
+  'channels.keyReplaceHint': 'Configured — type a new value to replace it',
+  'channels.keyMissingHint': 'Enter a key',
+  'channels.keyClear': 'Clear key',
+  'channels.modelCatalogTitle': 'Model catalog',
+  'channels.noModelsHint': 'No models yet: run "Detect" to pull candidates, or add one manually; the alias (display name) defaults to the upstream model id and can be renamed.',
+  'channels.detect': 'Re-detect',
+  'channels.detecting': 'Detecting…',
+  'channels.detectSuccess': 'Connected ✓ · {n} candidates',
+  'channels.detectFailed': 'Detection failed: {error}',
+  'channels.detectOk': 'Connected to this API',
+  'channels.modelAliasLabel': 'Display name (alias)',
+  'channels.modelIdLabel': 'Upstream model id',
+  'channels.generated': 'Generated {n} time(s)',
+  'channels.unknownProtocol': 'Unknown protocol — best-effort OpenAI',
+  'channels.removeModel': 'Remove model',
+  'channels.manualAddPlaceholder': 'Enter a model id, e.g. qwen-image',
+  'channels.addModelConfirm': 'Add',
+  'channels.copyFrom': 'Copy from another channel…',
+  'channels.copyApply': 'Copy',
+  'channels.candidatesTitle': 'Candidates (click to add)',
+  'channels.candidatesQuick': 'Add only known protocols',
+  'channels.deleteThisChannel': 'Delete this channel',
+  'channels.setDefault': 'Set as default channel',
+  'channels.presetPickerTitle': 'Add provider',
+  'channels.presetPickerHint': 'Pick a built-in provider — only the API key is needed',
+  'channels.presetModelsHint': '{n} preset model(s)',
+  'channels.presetCustomHint': 'Configure the API URL, key, and model catalog yourself',
+  'channels.presetLoadFailed': 'Failed to load providers: {error}',
 }
 
 /** Locale key union. */