dsh-codex-subscription 1.11.3 → 1.11.4

package/AGENTS.md

@@ -6,7 +6,7 @@ Use this guide when a user asks an Agent to install, update, verify, or remove
 ## Safety
 
 - Confirm the target DSH installation and profile. Use `web` only when it is the user's target.
-- Use the exact `1.11.3` package below; do not install a moving branch.
+- Use the exact `1.11.4` package below; do not install a moving branch.
 - Never print OAuth credentials, account IDs, authorization callbacks, or credential-store contents.
 - Preserve the DSH profile, unrelated plugins, sessions, and saved sign-in.
 - Do not start, stop, or restart DSH without explicit permission.
@@ -34,13 +34,13 @@ For an official DSH installation run through npm, keep the complete `npx` prefix
 run command does not create a global `dsh` command:
 
 ```sh
-npx -y @deepseek-ai/dsh@0.1.1-rc.2 plugin --profile web add dsh-codex-subscription@1.11.3
+npx -y @deepseek-ai/dsh@0.1.1-rc.2 plugin --profile web add dsh-codex-subscription@1.11.4
 ```
 
 With an existing global `dsh` command:
 
 ```sh
-dsh plugin --profile web add dsh-codex-subscription@1.11.3
+dsh plugin --profile web add dsh-codex-subscription@1.11.4
 ```
 
 Use the same `add` command to update or repair. This is the complete package-changing operation.
@@ -58,7 +58,7 @@ dsh --profile web --dump-config
 
 For the official npm route, run the same checks with `npx -y @deepseek-ai/dsh@0.1.1-rc.2` in place of `dsh`.
 
-1. `dsh-codex-subscription` version `1.11.3` appears exactly once.
+1. `dsh-codex-subscription` version `1.11.4` appears exactly once.
 2. `codex-subscription` appears exactly once in the composed config.
 3. No unrelated plugin or profile was changed and DSH was not restarted.
 

package/compatibility.json

@@ -8,6 +8,7 @@
     "0.1.1-rc.2"
   ],
   "previews": [
-    "0.1.2-alpha.2"
+    "0.1.2-alpha.2",
+    "0.1.2-alpha.3"
   ]
 }

package/lib/index.js

