dsh-image-gen 0.6.11 → 0.7.0

package/lib/client.js

@@ -116227,6 +116227,7 @@ img.ProseMirror-separator {
 		const GRID_GAP = 40;
 		const GRID_COLS = 3;
 		const mountedCanvases = /* @__PURE__ */ new Set();
+		const mountedEditors = /* @__PURE__ */ new Set();
 		/** Reset canvas-owned data only. Gallery records and host attachments are untouched. */
 		function clearStudioTlCanvases() {
 			if (mountedCanvases.size === 0) return false;
@@ -116236,6 +116237,17 @@ img.ProseMirror-separator {
 			return true;
 		}
 		/**
+		* Cancel in-editor selection on every mounted canvas, keeping shapes and sync
+		* untouched. Selection is interaction state tied to the surface: leaving the
+		* studio page cancels it so a stale selection can neither resurface on return
+		* nor linger in the host mirror.
+		*/
+		function deselectStudioTlCanvases() {
+			if (mountedEditors.size === 0) return false;
+			for (const editor of mountedEditors) editor.run(() => editor.selectNone());
+			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
 		* DefaultToolbar with the same tools and overflow handling — only the
@@ -116410,6 +116422,8 @@ img.ProseMirror-separator {
 			const retrySync = (0, react.useRef)(() => {});
 			const onMount = (0, react.useCallback)((editor) => {
 				let active = true;
+				editor.run(() => editor.selectNone());
+				mountedEditors.add(editor);
 				applyBrandTheme(editor);
 				editor.updateInstanceState({ isGridMode: true });
 				console.info(`[dsh-image-gen] tldraw mounted (instance ${editor.id})`);
@@ -116443,6 +116457,7 @@ img.ProseMirror-separator {
 				mountedCanvases.add(clear);
 				return () => {
 					active = false;
+					mountedEditors.delete(editor);
 					mountedCanvases.delete(clear);
 					stopLanding();
 					stopSync();
@@ -119969,7 +119984,7 @@ img.ProseMirror-separator {
 			return "1:1";
 		}
 		const GalleryViewTab = (props) => {
-			const { locale, sessionId, useSessions, useWorkspaces, credentialEvents, inSidebar, defaultTab, initialCanvasSurface } = props;
+			const { locale, sessionId, useSessions, useWorkspaces, credentialEvents, inSidebar, defaultTab, initialCanvasSurface, useTabInfo } = props;
 			const [activeTab, setActiveTab] = (0, react.useState)(defaultTab ?? "gallery");
 			const [studioDraft, setStudioDraft] = (0, react.useState)(void 0);
 			const [items, setItems] = (0, react.useState)([]);
@@ -119992,6 +120007,10 @@ img.ProseMirror-separator {
 					localStorage.setItem("dsh-ig-only-current-workspace", String(onlyCurrentWorkspace));
 				} catch {}
 			}, [onlyCurrentWorkspace]);
+			const tabVisible = useTabInfo?.().tab?.visible;
+			(0, react.useEffect)(() => {
+				if (tabVisible === false) deselectStudioTlCanvases();
+			}, [tabVisible]);
 			(0, react.useEffect)(() => {
 				let mounted = true;
 				fetch(STUDIO_ROUTE).then((res) => res.ok ? res.json() : null).then((data) => {
@@ -122038,6 +122057,12 @@ img.ProseMirror-separator {
 			return typeof candidate.attachmentId === "string" && (candidate.mediaType === "image/png" || candidate.mediaType === "image/jpeg" || candidate.mediaType === "image/webp" || candidate.mediaType === "image/gif") && typeof candidate.bytes === "number" && typeof candidate.width === "number" && typeof candidate.height === "number";
 		}
 		//#endregion
+		//#region lib/types/client/settings-write.js
+		/** DSH 0.1.7 resolves refused writes to false; older settings scopes resolve to void. */
+		async function writeSetting(scope, field, value, rejectedMessage) {
+			if (await scope.set(field, value) === false) throw new Error(rejectedMessage);
+		}
+		//#endregion
 		//#region lib/types/client/provider-pill.js
 		/**
 		* Composer tool-row pill: switch the default image provider without leaving
@@ -122058,7 +122083,8 @@ img.ProseMirror-separator {
 				subSignedOut: "未登录",
 				subStatusUnknown: "状态未知",
 				readOnly: "图像设置为只读，无法在此切换",
-				switchFailed: "切换失败"
+				switchFailed: "切换失败",
+				writeRejected: "设置未保存，请重试"
 			},
 			en: {
 				pillLabel: "Image",
@@ -122072,7 +122098,8 @@ img.ProseMirror-separator {
 				subSignedOut: "Signed out",
 				subStatusUnknown: "Unknown",
 				readOnly: "Image settings are read-only; switch them in the config source",
-				switchFailed: "Switch failed"
+				switchFailed: "Switch failed",
+				writeRejected: "Setting was not saved. Please try again"
 			}
 		};
 		/** Provider row names, per locale. Brand words stay untranslated; only the
@@ -122280,7 +122307,7 @@ img.ProseMirror-separator {
 				}
 				setError("");
 				setPending(provider);
-				props.scope.set("provider", provider).then(() => {
+				writeSetting(props.scope, "provider", provider, t("writeRejected")).then(() => {
 					setOpen(false);
 				}).catch((cause) => {
 					setError(cause instanceof Error ? cause.message : String(cause));
@@ -122473,7 +122500,7 @@ img.ProseMirror-separator {
 `;
 		//#endregion
 		//#region lib/types/client/index.js
-		console.info(`[dsh-image-gen] canvas bundle 2026-09-23T16:16:55.812Z`);
+		console.info(`[dsh-image-gen] canvas bundle 2026-09-26T07:20:53.102Z`);
 		/** 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. */
@@ -122598,6 +122625,7 @@ img.ProseMirror-separator {
 				saving: "保存中…",
 				save: "保存",
 				saved: "已保存",
+				settingsWriteRejected: "有一项设置未能保存，请检查后重试。",
 				savedToPath: "已保存到",
 				generating: "正在生成图片…",
 				loading: "正在加载图片…",
@@ -122741,6 +122769,7 @@ img.ProseMirror-separator {
 				saving: "Saving…",
 				save: "Save",
 				saved: "Saved",
+				settingsWriteRejected: "A setting could not be saved. Please check and try again.",
 				savedToPath: "Saved to",
 				generating: "Generating image…",
 				loading: "Loading image…",
@@ -123057,19 +123086,40 @@ img.ProseMirror-separator {
 :has(.dsh-ig-gallery-page:not(.dsh-ig-page-in-sidebar)) [class*="widthHandle"],
 .root:has(.dsh-ig-gallery-page:not(.dsh-ig-page-in-sidebar)) [class*="widthHandle"]{display:none!important}
 `;
-		/** Required browser services. */
+		/**
+		* Required browser services. The settings form reader is deliberately absent:
+		* DSH 0.1.7 serves it as `configForms` (keyed by the Loader entry id) while
+		* 0.1.5/0.1.6 expose `settingsScope` (keyed by the legacy namespace), so it is
+		* probed at runtime in `apply`. A static inject of either name would park this
+		* fiber forever on hosts from the other generation — the issue #55 failure.
+		*/
 		const inject = [
 			"slots",
 			"connection",
 			"remote",
-			"settingsScope",
 			"locale"
 		];
+		/** Host with neither settings generation: reads empty, writes refuse, never throws. */
+		function degradedScope() {
+			return {
+				getSnapshot: () => ({
+					value: void 0,
+					writable: false
+				}),
+				subscribe: () => () => {},
+				set: async () => false
+			};
+		}
 		/** Mount the settings card, generated-image card, and native conversation gallery view. */
 		function apply(ctx) {
-			const scope = ctx.settingsScope.bind({ namespace: IMAGE_GENERATION_NAMESPACE });
-			const chatScope = ctx.settingsScope.bind({ namespace: "ui-chat" });
-			const isCompactTranscript = () => chatScope.getSnapshot().value?.transcriptView !== "normal";
+			const configForms = ctx.get("configForms");
+			const settingsScopeApi = configForms === void 0 ? ctx.get("settingsScope") : void 0;
+			const scope = configForms?.get("image-gen") ?? settingsScopeApi?.bind({ namespace: "image-generation" }) ?? degradedScope();
+			const chatScope = configForms?.get("ui-chat") ?? settingsScopeApi?.bind({ namespace: "ui-chat" }) ?? degradedScope();
+			const isCompactTranscript = () => {
+				const mode = chatScope.getSnapshot().value?.transcriptView;
+				return configForms === void 0 ? mode !== "normal" : mode !== "standard" && mode !== "detailed" && mode !== "verbose";
+			};
 			const locale = ctx.get("locale");
 			const promotion = { enabled: false };
 			ctx.inject(["sessions"], (owner) => {
@@ -123562,6 +123612,7 @@ img.ProseMirror-separator {
 				if (params) for (const [k, v] of Object.entries(params)) text = text.replace(`{${k}}`, v);
 				return text;
 			};
+			const saveSetting = (field, value) => writeSetting(props.scope, field, value, t("settingsWriteRejected"));
 			const providerLabels = {
 				google: t("providerGoogle"),
 				openai: t("providerOpenAI"),
@@ -123673,7 +123724,7 @@ img.ProseMirror-separator {
 				setDefaultProvider(provider);
 				setProviderMessage("");
 				setProviderMessageIsError(false);
-				props.scope.set("provider", provider).catch((cause) => {
+				saveSetting("provider", provider).catch((cause) => {
 					setDefaultProvider(snapshot.value?.provider ?? "google");
 					setProviderMessage(cause instanceof Error ? cause.message : String(cause));
 					setProviderMessageIsError(true);
@@ -123699,12 +123750,12 @@ img.ProseMirror-separator {
 						}
 						if (new Set(entries.map((entry) => entry.name)).size !== entries.length) throw new Error(t("workflowDuplicateName"));
 						const activeEntry = entries.find((entry) => entry.name === row.activeWorkflow) ?? entries[0];
-						await props.scope.set("comfyuiBaseURL", row.baseURL);
-						await props.scope.set("comfyuiWorkflows", entries);
-						await props.scope.set("comfyuiActiveWorkflow", activeEntry === void 0 ? "" : activeEntry.name);
-						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);
+						await saveSetting("comfyuiBaseURL", row.baseURL);
+						await saveSetting("comfyuiWorkflows", entries);
+						await saveSetting("comfyuiActiveWorkflow", activeEntry === void 0 ? "" : activeEntry.name);
+						await saveSetting("comfyuiWorkflowJson", activeEntry === void 0 ? "" : activeEntry.json);
+						await saveSetting("comfyuiWorkflowName", activeEntry === void 0 ? "" : activeEntry.name);
+						await saveSetting("comfyuiTimeoutMs", Math.max(1, Math.round(row.timeoutSeconds)) * 1e3);
 					} else if (isSubscriptionProvider(provider)) await Promise.resolve();
 					else {
 						let editExtra = {};
@@ -123721,16 +123772,16 @@ img.ProseMirror-separator {
 								editExtra = parsed;
 							}
 						}
-						await props.scope.set(modelFieldOf(provider), row.model);
-						await props.scope.set(baseURLFieldOf(provider), row.baseURL);
+						await saveSetting(modelFieldOf(provider), row.model);
+						await saveSetting(baseURLFieldOf(provider), row.baseURL);
 						if (provider === "openai-compat") {
-							await props.scope.set("openaiCompatEditFormat", row.editFormat);
-							await props.scope.set("openaiCompatEditExtra", editExtra);
+							await saveSetting("openaiCompatEditFormat", row.editFormat);
+							await saveSetting("openaiCompatEditExtra", editExtra);
 						}
 						if (provider === "seedream") {
-							await props.scope.set("seedreamOutputFormat", row.outputFormat);
-							await props.scope.set("seedreamWatermark", row.watermark);
-							await props.scope.set("seedreamBackground", row.background);
+							await saveSetting("seedreamOutputFormat", row.outputFormat);
+							await saveSetting("seedreamWatermark", row.watermark);
+							await saveSetting("seedreamBackground", row.background);
 						}
 						if (row.keyInput.trim().length > 0) {
 							const keyRef = cloudCredentialRef(provider);
@@ -124021,7 +124072,7 @@ img.ProseMirror-separator {
 				setSaveToWorkspace(next);
 				setWorkspaceMessage("");
 				setWorkspaceMessageIsError(false);
-				props.scope.set("saveToWorkspace", next).catch((cause) => {
+				saveSetting("saveToWorkspace", next).catch((cause) => {
 					setSaveToWorkspace(snapshot.value?.saveToWorkspace ?? true);
 					setWorkspaceMessage(cause instanceof Error ? cause.message : String(cause));
 					setWorkspaceMessageIsError(true);
@@ -124033,7 +124084,7 @@ img.ProseMirror-separator {
 				if (next === (snapshot.value?.workspaceFolder ?? "dsh-image-gen")) return;
 				setWorkspaceMessage("");
 				setWorkspaceMessageIsError(false);
-				props.scope.set("workspaceFolder", next).then(() => {
+				saveSetting("workspaceFolder", next).then(() => {
 					setWorkspaceMessage(t("saved"));
 				}).catch((cause) => {
 					setWorkspaceFolder(snapshot.value?.workspaceFolder ?? "dsh-image-gen");
@@ -124046,7 +124097,7 @@ img.ProseMirror-separator {
 				setShowPill(next);
 				setUiMessage("");
 				setUiMessageIsError(false);
-				props.scope.set("showProviderPill", next).catch((cause) => {
+				saveSetting("showProviderPill", next).catch((cause) => {
 					setShowPill(snapshot.value?.showProviderPill === true);
 					setUiMessage(cause instanceof Error ? cause.message : String(cause));
 					setUiMessageIsError(true);