dsh-codex-subscription 2.1.2 → 2.1.3

package/lib/client.js

@@ -483,6 +483,41 @@ window.__ModuleLoader__.load({
 			};
 		}
 		//#endregion
+		//#region src/client-session-compat.js
+		async function withComposerSession(sessions, id, operation) {
+			const reference = typeof sessions.retain === "function" ? sessions.retain(id, { source: "controllerOperation" }) : void 0;
+			try {
+				if (reference) await reference.ready;
+				const context = reference ? reference.binding.ctx : sessions.scope(id);
+				if (!context) throw new Error("Image composer is unavailable");
+				return await operation(context);
+			} finally {
+				reference?.release();
+			}
+		}
+		function openComposerSession(sessions, workspace, id) {
+			if (typeof workspace?.openSession === "function") workspace.openSession(id);
+			else if (typeof sessions.open === "function") sessions.open(id);
+			else throw new Error("Session navigation is unavailable");
+		}
+		function createSessionOpeners() {
+			const entries = /* @__PURE__ */ new Map();
+			return {
+				register(id, callback) {
+					const callbacks = entries.get(id) ?? /* @__PURE__ */ new Set();
+					entries.set(id, callbacks);
+					callbacks.add(callback);
+					return () => {
+						callbacks.delete(callback);
+						if (!callbacks.size) entries.delete(id);
+					};
+				},
+				has: (id) => entries.has(id),
+				get: (id) => [...entries.get(id) ?? []].at(-1),
+				clear: () => entries.clear()
+			};
+		}
+		//#endregion
 		//#region src/image-edit.js
 		const isRecord = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
 		const validCoordinate = (value) => typeof value === "number" && Number.isFinite(value) && value >= 0 && value <= 1;
@@ -645,7 +680,10 @@ window.__ModuleLoader__.load({
 				loadImage,
 				attempt
 			]);
-			const item = image.attachment ?? image.preview;
+			const item = {
+				...image.attachment ?? image.preview,
+				...image.label ? { name: image.label } : {}
+			};
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 				type: "button",
 				className: "codexImageThumb",
@@ -670,11 +708,12 @@ window.__ModuleLoader__.load({
 				}) : failed ? t("accountRetry") : "…"
 			});
 		}
