dsh-image-gen 0.6.1 → 0.6.7

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
@@ -312,9 +343,9 @@ window.__ModuleLoader__.load({
 				}
 			});
 		}
-		const listeners$1 = /* @__PURE__ */ new Set();
+		const listeners = /* @__PURE__ */ new Set();
 		function notifyListeners() {
-			for (const listener of listeners$1) try {
+			for (const listener of listeners) try {
 				listener();
 			} catch (err) {
 				console.error("[dsh-image-gen] Gallery listener error:", err);
@@ -324,9 +355,9 @@ window.__ModuleLoader__.load({
 		* Subscribe to gallery mutations (insert/delete/clear).
 		*/
 		function subscribeGallery(listener) {
-			listeners$1.add(listener);
+			listeners.add(listener);
 			return () => {
-				listeners$1.delete(listener);
+				listeners.delete(listener);
 			};
 		}
 		/**
@@ -1409,6 +1440,11 @@ window.__ModuleLoader__.load({
 				cache.delete(key);
 			}
 		}
+		/** Clear all in-memory image caches. */
+		function clearAttachmentCache() {
+			cache.clear();
+			currentCacheBytes = 0;
+		}
 		function enforceLimits() {
 			while (cache.size > 30 || currentCacheBytes > 134217728) {
 				const oldestKey = cache.keys().next().value;
@@ -76011,14 +76047,14 @@ img.ProseMirror-separator {
 		});
 		var useReactId = react[" useId ".trim().toString()] || (() => void 0);
 		var count$1 = 0;
-		function useId(deterministicId) {
+		function useId$1(deterministicId) {
 			const [id, setId] = react.useState(useReactId());
 			useLayoutEffect2(() => {
 				if (!deterministicId) setId((reactId) => reactId ?? String(count$1++));
 			}, [deterministicId]);
 			return deterministicId || (id ? `radix-${id}` : "");
 		}
-		__name$25(useId, "useId");
+		__name$25(useId$1, "useId");
 		//#endregion
 		//#region node_modules/.pnpm/@radix-ui+react-direction@1_8310f062454398ef3b849e7d93575bcb/node_modules/@radix-ui/react-direction/dist/index.mjs
 		var __defProp$27 = Object.defineProperty;
@@ -78639,9 +78675,9 @@ img.ProseMirror-separator {
 				scope: __scopeDialog,
 				triggerRef,
 				contentRef,
-				contentId: useId(),
-				titleId: useId(),
-				descriptionId: useId(),
+				contentId: useId$1(),
+				titleId: useId$1(),
+				descriptionId: useId$1(),
 				titlePresent: titleCount > 0,
 				descriptionPresent: descriptionCount > 0,
 				setTitleCount,
@@ -80913,7 +80949,7 @@ img.ProseMirror-separator {
 		var ITEM_NAME$3 = "RovingFocusGroupItem";
 		var RovingFocusGroupItem = /* @__PURE__ */ react.forwardRef(/* @__PURE__ */ __name$13(function RovingFocusGroupItem2(props, forwardedRef) {
 			const { __scopeRovingFocusGroup, focusable = true, active = false, tabStopId, children, ...itemProps } = props;
-			const autoId = useId();
+			const autoId = useId$1();
 			const id = tabStopId || autoId;
 			const context = useRovingFocusContext(ITEM_NAME$3, __scopeRovingFocusGroup);
 			const isCurrentTabStop = context.currentTabStopId === id;
@@ -81472,8 +81508,8 @@ img.ProseMirror-separator {
 					onContentChange: setContent,
 					children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(MenuSubProvider, {
 						scope: __scopeMenu,
-						contentId: useId(),
-						triggerId: useId(),
+						contentId: useId$1(),
+						triggerId: useId$1(),
 						trigger,
 						onTriggerChange: setTrigger,
 						children
@@ -81931,9 +81967,9 @@ img.ProseMirror-separator {
 			});
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(DropdownMenuProvider, {
 				scope: __scopeDropdownMenu,
-				triggerId: useId(),
+				triggerId: useId$1(),
 				triggerRef,
-				contentId: useId(),
+				contentId: useId$1(),
 				open,
 				onOpenChange: setOpen,
 				onOpenToggle: react.useCallback(() => setOpen((prevOpen) => !prevOpen), [setOpen]),
@@ -82165,7 +82201,7 @@ img.ProseMirror-separator {
 				...popperScope,
 				children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(PopoverProvider, {
 					scope: __scopePopover,
-					contentId: useId(),
+					contentId: useId$1(),
 					triggerRef,
 					open,
 					onOpenChange: setOpen,
@@ -82397,7 +82433,7 @@ img.ProseMirror-separator {
 			]);
 			const isFormControl = trigger ? !!form || !!trigger.closest("form") : true;
 			const [nativeOptionsSet, setNativeOptionsSet] = react.useState(/* @__PURE__ */ new Set());
-			const contentId = useId();
+			const contentId = useId$1();
 			const nativeSelectKey = Array.from(nativeOptionsSet).map((option) => option.props.value).join(";");
 			const handleNativeOptionAdd = react.useCallback((option) => {
 				setNativeOptionsSet((prev) => new Set(prev).add(option));
@@ -83966,7 +84002,7 @@ img.ProseMirror-separator {
 			const popperScope = usePopperScope(__scopeTooltip);
 			const [trigger, setTrigger] = react.useState(null);
 			const [contentIdState, setContentId] = react.useState(void 0);
-			const generatedContentId = useId();
+			const generatedContentId = useId$1();
 			const openTimerRef = react.useRef(0);
 			const disableHoverableContent = disableHoverableContentProp ?? providerContext.disableHoverableContent;
 			const delayDuration = delayDurationProp ?? providerContext.delayDuration;
@@ -108087,7 +108123,7 @@ img.ProseMirror-separator {
 		}
 		const MAX_SIZE = 256;
 		const alphaCache = new LruCache(100);
-		const pending$1 = /* @__PURE__ */ new Set();
+		const pending$2 = /* @__PURE__ */ new Set();
 		let offscreenCanvas = null;
 		function getOffscreenCanvas(w, h) {
 			if (!offscreenCanvas) offscreenCanvas = new OffscreenCanvas(w, h);
@@ -108107,12 +108143,12 @@ img.ProseMirror-separator {
 		function preloadAlphaData(url, cacheKey) {
 			if (typeof OffscreenCanvas === "undefined") return;
 			const key = cacheKey ?? url;
-			if (alphaCache.has(key) || pending$1.has(key)) return;
-			pending$1.add(key);
+			if (alphaCache.has(key) || pending$2.has(key)) return;
+			pending$2.add(key);
 			const img = Image$1();
 			img.crossOrigin = "anonymous";
 			img.onload = async () => {
-				pending$1.delete(key);
+				pending$2.delete(key);
 				const { width: origW, height: origH } = img;
 				if (origW === 0 || origH === 0) return;
 				const scale = Math.min(1, MAX_SIZE / Math.max(origW, origH));
@@ -108139,7 +108175,7 @@ img.ProseMirror-separator {
 				});
 			};
 			img.onerror = () => {
-				pending$1.delete(key);
+				pending$2.delete(key);
 			};
 			img.src = url;
 		}
@@ -115591,43 +115627,6 @@ img.ProseMirror-separator {
 			});
 		}
 		//#endregion
-		//#region lib/types/client/tl/tl-canvas-bridge.js
-		const items = [];
-		const listeners = /* @__PURE__ */ new Set();
-		/** Queue freshly generated images for the tldraw canvases. Safe to call anywhere. */
-		function pushTlLandings(newItems) {
-			if (newItems.length === 0) return;
-			const known = new Set(items.map((item) => item.galleryId));
-			let pushed = 0;
-			for (const item of newItems) {
-				if (known.has(item.galleryId)) continue;
-				items.push(item);
-				known.add(item.galleryId);
-				pushed += 1;
-			}
-			if (pushed === 0) return;
-			for (const listener of listeners) listener();
-		}
-		/**
-		* Read every item landed so far in this browser session.
-		*
-		* The list is the in-memory session-scratch record shared by all canvases:
-		* reading never removes items, so a canvas mounted later (or a second canvas
-		* mounted beside the first) reconciles the same set. The list dies with the
-		* page, which is exactly the "unsaved content does not survive a restart"
-		* semantic the studio canvas keeps.
-		*/
-		function getTlLandings() {
-			return items;
-		}
-		/** Subscribe to queue pushes. Returns an unsubscribe function. */
-		function subscribeTlLandings(listener) {
-			listeners.add(listener);
-			return () => {
-				listeners.delete(listener);
-			};
-		}
-		//#endregion
 		//#region lib/types/client/tl/canvas-sync.js
 		/** Debounce for ordinary document/session changes. */
 		const STATE_DEBOUNCE_MS = 600;
@@ -115677,21 +115676,18 @@ img.ProseMirror-separator {
 		* the selection identity list, so a selected node reads exactly like its
 		* canvas node twin (same name, attachment id, dimensions).
 		*/
-		function describeShape(editor, shape, attachmentByGallery) {
+		function describeShape(editor, shape) {
 			const node = { kind: kindOf(shape.type) };
 			if (shape.type === "image") {
 				const meta = shape.meta;
 				const galleryId = meta?.galleryId;
-				if (typeof galleryId === "string" && galleryId.length > 0) {
-					node.galleryId = galleryId;
-					const attachmentId = attachmentByGallery.get(galleryId);
-					if (attachmentId !== void 0) node.attachmentId = attachmentId;
-				}
+				if (typeof galleryId === "string" && galleryId.length > 0) node.galleryId = galleryId;
+				if (typeof meta?.attachmentId === "string" && meta.attachmentId.length > 0) node.attachmentId = meta.attachmentId;
 				if (typeof meta?.prompt === "string" && meta.prompt.trim().length > 0) node.prompt = meta.prompt.replace(/\s+/g, " ").trim().slice(0, 120);
 				if (typeof meta?.provider === "string" && meta.provider.length > 0) node.provider = meta.provider;
 				if (typeof meta?.model === "string" && meta.model.length > 0) node.model = meta.model;
 				const asset = shape.props.assetId === null ? void 0 : editor.getAsset(shape.props.assetId);
-				const assetName = asset !== void 0 && asset.type === "image" ? asset.props.name : void 0;
+				const assetName = typeof meta?.name === "string" && meta.name.length > 0 ? meta.name : asset !== void 0 && asset.type === "image" ? asset.props.name : void 0;
 				if (typeof assetName === "string" && assetName.length > 0) node.name = assetName.slice(0, 128);
 				if (asset !== void 0 && asset.type === "image") {
 					node.width = Math.round(asset.props.w);
@@ -115714,31 +115710,19 @@ img.ProseMirror-separator {
 			return node;
 		}
 		function summarize(editor) {
-			const attachmentByGallery = /* @__PURE__ */ new Map();
-			const conversationGallery = /* @__PURE__ */ new Set();
-			for (const landing of getTlLandings()) {
-				attachmentByGallery.set(landing.galleryId, String(landing.attachment.attachmentId));
-				if (landing.fromConversation) conversationGallery.add(landing.galleryId);
-			}
 			const shapes = editor.getCurrentPageShapes();
 			const nodes = [];
-			for (const shape of shapes.slice(0, 48)) nodes.push(describeShape(editor, shape, attachmentByGallery));
+			for (const shape of shapes.slice(0, 48)) nodes.push(describeShape(editor, shape));
 			const selected = editor.getSelectedShapes();
 			const selectionKinds = [...new Set(selected.map((shape) => kindOf(shape.type)))].slice(0, 8);
-			const selectionItems = selected.slice(0, 16).map((shape) => describeShape(editor, shape, attachmentByGallery));
+			const selectionItems = selected.slice(0, 16).map((shape) => describeShape(editor, shape));
 			const selectionKey = selectionKeyOf(editor);
-			const selectionAllConversationImages = selected.length > 0 && selected.every((shape) => {
-				if (shape.type !== "image") return false;
-				const galleryId = shape.meta?.galleryId;
-				return typeof galleryId === "string" && conversationGallery.has(galleryId);
-			});
 			return {
 				nodeCount: shapes.length,
 				nodes,
 				selectionCount: selected.length,
 				selectionKinds,
 				selectionItems,
-				selectionAllConversationImages,
 				stateKey: JSON.stringify([
 					shapes.length,
 					nodes,
@@ -115805,7 +115789,7 @@ img.ProseMirror-separator {
 					return;
 				}
 				let selectionImage;
-				if (withScreenshot && summary.selectionCount > 0 && !summary.selectionAllConversationImages) try {
+				if (withScreenshot && summary.selectionCount > 0) try {
 					const selectedBefore = editor.getSelectedShapes();
 					const { url } = await editor.toImageDataUrl(selectedBefore, {
 						background: true,
@@ -115813,6 +115797,7 @@ img.ProseMirror-separator {
 						scale: 1,
 						pixelRatio: 2
 					});
+					if (disposed) return;
 					const selectedAfter = editor.getSelectedShapes();
 					const idsBefore = new Set(selectedBefore.map((shape) => String(shape.id)));
 					if (!(selectedBefore.length === selectedAfter.length && selectedAfter.every((shape) => idsBefore.has(String(shape.id))))) return;
@@ -115855,6 +115840,10 @@ img.ProseMirror-separator {
 				stateTimer = void 0;
 				flush(false);
 			}, STATE_DEBOUNCE_MS);
+			if (editor.getSelectedShapeIds().length > 0) exportTimer = setTimeout(() => {
+				exportTimer = void 0;
+				flush(true);
+			}, SELECTION_EXPORT_DELAY_MS);
 			return () => {
 				if (disposed) return;
 				disposed = true;
@@ -115877,25 +115866,81 @@ img.ProseMirror-separator {
 			};
 		}
 		//#endregion
+		//#region lib/types/client/tl/tl-canvas-bridge.js
+		const pending$1 = /* @__PURE__ */ new Map();
+		const consumers = /* @__PURE__ */ new Set();
+		let delivering = false;
+		let generation = 0;
+		/** Invalidates async landings that started before the user cleared the canvas. */
+		function getTlLandingGeneration() {
+			return generation;
+		}
+		function clearTlLandings() {
+			generation += 1;
+			pending$1.clear();
+		}
+		/** Queue freshly generated images for the tldraw canvases. Safe to call anywhere. */
+		function pushTlLandings(newItems) {
+			for (const item of newItems) if (!pending$1.has(item.galleryId)) pending$1.set(item.galleryId, item);
+			deliver();
+		}
+		/** Conversation results are admitted only while a canvas is mounted. */
+		function pushTlLandingsLive(items) {
+			if (consumers.size > 0) pushTlLandings(items);
+		}
+		/** Register a ready editor. False means it unmounted before committing. */
+		function registerTlLandingConsumer(consumer) {
+			consumers.add(consumer);
+			deliver();
+			return () => {
+				consumers.delete(consumer);
+				if (consumers.size === 0) {
+					for (const [id, item] of pending$1) if (item.fromConversation) pending$1.delete(id);
+				}
+			};
+		}
+		async function deliver() {
+			if (delivering) return;
+			delivering = true;
+			try {
+				while (pending$1.size > 0) {
+					const consumer = consumers.values().next().value;
+					if (consumer === void 0) break;
+					const batch = [...pending$1.values()];
+					let completed = true;
+					try {
+						completed = await consumer(batch);
+					} catch (error) {
+						console.warn("[dsh-image-gen] canvas landing failed:", error);
+					}
+					if (completed) {
+						for (const item of batch) if (pending$1.get(item.galleryId) === item) pending$1.delete(item.galleryId);
+					}
+				}
+			} finally {
+				delivering = false;
+			}
+		}
+		//#endregion
 		//#region lib/types/client/tl/studio-tl-canvas.js
 		/**
 		* Infinite canvas surface for the Studio workbench, backed by tldraw.
 		*
-		* Generated images are pushed onto the tl-canvas-bridge landing bus (studio
-		* form paths and chat tool cards land the same way) and become in-memory
-		* image assets with data-URL sources. The bus broadcasts, so this surface
-		* RECONCILES instead of draining: it lands the bus items its own page does
-		* not carry yet. The conversation-view gallery tab and the right-sidebar
-		* studio tab can both be mounted, and each mirrors the full session-scratch
-		* set independently. The surface deliberately runs WITHOUT persistenceKey:
-		* unsaved generations vanish on restart, matching the plugin's save-first
-		* philosophy; data-URL assets therefore never touch disk. Shapes carry
-		* `meta.galleryId` so re-landing the same generation is a no-op. One batch
-		* = one createShapes transaction = one undo step.
+		* Both surfaces share one locally persisted document. The landing queue is
+		* consumed once; tldraw owns subsequent edits, deletion, undo and persistence.
 		*/
 		const MAX_DISPLAY_SIDE = 380;
 		const GRID_GAP = 40;
 		const GRID_COLS = 3;
+		const mountedCanvases = /* @__PURE__ */ new Set();
+		/** Reset canvas-owned data only. Gallery records and host attachments are untouched. */
+		function clearStudioTlCanvases() {
+			if (mountedCanvases.size === 0) return false;
+			clearTlLandings();
+			for (const clear of mountedCanvases) clear();
+			clearAttachmentCache();
+			return true;
+		}
 		/**
 		* Dock the stock toolbar vertically along the left edge (Figma-style) instead
 		* of tldraw's signature bottom-center pill. It is still the same
@@ -115917,11 +115962,11 @@ img.ProseMirror-separator {
 				h: Math.round(height * scale)
 			};
 		}
-		/** Gallery ids already on one page (image shapes' `meta.galleryId`). */
+		/** Dedupe across the whole document, including images moved to other pages. */
 		function landedIdsOf(editor) {
 			const landedIds = /* @__PURE__ */ new Set();
-			for (const shape of editor.getCurrentPageShapes()) {
-				if (shape.type !== "image") continue;
+			for (const shape of editor.store.allRecords()) {
+				if (shape.typeName !== "shape" || shape.type !== "image") continue;
 				const galleryId = shape.meta?.galleryId;
 				if (typeof galleryId === "string") landedIds.add(galleryId);
 			}
@@ -115933,13 +115978,14 @@ img.ProseMirror-separator {
 			const collapsed = prompt.replace(/\s+/g, " ").trim();
 			return collapsed.length === 0 ? void 0 : collapsed.slice(0, 120);
 		}
-		async function landTlItems(editor, items, failedIds) {
+		async function landTlItems(editor, items, isActive) {
 			const landedIds = landedIdsOf(editor);
 			const pending = items.filter((item) => !landedIds.has(item.galleryId));
-			if (pending.length === 0) return;
+			if (pending.length === 0) return true;
 			const assets = [];
 			const landed = [];
 			for (const item of pending) {
+				if (!isActive()) return false;
 				const assetId = tlAssetIdFor(item.galleryId);
 				if (editor.getAsset(assetId) === void 0) try {
 					const blob = await fetchAttachmentBlob(item.attachment);
@@ -115960,7 +116006,6 @@ img.ProseMirror-separator {
 						}
 					});
 				} catch (error) {
-					failedIds.add(item.galleryId);
 					console.warn("[dsh-image-gen] canvas landing skipped (attachment unreadable):", item.galleryId, error);
 					continue;
 				}
@@ -115969,6 +116014,9 @@ img.ProseMirror-separator {
 				landed.push({
 					galleryId: item.galleryId,
 					assetId,
+					attachmentId: String(item.attachment.attachmentId),
+					name: item.attachment.name ?? item.galleryId,
+					fromConversation: item.fromConversation === true,
 					w: size.w,
 					h: size.h,
 					...prompt !== void 0 ? { prompt } : {},
@@ -115976,10 +116024,13 @@ img.ProseMirror-separator {
 					...typeof item.model === "string" && item.model.length > 0 ? { model: item.model } : {}
 				});
 			}
-			if (landed.length === 0) return;
+			if (!isActive()) return false;
+			const nowLanded = landedIdsOf(editor);
+			const ready = landed.filter((item) => !nowLanded.has(item.galleryId));
+			if (ready.length === 0) return true;
 			if (assets.length > 0) editor.createAssets(assets);
 			const rows = [];
-			for (let index = 0; index < landed.length; index += GRID_COLS) rows.push(landed.slice(index, index + GRID_COLS));
+			for (let index = 0; index < ready.length; index += GRID_COLS) rows.push(ready.slice(index, index + GRID_COLS));
 			const rowSizes = rows.map((row) => ({
 				width: row.reduce((sum, cell) => sum + cell.w, 0) + GRID_GAP * (row.length - 1),
 				height: Math.max(...row.map((cell) => cell.h))
@@ -116014,7 +116065,7 @@ img.ProseMirror-separator {
 				let cursorX = originX + (blockWidth - rowSize.width) / 2;
 				for (const cell of row) {
 					shapes.push({
-						id: createShapeId(),
+						id: createShapeId(`ig-${cell.galleryId}`),
 						type: "image",
 						x: Math.round(cursorX),
 						y: Math.round(cursorY),
@@ -116025,6 +116076,9 @@ img.ProseMirror-separator {
 						},
 						meta: {
 							galleryId: cell.galleryId,
+							attachmentId: cell.attachmentId,
+							name: cell.name,
+							fromConversation: cell.fromConversation,
 							...cell.prompt !== void 0 ? { prompt: cell.prompt } : {},
 							...cell.provider !== void 0 ? { provider: cell.provider } : {},
 							...cell.model !== void 0 ? { model: cell.model } : {}
@@ -116050,42 +116104,53 @@ img.ProseMirror-separator {
 					inset: GRID_GAP
 				});
 			}
+			return true;
 		}
 		const StudioTlCanvas = (0, react.memo)(function StudioTlCanvas() {
-			const editorRef = (0, react.useRef)(null);
-			const landingRef = (0, react.useRef)(false);
-			/** Per-canvas attachment misses, so one bad blob cannot spin the reconcile. */
-			const failedRef = (0, react.useRef)(/* @__PURE__ */ new Set());
-			const processQueue = (0, react.useCallback)(() => {
-				const editor = editorRef.current;
-				if (editor === null) return;
-				if (landingRef.current) return;
-				const landedIds = landedIdsOf(editor);
-				const items = getTlLandings().filter((item) => !landedIds.has(item.galleryId) && !failedRef.current.has(item.galleryId));
-				if (items.length === 0) return;
-				landingRef.current = true;
-				landTlItems(editor, items, failedRef.current).catch((error) => {
-					console.warn("[dsh-image-gen] tldraw canvas landing failed:", error);
-				}).finally(() => {
-					landingRef.current = false;
-					processQueue();
-				});
-			}, []);
-			(0, react.useEffect)(() => subscribeTlLandings(processQueue), [processQueue]);
+			const sessionId = (0, react.useId)();
 			return (0, react_jsx_runtime.jsx)("div", {
 				className: "dsh-ig-tl-canvas",
 				children: (0, react_jsx_runtime.jsx)(Tldraw, {
+					persistenceKey: "dsh-image-gen-workbench-v1",
+					sessionId,
 					components: { Toolbar: StudioToolbar },
 					onMount: (editor) => {
-						editorRef.current = editor;
+						let active = true;
 						applyBrandTheme(editor);
 						editor.updateInstanceState({ isGridMode: true });
 						console.info(`[dsh-image-gen] tldraw mounted (instance ${editor.id})`);
-						processQueue();
-						const stopSync = startCanvasSync(editor);
+						const stopLanding = registerTlLandingConsumer((items) => {
+							const generation = getTlLandingGeneration();
+							return landTlItems(editor, items, () => active && generation === getTlLandingGeneration());
+						});
+						let stopSync = startCanvasSync(editor);
+						const clear = () => {
+							stopSync();
+							editor.complete();
+							editor.run(() => {
+								editor.selectNone();
+								const pages = editor.getPages();
+								for (const page of pages) editor.deleteShapes([...editor.getPageShapeIds(page.id)]);
+								for (const page of pages.slice(1)) editor.deletePage(page.id);
+								editor.deleteAssets(editor.getAssets());
+								editor.setCamera({
+									x: 0,
+									y: 0,
+									z: 1
+								});
+							}, {
+								history: "ignore",
+								ignoreShapeLock: true
+							});
+							editor.clearHistory();
+							stopSync = startCanvasSync(editor);
+						};
+						mountedCanvases.add(clear);
 						return () => {
+							active = false;
+							mountedCanvases.delete(clear);
+							stopLanding();
 							stopSync();
-							editorRef.current = null;
 						};
 					}
 				})
@@ -116196,7 +116261,10 @@ img.ProseMirror-separator {
 				expandGenerate: "展开生成面板",
 				generatePanel: "生成面板",
 				findInspiration: "找灵感",
-				infiniteCanvasHint: "无限画布与侧边栏会话联动，才是完整功能。打开 DSH 右侧边栏的「图像工作台」即可解锁。"
+				infiniteCanvasHint: "无限画布与侧边栏会话联动，才是完整功能。打开 DSH 右侧边栏的「图像工作台」即可解锁。",
+				clearCanvas: "清空画布",
+				clearCanvasDescription: "将永久清空所有画布页面的内容、图片资产和撤销历史。画廊已保存的卡片及原图不受影响，此操作无法撤销。",
+				canvasCleared: "画布已清空，画廊不受影响"
 			},
 			en: {
 				title: "Cloud Image Studio",
@@ -116298,7 +116366,10 @@ img.ProseMirror-separator {
 				expandGenerate: "Expand generate panel",
 				generatePanel: "Generate",
 				findInspiration: "Find inspiration",
-				infiniteCanvasHint: "The infinite canvas is at its best when linked with the sidebar conversation. Open Image Studio from the DSH right sidebar to unlock the full experience."
+				infiniteCanvasHint: "The infinite canvas is at its best when linked with the sidebar conversation. Open Image Studio from the DSH right sidebar to unlock the full experience.",
+				clearCanvas: "Clear canvas",
+				clearCanvasDescription: "Permanently clear all canvas pages, image assets, and undo history. Saved gallery cards and original images are unaffected. This cannot be undone.",
+				canvasCleared: "Canvas cleared. Gallery unchanged."
 			}
 		};
 		/** localStorage flag remembering that the one-time infinite-canvas hint was dismissed. */
@@ -116346,6 +116417,15 @@ img.ProseMirror-separator {
 			const dragStartRef = (0, react.useRef)(null);
 			const hasDraggedRef = (0, react.useRef)(false);
 			const [canvasSurface, setCanvasSurface] = (0, react.useState)(initialCanvasSurface ?? "preview");
+			const [showClearCanvasModal, setShowClearCanvasModal] = (0, react.useState)(false);
+			(0, react.useEffect)(() => {
+				if (!showClearCanvasModal) return;
+				const close = (event) => {
+					if (event.key === "Escape") setShowClearCanvasModal(false);
+				};
+				window.addEventListener("keydown", close);
+				return () => window.removeEventListener("keydown", close);
+			}, [showClearCanvasModal]);
 			/** Generate-panel state from before the infinite canvas was opened, so the
 			*  panel is restored (not just forced open) when returning to preview. */
 			const generatePanelBeforeInfiniteRef = (0, react.useRef)(false);
@@ -117183,6 +117263,12 @@ img.ProseMirror-separator {
 											(0, react_jsx_runtime.jsxs)("div", {
 												className: "dsh-ig-canvas-toolbar-right",
 												children: [
+													canvasSurface === "infinite" && (0, react_jsx_runtime.jsxs)("button", {
+														type: "button",
+														onClick: () => setShowClearCanvasModal(true),
+														title: t("clearCanvas"),
+														children: [(0, react_jsx_runtime.jsx)(Trash2, { size: 14 }), (0, react_jsx_runtime.jsx)("span", { children: t("clearCanvas") })]
+													}),
 													canvasSurface === "preview" && selected !== null && (0, react_jsx_runtime.jsxs)("button", {
 														type: "button",
 														onClick: startNew,
@@ -117789,6 +117875,57 @@ img.ProseMirror-separator {
 							})
 						]
 					}),
+					showClearCanvasModal && (0, react_jsx_runtime.jsx)("div", {
+						className: "dsh-ig-workbench-modal-backdrop",
+						onClick: () => setShowClearCanvasModal(false),
+						children: (0, react_jsx_runtime.jsxs)("div", {
+							className: "dsh-ig-workbench-modal-box",
+							role: "dialog",
+							"aria-modal": "true",
+							"aria-label": t("clearCanvas"),
+							onClick: (event) => event.stopPropagation(),
+							children: [
+								(0, react_jsx_runtime.jsxs)("div", {
+									className: "dsh-ig-workbench-modal-header",
+									children: [(0, react_jsx_runtime.jsx)(TriangleAlert, {
+										size: 20,
+										color: "#dc2626"
+									}), (0, react_jsx_runtime.jsx)("strong", { children: t("clearCanvas") })]
+								}),
+								(0, react_jsx_runtime.jsx)("p", {
+									className: "dsh-ig-workbench-modal-desc",
+									children: t("clearCanvasDescription")
+								}),
+								(0, react_jsx_runtime.jsxs)("div", {
+									className: "dsh-ig-workbench-modal-actions",
+									children: [(0, react_jsx_runtime.jsx)("button", {
+										autoFocus: true,
+										type: "button",
+										className: "dsh-ig-workbench-modal-cancel",
+										onClick: () => setShowClearCanvasModal(false),
+										children: t("cancel")
+									}), (0, react_jsx_runtime.jsx)("button", {
+										type: "button",
+										className: "dsh-ig-workbench-modal-danger",
+										onClick: () => {
+											try {
+												if (!clearStudioTlCanvases()) {
+													flash(t("loading"));
+													return;
+												}
+												setShowClearCanvasModal(false);
+												flash(t("canvasCleared"));
+											} catch (error) {
+												setError(messageOf(error));
+												setShowClearCanvasModal(false);
+											}
+										},
+										children: t("clearCanvas")
+									})]
+								})
+							]
+						})
+					}),
 					showDeleteModal && selected !== null && (0, react_jsx_runtime.jsx)("div", {
 						className: "dsh-ig-workbench-modal-backdrop",
 						onClick: () => setShowDeleteModal(false),
@@ -120678,6 +120815,266 @@ img.ProseMirror-separator {
 			if (fromBlockContent?.type === "image") return fromBlockContent.attachment;
 		}
 		//#endregion
+		//#region lib/types/client/image-result-node.js
+		const IMAGE_RESULT_NODE_KIND = "dsh-image-result";
+		/**
+		* One image result row per Turn, anchored at its own tool/result position while
+		* the Turn runs, then optionally re-anchored beside the final answer once the
+		* Turn closes (only needed under the folding Compact transcript view).
+		*/
+		function createImageResultDefinition(options = {}) {
+			return {
+				kind: IMAGE_RESULT_NODE_KIND,
+				target: "chat",
+				match: (event) => {
+					if (event.type === "tool/ptc-dispatch") {
+						const subCallId = event.data.subCallId;
+						if (typeof subCallId !== "string" || subCallId === "") return null;
+						return imageResultFromPtcDispatch(event) === void 0 ? null : {
+							id: `ptc:${subCallId}`,
+							role: "start"
+						};
+					}
+					const turn = eventTurn(event);
+					if (turn === void 0) return null;
+					if (event.type === "turn/start") return {
+						id: String(turn),
+						role: "start"
+					};
+					if (event.type === "turn/end") return {
+						id: String(turn),
+						role: "update"
+					};
+					if (event.type === "assistant/message") return {
+						id: String(turn),
+						role: "update"
+					};
+					if (event.type === "tool/result" && imageResultFromMeta(event.data.meta) !== void 0) return {
+						id: String(turn),
+						role: "update"
+					};
+					return null;
+				},
+				start: (_context, match) => {
+					if (match.event.type === "tool/ptc-dispatch") {
+						const result = imageResultFromPtcDispatch(match.event);
+						if (result === void 0) throw new Error("dsh-image-result start requires a plugin image dispatch");
+						return { results: [{
+							...result,
+							seq: match.event.seq
+						}] };
+					}
+					const turn = eventTurn(match.event);
+					if (match.event.type !== "turn/start" || turn === void 0) throw new Error("dsh-image-result start requires turn/start");
+					return {
+						turn,
+						results: []
+					};
+				},
+				update: (context, match) => {
+					if (match.event.type === "turn/end") return {
+						...context.state,
+						endSeq: match.event.seq
+					};
+					if (match.event.type === "assistant/message") return {
+						...context.state,
+						answerSeq: match.event.seq
+					};
+					if (match.event.type === "tool/ptc-dispatch") {
+						const result = imageResultFromPtcDispatch(match.event);
+						return result === void 0 ? context.state : appendResult(context.state, result, match.event.seq);
+					}
+					if (match.event.type !== "tool/result") return context.state;
+					const result = imageResultFromMeta(match.event.data.meta);
+					if (result === void 0) return context.state;
+					return appendResult(context.state, result, match.event.seq);
+				},
+				buildViewNode: (context) => {
+					const state = context.state;
+					const last = state?.results.at(-1);
+					if (state === void 0 || last === void 0) return null;
+					const location = context.matches.at(-1)?.location ?? context.start?.location ?? { kind: "unresolved" };
+					return {
+						key: context.key,
+						kind: IMAGE_RESULT_NODE_KIND,
+						id: context.id,
+						target: "chat",
+						anchorSeq: state.endSeq !== void 0 && compactTranscript(options) ? state.answerSeq ?? state.endSeq ?? last.seq : last.seq,
+						location,
+						visibility: "visible",
+						data: {
+							...state.turn !== void 0 ? { turn: state.turn } : {},
+							results: state.results.map(({ seq: _seq, ...result }) => result)
+						}
+					};
+				}
+			};
+		}
+		/** Append a parsed result unless its attachment is already collected. */
+		function appendResult(state, result, seq) {
+			if (state.results.some((candidate) => candidate.attachment.attachmentId === result.attachment.attachmentId)) return state;
+			return {
+				...state,
+				results: [...state.results, {
+					...result,
+					seq
+				}]
+			};
+		}
+		function compactTranscript(options) {
+			try {
+				return options.isCompactTranscript?.() ?? true;
+			} catch {
+				return true;
+			}
+		}
+		/** Parse the plugin-owned durable presentation metadata from a Tool result event. */
+		function imageResultFromMeta(value) {
+			const meta = record(value);
+			if (meta?.kind !== "dsh-image-gen") return void 0;
+			const attachment = imageAttachment(meta.attachment);
+			if (attachment === void 0) return void 0;
+			return {
+				attachment,
+				prompt: stringValue(meta.prompt, "Generated Image"),
+				provider: stringValue(meta.provider, "google"),
+				model: stringValue(meta.model, ""),
+				output: stringValue(meta.output, ""),
+				...typeof meta.savedTo === "string" ? { savedTo: meta.savedTo } : {},
+				...typeof meta.seed === "number" ? { seed: meta.seed } : {}
+			};
+		}
+		function eventTurn(event) {
+			const turn = event.data.turn;
+			return typeof turn === "number" && Number.isSafeInteger(turn) && turn >= 0 ? turn : void 0;
+		}
+		/** Plugin tools whose PTC (run_code) dispatch results are image results. */
+		const PTC_IMAGE_TOOL_NAMES = /* @__PURE__ */ new Set(["generate_image", "edit_image"]);
+		/**
+		* Fixed summary text rendered by the tools' imageOutput(). PTC dispatch events
+		* carry no presentationMeta, so provider/model/output are recovered from this
+		* template rather than parsed out of natural language.
+		*/
+		const PTC_SUMMARY_PATTERN = /^(?:Generated|Edited) one image with ([^/\s]+)\/(\S+) \((.+)\)\. Attachment ID: /;
+		const PTC_SAVED_TO_PATTERN = / It was also saved to the workspace as (.+)\. (?:(?:Saving it to the workspace failed)|(?:It has no local file path)|(?:Respond to the user))/;
+		/**
+		* Parse a plugin image result from a tool/ptc-dispatch event (#38). PTC
+		* run_code sub-calls carry neither a turn nor presentationMeta, so the result
+		* is rebuilt from the dispatch payload itself: the image content block for the
+		* attachment, arguments for the prompt (and edit source ids), and the tool's
+		* fixed-format summary text for provider/model/output. Returns undefined for
+		* anything that is not a successful image result from our own image tools.
+		*/
+		function imageResultFromPtcDispatch(event) {
+			if (event.type !== "tool/ptc-dispatch") return void 0;
+			const data = event.data;
+			if (data.isError === true) return void 0;
+			if (typeof data.name !== "string" || !PTC_IMAGE_TOOL_NAMES.has(data.name)) return void 0;
+			const content = Array.isArray(data.content) ? data.content : [];
+			let attachment;
+			let summaryText = "";
+			for (const block of content) {
+				const candidate = record(block);
+				if (candidate === void 0) continue;
+				if (candidate.type === "image" && attachment === void 0) attachment = imageAttachment(candidate.attachment);
+				else if (candidate.type === "text" && summaryText === "" && typeof candidate.text === "string") summaryText = candidate.text;
+			}
+			if (attachment === void 0) return void 0;
+			const summary = PTC_SUMMARY_PATTERN.exec(summaryText);
+			const savedTo = PTC_SAVED_TO_PATTERN.exec(summaryText)?.[1];
+			const args = record(data.arguments);
+			const sourceIds = sourceAttachmentIds(args);
+			return {
+				attachment,
+				prompt: stringValue(args?.prompt, "Generated Image"),
+				provider: summary?.[1] ?? "",
+				model: summary?.[2] ?? "",
+				output: summary?.[3] ?? "",
+				...savedTo !== void 0 ? { savedTo } : {},
+				...sourceIds !== void 0 ? { sourceAttachmentIds: sourceIds } : {}
+			};
+		}
+		/** Collect edit_image source attachment ids (single or list form) from dispatch arguments. */
+		function sourceAttachmentIds(args) {
+			if (args === void 0) return void 0;
+			const single = typeof args.source_attachment_id === "string" ? [args.source_attachment_id] : void 0;
+			const list = Array.isArray(args.source_attachment_ids) ? args.source_attachment_ids.filter((id) => typeof id === "string") : void 0;
+			const ids = single ?? list;
+			return ids !== void 0 && ids.length > 0 ? ids : void 0;
+		}
+		function imageAttachment(value) {
+			const candidate = record(value);
+			if (candidate === void 0 || typeof candidate.attachmentId !== "string" || !isImageMediaType(candidate.mediaType) || !positiveInteger(candidate.bytes) || !positiveInteger(candidate.width) || !positiveInteger(candidate.height)) return void 0;
+			const original = record(candidate.originalDimensions);
+			if (candidate.originalDimensions !== void 0 && (original === void 0 || !positiveInteger(original.width) || !positiveInteger(original.height))) return void 0;
+			return {
+				attachmentId: candidate.attachmentId,
+				mediaType: candidate.mediaType,
+				bytes: candidate.bytes,
+				width: candidate.width,
+				height: candidate.height,
+				...typeof candidate.name === "string" ? { name: candidate.name } : {},
+				...original === void 0 ? {} : { originalDimensions: {
+					width: original.width,
+					height: original.height
+				} }
+			};
+		}
+		function isImageMediaType(value) {
+			return value === "image/png" || value === "image/jpeg" || value === "image/webp" || value === "image/gif";
+		}
+		function positiveInteger(value) {
+			return typeof value === "number" && Number.isSafeInteger(value) && value > 0;
+		}
+		function stringValue(value, fallback) {
+			return typeof value === "string" ? value : fallback;
+		}
+		function record(value) {
+			return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
+		}
+		//#endregion
+		//#region lib/types/client/tl/conversation-landings.js
+		/** Subscribe to live additions, never to card rendering or history replay. */
+		function startConversationLandings(sessions) {
+			let source;
+			let stopEvents;
+			const followCurrent = () => {
+				const id = sessions.list.getSnapshot().current;
+				const next = id === void 0 ? void 0 : sessions.binding(id)?.eventSource;
+				if (next === source) return;
+				stopEvents?.();
+				source = next;
+				if (next === void 0) return;
+				let lastSeq = next.getSnapshot().entries.reduce((seq, entry) => Math.max(seq, entry.event.seq), -1);
+				stopEvents = next.subscribe(() => {
+					const change = next.getSnapshot().change;
+					for (const entry of change.entries ?? []) {
+						if (entry.type !== "event") continue;
+						const { event } = entry;
+						const isNew = event.seq > lastSeq;
+						lastSeq = Math.max(lastSeq, event.seq);
+						if (change.kind !== "append" || !isNew) continue;
+						const result = event.type === "tool/result" ? imageResultFromMeta(event.data.meta) : imageResultFromPtcDispatch(event);
+						if (result === void 0) continue;
+						pushTlLandingsLive([{
+							galleryId: String(result.attachment.attachmentId),
+							attachment: result.attachment,
+							fromConversation: true,
+							prompt: result.prompt,
+							provider: result.provider,
+							model: result.model
+						}]);
+					}
+				});
+			};
+			const stopList = sessions.list.subscribe(followCurrent);
+			followCurrent();
+			return () => {
+				stopList();
+				stopEvents?.();
+			};
+		}
+		//#endregion
 		//#region lib/types/client/studio-style.js
 		const STUDIO_STYLE = `
 .dsh-ig-gallery-page-body.is-workbench{flex:1 1 0;height:100%;min-height:0;padding:0;overflow:hidden;display:flex;flex-direction:column}
@@ -121019,224 +121416,6 @@ img.ProseMirror-separator {
 .dsh-ig-inspiration-lightbox{position:fixed;inset:0;z-index:10000;background:rgba(8,12,22,.88);backdrop-filter:blur(8px);display:flex;align-items:center;justify-content:center;padding:24px;box-sizing:border-box}.dsh-ig-inspiration-lightbox-content{position:relative;max-width:90vw;max-height:90vh;display:flex;flex-direction:column;align-items:center}.dsh-ig-inspiration-lightbox-img-wrap{max-width:85vw;max-height:82vh;border-radius:10px;overflow:hidden;box-shadow:0 25px 60px rgba(0,0,0,.7);background:#05070d}.dsh-ig-inspiration-lightbox-img-wrap img{width:auto;height:auto;max-width:85vw;max-height:82vh;object-fit:contain;display:block}.dsh-ig-inspiration-lightbox-close{position:absolute;top:-16px;right:-16px;width:34px;height:34px;border-radius:50%;background:#1e293b;color:#fff;border:1px solid rgba(255,255,255,.2);cursor:pointer;display:grid;place-items:center;transition:background .15s,transform .15s;z-index:10}.dsh-ig-inspiration-lightbox-close:hover{background:#334155;transform:scale(1.1)}.dsh-ig-inspiration-lightbox-caption{margin-top:12px;color:rgba(255,255,255,.9);font-size:13px;font-weight:500;text-shadow:0 2px 4px rgba(0,0,0,.6)}
 @media(max-width:980px){.dsh-ig-inspiration-layout{grid-template-columns:1fr}.dsh-ig-inspiration-inspector{position:relative;top:auto}.dsh-ig-inspiration-inspector-empty{min-height:150px}.dsh-ig-inspiration-inspector-image{max-height:290px}.dsh-ig-inspiration-inspector-image img{object-fit:contain;background:#f1f4fa}}@media(max-width:700px){.dsh-ig-inspiration{padding:14px}.dsh-ig-inspiration-head{align-items:center}.dsh-ig-inspiration-toolbar{grid-template-columns:1fr 1fr}.dsh-ig-inspiration-search{grid-column:1/-1}.dsh-ig-inspiration-fav-filter{grid-column:1/-1}.dsh-ig-inspiration-grid{grid-template-columns:repeat(auto-fill,minmax(145px,1fr));gap:9px}}@media(max-width:420px){.dsh-ig-inspiration-toolbar{grid-template-columns:1fr}.dsh-ig-inspiration-search{grid-column:auto}}
 `;
-		//#endregion
-		//#region lib/types/client/image-result-node.js
-		const IMAGE_RESULT_NODE_KIND = "dsh-image-result";
-		/**
-		* One image result row per Turn, anchored at its own tool/result position while
-		* the Turn runs, then optionally re-anchored beside the final answer once the
-		* Turn closes (only needed under the folding Compact transcript view).
-		*/
-		function createImageResultDefinition(options = {}) {
-			return {
-				kind: IMAGE_RESULT_NODE_KIND,
-				target: "chat",
-				match: (event) => {
-					if (event.type === "tool/ptc-dispatch") {
-						const subCallId = event.data.subCallId;
-						if (typeof subCallId !== "string" || subCallId === "") return null;
-						return imageResultFromPtcDispatch(event) === void 0 ? null : {
-							id: `ptc:${subCallId}`,
-							role: "start"
-						};
-					}
-					const turn = eventTurn(event);
-					if (turn === void 0) return null;
-					if (event.type === "turn/start") return {
-						id: String(turn),
-						role: "start"
-					};
-					if (event.type === "turn/end") return {
-						id: String(turn),
-						role: "update"
-					};
-					if (event.type === "assistant/message") return {
-						id: String(turn),
-						role: "update"
-					};
-					if (event.type === "tool/result" && imageResultFromMeta(event.data.meta) !== void 0) return {
-						id: String(turn),
-						role: "update"
-					};
-					return null;
-				},
-				start: (_context, match) => {
-					if (match.event.type === "tool/ptc-dispatch") {
-						const result = imageResultFromPtcDispatch(match.event);
-						if (result === void 0) throw new Error("dsh-image-result start requires a plugin image dispatch");
-						return { results: [{
-							...result,
-							seq: match.event.seq
-						}] };
-					}
-					const turn = eventTurn(match.event);
-					if (match.event.type !== "turn/start" || turn === void 0) throw new Error("dsh-image-result start requires turn/start");
-					return {
-						turn,
-						results: []
-					};
-				},
-				update: (context, match) => {
-					if (match.event.type === "turn/end") return {
-						...context.state,
-						endSeq: match.event.seq
-					};
-					if (match.event.type === "assistant/message") return {
-						...context.state,
-						answerSeq: match.event.seq
-					};
-					if (match.event.type === "tool/ptc-dispatch") {
-						const result = imageResultFromPtcDispatch(match.event);
-						return result === void 0 ? context.state : appendResult(context.state, result, match.event.seq);
-					}
-					if (match.event.type !== "tool/result") return context.state;
-					const result = imageResultFromMeta(match.event.data.meta);
-					if (result === void 0) return context.state;
-					return appendResult(context.state, result, match.event.seq);
-				},
-				buildViewNode: (context) => {
-					const state = context.state;
-					const last = state?.results.at(-1);
-					if (state === void 0 || last === void 0) return null;
-					const location = context.matches.at(-1)?.location ?? context.start?.location ?? { kind: "unresolved" };
-					return {
-						key: context.key,
-						kind: IMAGE_RESULT_NODE_KIND,
-						id: context.id,
-						target: "chat",
-						anchorSeq: state.endSeq !== void 0 && compactTranscript(options) ? state.answerSeq ?? state.endSeq ?? last.seq : last.seq,
-						location,
-						visibility: "visible",
-						data: {
-							...state.turn !== void 0 ? { turn: state.turn } : {},
-							results: state.results.map(({ seq: _seq, ...result }) => result)
-						}
-					};
-				}
-			};
-		}
-		/** Append a parsed result unless its attachment is already collected. */
-		function appendResult(state, result, seq) {
-			if (state.results.some((candidate) => candidate.attachment.attachmentId === result.attachment.attachmentId)) return state;
-			return {
-				...state,
-				results: [...state.results, {
-					...result,
-					seq
-				}]
-			};
-		}
-		function compactTranscript(options) {
-			try {
-				return options.isCompactTranscript?.() ?? true;
-			} catch {
-				return true;
-			}
-		}
-		/** Parse the plugin-owned durable presentation metadata from a Tool result event. */
-		function imageResultFromMeta(value) {
-			const meta = record(value);
-			if (meta?.kind !== "dsh-image-gen") return void 0;
-			const attachment = imageAttachment(meta.attachment);
-			if (attachment === void 0) return void 0;
-			return {
-				attachment,
-				prompt: stringValue(meta.prompt, "Generated Image"),
-				provider: stringValue(meta.provider, "google"),
-				model: stringValue(meta.model, ""),
-				output: stringValue(meta.output, ""),
-				...typeof meta.savedTo === "string" ? { savedTo: meta.savedTo } : {},
-				...typeof meta.seed === "number" ? { seed: meta.seed } : {}
-			};
-		}
-		function eventTurn(event) {
-			const turn = event.data.turn;
-			return typeof turn === "number" && Number.isSafeInteger(turn) && turn >= 0 ? turn : void 0;
-		}
-		/** Plugin tools whose PTC (run_code) dispatch results are image results. */
-		const PTC_IMAGE_TOOL_NAMES = /* @__PURE__ */ new Set(["generate_image", "edit_image"]);
-		/**
-		* Fixed summary text rendered by the tools' imageOutput(). PTC dispatch events
-		* carry no presentationMeta, so provider/model/output are recovered from this
-		* template rather than parsed out of natural language.
-		*/
-		const PTC_SUMMARY_PATTERN = /^(?:Generated|Edited) one image with ([^/\s]+)\/(\S+) \((.+)\)\. Attachment ID: /;
-		const PTC_SAVED_TO_PATTERN = / It was also saved to the workspace as (.+)\. (?:(?:Saving it to the workspace failed)|(?:It has no local file path)|(?:Respond to the user))/;
-		/**
-		* Parse a plugin image result from a tool/ptc-dispatch event (#38). PTC
-		* run_code sub-calls carry neither a turn nor presentationMeta, so the result
-		* is rebuilt from the dispatch payload itself: the image content block for the
-		* attachment, arguments for the prompt (and edit source ids), and the tool's
-		* fixed-format summary text for provider/model/output. Returns undefined for
-		* anything that is not a successful image result from our own image tools.
-		*/
-		function imageResultFromPtcDispatch(event) {
-			if (event.type !== "tool/ptc-dispatch") return void 0;
-			const data = event.data;
-			if (data.isError === true) return void 0;
-			if (typeof data.name !== "string" || !PTC_IMAGE_TOOL_NAMES.has(data.name)) return void 0;
-			const content = Array.isArray(data.content) ? data.content : [];
-			let attachment;
-			let summaryText = "";
-			for (const block of content) {
-				const candidate = record(block);
-				if (candidate === void 0) continue;
-				if (candidate.type === "image" && attachment === void 0) attachment = imageAttachment(candidate.attachment);
-				else if (candidate.type === "text" && summaryText === "" && typeof candidate.text === "string") summaryText = candidate.text;
-			}
-			if (attachment === void 0) return void 0;
-			const summary = PTC_SUMMARY_PATTERN.exec(summaryText);
-			const savedTo = PTC_SAVED_TO_PATTERN.exec(summaryText)?.[1];
-			const args = record(data.arguments);
-			const sourceIds = sourceAttachmentIds(args);
-			return {
-				attachment,
-				prompt: stringValue(args?.prompt, "Generated Image"),
-				provider: summary?.[1] ?? "",
-				model: summary?.[2] ?? "",
-				output: summary?.[3] ?? "",
-				...savedTo !== void 0 ? { savedTo } : {},
-				...sourceIds !== void 0 ? { sourceAttachmentIds: sourceIds } : {}
-			};
-		}
-		/** Collect edit_image source attachment ids (single or list form) from dispatch arguments. */
-		function sourceAttachmentIds(args) {
-			if (args === void 0) return void 0;
-			const single = typeof args.source_attachment_id === "string" ? [args.source_attachment_id] : void 0;
-			const list = Array.isArray(args.source_attachment_ids) ? args.source_attachment_ids.filter((id) => typeof id === "string") : void 0;
-			const ids = single ?? list;
-			return ids !== void 0 && ids.length > 0 ? ids : void 0;
-		}
-		function imageAttachment(value) {
-			const candidate = record(value);
-			if (candidate === void 0 || typeof candidate.attachmentId !== "string" || !isImageMediaType(candidate.mediaType) || !positiveInteger(candidate.bytes) || !positiveInteger(candidate.width) || !positiveInteger(candidate.height)) return void 0;
-			const original = record(candidate.originalDimensions);
-			if (candidate.originalDimensions !== void 0 && (original === void 0 || !positiveInteger(original.width) || !positiveInteger(original.height))) return void 0;
-			return {
-				attachmentId: candidate.attachmentId,
-				mediaType: candidate.mediaType,
-				bytes: candidate.bytes,
-				width: candidate.width,
-				height: candidate.height,
-				...typeof candidate.name === "string" ? { name: candidate.name } : {},
-				...original === void 0 ? {} : { originalDimensions: {
-					width: original.width,
-					height: original.height
-				} }
-			};
-		}
-		function isImageMediaType(value) {
-			return value === "image/png" || value === "image/jpeg" || value === "image/webp" || value === "image/gif";
-		}
-		function positiveInteger(value) {
-			return typeof value === "number" && Number.isSafeInteger(value) && value > 0;
-		}
-		function stringValue(value, fallback) {
-			return typeof value === "string" ? value : fallback;
-		}
-		function record(value) {
-			return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
-		}
 		//#endregion
 		//#region lib/types/client/conversation-image-revisions.js
 		const STORAGE_PREFIX = "dsh_image_gen_conversation_revisions:";
@@ -121322,6 +121501,10 @@ img.ProseMirror-separator {
 				keyMissing: "未配置 Key",
 				noKeyNeeded: "无需 Key",
 				noWorkflow: "未导入工作流",
+				subNoKey: "订阅生图",
+				subSignedIn: "已登录",
+				subSignedOut: "未登录",
+				subStatusUnknown: "状态未知",
 				readOnly: "图像设置为只读，无法在此切换",
 				switchFailed: "切换失败"
 			},
@@ -121332,6 +121515,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 +121532,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 +121561,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 +121582,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 +121629,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 +121662,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 +121681,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 +121719,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 +121733,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 +121890,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 +121900,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-14T07:49:16.664Z`);
 		/** 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 +121920,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 +121968,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 +122049,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 +122097,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 +122181,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%)}
@@ -122153,6 +122467,11 @@ img.ProseMirror-separator {
 			const isCompactTranscript = () => chatScope.getSnapshot().value?.transcriptView !== "normal";
 			const locale = ctx.get("locale");
 			const promotion = { enabled: false };
+			ctx.inject(["sessions"], (owner) => {
+				const sessions = owner.get("sessions");
+				if (typeof sessions?.binding !== "function" || typeof sessions.list?.subscribe !== "function") return;
+				owner.effect(() => startConversationLandings(sessions), "dsh-image-gen: live canvas images");
+			});
 			ctx.effect(() => {
 				const style = document.createElement("style");
 				style.dataset.plugin = "dsh-image-gen";
@@ -122363,7 +122682,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 +122729,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 +122749,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 +122774,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 +122794,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 +122944,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 +123074,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 +123239,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 +123523,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 +123791,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 +123945,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", {
@@ -123510,14 +124190,6 @@ img.ProseMirror-separator {
 			};
 			(0, react.useEffect)(() => {
 				if (result === void 0) return;
-				pushTlLandings([{
-					galleryId: result.attachment.attachmentId,
-					attachment: result.attachment,
-					fromConversation: true,
-					prompt: result.prompt,
-					provider: result.provider,
-					model: result.model
-				}]);
 				saveGalleryItem({
 					id: result.attachment.attachmentId,
 					attachment: result.attachment,
@@ -124004,11 +124676,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