@dickpy/dsh-imagegen 1.5.2 → 1.5.3

package/lib/index.js

@@ -40,7 +40,7 @@ function installSettingsSectionCompat(ctx, ns, schema, entry, hooks) {
 /** Settings namespace this plugin owns (host settings seam + bridge). */
 const IMAGEGEN_SETTINGS_NAMESPACE = "dsh-imagegen";
 /** Published package version shared by the host updater and the client UI. */
-const PLUGIN_VERSION = "1.5.2";
+const PLUGIN_VERSION = "1.5.3";
 /** Same-origin route family (loopback-only, mirroring the dsh-ssh fence). */
 const SETTINGS_API = {
 	describe: "/api/dsh-imagegen/settings/describe",
@@ -206,6 +206,14 @@ const ENTRIES = {
 		supportsEdit: false,
 		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. */
@@ -244,6 +252,10 @@ function describeModel(model) {
 		family: "zhipu",
 		...ENTRIES.zhipu
 	};
+	if (/^qwen-image(?:[-_.]|$)/i.test(id)) return {
+		family: "qwen",
+		...ENTRIES.qwen
+	};
 	return {
 		family: "unknown",
 		label: "unknown",
@@ -471,6 +483,12 @@ function isSeedream(model) {
 function isZhipuImage(model) {
 	return modelFamily(model) === "zhipu";
 }
+/** Whether the model is Alibaba Qwen-Image, which speaks the DashScope native
+*  multimodal-generation contract (NOT OpenAI-compatible): a chat-style
+*  messages body, `宽*高` pixel sizes, and image URLs in the reply content. */
+function isQwenImage(model) {
+	return modelFamily(model) === "qwen";
+}
 function isGlmImage(model) {
 	return /^glm-image(?:-|$)/i.test(model.trim());
 }
@@ -483,6 +501,38 @@ function seedreamSize(quality) {
 	if (quality === "1k") return "1K";
 	return "2K";
 }
+/** The panel's aspect ratios mapped to Qwen-Image's `宽*高` pixel sizes.
+*  The classic series (qwen-image / -plus / -max) documents this fixed list;
+*  2.0 / 3.0-series models accept any size within their pixel budget and
+*  recommend the larger set. */
+const QWEN_SIZE_CLASSIC = {
+	"16:9": "1664*928",
+	"21:9": "1664*928",
+	"4:3": "1472*1104",
+	"3:2": "1472*1104",
+	"1:1": "1328*1328",
+	"3:4": "1104*1472",
+	"2:3": "1104*1472",
+	"9:16": "928*1664"
+};
+const QWEN_SIZE_HD = {
+	"16:9": "2688*1536",
+	"21:9": "2688*1536",
+	"4:3": "2368*1728",
+	"3:2": "2368*1728",
+	"1:1": "2048*2048",
+	"3:4": "1728*2368",
+	"2:3": "1728*2368",
+	"9:16": "1536*2688"
+};
+/** Versioned ids (qwen-image-2.0 / -3.0-pro / …) take the large size set. */
+function isVersionedQwenImage(model) {
+	return /^qwen-image-\d+\.\d/i.test(model.trim());
+}
+function qwenSize(model, ratio) {
+	if (ratio === "" || ratio === "auto") return void 0;
+	return (isVersionedQwenImage(model) ? QWEN_SIZE_HD : QWEN_SIZE_CLASSIC)[ratio];
+}
 /** The panel's aspect ratios mapped to the closest OpenAI pixel size
 *  (gpt-image-2 / generic OpenAI-compatible endpoints). */
 const OPENAI_SIZE_BY_RATIO = {
@@ -759,6 +809,83 @@ async function requestOneImage(baseUrl, upstream, request, params, signal) {
 	}));
 }
 /**
+* Qwen-Image (DashScope native multimodal-generation): one chat-style request
+* carries the prompt (plus the reference image for edit mode) and answers
+* synchronously with image URLs in the reply content. The versioned series
+* batches natively (n ≤ 6; the panel caps at 4), the classic series is
+* single-image per call.
+*/
+async function generateQwenImage(baseUrl, upstream, request, options) {
+	const model = wireModel(request);
+	const content = [];
+	if (request.mode === "edit") {
+		if (typeof request.image !== "string" || request.image === "") throw new ImageGenError("图生图需要上传参考图片", "edit-image-missing");
+		const parsed = parseDataUrl(request.image);
+		if (parsed === void 0) throw new ImageGenError("参考图片格式无效", "edit-image-invalid");
+		if (Buffer.from(parsed.base64, "base64").byteLength > MAX_EDIT_IMAGE_BYTES) throw new ImageGenError("参考图片超过 10MB 上限", "edit-image-too-large");
+		content.push({ image: request.image });
+	}
+	content.push({ text: request.prompt });
+	const count = isVersionedQwenImage(model) ? clampCount(request.n) : 1;
+	const size = qwenSize(model, request.size);
+	const body = {
+		model,
+		input: { messages: [{
+			role: "user",
+			content
+		}] },
+		parameters: {
+			...size !== void 0 ? { size } : {},
+			...count > 1 ? { n: count } : {}
+		}
+	};
+	const budget = requestSignal(options.signal, UPSTREAM_TIMEOUT_MS);
+	let 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");
+		throw new ImageGenError(`无法连接上游接口：${message}`, "upstream-unreachable");
+	} finally {
+		budget.dispose();
+	}
+	let payload;
+	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");
+	const output = payload.output;
+	const choices = output !== void 0 && Array.isArray(output.choices) ? output.choices : [];
+	const urls = [];
+	for (const choice of choices) {
+		const message = choice !== null && typeof choice === "object" ? choice.message : void 0;
+		const items = message !== null && typeof message === "object" && Array.isArray(message.content) ? message.content : [];
+		for (const item of items) if (item !== null && typeof item === "object") {
+			const image = item.image;
+			if (typeof image === "string" && image !== "") urls.push(image);
+		}
+	}
+	if (urls.length === 0) throw new ImageGenError("上游响应缺少图片内容", "upstream-empty");
+	return { images: await Promise.all(urls.map(async (url) => {
+		const normalized = await normalizeItem({ url }, upstream);
+		return {
+			b64: normalized.b64,
+			mime: normalized.mime
+		};
+	})) };
+}
+/**
 * Forward one generate request to the configured endpoint. The requested image
 * count is satisfied with N parallel single-image requests (the `n` batch
 * parameter is never sent, because Responses-API-based gateways reject it as
@@ -768,6 +895,7 @@ async function generateImage(upstream, request, options = {}) {
 	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");
+	if (isQwenImage(wireModel(request))) return generateQwenImage(baseUrl, upstream, request, options);
 	if (request.mode === "edit" && isZhipuImage(wireModel(request))) throw new ImageGenError("智谱 GLM-Image 当前仅支持文生图，请切换到文生图模式或选择支持图生图的模型", "edit-unsupported");
 	const params = effectiveParams(request);
 	const count = effectiveCount(request);
@@ -2001,6 +2129,42 @@ const IMAGE_PRESETS = [
 			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）",
@@ -3881,7 +4045,7 @@ const DEFAULT_ALLOW_AGENT_IMAGE_GENERATION = true;
 /** Order of the announcement section within the tool-guidance band. */
 const SECTION_ORDER = 150;
 /** Model-facing announcement: plugin presence, capabilities, and limits. */
-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）。用户提到「生图 / 绘画 / 生成图片 / 文生图 / 图生图 / 画廊 / 提示词模板」时即指本插件，请据此协作。";
+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, defaultChannelId) {
 	if (channels.length === 0) return `${IMAGEGEN_GUIDANCE} 尚未配置任何渠道：请先在「设置 → 插件 → AI 生图」添加渠道并填写 API 地址与密钥。`;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dickpy/dsh-imagegen",
   "description": "AI image generation plugin for the dsh web GUI: text-to-image and image-to-image through configurable provider channels (gpt-image-2 / grok-imagine-image / nanobanana series / seedream-5.0-pro / dall-e-3, with native xAI Grok Imagine, Google Nano Banana and ByteDance Seedream request shaping), with per-channel model catalogs and a New Session / Image Generation tab entry opening a three-column studio beside the native conversation.",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "type": "module",
   "main": "lib/index.js",
   "exports": {

package/src/client/ImageGenPanel.tsx

@@ -18,6 +18,7 @@ import type { ImageGenApi } from './api.ts'
 import { errorMessage, tt } from './helpers.ts'
 import { TemplateLibrary } from './TemplateLibrary.tsx'
 import { InspirationGallery } from './InspirationGallery.tsx'
+import { useImageGenLanguageTick } from './use-language.ts'
 import type { EcommerceRefRole, GeneratedImage, GenerateMode, GenerateRequest, GenerationTask, GenerationTaskStatus, HistoryEntry, HistoryImageRef, ProductSetDraft, ProductSetSlot, UpdateInfo } from '../protocol.ts'
 import { AGENT_IMAGE_API } from '../protocol.ts'
 import type { ImageGenConfig, ImageGenScope } from './settings-scope.ts'
@@ -440,6 +441,10 @@ export function ImageGenPanel(props: {
 }) {
   const { api, scope, sessions, conversation } = props
   const config = useConfig(scope)
+  // The plugin language follows the DSH interface (bridged from ctx.locale);
+  // this tick re-renders the tree so every tt() switches live — the template
+  // library and the inspiration wall render inside this tree.
+  useImageGenLanguageTick()
   const enabled = config?.enabled ?? true
   // Channel-aware model options: the panel lists every configured alias
   // (default channel first); legacy flat fields remain the upgrade fallback.

package/src/client/SettingsCard.tsx

@@ -21,6 +21,8 @@ import type { ImageGenScope } from './settings-scope.ts'
 import { describeModel } from '../model-catalog.ts'
 import { IMAGE_MODEL_API, PRESETS_API, PROMPT_ENHANCE_API, USAGE_API, type ModelMapping, type PresetProviderView } from '../protocol.ts'
 import type { ImageGenKey } from './locales.ts'
+import { tt, type TranslateValues } from './helpers.ts'
+import { useImageGenLanguageTick } from './use-language.ts'
 import css from './settings-card.module.css'
 
 /** The global (non-channel) fields this card's staged form edits. */
@@ -127,7 +129,11 @@ interface UsageCounters {
  * @returns the card, or nothing while the namespace is still loading.
  */
 export function ImageGenSettingsCard(props: ImageGenSettingsCardProps) {
-  const { t } = props
+  // The card renders through the plugin's own dictionary so the uiLanguage
+  // override applies here too — the host-locale props.t would only follow the
+  // DSH interface language.
+  const t = tt
+  useImageGenLanguageTick()
   const state = props.useImageGenSettingsCard(snapshot => snapshot)
   const [open, setOpen] = useState(false)
   // Global-section local states (prompt enhancement etc.).
@@ -445,8 +451,8 @@ export function ImageGenSettingsCard(props: ImageGenSettingsCardProps) {
               offLabel={t('settings.off')}
               {...fieldProps}
               {...state.allowAgentImageGeneration}
-              onEdit={(text) => { props.edit('allowAgentImageGeneration', text) }}
-              onReset={() => { props.resetField('allowAgentImageGeneration') }}
+              onEdit={(text) => { props.edit('enabled', text) }}
+              onReset={() => { props.resetField('enabled') }}
             />
             </div> : null}
             <div className={css.footer}>

package/src/client/helpers.ts

@@ -1,33 +1,71 @@
-/**
- * Shared panel helpers: the active-dictionary pick (document-language based,
- * dsh-ssh precedent) bound to the dsh-imagegen interpolator, plus a small
- * error-message extractor. All copy stays in the locale dictionaries.
- */
-
-import { en, zh, type ImageGenKey } from './locales.ts'
-
-/** Template values accepted by the interpolator. */
-export type TranslateValues = Record<string, string | number>
-
-/** Active dictionary, picked by the document language at call time. */
-export function dictionary(): Record<string, string> {
-  const lang = typeof document !== 'undefined' ? document.documentElement.lang : 'zh'
-  return lang.toLowerCase().startsWith('en') ? { ...en } : { ...zh }
-}
-
-/** Translate a key with optional {name} template params (current language). */
-export function tt(key: ImageGenKey, values?: TranslateValues): string {
-  const text = dictionary()[key] ?? key
-  if (values === undefined) return text
-  let rendered = text
-  for (const [name, value] of Object.entries(values)) {
-    rendered = rendered.replaceAll(`{${name}}`, String(value))
-  }
-  return rendered
-}
-
-/** Human-readable error text from an unknown thrown value. */
-export function errorMessage(error: unknown): string {
-  if (error instanceof Error) return error.message
-  return String(error)
-}
+/**
+ * Shared panel helpers: the active-dictionary pick bound to the dsh-imagegen
+ * interpolator, the plugin locale that follows the DSH interface language
+ * (bridged in client/index.ts from ctx.locale — the plugin ships zh / en / ru
+ * and registers itself as a DSH language pack for Русский), plus a small
+ * error-message extractor. All copy stays in the locale dictionaries.
+ */
+
+import { en, ru, zh, type ImageGenKey } from './locales.ts'
+
+/** Template values accepted by the interpolator. */
+export type TranslateValues = Record<string, string | number>
+
+/** Languages with a shipped dictionary. */
+export type ImageGenLanguage = 'zh' | 'en' | 'ru'
+
+const DICTIONARIES: Record<ImageGenLanguage, Record<string, string>> = { zh, en, ru }
+
+/** The active DSH locale mapped onto our dictionary (module-level, one value per app). */
+let activeLocale: ImageGenLanguage = 'zh'
+
+/** Bumped on every locale change; useSyncExternalStore version. */
+let languageVersion = 0
+
+const languageListeners = new Set<() => void>()
+
+/**
+ * Adopt the DSH interface language. Unknown ids (future language packs)
+ * resolve to English — the same per-key fallback convention the host locale
+ * chain uses.
+ */
+export function applyHostLocale(id: unknown): void {
+  const next: ImageGenLanguage = id === 'zh' || id === 'ru' ? id : 'en'
+  if (next === activeLocale) return
+  activeLocale = next
+  languageVersion += 1
+  for (const listener of [...languageListeners]) listener()
+}
+
+/** Monotonic version of the active locale (external-store snapshot). */
+export function getImageGenLanguageVersion(): number {
+  return languageVersion
+}
+
+/** Observe locale changes; returns the unsubscriber. */
+export function subscribeImageGenLanguage(listener: () => void): () => void {
+  languageListeners.add(listener)
+  return () => { languageListeners.delete(listener) }
+}
+
+/** Active dictionary for the current DSH language. */
+export function dictionary(): Record<string, string> {
+  return DICTIONARIES[activeLocale]
+}
+
+/** Translate a key with optional {name} template params (current language). */
+export function tt(key: ImageGenKey, values?: TranslateValues): string {
+  const text = dictionary()[key] ?? key
+  if (values === undefined) return text
+  let rendered = text
+  for (const [name, value] of Object.entries(values)) {
+    rendered = rendered.replaceAll(`{${name}}`, String(value))
+  }
+  return rendered
+}
+
+/** Human-readable error text from an unknown thrown value. */
+export function errorMessage(error: unknown): string {
+  if (error instanceof Error) return error.message
+  return String(error)
+}

package/src/client/index.ts

@@ -11,18 +11,18 @@
  * whole boot when a plugin apply throws, and an external plugin must not take
  * the GUI down.
  */
-import type { Context as ClientContext } from '@deepseek-ai/cordis'
-import type { ISessions } from '@deepseek-ai/dsh-api-session-controller/client'
+import type { Context as ClientContext } from '@deepseek-ai/cordis'
+import type { ISessions } from '@deepseek-ai/dsh-api-session-controller/client'
 import type { ConnectionHandle } from '@deepseek-ai/dsh-client-connection/client'
 // Type-only: pulls the locale plugin's Context merge (ctx.locale).
-import type {} from '@deepseek-ai/dsh-client-locale/client'
-import type {} from '@deepseek-ai/dsh-client-ui-renderer/client'
-// Type-only: pulls the LocaleNamespaceMap merge table.
+import type {} from '@deepseek-ai/dsh-client-locale/client'
+import type {} from '@deepseek-ai/dsh-client-ui-renderer/client'
+// Type-only: pulls the LocaleNamespaceMap merge table.
 import type {} from '@deepseek-ai/dsh-client-ui-slots'
 import { ImageGenApi } from './api.ts'
 import { ImageGenController } from './controller.ts'
-import { tt } from './helpers.ts'
-import { en, zh, type ImageGenKey } from './locales.ts'
+import { tt, applyHostLocale } from './helpers.ts'
+import { en, ru, zh, type ImageGenKey } from './locales.ts'
 import { mountPanel } from './mount.tsx'
 import { mountSidebarEntry } from './sidebar-entry.ts'
 import { ImageGenSettingsCard, ImageGenSettingsCardController } from './SettingsCard.tsx'
@@ -68,7 +68,39 @@ export const inject = ['slots', 'locale', 'connection', 'sessions', 'conversatio
  * @param ctx - client root context (services: slots, locale, connection).
  */
 export function apply(ctx: ClientContext): void {
+  // The host locale service only knows zh/en dictionaries (its type is
+  // fixed); ru rides the untyped single-locale registration instead.
   ctx.effect(() => ctx.locale.register(NS, { zh, en }), 'dsh-imagegen: dictionaries')
+  // Russian ships as a language pack: the dictionary lands in this plugin's
+  // namespace, and Русский joins the shared DSH language catalog (Settings →
+  // General → Language) with per-key fallback to English for host copy.
+  // Registration order/aggregation between register(NS, 'ru', …) and
+  // addLanguage differs across host builds and a duplicate throws — these
+  // surfaces must degrade silently, never fail the GUI boot.
+  ctx.effect(() => {
+    try {
+      return ctx.locale.register(NS, 'ru', ru)
+    } catch (error) {
+      console.warn('[dsh-imagegen] ru dictionary not registered:', error)
+      return () => {}
+    }
+  }, 'dsh-imagegen: ru dictionary')
+  ctx.effect(() => {
+    try {
+      if (ctx.locale.getLocale().locales.some(locale => locale.id === 'ru')) return () => {}
+      return ctx.locale.addLanguage({ id: 'ru', label: 'Русский', fallback: 'en' })
+    } catch (error) {
+      console.warn('[dsh-imagegen] ru language not added to the catalog:', error)
+      return () => {}
+    }
+  }, 'dsh-imagegen: ru language pack')
+  // Every plugin surface renders through tt(); bridge DSH locale switches
+  // into it so the whole plugin follows the interface language.
+  ctx.effect(() => {
+    const applyLocale = (): void => { applyHostLocale(ctx.locale.getLocale().active) }
+    applyLocale()
+    return ctx.locale.subscribe(applyLocale)
+  }, 'dsh-imagegen: follow host locale')
   registerImageToolviews(ctx)
 
   const connection = ctx.get('connection') as ConnectionHandle | undefined
@@ -119,6 +151,26 @@ export function apply(ctx: ClientContext): void {
         tt('entry.tooltip'),
       ))
       disposers.push(mountPanel(controller, api, scope, { sessions, conversation }))
+      // The imperative sidebar tabs render their labels once; relabel them on
+      // every DSH language switch so the entry follows the interface too.
+      disposers.push(ctx.locale.subscribe(() => {
+        const root = document.querySelector('[data-dsh-imagegen-sidebar-root]')
+        if (root === null) return
+        const labels: Array<[string, string, string]> = [
+          ['new-session', tt('entry.newSession'), tt('entry.newSessionTooltip')],
+          ['image', tt('entry.image'), tt('entry.tooltip')],
+        ]
+        for (const [tab, label, tooltip] of labels) {
+          const button = root.querySelector<HTMLButtonElement>(`[data-dsh-imagegen-tab="${tab}"]`)
+          if (button === null) continue
+          button.setAttribute('aria-label', label)
+          button.setAttribute('title', tooltip)
+          const labelSpan = button.querySelector('span:nth-child(2)')
+          if (labelSpan !== null) labelSpan.textContent = label
+        }
+        const tablist = root.querySelector<HTMLDivElement>('[role="tablist"][data-dsh-imagegen-session-tabs]')
+        tablist?.setAttribute('aria-label', tt('entry.tooltip'))
+      }))
     } catch (error) {
       // DOM failures degrade the studio, never the GUI.
       console.warn('[dsh-imagegen] mount failed:', error)