dsh-codex-subscription 1.11.0 → 1.11.1

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.0` package below; do not install a moving branch.
+- Use the exact `1.11.1` 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.0
+npx -y @deepseek-ai/dsh@0.1.1-rc.2 plugin --profile web add dsh-codex-subscription@1.11.1
 ```
 
 With an existing global `dsh` command:
 
 ```sh
-dsh plugin --profile web add dsh-codex-subscription@1.11.0
+dsh plugin --profile web add dsh-codex-subscription@1.11.1
 ```
 
 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.0` appears exactly once.
+1. `dsh-codex-subscription` version `1.11.1` 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/README.md

@@ -12,7 +12,7 @@ No OpenAI API key or Codex CLI. Models, search, quota, and image generation stay
 [![MIT](https://img.shields.io/badge/license-MIT-111111.svg)](LICENSE)
 [![Star](https://img.shields.io/github/stars/WSL043/dsh-codex-subscription?style=flat&logo=github&label=Star)](https://github.com/WSL043/dsh-codex-subscription/stargazers)
 
-[Three-step start](#three-step-start) · [Install](#install) · [Update and uninstall](#update-and-uninstall) · [简体中文](https://github.com/WSL043/dsh-codex-subscription/blob/main/README.zh-CN.md)
+[Three-step start](#three-step-start) · [Install](#install) · [Contribute](CONTRIBUTING.md) · [Update and uninstall](#update-and-uninstall) · [简体中文](https://github.com/WSL043/dsh-codex-subscription/blob/main/README.zh-CN.md)
 
 </div>
 
@@ -211,6 +211,7 @@ The ChatGPT Codex backend and DSH can change independently. This community proje
 
 Use the [bug report form](https://github.com/WSL043/dsh-codex-subscription/issues/new?template=install-problem.yml) for project feedback.
 Use the [feature request form](https://github.com/WSL043/dsh-codex-subscription/issues/new?template=feature-request.yml) for focused product suggestions.
+Focused fixes and compatibility improvements are welcome; see [CONTRIBUTING.md](CONTRIBUTING.md).
 For DSH plugin discussion, visit [DeepSeek Harness Discussions](https://github.com/deepseek-ai/deepseek-harness/discussions).
 Read [SECURITY.md](SECURITY.md) before reporting sensitive issues.
 

package/README.zh-CN.md

@@ -13,7 +13,7 @@
 [![MIT](https://img.shields.io/badge/license-MIT-111111.svg)](LICENSE)
 [![Star](https://img.shields.io/github/stars/WSL043/dsh-codex-subscription?style=flat&logo=github&label=Star)](https://github.com/WSL043/dsh-codex-subscription/stargazers)
 
-[三步开始](#三步开始) · [安装](#安装) · [更新与卸载](#更新与卸载) · [English](https://github.com/WSL043/dsh-codex-subscription/blob/main/README.md)
+[三步开始](#三步开始) · [安装](#安装) · [参与贡献](CONTRIBUTING.md) · [更新与卸载](#更新与卸载) · [English](https://github.com/WSL043/dsh-codex-subscription/blob/main/README.md)
 
 </div>
 
@@ -139,7 +139,7 @@ dsh --profile web --dump-config
 ### 输入框额度
 
 <p align="center">
-  <img src="https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/composer-quota-en.png" width="800" alt="输入框内的 Codex 剩余额度">
+  <img src="https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/composer-quota.png" width="800" alt="中文 DSH 输入框内的 Codex 剩余额度进度条">
 </p>
 
 可在设置中选择关闭、百分比、进度条或 Beta 续航预测；紧凑额度只在选择 Codex 模型时显示。续航预测仅在用户主动选择后，根据本机运行内存中观察到的官方剩余百分比估算当前消耗速度；样本不足时保持安静，额度重置、登录变化或关闭功能后会重新校准。普通 Codex 使用服务端返回窗口中剩余最少的一项，
@@ -209,6 +209,7 @@ ChatGPT Codex 后端和 DSH 可能独立变化；本项目为社区项目，与
 
 本项目的问题反馈请使用[使用问题表单](https://github.com/WSL043/dsh-codex-subscription/issues/new?template=install-problem.yml)；
 明确的产品建议请使用[功能建议表单](https://github.com/WSL043/dsh-codex-subscription/issues/new?template=feature-request.yml)；
+欢迎提交聚焦的修复和兼容性改进，具体要求见 [CONTRIBUTING.md](CONTRIBUTING.md)；
 DSH 插件交流可前往 [DeepSeek Harness Discussions](https://github.com/deepseek-ai/deepseek-harness/discussions)。
 敏感问题请先阅读 [SECURITY.md](SECURITY.md)。
 

package/lib/client.js

@@ -318,6 +318,7 @@ window.__ModuleLoader__.load({
 			resetTooEarly: "请等待冷静期结束后再确认。",
 			resetAcknowledgeRequired: "请先确认已了解这次操作可能消耗重置次数。",
 			resetAccountChanged: "登录账号已变更，请重新开始。",
+			resetUncertain: "服务端返回结果不确定。请再次确认，插件会复用同一个请求，不会另外发起一次重置。",
 			creditsNote: "仅显示 Codex 为此账户或工作区实际返回的额外 Credits、消费上限或额度重置次数；三者不是同一项。",
 			creditsUsed: "已用 {used} / {limit} credits",
 			spendReached: "Credits 月度消费上限已用尽。",
@@ -483,6 +484,7 @@ window.__ModuleLoader__.load({
 			resetTooEarly: "Wait for the cooldown before confirming.",
 			resetAcknowledgeRequired: "Confirm that you understand this may consume a reset.",
 			resetAccountChanged: "The signed-in account changed. Start again.",
+			resetUncertain: "The server result is uncertain. Confirm again to check the same request; the plugin will not start a separate reset.",
 			creditsNote: "Shows only extra Credits, spending caps, or quota resets returned for this account or workspace; these are separate items.",
 			creditsUsed: "{used} / {limit} credits used",
 			spendReached: "The monthly Credits spending cap has been reached.",
@@ -2310,7 +2312,8 @@ window.__ModuleLoader__.load({
 				["This quota reset is already in progress", "resetInProgress"],
 				["Wait before confirming this quota reset", "resetTooEarly"],
 				["You must acknowledge that this may consume one quota reset", "resetAcknowledgeRequired"],
-				["The signed-in ChatGPT account changed", "resetAccountChanged"]
+				["The signed-in ChatGPT account changed", "resetAccountChanged"],
+				["Quota reset result is uncertain; retry this confirmation to check the same request", "resetUncertain"]
 			])).get(error instanceof Error ? error.message : "") ?? "resetFailed");
 		}
 		function UsageCard({ rpc, t, signedIn, resetKey }) {

package/lib/index.js

@@ -936,7 +936,7 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 }
 //#endregion
 //#region src/version.js
-const PACKAGE_VERSION = "1.11.0";
+const PACKAGE_VERSION = "1.11.1";
 const USER_AGENT = `dsh-codex-subscription/${PACKAGE_VERSION}`;
 //#endregion
 //#region src/model-catalog.js
@@ -2156,6 +2156,7 @@ const DEFAULT_CONFIRM_DELAY_MS = 5e3;
 const DEFAULT_CHALLENGE_TTL_MS = 6e4;
 const DEFAULT_TIMEOUT_MS = 15e3;
 const MAX_COPY_LENGTH = 240;
+const UNCERTAIN_RESET_RESULT = "Quota reset result is uncertain; retry this confirmation to check the same request";
 const record = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
 const requestSignal = (signal, timeoutMs) => {
 	const timeout = AbortSignal.timeout(timeoutMs);
@@ -2232,8 +2233,8 @@ function createCodexResetCreditService(options) {
 	const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
 	const challenges = /* @__PURE__ */ new Map();
 	const resolveCredentials = async (signal) => credentialsOf(await getAuth({ signal }), await readCredential({ signal }));
-	const readDetails = async (signal) => {
-		const { access, accountId } = await resolveCredentials(signal);
+	const readDetails = async (signal, credentials) => {
+		const { access, accountId } = credentials ?? await resolveCredentials(signal);
 		const response = await fetchReset(CODEX_RESET_CREDITS_URL, {
 			method: "GET",
 			redirect: "error",
@@ -2267,7 +2268,24 @@ function createCodexResetCreditService(options) {
 			};
 		},
 		async prepare({ signal } = {}) {
-			const { accountId, details } = await readDetails(signal);
+			const credentials = await resolveCredentials(signal);
+			for (const [challengeId, challenge] of challenges) {
+				if (challenge.accountId !== credentials.accountId || challenge.uncertain !== true) continue;
+				if (now() > challenge.expiresAt) {
+					challenges.delete(challengeId);
+					continue;
+				}
+				return {
+					challengeId,
+					availableCount: challenge.availableCount,
+					readyAt: challenge.readyAt,
+					expiresAt: challenge.expiresAt,
+					...challenge.creditExpiresAt === void 0 ? {} : { creditExpiresAt: challenge.creditExpiresAt },
+					...challenge.title === void 0 ? {} : { title: challenge.title },
+					...challenge.description === void 0 ? {} : { description: challenge.description }
+				};
+			}
+			const { accountId, details } = await readDetails(signal, credentials);
 			const preparedAt = now();
 			const readyAt = preparedAt + confirmDelayMs;
 			const expiresAt = Math.min(preparedAt + challengeTtlMs, details.creditExpiresAt ?? Number.MAX_SAFE_INTEGER);
@@ -2279,7 +2297,12 @@ function createCodexResetCreditService(options) {
 				creditId: details.creditId,
 				redeemRequestId: randomUUID$1(),
 				readyAt,
-				expiresAt
+				expiresAt,
+				availableCount: details.availableCount,
+				creditExpiresAt: details.creditExpiresAt,
+				title: details.title,
+				description: details.description,
+				uncertain: false
 			});
 			return {
 				challengeId,
@@ -2302,38 +2325,66 @@ function createCodexResetCreditService(options) {
 			}
 			if (acknowledged !== true) throw new Error("You must acknowledge that this may consume one quota reset");
 			challenge.state = "pending";
+			let retryable = challenge.uncertain === true;
 			try {
 				const { access, accountId } = await resolveCredentials(signal);
-				if (accountId !== challenge.accountId) throw new Error("The signed-in ChatGPT account changed");
-				const response = await fetchReset(CODEX_RESET_CONSUME_URL, {
-					method: "POST",
-					redirect: "error",
-					headers: {
-						authorization: `Bearer ${access}`,
-						"chatgpt-account-id": accountId,
-						accept: "application/json",
-						"content-type": "application/json",
-						"cache-control": "no-store",
-						"user-agent": USER_AGENT
-					},
-					body: JSON.stringify({
-						redeem_request_id: challenge.redeemRequestId,
-						credit_id: challenge.creditId
-					}),
-					signal: requestSignal(signal, timeoutMs)
-				});
-				if (!response.ok) throw new Error(response.status === 401 || response.status === 403 ? "ChatGPT sign-in needs to be renewed" : `ChatGPT quota reset request failed (HTTP ${response.status})`);
+				if (accountId !== challenge.accountId) {
+					retryable = false;
+					throw new Error("The signed-in ChatGPT account changed");
+				}
+				let response;
+				try {
+					response = await fetchReset(CODEX_RESET_CONSUME_URL, {
+						method: "POST",
+						redirect: "error",
+						headers: {
+							authorization: `Bearer ${access}`,
+							"chatgpt-account-id": accountId,
+							accept: "application/json",
+							"content-type": "application/json",
+							"cache-control": "no-store",
+							"user-agent": USER_AGENT
+						},
+						body: JSON.stringify({
+							redeem_request_id: challenge.redeemRequestId,
+							credit_id: challenge.creditId
+						}),
+						signal: requestSignal(signal, timeoutMs)
+					});
+				} catch {
+					retryable = true;
+					throw new Error(UNCERTAIN_RESET_RESULT);
+				}
+				if (!response.ok) {
+					if (response.status >= 500) {
+						retryable = true;
+						throw new Error(UNCERTAIN_RESET_RESULT);
+					}
+					if (response.status !== 401 && response.status !== 403) retryable = false;
+					throw new Error(response.status === 401 || response.status === 403 ? "ChatGPT sign-in needs to be renewed" : `ChatGPT quota reset request failed (HTTP ${response.status})`);
+				}
 				let raw;
 				try {
 					raw = await response.json();
 				} catch {
-					throw new Error("ChatGPT returned an unreadable quota reset response");
+					retryable = true;
+					throw new Error(UNCERTAIN_RESET_RESULT);
 				}
-				const result = parseConsumeResult(raw);
+				let result;
+				try {
+					result = parseConsumeResult(raw);
+				} catch {
+					retryable = true;
+					throw new Error(UNCERTAIN_RESET_RESULT);
+				}
+				retryable = false;
 				usageReader.clear();
 				return result;
 			} finally {
-				challenges.delete(challengeId);
+				if (retryable && now() <= challenge.expiresAt) {
+					challenge.state = "prepared";
+					challenge.uncertain = true;
+				} else challenges.delete(challengeId);
 			}
 		},
 		clear() {
@@ -2347,7 +2398,6 @@ const name = "codex-subscription";
 const inject = [
 	"llm",
 	"credentials",
-	"connection",
 	"settings",
 	"web",
 	"loader",
@@ -2723,7 +2773,7 @@ function apply(ctx) {
 	ctx.effect(() => {
 		modelCatalog.refresh().catch((error) => ctx.logger?.debug?.("could not refresh Codex model catalog: %s", error.message));
 	}, "codex-subscription: official model catalog");
-	ctx.effect(() => ctx.connection.rpc.handle(CHANNEL, handler, { authority: "trusted-host" }), "codex-subscription: DSH-trusted account RPC");
+	ctx.inject(["connection"], (connectionContext) => connectionContext.effect(() => connectionContext.connection.rpc.handle(CHANNEL, handler, { authority: "trusted-host" }), "codex-subscription: DSH-trusted account RPC"));
 }
 //#endregion
 export { CODEX_IMAGE_GENERATION_URL, CODEX_IMAGE_TOOL_NAME, CODEX_RESET_CONSUME_URL, CODEX_RESET_CREDITS_URL, CODEX_USAGE_URL, CodexLoginCoordinator, DshOAuthCredentialStore, apply, assertCodexAuthUrl, commandForCodexAuthUrl, createCodexAuthService, createCodexImageTool, createCodexResetCreditService, createCodexRpcHandler, createCodexUsageReader, createSearchProviderSwitcher, createSubscriptionDiagnostics, createSubscriptionRpcHandler, decodeCodexPng, inject, name, normalizeContextMode, normalizeCustomContextWindow, openCodexAuthUrl, parseCodexUsage };

package/package.json

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