dsh-image-gen 0.6.7 → 0.6.8

package/README.zh-CN.md

@@ -1,3 +1,3 @@
-# dsh-image-gen 中文文档
-
-此文件为兼容旧链接而保留。完整的简体中文文档请参阅 [README.md](README.md)。
+# dsh-image-gen 中文文档
+
+此文件为兼容旧链接而保留。完整的简体中文文档请参阅 [README.md](README.md)。

package/lib/client.js

@@ -129,6 +129,12 @@ window.__ModuleLoader__.load({
 			"xai",
 			"zhipu"
 		];
+		/**
+		* Providers the browser workbench can drive: the BYOK cloud set plus the
+		* logged-in subscription channels. ComfyUI stays out; it has its own workflow
+		* pipeline and no shared request shape.
+		*/
+		const STUDIO_PROVIDERS = [...CLOUD_IMAGE_PROVIDERS, ...SUBSCRIPTION_PROVIDERS];
 		/** The credential reference each cloud provider's API key is stored under. */
 		const CLOUD_CREDENTIAL_REFS = {
 			google: "GEMINI_API_KEY",
@@ -116255,6 +116261,9 @@ img.ProseMirror-separator {
 				configuredCount: "API 已配置 · {count}",
 				unconfiguredStatus: "API 未配置",
 				providerStatus: "云端提供商与模型状态",
+				configuredSplit: "API {api} · 订阅 {sub}",
+				subSignedIn: "已登录",
+				subSignedOut: "未登录",
 				collapseSidebar: "折叠最近生成",
 				expandSidebar: "展开最近生成",
 				collapseGenerate: "折叠生成面板",
@@ -116360,6 +116369,9 @@ img.ProseMirror-separator {
 				configuredCount: "API configured · {count}",
 				unconfiguredStatus: "Not configured",
 				providerStatus: "Provider & Model Status",
+				configuredSplit: "API {api} · Sub {sub}",
+				subSignedIn: "Signed in",
+				subSignedOut: "Signed out",
 				collapseSidebar: "Collapse sidebar",
 				expandSidebar: "Expand recent list",
 				collapseGenerate: "Collapse generate panel",
@@ -116374,7 +116386,7 @@ img.ProseMirror-separator {
 		};
 		/** localStorage flag remembering that the one-time infinite-canvas hint was dismissed. */
 		const INFINITE_CANVAS_HINT_KEY = "dsh-ig-infinite-canvas-hint-dismissed";
-		const StudioView = ({ locale, workspace, initialPrompt, initialCanvasSurface, showInfiniteCanvasHint, onInitialPromptApplied, onOpenInspiration }) => {
+		const StudioView = ({ locale, credentialEvents, workspace, initialPrompt, initialCanvasSurface, showInfiniteCanvasHint, onInitialPromptApplied, onOpenInspiration }) => {
 			const [lang, setLang] = (0, react.useState)(() => locale?.getSnapshot?.().active?.startsWith("en") ? "en" : "zh");
 			const [config, setConfig] = (0, react.useState)(null);
 			const [configLoading, setConfigLoading] = (0, react.useState)(true);
@@ -116481,15 +116493,28 @@ img.ProseMirror-separator {
 			const maxReferences = comparisonEnabled ? comparisonProviders.includes("dashscope") ? 3 : 5 : provider === "dashscope" ? 3 : 5;
 			const referencesRef = (0, react.useRef)(references);
 			referencesRef.current = references;
+			const comparisonSelectionsAllSubscription = comparisonEnabled && comparisonProviders.length > 0 && comparisonProviders.every((provider) => isSubscriptionProvider(provider));
+			const singleProviderIsSubscription = !comparisonEnabled && isSubscriptionProvider(provider);
 			const t = (key, values) => {
 				let text = COPY$1[lang][key];
 				for (const [name, value] of Object.entries(values ?? {})) text = text.replace(`{${name}}`, value);
 				return text;
 			};
 			(0, react.useEffect)(() => locale?.subscribe?.(() => setLang(locale.getSnapshot().active?.startsWith("en") ? "en" : "zh")), [locale]);
-			const loadConfig = (0, react.useCallback)(async () => {
-				setConfigLoading(true);
-				setConfigError(null);
+			const formStateRef = (0, react.useRef)({
+				provider,
+				model
+			});
+			formStateRef.current = {
+				provider,
+				model
+			};
+			const loadConfig = (0, react.useCallback)(async (options) => {
+				const silent = options?.silent === true;
+				if (!silent) {
+					setConfigLoading(true);
+					setConfigError(null);
+				}
 				const controller = new AbortController();
 				try {
 					const response = await fetch(STUDIO_ROUTE, {
@@ -116499,20 +116524,35 @@ img.ProseMirror-separator {
 					const payload = await response.json();
 					if (!response.ok || !("providers" in payload)) throw new Error("error" in payload && payload.error ? payload.error : "Studio unavailable");
 					setConfig(payload);
+					if (silent) {
+						const { provider: currentProvider, model: currentModel } = formStateRef.current;
+						const activeProfile = payload.providers.find((item) => item.provider === currentProvider);
+						if (activeProfile !== void 0 && activeProfile.model !== currentModel) setModel(activeProfile.model);
+						setComparisonProviders((current) => current.filter((selectedProvider) => payload.providers.some((item) => item.provider === selectedProvider && item.configured)));
+						return;
+					}
 					const initial = payload.providers.find((item) => item.provider === payload.activeProvider) ?? payload.providers[0];
 					if (initial !== void 0) {
 						applyProvider(initial);
 						setComparisonProviders(initialComparisonProviders(payload.providers, initial.provider));
 					}
 				} catch (fetchError) {
-					if (!controller.signal.aborted) setConfigError(messageOf(fetchError));
+					if (!silent && !controller.signal.aborted) setConfigError(messageOf(fetchError));
 				} finally {
-					setConfigLoading(false);
+					if (!silent) setConfigLoading(false);
 				}
 			}, []);
 			(0, react.useEffect)(() => {
 				loadConfig();
 			}, [loadConfig]);
+			(0, react.useEffect)(() => {
+				if (credentialEvents === void 0) return;
+				return credentialEvents.listen(() => {
+					window.setTimeout(() => {
+						loadConfig({ silent: true });
+					}, 1e3);
+				});
+			}, [credentialEvents, loadConfig]);
 			(0, react.useEffect)(() => {
 				let mounted = true;
 				const load = () => void getGalleryItems().then((next) => {
@@ -116584,6 +116624,8 @@ img.ProseMirror-separator {
 			}, []);
 			const activeProfile = (0, react.useMemo)(() => config?.providers.find((item) => item.provider === provider), [config, provider]);
 			const configuredCount = config?.providers.filter((item) => item.configured).length ?? 0;
+			const apiConfiguredCount = config?.providers.filter((item) => item.configured && !isSubscriptionProvider(item.provider)).length ?? 0;
+			const subscriptionSignedInCount = config?.providers.filter((item) => item.configured && isSubscriptionProvider(item.provider)).length ?? 0;
 			const displayItems = (0, react.useMemo)(() => items.slice(0, visibleLimit), [items, visibleLimit]);
 			const comparisonProfiles = (0, react.useMemo)(() => (config?.providers ?? []).filter((item) => item.configured && (mode === "generate" || item.supportsEditing)), [config, mode]);
 			const comparisonTargets = (0, react.useMemo)(() => buildComparisonTargets(comparisonProfiles, comparisonProviders, ratio, quality), [
@@ -117179,7 +117221,10 @@ img.ProseMirror-separator {
 															(0, react_jsx_runtime.jsx)("span", { className: `dsh-ig-status-dot ${configuredCount > 0 ? "is-ready" : "is-muted"}` }),
 															(0, react_jsx_runtime.jsx)("span", {
 																className: "dsh-ig-status-text",
-																children: configuredCount > 0 ? t("configuredCount", { count: String(configuredCount) }) : t("unconfiguredStatus")
+																children: configuredCount > 0 ? subscriptionSignedInCount > 0 ? t("configuredSplit", {
+																	api: String(apiConfiguredCount),
+																	sub: String(subscriptionSignedInCount)
+																}) : t("configuredCount", { count: String(apiConfiguredCount) }) : t("unconfiguredStatus")
 															}),
 															(0, react_jsx_runtime.jsx)(ChevronDown, {
 																size: 11,
@@ -117200,7 +117245,7 @@ img.ProseMirror-separator {
 																	children: [(0, react_jsx_runtime.jsx)("strong", { children: p.label }), (0, react_jsx_runtime.jsx)("small", { children: p.model })]
 																}), (0, react_jsx_runtime.jsx)("span", {
 																	className: "dsh-ig-status-item-tag",
-																	children: p.configured ? t("configured") : t("unconfigured")
+																	children: isSubscriptionProvider(p.provider) ? p.configured ? t("subSignedIn") : t("subSignedOut") : p.configured ? t("configured") : t("unconfigured")
 																})]
 															}, p.provider))
 														})]
@@ -117646,7 +117691,26 @@ img.ProseMirror-separator {
 												}),
 												(0, react_jsx_runtime.jsx)("p", { children: t("compareParameterHint") })
 											]
-										}), (0, react_jsx_runtime.jsxs)("div", {
+										}), comparisonSelectionsAllSubscription ? (0, react_jsx_runtime.jsxs)("div", {
+											className: "dsh-ig-field-grid",
+											children: [(0, react_jsx_runtime.jsx)(FieldSelect, {
+												label: t("ratio"),
+												value: "auto",
+												onChange: () => {},
+												options: [{
+													value: "auto",
+													label: lang === "en" ? "Channel default" : "通道默认"
+												}]
+											}), (0, react_jsx_runtime.jsx)(FieldSelect, {
+												label: t("quality"),
+												value: "auto",
+												onChange: () => {},
+												options: [{
+													value: "auto",
+													label: lang === "en" ? "Channel default" : "通道默认"
+												}]
+											})]
+										}) : (0, react_jsx_runtime.jsxs)("div", {
 											className: "dsh-ig-field-grid",
 											children: [(0, react_jsx_runtime.jsx)(FieldSelect, {
 												label: t("ratio"),
@@ -117680,7 +117744,26 @@ img.ProseMirror-separator {
 													}]
 												})]
 											}),
-											(0, react_jsx_runtime.jsxs)("div", {
+											singleProviderIsSubscription ? (0, react_jsx_runtime.jsxs)("div", {
+												className: "dsh-ig-field-grid",
+												children: [(0, react_jsx_runtime.jsx)(FieldSelect, {
+													label: t("ratio"),
+													value: "auto",
+													onChange: () => {},
+													options: [{
+														value: "auto",
+														label: lang === "en" ? "Channel default" : "通道默认"
+													}]
+												}), (0, react_jsx_runtime.jsx)(FieldSelect, {
+													label: t("quality"),
+													value: "auto",
+													onChange: () => {},
+													options: [{
+														value: "auto",
+														label: lang === "en" ? "Channel default" : "通道默认"
+													}]
+												})]
+											}) : (0, react_jsx_runtime.jsxs)("div", {
 												className: "dsh-ig-field-grid",
 												children: [(0, react_jsx_runtime.jsx)(FieldSelect, {
 													label: t("ratio"),
@@ -119533,7 +119616,7 @@ img.ProseMirror-separator {
 			return "1:1";
 		}
 		const GalleryViewTab = (props) => {
-			const { locale, sessionId, useSessions, useWorkspaces, inSidebar, defaultTab, initialCanvasSurface } = props;
+			const { locale, sessionId, useSessions, useWorkspaces, credentialEvents, inSidebar, defaultTab, initialCanvasSurface } = props;
 			const [activeTab, setActiveTab] = (0, react.useState)(defaultTab ?? "gallery");
 			const [studioDraft, setStudioDraft] = (0, react.useState)(void 0);
 			const [items, setItems] = (0, react.useState)([]);
@@ -120290,6 +120373,7 @@ img.ProseMirror-separator {
 							onUsePrompt: useInspirationPrompt
 						}) : (0, react_jsx_runtime.jsx)(StudioView, {
 							locale,
+							credentialEvents,
 							workspace: activeWorkspace,
 							initialPrompt: studioDraft,
 							initialCanvasSurface,
@@ -121478,7 +121562,7 @@ img.ProseMirror-separator {
 		function isRevision(value) {
 			if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
 			const candidate = value;
-			return isAttachment(candidate.attachment) && typeof candidate.provider === "string" && CLOUD_IMAGE_PROVIDERS.includes(candidate.provider) && typeof candidate.prompt === "string" && typeof candidate.model === "string" && typeof candidate.output === "string" && typeof candidate.createdAt === "number" && Number.isFinite(candidate.createdAt) && typeof candidate.ratio === "string" && typeof candidate.quality === "string";
+			return isAttachment(candidate.attachment) && typeof candidate.provider === "string" && STUDIO_PROVIDERS.includes(candidate.provider) && typeof candidate.prompt === "string" && typeof candidate.model === "string" && typeof candidate.output === "string" && typeof candidate.createdAt === "number" && Number.isFinite(candidate.createdAt) && typeof candidate.ratio === "string" && typeof candidate.quality === "string";
 		}
 		function isAttachment(value) {
 			if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
@@ -121523,19 +121607,36 @@ img.ProseMirror-separator {
 				switchFailed: "Switch failed"
 			}
 		};
-		/** Short row labels; the settings card keeps the longer descriptive names. */
+		/** Provider row names, per locale. Brand words stay untranslated; only the
+		* qualifier ("订阅" / "Sub") localizes, so the pill and the menu agree with the
+		* settings card in both languages. */
 		const PILL_PROVIDER_LABELS = {
-			google: "Gemini",
-			openai: "OpenAI",
-			"openai-compat": "OpenAI 兼容",
-			seedream: "Seedream",
-			dashscope: "DashScope",
-			xai: "Grok",
-			zhipu: "智谱 GLM",
-			comfyui: "ComfyUI",
-			"chatgpt-sub": "ChatGPT 订阅",
-			"grok-sub": "Grok 订阅",
-			"google-sub": "Google 订阅"
+			zh: {
+				google: "Gemini",
+				openai: "OpenAI",
+				"openai-compat": "OpenAI 兼容",
+				seedream: "Seedream",
+				dashscope: "DashScope",
+				xai: "Grok",
+				zhipu: "智谱 GLM",
+				comfyui: "ComfyUI",
+				"chatgpt-sub": "ChatGPT 订阅",
+				"grok-sub": "Grok 订阅",
+				"google-sub": "Google 订阅"
+			},
+			en: {
+				google: "Gemini",
+				openai: "OpenAI",
+				"openai-compat": "OpenAI Compatible",
+				seedream: "Seedream",
+				dashscope: "DashScope",
+				xai: "Grok",
+				zhipu: "Zhipu GLM",
+				comfyui: "ComfyUI",
+				"chatgpt-sub": "ChatGPT Sub",
+				"grok-sub": "Grok Sub",
+				"google-sub": "Google Sub"
+			}
 		};
 		/** Compute the fixed-position anchor from the pill button: open upward when
 		* the chat pane leaves room above the composer, drop down otherwise. */
@@ -121787,7 +121888,7 @@ img.ProseMirror-separator {
 						}),
 						(0, react_jsx_runtime.jsx)("span", {
 							className: "dsh-ig-pill-provider",
-							children: PILL_PROVIDER_LABELS[current]
+							children: PILL_PROVIDER_LABELS[lang][current]
 						}),
 						(0, react_jsx_runtime.jsx)("span", {
 							className: `dsh-ig-pill-caret${open ? " dsh-ig-pill-caret-open" : ""}`,
@@ -121833,7 +121934,7 @@ img.ProseMirror-separator {
 									className: "dsh-ig-pill-option-text",
 									children: [(0, react_jsx_runtime.jsx)("span", {
 										className: "dsh-ig-pill-option-name",
-										children: PILL_PROVIDER_LABELS[provider]
+										children: PILL_PROVIDER_LABELS[lang][provider]
 									}), (0, react_jsx_runtime.jsx)("span", {
 										className: "dsh-ig-pill-option-sub",
 										children: subtitleOf(provider)
@@ -121871,16 +121972,20 @@ img.ProseMirror-separator {
 		}
 		/** Styles for the pill and its fixed-position menu; injected by the client entry. */
 		const PROVIDER_PILL_STYLE = `
-.dsh-ig-pill-root{position:relative;display:inline-flex;align-items:center;height:26px}
-.dsh-ig-pill-button{display:inline-flex;align-items:center;gap:5px;height:26px;padding:0 8px 0 7px;border:1px solid var(--dsw-alias-border-l2,#e5e7eb);border-radius:13px;background:var(--dsw-alias-bg-layer-3,#fff);color:var(--dsw-alias-label-secondary,#4b5563);font:inherit;font-size:12px;line-height:1;cursor:pointer;transition:border-color .15s,background .15s,color .15s;-webkit-user-select:none;user-select:none}
+.dsh-ig-pill-root{position:relative;display:inline-flex;align-items:center;height:28px}
+.dsh-ig-pill-button{display:inline-flex;align-items:center;gap:5px;height:28px;padding:0 9px 0 8px;border:1px solid var(--dsw-alias-border-l2,#e5e7eb);border-radius:14px;background:var(--dsw-alias-bg-layer-3,#fff);color:var(--dsw-alias-label-secondary,#4b5563);font:inherit;font-size:13px;line-height:20px;cursor:pointer;transition:border-color .15s,background .15s,color .15s;-webkit-user-select:none;user-select:none}
 .dsh-ig-pill-button:hover:not(:disabled){border-color:var(--dsw-alias-label-dimmed,#9ca3af);color:var(--dsw-alias-label-primary,#111827)}
 .dsh-ig-pill-button:focus-visible{outline:2px solid var(--dsw-alias-brand-primary,#4c78ff);outline-offset:1px}
 .dsh-ig-pill-button:disabled{opacity:.5;cursor:not-allowed}
 .dsh-ig-pill-button-open{border-color:var(--dsw-alias-brand-primary,#4c78ff);color:var(--dsw-alias-label-primary,#111827)}
 .dsh-ig-pill-icon{flex:none;color:var(--dsw-alias-brand-primary,#4c78ff)}
-.dsh-ig-pill-provider{max-width:96px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.dsh-ig-pill-provider{max-width:150px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
 .dsh-ig-pill-caret{display:inline-flex;flex:none;transition:transform .15s}
 .dsh-ig-pill-caret-open{transform:rotate(180deg)}
+@container (max-width:700px){
+  .dsh-ig-pill-caret{display:none}
+  .dsh-ig-pill-button{padding:0 7px 0 6px}
+}
 .dsh-ig-pill-menu{position:fixed;z-index:1000;min-width:264px;max-width:min(320px,calc(100vw - 24px));padding:6px;border:1px solid var(--dsw-alias-border-l2,#e5e7eb);border-radius:12px;background:var(--dsw-alias-bg-layer-3,#fff);box-shadow:0 12px 32px rgba(0,0,0,.16),0 2px 8px rgba(0,0,0,.08);max-height:min(320px,calc(100vh - 48px));overflow-y:auto}
 .dsh-ig-pill-menu-title{padding:6px 8px 4px;font-size:11px;font-weight:600;color:var(--dsw-alias-label-tertiary,#6b7280)}
 .dsh-ig-pill-option{display:flex;width:100%;align-items:center;gap:9px;padding:7px 8px;border:0;border-radius:8px;background:none;font:inherit;color:inherit;text-align:left;cursor:pointer}
@@ -121900,7 +122005,7 @@ img.ProseMirror-separator {
 `;
 		//#endregion
 		//#region lib/types/client/index.js
-		console.info(`[dsh-image-gen] canvas bundle 2026-09-14T07:49:16.664Z`);
+		console.info(`[dsh-image-gen] canvas bundle 2026-09-14T15:26:26.831Z`);
 		/** Right-sidebar tab-type registration id (DSH 0.1.5 `sidebarRightTabs`). */
 		const SIDEBAR_STUDIO_TAB_ID = "dsh-image-gen/studio";
 		/** The tab kind: a page type opened by kind, recognizing no resource address. */
@@ -121939,8 +122044,8 @@ img.ProseMirror-separator {
 				subLoginOk: "登录成功",
 				subModelLabel: "订阅模型",
 				subModelHint: "由订阅通道固定，不可更改。",
-				subEditUnsupported: "订阅通道暂不支持图生图（编辑图片），仅支持文字生图。",
-				subDefaultHint: "订阅 Provider 只能生成，不能编辑图片；需要编辑时请切换到 API Key Provider。",
+				subEditCapability: "订阅生图 · 图生图：支持。对话 edit_image、Studio 图生图与多模型对比均可上传参考图（最多 5 张）。",
+				subDefaultHint: "订阅 Provider 已支持文字生图与图生图；图生图使用各订阅渠道默认参数。",
 				apiKeyLabel: "{provider} API Key",
 				apiKeyPlaceholder: "留空即可保留已配置的 Key",
 				apiKeyHint: "安全保存为 {key}；页面不会读回明文。",
@@ -122068,8 +122173,8 @@ img.ProseMirror-separator {
 				subLoginOk: "Signed in",
 				subModelLabel: "Subscription model",
 				subModelHint: "Fixed by the subscription channel; not changeable.",
-				subEditUnsupported: "The subscription channel does not support image editing yet; text-to-image only.",
-				subDefaultHint: "Subscription providers can only generate; switch to an API-key provider for editing.",
+				subEditCapability: "Subscription image editing is now supported: edit_image in chats, Studio and multi-model compare all accept reference images (up to 5).",
+				subDefaultHint: "Subscription providers support both text-to-image and image editing; edits use each channel's default parameters.",
 				apiKeyLabel: "{provider} API Key",
 				apiKeyPlaceholder: "Leave empty to keep configured key",
 				apiKeyHint: "Securely saved as {key}; never read back in plaintext.",
@@ -122597,7 +122702,10 @@ img.ProseMirror-separator {
 				label: () => {
 					return (locale?.getSnapshot?.()?.active)?.startsWith("en") ? "Gallery" : "画廊";
 				},
-				inject: () => ({ locale })
+				inject: () => ({
+					locale,
+					credentialEvents
+				})
 			}, GalleryViewTab));
 			ctx.inject(["sidebarRightTabs"], (owner) => {
 				const sidebarTabs = owner.get("sidebarRightTabs");
@@ -122620,6 +122728,7 @@ img.ProseMirror-separator {
 					key: SIDEBAR_STUDIO_TAB_ID,
 					inject: () => ({
 						locale,
+						credentialEvents,
 						inSidebar: true,
 						defaultTab: "studio",
 						initialCanvasSurface: "infinite"
@@ -123871,8 +123980,8 @@ img.ProseMirror-separator {
 							(0, react_jsx_runtime.jsx)("div", {
 								className: "dsh-ig-field",
 								children: (0, react_jsx_runtime.jsx)("span", {
-									className: "dsh-ig-label",
-									children: t("subEditUnsupported")
+									className: "dsh-ig-hint",
+									children: t("subEditCapability")
 								})
 							}),
 							(0, react_jsx_runtime.jsxs)("div", {