dsh-codex-subscription 2.1.9 → 2.2.1

package/README.en.md

@@ -39,6 +39,7 @@ See below for detailed installation steps, terminal commands, updates, and remov
 | **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; 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, with reset times |
+| **Optional quota recovery** | Opt in to keep a turn open until a confirmed short Codex quota resets; the turn shows the wait and remains cancellable, while switching accounts retries immediately |
 | **Composer quota** | Choose a compact percentage, progress bar, Beta runway forecast, or no inline 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 |

package/README.md

@@ -40,6 +40,7 @@
 | **订阅模型直连** | 登录 ChatGPT 后直接使用 Codex，不需要 OpenAI API Key 或 Codex CLI |
 | **可恢复、可诊断** | 登录状态会自动对账；读取失败时可在原处重试，超时和旧账号响应不会覆盖当前状态；设置页可生成不含凭据和账号标识的支持报告 |
 | **额度可见** | 普通 Codex、Spark 等服务端实际返回的额度分开显示，并显示重置时间 |
+| **可选额度恢复** | 可选择让对话等待已确认的短时 Codex 额度重置；对话会显示等待原因、仍可停止，等待期间切换账号会立即重试 |
 | **输入框额度** | 可选择紧凑百分比、进度条、Beta 续航预测或关闭显示 |
 | **安全额度重置** | 每张重置卡单独显示，并通过冷静期和知情确认主动尝试重置 |
 | **订阅搜索** | 可将全部模型的搜索明确路由到 DSH 默认搜索或已登录的 Codex 订阅 |

package/lib/client.js

