dsh-codex-subscription 2.5.6 → 2.5.7

package/README.en.md

@@ -8,7 +8,7 @@
 
 **Use your ChatGPT / Codex subscription directly in DeepSeek Harness**
 
-No OpenAI API key or Codex CLI. Models, search, quota, and image generation stay inside DSH.
+Sign in with ChatGPT Plus / Pro to use GPT-6 and other Codex models, quota, web search, and image generation inside DSH. No OpenAI API key or Codex CLI.
 
 [![CI](https://github.com/WSL043/dsh-codex-subscription/actions/workflows/ci.yml/badge.svg)](https://github.com/WSL043/dsh-codex-subscription/actions/workflows/ci.yml)
 [![npm](https://img.shields.io/npm/v/dsh-codex-subscription?logo=npm&label=npm)](https://www.npmjs.com/package/dsh-codex-subscription)
@@ -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.5.6
+   dsh-codex-subscription@2.5.7
    ```
 
 3. Click **Install** and wait for completion. Follow the page instructions; save your work before restarting if requested.

package/README.md

@@ -8,7 +8,7 @@
 
 **把 ChatGPT / Codex 订阅直接接入 DeepSeek Harness**
 
-登录已有订阅，即可在 DSH 中选模型、查额度、搜索和生图。无需 API Key，也不依赖 Codex CLI。
+用 ChatGPT Plus / Pro 订阅登录，即可在 DSH 中使用 GPT-6 等 Codex 模型、查额度、联网搜索和生图。无需 OpenAI API Key，也不依赖 Codex CLI。
 
 [![CI](https://github.com/WSL043/dsh-codex-subscription/actions/workflows/ci.yml/badge.svg)](https://github.com/WSL043/dsh-codex-subscription/actions/workflows/ci.yml)
 [![npm](https://img.shields.io/npm/v/dsh-codex-subscription?logo=npm&label=npm)](https://www.npmjs.com/package/dsh-codex-subscription)
@@ -106,7 +106,7 @@
 2. 在 **包名或地址** 输入框中粘贴下面的包名（已带版本号）：
 
    ```text
-   dsh-codex-subscription@2.5.6
+   dsh-codex-subscription@2.5.7
    ```
 
 3. 点击 **安装**，等待安装完成；按页面提示操作，需要重启时先保存工作。

package/lib/client.js

@@ -5781,15 +5781,18 @@ window.__ModuleLoader__.load({
 			unlimited: "不限额",
 			monthlyCreditLimit: "Credits 月度消费上限",
 			resetCredits: "额度重置",
+			resetCreditsHint: "使用重置可恢复短周期额度、每周额度，或两者同时恢复。",
+			resetAvailableTab: "可用",
+			resetFull: "完全重置",
 			resetCreditsAvailable: "额度重置（可用 {count} 次）",
 			resetCreditDefaultName: "额度重置",
-			resetUse: "使用",
+			resetUse: "使用重置",
 			resetPreparing: "准备中…",
 			resetConfirmTitle: "确认使用额度重置",
 			resetWarning: "执行后会消耗 1 次，且无法撤销。",
 			resetEarlyWarning: "当前额度未用尽，服务可能不执行重置。",
 			resetAcknowledge: "我知道这次操作可能立即消耗 1 次重置",
-			resetCreditExpires: "到期：{value}",
+			resetCreditExpires: "有效期至：{value}",
 			resetCreditExpiryUnknown: "到期时间未提供",
 			resetCreditExpiryLoading: "正在读取到期时间…",
 			resetCreditExpiryFailed: "无法读取到期时间",
@@ -6350,15 +6353,18 @@ window.__ModuleLoader__.load({
 			unlimited: "Unlimited",
 			monthlyCreditLimit: "Monthly Credits spending cap",
 			resetCredits: "Quota resets",
+			resetCreditsHint: "A reset restores your short-window limit, weekly limit, or both.",
+			resetAvailableTab: "Available",
+			resetFull: "Full reset",
 			resetCreditsAvailable: "Quota resets ({count} available)",
 			resetCreditDefaultName: "Quota reset",
-			resetUse: "Use",
+			resetUse: "Use reset",
 			resetPreparing: "Preparing…",
 			resetConfirmTitle: "Confirm quota reset",
 			resetWarning: "This consumes one reset and cannot be undone.",
 			resetEarlyWarning: "Quota remains. The service may decline the reset.",
 			resetAcknowledge: "I understand this may consume one reset now",
-			resetCreditExpires: "Expires {value}",
+			resetCreditExpires: "Valid until {value}",
 			resetCreditExpiryUnknown: "Expiration time not provided",
 			resetCreditExpiryLoading: "Reading expiration…",
 			resetCreditExpiryFailed: "Could not read expiration",
@@ -6634,9 +6640,21 @@ window.__ModuleLoader__.load({
 .codexSubscriptionCreditBalance strong{font:600 18px/24px ui-monospace,SFMono-Regular,Consolas,monospace;font-variant-numeric:tabular-nums;overflow-wrap:anywhere}
 .codexSubscriptionCreditRows{display:flex;flex-direction:column;gap:6px}
 .codexSubscriptionResetMeta{display:flex;min-width:0;flex-direction:column;gap:1px}
-.codexSubscriptionResetDisclosure>summary{cursor:pointer;width:fit-content;color:var(--dsw-alias-label-primary);border-radius:6px}
-.codexSubscriptionResetDisclosure>summary:focus-visible{outline:2px solid currentColor;outline-offset:4px}
-.codexSubscriptionResetDisclosure[open]>summary{margin-bottom:10px}
+.codexSubscriptionResetPanel{display:flex;flex-direction:column;gap:10px;margin-top:6px}
+.codexSubscriptionResetHead{display:flex;flex-direction:column;gap:2px}
+.codexSubscriptionResetHead strong{font-size:14px;line-height:20px;font-weight:600;color:var(--dsw-alias-label-primary)}
+.codexSubscriptionResetHead span{font-size:12px;line-height:18px;color:var(--dsw-alias-label-secondary)}
+.codexSubscriptionResetBox{border:1px solid var(--dsw-alias-border-l2);border-radius:12px;padding:6px 14px 2px}
+.codexSubscriptionResetTabs{display:flex;gap:8px;padding:6px 0 10px;border-bottom:1px solid var(--dsw-alias-border-l2)}
+.codexSubscriptionResetTabs span{display:inline-flex;align-items:center;gap:6px;padding:3px 10px;border-radius:8px;background:var(--dsw-alias-bg-module-platform);font-size:12px;line-height:18px;font-weight:600;color:var(--dsw-alias-label-primary)}
+.codexSubscriptionResetTabs b{font-weight:400;color:var(--dsw-alias-label-secondary)}
+.codexSubscriptionResetBox .codexSubscriptionResetBalance{gap:0}
+.codexSubscriptionResetBox .codexSubscriptionResetCard{padding:12px 0;border:0;border-radius:0;background:none}
+.codexSubscriptionResetBox .codexSubscriptionResetCard+.codexSubscriptionResetCard{border-top:1px solid var(--dsw-alias-border-l2)}
+.codexSubscriptionResetBox .codexSubscriptionResetCard strong{font-size:13px;line-height:20px;font-weight:600}
+.codexSubscriptionResetBox .codexSubscriptionResetExpiry{font-size:12px;line-height:18px;color:var(--dsw-alias-label-secondary)}
+.codexSubscriptionResetBox .codexSubscriptionResetUse{min-height:28px;padding:0 12px;border:0!important;border-radius:8px;background:var(--dsw-alias-bg-module-platform);font-size:12px;font-weight:600}
+.codexSubscriptionResetBox>.codexSubscriptionResetBalance>.codexSubscriptionCreditNote{padding:12px 0}
 .codexSubscriptionResetBalance{display:flex;flex-direction:column;gap:8px}
 .codexSubscriptionResetCard{display:flex;align-items:center;justify-content:space-between;gap:10px;min-width:0;padding:9px 10px;border:1px solid var(--dsw-alias-border-l2);border-radius:9px;background:var(--dsw-alias-bg-module-platform)}
 .codexSubscriptionResetCard{flex-wrap:wrap}
@@ -8531,7 +8549,7 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/version.js
-		const PACKAGE_VERSION = "2.5.6";
+		const PACKAGE_VERSION = "2.5.7";
 		//#endregion
 		//#region src/client-recovery.js
 		async function recoveryCall(rpc, endpoint, payload = {}, timeoutMs = 1e4) {
@@ -11247,7 +11265,10 @@ window.__ModuleLoader__.load({
 				children: date === void 0 ? t("resetCreditExpiryUnknown") : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("time", {
 					dateTime: date.toISOString(),
 					title: date.toLocaleString(),
-					children: fill(t("resetCreditExpires"), { value: date.toLocaleString() })
+					children: fill(t("resetCreditExpires"), { value: date.toLocaleDateString(void 0, {
+						month: "long",
+						day: "numeric"
+					}) })
 				})
 			});
 		}
@@ -11349,7 +11370,7 @@ window.__ModuleLoader__.load({
 				children: [
 					challenge === void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						className: "codexSubscriptionResetMeta",
-						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: credit.name ?? t("resetCreditDefaultName") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ResetCreditExpiry, {
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: credit.name === void 0 ? t("resetCreditDefaultName") : /^full reset$/iu.test(credit.name) ? t("resetFull") : credit.name }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ResetCreditExpiry, {
 							expiresAt: credit.expiresAt,
 							t
 						})]
@@ -11626,17 +11647,27 @@ window.__ModuleLoader__.load({
 										cloud: visibleUsage.credits.approxCloudMessages ? `${count(visibleUsage.credits.approxCloudMessages[0])}–${count(visibleUsage.credits.approxCloudMessages[1])}` : t("unavailable")
 									})
 								}) : null,
-								visibleUsage?.resetCredits?.availableCount > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("details", {
-									className: "codexSubscriptionCreditBalance codexSubscriptionResetDisclosure",
-									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("summary", { children: fill(t("resetCreditsAvailable"), { count: visibleUsage.resetCredits.availableCount }) }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ResetCreditList, {
-										rpc,
-										t,
-										count: visibleUsage.resetCredits.availableCount,
-										nextExpiresAt: visibleUsage.resetCredits.nextExpiresAt,
-										initialCredits: visibleUsage.resetCredits.credits,
-										refreshKey: `${resetKey}:${usageRefreshGeneration}`,
-										hasExhaustedQuota: exhausted,
-										onConsumed: () => load(true)
+								visibleUsage?.resetCredits?.availableCount > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
+									className: "codexSubscriptionResetPanel",
+									"aria-label": t("resetCredits"),
+									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+										className: "codexSubscriptionResetHead",
+										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: t("resetCredits") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("resetCreditsHint") })]
+									}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+										className: "codexSubscriptionResetBox",
+										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+											className: "codexSubscriptionResetTabs",
+											children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", { children: [t("resetAvailableTab"), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("b", { children: visibleUsage.resetCredits.availableCount })] })
+										}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ResetCreditList, {
+											rpc,
+											t,
+											count: visibleUsage.resetCredits.availableCount,
+											nextExpiresAt: visibleUsage.resetCredits.nextExpiresAt,
+											initialCredits: visibleUsage.resetCredits.credits,
+											refreshKey: `${resetKey}:${usageRefreshGeneration}`,
+											hasExhaustedQuota: exhausted,
+											onConsumed: () => load(true)
+										})]
 									})]
 								}) : null,
 								visibleUsage?.individualLimit ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {

package/lib/index.js

@@ -2049,7 +2049,7 @@ function inheritedOriginalImageRef(session, assetId) {
 }
 //#endregion
 //#region src/version.js
-const PACKAGE_VERSION = "2.5.6";
+const PACKAGE_VERSION = "2.5.7";
 const USER_AGENT = `dsh-codex-subscription/${PACKAGE_VERSION}`;
 //#endregion
 //#region src/codex-images.js
@@ -3590,6 +3590,8 @@ function withInputImageDetail(payload, detail) {
 }
 const DSH_REVIEW_POLICY_PREFIX = "REVIEW_POLICY\nYou are the final authorization reviewer";
 const REVIEW_MODEL_SESSION = "session";
+const REVIEW_RETRIES = 2;
+const TRANSIENT_REVIEW_FAILURE = /stream ended (?:before|without)|\b(?:network|connection|socket)\b|\bECONN[A-Z]+\b|other side closed|premature close|\bterminated\b|WebSocket closed (?:1006|1011|1012|1013)/iu;
 function systemText(context) {
 	if (typeof context?.systemPrompt === "string") return context.systemPrompt;
 	const first = Array.isArray(context?.messages) ? context.messages[0] : void 0;
@@ -3683,7 +3685,8 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 	const review = {
 		requests: 0,
 		routed: 0,
-		sessionModel: 0
+		sessionModel: 0,
+		retries: 0
 	};
 	const reviewRoute = (model, context) => {
 		if (resolveReviewModel() !== "official" || !isDshAutoReview(context)) return void 0;
@@ -3710,6 +3713,34 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 			}
 		};
 	};
+	const reviewIterable = (create) => {
+		let replay;
+		const run = async function* () {
+			for (let attempt = 0;; attempt += 1) {
+				const events = [];
+				let failure;
+				let thrown;
+				try {
+					for await (const event of create()) {
+						events.push(event);
+						if (event?.type === "error") failure = event.error?.errorMessage;
+					}
+				} catch (error) {
+					thrown = error;
+					failure = error?.message;
+				}
+				if (failure !== void 0 && attempt < REVIEW_RETRIES && TRANSIENT_REVIEW_FAILURE.test(failure)) {
+					review.retries += 1;
+					continue;
+				}
+				if (thrown !== void 0 && events.length === 0) throw thrown;
+				yield* events;
+				if (thrown !== void 0) throw thrown;
+				return;
+			}
+		};
+		return { [Symbol.asyncIterator]: () => replay ??= run() };
+	};
 	const networkIterable = (factory, options, direct = false) => {
 		let iterator;
 		let prepared;
@@ -3739,6 +3770,11 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 			throw: (error) => iterator ? step("throw", error) : Promise.reject(error)
 		};
 	};
+	const routed = (method, model, context, options) => {
+		const route = reviewRoute(model, context);
+		const create = () => route === void 0 ? networkIterable((prepared) => provider[method](model, context, prepared), withPreferences(model, options)) : networkIterable((prepared) => provider[method](model, context, prepared), withReview(route, options), true);
+		return isDshAutoReview(context) ? reviewIterable(create) : create();
+	};
 	return Object.freeze({
 		...provider,
 		auth: Object.freeze({
@@ -3746,14 +3782,8 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 			apiKey: requestToken
 		}),
 		getModels,
-		stream: (model, context, options) => {
-			const route = reviewRoute(model, context);
-			return route === void 0 ? networkIterable((prepared) => provider.stream(model, context, prepared), withPreferences(model, options)) : networkIterable((prepared) => provider.stream(model, context, prepared), withReview(route, options), true);
-		},
-		streamSimple: (model, context, options) => {
-			const route = reviewRoute(model, context);
-			return route === void 0 ? networkIterable((prepared) => provider.streamSimple(model, context, prepared), withPreferences(model, options)) : networkIterable((prepared) => provider.streamSimple(model, context, prepared), withReview(route, options), true);
-		},
+		stream: (model, context, options) => routed("stream", model, context, options),
+		streamSimple: (model, context, options) => routed("streamSimple", model, context, options),
 		reviewCounters: () => ({ ...review })
 	});
 }
@@ -4759,7 +4789,8 @@ async function createSubscriptionDiagnostics({ auth, preferences, login = { phas
 			() => typeof review?.reviewCounters === "function" ? safeCounters({ snapshot: () => review.reviewCounters() }, [
 				"requests",
 				"routed",
-				"sessionModel"
+				"sessionModel",
+				"retries"
 			]) : void 0
 		],
 		[

package/package.json

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