dsh-codex-subscription 2.2.0 → 2.2.2

package/lib/index.js

@@ -1,6 +1,6 @@
 import { createRequire } from "node:module";
 import { createHash, randomBytes, randomUUID } from "node:crypto";
-import { closeOpenAICodexWebSocketSessions, resetOpenAICodexWebSocketDebugStats } from "@earendil-works/pi-ai/api/openai-codex-responses";
+import { closeOpenAICodexWebSocketSessions, getOpenAICodexWebSocketDebugStats, resetOpenAICodexWebSocketDebugStats } from "@earendil-works/pi-ai/api/openai-codex-responses";
 import { execFile, spawn } from "node:child_process";
 import { request } from "node:https";
 import { AsyncLocalStorage } from "node:async_hooks";
@@ -553,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({
@@ -571,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;
@@ -661,6 +662,21 @@ function createSubscriptionConnection({ resolveMode = () => "sse", resolveProxy
 	const namespace = randomUUID();
 	const sessions = /* @__PURE__ */ new Set();
 	return {
+		snapshot() {
+			const totals = Object.fromEntries([
+				"requests",
+				"connectionsCreated",
+				"connectionsReused",
+				"deltaRequests",
+				"websocketFailures",
+				"sseFallbacks"
+			].map((key) => [key, 0]));
+			for (const session of sessions) {
+				const stats = getOpenAICodexWebSocketDebugStats(session);
+				for (const key of Object.keys(totals)) if (Number.isSafeInteger(stats?.[key]) && stats[key] >= 0) totals[key] = Math.min(Number.MAX_SAFE_INTEGER, totals[key] + stats[key]);
+			}
+			return totals;
+		},
 		async prepare(options = {}) {
 			if (resolveMode() !== "websocket") return { options: {
 				...options,
@@ -715,6 +731,11 @@ const MAX_BYTES = 2 * 1024 * 1024;
 const MAX_AGE_MS = 10080 * 60 * 1e3;
 function createCompactionBridge({ enabled = () => false, threshold = () => 1e5, accountScope, diagnostic = () => {}, now = Date.now }) {
 	const scope = new AsyncLocalStorage();
+	const stats = {
+		requests: 0,
+		checkpointsSaved: 0,
+		checkpointsReused: 0
+	};
 	const wrapStream = (factory, options) => (async function* () {
 		if (!enabled() || options.provider !== "openai-codex") {
 			yield* factory(options);
@@ -774,6 +795,7 @@ function createCompactionBridge({ enabled = () => false, threshold = () => 1e5,
 							}
 						}
 					};
+					stats.checkpointsSaved = Math.min(Number.MAX_SAFE_INTEGER, stats.checkpointsSaved + 1);
 				}
 				yield event;
 			}
@@ -782,6 +804,7 @@ function createCompactionBridge({ enabled = () => false, threshold = () => 1e5,
 		}
 	})();
 	return {
+		snapshot: () => ({ ...stats }),
 		wrapAdapter(adapter) {
 			return new Proxy(adapter, { get(target, property) {
 				if (property === "stream") return (options) => wrapStream((o) => target.stream(o), options);
@@ -799,6 +822,11 @@ function createCompactionBridge({ enabled = () => false, threshold = () => 1e5,
 		preparePayload(payload, contextWindow) {
 			const state = scope.getStore();
 			if (!state) return payload;
+			if (!state.counted) {
+				state.counted = true;
+				stats.requests = Math.min(Number.MAX_SAFE_INTEGER, stats.requests + 1);
+				if (state.suffix) stats.checkpointsReused = Math.min(Number.MAX_SAFE_INTEGER, stats.checkpointsReused + 1);
+			}
 			const configured = threshold();
 			if (!Number.isSafeInteger(configured) || configured < 1e3) throw new Error("Invalid compaction threshold");
 			const limit = Number.isFinite(contextWindow) && contextWindow >= 2e3 ? Math.min(configured, Math.floor(contextWindow / 2)) : configured;
@@ -901,6 +929,8 @@ const RPC_ENDPOINTS = Object.freeze([
 	"runtime/install",
 	"runtime/remove",
 	"runtime/cancel",
+	"storage/status",
+	"storage/clear-forecast",
 	"reset-credit/inspect",
 	"reset-credit/prepare",
 	"reset-credit/consume",
@@ -2831,7 +2861,7 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 Object.freeze(["0.82.1", "0.85.1"]);
 //#endregion
 //#region src/version.js
-const PACKAGE_VERSION = "2.2.0";
+const PACKAGE_VERSION = "2.2.2";
 const USER_AGENT = `dsh-codex-subscription/${PACKAGE_VERSION}`;
 //#endregion
 //#region src/model-catalog.js
@@ -2995,6 +3025,7 @@ function createOfficialModelCatalog(options = {}) {
 			etag = nonEmpty$2(response.headers.get("etag")) ?? etag;
 			revision += 1;
 			outcome = "ok";
+			options.onUpdated?.();
 			return true;
 		})();
 		let rejectAborted;
@@ -3047,6 +3078,7 @@ function createOfficialModelCatalog(options = {}) {
 			etag = void 0;
 			refreshStatus = "idle";
 			revision += 1;
+			options.onUpdated?.();
 		}
 	});
 }
@@ -3699,7 +3731,7 @@ function createCodexImageTool(options) {
 				localPath: options.originalImages.originalPath(original.assetId),
 				...metadata.background === void 0 ? {} : { background: metadata.background },
 				...metadata.quality === void 0 ? {} : { quality: metadata.quality },
-				...metadata.size === void 0 ? {} : { size: metadata.size }
+				size: `${original.width}x${original.height}`
 			};
 			if (exec.parent !== void 0) exec.deferContext(createUserMessage({
 				content: imageContent(result),
@@ -3925,7 +3957,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, modelCatalog }) {
+async function createSubscriptionDiagnostics({ auth, preferences, login = { phase: "idle" }, network, modelCatalog, connection, compaction }) {
 	let account = { status: "unknown" };
 	const issues = [];
 	try {
@@ -3963,6 +3995,19 @@ async function createSubscriptionDiagnostics({ auth, preferences, login = { phas
 		account,
 		login,
 		requests: safeRequests(network),
+		...connection ? { websocket: safeCounters(connection, [
+			"requests",
+			"connectionsCreated",
+			"connectionsReused",
+			"deltaRequests",
+			"websocketFailures",
+			"sseFallbacks"
+		]) } : {},
+		...compaction ? { compaction: safeCounters(compaction, [
+			"requests",
+			"checkpointsSaved",
+			"checkpointsReused"
+		]) } : {},
 		...catalog && ["fallback", "online"].includes(catalog.source) && [
 			"idle",
 			"refreshing",
@@ -3985,6 +4030,10 @@ async function createSubscriptionDiagnostics({ auth, preferences, login = { phas
 		issues
 	};
 }
+function safeCounters(source, keys) {
+	const values = source.snapshot();
+	return Object.fromEntries(keys.filter((key) => Number.isSafeInteger(values?.[key]) && values[key] >= 0).map((key) => [key, values[key]]));
+}
 //#endregion
 //#region src/usage.js
 const CODEX_USAGE_URL = "https://chatgpt.com/backend-api/wham/usage";
@@ -4682,6 +4731,7 @@ function createQuotaForecastReader({ reader, enabled, now = Date.now, scope = ()
 			return current === generation ? forecast.usage : usage;
 		},
 		clear: () => clearHistory(),
+		storage: () => stateStore.usage(),
 		clearCache() {
 			generation += 1;
 			reader.clear();
@@ -4767,6 +4817,22 @@ var QuotaForecastStateStore = class {
 	async clear() {
 		await rm(this.filename, { force: true });
 	}
+	async usage() {
+		try {
+			const info = await lstat(this.filename);
+			if (!info.isFile() || info.isSymbolicLink()) throw Error("Unexpected forecast cache entry");
+			return {
+				bytes: info.size,
+				limit: this.maxBytes
+			};
+		} catch (error) {
+			if (error.code === "ENOENT") return {
+				bytes: 0,
+				limit: this.maxBytes
+			};
+			throw error;
+		}
+	}
 };
 //#endregion
 //#region src/reset-credits.js
@@ -5065,6 +5131,17 @@ const publicError = (code, message) => ({
 });
 function createSubscriptionRpcHandler({ authHandler, usageReader, resetCreditService, preferences, runtimeManagement, diagnosticsReader, modelCatalog, originalImages, resolveInheritedOriginal, closeConnections, onAccountChanged }) {
 	return async (endpoint, payload, signal) => {
+		if (endpoint === "storage/status" || endpoint === "storage/clear-forecast") try {
+			signal.throwIfAborted();
+			if (endpoint === "storage/clear-forecast") await usageReader.clear();
+			return {
+				ok: true,
+				value: await usageReader.storage()
+			};
+		} catch (error) {
+			if (signal.aborted) throw error;
+			return publicError("operation-error", "Could not manage forecast cache");
+		}
 		if ([
 			"runtime/status",
 			"runtime/install",
@@ -5328,6 +5405,7 @@ function apply(ctx, config = {}) {
 	});
 	ctx.effect(() => ctx.on?.("plugin-manager/install-state", (value) => runtimeManagement.progress(value)));
 	const modelCatalog = createOfficialModelCatalog({
+		onUpdated: () => ctx.llm.emitAdaptersUpdated?.(),
 		getAuth: (options) => resolveAuth(options),
 		readCredential: (options) => store.read(PROVIDER, options),
 		baseModels: () => baseProvider.getModels(),
@@ -5634,7 +5712,9 @@ function apply(ctx, config = {}) {
 			preferences,
 			login: coordinator.supportState(),
 			network,
-			modelCatalog
+			modelCatalog,
+			connection,
+			compaction
 		}),
 		modelCatalog,
 		closeConnections: () => connection.dispose(),

package/package.json

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