dsh-codex-subscription 1.14.3 → 2.0.0

package/lib/index.js

@@ -1,3 +1,4 @@
+import { clientRequestSchema } from "@deepseek-ai/dsh-client-connection";
 import * as dshCredentials from "@deepseek-ai/dsh-credentials";
 import { dshHomePath, resolveDshHome } from "@deepseek-ai/dsh-home-paths";
 import { LlmError, createUserMessage } from "@deepseek-ai/dsh-llm";
@@ -17,6 +18,389 @@ import { defineTool } from "@deepseek-ai/dsh-tools";
 import { constants } from "node:fs";
 import { lstat, mkdir, open, readFile, rename, rm, stat } from "node:fs/promises";
 import { dirname, join, resolve } from "node:path";
+//#region src/image-models.js
+const DEFAULT_IMAGE_MODEL = "gpt-image-2";
+const IMAGE_MODELS = Object.freeze({
+	"gpt-image-2": Object.freeze([
+		"auto",
+		"low",
+		"medium",
+		"high"
+	]),
+	"gpt-image-2.5-flare": Object.freeze([
+		"auto",
+		"low",
+		"medium",
+		"high",
+		"xhigh",
+		"max"
+	]),
+	"gpt-image-2.5-sunburst": Object.freeze([
+		"auto",
+		"low",
+		"medium",
+		"high",
+		"xhigh",
+		"max"
+	])
+});
+function resolveImageModel(model = DEFAULT_IMAGE_MODEL) {
+	if (typeof model !== "string" || !Object.hasOwn(IMAGE_MODELS, model)) throw new Error("Unknown image model");
+	return model;
+}
+function validateImageQuality(model, quality) {
+	if (!IMAGE_MODELS[resolveImageModel(model)].includes(quality)) throw new Error(`Unsupported quality for ${model}`);
+}
+//#endregion
+//#region src/image-features.js
+const IMAGE_FEATURE_DEFAULTS = Object.freeze({
+	imageGeneration: true,
+	imageShortcut: true,
+	imageEditing: true,
+	imageViewer: true,
+	imageAnnotations: true,
+	imageSketch: true
+});
+function readImageFeatures(value = {}) {
+	return Object.fromEntries(Object.entries(IMAGE_FEATURE_DEFAULTS).map(([key, fallback]) => [key, typeof value?.[key] === "boolean" ? value[key] : fallback]));
+}
+function readImageDefaults(value = {}) {
+	const imageModel = Object.hasOwn(IMAGE_MODELS, value?.imageModel) ? value.imageModel : DEFAULT_IMAGE_MODEL;
+	return {
+		imageModel,
+		imageQuality: IMAGE_MODELS[imageModel].includes(value?.imageQuality) ? value.imageQuality : "auto"
+	};
+}
+function imageFeaturePatch(value = {}) {
+	const patch = {};
+	if (Object.hasOwn(value, "imageModel")) patch.imageModel = resolveImageModel(value.imageModel);
+	if (Object.hasOwn(value, "imageQuality")) {
+		if (![
+			"auto",
+			"low",
+			"medium",
+			"high",
+			"xhigh",
+			"max"
+		].includes(value.imageQuality)) throw new Error("Invalid image quality");
+		patch.imageQuality = value.imageQuality;
+	}
+	for (const key of Object.keys(IMAGE_FEATURE_DEFAULTS)) {
+		if (!Object.hasOwn(value, key)) continue;
+		if (typeof value[key] !== "boolean") throw new Error("Invalid image feature preference");
+		patch[key] = value[key];
+	}
+	return patch;
+}
+function assertImageOperation(features, editing) {
+	const current = readImageFeatures(features);
+	if (!(editing ? current.imageEditing : current.imageGeneration)) throw new Error(editing ? "Image editing is disabled in subscription settings" : "Image generation is disabled in subscription settings");
+}
+//#endregion
+//#region src/capability-settings.js
+const CUSTOM_CONTEXT_OVERRIDES_FIELD = "customContextModels";
+const SEARCH_MODE_FIELD = "searchMode";
+const SEARCH_DOMAINS_FIELD = "searchDomains";
+const QUOTA_ALERTS_FIELD = "quotaAlerts";
+const SEARCH_MODES = [
+	"live",
+	"cached",
+	"disabled"
+];
+const QUOTA_ALERT_MODES = [
+	"off",
+	"important",
+	"early",
+	"custom"
+];
+const QUOTA_THRESHOLD_FIELDS = ["quotaShortThreshold", "quotaLongThreshold"];
+const validQuotaThreshold = (value) => Number.isInteger(value) && value >= 1 && value <= 100;
+const MAX_CONTEXT_BUDGET = 16e6;
+const validModelKey = (key) => typeof key === "string" && /^[a-zA-Z0-9][a-zA-Z0-9._:/-]{0,95}$/u.test(key) && ![
+	"constructor",
+	"prototype",
+	"__proto__"
+].includes(key);
+function normalizeContextOverrides(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return {};
+	return Object.fromEntries(Object.entries(value).filter(([key, size]) => validModelKey(key) && Number.isSafeInteger(size) && size > 0 && size <= 16e6).slice(0, 64));
+}
+function normalizeSearchDomains(value) {
+	if (!Array.isArray(value) || value.length > 20) throw new Error("Invalid search domains");
+	return [...new Set(value.map((item) => {
+		if (typeof item !== "string" || item.length > 253 || !/^[\p{L}\p{N}.-]+$/u.test(item)) throw new Error("Invalid search domain");
+		const hostname = new URL(`https://${item}`).hostname.toLowerCase();
+		if (!hostname.includes(".") || hostname.split(".").some((part) => !/^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/u.test(part))) throw new Error("Invalid search domain");
+		return hostname;
+	}))];
+}
+function readCapabilitySettings(value = {}) {
+	return {
+		...Object.fromEntries(QUOTA_THRESHOLD_FIELDS.map((key) => [key, validQuotaThreshold(value[key]) ? value[key] : 20])),
+		...readImageFeatures(value),
+		...readImageDefaults(value),
+		[CUSTOM_CONTEXT_OVERRIDES_FIELD]: normalizeContextOverrides(value[CUSTOM_CONTEXT_OVERRIDES_FIELD]),
+		[SEARCH_MODE_FIELD]: SEARCH_MODES.includes(value["searchMode"]) ? value[SEARCH_MODE_FIELD] : "live",
+		[SEARCH_DOMAINS_FIELD]: normalizeSearchDomains(value["searchDomains"] ?? []),
+		[QUOTA_ALERTS_FIELD]: QUOTA_ALERT_MODES.includes(value["quotaAlerts"]) ? value[QUOTA_ALERTS_FIELD] : "important"
+	};
+}
+function capabilityPatch(payload) {
+	const patch = imageFeaturePatch(payload ?? {});
+	for (const field of QUOTA_THRESHOLD_FIELDS) {
+		if (!Object.hasOwn(payload ?? {}, field)) continue;
+		if (!validQuotaThreshold(payload[field])) throw new Error("Threshold must be an integer from 1 to 100");
+		patch[field] = payload[field];
+	}
+	for (const [key, choices] of [[SEARCH_MODE_FIELD, SEARCH_MODES], [QUOTA_ALERTS_FIELD, QUOTA_ALERT_MODES]]) {
+		if (!Object.hasOwn(payload ?? {}, key)) continue;
+		if (!choices.includes(payload[key])) throw new Error("Invalid capability preference");
+		patch[key] = payload[key];
+	}
+	if (Object.hasOwn(payload ?? {}, "searchDomains")) patch[SEARCH_DOMAINS_FIELD] = normalizeSearchDomains(payload[SEARCH_DOMAINS_FIELD]);
+	if (Object.hasOwn(payload ?? {}, "customContextModels")) {
+		const original = payload[CUSTOM_CONTEXT_OVERRIDES_FIELD];
+		const normalized = normalizeContextOverrides(original);
+		if (JSON.stringify(normalized) !== JSON.stringify(original)) throw new Error("Invalid model context preferences");
+		patch[CUSTOM_CONTEXT_OVERRIDES_FIELD] = normalized;
+	}
+	return patch;
+}
+//#endregion
+//#region src/settings-contract.js
+const SETTINGS_NAMESPACE = "codex-subscription";
+const QUICK_QUOTA_MODE_FIELD = "quickQuotaMode";
+const LEGACY_QUICK_QUOTA_FIELD = "quickQuotaVisible";
+const QUICK_QUOTA_MODE_PERCENT = "percent";
+const QUICK_QUOTA_MODE_FORECAST = "forecast";
+const SEARCH_PROVIDER_FIELD = "searchProvider";
+const SEARCH_PROVIDER_AUTO = "auto";
+const SEARCH_PROVIDER_CODEX = "codex";
+const DEFAULT_SEARCH_PROVIDER = SEARCH_PROVIDER_AUTO;
+const SPEED_MODE_FIELD = "speedMode";
+const SPEED_MODE_STANDARD = "standard";
+const SPEED_MODE_FAST = "fast";
+const DEFAULT_SPEED_MODE = SPEED_MODE_STANDARD;
+const OUTPUT_VERBOSITY_FIELD = "outputVerbosity";
+const OUTPUT_VERBOSITY_DEFAULT = "default";
+const OUTPUT_VERBOSITY_MEDIUM = "medium";
+const OUTPUT_VERBOSITY_HIGH = "high";
+const DEFAULT_OUTPUT_VERBOSITY = OUTPUT_VERBOSITY_DEFAULT;
+const CONTEXT_MODE_FIELD = "contextMode";
+const CONTEXT_MODE_STANDARD = "standard";
+const CONTEXT_MODE_EXTENDED = "extended";
+const CONTEXT_MODE_CUSTOM = "custom";
+const DEFAULT_CONTEXT_MODE = CONTEXT_MODE_STANDARD;
+const CUSTOM_CONTEXT_WINDOW_FIELD = "customContextWindow";
+const DEFAULT_CUSTOM_CONTEXT_WINDOW = 272e3;
+const MIN_CUSTOM_CONTEXT_WINDOW = 128e3;
+const MAX_CUSTOM_CONTEXT_WINDOW = 1e6;
+const CUSTOM_CONTEXT_MODEL_FIELDS = Object.freeze({
+	"gpt-5.4": "customContextGpt54",
+	"gpt-5.4-mini": "customContextGpt54Mini",
+	"gpt-5.5": "customContextGpt55",
+	"gpt-5.6": "customContextGpt56",
+	"gpt-6-astra": "customContextGpt6Astra"
+});
+const CUSTOM_CONTEXT_MODEL_CAPS = Object.freeze({
+	"gpt-5.4": 1e6,
+	"gpt-5.4-mini": 4e5,
+	"gpt-5.5": 1e6,
+	"gpt-5.6": 1e6,
+	"gpt-6-astra": 872e3
+});
+const CUSTOM_CONTEXT_MODEL_DEFAULTS = Object.freeze({
+	"gpt-5.4": 272e3,
+	"gpt-5.4-mini": 272e3,
+	"gpt-5.5": 272e3,
+	"gpt-5.6": 272e3,
+	"gpt-6-astra": 272e3
+});
+const normalizeOutputVerbosity = (value) => [
+	"default",
+	"low",
+	"medium",
+	"high"
+].includes(value) ? value : DEFAULT_OUTPUT_VERBOSITY;
+const normalizeContextMode = (value) => [
+	"standard",
+	"extended",
+	"custom"
+].includes(value) ? value : DEFAULT_CONTEXT_MODE;
+const normalizeCustomContextWindow = (value, maximum = MAX_CUSTOM_CONTEXT_WINDOW) => {
+	if (!Number.isInteger(value)) return DEFAULT_CUSTOM_CONTEXT_WINDOW;
+	return Math.min(Math.max(value, MIN_CUSTOM_CONTEXT_WINDOW), maximum);
+};
+const customContextModelKey = (modelId) => modelId?.startsWith("gpt-5.6-") ? "gpt-5.6" : modelId;
+function modelContextMaximum(model) {
+	const explicit = Number.isSafeInteger(model?.maxContextWindow) && model.maxContextWindow > 0 ? model.maxContextWindow : void 0;
+	const fallback = CUSTOM_CONTEXT_MODEL_CAPS[customContextModelKey(model?.id)] ?? model?.contextWindow;
+	return Math.min(MAX_CONTEXT_BUDGET, explicit ?? fallback ?? 272e3);
+}
+function clampModelContext(value, maximum, fallback = DEFAULT_CUSTOM_CONTEXT_WINDOW) {
+	return Math.max(Math.min(MIN_CUSTOM_CONTEXT_WINDOW, maximum), Math.min(Number.isSafeInteger(value) ? value : fallback, maximum));
+}
+function contextModelGroups(models) {
+	const groups = /* @__PURE__ */ new Map();
+	for (const model of models ?? []) {
+		if (model?.id === "gpt-5.3-codex-spark") {
+			groups.set(model.id, {
+				key: model.id,
+				label: model.name ?? model.id,
+				maximum: 128e3,
+				fixed: true
+			});
+			continue;
+		}
+		const key = customContextModelKey(model?.id);
+		if (!validModelKey(key)) continue;
+		const maximum = modelContextMaximum(model);
+		if (key !== "gpt-5.6") {
+			groups.set(key, {
+				key,
+				label: model.name ?? model.id,
+				maximum,
+				...Object.hasOwn(CUSTOM_CONTEXT_MODEL_FIELDS, key) ? {} : { default: clampModelContext(model.contextWindow, maximum) }
+			});
+			continue;
+		}
+		const variant = String(model.name ?? model.id).replace(/^GPT-5\.6[ -]/iu, "");
+		const current = groups.get(key);
+		groups.set(key, {
+			key,
+			label: `GPT-5.6 ${current === void 0 ? variant : `${current.label.replace(/^GPT-5\.6 /u, "")} / ${variant}`}`,
+			maximum: Math.min(current?.maximum ?? maximum, maximum)
+		});
+	}
+	return [...groups.values()];
+}
+const normalizeQuickQuotaMode = (value, legacyVisible = false) => [
+	"off",
+	"percent",
+	"bar",
+	"forecast"
+].includes(value) ? value : legacyVisible === true ? QUICK_QUOTA_MODE_PERCENT : "off";
+const supportsCodexFastMode = (modelId) => typeof modelId === "string" && (/^gpt-5\.(?:5|6)(?:$|-)/u.test(modelId) || modelId === "gpt-5.4" || modelId === "gpt-6-astra");
+//#endregion
+//#region src/preference-fields.js
+const PREFERENCE_FIELDS = Object.freeze({
+	[QUICK_QUOTA_MODE_FIELD]: {
+		choices: [
+			"off",
+			QUICK_QUOTA_MODE_PERCENT,
+			"bar",
+			QUICK_QUOTA_MODE_FORECAST
+		],
+		error: "Invalid quick quota preference"
+	},
+	[SEARCH_PROVIDER_FIELD]: {
+		choices: [
+			SEARCH_PROVIDER_AUTO,
+			"dsh",
+			SEARCH_PROVIDER_CODEX
+		],
+		default: DEFAULT_SEARCH_PROVIDER,
+		error: "Invalid search provider preference"
+	},
+	[SPEED_MODE_FIELD]: {
+		choices: [SPEED_MODE_STANDARD, SPEED_MODE_FAST],
+		default: DEFAULT_SPEED_MODE,
+		error: "Invalid speed mode preference"
+	},
+	[OUTPUT_VERBOSITY_FIELD]: {
+		choices: [
+			OUTPUT_VERBOSITY_DEFAULT,
+			"low",
+			OUTPUT_VERBOSITY_MEDIUM,
+			OUTPUT_VERBOSITY_HIGH
+		],
+		default: DEFAULT_OUTPUT_VERBOSITY,
+		error: "Invalid output verbosity preference"
+	},
+	[CONTEXT_MODE_FIELD]: {
+		choices: [
+			CONTEXT_MODE_STANDARD,
+			CONTEXT_MODE_EXTENDED,
+			CONTEXT_MODE_CUSTOM
+		],
+		default: DEFAULT_CONTEXT_MODE,
+		error: "Invalid context mode preference"
+	}
+});
+//#endregion
+//#region src/rpc-contract.js
+const RPC_ENDPOINTS = Object.freeze([
+	"status",
+	"login/start",
+	"login/status",
+	"login/submit",
+	"login/cancel",
+	"logout",
+	"account/select",
+	"account/remove",
+	"usage",
+	"diagnostics",
+	"preferences/status",
+	"preferences/models",
+	"preferences/update",
+	"reset-credit/inspect",
+	"reset-credit/prepare",
+	"reset-credit/consume",
+	"image/original/chunk"
+]);
+//#endregion
+//#region src/subscription-transport.js
+/** Exact routes stay inside DSH's authenticated /api bridge and body limit. */
+function registerSubscriptionTransport(connection, handler) {
+	const disposers = [];
+	try {
+		for (const endpoint of RPC_ENDPOINTS) {
+			const method = `codex-subscription/${endpoint}`;
+			disposers.push(connection.fetch.register({
+				path: `/api/${method}`,
+				methods: ["POST"],
+				requestBody: "buffered",
+				async fetch(request) {
+					if (request.headers.get("content-type")?.split(";", 1)[0]?.trim().toLowerCase() !== "application/json") return new Response("content type must be application/json", { status: 415 });
+					let body;
+					try {
+						body = await request.json();
+					} catch {
+						return new Response("invalid JSON", { status: 400 });
+					}
+					const envelope = clientRequestSchema.safeParse(body);
+					if (!envelope.success || envelope.data.method !== method) return new Response("invalid RPC envelope", { status: 400 });
+					let result;
+					try {
+						request.signal.throwIfAborted();
+						result = await handler(endpoint, envelope.data.payload, request.signal);
+					} catch {
+						result = {
+							ok: false,
+							error: {
+								code: "internal",
+								message: "Subscription request failed",
+								details: { issues: [] }
+							}
+						};
+					}
+					return Response.json({
+						type: "server-response",
+						rpcId: envelope.data.rpcId,
+						result
+					});
+				}
+			}));
+		}
+	} catch (error) {
+		for (const dispose of disposers.reverse()) dispose();
+		throw error;
+	}
+	return () => {
+		for (const dispose of disposers.reverse()) dispose();
+	};
+}
+//#endregion
 //#region src/account-vault.js
 const VERSION = 1;
 const DEFAULT_LABEL = "Account 1";
