dsh-codex-subscription 1.14.2 → 1.14.3

package/README.en.md

@@ -22,16 +22,6 @@ No OpenAI API key or Codex CLI. Models, search, quota, and image generation stay
   <img src="https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/readme-hero-en.webp" width="900" alt="Your Codex subscription inside DSH: models, web search, quota and safe reset, image generation, and Fast mode">
 </p>
 
-## What's included in 1.14.2
-
-- GPT-6 Astra now supports model-catalog context settings: Standard preserves the catalog default, Extended uses 872K, and Custom is bounded to 128K–872K.
-
-### From 1.14.1
-
-- The composer shows both 5-hour and weekly quota windows when returned by the service, so neither window is hidden.
-- Image edits validate attachment references, normalize bare SHA-256 digests, and resolve the actual attachment metadata from the current session. Paths produce an actionable error asking the model to obtain the correct reference with `read_image` and retry.
-- Location edits attach the clean source, a numbered annotation image, and coordinate instructions so the model can match each requested change to its location.
-
 ## Three-step start
 
 1. **Install the plugin.** Run the standard DSH bundle command:
@@ -50,14 +40,14 @@ DSH-Portable exposes the same standard plugin command, so the command above also
 | Capability | What you get |
 | --- | --- |
 | **Subscription models** | Sign in to ChatGPT and use Codex without an OpenAI API key or Codex CLI |
-| **Recoverable and diagnosable** | Sign-in state reconciles automatically; Settings can create a support report without credentials or account identifiers |
+| **Recoverable and diagnosable** | Sign-in state reconciles automatically; failed reads can be retried in place, while timeouts and stale account responses cannot overwrite current state; Settings can create a support report without credentials or account identifiers |
 | **Visible quota** | Keep backend-provided standard Codex, Spark, and other limits separate |
 | **Composer quota** | Choose a compact percentage, progress bar, or no inline quota display |
 | **Safe quota reset** | See each reset credit separately and deliberately try one with a cooldown and acknowledgement |
 | **Subscription search** | Explicitly route search globally through DSH default search or the signed-in Codex subscription |
 | **Codex image generation and editing (Beta)** | Generate without references, or explicitly edit one selected image; preview, zoom, annotate regions, download the original, and get the original host path for new or edited images |
 | **Fast mode** | Switch between Standard and Fast directly in the composer |
-| **Model-aware context** | Keep catalog defaults, use each model's supported extended window, or enter a full numeric token limit for each model |
+| **Model-aware context** | Keep catalog defaults, use each model's supported extended window, or enter a full numeric token limit for each model; Settings refreshes the model directory on open, account changes, and connection resets without overwriting an unsaved draft |
 | **Headless runs** | Use the same signed-in Codex provider for one-shot DSH tasks that print their answer and exit |
 
 These capabilities reuse the same local ChatGPT sign-in. Subscription routing failures stay visible and never silently switch to another paid route.
@@ -181,7 +171,7 @@ A new image request does not silently include earlier images. GPT Image 2 can ta
   <img src="https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/image-preview-annotations-en.png" width="800" alt="Generated image, region note, and continue editing inside the DSH Image Viewer">
 </p>
 
-The screenshot above illustrates image viewing and on-image notes. Version 1.14.0 includes the same basic experience; available buttons can vary with the image and installed viewer version.
+The screenshot above illustrates image viewing and on-image notes; available buttons can vary with the image and installed viewer version.
 
 ### Composer speed
 

package/README.md

@@ -23,16 +23,6 @@
   <img src="https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/readme-hero.webp" width="900" alt="Codex 订阅直接用在 DSH：订阅模型、联网搜索、额度与安全重置、图片生成和高速模式">
 </p>
 
-## 1.14.2 重点变化
-
-- GPT-6 Astra 支持模型目录上下文设置：标准模式保留目录默认值，扩展模式使用 872K，自定义模式限制为 128K–872K。
-
-### 1.14.1 更新回顾
-
-- 输入框同时显示服务端返回的 5 小时与每周额度，避免其中一个额度窗口被隐藏。
-- 图片编辑会检查附件引用，自动补全裸 SHA-256，并从当前会话取回真实附件元数据；误填路径时提示模型通过 `read_image` 获取正确引用并重试。
-- 部位修改会同时附上干净原图、编号标注图和坐标说明，让模型能够对应每条修改要求。
-
 ## 三步开始
 
 1. **安装插件**：直接运行 DSH 标准 bundle 命令：
@@ -51,14 +41,14 @@ DSH-Portable 也提供相同的标准插件命令，因此同样使用上面的
 | 能力 | 用户得到什么 |
 | --- | --- |
 | **订阅模型直连** | 登录 ChatGPT 后直接使用 Codex，不需要 OpenAI API Key 或 Codex CLI |
-| **可恢复、可诊断** | 登录状态会自动对账；设置页可生成不含凭据和账号标识的支持报告 |
+| **可恢复、可诊断** | 登录状态会自动对账；读取失败时可在原处重试，超时和旧账号响应不会覆盖当前状态；设置页可生成不含凭据和账号标识的支持报告 |
 | **额度可见** | 普通 Codex、Spark 等服务端实际返回的额度分开显示 |
 | **输入框额度** | 可选择紧凑百分比、进度条或完全关闭输入框额度显示 |
 | **安全额度重置** | 每张重置卡单独显示，并通过冷静期和知情确认主动尝试重置 |
 | **订阅搜索** | 可将全部模型的搜索明确路由到 DSH 默认搜索或已登录的 Codex 订阅 |
 | **Codex 图片生成与编辑（Beta）** | 可无参考图全新生成，也可明确选择会话图片继续编辑；支持预览、缩放、区域备注、下载原图，并为新生成或编辑的图片提供 DSH 主机上的原图路径 |
 | **高速模式** | 直接在输入框切换标准或高速，无需离开当前会话 |
