dsh-codex-subscription 2.6.4 → 2.6.5

package/README.en.md

@@ -106,7 +106,7 @@ This plugin supports the latest DeepSeek Harness release recorded in its package
 2. Paste this package name, with its version, into the **Package name or address** field:
 
    ```text
-   dsh-codex-subscription@2.6.4
+   dsh-codex-subscription@2.6.5
    ```
 
 3. Click **Install** and wait for completion. Follow the page instructions; save your work before restarting if requested.
@@ -118,7 +118,7 @@ Why the version is included: DSH's plugin page only installs versions that are a
 <summary>Terminal installation (with an existing dsh command)</summary>
 
 ```sh
-dsh plugin --profile web add dsh-codex-subscription@2.6.4
+dsh plugin --profile web add dsh-codex-subscription@2.6.5
 ```
 
 Follow the restart instructions, then sign in under **Settings → Codex**. Both the Plugins page and the terminal use DSH's installation management.
@@ -131,7 +131,7 @@ Follow the restart instructions, then sign in under **Settings → Codex**. Both
 After signing in and selecting a Codex model in Web, install the same plugin in the Headless profile:
 
 ```sh
-dsh plugin --profile headless add dsh-codex-subscription@2.6.4
+dsh plugin --profile headless add dsh-codex-subscription@2.6.5
 dsh --profile headless "Reply with only the word: ok"
 ```
 
@@ -266,7 +266,7 @@ Find this plugin on the DSH **Plugins** page and use its update or uninstall act
 <summary>Terminal commands</summary>
 
 ```sh
-dsh plugin --profile web update dsh-codex-subscription@2.6.4
+dsh plugin --profile web update dsh-codex-subscription@2.6.5
 ```
 
 Run only when you want to uninstall:
@@ -282,7 +282,7 @@ dsh plugin --profile web remove dsh-codex-subscription
 <details>
 <summary>DSH 0.2.0-rc.2 reports the plugin as incompatible?</summary>
 
-DSH 0.2.0-rc.2 did not exist when any release before 2.2.10 was published, and a published package's compatibility declaration cannot be changed. Install 2.2.10 or later (a bare package name can resolve to an older release during the first 24 hours, so enter `dsh-codex-subscription@2.2.10`) from the **Plugins** page, or run `dsh plugin --profile web update dsh-codex-subscription@2.6.4`, then restart DSH.
+DSH 0.2.0-rc.2 did not exist when any release before 2.2.10 was published, and a published package's compatibility declaration cannot be changed. Install 2.2.10 or later (a bare package name can resolve to an older release during the first 24 hours, so enter `dsh-codex-subscription@2.2.10`) from the **Plugins** page, or run `dsh plugin --profile web update dsh-codex-subscription@2.6.5`, then restart DSH.
 
 </details>
 

package/README.md

@@ -106,7 +106,7 @@
 2. 在 **包名或地址** 输入框中粘贴下面的包名（已带版本号）：
 
    ```text
-   dsh-codex-subscription@2.6.4
+   dsh-codex-subscription@2.6.5
    ```
 
 3. 点击 **安装**，等待安装完成；按页面提示操作，需要重启时先保存工作。
@@ -118,7 +118,7 @@
 <summary>终端安装（已能运行 dsh 命令）</summary>
 
 ```sh
-dsh plugin --profile web add dsh-codex-subscription@2.6.4
+dsh plugin --profile web add dsh-codex-subscription@2.6.5
 ```
 
 安装完成后按提示重启 DSH，再到 **设置 → Codex 订阅** 登录。插件页面和终端均由 DSH 管理安装。
@@ -131,7 +131,7 @@ dsh plugin --profile web add dsh-codex-subscription@2.6.4
 先在 Web 中完成登录并选择一次 Codex 模型，再把同一个插件安装到 Headless profile：
 
 ```sh
-dsh plugin --profile headless add dsh-codex-subscription@2.6.4
+dsh plugin --profile headless add dsh-codex-subscription@2.6.5
 dsh --profile headless "只回复：ok"
 ```
 
@@ -295,7 +295,7 @@ DSH 实机设置截图。
 <summary>终端方式</summary>
 
 ```sh
-dsh plugin --profile web update dsh-codex-subscription@2.6.4
+dsh plugin --profile web update dsh-codex-subscription@2.6.5
 ```
 
 仅在需要卸载时运行：
@@ -311,7 +311,7 @@ dsh plugin --profile web remove dsh-codex-subscription
 <details>
 <summary>DSH 0.2.0-rc.2 提示插件不兼容？</summary>
 
-2.2.10 之前的所有版本发布时 DSH 0.2.0-rc.2 还不存在，其兼容声明无法事后修改。请安装 2.2.10 或更高版本（只填包名时，发布满 24 小时前可能装到旧版，请直接填 `dsh-codex-subscription@2.2.10`）：在 **插件** 页面更新，或运行 `dsh plugin --profile web update dsh-codex-subscription@2.6.4`，然后重启 DSH。
+2.2.10 之前的所有版本发布时 DSH 0.2.0-rc.2 还不存在，其兼容声明无法事后修改。请安装 2.2.10 或更高版本（只填包名时，发布满 24 小时前可能装到旧版，请直接填 `dsh-codex-subscription@2.2.10`）：在 **插件** 页面更新，或运行 `dsh plugin --profile web update dsh-codex-subscription@2.6.5`，然后重启 DSH。
 
 </details>
 

package/lib/client.js