-		function MessageImagePreviews({ images, align, ...props }) {
+		function MessageImagePreviews({ images, align, compact, thumbnail, ...props }) {
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 				className: "codexMessageImages",
 				"data-align": align,
-				"data-single": images.length === 1,
+				"data-single": images.length === 1 && !compact && !thumbnail,
+				"data-thumbnail": thumbnail || void 0,
 				children: images.map((image, index) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(MessageImagePreview, {
 					image,
 					...props
@@ -689,6 +728,7 @@ window.__ModuleLoader__.load({
 .codexMessageImages{flex-wrap:wrap}.codexMessageImages[data-align=end]{justify-content:flex-end}
 .codexMessageImages[data-single=true] .codexImageThumb{width:240px;height:auto;max-width:100%}
 .codexMessageImages[data-single=true] img{height:auto;max-height:320px;object-fit:contain}
+.codexMessageImages[data-thumbnail=true]{padding:0}.codexMessageImages[data-thumbnail=true] img{object-fit:contain}
 `;
 		//#endregion
 		//#region src/image-conversation-node.js
@@ -832,6 +872,10 @@ window.__ModuleLoader__.load({
 			"preferences/status",
 			"preferences/models",
 			"preferences/update",
+			"runtime/status",
+			"runtime/install",
+			"runtime/remove",
+			"runtime/cancel",
 			"reset-credit/inspect",
 			"reset-credit/prepare",
 			"reset-credit/consume",
@@ -4462,6 +4506,24 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region src/client-locales.js
 		const zh = {
+			runtimeLoading: "正在检查组件…",
+			runtimeRestart: "组件已更新，请重启 DSH 后使用。",
+			runtime_installing: "正在通过 DSH 安装组件…",
+			runtime_removing: "正在通过 DSH 卸载组件…",
+			runtime_applying: "正在应用安装结果…",
+			runtimeInstall: "安装组件",
+			runtimeRemove: "卸载组件",
+			runtimeCancel: "取消安装",
+			runtimeKeep: "保留",
+			runtimeConfirmRemove: "确认卸载",
+			runtimeRefresh: "刷新状态",
+			runtimeActive: "有 Codex 子任务正在运行，结束后才能安装或卸载。",
+			runtimeConfirm: "卸载后将切回 DSH 子任务。普通订阅聊天、生图、登录和草稿保留。确定卸载可选组件？",
+			runtimeFailed: "操作未完成。请刷新状态后重试；详细原因可在 DSH 插件管理中查看。",
+			runtimeBuildBlocked: "DSH 拦截了依赖安装脚本。请在官方插件管理中审核后再安装。",
+			runtimeCancelled: "安装已取消，可重新安装。",
+			runtimeUnavailable: "当前宿主未提供组件管理接口，请更新 DSH 或按说明手动管理。",
+			runtimeInstallHint: "此处只管理官方 Codex 子任务组件，由 DSH 负责安装与卸载。安装后不会自动开启子任务；仅切回 DSH 不会卸载组件。",
 			compactionTitle: "云端压缩",
 			compaction_dsh: "关闭",
 			compaction_cloud: "开启",
@@ -4474,6 +4536,11 @@ window.__ModuleLoader__.load({
 			connectionHint: "默认 SSE。WebSocket 实验性复用连接与上下文传输；连接失败可回退 SSE。下次请求生效，不扩大上下文容量。",
 			subagentBackendHint: "Codex 复用订阅登录和工作区权限；默认继承当前订阅模型。开启 DSH 子任务模型选择并新建会话后，可在聊天中指定允许的订阅模型与推理档位；非订阅会话需指定。共享上下文子任务仍用 DSH。",
 			subagentBackendUnavailable: "当前宿主缺少子代理服务，请更新 DSH。",
+			subagentRuntimeMissing: "尚未准备 Codex 子任务运行时，仅影响此选项。普通订阅对话无需安装。",
+			subagentRuntimePrepare: "准备方法（含离线说明）",
+			subagentRuntimeInstalled: "已检测到 Codex 子任务组件；启动时会检查可执行文件。",
+			subagentRuntimeManage: "安装、卸载与存储",
+			subagentRuntimeCacheHint: "卸载后安装缓存可能仍保留，由 DSH 或 Portable 统一管理。此处不会删除登录、草稿或生成图片。",
 			sketchRecovered: "已恢复未保存草稿",
 			sketchRecoveryFailed: "恢复检查点保存失败，请手动保存或导出草稿。",
 			sketchStorageBlocked: "草稿正被其他窗口占用，请关闭其他草图窗口后重试。",
@@ -4890,6 +4957,24 @@ window.__ModuleLoader__.load({
 			imageRemoveAnnotation: "删除标注"
 		};
 		const en = {
+			runtimeLoading: "Checking component…",
+			runtimeRestart: "Component changed. Restart DSH before using it.",
+			runtime_installing: "Installing through DSH…",
+			runtime_removing: "Uninstalling through DSH…",
+			runtime_applying: "Applying installation…",
+			runtimeInstall: "Install component",
+			runtimeRemove: "Uninstall component",
+			runtimeCancel: "Cancel installation",
+			runtimeKeep: "Keep",
+			runtimeConfirmRemove: "Confirm uninstall",
+			runtimeRefresh: "Refresh status",
+			runtimeActive: "Codex subtasks are running. Wait for them to finish before installing or uninstalling.",
+			runtimeConfirm: "Uninstalling switches subtasks back to DSH. Subscription chat, images, sign-in and sketches stay available. Uninstall this optional component?",
+			runtimeFailed: "The operation did not complete. Refresh and retry; see DSH plugin management for details.",
+			runtimeBuildBlocked: "DSH blocked dependency build scripts. Review them in the official plugin manager before installing.",
+			runtimeCancelled: "Installation cancelled. You can try again.",
+			runtimeUnavailable: "This host has no component management interface. Update DSH or use the manual instructions.",
+			runtimeInstallHint: "DSH installs and removes the official Codex subtask component here. Installation does not enable subtasks automatically. Switching to DSH alone does not uninstall it.",
 			compactionTitle: "Cloud compaction",
 			compaction_dsh: "Off",
 			compaction_cloud: "On",
@@ -4902,6 +4987,11 @@ window.__ModuleLoader__.load({
 			connectionHint: "SSE by default. Experimental WebSocket reuses connections and context transfers and can fall back to SSE on connection failure. Applies to the next request; context limits stay the same.",
 			subagentBackendHint: "Codex reuses subscription login and workspace permissions, inheriting the current subscription model by default. Enable DSH subtask model selection and start a new session to request an allowed subscription model and reasoning effort in chat; other model sessions require an explicit selection. Shared-context subtasks stay in DSH.",
 			subagentBackendUnavailable: "Subagent services are unavailable. Update DSH to use this option.",
+			subagentRuntimeMissing: "Codex subtask runtime is not prepared. Subscription chat does not require it.",
+			subagentRuntimePrepare: "Setup and offline instructions",
+			subagentRuntimeInstalled: "Codex subtask component detected; its executable is checked on startup.",
+			subagentRuntimeManage: "Install, uninstall and storage",
+			subagentRuntimeCacheHint: "Package caches may remain after uninstalling. DSH or Portable manages them centrally. Sign-in, sketches and generated images are not deleted here.",
 			sketchRecovered: "Unsaved sketch recovered",
 			sketchRecoveryFailed: "Recovery checkpoint failed. Save or export your draft.",
 			sketchStorageBlocked: "Draft storage is in use. Close other sketch windows and retry.",
@@ -5536,6 +5626,14 @@ window.__ModuleLoader__.load({
 @container (max-width:480px){.codexSubscriptionAccountRow,.codexSubscriptionSectionHead{align-items:flex-start;flex-direction:column}
 .codexSubscriptionActions{width:100%}
 .codexSubscriptionSearchChoices{grid-template-columns:1fr}}
+.codexSubscriptionRuntime{font-size:12px;line-height:1.6;margin-top:12px;color:var(--dsw-alias-label-secondary)}
+.codexSubscriptionRuntime summary{cursor:pointer;width:fit-content;color:var(--dsw-alias-label-primary);border-radius:6px}
+.codexSubscriptionRuntime summary:focus-visible{outline:2px solid currentColor;outline-offset:4px}
+.codexSubscriptionRuntime p{margin:8px 0}
+.codexSubscriptionRuntime .codexSubscriptionPreference{flex-wrap:wrap;align-items:flex-start}
+.codexSubscriptionRuntime .codexSubscriptionPreference>span{flex:1;min-width:180px;font-size:12px;color:var(--dsw-alias-label-secondary)}
+.codexSubscriptionRuntime button{flex-shrink:0;white-space:nowrap}
+.codexSubscriptionRuntime code{display:block;overflow-wrap:anywhere;padding:8px 10px;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;user-select:text}
 @media(max-width:640px){.codexSubscriptionCard{padding:14px}}
 `;
 		//#endregion
@@ -6672,6 +6770,7 @@ window.__ModuleLoader__.load({
 			let modelRefreshStarted = false;
 			let disposed = false;
 			let subagentBackendAvailable = false;
+			let subagentRuntimeInstalled = false;
 			const sameModels = (left, right) => left.length === right.length && left.every((model, index) => JSON.stringify(model) === JSON.stringify(right[index]));
 			const nativeSnapshot = () => scope.getSnapshot();
 			const read = () => {
@@ -6689,6 +6788,7 @@ window.__ModuleLoader__.load({
 					compactionMode: value?.compactionMode === "cloud" ? "cloud" : "dsh",
 					subagentBackend: value?.subagentBackend === "codex" ? "codex" : "dsh",
 					subagentBackendAvailable,
+					subagentRuntimeInstalled,
 					quickQuotaMode: normalizeQuickQuotaMode(value?.[QUICK_QUOTA_MODE_FIELD], value?.[LEGACY_QUICK_QUOTA_FIELD]),
 					searchProvider: normalizeSearchProvider(value?.[SEARCH_PROVIDER_FIELD]),
 					speedMode: normalizeSpeedMode(value?.[SPEED_MODE_FIELD]),
@@ -6723,6 +6823,7 @@ window.__ModuleLoader__.load({
 			});
 			const acceptFallback = (value) => {
 				subagentBackendAvailable = value?.subagentBackendAvailable === true;
+				subagentRuntimeInstalled = value?.subagentRuntimeInstalled === true;
 				if (!modelRefreshStarted) {
 					contextModels = Array.isArray(value?.contextModels) ? value.contextModels : [];
 					verbosityModels = Array.isArray(value?.verbosityModels) ? value.verbosityModels : [];
@@ -6760,6 +6861,7 @@ window.__ModuleLoader__.load({
 					const value = unwrap(await rpc.call(CHANNEL, "preferences/status", {}));
 					if (current !== generation || disposed) return;
 					subagentBackendAvailable = value?.subagentBackendAvailable === true;
+					subagentRuntimeInstalled = value?.subagentRuntimeInstalled === true;
 					if (nativeSnapshot().status === "ready") {
 						if (!modelRefreshStarted) {
 							contextModels = Array.isArray(value?.contextModels) ? value.contextModels : [];
@@ -7132,12 +7234,19 @@ window.__ModuleLoader__.load({
 		//#region src/sidebar-quota.js
 		const isDisplayableWindow = (window) => Number.isFinite(window?.remainingPercent) && window.remainingPercent >= 0 && window.remainingPercent <= 100 && Number.isFinite(window?.windowSeconds) && window.windowSeconds > 0;
 		const normalized = (value) => String(value ?? "").toLocaleLowerCase("en-US").replaceAll(/[^a-z0-9]+/gu, "-");
-		const limitMatchesModel = (limit, model) => {
+		const exactModelLimit = (limit, model) => {
+			const id = normalized(model);
+			return id.length > 0 && [limit?.id, limit?.name].some((value) => typeof value === "string" && normalized(value) === id);
+		};
+		const limitMatchesModel = (limit, model, hasExactLimit) => {
+			if (hasExactLimit) return exactModelLimit(limit, model);
+			if (normalized(model) === "gpt-reserve") return false;
 			if (/\bspark\b/u.test(normalized(model))) return /\bspark\b/u.test(normalized(`${limit?.id ?? ""} ${limit?.name ?? ""}`));
 			return limit?.id === "codex";
 		};
 		function selectModelQuotaWindows(usage, model) {
-			return (Array.isArray(usage?.rateLimits) ? usage.rateLimits.filter((limit) => limitMatchesModel(limit, model) && Array.isArray(limit.windows)).flatMap((limit) => limit.windows).filter(isDisplayableWindow) : []).map((selected) => ({
+			const hasExactLimit = Array.isArray(usage?.rateLimits) && usage.rateLimits.some((limit) => exactModelLimit(limit, model));
+			return (Array.isArray(usage?.rateLimits) ? usage.rateLimits.filter((limit) => limitMatchesModel(limit, model, hasExactLimit) && Array.isArray(limit.windows)).flatMap((limit) => limit.windows).filter(isDisplayableWindow) : []).map((selected) => ({
 				remainingPercent: selected.remainingPercent,
 				windowSeconds: selected.windowSeconds,
 				...Number.isSafeInteger(selected.resetsAt) ? { resetsAt: selected.resetsAt } : {},
@@ -7146,7 +7255,7 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/version.js
-		const PACKAGE_VERSION = "2.1.2";
+		const PACKAGE_VERSION = "2.1.3";
 		//#endregion
 		//#region src/client-recovery.js
 		async function recoveryCall(rpc, endpoint, payload = {}, timeoutMs = 1e4) {
@@ -8003,6 +8112,158 @@ window.__ModuleLoader__.load({
 			] });
 		}
 		//#endregion
+		//#region src/client-runtime-management.jsx
+		function RuntimeManagement({ rpc, preference, t }) {
+			const [state, setState] = (0, react.useState)();
+			const [error, setError] = (0, react.useState)(false);
+			const [sending, setSending] = (0, react.useState)(false);
+			const [confirm, setConfirm] = (0, react.useState)(false);
+			const alive = (0, react.useRef)(false);
+			const busy = [
+				"installing",
+				"removing",
+				"applying"
+			].includes(state?.phase);
+			const read = async () => {
+				try {
+					const result = await rpc.call(CHANNEL, "runtime/status", {});
+					if (!alive.current) return;
+					if (!result.ok) {
+						setError(true);
+						return;
+					}
+					setState(result.value);
+					setError(false);
+				} catch {
+					if (alive.current) setError(true);
+				}
+			};
+			(0, react.useEffect)(() => {
+				alive.current = true;
+				read();
+				return () => {
+					alive.current = false;
+				};
+			}, [rpc]);
+			(0, react.useEffect)(() => {
+				if (!busy) return;
+				let stopped = false, timer;
+				const poll = async () => {
+					await read();
+					if (!stopped) timer = setTimeout(poll, 1500);
+				};
+				timer = setTimeout(poll, 1500);
+				return () => {
+					stopped = true;
+					clearTimeout(timer);
+				};
+			}, [busy, rpc]);
+			const act = async (action) => {
+				if (sending) return;
+				setSending(true);
+				setError(false);
+				setConfirm(false);
+				try {
+					const result = await rpc.call(CHANNEL, `runtime/${action}`, {});
+					if (!alive.current) return;
+					if (!result.ok) {
+						await read();
+						if (alive.current) setError(true);
+						return;
+					}
+					setState(result.value);
+					if (action === "remove") preference.load();
+				} catch {
+					if (alive.current) setError(true);
+				} finally {
+					if (alive.current) setSending(false);
+				}
+			};
+			const locked = sending || busy || state?.restartRequired || state?.active > 0;
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				className: "codexSubscriptionRuntime",
+				children: [
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "codexSubscriptionPreference",
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							role: "status",
+							children: t(!state ? "runtimeLoading" : state.restartRequired ? "runtimeRestart" : busy ? `runtime_${state.phase}` : state.installed ? "subagentRuntimeInstalled" : "subagentRuntimeMissing")
+						}), state?.available ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+							type: "button",
+							variant: "outline",
+							disabled: locked || state.installed && !state.removable,
+							onClick: () => state.installed ? setConfirm(true) : void act("install"),
+							children: t(state.installed ? "runtimeRemove" : "runtimeInstall")
+						}) : null]
+					}),
+					state?.active > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: t("runtimeActive") }) : null,
+					busy && state.phase === "installing" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+						type: "button",
+						variant: "outline",
+						disabled: sending,
+						onClick: () => {
+							act("cancel");
+						},
+						children: t("runtimeCancel")
+					}) : null,
+					confirm ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						role: "group",
+						"aria-label": t("runtimeRemove"),
+						children: [
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: t("runtimeConfirm") }),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+								type: "button",
+								variant: "outline",
+								onClick: () => setConfirm(false),
+								children: t("runtimeKeep")
+							}),
+							" ",
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+								type: "button",
+								variant: "outline",
+								disabled: locked,
+								onClick: () => {
+									act("remove");
+								},
+								children: t("runtimeConfirmRemove")
+							})
+						]
+					}) : null,
+					error || state?.phase === "failed" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+						role: "alert",
+						children: t(state?.error === "build-blocked" ? "runtimeBuildBlocked" : "runtimeFailed")
+					}) : null,
+					state?.phase === "cancelled" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+						role: "status",
+						children: t("runtimeCancelled")
+					}) : null,
+					!busy ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+						type: "button",
+						variant: "outline",
+						disabled: sending,
+						onClick: () => {
+							read();
+							preference.load();
+						},
+						children: t("runtimeRefresh")
+					}) : null,
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("details", { children: [
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("summary", { children: t("subagentRuntimeManage") }),
+						state && !state.available ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: t("runtimeUnavailable") }) : null,
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: t("runtimeInstallHint") }),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("code", { children: "@deepseek-ai/dsh-subagent-codex@0.1.5-rc.2" }),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: t("subagentRuntimeCacheHint") }),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("a", {
+							href: "https://github.com/WSL043/dsh-codex-subscription/blob/main/README.md#codex-subtask-runtime",
+							target: "_blank",
+							rel: "noreferrer",
+							children: t("subagentRuntimePrepare")
+						})
+					] })
+				]
+			});
+		}
+		//#endregion
 		//#region src/context-draft-state.js
 		const hasOwn = (value, key) => Object.prototype.hasOwnProperty.call(value ?? {}, key);
 		/**
@@ -8274,7 +8535,7 @@ window.__ModuleLoader__.load({
 				]
 			});
 		}
-		function PreferencesCard({ preference, t, section = "display" }) {
+		function PreferencesCard({ preference, rpc, t, section = "display" }) {
 			const snapshot = usePreferenceSnapshot(preference);
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: section === "advanced" ? "codexSubscriptionAdvancedPreferences" : "codexSubscriptionCard codexSubscriptionPreferencesCard",
@@ -8371,10 +8632,10 @@ window.__ModuleLoader__.load({
 							})]
 						})
 					}),
-					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("section", {
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
 						className: "codexSubscriptionCard codexSubscriptionPreferencesCard",
 						"aria-label": t("subagentBackendTitle"),
-						children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 							className: "codexSubscriptionPreference",
 							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 								className: "codexSubscriptionPreferenceCopy",
@@ -8400,14 +8661,18 @@ window.__ModuleLoader__.load({
 										type: "radio",
 										name: "codex-subagent-backend",
 										checked: snapshot.subagentBackend === value,
-										disabled: !snapshot.writable || !snapshot.subagentBackendAvailable,
+										disabled: !snapshot.writable || !snapshot.subagentBackendAvailable || value === "codex" && !snapshot.subagentRuntimeInstalled,
 										onChange: () => {
 											preference.set({ subagentBackend: value });
 										}
 									}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t(`subagentBackend_${value}`) })]
 								}, value))
 							})]
-						})
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(RuntimeManagement, {
+							rpc,
+							preference,
+							t
+						})]
 					})
 				] }) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(QuickQuotaPreference, {
 					preference,
@@ -9453,6 +9718,7 @@ window.__ModuleLoader__.load({
 								preference
 							}, resetKey),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)(PreferencesCard, {
+								rpc,
 								preference,
 								t
 							})
@@ -9465,6 +9731,7 @@ window.__ModuleLoader__.load({
 						hidden: tab !== "advanced",
 						children: [
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)(PreferencesCard, {
+								rpc,
 								preference,
 								t,
 								section: "advanced"
@@ -9594,9 +9861,15 @@ window.__ModuleLoader__.load({
 			else ctx.inject(["remote.session"], installDirectorySlots);
 			const conversation = ctx.get("conversation");
 			const uiConversation = ctx.get("uiConversation");
-			const sketchOpeners = /* @__PURE__ */ new Map();
+			const sketchOpeners = createSessionOpeners();
 			const sketchSessions = createSketchSessionRegistry();