-| **模型感知上下文** | 可保留目录默认值、按模型启用扩展窗口，或为每个模型填写完整数字 Token 上限 |
+| **模型感知上下文** | 可保留目录默认值、按模型启用扩展窗口，或为每个模型填写完整数字 Token 上限；设置页打开、账号切换和连接重置后会刷新模型目录，失败时可重试且不会覆盖未保存的草稿 |
 | **Headless 任务** | 使用同一份已登录的 Codex Provider 运行一次性 DSH 任务，输出答案后自动退出 |
 
 这些能力共用同一份本机 ChatGPT 登录。订阅路由失败时会明确报错，不会静默切换到其他付费路由。
@@ -179,7 +169,7 @@ ChatGPT 返回可用重置卡时，设置页会把每张卡分别显示为紧凑
   <img src="https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/image-preview-annotations.png" width="800" alt="DSH 图片查看器中的生成图、区域备注和继续编辑">
 </p>
 
-上图展示图片查看与图上备注的基本交互。1.14.0 已内置相同的基础体验；具体按钮会随图片和所安装的查看器版本变化。
+上图展示图片查看与图上备注的基本交互；具体按钮会随图片和所安装的查看器版本变化。
 
 ### 输入框速度
 

package/lib/client.js

@@ -1097,7 +1097,7 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/preference-controller.js
-		const CHANNEL$1 = "/codex-subscription";
+		const CHANNEL$2 = "/codex-subscription";
 		const unwrap$1 = (response) => {
 			if (!response?.ok) throw new Error(response?.error?.message ?? "Codex RPC failed");
 			return response.value;
@@ -1112,6 +1112,11 @@ window.__ModuleLoader__.load({
 			let generation = 0;
 			let contextModels = [];
 			let verbosityModels = [];
+			let modelError = false;
+			let modelRefreshGeneration = 0;
+			let modelRefreshStarted = false;
+			let disposed = 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 = () => {
 				const native = nativeSnapshot();
@@ -1131,6 +1136,7 @@ window.__ModuleLoader__.load({
 					customContextWindows: Object.fromEntries(Object.entries(CUSTOM_CONTEXT_MODEL_FIELDS).map(([modelKey, field]) => [modelKey, normalizeCustomContextWindow(value?.[field] ?? CUSTOM_CONTEXT_MODEL_DEFAULTS[modelKey], CUSTOM_CONTEXT_MODEL_CAPS[modelKey])])),
 					contextModels,
 					verbosityModels,
+					modelError,
 					writable: !updating && current.status === "ready" && current.writable === true,
 					saving: updating,
 					error
@@ -1148,8 +1154,10 @@ window.__ModuleLoader__.load({
 				publish();
 			});
 			const acceptFallback = (value) => {
-				contextModels = Array.isArray(value?.contextModels) ? value.contextModels : [];
-				verbosityModels = Array.isArray(value?.verbosityModels) ? value.verbosityModels : [];
+				if (!modelRefreshStarted) {
+					contextModels = Array.isArray(value?.contextModels) ? value.contextModels : [];
+					verbosityModels = Array.isArray(value?.verbosityModels) ? value.verbosityModels : [];
+				}
 				fallbackStatus = "ready";
 				fallback = {
 					status: "ready",
@@ -1174,21 +1182,50 @@ window.__ModuleLoader__.load({
 				error = false;
 				publish();
 				try {
-					const value = unwrap$1(await rpc.call(CHANNEL$1, "preferences/status", {}));
-					if (current !== generation) return;
+					const value = unwrap$1(await rpc.call(CHANNEL$2, "preferences/status", {}));
+					if (current !== generation || disposed) return;
 					if (nativeSnapshot().status === "ready") {
-						contextModels = Array.isArray(value?.contextModels) ? value.contextModels : [];
-						verbosityModels = Array.isArray(value?.verbosityModels) ? value.verbosityModels : [];
+						if (!modelRefreshStarted) {
+							contextModels = Array.isArray(value?.contextModels) ? value.contextModels : [];
+							verbosityModels = Array.isArray(value?.verbosityModels) ? value.verbosityModels : [];
+						}
 					} else acceptFallback(value);
 					publish();
 				} catch {
-					if (current !== generation || nativeSnapshot().status === "ready") return;
+					if (current !== generation || disposed || nativeSnapshot().status === "ready") return;
 					fallbackStatus = "unavailable";
 					publish();
 				}
 			};
+			const refreshModels = async () => {
+				const current = ++modelRefreshGeneration;
+				modelRefreshStarted = true;
+				const hadError = modelError;
+				modelError = false;
+				if (hadError) publish();
+				try {
+					const value = unwrap$1(await rpc.call(CHANNEL$2, "preferences/models", {}));
+					if (disposed || current !== modelRefreshGeneration) return false;
+					const nextContextModels = Array.isArray(value?.contextModels) ? value.contextModels : [];
+					const nextVerbosityModels = Array.isArray(value?.verbosityModels) ? value.verbosityModels : [];
+					const changed = !sameModels(contextModels, nextContextModels) || !sameModels(verbosityModels, nextVerbosityModels);
+					if (changed) {
+						contextModels = nextContextModels;
+						verbosityModels = nextVerbosityModels;
+						publish();
+					}
+					return changed;
+				} catch {
+					if (disposed || current !== modelRefreshGeneration) return false;
+					if (!modelError) {
+						modelError = true;
+						publish();
+					}
+					return false;
+				}
+			};
 			const set = async (patch) => {
-				if (snapshot.status !== "ready" || snapshot.writable !== true) return;
+				if (disposed || snapshot.status !== "ready" || snapshot.writable !== true) return;
 				const current = ++generation;
 				const entries = Object.entries(patch);
 				updating = true;
@@ -1207,7 +1244,7 @@ window.__ModuleLoader__.load({
 						error = entries.some(([field, value]) => accepted?.[field] !== value);
 						pendingPatch = void 0;
 					} else {
-						const value = unwrap$1(await rpc.call(CHANNEL$1, "preferences/update", patch));
+						const value = unwrap$1(await rpc.call(CHANNEL$2, "preferences/update", patch));
 						if (current !== generation) return;
 						acceptFallback(value);
 						pendingPatch = void 0;
@@ -1234,10 +1271,219 @@ window.__ModuleLoader__.load({
 				load,
 				set,
 				retry: () => failedPatch === void 0 ? load() : set(failedPatch),
-				dispose: disposeScope
+				refreshModels,
+				dispose: () => {
+					disposed = true;
+					generation += 1;
+					modelRefreshGeneration += 1;
+					disposeScope();
+				}
 			};
 		}
 		//#endregion
+		//#region src/account-status-controller.js
+		const CHANNEL$1 = "/codex-subscription";
+		const DEFAULT_TIMEOUT_MS = 1e4;
+		const STATUS_ERROR_CODES = /* @__PURE__ */ new Set([
+			"credential-unavailable",
+			"credential-malformed",
+			"transport",
+			"timeout",
+			"unknown"
+		]);
+		const STATUS_ERROR_MESSAGES = /* @__PURE__ */ new Map([
+			["Codex account credentials are unavailable", "credential-unavailable"],
+			["Codex account credentials are malformed", "credential-malformed"],
+			["Codex account status service is unavailable", "transport"],
+			["Could not read Codex account status", "unknown"]
+		]);
+		const TIMEOUT_CODES = /* @__PURE__ */ new Set([
+			"TIMEOUT",
+			"ETIMEDOUT",
+			"ERR_TIMEOUT",
+			"UND_ERR_CONNECT_TIMEOUT"
+		]);
+		const TRANSPORT_CODES = /* @__PURE__ */ new Set([
+			"ECONNRESET",
+			"ECONNREFUSED",
+			"ENOTFOUND",
+			"EAI_AGAIN",
+			"NETWORK",
+			"NETWORK_ERROR",
+			"TRANSPORT",
+			"CONNECTION_CLOSED",
+			"DISCONNECTED"
+		]);
+		const asCode = (value) => typeof value === "string" ? value.trim().toLowerCase() : void 0;
+		function rpcError(response) {
+			const code = asCode(response?.error?.code);
+			const message = typeof response?.error?.message === "string" ? response.error.message : "";
+			const error = /* @__PURE__ */ new Error("Codex account status request failed");
+			error.code = code === "internal" && STATUS_ERROR_MESSAGES.has(message) ? STATUS_ERROR_MESSAGES.get(message) : "unknown";
+			return error;
+		}
+		function timeoutError() {
+			const error = /* @__PURE__ */ new Error("Codex account status request timed out");
+			error.code = "timeout";
+			error.name = "TimeoutError";
+			return error;
+		}
+		function classifyAccountStatusError(error) {
+			const code = typeof error?.code === "string" ? error.code.trim().toUpperCase() : "";
+			if (code === "TIMEOUT" || TIMEOUT_CODES.has(code) || error?.name === "TimeoutError") return "timeout";
+			if (STATUS_ERROR_CODES.has(asCode(error?.code))) return asCode(error.code);
+			if (TRANSPORT_CODES.has(code) || error?.name === "NetworkError") return "transport";
+			return "unknown";
+		}
+		function publicAccountStatusError(error) {
+			return Object.freeze({ code: classifyAccountStatusError(error) });
+		}
+		/** Own the account-status request lifecycle independently from account actions. */
+		function createAccountStatusController(rpc, options = {}) {
+			const request = options.request ?? (() => rpc.call(CHANNEL$1, "status", {}));
+			const scheduleTimeout = options.setTimeout ?? setTimeout;
+			const cancelTimeout = options.clearTimeout ?? clearTimeout;
+			const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+			if (!Number.isFinite(timeoutMs) || timeoutMs <= 0) throw new Error("Account status timeout must be positive");
+			let snapshot = Object.freeze({
+				status: "loading",
+				account: void 0,
+				error: void 0,
+				retrying: false
+			});
+			let generation = 0;
+			let active;
+			let disposed = false;
+			const listeners = /* @__PURE__ */ new Set();
+			const publish = (next) => {
+				snapshot = Object.freeze(next);
+				for (const listener of [...listeners]) listener();
+			};
+			const load = () => {
+				if (disposed) return Promise.resolve(void 0);
+				if (active !== void 0) return active.promise;
+				const id = ++generation;
+				const retrying = snapshot.error !== void 0;
+				publish({
+					status: retrying ? "error" : "loading",
+					account: retrying ? snapshot.account : void 0,
+					error: retrying ? snapshot.error : void 0,
+					retrying: true
+				});
+				const controller = new AbortController();
+				let timer;
+				let onAbort;
+				const cancelled = new Promise((resolve, reject) => {
+					onAbort = () => reject(controller.signal.reason);
+					controller.signal.addEventListener("abort", onAbort, { once: true });
+					if (controller.signal.aborted) onAbort();
+				});
+				const timeout = new Promise((resolve, reject) => {
+					timer = scheduleTimeout(() => {
+						const error = timeoutError();
+						controller.abort(error);
+						reject(error);
+					}, timeoutMs);
+				});
+				const work = Promise.resolve().then(() => request(controller.signal)).then((response) => {
+					if (!response?.ok) throw rpcError(response);
+					return response.value;
+				});
+				const promise = Promise.race([
+					work,
+					timeout,
+					cancelled
+				]).then((account) => {
+					if (disposed || id !== generation || controller.signal.aborted) return void 0;
+					if (account === null || typeof account !== "object" || Array.isArray(account) || typeof account.authenticated !== "boolean") throw new Error("Invalid account status");
+					publish({
+						status: "ready",
+						account,
+						error: void 0,
+						retrying: false
+					});
+					return account;
+				}).catch((error) => {
+					if (disposed || id !== generation || controller.signal.aborted && error?.code !== "timeout") return void 0;
+					publish({
+						status: "error",
+						account: void 0,
+						error: publicAccountStatusError(error),
+						retrying: false
+					});
+				}).finally(() => {
+					cancelTimeout(timer);
+					controller.signal.removeEventListener("abort", onAbort);
+					if (active?.id === id) active = void 0;
+				});
+				active = {
+					id,
+					controller,
+					promise
+				};
+				return promise;
+			};
+			const acceptAccount = (account) => {
+				if (disposed) return false;
+				generation += 1;
+				active?.controller.abort(/* @__PURE__ */ new Error("Account status superseded by an account action"));
+				active = void 0;
+				publish({
+					status: "ready",
+					account,
+					error: void 0,
+					retrying: false
+				});
+				return true;
+			};
+			const reload = () => {
+				if (disposed) return Promise.resolve(void 0);
+				if (active !== void 0) {
+					generation += 1;
+					active.controller.abort(/* @__PURE__ */ new Error("Account status reload superseded the previous request"));
+					active = void 0;
+				}
+				return load();
+			};
+			const dispose = () => {
+				if (disposed) return;
+				disposed = true;
+				generation += 1;
+				active?.controller.abort(/* @__PURE__ */ new Error("Account status controller disposed"));
+				active = void 0;
+				listeners.clear();
+			};
+			return Object.freeze({
+				getSnapshot: () => snapshot,
+				subscribe(listener) {
+					listeners.add(listener);
+					return () => listeners.delete(listener);
+				},
+				load,
+				retry: load,
+				reload,
+				acceptAccount,
+				dispose
+			});
+		}
+		//#endregion
+		//#region src/context-draft-state.js
+		const hasOwn = (value, key) => Object.prototype.hasOwnProperty.call(value ?? {}, key);
+		/**
+		* Reconcile saved context values with the inputs currently shown in Settings.
+		* A draft survives a catalog refresh while its saved value is unchanged. New
+		* rows and rows whose saved value changed start from the new saved value.
+		*/
+		function reconcileContextDrafts({ modelRows, drafts, previousSavedValues, savedValues }) {
+			const next = {};
+			for (const model of modelRows) {
+				const key = model.key;
+				const saved = String(savedValues?.[key] ?? "");
+				next[key] = hasOwn(previousSavedValues, key) && previousSavedValues[key] === saved && hasOwn(drafts, key) ? drafts[key] : saved;
+			}
+			return next;
+		}
+		//#endregion
 		//#region src/client.jsx
 		const inject = [
 			"slots",
@@ -1281,6 +1527,12 @@ window.__ModuleLoader__.load({
 			failed: "登录失败，请重试。",
 			loadFailed: "无法读取账户状态。",
 			accountRetry: "重试",
+			accountRetrying: "正在重试账户状态…",
+			accountCredentialUnavailable: "登录凭据暂时不可用。请重试；不会删除已保存的登录信息。",
+			accountCredentialMalformed: "登录凭据格式异常，无法读取账户状态。重试不会删除已保存的登录信息。",
+			accountStatusTimeout: "读取账户状态超时，请重试。",
+			accountStatusTransport: "无法连接账户服务，请检查连接后重试。",
+			accountStatusUnknown: "无法读取账户状态，请重试。",
 			diagnostics: "支持诊断",
 			diagnosticsLoad: "生成诊断",
 			diagnosticsLoading: "生成中…",
@@ -1409,6 +1661,7 @@ window.__ModuleLoader__.load({
 			modelsEmpty: "没有可用模型。",
 			effortsEmpty: "当前模型未提供推理等级。",
 			modelRetry: "重试",
+			modelDirectoryFailed: "模型目录加载失败，请重试。",
 			modelFailed: "模型目录加载失败：{value}",
 			groupFailed: "{name}：{value}",
 			imageGenerate: "生成图片",
@@ -1476,6 +1729,12 @@ window.__ModuleLoader__.load({
 			failed: "Sign-in failed. Try again.",
 			loadFailed: "Could not read account status.",
 			accountRetry: "Retry",
+			accountRetrying: "Retrying account status…",
+			accountCredentialUnavailable: "The saved sign-in credentials are temporarily unavailable. Retry; saved sign-in information will not be deleted.",
+			accountCredentialMalformed: "The saved sign-in credentials are malformed, so account status cannot be read. Retrying will not delete saved sign-in information.",
+			accountStatusTimeout: "Reading account status timed out. Retry.",
+			accountStatusTransport: "The account service is unavailable. Check the connection and retry.",
+			accountStatusUnknown: "Could not read account status. Retry.",
 			diagnostics: "Support diagnostics",
 			diagnosticsLoad: "Create report",
 			diagnosticsLoading: "Creating…",
@@ -1604,6 +1863,7 @@ window.__ModuleLoader__.load({
 			modelsEmpty: "No models available.",
 			effortsEmpty: "This model provides no reasoning effort levels.",
 			modelRetry: "Retry",
+			modelDirectoryFailed: "Could not load the model directory. Try again.",
 			modelFailed: "Could not load models: {value}",
 			groupFailed: "{name}: {value}",
 			imageGenerate: "Generate image",
@@ -1694,6 +1954,16 @@ window.__ModuleLoader__.load({
 			if (!response?.ok) throw new Error(response?.error?.message ?? "Codex RPC failed");
 			return response.value;
 		};
+		const accountStatusErrorText = (error, t) => {
+			const key = {
+				"credential-unavailable": "accountCredentialUnavailable",
+				"credential-malformed": "accountCredentialMalformed",
+				timeout: "accountStatusTimeout",
+				transport: "accountStatusTransport",
+				unknown: "accountStatusUnknown"
+			}[error?.code];
+			return t(key ?? "accountStatusUnknown");
+		};
 		const fill = (text, values) => Object.entries(values).reduce((next, [key, value]) => next.replace(`{${key}}`, String(value)), text);
 		const maskEmail = (value) => {
 			if (typeof value !== "string" || !value.includes("@")) return "••••";
@@ -1927,6 +2197,7 @@ window.__ModuleLoader__.load({
 			});
 		}
 		const usePreferenceSnapshot = (preference) => (0, react.useSyncExternalStore)(preference.subscribe, preference.getSnapshot);
+		const useAccountStatusSnapshot = (accountStatus) => (0, react.useSyncExternalStore)(accountStatus.subscribe, accountStatus.getSnapshot);
 		const notifyQuickQuota = () => window.dispatchEvent(new Event(QUICK_QUOTA_REFRESH_EVENT));
 		const formatRunway = (seconds, t) => {
 			if (!Number.isFinite(seconds) || seconds <= 0) return void 0;
@@ -2089,7 +2360,18 @@ window.__ModuleLoader__.load({
 			const modelRows = snapshot.contextModels.filter((model) => model.fixed !== true);
 			const fixedRows = snapshot.contextModels.filter((model) => model.fixed === true);
 			const [drafts, setDrafts] = (0, react.useState)({});
-			(0, react.useEffect)(() => setDrafts(Object.fromEntries(modelRows.map((model) => [model.key, String(snapshot.customContextWindows[model.key])]))), [snapshot.customContextWindows, snapshot.contextModels]);
+			const previousSavedValues = (0, react.useRef)();
+			(0, react.useEffect)(() => {
+				const savedValues = Object.fromEntries(modelRows.map((model) => [model.key, String(snapshot.customContextWindows[model.key])]));
+				const previous = previousSavedValues.current;
+				setDrafts((current) => reconcileContextDrafts({
+					modelRows,
+					drafts: current,
+					previousSavedValues: previous,
+					savedValues
+				}));
+				previousSavedValues.current = savedValues;
+			}, [modelRows.map((model) => `${model.key}\u0000${snapshot.customContextWindows[model.key]}`).join("
")]);
 			const hint = snapshot.contextMode === "extended" ? t("contextExtendedHint") : snapshot.contextMode === "custom" ? t("contextCustomHint") : t("contextStandardHint");
 			const commit = (modelKey) => {
 				const parsed = parseContextWindow(drafts[modelKey]);
@@ -2124,81 +2406,99 @@ window.__ModuleLoader__.load({
 			const selectedMode = contextModeItems.find((item) => item.id === snapshot.contextMode)?.label ?? t("contextStandard");
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "codexSubscriptionContext",
-				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-					className: "codexSubscriptionContextHead",
-					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-						className: "codexSubscriptionContextCopy",
-						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-							className: "codexSubscriptionPreferenceLabel",
-							children: t("contextTitle")
-						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-							className: "codexSubscriptionContextHint",
-							children: hint
+				children: [
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "codexSubscriptionContextHead",
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+							className: "codexSubscriptionContextCopy",
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								className: "codexSubscriptionPreferenceLabel",
+								children: t("contextTitle")
+							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								className: "codexSubscriptionContextHint",
+								children: hint
+							})]
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Menu, {
+							open: menuOpen,
+							items: contextModeItems,
+							selectedId: snapshot.contextMode,
+							onSelect: (value) => {
+								setMenuOpen(false);
+								preference.set({ [CONTEXT_MODE_FIELD]: value });
+							},
+							onClose: () => setMenuOpen(false),
+							align: "end",
+							side: "bottom",
+							portal: true,
+							compact: true,
+							anchor: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+								className: "codexSubscriptionContextTrigger",
+								type: "button",
+								"aria-label": t("contextTitle"),
+								"aria-haspopup": "menu",
+								"aria-expanded": menuOpen,
+								disabled: !writable,
+								onClick: () => setMenuOpen((value) => !value),
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: selectedMode }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronDownOutline14, {})]
+							})
 						})]
-					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Menu, {
-						open: menuOpen,
-						items: contextModeItems,
-						selectedId: snapshot.contextMode,
-						onSelect: (value) => {
-							setMenuOpen(false);
-							preference.set({ [CONTEXT_MODE_FIELD]: value });
-						},
-						onClose: () => setMenuOpen(false),
-						align: "end",
-						side: "bottom",
-						portal: true,
-						compact: true,
-						anchor: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
-							className: "codexSubscriptionContextTrigger",
+					}),
+					snapshot.contextMode === "custom" ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "codexSubscriptionContextModels",
+						children: [modelRows.map((model) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+							className: "codexSubscriptionContextModel",
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+								className: "codexSubscriptionContextModelCopy",
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: model.label }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: fill(t("contextMaximum"), { value: String(model.maximum) }) })]
+							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Input, {
+								"aria-label": `${model.label} ${t("contextTokens")}`,
+								className: "codexSubscriptionContextInput",
+								type: "number",
+								inputMode: "numeric",
+								min: MIN_CUSTOM_CONTEXT_WINDOW,
+								max: model.maximum,
+								step: 1,
+								value: drafts[model.key] ?? "",
+								disabled: !writable,
+								onChange: (event) => {
+									const nextValue = event.currentTarget.value;
+									setDrafts((current) => ({
+										...current,
+										[model.key]: nextValue
+									}));
+								},
+								onBlur: () => commit(model.key),
+								onKeyDown: (event) => {
+									if (event.key === "Enter") event.currentTarget.blur();
+								}
+							})]
+						}, model.key)), fixedRows.map((model) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+							className: "codexSubscriptionContextModel",
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+								className: "codexSubscriptionContextModelCopy",
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: model.label }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: fill(t("contextFixed"), { value: formatContextWindow(model.maximum) }) })]
+							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								className: "codexSubscriptionContextHint",
+								children: formatContextWindow(model.maximum)
+							})]
+						}, model.key))]
+					}) : null,
+					snapshot.modelError ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "codexSubscriptionRecover",
+						role: "alert",
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+							className: "codexSubscriptionError",
+							children: t("modelDirectoryFailed")
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
 							type: "button",
-							"aria-label": t("contextTitle"),
-							"aria-haspopup": "menu",
-							"aria-expanded": menuOpen,
-							disabled: !writable,
-							onClick: () => setMenuOpen((value) => !value),
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: selectedMode }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronDownOutline14, {})]
-						})
-					})]
-				}), snapshot.contextMode === "custom" ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-					className: "codexSubscriptionContextModels",
-					children: [modelRows.map((model) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-						className: "codexSubscriptionContextModel",
-						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-							className: "codexSubscriptionContextModelCopy",
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: model.label }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: fill(t("contextMaximum"), { value: String(model.maximum) }) })]
-						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Input, {
-							"aria-label": `${model.label} ${t("contextTokens")}`,
-							className: "codexSubscriptionContextInput",
-							type: "number",
-							inputMode: "numeric",
-							min: MIN_CUSTOM_CONTEXT_WINDOW,
-							max: model.maximum,
-							step: 1,
-							value: drafts[model.key] ?? "",
-							disabled: !writable,
-							onChange: (event) => {
-								const nextValue = event.currentTarget.value;
-								setDrafts((current) => ({
-									...current,
-									[model.key]: nextValue
-								}));
+							variant: "outline",
+							onClick: () => {
+								preference.refreshModels();
 							},
-							onBlur: () => commit(model.key),
-							onKeyDown: (event) => {
-								if (event.key === "Enter") event.currentTarget.blur();
-							}
-						})]
-					}, model.key)), fixedRows.map((model) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-						className: "codexSubscriptionContextModel",
-						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-							className: "codexSubscriptionContextModelCopy",
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: model.label }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: fill(t("contextFixed"), { value: formatContextWindow(model.maximum) }) })]
-						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-							className: "codexSubscriptionContextHint",
-							children: formatContextWindow(model.maximum)
+							children: t("modelRetry")
 						})]