@@ -9153,7 +9153,7 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/version.js
-		const PACKAGE_VERSION = "2.6.4";
+		const PACKAGE_VERSION = "2.6.5";
 		//#endregion
 		//#region src/client-recovery.js
 		async function recoveryCall(rpc, endpoint, payload = {}, timeoutMs = 1e4) {

package/lib/index.js

@@ -2080,7 +2080,7 @@ function inheritedOriginalImageRef(session, assetId) {
 }
 //#endregion
 //#region src/version.js
-const PACKAGE_VERSION = "2.6.4";
+const PACKAGE_VERSION = "2.6.5";
 const USER_AGENT = `dsh-codex-subscription/${PACKAGE_VERSION}`;
 //#endregion
 //#region src/codex-images.js
@@ -5377,7 +5377,7 @@ function createWakeSignal() {
 	};
 }
 function shortResetDelay(usage, nowMs, maxWaitMs, resetMarginMs) {
-	if (typeof usage?.rateLimitReachedType === "string" && /^(?:workspace_|.*credits_depleted)/u.test(usage.rateLimitReachedType)) return void 0;
+	if (typeof usage?.rateLimitReachedType === "string" && /^workspace_[a-z_]*usage_limit_reached$/u.test(usage.rateLimitReachedType)) return void 0;
 	let latestDelayMs;
 	for (const limit of usage?.rateLimits ?? []) {
 		if (limit?.id !== "codex") continue;
@@ -5441,6 +5441,29 @@ async function waitForResetOrWake(delayMs, signal, wait, wakeSignal, revision) {
 	controller.abort();
 	return result;
 }
+async function modelsReadyOrCancelled(modelsReady, signal) {
+	if (signal?.aborted) return "cancelled";
+	let onAbort;
+	const cancelled = new Promise((resolve) => {
+		onAbort = () => resolve("cancelled");
+		signal?.addEventListener("abort", onAbort, { once: true });
+	});
+	const ready = Promise.resolve().then(modelsReady).then((value) => value === true, () => false);
+	try {
+		return await Promise.race([ready, cancelled]);
+	} finally {
+		signal?.removeEventListener("abort", onAbort);
+	}
+}
+/**
+* Model readiness for a retry after an account switch. The refresh joins the
+* switch's own catalog reload and is not tied to the turn, so cancelling one
+* turn never aborts the reload other consumers share.
+*/
+const catalogModelsReady = (modelCatalog) => async () => {
+	await modelCatalog.refresh();
+	return modelCatalog.getModels().length > 0;
+};
 /**
 * Recover a Codex subscription RATE_LIMIT only when the backend confirms an
 * exhausted short quota window whose reset is close enough to wait out.
@@ -5449,9 +5472,9 @@ async function waitForResetOrWake(delayMs, signal, wait, wakeSignal, revision) {
 * the host's standard model-retry surface event so the turn shows the reason,
 * countdown, and normal turn cancellation affordance while it is parked.
 */
-function createCodexQuotaRetryHandler({ usageReader, provider = "openai-codex", enabled = () => true, now = Date.now, wait = cancellableDelay, maxWaitMs = DEFAULT_MAX_WAIT_MS, resetMarginMs = DEFAULT_RESET_MARGIN_MS } = {}) {
+function createCodexQuotaRetryHandler({ usageReader, provider = "openai-codex", enabled = () => true, now = Date.now, wait = cancellableDelay, modelsReady = () => true, maxWaitMs = DEFAULT_MAX_WAIT_MS, resetMarginMs = DEFAULT_RESET_MARGIN_MS } = {}) {
 	if (usageReader === void 0 || typeof usageReader.read !== "function") throw new TypeError("quota retry requires a usage reader");
-	if (typeof enabled !== "function" || typeof now !== "function" || typeof wait !== "function") throw new TypeError("quota retry requires enablement, clock, and wait functions");
+	if (typeof enabled !== "function" || typeof now !== "function" || typeof wait !== "function" || typeof modelsReady !== "function") throw new TypeError("quota retry requires enablement, clock, wait, and model readiness functions");
 	if (!Number.isFinite(maxWaitMs) || maxWaitMs <= 0 || !Number.isFinite(resetMarginMs) || resetMarginMs < 0) throw new TypeError("quota retry requires a positive wait cap and non-negative reset margin");
 	const wakeSignal = createWakeSignal();
 	const clearCache = async () => {
@@ -5491,6 +5514,12 @@ function createCodexQuotaRetryHandler({ usageReader, provider = "openai-codex",
 			const reason = await waitForResetOrWake(resetDelayMs + resetMarginMs, signal, wait, wakeSignal, wakeRevision);
 			if (reason === "cancelled" || signal?.aborted) return void 0;
 			if (!enabled()) return next();
+			if (reason === "account") {
+				const ready = await modelsReadyOrCancelled(modelsReady, signal);
+				if (ready === "cancelled" || signal?.aborted) return void 0;
+				if (!ready) return next();
+				break;
+			}
 			if (reason !== "configuration") break;
 			wakeRevision = wakeSignal.revision();
 			resetDelayMs = shortResetDelay(usage, now(), maxWaitMs, resetMarginMs);
@@ -6771,7 +6800,8 @@ function apply(ctx, config = {}) {
 	const activeQuotaRetries = /* @__PURE__ */ new Set();
 	const quotaRetryHandler = createCodexQuotaRetryHandler({
 		usageReader,
-		enabled: () => normalizeAutoQuotaRetry(settings.get()[AUTO_QUOTA_RETRY_FIELD])
+		enabled: () => normalizeAutoQuotaRetry(settings.get()[AUTO_QUOTA_RETRY_FIELD]),
+		modelsReady: catalogModelsReady(modelCatalog)
 	});
 	const disposeQuotaRetry = ctx.on("agent/request-error", (payload, next) => {
 		if (quotaRetryLifetime.signal.aborted) return Promise.resolve(void 0);

package/package.json

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