dsh-codex-subscription 2.5.0 → 2.5.2

package/README.en.md

@@ -105,7 +105,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.0
+   dsh-codex-subscription@2.5.2
    ```
 
 3. Click **Install** and wait for completion. Follow the page instructions; save your work before restarting if requested.

package/README.md

@@ -105,7 +105,7 @@
 2. 在 **包名或地址** 输入框中粘贴下面的包名（已带版本号）：
 
    ```text
-   dsh-codex-subscription@2.5.0
+   dsh-codex-subscription@2.5.2
    ```
 
 3. 点击 **安装**，等待安装完成；按页面提示操作，需要重启时先保存工作。

package/lib/client.js

@@ -5967,6 +5967,12 @@ window.__ModuleLoader__.load({
 			resetAccountChanged: "登录账号已变更，请重新开始。",
 			resetUncertain: "服务端返回结果不确定。请再次确认，插件会复用同一个请求，不会另外发起一次重置。",
 			creditsNote: "额外 Credits、消费上限、重置次数分别显示。",
+			creditsExpires: "预计 {date} 到期，还剩 {days} 天",
+			creditsExpiredToday: "今天 {date} 到期",
+			creditsExpiryEstimate: "（估计：官方公布的 Pro 200 补偿 Credits 到期日，接口未返回，以 ChatGPT 使用情况页为准）",
+			creditsAfterAllowance: "Credits 要等套餐额度用完后才会开始消耗，官方没有“先用 Credits”的开关。",
+			creditsMessages: "约可发 {local} 条本地消息 / {cloud} 条云端消息",
+			chatPass: "ChatPass 每周额度",
 			creditsUsed: "已用 {used} / {limit} credits",
 			spendReached: "Credits 月度消费上限已用尽。",
 			unavailable: "暂无数据",
@@ -6528,6 +6534,12 @@ window.__ModuleLoader__.load({
 			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: "Extra Credits, spending caps, and resets are separate items.",
+			creditsExpires: "Expires {date} ({days} days left)",
+			creditsExpiredToday: "Expires today ({date})",
+			creditsExpiryEstimate: "(Estimate: the published expiry of the Pro 200 compensation Credits; the API does not report it, so check ChatGPT usage settings)",
+			creditsAfterAllowance: "Credits are only drawn once the plan allowance runs out; there is no official switch to spend them first.",
+			creditsMessages: "Roughly {local} local / {cloud} cloud messages",
+			chatPass: "ChatPass weekly",
 			creditsUsed: "{used} / {limit} credits used",
 			spendReached: "The monthly Credits spending cap has been reached.",
 			unavailable: "No data yet",
@@ -6770,6 +6782,7 @@ window.__ModuleLoader__.load({
 .codexSubscriptionSearchOptions[open]>summary{margin-bottom:8px}
 .codexSubscriptionCreditSection{display:flex;flex-direction:column;gap:7px}
 .codexSubscriptionCreditNote{font-size:11px;line-height:17px;color:var(--dsw-alias-label-tertiary)}
+.codexSubscriptionCreditExpiry{display:grid;gap:2px;font-size:11px;line-height:17px;color:var(--dsw-alias-label-tertiary)}.codexSubscriptionCreditExpiry p{margin:0}.codexSubscriptionCreditExpiry[data-soon=true]{color:var(--dsw-alias-label-secondary);font-weight:600}
 .codexSubscriptionCreditRows{display:grid;grid-template-columns:repeat(auto-fit,minmax(180px,1fr));gap:8px}
 .codexSubscriptionCreditBalance,.codexSubscriptionSpendLimit{min-width:0;border-radius:10px;padding:12px 14px;background:var(--dsw-alias-bg-module-platform)}
 .codexSubscriptionCreditBalance{display:flex;flex-direction:column;gap:6px}
@@ -8672,7 +8685,7 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/version.js
-		const PACKAGE_VERSION = "2.5.0";
+		const PACKAGE_VERSION = "2.5.2";
 		//#endregion
 		//#region src/client-recovery.js
 		async function recoveryCall(rpc, endpoint, payload = {}, timeoutMs = 1e4) {
@@ -11296,8 +11309,38 @@ window.__ModuleLoader__.load({
 				]
 			});
 		}
+		Object.freeze({
+			credits: 62500,
+			expiresAt: Date.UTC(2026, 11, 31, 12)
+		});
+		const DAY_MS = 864e5;
+		/** Whole days left, and whether the expiry is close enough to call out. */
+		function creditExpiryStatus(expiry, now = Date.now()) {
+			if (expiry === void 0) return void 0;
+			const daysLeft = Math.max(0, Math.ceil((expiry.expiresAt - now) / DAY_MS));
+			return {
+				daysLeft,
+				soon: daysLeft <= 30
+			};
+		}
 		//#endregion
 		//#region src/client-usage.jsx
+		const count = (value) => Number(value).toLocaleString();
+		function CreditExpiry({ credits, t }) {
+			const date = validDate(credits.expiresAt);
+			if (date === void 0 || credits.unlimited) return null;
+			const status = creditExpiryStatus({ expiresAt: credits.expiresAt });
+			const estimate = credits.expirySource === "estimate";
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+				className: "codexSubscriptionCreditExpiry",
+				"data-soon": status.soon,
+				role: "status",
+				children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("p", { children: [fill(t(status.daysLeft === 0 ? "creditsExpiredToday" : "creditsExpires"), {
+					date: date.toLocaleDateString(),
+					days: status.daysLeft
+				}), estimate ? ` ${t("creditsExpiryEstimate")}` : ""] })
+			});
+		}
 		function ResetTime({ resetsAt, t }) {
 			const date = Number.isSafeInteger(resetsAt) ? validDate(resetsAt * 1e3) : void 0;
 			if (date === void 0) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("resetUnknown") });
@@ -11559,7 +11602,7 @@ window.__ModuleLoader__.load({
 			const visibleUsage = signedIn ? usage : void 0;
 			const limits = visibleUsage?.rateLimits ?? [];
 			const exhausted = limits.some((limit) => limit.id !== "code_review" && limit.windows.some((window) => window.usedPercent >= 100));
-			const hasUsageDetails = limits.length > 0 || visibleUsage?.credits !== void 0 || visibleUsage?.individualLimit !== void 0 || visibleUsage?.resetCredits?.availableCount > 0;
+			const hasUsageDetails = limits.length > 0 || visibleUsage?.chatPass !== void 0 || visibleUsage?.credits !== void 0 || visibleUsage?.individualLimit !== void 0 || visibleUsage?.resetCredits?.availableCount > 0;
 			const fetchedAt = typeof visibleUsage?.fetchedAt === "number" ? validDate(visibleUsage.fetchedAt) : void 0;
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "codexSubscriptionCard codexSubscriptionUsageCard",
@@ -11642,6 +11685,36 @@ window.__ModuleLoader__.load({
 							]
 						}, `${limit.id}-${window.windowSeconds}-${index}`)))
 					}),
+					visibleUsage?.chatPass === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+						className: "codexSubscriptionLimits",
+						children: visibleUsage.chatPass.windows.map((window, index) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+							className: "codexSubscriptionLimit",
+							children: [
+								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+									className: "codexSubscriptionLimitTop",
+									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										className: "codexSubscriptionLimitLabel",
+										children: t("chatPass")
+									}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("strong", { children: [percent(window.remainingPercent), "%"] })]
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("progress", {
+									max: "100",
+									value: window.remainingPercent,
+									"aria-label": `${t("chatPass")} ${fill(t("remaining"), { value: percent(window.remainingPercent) })}`
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+									className: "codexSubscriptionLimitMeta",
+									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										className: "codexSubscriptionLimitPeriod",
+										children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: windowLabel(window.windowSeconds, t) })
+									}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ResetTime, {
+										resetsAt: window.resetsAt,
+										t
+									})]
+								})
+							]
+						}, `chatpass-${window.windowSeconds}-${index}`))
+					}),
 					visibleUsage?.credits === void 0 && visibleUsage?.individualLimit === void 0 && !(visibleUsage?.resetCredits?.availableCount > 0) ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						className: "codexSubscriptionCreditSection",
 						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
@@ -11654,6 +11727,21 @@ window.__ModuleLoader__.load({
 									className: "codexSubscriptionCreditBalance",
 									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("creditsBalance") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: visibleUsage.credits.unlimited ? t("unlimited") : `${visibleUsage.credits.balance ?? t("unavailable")} ${t("creditsUnit")}` })]
 								}) : null,
+								visibleUsage?.credits ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(CreditExpiry, {
+									credits: visibleUsage.credits,
+									t
+								}) : null,
+								visibleUsage?.credits && !visibleUsage.credits.unlimited ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+									className: "codexSubscriptionCreditNote",
+									children: t("creditsAfterAllowance")
+								}) : null,
+								visibleUsage?.credits?.approxLocalMessages ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+									className: "codexSubscriptionCreditNote",
+									children: fill(t("creditsMessages"), {
+										local: `${count(visibleUsage.credits.approxLocalMessages[0])}–${count(visibleUsage.credits.approxLocalMessages[1])}`,
+										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, {

package/lib/index.js

@@ -2043,7 +2043,7 @@ function inheritedOriginalImageRef(session, assetId) {
 }
 //#endregion
 //#region src/version.js
-const PACKAGE_VERSION = "2.5.0";
+const PACKAGE_VERSION = "2.5.2";
 const USER_AGENT = `dsh-codex-subscription/${PACKAGE_VERSION}`;
 //#endregion
 //#region src/codex-images.js
@@ -2763,7 +2763,7 @@ function assertVaultRecord(record) {
 	return {
 		version: VERSION,
 		activeId: record.payload.activeId,
-		legacyAccountId,
+		...legacyAccountId === void 0 ? {} : { legacyAccountId },
 		accounts
 	};
 }
@@ -2973,10 +2973,11 @@ var DshOAuthAccountVault = class {
 				if (!current.accounts.some((account) => account.id === id)) throw new Error("Unknown Codex account");
 				if (current.accounts.length === 1) throw new Error("Cannot remove the last account; sign out instead");
 				const accounts = current.accounts.filter((account) => account.id !== id);
+				const { legacyAccountId, ...rest } = current;
 				return {
-					...current,
+					...rest,
 					activeId: current.activeId === id ? accounts[0].id : current.activeId,
-					legacyAccountId: current.legacyAccountId === id ? void 0 : current.legacyAccountId,
+					...legacyAccountId === void 0 || legacyAccountId === id ? {} : { legacyAccountId },
 					accounts
 				};
 			});
@@ -4824,6 +4825,24 @@ function safeCounters(source, keys) {
 	return Object.fromEntries(keys.filter((key) => Number.isSafeInteger(values?.[key]) && values[key] >= 0).map((key) => [key, values[key]]));
 }
 //#endregion
+//#region src/credit-expiry.js
+const PRO_200_COMPENSATION = Object.freeze({
+	credits: 62500,
+	expiresAt: Date.UTC(2026, 11, 31, 12)
+});
+/** Expiry of the balance: the API's own value when it has one, otherwise the known grant. */
+function creditExpiry({ planType, balance, apiExpiresAt }, now = Date.now()) {
+	if (Number.isFinite(apiExpiresAt) && apiExpiresAt > now) return {
+		expiresAt: apiExpiresAt,
+		source: "api"
+	};
+	const amount = Number(balance);
+	if (planType === "pro" && Number.isFinite(amount) && amount >= PRO_200_COMPENSATION.credits && now < PRO_200_COMPENSATION.expiresAt) return {
+		expiresAt: PRO_200_COMPENSATION.expiresAt,
+		source: "estimate"
+	};
+}
+//#endregion
 //#region src/usage.js
 const CODEX_USAGE_URL = "https://chatgpt.com/backend-api/wham/usage";
 const DEFAULT_TTL_MS = 6e4;
@@ -4865,15 +4884,44 @@ function epochSeconds(value, label) {
 	if (!Number.isSafeInteger(value) || value < 0) throw new Error(`Codex returned an invalid ${label}`);
 	return value;
 }
-function creditsOf(value) {
+function messageRange(value) {
+	return Array.isArray(value) && value.length === 2 && value.every((item) => Number.isSafeInteger(item) && item >= 0) ? [value[0], value[1]] : void 0;
+}
+function expiryOf(value) {
+	const raw = value?.expires_at;
+	if (Number.isSafeInteger(raw) && raw > 0) return raw * 1e3;
+	if (typeof raw === "string" && raw.length <= 64) {
+		const parsed = Date.parse(raw);
+		if (Number.isFinite(parsed) && parsed > 0) return parsed;
+	}
+}
+function creditsOf(value, planType) {
 	if (value === void 0 || value === null) return void 0;
 	if (!record$1(value) || typeof value.has_credits !== "boolean" || typeof value.unlimited !== "boolean") throw new Error("Codex returned malformed credit details");
 	if (!value.has_credits) return void 0;
+	const balance = value.balance === void 0 || value.balance === null ? void 0 : decimal(value.balance, "credit balance");
+	const expiry = value.unlimited ? void 0 : creditExpiry({
+		planType,
+		balance,
+		apiExpiresAt: expiryOf(value)
+	});
+	const local = messageRange(value.approx_local_messages), cloud = messageRange(value.approx_cloud_messages);
 	return {
 		unlimited: value.unlimited,
-		...value.balance === void 0 || value.balance === null ? {} : { balance: decimal(value.balance, "credit balance") }
+		...balance === void 0 ? {} : { balance },
+		...expiry === void 0 ? {} : {
+			expiresAt: expiry.expiresAt,
+			expirySource: expiry.source
+		},
+		...local === void 0 ? {} : { approxLocalMessages: local },
+		...cloud === void 0 ? {} : { approxCloudMessages: cloud }
 	};
 }
+function chatPassOf(value) {
+	if (!record$1(value) || !Array.isArray(value.windows)) return void 0;
+	const windows = value.windows.map(windowOf).filter(Boolean);
+	return windows.length === 0 ? void 0 : { windows };
+}
 function individualOf(value) {
 	if (value === void 0 || value === null) return void 0;
 	if (!record$1(value)) throw new Error("Codex returned malformed spend control");
@@ -4937,12 +4985,14 @@ function parseCodexUsage(value) {
 		addLimit(limitOf(entry.metered_feature, entry.limit_name || void 0, entry.rate_limit));
 	}
 	addLimit(limitOf("code_review", "Code review", value.code_review_rate_limit));
-	const credits = creditsOf(value.credits);
+	const chatPass = chatPassOf(value.chatpass);
+	const credits = creditsOf(value.credits, typeof value.plan_type === "string" ? value.plan_type : void 0);
 	const individualLimit = individualOf(value.spend_control);
 	const spendControlReached = spendControlReachedOf(value.spend_control);
 	const resetCredits = resetCreditsOf(value.rate_limit_reset_credits);
 	return {
 		rateLimits,
+		...chatPass === void 0 ? {} : { chatPass },
 		...credits === void 0 ? {} : { credits },
 		...individualLimit === void 0 ? {} : { individualLimit },
 		...spendControlReached === void 0 ? {} : { spendControlReached },

package/package.json

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