-			ctx.effect(() => () => sketchSessions.dispose(), "codex-subscription: sketch sessions");
+			const lifetime = new AbortController();
+			ctx.effect(() => () => {
+				lifetime.abort();
+				imageViewer.close();
+				sketchOpeners.clear();
+				sketchSessions.dispose();
+			}, "codex-subscription: sketch sessions");
 			ctx.inject(["inputTriggers"], (triggerContext) => triggerContext.effect(() => triggerContext.get("inputTriggers").registerSource(createSketchTrigger({
 				enabled: () => {
 					const value = preference.getSnapshot();
@@ -9632,33 +9905,38 @@ window.__ModuleLoader__.load({
 			const openSketchImage = (sessionId) => async (src, name) => {
 				const settings = preference.getSnapshot(), open = sketchOpeners.get(sessionId);
 				if (!settings.imageSketch || !settings.imageEditing || !open) throw Error("Sketch unavailable");
-				const response = await fetch(src);
+				const response = await fetch(src, { signal: lifetime.signal });
 				if (!response.ok) throw Error("Image unavailable");
 				const blob = await response.blob();
 				if (blob.size > 20 * 1024 * 1024) throw Error("Image too large");
+				lifetime.signal.throwIfAborted();
+				const liveOpen = sketchOpeners.get(sessionId);
+				if (!liveOpen || !preference.getSnapshot().imageSketch || !preference.getSnapshot().imageEditing) throw Error("Sketch unavailable");
 				imageViewer.close();
-				open("sketch", document.activeElement, new File([blob], name || "image.png", { type: blob.type || "image/png" }));
+				liveOpen("sketch", document.activeElement, new File([blob], name || "image.png", { type: blob.type || "image/png" }));
 			};
 			const attachForEdit = (sessionId) => async (src, filename, draft, annotations = [], referenceName, sourceInDraft = false) => {
 				if (!preference.getSnapshot().imageEditing) throw new Error("Image editing is disabled");
-				const actx = sessions.scope(sessionId);
-				if (actx === void 0 || conversation.input?.for === void 0) throw new Error("This DSH version does not provide the image composer bridge");
-				const response = await fetch(src);
-				if (!response.ok) throw new Error("Could not read generated image");
-				const blob = await response.blob();
-				const files = sourceInDraft ? [] : [new File([blob], filename, { type: blob.type || "image/png" })];
-				if (annotations.length > 0) {
-					const reference = await createAnnotatedImageReference(blob, annotations);
-					files.push(new File([reference], referenceName, { type: "image/png" }));
-				}
-				const input = conversation.input.for(actx);
-				if (!preference.getSnapshot().imageEditing) throw new Error("Image editing is disabled");
-				if (files.length) attachImageFiles(conversation, input, files, sessionId);
-				sessions.open(sessionId);
-				if (sourceInDraft && !annotations.length) return;
-				if (!input.state.getSnapshot().draft.trim()) input.setDraft(draft);
-				else if (annotations.length) if (!input.state.getSnapshot().occurrences?.length) appendImagePrompt(input, draft);
-				else input.notify("info", draft);
+				return withComposerSession(sessions, sessionId, async (actx) => {
+					if (conversation.input?.for === void 0) throw new Error("This DSH version does not provide the image composer bridge");
+					const response = await fetch(src, { signal: lifetime.signal });
+					if (!response.ok) throw new Error("Could not read generated image");
+					const blob = await response.blob();
+					const files = sourceInDraft ? [] : [new File([blob], filename, { type: blob.type || "image/png" })];
+					if (annotations.length > 0) {
+						const reference = await createAnnotatedImageReference(blob, annotations);
+						files.push(new File([reference], referenceName, { type: "image/png" }));
+					}
+					lifetime.signal.throwIfAborted();
+					const input = conversation.input.for(actx);
+					if (!preference.getSnapshot().imageEditing) throw new Error("Image editing is disabled");
+					if (files.length) attachImageFiles(conversation, input, files, sessionId);
+					openComposerSession(sessions, ctx.get("uiWorkspace"), sessionId);
+					if (sourceInDraft && !annotations.length) return;
+					if (!input.state.getSnapshot().draft.trim()) input.setDraft(draft);
+					else if (annotations.length) if (!input.state.getSnapshot().occurrences?.length) appendImagePrompt(input, draft);
+					else input.notify("info", draft);
+				});
 			};
 			const nativeAttachments = () => ctx.slots.entries("conversation.input.attachments").find((entry) => entry.component !== ComposerImagePreviews && entry.locale === "conversation" && !entry.inject && !entry.store && !entry.children);
 			const watchNativeAttachments = (callback) => ctx.slots.subscribe("conversation.input.attachments", callback);
@@ -9706,12 +9984,7 @@ window.__ModuleLoader__.load({
 					sessionId,
 					rpc,
 					sessionState: sketchSessions.get(sessionId),
-					registerOpen: (callback) => {
-						sketchOpeners.set(sessionId, callback);
-						return () => {
-							if (sketchOpeners.get(sessionId) === callback) sketchOpeners.delete(sessionId);
-						};
-					},
+					registerOpen: (callback) => sketchOpeners.register(sessionId, callback),
 					attachSketch: (blob) => {
 						const current = preference.getSnapshot();
 						if (!current.imageSketch || !current.imageEditing) throw new Error("Sketch editing is disabled");