dsh-codex-subscription 1.14.2 → 1.14.4

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.4";
 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,35 @@ 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;
+	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"));
+		};
+		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,34 +1464,73 @@ function createOfficialModelCatalog(options = {}) {
 				method: "GET",
 				redirect: "error",
 				headers,
-				signal
+				signal: requestSignal
 			});
-			if (response.status === 304) return false;
+			if (currentGeneration !== generation || requestSignal.aborted) 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;
 			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;
+			outcome = "ok";
 			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 });
+		});
+		timer = scheduleTimeout(() => controller.abort(timeoutError), timeoutMs);
+		timer.unref?.();
+		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;
+				refreshStatus = outcome;
+			}
 		});
-		return refreshing;
+		refreshing = {
+			generation: currentGeneration,
+			promise,
+			cancel: () => controller.abort()
+		};
+		return promise;
 	};
 	return Object.freeze({
 		refresh,
 		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;
+			refreshing = void 0;
+			flight?.cancel();
 			models = void 0;
 			metadata = /* @__PURE__ */ new Map();
 			etag = void 0;
+			refreshStatus = "idle";
 			revision += 1;
 		}
 	});
@@ -2192,7 +2286,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 {
@@ -2208,10 +2303,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
 		};
 	}
@@ -2221,6 +2317,7 @@ var OriginalImageStore = class {
 const requestAreas = /* @__PURE__ */ new Set([
 	"login",
 	"model",
+	"catalog",
 	"quota",
 	"quota-reset",
 	"search",
@@ -2266,7 +2363,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 {
@@ -2275,6 +2372,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",
@@ -2287,6 +2385,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,
@@ -2673,40 +2780,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));
 		}
 	});
 }
@@ -3124,6 +3258,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") {
@@ -3455,12 +3605,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,
@@ -3477,7 +3637,8 @@ function apply(ctx) {
 			auth,
 			preferences,
 			login: coordinator.supportState(),
-			network
+			network,
+			modelCatalog
 		}),
 		modelCatalog,
 		originalImages,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-codex-subscription",
-  "version": "1.14.2",
+  "version": "1.14.4",
   "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",
@@ -127,8 +127,8 @@
   },
   "scripts": {
     "build": "tsdown --config tsdown.config.mjs",
-    "test:behavior": "node --test tests/auth-security.test.mjs tests/cache-contract.test.mjs tests/codex-images.test.mjs tests/codex-search.test.mjs tests/image-edit.test.mjs tests/model-catalog.test.mjs tests/oauth-network.test.mjs tests/pi-ai-runtime.test.mjs tests/plugin-integration.test.mjs tests/reset-credits.test.mjs tests/sidebar-quota.test.mjs tests/transport-contract.test.mjs tests/usage.test.mjs",
-    "test:delivery": "node --test tests/ci-change-plan.test.mjs tests/client-contract.test.mjs tests/prepare-compat-release.test.mjs tests/publish-idempotency.test.mjs tests/release-contract.test.mjs tests/release-notes.test.mjs tests/support-intake.test.mjs",
+    "test:behavior": "node scripts/run-tests.mjs behavior",
+    "test:delivery": "node scripts/run-tests.mjs delivery",
     "test": "node --test tests/*.test.mjs",
     "check": "pnpm run test && pnpm run build && pnpm pack --pack-destination .artifacts"
   }