@@ -44,11 +44,14 @@ function parseOAuthCredential(value) {
 */
 var DshOAuthCredentialStore = class {
 	#chains = /* @__PURE__ */ new Map();
-	constructor(credentials, ref, legacyRefs = []) {
+	constructor(credentials, ref, legacyRefs = [], options = {}) {
 		if (credentials === void 0 || credentials === null) throw new Error("Codex OAuth requires the DSH credentials service");
+		const expirySkewMs = options.expirySkewMs ?? 0;
+		if (!Number.isFinite(expirySkewMs) || expirySkewMs < 0) throw new Error("Codex OAuth expiry skew must be a non-negative finite number");
 		this.credentials = credentials;
 		this.ref = ref;
 		this.legacyRefs = Object.freeze([...legacyRefs]);
+		this.expirySkewMs = expirySkewMs;
 	}
 	#enqueue(providerId, operation, options) {
 		assertProvider(providerId);
@@ -78,7 +81,11 @@ var DshOAuthCredentialStore = class {
 		}
 		abortIfNeeded(options);
 		if (hit?.value === void 0 || hit.value === "") return void 0;
-		return parseOAuthCredential(hit.value);
+		const credential = parseOAuthCredential(hit.value);
+		return this.expirySkewMs === 0 ? credential : {
+			...credential,
+			expires: credential.expires - this.expirySkewMs
+		};
 	}
 	read(providerId, options) {
 		return this.#enqueue(providerId, () => this.#read(providerId, options), options);
@@ -935,7 +942,7 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 }
 //#endregion
 //#region src/version.js
-const PACKAGE_VERSION = "1.11.3";
+const PACKAGE_VERSION = "1.11.4";
 const USER_AGENT = `dsh-codex-subscription/${PACKAGE_VERSION}`;
 //#endregion
 //#region src/model-catalog.js
@@ -1836,6 +1843,8 @@ async function createSubscriptionDiagnostics({ auth, preferences, login = { phas
 const CODEX_USAGE_URL = "https://chatgpt.com/backend-api/wham/usage";
 const DEFAULT_TTL_MS = 6e4;
 const DEFAULT_TIMEOUT_MS$1 = 15e3;
+const DEFAULT_FAILURE_TTL_MS = 5e3;
+const DEFAULT_MAX_RETRY_AFTER_MS = 5 * 6e4;
 const record$1 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
 function windowOf(value) {
 	if (value === void 0 || value === null) return void 0;
@@ -1951,6 +1960,15 @@ const requestSignal$1 = (signal, timeoutMs) => {
 	const timeout = AbortSignal.timeout(timeoutMs);
 	return signal === void 0 ? timeout : AbortSignal.any([signal, timeout]);
 };
+function retryAfterMs(response, now, maximum) {
+	if (response.status !== 429) return void 0;
+	const raw = response.headers?.get?.("retry-after")?.trim();
+	if (!raw) return void 0;
+	const seconds = Number(raw);
+	const delay = Number.isFinite(seconds) && seconds >= 0 ? seconds * 1e3 : Date.parse(raw) - now();
+	if (!Number.isFinite(delay) || delay < 0) return void 0;
+	return Math.min(delay, maximum);
+}
 /**
 * Read quota through the same refreshable OAuth lifecycle used by model turns.
 * The browser receives only a parsed quota projection; bearer and account id
@@ -1963,7 +1981,10 @@ function createCodexUsageReader(options) {
 	const now = options.now ?? Date.now;
 	const ttlMs = options.ttlMs ?? DEFAULT_TTL_MS;
 	const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS$1;
+	const failureTtlMs = options.failureTtlMs ?? DEFAULT_FAILURE_TTL_MS;
+	const maxRetryAfterMs = options.maxRetryAfterMs ?? DEFAULT_MAX_RETRY_AFTER_MS;
 	let cached;
+	let failed;
 	let inFlight;
 	let generation = 0;
 	const load = async (signal) => {
@@ -1984,7 +2005,11 @@ function createCodexUsageReader(options) {
 			},
 			signal: requestSignal$1(signal, timeoutMs)
 		});
-		if (!response.ok) throw new Error(response.status === 401 || response.status === 403 ? "ChatGPT sign-in needs to be renewed" : `ChatGPT usage request failed (HTTP ${response.status})`);
+		if (!response.ok) {
+			const error = /* @__PURE__ */ new Error(response.status === 401 || response.status === 403 ? "ChatGPT sign-in needs to be renewed" : `ChatGPT usage request failed (HTTP ${response.status})`);
+			Object.defineProperty(error, "retryAfterMs", { value: retryAfterMs(response, now, maxRetryAfterMs) });
+			throw error;
+		}
 		let value;
 		try {
 			value = await response.json();
@@ -1998,12 +2023,25 @@ function createCodexUsageReader(options) {
 	};
 	return Object.freeze({
 		read({ force = false, signal } = {}) {
+			if (failed !== void 0 && now() < failed.retryAt) return Promise.reject(new Error(failed.message));
 			if (!force && cached !== void 0 && now() - cached.fetchedAt < ttlMs) return Promise.resolve(structuredClone(cached));
 			if (inFlight !== void 0) return inFlight.then(structuredClone);
 			const currentGeneration = generation;
 			const current = load(signal).then((value) => {
-				if (generation === currentGeneration) cached = structuredClone(value);
+				if (generation === currentGeneration) {
+					cached = structuredClone(value);
+					failed = void 0;
+				}
 				return structuredClone(value);
+			}).catch((error) => {
+				if (generation === currentGeneration && error?.name !== "AbortError") {
+					const delay = Number.isFinite(error?.retryAfterMs) ? error.retryAfterMs : failureTtlMs;
+					failed = {
+						message: error instanceof Error ? error.message : "ChatGPT usage request failed",
+						retryAt: now() + delay
+					};
+				}
+				throw error;
 			}).finally(() => {
 				if (inFlight === current) inFlight = void 0;
 			});
@@ -2013,6 +2051,7 @@ function createCodexUsageReader(options) {
 		clear() {
 			generation += 1;
 			cached = void 0;
+			failed = void 0;
 			inFlight = void 0;
 		}
 	});
@@ -2404,6 +2443,7 @@ const inject = [
 	"attachments"
 ];
 const PROVIDER = "openai-codex";
+const OAUTH_EXPIRY_SKEW_MS = 6e4;
 const CREDENTIAL_REF = credentialRef("OPENAI_CODEX_SUBSCRIPTION_OAUTH");
 const LEGACY_CREDENTIAL_REF = credentialRef("WSL043_OPENAI_CODEX_OAUTH");
 const CHANNEL = "/codex-subscription";
@@ -2616,7 +2656,7 @@ function apply(ctx) {
 	const searchProvider = createSearchProviderSwitcher(ctx.loader);
 	const network = createCodexNetworkTransport();
 	const originalImages = new OriginalImageStore();
-	const store = new DshOAuthCredentialStore(ctx.credentials, CREDENTIAL_REF, [LEGACY_CREDENTIAL_REF]);
+	const store = new DshOAuthCredentialStore(ctx.credentials, CREDENTIAL_REF, [LEGACY_CREDENTIAL_REF], { expirySkewMs: OAUTH_EXPIRY_SKEW_MS });
 	const baseProvider = createOpenAICodexProvider();
 	let resolveAuth = async () => void 0;
 	const modelCatalog = createOfficialModelCatalog({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-codex-subscription",
-  "version": "1.11.3",
+  "version": "1.11.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",
@@ -77,22 +77,22 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "4.0.1 || 4.0.2",
-    "@deepseek-ai/dsh-api-remotes": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2",
-    "@deepseek-ai/dsh-client-connection": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2",
-    "@deepseek-ai/dsh-client-locale": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2",
-    "@deepseek-ai/dsh-client-runtime": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2",
-    "@deepseek-ai/dsh-client-ui-conversation": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2",
-    "@deepseek-ai/dsh-client-ui-model-selection": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2",
-    "@deepseek-ai/dsh-client-ui-primitives": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2",
-    "@deepseek-ai/dsh-client-ui-settings": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2",
-    "@deepseek-ai/dsh-client-ui-slots": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2",
-    "@deepseek-ai/dsh-client-ui-tool": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2",
-    "@deepseek-ai/dsh-credentials": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2",
-    "@deepseek-ai/dsh-llm": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2",
-    "@deepseek-ai/dsh-llm-pi-ai": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2",
-    "@deepseek-ai/dsh-settings": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2",
-    "@deepseek-ai/dsh-tools": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2",
-    "@deepseek-ai/dsh-web": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2",
+    "@deepseek-ai/dsh-api-remotes": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2 || 0.1.2-alpha.3",
+    "@deepseek-ai/dsh-client-connection": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2 || 0.1.2-alpha.3",
+    "@deepseek-ai/dsh-client-locale": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2 || 0.1.2-alpha.3",
+    "@deepseek-ai/dsh-client-runtime": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2 || 0.1.2-alpha.3",
+    "@deepseek-ai/dsh-client-ui-conversation": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2 || 0.1.2-alpha.3",
+    "@deepseek-ai/dsh-client-ui-model-selection": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2 || 0.1.2-alpha.3",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2 || 0.1.2-alpha.3",
+    "@deepseek-ai/dsh-client-ui-settings": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2 || 0.1.2-alpha.3",
+    "@deepseek-ai/dsh-client-ui-slots": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2 || 0.1.2-alpha.3",
+    "@deepseek-ai/dsh-client-ui-tool": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2 || 0.1.2-alpha.3",
+    "@deepseek-ai/dsh-credentials": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2 || 0.1.2-alpha.3",
+    "@deepseek-ai/dsh-llm": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2 || 0.1.2-alpha.3",
+    "@deepseek-ai/dsh-llm-pi-ai": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2 || 0.1.2-alpha.3",
+    "@deepseek-ai/dsh-settings": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2 || 0.1.2-alpha.3",
+    "@deepseek-ai/dsh-tools": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2 || 0.1.2-alpha.3",
+    "@deepseek-ai/dsh-web": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2 || 0.1.2-alpha.2 || 0.1.2-alpha.3",
     "@deepseek-ai/schemastery": "3.18.1",
     "@earendil-works/pi-ai": "0.82.1",
     "react": "^18.2.0",