-					}, model.key))]
-				}) : null]
+					}) : null
+				]
 			});
 		}
 		function PreferencesCard({ preference, t }) {
@@ -2935,18 +3235,23 @@ window.__ModuleLoader__.load({
 				]
 			});
 		}
-		function AccountFailureCard({ retry, t }) {
+		function AccountFailureCard({ accountStatus, snapshot, t }) {
+			const retrying = snapshot.retrying === true;
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "codexSubscriptionCard codexSubscriptionRecover",
 				role: "alert",
 				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 					className: "codexSubscriptionError",
-					children: t("loadFailed")
+					children: retrying ? t("accountRetrying") : accountStatusErrorText(snapshot.error, t)
 				}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
 					type: "button",
 					variant: "outline",
-					onClick: retry,
-					children: t("accountRetry")
+					disabled: retrying,
+					"aria-busy": retrying,
+					onClick: () => {
+						accountStatus.retry();
+					},
+					children: retrying ? t("accountRetrying") : t("accountRetry")
 				})]
 			});
 		}
@@ -3406,27 +3711,19 @@ window.__ModuleLoader__.load({
 				]
 			});
 		}
-		function CodexSection({ preference, rpc, t }) {
-			const [account, setAccount] = (0, react.useState)();
-			const [accountError, setAccountError] = (0, react.useState)();
+		function CodexSection({ preference, rpc, accountStatus, t }) {
+			const accountSnapshot = useAccountStatusSnapshot(accountStatus);
+			const account = accountSnapshot.account;
 			const [resetKey, setResetKey] = (0, react.useState)(0);
-			const accountRequest = (0, react.useRef)(0);
-			const loadAccount = () => {
-				const id = ++accountRequest.current;
-				setAccount(void 0);
-				setAccountError(void 0);
-				rpc.call(CHANNEL, "status", {}).then(unwrap).then((next) => {
-					if (accountRequest.current === id) setAccount(next);
-				}).catch(() => {
-					if (accountRequest.current === id) setAccountError(true);
-				});
+			const setAccount = accountStatus.acceptAccount;
+			const accountChanged = () => {
+				setResetKey((value) => value + 1);
+				preference.refreshModels();
 			};
 			(0, react.useEffect)(() => {
-				loadAccount();
-				return () => {
-					accountRequest.current += 1;
-				};
-			}, []);
+				accountStatus.load();
+				preference.refreshModels();
+			}, [accountStatus, preference]);
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
 				className: "codexSubscription",
 				children: [
@@ -3434,15 +3731,16 @@ window.__ModuleLoader__.load({
 						className: "codexSubscriptionHead",
 						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("h2", { children: t("title") })
 					}),
-					accountError === void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(AccountCard, {
+					accountSnapshot.status === "error" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(AccountFailureCard, {
+						accountStatus,
+						snapshot: accountSnapshot,
+						t
+					}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(AccountCard, {
 						rpc,
 						t,
 						account,
 						setAccount,
-						onSignedOut: () => setResetKey((value) => value + 1)
-					}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(AccountFailureCard, {
-						retry: loadAccount,
-						t
+						onSignedOut: accountChanged
 					}),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(PreferencesCard, {
 						preference,
@@ -3476,16 +3774,21 @@ window.__ModuleLoader__.load({
 			}, "codex-subscription: style");
 			const connection = ctx.get("connection");
 			const preference = createPreferenceController(ctx.settingsScope.bind({ namespace: SETTINGS_NAMESPACE }), connection.rpc);
+			const accountStatus = createAccountStatusController(connection.rpc);
 			ctx.effect(() => {
 				preference.load();
+				accountStatus.load();
 				const disposeReset = ctx.on("connection/reset", () => {
 					preference.load();
+					preference.refreshModels();
+					accountStatus.reload();
 				});
 				return () => {
 					disposeReset?.();
 					preference.dispose();
+					accountStatus.dispose();
 				};
-			}, "codex-subscription: preferences");
+			}, "codex-subscription: preferences and account status");
 			const t = ctx.locale.bind(NS);
 			ctx.slots.inject("shell.overlay", () => ctx.slots.register({
 				name: "shell.overlay",
@@ -3505,6 +3808,7 @@ window.__ModuleLoader__.load({
 				inject: () => ({
 					preference,
 					rpc: connection.rpc,
+					accountStatus,
 					t
 				})
 			}, CodexSection));

package/lib/index.js

@@ -565,6 +565,35 @@ const badRequest = (message) => ({
 		details: { issues: [] }
 	}
 });
+const accountStatusError = (message) => ({
+	ok: false,
+	error: {
+		code: "internal",
+		message,
+		details: { issues: [] }
+	}
+});
+const classifyAccountStatusError = (error) => {
+	const message = error instanceof Error ? error.message : "";
+	if (/malformed (?:OAuth|grant|account vault)|received a malformed OAuth|contains malformed OAuth/iu.test(message)) return ["credential-malformed", "Codex account credentials are malformed"];
+	if (/credential|account vault|readRecord|credential store|credentials service/iu.test(message)) return ["credential-unavailable", "Codex account credentials are unavailable"];
+	const code = typeof error?.code === "string" ? error.code.toUpperCase() : "";
+	if (error?.name === "TimeoutError" || [
+		"TIMEOUT",
+		"ETIMEDOUT",
+		"UND_ERR_CONNECT_TIMEOUT"
+	].includes(code)) return ["transport", "Codex account status service is unavailable"];
+	if ([
+		"ECONNRESET",
+		"ECONNREFUSED",
+		"ENOTFOUND",
+		"EAI_AGAIN",
+		"NETWORK",
+		"NETWORK_ERROR",
+		"TRANSPORT"
+	].includes(code) || error?.name === "NetworkError") return ["transport", "Codex account status service is unavailable"];
+	return ["unknown", "Could not read Codex account status"];
+};
 const deferred = () => {
 	let resolve;
 	let reject;
@@ -804,7 +833,13 @@ function createCodexRpcHandler(coordinator, options = {}) {
 		try {
 			signal.throwIfAborted();
 			const input = asObject(payload);
-			if (endpoint === "status") return ok(await coordinator.accountStatus({ signal }));
+			if (endpoint === "status") try {
+				return ok(await coordinator.accountStatus({ signal }));
+			} catch (error) {
+				if (signal.aborted) throw error;
+				const [, message] = classifyAccountStatusError(error);
+				return accountStatusError(message);
+			}
 			if (endpoint === "login/start") {
 				const started = await coordinator.start({
 					method: input.method,
@@ -1310,7 +1345,7 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 }
 //#endregion
 //#region src/version.js
-const PACKAGE_VERSION = "1.14.2";
+const PACKAGE_VERSION = "1.14.3";
 const USER_AGENT = `dsh-codex-subscription/${PACKAGE_VERSION}`;
 //#endregion
 //#region src/model-catalog.js
@@ -1324,6 +1359,7 @@ const LEVELS = [
 	"xhigh",
 	"max"
 ];
+const DEFAULT_REFRESH_TIMEOUT_MS = 1e4;
 const record$4 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
 const nonEmpty$2 = (value) => typeof value === "string" && value.trim().length > 0 ? value.trim() : void 0;
 const positiveInteger$1 = (value) => Number.isSafeInteger(value) && value > 0 ? value : void 0;
@@ -1384,16 +1420,32 @@ function mergeModel(baseModels, remote) {
 }
 function createOfficialModelCatalog(options = {}) {
 	const fetchCatalog = options.fetch ?? fetch;
+	const scheduleTimeout = options.setTimeout ?? setTimeout;
+	const cancelTimeout = options.clearTimeout ?? clearTimeout;
+	const timeoutMs = Number.isFinite(options.timeoutMs) && options.timeoutMs > 0 ? options.timeoutMs : DEFAULT_REFRESH_TIMEOUT_MS;
 	let models;
 	let metadata = /* @__PURE__ */ new Map();
 	let etag;
 	let revision = 0;
 	let refreshing;
-	const refresh = async ({ signal } = {}) => {
-		if (refreshing !== void 0) return refreshing;
-		refreshing = (async () => {
-			const auth = await options.getAuth({ signal });
-			const credential = await options.readCredential({ signal });
+	let generation = 0;
+	const refresh = ({ signal } = {}) => {
+		if (signal?.aborted) return Promise.reject(signal.reason ?? /* @__PURE__ */ new Error("Codex model catalog refresh aborted"));
+		if (refreshing?.generation === generation) return refreshing.promise;
+		const currentGeneration = generation;
+		const controller = new AbortController();
+		const abort = () => {
+			if (!controller.signal.aborted) controller.abort(signal?.reason ?? /* @__PURE__ */ new Error("Codex model catalog refresh aborted"));
+		};
+		signal?.addEventListener("abort", abort, { once: true });
+		const requestSignal = controller.signal;
+		let timer;
+		const timeoutError = /* @__PURE__ */ new Error("Codex model catalog refresh timed out");
+		const work = (async () => {
+			const auth = await options.getAuth({ signal: requestSignal });
+			if (currentGeneration !== generation || requestSignal.aborted) return false;
+			const credential = await options.readCredential({ signal: requestSignal });
+			if (currentGeneration !== generation || requestSignal.aborted) return false;
 			const access = auth?.auth?.apiKey;
 			const accountId = credential?.type === "oauth" ? credential.accountId : void 0;
 			if (typeof access !== "string" || access.length === 0 || typeof accountId !== "string" || accountId.length === 0) return false;
@@ -1409,24 +1461,44 @@ function createOfficialModelCatalog(options = {}) {
 				method: "GET",
 				redirect: "error",
 				headers,
-				signal
+				signal: requestSignal
 			});
+			if (currentGeneration !== generation || requestSignal.aborted) return false;
 			if (response.status === 304) return false;
 			if (!response.ok) throw new Error(`Codex model catalog failed (HTTP ${response.status})`);
 			const remote = parseOfficialModelCatalog(await response.json());
+			if (currentGeneration !== generation || requestSignal.aborted) return false;
 			if (remote.length === 0) throw new Error("Codex returned an empty model catalog");
 			const baseModels = options.baseModels();
 			const next = remote.map((model) => mergeModel(baseModels, model)).filter(Boolean);
 			if (next.length === 0) throw new Error("Codex model catalog has no compatible models");
+			if (currentGeneration !== generation || requestSignal.aborted) return false;
 			models = next;
 			metadata = new Map(remote.map((model) => [model.id, model]));
 			etag = nonEmpty$2(response.headers.get("etag")) ?? etag;
 			revision += 1;
 			return true;
-		})().finally(() => {
-			refreshing = void 0;
+		})();
+		let rejectAborted;
+		const abortPromise = new Promise((_, reject) => {
+			rejectAborted = () => reject(requestSignal.reason ?? /* @__PURE__ */ new Error("Codex model catalog refresh aborted"));
+			if (requestSignal.aborted) rejectAborted();
+			else requestSignal.addEventListener("abort", rejectAborted, { once: true });
 		});
-		return refreshing;
+		timer = scheduleTimeout(() => controller.abort(timeoutError), timeoutMs);
+		timer.unref?.();
+		const promise = Promise.race([work, abortPromise]).finally(() => {
+			cancelTimeout(timer);
+			signal?.removeEventListener("abort", abort);
+			requestSignal.removeEventListener("abort", rejectAborted);
+			if (refreshing?.promise === promise) refreshing = void 0;
+		});
+		refreshing = {
+			generation: currentGeneration,
+			promise,
+			cancel: () => controller.abort()
+		};
+		return promise;
 	};
 	return Object.freeze({
 		refresh,
@@ -1434,6 +1506,10 @@ function createOfficialModelCatalog(options = {}) {
 		metadata: (modelId) => metadata.get(modelId),
 		revision: () => revision,
 		clear() {
+			generation += 1;
+			const flight = refreshing;
+			refreshing = void 0;
+			flight?.cancel();
 			models = void 0;
 			metadata = /* @__PURE__ */ new Map();
 			etag = void 0;
@@ -3124,6 +3200,22 @@ function createSubscriptionRpcHandler({ authHandler, usageReader, resetCreditSer
 			if (signal.aborted) throw error;
 			return publicError("internal", "Could not create support diagnostics");
 		}
+		if (endpoint === "preferences/models") try {
+			signal.throwIfAborted();
+			if (typeof modelCatalog?.refresh !== "function" || typeof preferences?.status !== "function") return publicError("internal", "Could not refresh Codex model catalog");
+			await modelCatalog.refresh({ signal });
+			const value = preferences.status();
+			return {
+				ok: true,
+				value: {
+					contextModels: Array.isArray(value?.contextModels) ? value.contextModels : [],
+					verbosityModels: Array.isArray(value?.verbosityModels) ? value.verbosityModels : []
+				}
+			};
+		} catch (error) {
+			if (signal.aborted) throw error;
+			return publicError("internal", "Could not refresh Codex model catalog");
+		}
 		if (endpoint === "preferences/status" || endpoint === "preferences/update") try {
 			signal.throwIfAborted();
 			if (endpoint === "preferences/update") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-codex-subscription",
-  "version": "1.14.2",
+  "version": "1.14.3",
   "description": "Use ChatGPT and Codex subscriptions in DeepSeek Harness with OAuth, quota, safe resets, web search, images, and Fast mode",
   "type": "module",
   "main": "./lib/index.js",