dsh-codex-subscription 2.6.3 → 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.3
+   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.3
+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.3
+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.3
+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.3`, 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.3
+   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.3
+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.3
 先在 Web 中完成登录并选择一次 Codex 模型，再把同一个插件安装到 Headless profile：
 
 ```sh
-dsh plugin --profile headless add dsh-codex-subscription@2.6.3
+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.3
+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.3`，然后重启 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

@@ -5960,6 +5960,10 @@ window.__ModuleLoader__.load({
 			deviceHint: "在登录页输入此设备代码：",
 			waiting: "正在等待登录完成…",
 			failed: "登录失败，请重试。",
+			failed_account_claim: "登录已授权，但这个账号的令牌里没有 ChatGPT 账号 ID（常见于只用手机号注册的账号）。请改用邮箱账号登录，或先在 ChatGPT 里为账号绑定邮箱后重试。",
+			failed_network: "登录时网络连接失败。请检查网络或代理后重试。",
+			failed_token_exchange: "授权已完成，但换取令牌失败。请重试；反复出现时请检查网络或代理。",
+			failed_callback: "没有收到浏览器的授权回调。请重试，或改用设备码登录。",
 			accountRetry: "重试",
 			accountRetrying: "正在重试账户状态…",
 			accountCredentialUnavailable: "登录凭据暂时不可用。请重试；不会删除已保存的登录信息。",
@@ -6562,6 +6566,10 @@ window.__ModuleLoader__.load({
 			deviceHint: "Enter this device code on the sign-in page:",
 			waiting: "Waiting for sign-in to finish…",
 			failed: "Sign-in failed. Try again.",
+			failed_account_claim: "Sign-in was authorized, but the token of this account has no ChatGPT account ID (common for accounts created with only a phone number). Sign in with an email account, or add an email to the account in ChatGPT first, then try again.",
+			failed_network: "The network connection failed during sign-in. Check the network or proxy and try again.",
+			failed_token_exchange: "Authorization finished, but exchanging it for a token failed. Try again; if it keeps happening, check the network or proxy.",
+			failed_callback: "The browser did not send the authorization back. Try again, or use device code sign-in.",
 			accountRetry: "Retry",
 			accountRetrying: "Retrying account status…",
 			accountCredentialUnavailable: "The saved sign-in credentials are temporarily unavailable. Retry; saved sign-in information will not be deleted.",
@@ -9145,7 +9153,7 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/version.js
-		const PACKAGE_VERSION = "2.6.3";
+		const PACKAGE_VERSION = "2.6.5";
 		//#endregion
 		//#region src/client-recovery.js
 		async function recoveryCall(rpc, endpoint, payload = {}, timeoutMs = 1e4) {
@@ -11143,6 +11151,12 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/client-account.jsx
+		const LOGIN_FAILURES = [
+			"account-claim",
+			"network",
+			"token-exchange",
+			"callback"
+		];
 		function AccountEmail({ candidate, fallback, t, emailVisible, onClick }) {
 			if (typeof candidate?.email !== "string" || candidate.email.length === 0) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 				title: t("emailUnavailable"),
@@ -11502,7 +11516,7 @@ window.__ModuleLoader__.load({
 					flow?.phase === "failed" || error !== void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 						className: "codexSubscriptionError",
 						role: "alert",
-						children: error ?? t("failed")
+						children: error ?? (LOGIN_FAILURES.includes(flow?.failure) ? t(`failed_${flow.failure.replace("-", "_")}`) : t("failed"))
 					}) : null
 				]
 			});

package/lib/index.js

@@ -2080,7 +2080,7 @@ function inheritedOriginalImageRef(session, assetId) {
 }
 //#endregion
 //#region src/version.js
-const PACKAGE_VERSION = "2.6.3";
+const PACKAGE_VERSION = "2.6.5";
 const USER_AGENT = `dsh-codex-subscription/${PACKAGE_VERSION}`;
 //#endregion
 //#region src/codex-images.js
@@ -3358,6 +3358,13 @@ const publicPrompt = (prompt) => ({
 	message: String(prompt.message ?? ""),
 	...typeof prompt.placeholder === "string" ? { placeholder: prompt.placeholder } : {}
 });
+const PUBLIC_FAILURES = /* @__PURE__ */ new Set([
+	"account-claim",
+	"network",
+	"token-exchange",
+	"callback"
+]);
+const publicFailure = (kind) => PUBLIC_FAILURES.has(kind) ? kind : void 0;
 function classifyLoginFailure(error) {
 	const message = error instanceof Error ? error.message : "";
 	if (/token exchange failed/iu.test(message)) return "token-exchange";
@@ -3517,7 +3524,8 @@ var CodexLoginCoordinator = class {
 				method,
 				phase: "failed",
 				authenticated: false,
-				error: "Codex login failed"
+				error: "Codex login failed",
+				failure: publicFailure(classifyLoginFailure(error))
 			};
 			session.hostError = error;
 		}).finally(publishReady);
@@ -5369,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;
@@ -5433,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.
@@ -5441,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 () => {
@@ -5483,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);
@@ -6763,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.3",
+  "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",