@@ -4878,6 +4878,8 @@ window.__ModuleLoader__.load({
 			quickQuotaBar: "进度条",
 			quickQuotaForecast: "续航预测",
 			quickQuotaBeta: "Beta",
+			autoQuotaRetry: "额度重置后自动重试",
+			autoQuotaRetryHint: "选择开启后，将等待已确认的短时额度重置；对话会显示等待原因且可停止，等待期间切换账号会立即重试。",
 			quickQuotaForecastHint: "按最近两小时的消耗估算；消耗不足或速度突变时重新校准，详情显示估计范围。仅供参考，历史保存在本机。",
 			contextTitle: "上下文窗口",
 			contextStandard: "标准",
@@ -5332,6 +5334,8 @@ window.__ModuleLoader__.load({
 			quickQuotaBar: "Progress bar",
 			quickQuotaForecast: "Runway",
 			quickQuotaBeta: "Beta",
+			autoQuotaRetry: "Retry after quota reset",
+			autoQuotaRetryHint: "Opt in to wait for confirmed short quota resets. The turn shows why it is waiting and can be stopped; switching accounts retries immediately.",
 			quickQuotaForecastHint: "Estimates recent two-hour consumption; recalibrates with insufficient data or changing pace. Details show a range. Indicative only; history stays local.",
 			contextTitle: "Context window",
 			contextStandard: "Standard",
@@ -5470,6 +5474,12 @@ window.__ModuleLoader__.load({
 .codexSubscriptionPreferenceCopy{display:flex;min-width:0;flex-direction:column;gap:2px}
 .codexSubscriptionPreferenceLabel{display:flex;align-items:center;gap:6px}
 .codexSubscriptionPreferenceHint{max-width:300px;font-size:11px;line-height:17px;color:var(--dsw-alias-label-tertiary)}
+.codexSubscriptionSwitch{position:relative;flex:none;width:36px;height:20px;padding:2px;border:0;border-radius:999px;background:var(--dsw-alias-bg-module-platform);cursor:pointer;transition:background 120ms var(--ds-ease-in-out)}
+.codexSubscriptionSwitch[aria-checked=true]{background:var(--dsw-alias-label-primary)}
+.codexSubscriptionSwitch:focus-visible{outline:2px solid var(--dsw-alias-border-l3);outline-offset:2px}
+.codexSubscriptionSwitch:disabled{cursor:not-allowed;opacity:.5}
+.codexSubscriptionSwitchKnob{display:block;width:16px;height:16px;border-radius:50%;background:var(--dsw-alias-bg-layer-1);box-shadow:0 1px 2px var(--dsw-alias-border-l3);transition:transform 120ms var(--ds-ease-in-out)}
+.codexSubscriptionSwitch[aria-checked=true] .codexSubscriptionSwitchKnob{transform:translateX(16px)}
 .codexSubscriptionQuotaModes{display:flex;align-items:center;gap:3px;padding:2px;border-radius:9px;background:var(--dsw-alias-bg-module-platform)}
 .codexSubscriptionQuotaMode{position:relative;display:flex;align-items:center;justify-content:center;min-height:26px;padding:0 9px;border-radius:7px;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:18px;cursor:pointer;white-space:nowrap}
 .codexSubscriptionQuotaMode small{margin-left:3px;font-size:9px;line-height:1;color:var(--dsw-alias-label-tertiary)}
@@ -6687,6 +6697,7 @@ window.__ModuleLoader__.load({
 				limitId: limit.id
 			}))).filter((window) => Number.isFinite(window.remainingPercent) && window.remainingPercent >= 0 && window.remainingPercent <= (mode === "custom" ? readCapabilitySettings(thresholds)[window.windowSeconds > 0 && window.windowSeconds <= 6 * 3600 ? "quotaShortThreshold" : "quotaLongThreshold"] : mode === "early" && window.windowSeconds > 0 && window.windowSeconds <= 6 * 3600 ? 50 : 20) && (!Number.isFinite(window.resetsAt) || window.resetsAt * 1e3 > now)).sort((a, b) => a.remainingPercent - b.remainingPercent)[0];
 		}
+		const AUTO_QUOTA_RETRY_FIELD = "autoQuotaRetry";
 		const QUICK_QUOTA_MODE_FIELD = "quickQuotaMode";
 		const LEGACY_QUICK_QUOTA_FIELD = "quickQuotaVisible";
 		const QUICK_QUOTA_MODE_PERCENT = "percent";
@@ -6734,6 +6745,7 @@ window.__ModuleLoader__.load({
 			"gpt-5.6": 272e3,
 			"gpt-6-astra": 272e3
 		});
+		const normalizeAutoQuotaRetry = (value) => typeof value === "boolean" ? value : false;
 		const normalizeSearchProvider = (value) => [
 			"auto",
 			"dsh",
@@ -6805,6 +6817,7 @@ window.__ModuleLoader__.load({
 				return Object.freeze({
 					status: current.status,
 					...capabilities,
+					autoQuotaRetry: normalizeAutoQuotaRetry(value?.[AUTO_QUOTA_RETRY_FIELD]),
 					connectionMode: value?.connectionMode === "websocket" ? "websocket" : "sse",
 					compactionMode: value?.compactionMode === "cloud" ? "cloud" : "dsh",
 					subagentBackend: value?.subagentBackend === "codex" ? "codex" : "dsh",
@@ -6855,6 +6868,7 @@ window.__ModuleLoader__.load({
 				fallback = {
 					status: "ready",
 					value: {
+						[AUTO_QUOTA_RETRY_FIELD]: normalizeAutoQuotaRetry(value?.[AUTO_QUOTA_RETRY_FIELD]),
 						connectionMode: value?.connectionMode === "websocket" ? "websocket" : "sse",
 						compactionMode: value?.compactionMode === "cloud" ? "cloud" : "dsh",
 						subagentBackend: value?.subagentBackend === "codex" ? "codex" : "dsh",
@@ -7276,7 +7290,7 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/version.js
-		const PACKAGE_VERSION = "2.1.9";
+		const PACKAGE_VERSION = "2.2.1";
 		//#endregion
 		//#region src/client-recovery.js
 		async function recoveryCall(rpc, endpoint, payload = {}, timeoutMs = 1e4) {
@@ -8353,6 +8367,34 @@ window.__ModuleLoader__.load({
 				})]
 			});
 		}
+		function AutoQuotaRetryPreference({ preference, t }) {
+			const snapshot = usePreferenceSnapshot(preference);
+			const writable = snapshot.status === "ready" && snapshot.writable === true;
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				className: "codexSubscriptionPreference",
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+					className: "codexSubscriptionPreferenceCopy",
+					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "codexSubscriptionPreferenceLabel",
+						children: t("autoQuotaRetry")
+					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "codexSubscriptionPreferenceHint",
+						children: t("autoQuotaRetryHint")
+					})]
+				}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+					className: "codexSubscriptionSwitch",
+					type: "button",
+					role: "switch",
+					"aria-label": t("autoQuotaRetry"),
+					"aria-checked": snapshot.autoQuotaRetry,
+					disabled: !writable,
+					onClick: () => {
+						preference.set({ [AUTO_QUOTA_RETRY_FIELD]: !snapshot.autoQuotaRetry });
+					},
+					children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { className: "codexSubscriptionSwitchKnob" })
+				})]
+			});
+		}
 		function SearchProviderPreference({ preference, t }) {
 			const snapshot = usePreferenceSnapshot(preference);
 			const writable = snapshot.status === "ready" && snapshot.writable === true;
@@ -8700,14 +8742,22 @@ window.__ModuleLoader__.load({
 							t
 						})]
 					})