@@ -1126,111 +1510,6 @@ function createCodexNetworkTransport(options = {}) {
 	});
 }
 //#endregion
-//#region src/settings-contract.js
-const SETTINGS_NAMESPACE = "codex-subscription";
-const QUICK_QUOTA_MODE_FIELD = "quickQuotaMode";
-const LEGACY_QUICK_QUOTA_FIELD = "quickQuotaVisible";
-const QUICK_QUOTA_MODE_PERCENT = "percent";
-const QUICK_QUOTA_MODE_FORECAST = "forecast";
-const SEARCH_PROVIDER_FIELD = "searchProvider";
-const SEARCH_PROVIDER_AUTO = "auto";
-const SEARCH_PROVIDER_CODEX = "codex";
-const DEFAULT_SEARCH_PROVIDER = SEARCH_PROVIDER_AUTO;
-const SPEED_MODE_FIELD = "speedMode";
-const SPEED_MODE_STANDARD = "standard";
-const SPEED_MODE_FAST = "fast";
-const DEFAULT_SPEED_MODE = SPEED_MODE_STANDARD;
-const OUTPUT_VERBOSITY_FIELD = "outputVerbosity";
-const OUTPUT_VERBOSITY_DEFAULT = "default";
-const OUTPUT_VERBOSITY_MEDIUM = "medium";
-const OUTPUT_VERBOSITY_HIGH = "high";
-const DEFAULT_OUTPUT_VERBOSITY = OUTPUT_VERBOSITY_DEFAULT;
-const CONTEXT_MODE_FIELD = "contextMode";
-const CONTEXT_MODE_STANDARD = "standard";
-const CONTEXT_MODE_EXTENDED = "extended";
-const CONTEXT_MODE_CUSTOM = "custom";
-const DEFAULT_CONTEXT_MODE = CONTEXT_MODE_STANDARD;
-const CUSTOM_CONTEXT_WINDOW_FIELD = "customContextWindow";
-const DEFAULT_CUSTOM_CONTEXT_WINDOW = 272e3;
-const MIN_CUSTOM_CONTEXT_WINDOW = 128e3;
-const MAX_CUSTOM_CONTEXT_WINDOW = 1e6;
-const CUSTOM_CONTEXT_MODEL_FIELDS = Object.freeze({
-	"gpt-5.4": "customContextGpt54",
-	"gpt-5.4-mini": "customContextGpt54Mini",
-	"gpt-5.5": "customContextGpt55",
-	"gpt-5.6": "customContextGpt56",
-	"gpt-6-astra": "customContextGpt6Astra"
-});
-const CUSTOM_CONTEXT_MODEL_CAPS = Object.freeze({
-	"gpt-5.4": 1e6,
-	"gpt-5.4-mini": 4e5,
-	"gpt-5.5": 1e6,
-	"gpt-5.6": 1e6,
-	"gpt-6-astra": 872e3
-});
-const CUSTOM_CONTEXT_MODEL_DEFAULTS = Object.freeze({
-	"gpt-5.4": 272e3,
-	"gpt-5.4-mini": 272e3,
-	"gpt-5.5": 272e3,
-	"gpt-5.6": 272e3,
-	"gpt-6-astra": 272e3
-});
-const normalizeOutputVerbosity = (value) => [
-	"default",
-	"low",
-	"medium",
-	"high"
-].includes(value) ? value : DEFAULT_OUTPUT_VERBOSITY;
-const normalizeContextMode = (value) => [
-	"standard",
-	"extended",
-	"custom"
-].includes(value) ? value : DEFAULT_CONTEXT_MODE;
-const normalizeCustomContextWindow = (value, maximum = MAX_CUSTOM_CONTEXT_WINDOW) => {
-	if (!Number.isInteger(value)) return DEFAULT_CUSTOM_CONTEXT_WINDOW;
-	return Math.min(Math.max(value, MIN_CUSTOM_CONTEXT_WINDOW), maximum);
-};
-const customContextModelKey = (modelId) => modelId?.startsWith("gpt-5.6-") ? "gpt-5.6" : modelId;
-function contextModelGroups(models) {
-	const groups = /* @__PURE__ */ new Map();
-	for (const model of models ?? []) {
-		if (model?.id === "gpt-5.3-codex-spark") {
-			groups.set(model.id, {
-				key: model.id,
-				label: model.name ?? model.id,
-				maximum: 128e3,
-				fixed: true
-			});
-			continue;
-		}
-		const key = customContextModelKey(model?.id);
-		if (!Object.hasOwn(CUSTOM_CONTEXT_MODEL_FIELDS, key)) continue;
-		if (key !== "gpt-5.6") {
-			groups.set(key, {
-				key,
-				label: model.name ?? model.id,
-				maximum: CUSTOM_CONTEXT_MODEL_CAPS[key]
-			});
-			continue;
-		}
-		const variant = String(model.name ?? model.id).replace(/^GPT-5\.6[ -]/iu, "");
-		const current = groups.get(key);
-		groups.set(key, {
-			key,
-			label: `GPT-5.6 ${current === void 0 ? variant : `${current.label.replace(/^GPT-5\.6 /u, "")} / ${variant}`}`,
-			maximum: CUSTOM_CONTEXT_MODEL_CAPS[key]
-		});
-	}
-	return [...groups.values()];
-}
-const normalizeQuickQuotaMode = (value, legacyVisible = false) => [
-	"off",
-	"percent",
-	"bar",
-	"forecast"
-].includes(value) ? value : legacyVisible === true ? QUICK_QUOTA_MODE_PERCENT : "off";
-const supportsCodexFastMode = (modelId) => typeof modelId === "string" && (/^gpt-5\.(?:5|6)(?:$|-)/u.test(modelId) || modelId === "gpt-5.4");
-//#endregion
 //#region src/pi-ai-runtime.js
 const FAST_SERVICE_TIER = "priority";
 /**
@@ -1245,15 +1524,6 @@ const FAST_SERVICE_TIER = "priority";
 * persistence, headers, transport, and model behavior remain owned by the
 * original provider.
 */
