dsh-image-gen 0.6.1 → 0.6.5

package/lib/client.js

@@ -87,6 +87,8 @@ window.__ModuleLoader__.load({
 		const TEST_CONNECTION_ROUTE = "/plugins/dsh-image-gen/test";
 		/** Browser route the workbench infinite canvas pushes live state through. */
 		const CANVAS_STATE_ROUTE = "/plugins/dsh-image-gen/canvas-state";
+		const SUBSCRIPTION_LOGIN_ROUTE = "/plugins/dsh-image-gen/subscription-login";
+		const SUBSCRIPTION_STATUS_ROUTE = "/plugins/dsh-image-gen/subscription-status";
 		/** Namespace persisted through DSH Settings. */
 		const IMAGE_GENERATION_NAMESPACE = "image-generation";
 		/** Supported providers. */
@@ -98,8 +100,25 @@ window.__ModuleLoader__.load({
 			"dashscope",
 			"xai",
 			"zhipu",
-			"comfyui"
+			"comfyui",
+			"chatgpt-sub",
+			"grok-sub",
+			"google-sub"
 		];
+		/**
+		* Providers that generate through a logged-in subscription account instead
+		* of an API key. They use no credential reference and never join the
+		* cloud/BYOK sets.
+		*/
+		const SUBSCRIPTION_PROVIDERS = [
+			"chatgpt-sub",
+			"grok-sub",
+			"google-sub"
+		];
+		/** True when the provider generates through a logged-in subscription account. */
+		function isSubscriptionProvider(provider) {
+			return SUBSCRIPTION_PROVIDERS.includes(provider);
+		}
 		/** Providers supported by the first browser workbench release. */
 		const CLOUD_IMAGE_PROVIDERS = [
 			"google",
@@ -184,6 +203,12 @@ window.__ModuleLoader__.load({
 				if (!existing.includes(candidate)) return candidate;
 			}
 		}
+		/** Default models for the subscription channels; fixed by the bridge protocol. */
+		const DEFAULT_SUBSCRIPTION_MODELS = {
+			"chatgpt-sub": "gpt-image-2.5-flare",
+			"grok-sub": "grok-imagine-image-2.0",
+			"google-sub": "gemini-3-pro-image"
+		};
 		const DEFAULT_MODELS = {
 			google: DEFAULT_GOOGLE_MODEL,
 			openai: DEFAULT_OPENAI_MODEL,
@@ -192,7 +217,10 @@ window.__ModuleLoader__.load({
 			dashscope: DEFAULT_DASHSCOPE_MODEL,
 			xai: DEFAULT_XAI_MODEL,
 			zhipu: DEFAULT_ZHIPU_MODEL,
-			comfyui: DEFAULT_COMFYUI_WORKFLOW_LABEL
+			comfyui: DEFAULT_COMFYUI_WORKFLOW_LABEL,
+			"chatgpt-sub": DEFAULT_SUBSCRIPTION_MODELS["chatgpt-sub"],
+			"grok-sub": DEFAULT_SUBSCRIPTION_MODELS["grok-sub"],
+			"google-sub": DEFAULT_SUBSCRIPTION_MODELS["google-sub"]
 		};
 		const DEFAULT_BASE_URLS = {
 			google: DEFAULT_GOOGLE_ENDPOINT,
@@ -202,7 +230,10 @@ window.__ModuleLoader__.load({
 			dashscope: DEFAULT_DASHSCOPE_ENDPOINT,
 			xai: DEFAULT_XAI_BASE_URL,
 			zhipu: DEFAULT_ZHIPU_BASE_URL,
-			comfyui: DEFAULT_COMFYUI_BASE_URL
+			comfyui: DEFAULT_COMFYUI_BASE_URL,
+			"chatgpt-sub": "",
+			"grok-sub": "",
+			"google-sub": ""
 		};
 		//#endregion
 		//#region lib/types/comfyui-workflow.js
@@ -121322,6 +121353,10 @@ img.ProseMirror-separator {
 				keyMissing: "未配置 Key",
 				noKeyNeeded: "无需 Key",
 				noWorkflow: "未导入工作流",
+				subNoKey: "订阅生图",
+				subSignedIn: "已登录",
+				subSignedOut: "未登录",
+				subStatusUnknown: "状态未知",
 				readOnly: "图像设置为只读，无法在此切换",
 				switchFailed: "切换失败"
 			},
@@ -121332,6 +121367,10 @@ img.ProseMirror-separator {
 				keyMissing: "No key",
 				noKeyNeeded: "No key needed",
 				noWorkflow: "No workflow",
+				subNoKey: "Subscription",
+				subSignedIn: "Signed in",
+				subSignedOut: "Signed out",
+				subStatusUnknown: "Unknown",
 				readOnly: "Image settings are read-only; switch them in the config source",
 				switchFailed: "Switch failed"
 			}
@@ -121345,8 +121384,25 @@ img.ProseMirror-separator {
 			dashscope: "DashScope",
 			xai: "Grok",
 			zhipu: "智谱 GLM",
-			comfyui: "ComfyUI"
-		};
+			comfyui: "ComfyUI",
+			"chatgpt-sub": "ChatGPT 订阅",
+			"grok-sub": "Grok 订阅",
+			"google-sub": "Google 订阅"
+		};
+		/** Compute the fixed-position anchor from the pill button: open upward when
+		* the chat pane leaves room above the composer, drop down otherwise. */
+		function anchorOf(button) {
+			const rect = button?.getBoundingClientRect();
+			if (rect === void 0) return void 0;
+			if (rect.top >= 332) return {
+				left: rect.left,
+				bottom: window.innerHeight - rect.top + 6
+			};
+			return {
+				left: rect.left,
+				top: rect.bottom + 6
+			};
+		}
 		/** Whether the user opted into the composer pill; hidden (not merely inert) when off. */
 		function pillVisible(value) {
 			return value?.showProviderPill === true;
@@ -121357,6 +121413,7 @@ img.ProseMirror-separator {
 				const workflow = activeComfyUIWorkflow(value ?? {});
 				return workflow === void 0 ? "" : workflow.name;
 			}
+			if (SUBSCRIPTION_PROVIDERS.includes(provider)) return DEFAULT_MODELS[provider];
 			const stored = provider === "google" ? value?.googleModel : provider === "openai" ? value?.openaiModel : provider === "openai-compat" ? value?.openaiCompatModel : provider === "seedream" ? value?.seedreamModel : provider === "dashscope" ? value?.dashscopeModel : provider === "xai" ? value?.xaiModel : value?.zhipuModel;
 			return typeof stored === "string" && stored.length > 0 ? stored : DEFAULT_MODELS[provider];
 		}
@@ -121377,6 +121434,11 @@ img.ProseMirror-separator {
 				zhipu: "unknown"
 			});
 			const [keyTick, setKeyTick] = (0, react.useState)(0);
+			const [subDots, setSubDots] = (0, react.useState)(() => ({
+				"chatgpt-sub": "unknown",
+				"grok-sub": "unknown",
+				"google-sub": "unknown"
+			}));
 			const buttonRef = (0, react.useRef)(null);
 			const [menuStyle, setMenuStyle] = (0, react.useState)(null);
 			(0, react.useEffect)(() => props.scope.subscribe(() => {
@@ -121419,6 +121481,31 @@ img.ProseMirror-separator {
 					active = false;
 				};
 			}, [props.credentials, keyTick]);
+			(0, react.useEffect)(() => {
+				if (!open) return;
+				let active = true;
+				const probe = async () => {
+					try {
+						const response = await fetch(SUBSCRIPTION_STATUS_ROUTE, {
+							method: "POST",
+							cache: "no-store"
+						});
+						if (!active || !response.ok) return;
+						const payload = await response.json();
+						if (!active || payload.statuses === void 0) return;
+						const next = {};
+						for (const provider of SUBSCRIPTION_PROVIDERS) {
+							const row = payload.statuses[provider];
+							next[provider] = row?.state === "logged-in" ? "logged-in" : row?.state === "logged-out" ? "logged-out" : "unknown";
+						}
+						setSubDots(next);
+					} catch {}
+				};
+				probe();
+				return () => {
+					active = false;
+				};
+			}, [open, keyTick]);
 			const t = (keyName) => (lang === "en" ? PILL_DICT.en : PILL_DICT.zh)[keyName];
 			const current = snapshot.value?.provider ?? "google";
 			const writable = snapshot.writable;
@@ -121427,11 +121514,15 @@ img.ProseMirror-separator {
 					setMenuStyle(null);
 					return;
 				}
-				const rect = buttonRef.current?.getBoundingClientRect();
-				if (rect !== void 0) setMenuStyle({
-					left: rect.left,
-					bottom: window.innerHeight - rect.top + 6
-				});
+				const anchor = () => {
+					const next = anchorOf(buttonRef.current);
+					if (next !== void 0) setMenuStyle(next);
+				};
+				anchor();
+				window.addEventListener("resize", anchor);
+				return () => {
+					window.removeEventListener("resize", anchor);
+				};
 			}, [open]);
 			(0, react.useEffect)(() => {
 				if (!open) return;
@@ -121442,8 +121533,15 @@ img.ProseMirror-separator {
 				const onKeyDown = (event) => {
 					if (event.key === "Escape") setOpen(false);
 				};
-				const onReflow = () => {
-					setOpen(false);
+				const onReflow = (event) => {
+					if (event.target instanceof Element && event.target.closest(".dsh-ig-pill-menu") !== null) return;
+					const rect = buttonRef.current?.getBoundingClientRect();
+					if (rect !== void 0 && (rect.bottom < 0 || rect.top > window.innerHeight)) {
+						setOpen(false);
+						return;
+					}
+					const next = anchorOf(buttonRef.current);
+					if (next !== void 0) setMenuStyle(next);
 				};
 				document.addEventListener("mousedown", onPointerDown, true);
 				document.addEventListener("keydown", onKeyDown, true);
@@ -121473,8 +121571,12 @@ img.ProseMirror-separator {
 					setPending(void 0);
 				});
 			};
+			/** Plan A dots: ComfyUI is always fixed blue (theme-independent); each
+			* subscription reflects its login state (green in, gray out); cloud rows
+			* reflect their API-key state as before. */
 			const dotClassOf = (provider) => {
 				if (provider === "comfyui") return "dsh-ig-pill-dot-neutral";
+				if (isSubscriptionProvider(provider)) return subDots[provider] === "logged-in" ? "dsh-ig-pill-dot-ok" : "dsh-ig-pill-dot-missing";
 				const dot = dots[provider];
 				return dot === "configured" ? "dsh-ig-pill-dot-ok" : dot === "missing" ? "dsh-ig-pill-dot-missing" : "dsh-ig-pill-dot-neutral";
 			};
@@ -121483,6 +121585,11 @@ img.ProseMirror-separator {
 					const workflow = pillModelOf(provider, snapshot.value);
 					return workflow.length > 0 ? `${t("noKeyNeeded")} · ${workflow}` : `${t("noKeyNeeded")} · ${t("noWorkflow")}`;
 				}
+				if (isSubscriptionProvider(provider)) {
+					const state = subDots[provider];
+					const stateText = state === "logged-in" ? t("subSignedIn") : state === "logged-out" ? t("subSignedOut") : t("subStatusUnknown");
+					return `${t("subNoKey")} · ${stateText} · ${pillModelOf(provider, snapshot.value)}`;
+				}
 				const dot = dots[provider];
 				const model = pillModelOf(provider, snapshot.value);
 				if (dot === "configured") return `${t("keyConfigured")} · ${model}`;
@@ -121635,8 +121742,8 @@ img.ProseMirror-separator {
 .dsh-ig-pill-option-active{background:var(--dsw-alias-brand-primary-soft,rgba(76,120,255,.10))}
 .dsh-ig-pill-dot{flex:none;width:7px;height:7px;border-radius:50%}
 .dsh-ig-pill-dot-ok{background:#22c55e}
-.dsh-ig-pill-dot-missing{background:var(--dsw-alias-border-l2,#d1d5db)}
-.dsh-ig-pill-dot-neutral{background:var(--dsw-alias-brand-primary,#4c78ff)}
+.dsh-ig-pill-dot-missing{background:#9ca3af}
+.dsh-ig-pill-dot-neutral{background:#4c78ff}
 .dsh-ig-pill-option-text{flex:1;min-width:0;display:flex;flex-direction:column;gap:2px}
 .dsh-ig-pill-option-name{font-size:12.5px;font-weight:500;color:var(--dsw-alias-label-primary,#111827);line-height:1.2}
 .dsh-ig-pill-option-sub{font-size:11px;color:var(--dsw-alias-label-tertiary,#6b7280);line-height:1.2;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
@@ -121645,7 +121752,7 @@ img.ProseMirror-separator {
 `;
 		//#endregion
 		//#region lib/types/client/index.js
-		console.info(`[dsh-image-gen] canvas bundle 2026-09-12T16:41:18.261Z`);
+		console.info(`[dsh-image-gen] canvas bundle 2026-09-14T00:33:35.649Z`);
 		/** 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. */
@@ -121665,6 +121772,27 @@ img.ProseMirror-separator {
 				providerXAI: "xAI Grok Imagine",
 				providerZhipu: "智谱 GLM-Image",
 				providerComfyUI: "本地 ComfyUI",
+				providerChatGPTSub: "ChatGPT 订阅",
+				providerGrokSub: "Grok 订阅",
+				providerGoogleSub: "Google 订阅",
+				subBadgeLoggedIn: "已登录",
+				subBadgeLoggedOut: "未登录",
+				subBadgeUnknown: "状态未知",
+				subSectionTitle: "订阅生图",
+				subHint: "通过已登录的订阅账号生图，无需 API Key。登录在你的授权下进行，不会修改任何 API Key 或默认 Provider。",
+				subAccountLabel: "账号",
+				subAccountEmail: "已登录：{email}",
+				subAccountNone: "未登录",
+				subLogin: "登录",
+				subLoggingIn: "正在登录…",
+				subLogout: "退出登录",
+				subLoggingOut: "正在退出…",
+				subWaitingLogin: "已打开授权页面，请在浏览器中完成登录…",
+				subLoginOk: "登录成功",
+				subModelLabel: "订阅模型",
+				subModelHint: "由订阅通道固定，不可更改。",
+				subEditUnsupported: "订阅通道暂不支持图生图（编辑图片），仅支持文字生图。",
+				subDefaultHint: "订阅 Provider 只能生成，不能编辑图片；需要编辑时请切换到 API Key Provider。",
 				apiKeyLabel: "{provider} API Key",
 				apiKeyPlaceholder: "留空即可保留已配置的 Key",
 				apiKeyHint: "安全保存为 {key}；页面不会读回明文。",
@@ -121692,6 +121820,14 @@ img.ProseMirror-separator {
 				endpointHintGoogle: "Google 官方地址或反代端点（全路径）。",
 				endpointHintOpenAI: "官方 api.openai.com 的 /v1 地址；中转站请使用下方「OpenAI 兼容」行。",
 				endpointHintOpenAICompat: "中转站/自建服务的 OpenAI 兼容 /v1 地址（必填），例如 https://your-relay.example.com/v1。",
+				editFormat: "图生图请求形态",
+				editFormatMultipart: "标准 multipart（OpenAI 官方）",
+				editFormatJsonImageUrlArray: "JSON images 数组（商汤等中转）",
+				editFormatHint: "文生图不受影响。仅当中转站的图生图接口使用自有 JSON 契约（如商汤 SenseNova）时才需要切换。",
+				editExtra: "附加 JSON 字段",
+				editExtraPlaceholder: "{\"watermark\": false, \"prompt_extend\": true}",
+				editExtraHint: "仅 JSON 形态生效；会合并到请求体末尾，可覆盖默认字段。留空表示不附加。",
+				editExtraInvalid: "附加 JSON 字段必须是合法的 JSON 对象。",
 				endpointHintSeedream: "火山方舟兼容的 /api/v3 地址。",
 				endpointHintDashScope: "阿里云百炼 DashScope 官方接口地址。",
 				endpointHintXAI: "xAI 官方 api.x.ai 的 /v1 地址。",
@@ -121765,6 +121901,27 @@ img.ProseMirror-separator {
 				providerXAI: "xAI Grok Imagine",
 				providerZhipu: "Zhipu GLM-Image",
 				providerComfyUI: "Local ComfyUI",
+				providerChatGPTSub: "ChatGPT Subscription",
+				providerGrokSub: "Grok Subscription",
+				providerGoogleSub: "Google Subscription",
+				subBadgeLoggedIn: "Signed in",
+				subBadgeLoggedOut: "Signed out",
+				subBadgeUnknown: "Unknown",
+				subSectionTitle: "Subscription generation",
+				subHint: "Generates through a logged-in subscription account; no API key needed. Signing in never changes any API key or the default provider.",
+				subAccountLabel: "Account",
+				subAccountEmail: "Signed in: {email}",
+				subAccountNone: "Not signed in",
+				subLogin: "Sign in",
+				subLoggingIn: "Signing in…",
+				subLogout: "Sign out",
+				subLoggingOut: "Signing out…",
+				subWaitingLogin: "Authorization page opened; complete sign-in in your browser…",
+				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.",
 				apiKeyLabel: "{provider} API Key",
 				apiKeyPlaceholder: "Leave empty to keep configured key",
 				apiKeyHint: "Securely saved as {key}; never read back in plaintext.",
@@ -121792,6 +121949,14 @@ img.ProseMirror-separator {
 				endpointHintGoogle: "Official Google endpoint or reverse proxy (full path).",
 				endpointHintOpenAI: "Official api.openai.com /v1 base URL; for relays use the \"OpenAI-compatible\" row below.",
 				endpointHintOpenAICompat: "OpenAI-compatible /v1 base URL of your relay or self-hosted service (required), e.g. https://your-relay.example.com/v1.",
+				editFormat: "Edit request format",
+				editFormatMultipart: "Standard multipart (official OpenAI)",
+				editFormatJsonImageUrlArray: "JSON images array (SenseNova etc.)",
+				editFormatHint: "Text-to-image is unaffected. Only switch when the relay runs image edits on its own JSON contract (e.g. SenseNova); size is pinned to \"auto\" in this format (the only value SenseNova's edits endpoint accepts) and can be overridden via extra fields.",
+				editExtra: "Extra JSON fields",
+				editExtraPlaceholder: "{\"watermark\": false, \"prompt_extend\": true}",
+				editExtraHint: "Only used with the JSON format; merged into the request body last and may override defaults. Leave empty for none.",
+				editExtraInvalid: "Extra JSON fields must be a valid JSON object.",
 				endpointHintSeedream: "Volcengine Ark compatible /api/v3 base URL.",
 				endpointHintDashScope: "Official Aliyun DashScope endpoint.",
 				endpointHintXAI: "Official xAI api.x.ai /v1 base URL.",
@@ -121868,6 +122033,7 @@ img.ProseMirror-separator {
 .dsh-ig-label{font-size:13px;font-weight:500;color:var(--dsw-alias-label-primary,inherit)}
 .dsh-ig-input{box-sizing:border-box;width:100%;padding:8px 12px;font-size:13px;border:1px solid var(--dsw-alias-border-l2,#d7dbe0);border-radius:8px;background:var(--dsw-alias-bg-layer-3,transparent);color:inherit;outline:none;transition:border-color .15s}
 .dsh-ig-input:focus{border-color:var(--dsw-alias-brand-primary,#4c78ff)}
+.dsh-ig-textarea{resize:vertical;min-height:56px;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;line-height:1.5}
 .dsh-ig-input-group{display:flex;gap:8px;align-items:center}
 .dsh-ig-file-row{display:flex;align-items:center;gap:10px;min-width:0}
 .dsh-ig-file-input{position:absolute;width:1px;height:1px;overflow:hidden;clip:rect(0 0 0 0);white-space:nowrap;clip-path:inset(50%)}
@@ -122363,7 +122529,9 @@ img.ProseMirror-separator {
 				messageIsError: false,
 				workflows: [],
 				activeWorkflow: "",
-				timeoutSeconds: DEFAULT_COMFYUI_TIMEOUT_MS / 1e3
+				timeoutSeconds: DEFAULT_COMFYUI_TIMEOUT_MS / 1e3,
+				editFormat: "multipart",
+				editExtraText: ""
 			};
 		}
 		/** Settings field each cloud provider persists its model under. */
@@ -122408,6 +122576,15 @@ img.ProseMirror-separator {
 		function modelPullSupported(_provider) {
 			return true;
 		}
+		/** Serialize the extra-fields record into editor text; empty record becomes ''. */
+		function editExtraTextOf(value) {
+			if (value === void 0 || Object.keys(value).length === 0) return "";
+			try {
+				return JSON.stringify(value);
+			} catch {
+				return "";
+			}
+		}
 		/** Build one row per provider from persisted settings, including ComfyUI extras. */
 		function rowsFromSettings(value) {
 			const rows = {};
@@ -122419,6 +122596,10 @@ img.ProseMirror-separator {
 					workflows: resolveComfyUIWorkflows(value ?? {}),
 					activeWorkflow: activeComfyUIWorkflow(value ?? {})?.name ?? "",
 					timeoutSeconds: Math.max(1, Math.round((value?.comfyuiTimeoutMs ?? 3e5) / 1e3))
+				} : {},
+				...provider === "openai-compat" ? {
+					editFormat: value?.openaiCompatEditFormat === "jsonImageUrlArray" ? "jsonImageUrlArray" : "multipart",
+					editExtraText: editExtraTextOf(value?.openaiCompatEditExtra)
 				} : {}
 			};
 			return rows;
@@ -122440,6 +122621,14 @@ img.ProseMirror-separator {
 			const [workspaceMessageIsError, setWorkspaceMessageIsError] = (0, react.useState)(false);
 			const [rows, setRows] = (0, react.useState)(() => rowsFromSettings(props.scope.getSnapshot().value));
 			const [keyTick, setKeyTick] = (0, react.useState)(0);
+			const [subStatus, setSubStatus] = (0, react.useState)(() => ({
+				"chatgpt-sub": { state: "unknown" },
+				"grok-sub": { state: "unknown" },
+				"google-sub": { state: "unknown" }
+			}));
+			const [subTick, setSubTick] = (0, react.useState)(0);
+			const [subBusy, setSubBusy] = (0, react.useState)({});
+			const [subPending, setSubPending] = (0, react.useState)([]);
 			(0, react.useEffect)(() => props.scope.subscribe(() => {
 				setSnapshot(props.scope.getSnapshot());
 			}), [props.scope]);
@@ -122452,6 +122641,143 @@ img.ProseMirror-separator {
 			(0, react.useEffect)(() => credentialEvents?.listen(() => {
 				setKeyTick((tick) => tick + 1);
 			}), [credentialEvents]);
+			const pending = subPending;
+			(0, react.useEffect)(() => {
+				if (!open) return void 0;
+				let active = true;
+				const probe = async () => {
+					try {
+						const response = await fetch(SUBSCRIPTION_STATUS_ROUTE, {
+							method: "POST",
+							cache: "no-store"
+						});
+						if (!response.ok) return;
+						const payload = await response.json();
+						if (!active || payload.statuses === void 0) return;
+						const next = {
+							"chatgpt-sub": { state: "unknown" },
+							"grok-sub": { state: "unknown" },
+							"google-sub": { state: "unknown" }
+						};
+						for (const provider of SUBSCRIPTION_PROVIDERS) {
+							const row = payload.statuses[provider];
+							if (row?.state === "logged-in") next[provider] = {
+								state: "logged-in",
+								...typeof row.email === "string" ? { email: row.email } : {}
+							};
+							else if (row?.state === "logged-out") next[provider] = { state: "logged-out" };
+						}
+						setSubStatus(next);
+						const landed = pending.filter((entry) => next[entry.provider].state === "logged-in");
+						if (landed.length > 0) {
+							setSubPending((current) => current.filter((entry) => next[entry.provider].state !== "logged-in"));
+							for (const entry of landed) updateRow(entry.provider, {
+								message: t("subLoginOk"),
+								messageIsError: false
+							});
+						}
+						const WINDOW_MS = 63e4;
+						if (pending.filter((entry) => Date.now() - entry.startedAt > WINDOW_MS).length > 0) setSubPending((current) => current.filter((entry) => Date.now() - entry.startedAt <= WINDOW_MS));
+					} catch {}
+				};
+				probe();
+				let timer;
+				if (pending.length > 0) timer = setInterval(() => {
+					probe();
+				}, 2e3);
+				const onFocus = () => {
+					probe();
+				};
+				window.addEventListener("focus", onFocus);
+				return () => {
+					active = false;
+					if (timer !== void 0) clearInterval(timer);
+					window.removeEventListener("focus", onFocus);
+				};
+			}, [
+				open,
+				subTick,
+				pending
+			]);
+			/** Start a subscription login: the host registers PKCE and the loopback
+			* catch server, then the browser opens the vendor's authorize URL. The
+			* provider joins the pending set so the badge polls until login lands. */
+			const subscriptionLogin = async (provider) => {
+				updateRow(provider, {
+					message: "",
+					messageIsError: false
+				});
+				setSubBusy((current) => ({
+					...current,
+					[provider]: "login"
+				}));
+				try {
+					const response = await fetch(SUBSCRIPTION_LOGIN_ROUTE, {
+						method: "POST",
+						headers: { "content-type": "application/json" },
+						body: JSON.stringify({ provider })
+					});
+					const payload = await response.json().catch(() => ({}));
+					if (!response.ok || payload.ok !== true || typeof payload.url !== "string") {
+						const detail = typeof payload.error === "string" ? payload.error : payload.error?.message;
+						throw new Error(detail ?? `HTTP ${String(response.status)}`);
+					}
+					setSubPending((current) => [...current.filter((entry) => entry.provider !== provider), {
+						provider,
+						startedAt: Date.now()
+					}]);
+					window.open(payload.url, "_blank", "noopener");
+					updateRow(provider, {
+						message: t("subWaitingLogin"),
+						messageIsError: false
+					});
+				} catch (cause) {
+					updateRow(provider, {
+						message: cause instanceof Error ? cause.message : String(cause),
+						messageIsError: true
+					});
+				} finally {
+					setSubBusy((current) => {
+						const next = { ...current };
+						delete next[provider];
+						return next;
+					});
+				}
+			};
+			/** Sign out one subscription account; nothing else changes. */
+			const subscriptionLogout = async (provider) => {
+				setSubBusy((current) => ({
+					...current,
+					[provider]: "logout"
+				}));
+				try {
+					const response = await fetch(SUBSCRIPTION_LOGIN_ROUTE, {
+						method: "POST",
+						headers: { "content-type": "application/json" },
+						body: JSON.stringify({
+							provider,
+							action: "logout"
+						})
+					});
+					if (!response.ok) throw new Error(`HTTP ${String(response.status)}`);
+					updateRow(provider, {
+						message: "",
+						messageIsError: false
+					});
+				} catch (cause) {
+					updateRow(provider, {
+						message: cause instanceof Error ? cause.message : String(cause),
+						messageIsError: true
+					});
+				} finally {
+					setSubBusy((current) => {
+						const next = { ...current };
+						delete next[provider];
+						return next;
+					});
+					setSubTick((tick) => tick + 1);
+				}
+			};
 			const t = (keyName, params) => {
 				let text = (lang === "en" ? DICT.en : DICT.zh)[keyName] || DICT.zh[keyName] || keyName;
 				if (params) for (const [k, v] of Object.entries(params)) text = text.replace(`{${k}}`, v);
@@ -122465,7 +122791,10 @@ img.ProseMirror-separator {
 				dashscope: t("providerDashScope"),
 				xai: t("providerXAI"),
 				zhipu: t("providerZhipu"),
-				comfyui: t("providerComfyUI")
+				comfyui: t("providerComfyUI"),
+				"chatgpt-sub": t("providerChatGPTSub"),
+				"grok-sub": t("providerGrokSub"),
+				"google-sub": t("providerGoogleSub")
 			};
 			(0, react.useEffect)(() => {
 				const value = snapshot.value;
@@ -122592,9 +122921,28 @@ img.ProseMirror-separator {
 						await props.scope.set("comfyuiWorkflowJson", activeEntry === void 0 ? "" : activeEntry.json);
 						await props.scope.set("comfyuiWorkflowName", activeEntry === void 0 ? "" : activeEntry.name);
 						await props.scope.set("comfyuiTimeoutMs", Math.max(1, Math.round(row.timeoutSeconds)) * 1e3);
-					} else {
+					} else if (isSubscriptionProvider(provider)) await Promise.resolve();
+					else {
+						let editExtra = {};
+						if (provider === "openai-compat") {
+							const extraText = row.editExtraText.trim();
+							if (extraText.length > 0) {
+								let parsed;
+								try {
+									parsed = JSON.parse(extraText);
+								} catch {
+									throw new Error(t("editExtraInvalid"));
+								}
+								if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) throw new Error(t("editExtraInvalid"));
+								editExtra = parsed;
+							}
+						}
 						await props.scope.set(modelFieldOf(provider), row.model);
 						await props.scope.set(baseURLFieldOf(provider), row.baseURL);
+						if (provider === "openai-compat") {
+							await props.scope.set("openaiCompatEditFormat", row.editFormat);
+							await props.scope.set("openaiCompatEditExtra", editExtra);
+						}
 						if (row.keyInput.trim().length > 0) {
 							const keyRef = cloudCredentialRef(provider);
 							if (keyRef === void 0) throw new Error(t("comfyuiNoKey"));
@@ -122738,6 +123086,21 @@ img.ProseMirror-separator {
 					text: t("comfyuiNoKey"),
 					className: "dsh-ig-badge dsh-ig-badge-neutral"
 				};
+				if (isSubscriptionProvider(provider)) {
+					const status = subStatus[provider].state;
+					if (status === "logged-in") return {
+						text: t("subBadgeLoggedIn"),
+						className: "dsh-ig-badge dsh-ig-badge-ok"
+					};
+					if (status === "logged-out") return {
+						text: t("subBadgeLoggedOut"),
+						className: "dsh-ig-badge dsh-ig-badge-missing"
+					};
+					return {
+						text: t("subBadgeUnknown"),
+						className: "dsh-ig-badge dsh-ig-badge-neutral"
+					};
+				}
 				const status = rows[provider].keyStatus;
 				if (status === "checking") return {
 					text: t("badgeChecking"),
@@ -123007,6 +123370,57 @@ img.ProseMirror-separator {
 									}) : null
 								]
 							}),
+							provider === "openai-compat" ? (0, react_jsx_runtime.jsxs)("label", {
+								className: "dsh-ig-field",
+								children: [
+									(0, react_jsx_runtime.jsx)("span", {
+										className: "dsh-ig-label",
+										children: t("editFormat")
+									}),
+									(0, react_jsx_runtime.jsxs)("select", {
+										className: "dsh-ig-input",
+										value: row.editFormat,
+										onChange: (event) => {
+											updateRow(provider, { editFormat: event.target.value === "jsonImageUrlArray" ? "jsonImageUrlArray" : "multipart" });
+										},
+										disabled: !snapshot.writable,
+										children: [(0, react_jsx_runtime.jsx)("option", {
+											value: "multipart",
+											children: t("editFormatMultipart")
+										}), (0, react_jsx_runtime.jsx)("option", {
+											value: "jsonImageUrlArray",
+											children: t("editFormatJsonImageUrlArray")
+										})]
+									}),
+									(0, react_jsx_runtime.jsx)("span", {
+										className: "dsh-ig-hint",
+										children: t("editFormatHint")
+									})
+								]
+							}) : null,
+							provider === "openai-compat" && row.editFormat === "jsonImageUrlArray" ? (0, react_jsx_runtime.jsxs)("label", {
+								className: "dsh-ig-field",
+								children: [
+									(0, react_jsx_runtime.jsx)("span", {
+										className: "dsh-ig-label",
+										children: t("editExtra")
+									}),
+									(0, react_jsx_runtime.jsx)("textarea", {
+										className: "dsh-ig-input dsh-ig-textarea",
+										value: row.editExtraText,
+										onChange: (event) => {
+											updateRow(provider, { editExtraText: event.target.value });
+										},
+										placeholder: t("editExtraPlaceholder"),
+										rows: 2,
+										disabled: !snapshot.writable
+									}),
+									(0, react_jsx_runtime.jsx)("span", {
+										className: "dsh-ig-hint",
+										children: t("editExtraHint")
+									})
+								]
+							}) : null,
 							(0, react_jsx_runtime.jsxs)("div", {
 								className: "dsh-ig-row-actions",
 								children: [(0, react_jsx_runtime.jsx)("p", {
@@ -123224,6 +123638,119 @@ img.ProseMirror-separator {
 					})
 				});
 			};
+			/** Subscription rows: account login/logout, fixed model, edit limitation. */
+			const renderSubscriptionBody = (provider) => {
+				const row = rows[provider];
+				const status = subStatus[provider];
+				const busy = subBusy[provider];
+				return (0, react_jsx_runtime.jsx)("div", {
+					className: "dsh-ig-provider-body",
+					children: (0, react_jsx_runtime.jsxs)("form", {
+						onSubmit: (event) => {
+							event.preventDefault();
+							saveProviderRow(provider);
+						},
+						children: [
+							(0, react_jsx_runtime.jsxs)("div", {
+								className: "dsh-ig-field",
+								children: [(0, react_jsx_runtime.jsx)("span", {
+									className: "dsh-ig-label",
+									children: t("subSectionTitle")
+								}), (0, react_jsx_runtime.jsx)("p", {
+									className: "dsh-ig-hint",
+									children: t("subHint")
+								})]
+							}),
+							(0, react_jsx_runtime.jsxs)("div", {
+								className: "dsh-ig-field",
+								children: [
+									(0, react_jsx_runtime.jsx)("span", {
+										className: "dsh-ig-label",
+										children: t("subAccountLabel")
+									}),
+									(0, react_jsx_runtime.jsx)("p", {
+										className: "dsh-ig-hint",
+										children: status.state === "logged-in" ? t("subAccountEmail", { email: status.email ?? "" }) : status.state === "logged-out" ? t("subAccountNone") : t("subBadgeUnknown")
+									}),
+									(0, react_jsx_runtime.jsx)("span", {
+										className: "dsh-ig-row-buttons",
+										children: status.state === "logged-in" ? (0, react_jsx_runtime.jsx)("button", {
+											type: "button",
+											className: "dsh-ig-btn-secondary",
+											disabled: busy !== void 0,
+											onClick: () => {
+												subscriptionLogout(provider);
+											},
+											children: busy === "logout" ? t("subLoggingOut") : t("subLogout")
+										}) : (0, react_jsx_runtime.jsx)("button", {
+											type: "button",
+											className: "dsh-ig-save",
+											disabled: busy !== void 0,
+											onClick: () => {
+												subscriptionLogin(provider);
+												setSubTick((tick) => tick + 1);
+											},
+											children: busy === "login" ? t("subLoggingIn") : t("subLogin")
+										})
+									})
+								]
+							}),
+							(0, react_jsx_runtime.jsxs)("label", {
+								className: "dsh-ig-field",
+								children: [
+									(0, react_jsx_runtime.jsx)("span", {
+										className: "dsh-ig-label",
+										children: t("subModelLabel")
+									}),
+									(0, react_jsx_runtime.jsx)("input", {
+										className: "dsh-ig-input",
+										type: "text",
+										value: row.model,
+										readOnly: true,
+										disabled: true
+									}),
+									(0, react_jsx_runtime.jsx)("span", {
+										className: "dsh-ig-hint",
+										children: t("subModelHint")
+									})
+								]
+							}),
+							(0, react_jsx_runtime.jsx)("div", {
+								className: "dsh-ig-field",
+								children: (0, react_jsx_runtime.jsx)("span", {
+									className: "dsh-ig-label",
+									children: t("subEditUnsupported")
+								})
+							}),
+							(0, react_jsx_runtime.jsxs)("div", {
+								className: "dsh-ig-row-actions",
+								children: [(0, react_jsx_runtime.jsx)("p", {
+									className: `dsh-ig-status${row.messageIsError ? " dsh-ig-status-error" : ""}`,
+									role: "status",
+									children: row.message || testResultText(row.testResult)
+								}), (0, react_jsx_runtime.jsxs)("span", {
+									className: "dsh-ig-row-buttons",
+									children: [(0, react_jsx_runtime.jsx)("button", {
+										type: "button",
+										className: "dsh-ig-btn-secondary",
+										disabled: row.testing,
+										onClick: () => {
+											testConnection(provider);
+											setSubTick((tick) => tick + 1);
+										},
+										children: row.testing ? t("testing") : t("testConnection")
+									}), (0, react_jsx_runtime.jsx)("button", {
+										className: "dsh-ig-save",
+										type: "submit",
+										disabled: row.saving || !snapshot.writable,
+										children: row.saving ? t("saving") : t("save")
+									})]
+								})]
+							})
+						]
+					})
+				});
+			};
 			const renderProviderRow = (provider) => {
 				const row = rows[provider];
 				const badge = badgeOf(provider);
@@ -123265,7 +123792,7 @@ img.ProseMirror-separator {
 								})
 							})
 						]
-					}), row.expanded ? provider === "comfyui" ? renderComfyUIBody() : renderCloudBody(provider) : null]
+					}), row.expanded ? provider === "comfyui" ? renderComfyUIBody() : isSubscriptionProvider(provider) ? renderSubscriptionBody(provider) : renderCloudBody(provider) : null]
 				}, provider);
 			};
 			return (0, react_jsx_runtime.jsxs)("li", {
@@ -124004,11 +124531,11 @@ img.ProseMirror-separator {
 			};
 		}
 		function modelOf(provider, value) {
-			const stored = provider === "comfyui" ? activeComfyUIWorkflow(value ?? {})?.name : value?.[CLOUD_MODEL_FIELDS[provider]];
+			const stored = provider === "comfyui" ? activeComfyUIWorkflow(value ?? {})?.name : isSubscriptionProvider(provider) ? DEFAULT_MODELS[provider] : value?.[CLOUD_MODEL_FIELDS[provider]];
 			return typeof stored === "string" && stored.length > 0 ? stored : DEFAULT_MODELS[provider];
 		}
 		function baseURLOf(provider, value) {
-			const stored = provider === "comfyui" ? value?.comfyuiBaseURL : value?.[CLOUD_URL_FIELDS[provider]];
+			const stored = provider === "comfyui" ? value?.comfyuiBaseURL : isSubscriptionProvider(provider) ? "" : value?.[CLOUD_URL_FIELDS[provider]];
 			return typeof stored === "string" && stored.length > 0 ? stored : DEFAULT_BASE_URLS[provider];
 		}
 		//#endregion