-				] }) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(QuickQuotaPreference, {
-					preference,
-					t
-				}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(CapabilityPreferences, {
-					preference,
-					t,
-					section: "quota"
-				})] }), snapshot.error ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				] }) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(QuickQuotaPreference, {
+						preference,
+						t
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(CapabilityPreferences, {
+						preference,
+						t,
+						section: "quota"
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", { className: "codexSubscriptionDivider" }),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(AutoQuotaRetryPreference, {
+						preference,
+						t
+					})
+				] }), snapshot.error ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 					className: "codexSubscriptionRecover",
 					role: "alert",
 					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {

package/lib/index.js

@@ -193,6 +193,7 @@ function capabilityPatch(payload) {
 //#endregion
 //#region src/settings-contract.js
 const SETTINGS_NAMESPACE = "codex-subscription";
+const AUTO_QUOTA_RETRY_FIELD = "autoQuotaRetry";
 const QUICK_QUOTA_MODE_FIELD = "quickQuotaMode";
 const LEGACY_QUICK_QUOTA_FIELD = "quickQuotaVisible";
 const QUICK_QUOTA_MODE_PERCENT = "percent";
@@ -240,6 +241,7 @@ const CUSTOM_CONTEXT_MODEL_DEFAULTS = Object.freeze({
 	"gpt-5.6": 272e3,
 	"gpt-6-astra": 272e3
 });
+const normalizeAutoQuotaRetry = (value) => typeof value === "boolean" ? value : false;
 const normalizeOutputVerbosity = (value) => [
 	"default",
 	"low",
@@ -551,14 +553,15 @@ async function withCodexNetwork(run, options = {}) {
 	}
 	if (options.websocket) activeWebSocketScopes += 1;
 	if (activeScopes === 0) {
-		baseFetch = globalThis.fetch;
+		const fetchBeforeScope = globalThis.fetch;
+		baseFetch = fetchBeforeScope;
 		scopedFetch = async (input, init) => {
 			const scope = networkScope.getStore();
-			if (scope === void 0) return baseFetch(input, init);
+			if (scope === void 0) return fetchBeforeScope(input, init);
 			const { options: scopedOptions, allowedHosts, resolved } = scope;
 			const proxyFetch = scopedOptions.fetchThroughProxy ?? fetchThroughProxy;
 			const target = new URL(typeof input === "string" || input instanceof URL ? input : input.url);
-			if (target.protocol !== "https:" || !allowedHosts.has(target.hostname)) return baseFetch(input, init);
+			if (target.protocol !== "https:" || !allowedHosts.has(target.hostname)) return fetchBeforeScope(input, init);
 			let proxy = resolved.get(target.hostname);
 			if (proxy === void 0) {
 				proxy = resolveCodexProxy({
@@ -569,7 +572,7 @@ async function withCodexNetwork(run, options = {}) {
 			}
 			const route = await proxy;
 			scopedOptions.onRoute?.(route.source);
-			const response = await (route.url === void 0 ? baseFetch(input, init) : proxyFetch(input, init, route.url));
+			const response = await (route.url === void 0 ? fetchBeforeScope(input, init) : proxyFetch(input, init, route.url));
 			return scopedOptions.transformResponse?.(response, target) ?? response;
 		};
 		globalThis.fetch = scopedFetch;
@@ -2829,7 +2832,7 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 Object.freeze(["0.82.1", "0.85.1"]);
 //#endregion
 //#region src/version.js
-const PACKAGE_VERSION = "2.1.9";
+const PACKAGE_VERSION = "2.2.1";
 const USER_AGENT = `dsh-codex-subscription/${PACKAGE_VERSION}`;
 //#endregion
 //#region src/model-catalog.js
@@ -3972,6 +3975,7 @@ async function createSubscriptionDiagnostics({ auth, preferences, login = { phas
 			...gaps.length ? { unsupported: gaps } : {}
 		} } : {},
 		configuration: {
+			...typeof preference.autoQuotaRetry === "boolean" ? { autoQuotaRetry: preference.autoQuotaRetry } : {},
 			contextMode: preference.contextMode,
 			quickQuotaMode: preference.quickQuotaMode,
 			...typeof preference.outputVerbosity === "string" ? { outputVerbosity: preference.outputVerbosity } : {},
@@ -4209,6 +4213,187 @@ function createCodexUsageReader(options) {
 	});
 }
 //#endregion
+//#region src/quota-retry.js
+const DEFAULT_MAX_WAIT_MS = 360 * 60 * 1e3;
+const DEFAULT_RESET_MARGIN_MS = 1e4;
+const EXHAUSTED_PERCENT = 99.9;
+const CODEX_USAGE_LIMIT_MESSAGE = /^You have hit your ChatGPT usage limit(?: \([a-z0-9][a-z0-9 ._-]{0,39} plan\))?\.(?: Try again in ~\d{1,6} min\.)?$/u;
+const isCodexRateLimit = (failure) => failure?.code === "RATE_LIMIT" || failure?.code === "PI_AI_ERROR" && typeof failure.message === "string" && CODEX_USAGE_LIMIT_MESSAGE.test(failure.message);
+function cancellableDelay(delayMs, signal) {
+	if (signal?.aborted) return Promise.resolve(false);
+	return new Promise((resolve) => {
+		const timer = setTimeout(() => {
+			signal?.removeEventListener("abort", onAbort);
+			resolve(true);
+		}, delayMs);
+		function onAbort() {
+			clearTimeout(timer);
+			resolve(false);
+		}
+		signal?.addEventListener("abort", onAbort, { once: true });
+	});
+}
+function createWakeSignal() {
+	let revision = 0;
+	let reason;
+	const waiters = /* @__PURE__ */ new Set();
+	const notify = (nextReason) => {
+		revision += 1;
+		reason = nextReason;
+		for (const waiter of [...waiters]) waiter(nextReason);
+	};
+	const wait = (since, signal) => {
+		if (revision !== since) return Promise.resolve(reason);
+		if (signal?.aborted) return Promise.resolve("cancelled");
+		return new Promise((resolve) => {
+			const settle = (value) => {
+				waiters.delete(settle);
+				signal?.removeEventListener("abort", onAbort);
+				resolve(value);
+			};
+			const onAbort = () => settle("cancelled");
+			waiters.add(settle);
+			signal?.addEventListener("abort", onAbort, { once: true });
+			if (revision !== since) settle(reason);
+		});
+	};
+	return {
+		revision: () => revision,
+		notify,
+		wait
+	};
+}
+function shortResetDelay(usage, nowMs, maxWaitMs, resetMarginMs) {
+	let latestDelayMs;
+	for (const limit of usage?.rateLimits ?? []) {
+		if (limit?.id !== "codex") continue;
+		for (const window of limit?.windows ?? []) {
+			if (!Number.isFinite(window?.usedPercent) || window.usedPercent < EXHAUSTED_PERCENT) continue;
+			if (!Number.isFinite(window?.windowSeconds) || window.windowSeconds * 1e3 > maxWaitMs) return void 0;
+			if (!Number.isFinite(window?.resetsAt)) return void 0;
+			const delayMs = window.resetsAt * 1e3 - nowMs;
+			if (delayMs <= 0 || delayMs + resetMarginMs > maxWaitMs) return void 0;
+			latestDelayMs = Math.max(latestDelayMs ?? 0, delayMs);
+		}
+	}
+	return latestDelayMs;
+}
+function publishScheduledRetry({ agent, turn, step, provider, failure }, delayMs, resetAtMs) {
+	if (typeof agent?.session?.append !== "function" || !Number.isSafeInteger(turn) || !Number.isSafeInteger(step)) return void 0;
+	const retryId = `codex-quota-${randomUUID()}`;
+	const message = `Codex usage limit exhausted. Waiting for quota reset at ${new Date(resetAtMs).toISOString()}; retrying shortly afterward.`;
+	const visibleFailure = {
+		code: failure.code,
+		message,
+		...Number.isInteger(failure.status) && failure.status >= 100 && failure.status <= 599 ? { status: failure.status } : {},
+		...typeof failure.requestId === "string" && failure.requestId.length > 0 ? { requestId: failure.requestId } : {}
+	};
+	try {
+		agent.session.append("llm/retry", {
+			retryId,
+			turn,
+			step,
+			provider,
+			mode: "normal",
+			policyKey: retryId,
+			retry: 1,
+			maxRetries: 1,
+			delayMs,
+			failure: visibleFailure
+		});
+		return {
+			retryId,
+			turn,
+			step,
+			retry: 1
+		};
+	} catch {
+		return;
+	}
+}
+function publishRetryStarted(agent, scheduled) {
+	try {
+		agent.session.append("llm/retry-started", scheduled);
+		return true;
+	} catch {
+		return false;
+	}
+}
+async function waitForResetOrWake(delayMs, signal, wait, wakeSignal, revision) {
+	const controller = new AbortController();
+	const fusedSignal = signal === void 0 ? controller.signal : AbortSignal.any([signal, controller.signal]);
+	const delayed = Promise.resolve(wait(delayMs, fusedSignal)).then((completed) => completed ? "reset" : "cancelled");
+	const result = await Promise.race([delayed, wakeSignal.wait(revision, fusedSignal)]);
+	controller.abort();
+	return result;
+}
+/**
+* Recover a Codex subscription RATE_LIMIT only when the backend confirms an
+* exhausted short quota window whose reset is close enough to wait out.
+*
+* The listener owns the authoritative wait from `/wham/usage` and publishes
+* the host's standard model-retry surface event so the turn shows the reason,
+* countdown, and normal turn cancellation affordance while it is parked.
+*/
+function createCodexQuotaRetryHandler({ usageReader, provider = "openai-codex", enabled = () => true, now = Date.now, wait = cancellableDelay, maxWaitMs = DEFAULT_MAX_WAIT_MS, resetMarginMs = DEFAULT_RESET_MARGIN_MS } = {}) {
+	if (usageReader === void 0 || typeof usageReader.read !== "function") throw new TypeError("quota retry requires a usage reader");
+	if (typeof enabled !== "function" || typeof now !== "function" || typeof wait !== "function") throw new TypeError("quota retry requires enablement, clock, and wait functions");
+	if (!Number.isFinite(maxWaitMs) || maxWaitMs <= 0 || !Number.isFinite(resetMarginMs) || resetMarginMs < 0) throw new TypeError("quota retry requires a positive wait cap and non-negative reset margin");
+	const wakeSignal = createWakeSignal();
+	const clearCache = async () => {
+		try {
+			if (typeof usageReader.clearCache === "function") await usageReader.clearCache();
+			else await usageReader.clear?.();
+		} catch {}
+	};
+	const handler = async ({ agent, turn, step, provider: requestProvider, failure, signal }, next) => {
+		if (requestProvider !== provider || !isCodexRateLimit(failure) || !enabled()) return next();
+		if (signal?.aborted) return void 0;
+		let wakeRevision = wakeSignal.revision();
+		let usage;
+		try {
+			usage = await usageReader.read({
+				force: true,
+				signal
+			});
+		} catch {
+			if (signal?.aborted) return void 0;
+			return next();
+		}
+		if (signal?.aborted) return void 0;
+		if (!enabled()) return next();
+		const observedAtMs = now();
+		let resetDelayMs = shortResetDelay(usage, observedAtMs, maxWaitMs, resetMarginMs);
+		if (resetDelayMs === void 0) return next();
+		const scheduled = publishScheduledRetry({
+			agent,
+			turn,
+			step,
+			provider: requestProvider,
+			failure
+		}, resetDelayMs + resetMarginMs, observedAtMs + resetDelayMs);
+		if (scheduled === void 0) return next();
+		while (true) {
+			const reason = await waitForResetOrWake(resetDelayMs + resetMarginMs, signal, wait, wakeSignal, wakeRevision);
+			if (reason === "cancelled" || signal?.aborted) return void 0;
+			if (!enabled()) return next();
+			if (reason !== "configuration") break;
+			wakeRevision = wakeSignal.revision();
+			resetDelayMs = shortResetDelay(usage, now(), maxWaitMs, resetMarginMs);
+			if (resetDelayMs === void 0) return next();
+		}
+		await clearCache();
+		if (signal?.aborted) return void 0;
+		if (!publishRetryStarted(agent, scheduled)) return next();
+		return { kind: "retry" };
+	};
+	Object.defineProperties(handler, {
+		notifyAccountChanged: { value: () => wakeSignal.notify("account") },
+		notifyConfigurationChanged: { value: () => wakeSignal.notify("configuration") }
+	});
+	return handler;
+}
+//#endregion
 //#region src/quota-rate-interval.js
 function quotaRateInterval(samples, { quantum = 1, rounding = "unknown" } = {}) {
 	if (!(quantum > 0) || !Number.isFinite(quantum)) throw new RangeError("Invalid quantum");
@@ -4879,7 +5064,7 @@ const publicError = (code, message) => ({
 		details: { issues: [] }
 	}
 });
-function createSubscriptionRpcHandler({ authHandler, usageReader, resetCreditService, preferences, runtimeManagement, diagnosticsReader, modelCatalog, originalImages, resolveInheritedOriginal, closeConnections }) {
+function createSubscriptionRpcHandler({ authHandler, usageReader, resetCreditService, preferences, runtimeManagement, diagnosticsReader, modelCatalog, originalImages, resolveInheritedOriginal, closeConnections, onAccountChanged }) {
 	return async (endpoint, payload, signal) => {
 		if ([
 			"runtime/status",
@@ -4950,6 +5135,10 @@ function createSubscriptionRpcHandler({ authHandler, usageReader, resetCreditSer
 			signal.throwIfAborted();
 			if (endpoint === "preferences/update") {
 				const patch = capabilityPatch(payload);
+				if (Object.hasOwn(payload ?? {}, "autoQuotaRetry")) {
+					if (typeof payload["autoQuotaRetry"] !== "boolean") return publicError("internal", "Invalid automatic quota retry preference");
+					patch[AUTO_QUOTA_RETRY_FIELD] = payload[AUTO_QUOTA_RETRY_FIELD];
+				}
 				for (const [field, rule] of Object.entries(PREFERENCE_FIELDS)) {
 					if (!Object.hasOwn(payload ?? {}, field)) continue;
 					if (!rule.choices.includes(payload[field])) return publicError("internal", rule.error);
@@ -5032,10 +5221,12 @@ function createSubscriptionRpcHandler({ authHandler, usageReader, resetCreditSer
 			await usageReader.clear();
 			resetCreditService.clear();
 			modelCatalog?.clear();
+			onAccountChanged?.();
 		} else if (result.ok === true && (endpoint === "account/select" || endpoint === "account/remove" || endpoint === "login/status" && result.value?.authenticated === true)) {
 			usageReader.clearCache();
 			resetCreditService.clear();
 			modelCatalog?.clear();
+			onAccountChanged?.();
 			modelCatalog?.refresh({ signal: void 0 }).catch(() => {});
 		} else if (result.ok === true && (endpoint === "status" || result.value?.authenticated === true)) modelCatalog?.refresh({ signal: void 0 }).catch(() => {});
 		return result;
@@ -5088,6 +5279,7 @@ function createSearchProviderSwitcher(loader) {
 	});
 }
 const settingsFields = {
+	[AUTO_QUOTA_RETRY_FIELD]: z.boolean().default(false),
 	...Object.fromEntries(Object.entries(PREFERENCE_FIELDS).map(([field, rule]) => [field, rule.default === void 0 ? z.union(rule.choices) : z.union(rule.choices).default(rule.default)])),
 	imageModel: z.union(Object.keys(IMAGE_MODELS)).default(DEFAULT_IMAGE_MODEL),
 	imageQuality: z.union([
@@ -5170,6 +5362,7 @@ function apply(ctx, config = {}) {
 	});
 	const preferences = {
 		status: () => ({
+			[AUTO_QUOTA_RETRY_FIELD]: normalizeAutoQuotaRetry(settings.get()[AUTO_QUOTA_RETRY_FIELD]),
 			compactionMode: settings.get().compactionMode ?? "dsh",
 			connectionMode: settings.get().connectionMode ?? "sse",
 			subagentBackend: settings.get().subagentBackend ?? "dsh",
@@ -5380,6 +5573,30 @@ function apply(ctx, config = {}) {
 			usageReader.clearCache();
 		};
 	}, "codex-subscription: quota forecast warm-up");
+	const quotaRetryLifetime = new AbortController();
+	const activeQuotaRetries = /* @__PURE__ */ new Set();
+	const quotaRetryHandler = createCodexQuotaRetryHandler({
+		usageReader,
+		enabled: () => normalizeAutoQuotaRetry(settings.get()[AUTO_QUOTA_RETRY_FIELD])
+	});
+	const disposeQuotaRetry = ctx.on("agent/request-error", (payload, next) => {
+		if (quotaRetryLifetime.signal.aborted) return Promise.resolve(void 0);
+		const signal = payload.signal === void 0 ? quotaRetryLifetime.signal : AbortSignal.any([payload.signal, quotaRetryLifetime.signal]);
+		const tracked = quotaRetryHandler({
+			...payload,
+			signal
+		}, next).finally(() => activeQuotaRetries.delete(tracked));
+		activeQuotaRetries.add(tracked);
+		return tracked;
+	});
+	ctx.effect(() => async () => {
+		disposeQuotaRetry();
+		quotaRetryLifetime.abort(/* @__PURE__ */ new Error("codex-subscription quota retry disposed"));
+		await Promise.allSettled([...activeQuotaRetries]);
+	}, "codex-subscription: abort and drain quota recovery");
+	ctx.effect(() => settings.watch((value, previous) => {
+		if (normalizeAutoQuotaRetry(value["autoQuotaRetry"]) !== normalizeAutoQuotaRetry(previous?.["autoQuotaRetry"])) quotaRetryHandler.notifyConfigurationChanged();
+	}), "codex-subscription: update quota recovery preference");
 	const resetCreditService = createCodexResetCreditService({
 		getAuth: resolveAuth,
 		readCredential: (options) => store.read(PROVIDER, options),
@@ -5412,6 +5629,7 @@ function apply(ctx, config = {}) {
 		resetCreditService,
 		preferences,
 		runtimeManagement,
+		onAccountChanged: quotaRetryHandler.notifyAccountChanged,
 		diagnosticsReader: () => createSubscriptionDiagnostics({
 			auth,
 			preferences,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-codex-subscription",
-  "version": "2.1.9",
+  "version": "2.2.1",
   "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",