-const EXTENDED_CONTEXT_WINDOWS = Object.freeze({
-	"gpt-5.4": 1e6,
-	"gpt-5.4-mini": 4e5,
-	"gpt-5.5": 1e6,
-	"gpt-5.6-luna": 1e6,
-	"gpt-5.6-sol": 1e6,
-	"gpt-5.6-terra": 1e6,
-	"gpt-6-astra": CUSTOM_CONTEXT_MODEL_CAPS["gpt-6-astra"]
-});
 function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, resolveOutputVerbosity = () => OUTPUT_VERBOSITY_DEFAULT, resolveContextMode = () => void 0, resolveCustomContextWindow = () => void 0, catalog, runNetwork = (_area, operation) => operation() } = {}) {
 	const provider = createOpenAICodexProvider();
 	const requestToken = Object.freeze({
@@ -1301,17 +1571,17 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 		};
 	};
 	const getModels = () => (catalog?.getModels(provider.getModels()) ?? provider.getModels()).map((model) => {
-		const maximum = EXTENDED_CONTEXT_WINDOWS[model.id];
+		const maximum = modelContextMaximum(model);
 		const mode = resolveContextMode();
-		if (maximum === void 0 || !["extended", "custom"].includes(mode)) return model;
+		if (model.id === "gpt-5.3-codex-spark" || !["extended", "custom"].includes(mode)) return model;
 		if (mode === "extended") {
-			const contextWindow = model.id === "gpt-6-astra" ? maximum : Math.max(model.contextWindow, maximum);
+			const contextWindow = maximum;
 			return {
 				...model,
 				contextWindow
 			};
 		}
-		const requested = normalizeCustomContextWindow(resolveCustomContextWindow(customContextModelKey(model.id)), maximum);
+		const requested = clampModelContext(resolveCustomContextWindow(customContextModelKey(model.id)), maximum, model.contextWindow);
 		return {
 			...model,
 			contextWindow: requested
@@ -1345,7 +1615,7 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 }
 //#endregion
 //#region src/version.js
-const PACKAGE_VERSION = "1.14.3";
+const PACKAGE_VERSION = "2.0.0";
 const USER_AGENT = `dsh-codex-subscription/${PACKAGE_VERSION}`;
 //#endregion
 //#region src/model-catalog.js
@@ -1383,6 +1653,7 @@ function visibleModel(value) {
 		priority: Number.isFinite(value.priority) ? value.priority : 0,
 		input: input.length > 0 ? input : ["text"],
 		contextWindow: positiveInteger$1(value.context_window) ?? positiveInteger$1(value.max_context_window),
+		...positiveInteger$1(value.max_context_window) === void 0 ? {} : { maxContextWindow: value.max_context_window },
 		reasoning: supported.length > 0,
 		thinkingLevelMap: reasoningMap(supported),
 		supportVerbosity: value.support_verbosity === true,
@@ -1410,6 +1681,7 @@ function mergeModel(baseModels, remote) {
 		reasoning: remote.reasoning,
 		thinkingLevelMap: remote.thinkingLevelMap,
 		...remote.contextWindow === void 0 ? {} : { contextWindow: remote.contextWindow },
+		...remote.maxContextWindow === void 0 ? {} : { maxContextWindow: remote.maxContextWindow },
 		...base.id === remote.id ? {} : { cost: {
 			input: 0,
 			output: 0,
@@ -1429,10 +1701,13 @@ function createOfficialModelCatalog(options = {}) {
 	let revision = 0;
 	let refreshing;
 	let generation = 0;
+	let refreshStatus = "idle";
 	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;
+		refreshStatus = "refreshing";
+		let outcome = "idle";
 		const controller = new AbortController();
 		const abort = () => {
 			if (!controller.signal.aborted) controller.abort(signal?.reason ?? /* @__PURE__ */ new Error("Codex model catalog refresh aborted"));
@@ -1464,7 +1739,10 @@ function createOfficialModelCatalog(options = {}) {
 				signal: requestSignal
 			});
 			if (currentGeneration !== generation || requestSignal.aborted) return false;
-			if (response.status === 304) return false;
+			if (response.status === 304) {
+				outcome = "ok";
+				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;
@@ -1477,6 +1755,7 @@ function createOfficialModelCatalog(options = {}) {
 			metadata = new Map(remote.map((model) => [model.id, model]));
 			etag = nonEmpty$2(response.headers.get("etag")) ?? etag;
 			revision += 1;
+			outcome = "ok";
 			return true;
 		})();
 		let rejectAborted;
@@ -1487,11 +1766,17 @@ function createOfficialModelCatalog(options = {}) {
 		});
 		timer = scheduleTimeout(() => controller.abort(timeoutError), timeoutMs);
 		timer.unref?.();
-		const promise = Promise.race([work, abortPromise]).finally(() => {
+		const promise = Promise.race([work, abortPromise]).catch((error) => {
+			outcome = "failed";
+			throw error;
+		}).finally(() => {
 			cancelTimeout(timer);
 			signal?.removeEventListener("abort", abort);
 			requestSignal.removeEventListener("abort", rejectAborted);
-			if (refreshing?.promise === promise) refreshing = void 0;
+			if (refreshing?.promise === promise) {
+				refreshing = void 0;
+				refreshStatus = outcome;
+			}
 		});
 		refreshing = {
 			generation: currentGeneration,
@@ -1505,6 +1790,10 @@ function createOfficialModelCatalog(options = {}) {
 		getModels: (fallback) => models ?? fallback,
 		metadata: (modelId) => metadata.get(modelId),
 		revision: () => revision,
+		status: () => ({
+			source: models === void 0 ? "fallback" : "online",
+			refresh: refreshStatus
+		}),
 		clear() {
 			generation += 1;
 			const flight = refreshing;
@@ -1513,6 +1802,7 @@ function createOfficialModelCatalog(options = {}) {
 			models = void 0;
 			metadata = /* @__PURE__ */ new Map();
 			etag = void 0;
+			refreshStatus = "idle";
 			revision += 1;
 		}
 	});
@@ -1580,6 +1870,9 @@ function createCodexSearchProvider(options) {
 		id: CODEX_SEARCH_PROVIDER_ID,
 		available: () => true,
 		async search(request, signal) {
+			signal?.throwIfAborted();
+			const preferences = readCapabilitySettings(options.resolvePreferences?.());
+			if (preferences.searchMode === "disabled") throw new WebError("Codex search is disabled in subscription settings", "WEB_PROVIDER_UNAVAILABLE");
 			const auth = await options.getAuth({ signal });
 			const credential = await options.readCredential({ signal });
 			const access = auth?.auth?.apiKey;
@@ -1610,7 +1903,7 @@ function createCodexSearchProvider(options) {
 						},
 						settings: {
 							allowed_callers: ["direct"],
-							external_web_access: true
+							external_web_access: preferences.searchMode === "live"
 						},
 						max_output_tokens: MAX_OUTPUT_TOKENS
 					}),
@@ -1628,7 +1921,12 @@ function createCodexSearchProvider(options) {
 				throw new WebError("Codex returned an unreadable search response", "WEB_PROVIDER_ERROR", { cause: error });
 			}
 			try {
-				return parseSearchResponse(value);
+				const result = parseSearchResponse(value);
+				if (preferences.searchDomains.length > 0) result.sources = result.sources.filter((source) => {
+					const hostname = new URL(source.url).hostname.toLowerCase();
+					return preferences.searchDomains.some((domain) => hostname === domain || hostname.endsWith(`.${domain}`));
+				});
+				return result;
 			} catch (error) {
 				throw new WebError("Codex returned a malformed search response", "WEB_PROVIDER_ERROR", { cause: error });
 			}
@@ -1696,15 +1994,8 @@ function inheritedOriginalImageRef(session, assetId) {
 const CODEX_IMAGE_TOOL_NAME = "codex_image_generate";
 const CODEX_IMAGE_GENERATION_URL = "https://chatgpt.com/backend-api/codex/images/generations";
 const CODEX_IMAGE_EDIT_URL = "https://chatgpt.com/backend-api/codex/images/edits";
-const IMAGE_MODEL = "gpt-image-2";
 const MAX_REFERENCE_IMAGES = 5;
 const RESPONSE_ENVELOPE_BYTES = 1024 * 1024;
-const IMAGE_QUALITIES = /* @__PURE__ */ new Set([
-	"auto",
-	"low",
-	"medium",
-	"high"
-]);
 const IMAGE_BACKGROUNDS = /* @__PURE__ */ new Set([
 	"auto",
 	"transparent",
@@ -1730,7 +2021,7 @@ function normalizeImageOptions(args) {
 	const quality = nonEmpty(args?.quality) ?? "auto";
 	const background = nonEmpty(args?.background) ?? "auto";
 	const size = nonEmpty(args?.size) ?? "auto";
-	if (!IMAGE_QUALITIES.has(quality)) throw new Error("quality must be auto, low, medium, or high");
+	validateImageQuality(resolveImageModel(args?.model), quality);
 	if (!IMAGE_BACKGROUNDS.has(background)) throw new Error("background must be auto, transparent, or opaque");
 	if (size !== "auto") {
 		const match = /^(\d+)x(\d+)$/u.exec(size);
@@ -1956,6 +2247,9 @@ function imageOutputSchema() {
 				}
 			},
 			background: { type: "string" },
+			requestedModel: { type: "string" },
+			reportedModel: { type: "string" },
+			requestedSize: { type: "string" },
 			localPath: {
 				type: "string",
 				required: true,
@@ -1974,7 +2268,8 @@ function responseMetadata(value) {
 		encoded,
 		background: nonEmpty(value.background),
 		quality: nonEmpty(value.quality),
-		size: nonEmpty(value.size)
+		size: nonEmpty(value.size),
+		reportedModel: nonEmpty(value.model)
 	};
 }
 /** Create the DSH-native image-generation tool backed only by the ChatGPT subscription. */
@@ -1983,8 +2278,13 @@ function createCodexImageTool(options) {
 	const attachments = options.attachments;
 	return defineTool({
 		name: CODEX_IMAGE_TOOL_NAME,
-		description: "Create a new image or explicitly edit selected prior images using the signed-in Codex subscription. Omit referenceImages only for a completely new image. For an edit, copy each complete image reference from the session image block or read_image result, including attachmentId in the exact form sha256:<64 lowercase hex>; never use a workspace path, absolute path, or filename, and do not omit the references to turn an edit into text-to-image generation. A bare 64-character hex digest is accepted and normalized to sha256:<64 lowercase hex>. If a reference is unavailable, call read_image and retry with its returned reference. Include only the exact prior image references the user asked to edit; never assume every image in the conversation is a reference. For annotation-guided edits, include both the named clean source and its numbered location reference, and preserve the numbered coordinates and requested changes in the prompt. The location-reference markers are guidance only and must not appear in the result. If those references cannot be identified, do not substitute unrelated images or silently ignore the annotations.",
+		description: "Generate or edit images only when the user asks for image output, not when merely discussing images. Uses the signed-in Codex subscription. For a new image, omit referenceImages. For edits, copy complete references only for the images the user selected; obtain missing references using read_image. Never substitute paths, unrelated images, or text-only generation for an edit. For numbered annotations, include the clean source and location-reference image, preserve the requested changes and coordinates in the prompt, and remove guidance markers from the result. If the intended references cannot be identified, ask rather than guessing.",
 		parameters: {
+			model: {
+				type: "string",
+				enum: Object.keys(IMAGE_MODELS),
+				description: "Optional image engine, independent of the conversation model. When omitted, uses the user image setting (initially gpt-image-2). The 2.5 identifiers are experimental subscription candidates; override only when explicitly requested. Never silently retry with another model."
+			},
 			prompt: {
 				type: "string",
 				required: true,
@@ -2000,7 +2300,9 @@ function createCodexImageTool(options) {
 					"auto",
 					"low",
 					"medium",
-					"high"
+					"high",
+					"xhigh",
+					"max"
 				],
 				description: "Optional rendering quality. Use auto unless the user requests draft speed or final quality."
 			},
@@ -2066,12 +2368,22 @@ function createCodexImageTool(options) {
 			presentationMeta: (_args, value) => ({
 				kind: "codex-subscription-image",
 				schemaVersion: 1,
-				original: value.original
+				original: value.original,
+				...value.requestedModel === void 0 ? {} : { requestedModel: value.requestedModel },
+				...value.reportedModel === void 0 ? {} : { reportedModel: value.reportedModel },
+				...value.requestedSize === void 0 ? {} : { requestedSize: value.requestedSize }
 			})
 		},
 		timeoutMs: 300 * 1e3,
 		isConcurrencySafe: () => false,
 		async execute(args, exec) {
+			assertImageOperation(options.getFeatures?.(), args.referenceImages !== void 0);
+			const defaults = readImageDefaults(options.getFeatures?.());
+			args = {
+				...args,
+				model: args.model ?? defaults.imageModel,
+				quality: args.quality ?? defaults.imageQuality
+			};
 			const prompt = nonEmpty(args.prompt);
 			if (prompt === void 0) throw new Error("prompt must be a non-empty string");
 			const imageOptions = normalizeImageOptions(args);
@@ -2086,6 +2398,7 @@ function createCodexImageTool(options) {
 			const sessionMessages = editing && typeof options.getSessionMessages === "function" ? await options.getSessionMessages(exec.agent?.id) : void 0;
 			const images = editing ? await editImages(args.referenceImages, attachments, exec.signal, sessionMessages ?? (options.getSessionMessages ? [] : void 0)) : void 0;
 			let response;
+			assertImageOperation(options.getFeatures?.(), editing);
 			try {
 				response = await fetchImage(editing ? CODEX_IMAGE_EDIT_URL : CODEX_IMAGE_GENERATION_URL, {
 					method: "POST",
@@ -2103,7 +2416,7 @@ function createCodexImageTool(options) {
 						...images === void 0 ? {} : { images },
 						prompt,
 						background: imageOptions.background,
-						model: IMAGE_MODEL,
+						model: resolveImageModel(args.model),
 						quality: imageOptions.quality,
 						size: imageOptions.size
 					}),
@@ -2135,6 +2448,9 @@ function createCodexImageTool(options) {
 				throw error;
 			}
 			const result = {
+				requestedModel: resolveImageModel(args.model),
+				requestedSize: imageOptions.size,
+				...metadata.reportedModel === void 0 ? {} : { reportedModel: metadata.reportedModel },
 				image: imageReference(ref),
 				original,
 				localPath: options.originalImages.originalPath(original.assetId),
@@ -2154,6 +2470,27 @@ function createCodexImageTool(options) {
 	});
 }
 //#endregion
+//#region src/image-tool-registration.js
+/** Removing the tool also removes its schema from subsequent model requests. */
+function watchImageTool(settings, register) {
+	let disposeTool;
+	const sync = (value) => {
+		const { imageGeneration, imageEditing } = readImageFeatures(value);
+		if ((imageGeneration || imageEditing) && !disposeTool) disposeTool = register();
+		else if (!imageGeneration && !imageEditing && disposeTool) {
+			disposeTool();
+			disposeTool = void 0;
+		}
+	};
+	sync(settings.get());
+	const unwatch = settings.watch(sync);
+	return () => {
+		unwatch();
+		disposeTool?.();
+		disposeTool = void 0;
+	};
+}
+//#endregion
 //#region src/image-original-store.js
 const ORIGINAL_IMAGE_DIRECTORY = "dsh-codex-subscription/images/v1";
 const METADATA_VERSION = 1;
@@ -2268,7 +2605,8 @@ var OriginalImageStore = class {
 			await Promise.all([assertPrivateFile(metadataFile), assertPrivateFile(originalFile)]);
 			const metadata = parseMetadata(await readFile(metadataFile, "utf8"));
 			if (metadata === void 0 || metadata.image.assetId !== assetId || metadata.sessionId !== sessionId && !originalImageRefsEqual(metadata.image, inherited)) return void 0;
-			const data = new Uint8Array(await readFile(originalFile));
+			const buffer = await readFile(originalFile);
+			const data = new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength);
 			const dimensions = pngDimensions(data);
 			if (data.byteLength !== metadata.image.bytes || digest(data) !== metadata.image.sha256 || dimensions.width !== metadata.image.width || dimensions.height !== metadata.image.height) return void 0;
 			return {
@@ -2284,10 +2622,11 @@ var OriginalImageStore = class {
 		const stored = await this.read(sessionId, assetId, inherited);
 		if (stored === void 0 || offset >= stored.data.byteLength || offset % 4194304 !== 0) return void 0;
 		const end = Math.min(stored.data.byteLength, offset + ORIGINAL_IMAGE_CHUNK_BYTES);
+		const chunk = Buffer.from(stored.data.buffer, stored.data.byteOffset + offset, end - offset);
 		return {
 			ref: stored.ref,
 			offset,
-			encoded: Buffer.from(stored.data.subarray(offset, end)).toString("base64"),
+			encoded: chunk.toString("base64"),
 			done: end === stored.data.byteLength
 		};
 	}
@@ -2297,6 +2636,7 @@ var OriginalImageStore = class {
 const requestAreas = /* @__PURE__ */ new Set([
 	"login",
 	"model",
+	"catalog",
 	"quota",
 	"quota-reset",
 	"search",
@@ -2342,7 +2682,7 @@ function safeRequests(network) {
 	return result;
 }
 /** Build a support report that deliberately excludes OAuth and account metadata. */
-async function createSubscriptionDiagnostics({ auth, preferences, login = { phase: "idle" }, network }) {
+async function createSubscriptionDiagnostics({ auth, preferences, login = { phase: "idle" }, network, modelCatalog }) {
 	let account = { status: "unknown" };
 	const issues = [];
 	try {
@@ -2351,6 +2691,7 @@ async function createSubscriptionDiagnostics({ auth, preferences, login = { phas
 		issues.push({ code: "account-status-unavailable" });
 	}
 	const preference = preferences.status();
+	const catalog = modelCatalog?.status?.();
 	return {
 		schemaVersion: 3,
 		package: "dsh-codex-subscription",
@@ -2363,6 +2704,15 @@ async function createSubscriptionDiagnostics({ auth, preferences, login = { phas
 		account,
 		login,
 		requests: safeRequests(network),
+		...catalog && ["fallback", "online"].includes(catalog.source) && [
+			"idle",
+			"refreshing",
+			"ok",
+			"failed"
+		].includes(catalog.refresh) ? { catalog: {
+			source: catalog.source,
+			refresh: catalog.refresh
+		} } : {},
 		configuration: {
 			contextMode: preference.contextMode,
 			quickQuotaMode: preference.quickQuotaMode,
@@ -2601,12 +2951,74 @@ function createCodexUsageReader(options) {
 	});
 }
 //#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");
+	const points = samples.map((sample) => {
+		const used = 100 - sample.remainingPercent;
+		const lower = rounding === "floor" ? used : used - quantum / (rounding === "nearest" ? 2 : 1);
+		const upper = rounding === "floor" ? used + quantum : used + quantum / (rounding === "nearest" ? 2 : 1);
+		return {
+			at: sample.at,
+			lower: Math.max(0, lower),
+			upper: Math.min(100, upper)
+		};
+	});
+	let min = 0, max = Infinity;
+	for (let i = 0; i < points.length; i++) for (let j = i + 1; j < points.length; j++) {
+		const minutes = (points[j].at - points[i].at) / 6e4;
+		if (minutes <= 0) continue;
+		min = Math.max(min, (points[j].lower - points[i].upper) / minutes);
+		max = Math.min(max, (points[j].upper - points[i].lower) / minutes);
+	}
+	return {
+		min,
+		max,
+		feasible: min <= max + 1e-10
+	};
+}
+function quotaSharedOffsetInterval(samples, { quantum = 1, maxLagMs = 12e4 } = {}) {
+	if (!(quantum > 0) || !Number.isFinite(quantum) || !Number.isFinite(maxLagMs) || maxLagMs < 0) throw new RangeError("Invalid interval options");
+	let min = 0, max = Infinity;
+	for (let i = 0; i < samples.length; i++) for (let j = i + 1; j < samples.length; j++) {
+		const elapsed = (samples[j].at - samples[i].at) / 6e4, lag = maxLagMs / 6e4;
+		if (elapsed <= 0) continue;
+		const delta = samples[i].remainingPercent - samples[j].remainingPercent;
+		min = Math.max(min, (delta - quantum) / (elapsed + lag));
+		if (elapsed > lag) max = Math.min(max, (delta + quantum) / (elapsed - lag));
+	}
+	return {
+		min,
+		max,
+		feasible: min <= max + 1e-10
+	};
+}
+function refineQuotaRate(samples, conservative) {
+	if (!conservative.feasible || samples.length < 4 || samples.at(-1).at - samples[0].at < 20 * 6e4) return conservative;
+	let crossings = 0;
+	for (let i = 0; i < samples.length; i++) {
+		const value = samples[i].remainingPercent;
+		if (!Number.isInteger(value) || value <= 0 || value >= 100) return conservative;
+		if (i > 0) {
+			if (value > samples[i - 1].remainingPercent || samples[i].at <= samples[i - 1].at) return conservative;
+			if (value < samples[i - 1].remainingPercent) crossings++;
+		}
+	}
+	if (crossings < 3) return conservative;
+	const candidate = quotaSharedOffsetInterval(samples);
+	if (!candidate.feasible || candidate.min <= 0) return conservative;
+	if (candidate.max - candidate.min >= conservative.max - conservative.min) return conservative;
+	return {
+		...candidate,
+		method: "shared-offset",
+		maxLagMs: 12e4
+	};
+}
+//#endregion
 //#region src/quota-forecast.js
 const HOUR_MS = 3600 * 1e3;
 const HISTORY_MS = 24 * HOUR_MS;
-const MIN_SAMPLES = 3;
-const PLATEAU_SAMPLE_MS = 900 * 1e3;
-const finite = (value) => Number.isFinite(Number(value));
+const finite = (value) => value !== null && value !== void 0 && Number.isFinite(Number(value));
 const clampPercent = (value) => Math.max(0, Math.min(100, Number(value)));
 const cleanSegment = (value) => String(value ?? "default").slice(0, 96);
 const keyFor = (window, context = {}) => JSON.stringify([
@@ -2614,17 +3026,6 @@ const keyFor = (window, context = {}) => JSON.stringify([
 	cleanSegment(context.limitId ?? "codex"),
 	Number(window.windowSeconds) || "limit"
 ]);
-const median = (values) => {
-	const ordered = [...values].sort((a, b) => a - b);
-	const middle = Math.floor(ordered.length / 2);
-	return ordered.length % 2 === 0 ? (ordered[middle - 1] + ordered[middle]) / 2 : ordered[middle];
-};
-function requiredSpanMs(consumedPercent) {
-	if (consumedPercent >= 2) return 300 * 1e3;
-	if (consumedPercent >= 1) return 600 * 1e3;
-	if (consumedPercent >= .5) return 1200 * 1e3;
-	return 1800 * 1e3;
-}
 function observeQuotaForecast(state, windows, now = Date.now(), context = {}) {
 	const next = { windows: { ...state?.windows ?? {} } };
 	let changed = false;
@@ -2632,12 +3033,13 @@ function observeQuotaForecast(state, windows, now = Date.now(), context = {}) {
 		if (!finite(window?.remainingPercent)) continue;
 		const key = keyFor(window, context);
 		const resetsAt = finite(window.resetsAt) ? Number(window.resetsAt) : null;
-		const remainingPercent = Math.round(clampPercent(window.remainingPercent) * 1e4) / 1e4;
+		const remainingPercent = clampPercent(window.remainingPercent);
 		const previous = next.windows[key];
 		const resetChanged = previous !== void 0 && (previous.resetsAt === null !== (resetsAt === null) || previous.resetsAt !== null && Math.abs(previous.resetsAt - resetsAt) > 300);
 		const last = previous?.samples?.at(-1);
 		const quotaIncreased = last !== void 0 && remainingPercent > last.remainingPercent + .5;
-		const record = resetChanged || quotaIncreased ? {
+		const observationGap = last !== void 0 && now - last.at > 90 * 6e4;
+		const record = resetChanged || quotaIncreased || observationGap ? {
 			resetsAt,
 			samples: []
 		} : {
@@ -2645,7 +3047,7 @@ function observeQuotaForecast(state, windows, now = Date.now(), context = {}) {
 			samples: [...previous?.samples ?? []]
 		};
 		const latest = record.samples.at(-1);
-		if (latest === void 0 || now > latest.at && (Math.abs(remainingPercent - latest.remainingPercent) >= .001 || now - latest.at >= PLATEAU_SAMPLE_MS)) {
+		if (latest === void 0 || now > latest.at) {
 			record.samples.push({
 				at: now,
 				remainingPercent
@@ -2666,59 +3068,98 @@ function estimateQuotaForecast(state, window, now = Date.now(), context = {}) {
 	if (record === void 0) return { status: "calibrating" };
 	const resetsAt = finite(window.resetsAt) ? Number(window.resetsAt) : null;
 	if (record.resetsAt === null !== (resetsAt === null) || resetsAt !== null && Math.abs(record.resetsAt - resetsAt) > 300) return { status: "calibrating" };
-	const samples = record.samples.filter((sample) => sample.at >= now - HISTORY_MS && sample.at <= now + 6e4);
-	if (samples.length < MIN_SAMPLES) return {
+	let samples = record.samples.filter((sample) => sample.at >= now - 2 * HOUR_MS && sample.at <= now);
+	if (samples.length < 2) return {
 		status: "calibrating",
 		sampleCount: samples.length
 	};
-	const first = samples[0];
-	const last = samples.at(-1);
-	const spanMs = last.at - first.at;
-	const consumedPercent = Math.max(0, first.remainingPercent - last.remainingPercent);
-	if (spanMs < requiredSpanMs(consumedPercent)) return {
+	if (now - samples.at(-1).at > 20 * 6e4) return {
 		status: "calibrating",
+		reason: "stale"
+	};
+	let bounds = quotaRateInterval(samples);
+	let changedIntensity = false;
+	while (!bounds.feasible && samples.length > 3) {
+		samples = samples.slice(1);
+		bounds = quotaRateInterval(samples);
+		changedIntensity = true;
+	}
+	bounds = refineQuotaRate(samples, bounds);
+	const spanMs = samples.at(-1).at - samples[0].at;
+	const common = {
 		sampleCount: samples.length,
 		observedSpanMs: spanMs,
-		consumedPercent
-	};
-	const slopes = [];
-	for (let left = 0; left < samples.length - 1; left += 1) for (let right = left + 1; right < samples.length; right += 1) {
-		const hours = (samples[right].at - samples[left].at) / HOUR_MS;
-		if (hours <= 0) continue;
-		slopes.push((samples[left].remainingPercent - samples[right].remainingPercent) / hours);
-	}
-	const positive = slopes.filter((value) => Number.isFinite(value) && value >= 0);
-	const pacePerHour = positive.length === 0 ? 0 : median(positive);
-	if (!Number.isFinite(pacePerHour) || pacePerHour < .02) return {
-		status: "idle",
-		pacePerHour: 0,
-		sampleCount: samples.length,
-		observedSpanMs: spanMs,
-		consumedPercent
+		consumedPercent: samples[0].remainingPercent - samples.at(-1).remainingPercent,
+		lowerPacePerHour: bounds.min * 60,
+		upperPacePerHour: bounds.max * 60,
+		changedIntensity,
+		rateMethod: bounds.method ?? "conservative"
+	};
+	if (!bounds.feasible) return {
+		...common,
+		status: "calibrating",
+		reason: "changing-pace"
+	};
+	if (resetsAt !== null && resetsAt <= now / 1e3) return {
+		...common,
+		status: "calibrating",
+		reason: "stale"
 	};
-	const deviations = positive.map((value) => Math.abs(value - pacePerHour));
-	const uncertaintyPerHour = deviations.length === 0 ? 0 : median(deviations) * 1.4826;
-	const lowerPacePerHour = Math.max(.02, pacePerHour - uncertaintyPerHour);
-	const upperPacePerHour = pacePerHour + uncertaintyPerHour;
+	if (spanMs >= 5 * 6e4 && samples.length >= 3 && bounds.min <= 1e-9 && common.consumedPercent >= 1) {
+		const pacePerHour = common.consumedPercent / (spanMs / HOUR_MS);
+		return {
+			...common,
+			status: "ready",
+			provisional: true,
+			pacePerHour,
+			runwaySeconds: clampPercent(window.remainingPercent) / pacePerHour * 3600,
+			survivesReset: false
+		};
+	}
+	if (spanMs < 6e4 || bounds.min <= 1e-9) return {
+		...common,
+		status: "calibrating",
+		reason: "resolution"
+	};
+	const pacePerHour = (bounds.min + bounds.max) * 30;
 	const remaining = clampPercent(window.remainingPercent);
-	const runwaySeconds = remaining / pacePerHour * 3600;
-	const runwayMinSeconds = remaining / upperPacePerHour * 3600;
-	const runwayMaxSeconds = remaining / lowerPacePerHour * 3600;
-	const resetSeconds = resetsAt === null ? null : Math.max(0, resetsAt - now / 1e3);
+	const runwayMinSeconds = Math.max(0, remaining - 1) / common.upperPacePerHour * 3600;
+	const runwayMaxSeconds = Math.min(100, remaining + 1) / common.lowerPacePerHour * 3600;
+	const resetSeconds = resetsAt === null ? null : resetsAt - now / 1e3;
+	if (resetSeconds !== null && resetSeconds <= 0) return {
+		...common,
+		status: "calibrating",
+		reason: "stale"
+	};
 	return {
+		...common,
 		status: "ready",
 		pacePerHour,
-		uncertaintyPerHour,
-		runwaySeconds,
+		runwaySeconds: remaining / pacePerHour * 3600,
 		runwayMinSeconds,
 		runwayMaxSeconds,
-		survivesReset: resetSeconds !== null && runwayMinSeconds >= resetSeconds,
-		sampleCount: samples.length,
-		observedSpanMs: spanMs,
-		consumedPercent
+		survivesReset: resetSeconds !== null && runwayMinSeconds >= resetSeconds
 	};
 }
 function forecastUsage(usage, state = { windows: {} }, now = Date.now(), options = {}) {
+	const observedAt = Number.isFinite(usage?.fetchedAt) ? usage.fetchedAt : now;
+	if (observedAt > now || now - observedAt > 5 * 6e4) return {
+		state,
+		changed: false,
+		usage: {
+			...usage,
+			rateLimits: (usage?.rateLimits ?? []).map((limit) => ({
+				...limit,
+				windows: limit.windows.map((window) => ({
+					...window,
+					forecast: {
+						status: "calibrating",
+						reason: "stale"
+					}
+				}))
+			}))
+		}
+	};
 	let nextState = state;
 	let changed = false;
 	const rateLimits = (usage?.rateLimits ?? []).map((limit) => {
@@ -2726,7 +3167,7 @@ function forecastUsage(usage, state = { windows: {} }, now = Date.now(), options
 			scope: options.scope,
 			limitId: limit.id
 		};
-		const observed = observeQuotaForecast(nextState, limit.windows, now, context);
+		const observed = observeQuotaForecast(nextState, limit.windows, observedAt, context);
 		nextState = observed.state;
 		changed ||= observed.changed;
 		return {
@@ -2749,40 +3190,67 @@ function forecastUsage(usage, state = { windows: {} }, now = Date.now(), options
 function createQuotaForecastReader({ reader, enabled, now = Date.now, scope = () => "default", stateStore }) {
 	let state = { windows: {} };
 	let loaded = false;
+	let loading;
+	let generation = 0;
+	let historyGeneration = 0;
+	let persistence = Promise.resolve();
+	const persist = (operation) => {
+		const pending = persistence.then(operation);
+		persistence = pending.catch(() => {});
+		return pending;
+	};
 	const load = async () => {
 		if (loaded) return;
+		if (loading) return loading;
+		const current = historyGeneration;
+		const pending = Promise.resolve().then(() => stateStore?.load?.()).then((restored) => {
+			if (current !== historyGeneration) return;
+			if (restored?.windows !== null && typeof restored?.windows === "object") state = restored;
+			loaded = true;
+		}).finally(() => {
+			if (loading === pending) loading = void 0;
+		});
+		loading = pending;
+		return pending;
+	};
+	const clearHistory = (clearReader = true) => {
+		generation += 1;
+		historyGeneration += 1;
+		state = { windows: {} };
 		loaded = true;
-		const restored = await stateStore?.load?.();
-		if (restored?.windows !== null && typeof restored?.windows === "object") state = restored;
+		if (clearReader) reader.clear();
+		return persist(() => stateStore?.clear?.());
 	};
 	return Object.freeze({
 		async read(options) {
+			const current = generation;
+			const account = await scope();
 			const usage = await reader.read(options);
+			if (current !== generation) return usage;
 			await load();
+			const activeAccount = await scope();
+			if (current !== generation || account !== activeAccount) return usage;
 			if (!enabled()) {
-				state = { windows: {} };
-				await stateStore?.clear?.();
+				await clearHistory(false);
 				return usage;
 			}
-			const forecast = forecastUsage(usage, state, now(), { scope: await scope() });
+			const forecast = forecastUsage(usage, state, now(), { scope: account });
 			state = forecast.state;
-			if (forecast.changed) await stateStore?.save?.(state);
-			return forecast.usage;
-		},
-		async clear() {
-			state = { windows: {} };
-			loaded = true;
-			reader.clear();
-			await stateStore?.clear?.();
+			if (forecast.changed) await persist(() => stateStore?.save?.(forecast.state));
+			return current === generation ? forecast.usage : usage;
 		},
+		clear: () => clearHistory(),
 		clearCache() {
+			generation += 1;
 			reader.clear();
 		},
 		async clearScope(targetScope) {
+			generation += 1;
 			await load();
 			const prefix = `[${JSON.stringify(cleanSegment(targetScope))},`;
 			state = { windows: Object.fromEntries(Object.entries(state.windows).filter(([key]) => !key.startsWith(prefix))) };
-			await stateStore?.save?.(state);
+			const snapshot = state;
+			await persist(() => stateStore?.save?.(snapshot));
 		}
 	});
 }
@@ -3144,28 +3612,7 @@ function createCodexResetCreditService(options) {
 	});
 }
 //#endregion
-//#region src/index.js
-const name = "codex-subscription";
-const inject = [
-	"llm",
-	"credentials",
-	"settings",
-	"web",
-	"loader",
-	"tools",
-	"attachments"
-];
-const PROVIDER = "openai-codex";
-const OAUTH_EXPIRY_SKEW_MS = 6e4;
-const CREDENTIAL_REF = dshCredentials.credentialRef("OPENAI_CODEX_SUBSCRIPTION_OAUTH");
-const LEGACY_CREDENTIAL_REF = dshCredentials.credentialRef("WSL043_OPENAI_CODEX_OAUTH");
-const ACCOUNT_VAULT_KEY = typeof dshCredentials.credentialKey === "function" ? dshCredentials.credentialKey("codex-subscription", "accounts") : void 0;
-const CHANNEL = "/codex-subscription";
-const WEB_ENTRY_ID = "web";
-const DSH_SEARCH_PROVIDER_FALLBACK = "deepseek-official";
-const MAX_REQUEST_IMAGE_BYTES = 20 * 1024 * 1024;
-const REQUEST_IMAGE_PIXEL_BUDGET = 2048 * 2048;
-const REQUEST_IMAGE_MAX_BYTES = 1024 * 1024;
+//#region src/subscription-rpc.js
 const publicError = (code, message) => ({
 	ok: false,
 	error: {
@@ -3209,7 +3656,9 @@ function createSubscriptionRpcHandler({ authHandler, usageReader, resetCreditSer
 				ok: true,
 				value: {
 					contextModels: Array.isArray(value?.contextModels) ? value.contextModels : [],
-					verbosityModels: Array.isArray(value?.verbosityModels) ? value.verbosityModels : []
+					verbosityModels: Array.isArray(value?.verbosityModels) ? value.verbosityModels : [],
+					fastModels: Array.isArray(value?.fastModels) ? value.fastModels : [],
+					catalogStatus: value?.catalogStatus
 				}
 			};
 		} catch (error) {
@@ -3219,44 +3668,11 @@ function createSubscriptionRpcHandler({ authHandler, usageReader, resetCreditSer
 		if (endpoint === "preferences/status" || endpoint === "preferences/update") try {
 			signal.throwIfAborted();
 			if (endpoint === "preferences/update") {
-				const patch = {};
-				if (Object.hasOwn(payload ?? {}, "quickQuotaMode")) {
-					if (![
-						"off",
-						"percent",
-						"bar",
-						"forecast"
-					].includes(payload["quickQuotaMode"])) return publicError("internal", "Invalid quick quota preference");
-					patch[QUICK_QUOTA_MODE_FIELD] = payload[QUICK_QUOTA_MODE_FIELD];
-				}
-				if (Object.hasOwn(payload ?? {}, "searchProvider")) {
-					if (![
-						"auto",
-						"dsh",
-						"codex"
-					].includes(payload["searchProvider"])) return publicError("internal", "Invalid search provider preference");
-					patch[SEARCH_PROVIDER_FIELD] = payload[SEARCH_PROVIDER_FIELD];
-				}
-				if (Object.hasOwn(payload ?? {}, "speedMode")) {
-					if (!["standard", "fast"].includes(payload["speedMode"])) return publicError("internal", "Invalid speed mode preference");
-					patch[SPEED_MODE_FIELD] = payload[SPEED_MODE_FIELD];
-				}
-				if (Object.hasOwn(payload ?? {}, "outputVerbosity")) {
-					if (![
-						"default",
-						"low",
-						"medium",
-						"high"
-					].includes(payload["outputVerbosity"])) return publicError("internal", "Invalid output verbosity preference");
-					patch[OUTPUT_VERBOSITY_FIELD] = payload[OUTPUT_VERBOSITY_FIELD];
-				}
-				if (Object.hasOwn(payload ?? {}, "contextMode")) {
-					if (![
-						"standard",
-						"extended",
-						"custom"
-					].includes(payload["contextMode"])) return publicError("internal", "Invalid context mode preference");
-					patch[CONTEXT_MODE_FIELD] = payload[CONTEXT_MODE_FIELD];
+				const patch = capabilityPatch(payload);
+				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);
+					patch[field] = payload[field];
 				}
 				if (Object.hasOwn(payload ?? {}, "customContextWindow")) {
 					if (normalizeCustomContextWindow(payload["customContextWindow"]) !== payload["customContextWindow"]) return publicError("internal", "Invalid custom context window");
@@ -3339,6 +3755,28 @@ function createSubscriptionRpcHandler({ authHandler, usageReader, resetCreditSer
 		return result;
 	};
 }
+//#endregion
+//#region src/index.js
+const name = "codex-subscription";
+const inject = [
+	"llm",
+	"credentials",
+	"settings",
+	"web",
+	"loader",
+	"tools",
+	"attachments"
+];
+const PROVIDER = "openai-codex";
+const OAUTH_EXPIRY_SKEW_MS = 6e4;
+const CREDENTIAL_REF = dshCredentials.credentialRef("OPENAI_CODEX_SUBSCRIPTION_OAUTH");
+const LEGACY_CREDENTIAL_REF = dshCredentials.credentialRef("WSL043_OPENAI_CODEX_OAUTH");
+const ACCOUNT_VAULT_KEY = typeof dshCredentials.credentialKey === "function" ? dshCredentials.credentialKey("codex-subscription", "accounts") : void 0;
+const WEB_ENTRY_ID = "web";
+const DSH_SEARCH_PROVIDER_FALLBACK = "deepseek-official";
+const MAX_REQUEST_IMAGE_BYTES = 20 * 1024 * 1024;
+const REQUEST_IMAGE_PIXEL_BUDGET = 2048 * 2048;
+const REQUEST_IMAGE_MAX_BYTES = 1024 * 1024;
 function createSearchProviderSwitcher(loader) {
 	const webEntry = () => [...loader.entries()].find((entry) => entry.options?.id === WEB_ENTRY_ID);
 	const dshProviderId = () => {
@@ -3365,30 +3803,23 @@ function createSearchProviderSwitcher(loader) {
 }
 function apply(ctx) {
 	const settings = ctx.settings.register(SETTINGS_NAMESPACE, z.object({
-		[QUICK_QUOTA_MODE_FIELD]: z.union([
-			"off",
-			QUICK_QUOTA_MODE_PERCENT,
-			"bar",
-			QUICK_QUOTA_MODE_FORECAST
-		]),
-		[LEGACY_QUICK_QUOTA_FIELD]: z.boolean(),
-		[SEARCH_PROVIDER_FIELD]: z.union([
-			SEARCH_PROVIDER_AUTO,
-			"dsh",
-			SEARCH_PROVIDER_CODEX
-		]).default(DEFAULT_SEARCH_PROVIDER),
-		[SPEED_MODE_FIELD]: z.union([SPEED_MODE_STANDARD, SPEED_MODE_FAST]).default(DEFAULT_SPEED_MODE),
-		[OUTPUT_VERBOSITY_FIELD]: z.union([
-			OUTPUT_VERBOSITY_DEFAULT,
+		...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([
+			"auto",
 			"low",
-			OUTPUT_VERBOSITY_MEDIUM,
-			OUTPUT_VERBOSITY_HIGH
-		]).default(DEFAULT_OUTPUT_VERBOSITY),
-		[CONTEXT_MODE_FIELD]: z.union([
-			CONTEXT_MODE_STANDARD,
-			CONTEXT_MODE_EXTENDED,
-			CONTEXT_MODE_CUSTOM
-		]).default(DEFAULT_CONTEXT_MODE),
+			"medium",
+			"high",
+			"xhigh",
+			"max"
+		]).default("auto"),
+		...Object.fromEntries(Object.entries(IMAGE_FEATURE_DEFAULTS).map(([key, value]) => [key, z.boolean().default(value)])),
+		[CUSTOM_CONTEXT_OVERRIDES_FIELD]: z.dict(z.number().step(1).min(1).max(MAX_CONTEXT_BUDGET)).default({}),
+		[SEARCH_MODE_FIELD]: z.union(SEARCH_MODES).default("live"),
+		[SEARCH_DOMAINS_FIELD]: z.transform(z.array(z.string()).max(20), (value) => readCapabilitySettings({ searchDomains: value }).searchDomains).default([]),
+		...Object.fromEntries(QUOTA_THRESHOLD_FIELDS.map((key) => [key, z.number().step(1).min(1).max(100).default(20)])),
+		[QUOTA_ALERTS_FIELD]: z.union(QUOTA_ALERT_MODES).default("important"),
+		[LEGACY_QUICK_QUOTA_FIELD]: z.boolean(),
 		[CUSTOM_CONTEXT_WINDOW_FIELD]: z.number().step(1).min(128e3).max(1e6).default(DEFAULT_CUSTOM_CONTEXT_WINDOW),
 		...Object.fromEntries(Object.entries(CUSTOM_CONTEXT_MODEL_FIELDS).map(([modelKey, field]) => [field, z.number().step(1).min(128e3).max(CUSTOM_CONTEXT_MODEL_CAPS[modelKey]).default(CUSTOM_CONTEXT_MODEL_DEFAULTS[modelKey])]))
 	}));
@@ -3417,7 +3848,10 @@ function apply(ctx) {
 		resolveOutputVerbosity: () => normalizeOutputVerbosity(settings.get()[OUTPUT_VERBOSITY_FIELD]),
 		resolveContextMode: () => normalizeContextMode(settings.get()[CONTEXT_MODE_FIELD]),
 		resolveCustomContextWindow: (modelKey) => {
+			const overrides = readCapabilitySettings(settings.get())[CUSTOM_CONTEXT_OVERRIDES_FIELD];
+			if (Object.hasOwn(overrides, modelKey)) return overrides[modelKey];
 			const field = CUSTOM_CONTEXT_MODEL_FIELDS[modelKey];
+			if (field === void 0) return void 0;
 			return normalizeCustomContextWindow(settings.get()[field] ?? CUSTOM_CONTEXT_MODEL_DEFAULTS[modelKey], CUSTOM_CONTEXT_MODEL_CAPS[modelKey]);
 		},
 		catalog: modelCatalog,
@@ -3425,6 +3859,7 @@ function apply(ctx) {
 	});
 	const preferences = {
 		status: () => ({
+			...readCapabilitySettings(settings.get()),
 			[QUICK_QUOTA_MODE_FIELD]: normalizeQuickQuotaMode(settings.get()[QUICK_QUOTA_MODE_FIELD], settings.get()[LEGACY_QUICK_QUOTA_FIELD]),
 			[SEARCH_PROVIDER_FIELD]: settings.get()[SEARCH_PROVIDER_FIELD],
 			[SPEED_MODE_FIELD]: settings.get()[SPEED_MODE_FIELD],
@@ -3432,8 +3867,10 @@ function apply(ctx) {
 			[CONTEXT_MODE_FIELD]: normalizeContextMode(settings.get()[CONTEXT_MODE_FIELD]),
 			[CUSTOM_CONTEXT_WINDOW_FIELD]: normalizeCustomContextWindow(settings.get()[CUSTOM_CONTEXT_WINDOW_FIELD]),
 			...Object.fromEntries(Object.entries(CUSTOM_CONTEXT_MODEL_FIELDS).map(([modelKey, field]) => [field, normalizeCustomContextWindow(settings.get()[field] ?? CUSTOM_CONTEXT_MODEL_DEFAULTS[modelKey], CUSTOM_CONTEXT_MODEL_CAPS[modelKey])])),
-			contextModels: contextModelGroups(provider.getModels()),
+			contextModels: contextModelGroups(modelCatalog.getModels(baseProvider.getModels())),
+			catalogStatus: modelCatalog.status(),
 			verbosityModels: provider.getModels().filter((model) => modelCatalog.metadata(model.id)?.supportVerbosity ?? model.id !== "gpt-5.3-codex-spark").map((model) => model.id),
+			fastModels: provider.getModels().filter((model) => modelCatalog.metadata(model.id)?.supportsFast ?? supportsCodexFastMode(model.id)).map((model) => model.id),
 			writable: ctx.settings.writable
 		}),
 		update: (patch) => settings.update(patch)
@@ -3455,11 +3892,12 @@ function apply(ctx) {
 	let profileKey;
 	let profileSnapshot;
 	const profiles = () => {
-		const key = [
+		const key = JSON.stringify([
 			modelCatalog.revision(),
 			normalizeContextMode(settings.get()[CONTEXT_MODE_FIELD]),
+			settings.get()[CUSTOM_CONTEXT_OVERRIDES_FIELD],
 			...Object.values(CUSTOM_CONTEXT_MODEL_FIELDS).map((field) => settings.get()[field])
-		].join(":");
+		]);
 		if (key !== profileKey) {
 			profileKey = key;
 			profileSnapshot = /* @__PURE__ */ new Map([[PROVIDER, profile]]);
@@ -3474,14 +3912,15 @@ function apply(ctx) {
 			fileExists: async () => false
 		})
 	});
-	ctx.tools.register(createCodexImageTool({
+	ctx.effect(() => watchImageTool(settings, () => ctx.tools.register(createCodexImageTool({
+		getFeatures: () => settings.get(),
 		getAuth: resolveAuth,
 		readCredential: (options) => store.read(PROVIDER, options),
 		attachments: ctx.attachments,
 		getSessionMessages: (sessionId) => ctx.get?.("sessions")?.get?.(sessionId)?.deriveMessages?.() ?? [],
 		originalImages,
 		fetch: (input, init) => network.fetch("image", input, init)
-	}));
+	}))), "codex-subscription: image tool availability");
 	const adapter = new PiAiAdapter({
 		profiles,
 		resolveApiKey: async () => {
@@ -3500,6 +3939,7 @@ function apply(ctx) {
 	ctx.llm.registerAdapter([PROVIDER], adapter);
 	const currentAgent = () => ctx.get?.("agents")?.currentInitiator?.();
 	const codexSearch = createCodexSearchProvider({
+		resolvePreferences: () => readCapabilitySettings(settings.get()),
 		getAuth: resolveAuth,
 		readCredential: (options) => store.read(PROVIDER, options),
 		resolveModel: () => {
@@ -3547,12 +3987,22 @@ function apply(ctx) {
 		stateStore: new QuotaForecastStateStore({ filename: dshHomePath("state", "codex-subscription", "quota-forecast.json") })
 	});
 	ctx.effect(() => {
+		let forecasting = false;
 		const warmForecast = (value) => {
-			if (normalizeQuickQuotaMode(value["quickQuotaMode"], value["quickQuotaVisible"]) !== "forecast") return;
+			if (!(normalizeQuickQuotaMode(value["quickQuotaMode"], value["quickQuotaVisible"]) === "forecast")) {
+				if (forecasting) usageReader.clear().catch((error) => ctx.logger?.debug?.("could not clear Codex quota forecast: %s", error.message));
+				forecasting = false;
+				return;
+			}
+			forecasting = true;
 			usageReader.read().catch((error) => ctx.logger?.debug?.("could not warm Codex quota forecast: %s", error.message));
 		};
 		warmForecast(settings.get());
-		return settings.watch(warmForecast);
+		const unwatch = settings.watch(warmForecast);
+		return () => {
+			unwatch();
+			usageReader.clearCache();
+		};
 	}, "codex-subscription: quota forecast warm-up");
 	const resetCreditService = createCodexResetCreditService({
 		getAuth: resolveAuth,
@@ -3569,7 +4019,8 @@ function apply(ctx) {
 			auth,
 			preferences,
 			login: coordinator.supportState(),
-			network
+			network,
+			modelCatalog
 		}),
 		modelCatalog,
 		originalImages,
@@ -3578,7 +4029,7 @@ function apply(ctx) {
 	ctx.effect(() => {
 		modelCatalog.refresh().catch((error) => ctx.logger?.debug?.("could not refresh Codex model catalog: %s", error.message));
 	}, "codex-subscription: official model catalog");
-	ctx.inject(["connection"], (connectionContext) => connectionContext.effect(() => connectionContext.connection.rpc.handle(CHANNEL, handler, { authority: "trusted-host" }), "codex-subscription: DSH-trusted account RPC"));
+	ctx.inject(["connection"], (connectionContext) => connectionContext.effect(() => registerSubscriptionTransport(connectionContext.connection, handler), "codex-subscription: DSH-trusted account RPC"));
 }
 //#endregion
 export { CODEX_IMAGE_GENERATION_URL, CODEX_IMAGE_TOOL_NAME, CODEX_RESET_CONSUME_URL, CODEX_RESET_CREDITS_URL, CODEX_USAGE_URL, CodexLoginCoordinator, DshOAuthCredentialStore, apply, assertCodexAuthUrl, commandForCodexAuthUrl, createCodexAuthService, createCodexImageTool, createCodexResetCreditService, createCodexRpcHandler, createCodexUsageReader, createSearchProviderSwitcher, createSubscriptionDiagnostics, createSubscriptionRpcHandler, decodeCodexPng, inject, name, normalizeContextMode, normalizeCustomContextWindow, openCodexAuthUrl, parseCodexUsage };