@lyogvce/dsh-codex-subscription 0.2.2 → 0.2.3

package/README.md

@@ -19,7 +19,7 @@
 4. **原生多轮思考链回放与工具调用**
    - 底层复用 DSH 内置的 `PiAiAdapter` 与 `@earendil-works/pi-ai` 的 `openaiCodexProvider()`，固定使用 `sse` 传输（含 `zstd` 请求体压缩、规范化纯 UUID `session-id` / `x-client-request-id` 缓存头、`reasoning.encrypted_content` 签名回放与图片自动缩放卸载）。
 5. **Codex 订阅限额内联展示（`conversation.input.right`）**
-   - 当会话选中 `openai-codex` 模型时，在输入框右下角紧邻模型选择器左侧展示 `5h X% · 7d Y%` 限额胶囊（数据源来自 `https://chatgpt.com/backend-api/wham/usage`，内置 60 秒缓存、单飞合并与每轮回复结束自动刷新），点击可展开查看 5 小时 / 7 天窗口进度条、重置倒计时与手动刷新按钮；切换至其他 Provider 模型时自动隐藏。
+   - 当会话选中 `openai-codex` 模型时，在输入框右下角紧邻模型选择器左侧展示限额胶囊（根据 `wham/usage` 返回的 `limit_window_seconds` 自适应展示 Plus 的 `5h X% · 7d Y%` 双窗口或 Pro 的 `7d X%` 单窗口，内置 60 秒缓存、单飞合并与每轮回复结束自动刷新），点击可展开查看对应窗口进度条、重置倒计时与手动刷新按钮；切换至其他 Provider 模型时自动隐藏。
 
 ---
 

package/lib/client.js

@@ -25,6 +25,8 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region src/client/quota.ts
 		const RING_CIRCUMFERENCE = 2 * Math.PI * 5.5;
+		const DEFAULT_PRIMARY_WINDOW_SECONDS = 18e3;
+		const DEFAULT_SECONDARY_WINDOW_SECONDS = 604800;
 		function resolveActiveProvider(directorySnapshot, projectedSelection) {
 			const dir = directorySnapshot && typeof directorySnapshot === "object" ? directorySnapshot : void 0;
 			const proj = projectedSelection && typeof projectedSelection === "object" ? projectedSelection : void 0;
@@ -46,14 +48,53 @@ window.__ModuleLoader__.load({
 			if (usedPercent >= 80) return "warn";
 			return "ok";
 		}
+		function resolveWindowSpan(windowSeconds, fallbackSeconds) {
+			const sec = typeof windowSeconds === "number" && Number.isFinite(windowSeconds) && windowSeconds > 0 ? windowSeconds : fallbackSeconds;
+			if (sec >= 86400) return {
+				value: Math.round(sec / 86400),
+				unit: "d"
+			};
+			if (sec >= 3600) return {
+				value: Math.round(sec / 3600),
+				unit: "h"
+			};
+			return {
+				value: Math.max(1, Math.round(sec / 60)),
+				unit: "m"
+			};
+		}
+		const WINDOW_UNIT_LABELS = {
+			zh: {
+				d: "天窗口",
+				h: "小时窗口",
+				m: "分钟窗口"
+			},
+			en: {
+				d: "-day window",
+				h: "-hour window",
+				m: "-minute window"
+			}
+		};
+		function formatWindowShortLabel(windowSeconds, fallbackSeconds = DEFAULT_PRIMARY_WINDOW_SECONDS) {
+			const { value, unit } = resolveWindowSpan(windowSeconds, fallbackSeconds);
+			return `${value}${unit}`;
+		}
+		function formatWindowTitle(windowSeconds, locale, fallbackSeconds = DEFAULT_PRIMARY_WINDOW_SECONDS) {
+			const { value, unit } = resolveWindowSpan(windowSeconds, fallbackSeconds);
+			const suffix = WINDOW_UNIT_LABELS[locale][unit];
+			return locale === "en" ? `${value}${suffix}` : `${value} ${suffix}`;
+		}
 		function formatQuotaSummary(snapshot) {
 			const primaryPercent = clampPercent(snapshot.primary.usedPercent);
 			const secondaryPercent = snapshot.secondary !== null ? clampPercent(snapshot.secondary.usedPercent) : null;
+			const level = windowLevelOf(secondaryPercent !== null ? Math.max(primaryPercent, secondaryPercent) : primaryPercent, snapshot.limitReached);
+			const primaryLabel = formatWindowShortLabel(snapshot.primary.windowSeconds, DEFAULT_PRIMARY_WINDOW_SECONDS);
+			const secondaryLabel = snapshot.secondary !== null ? formatWindowShortLabel(snapshot.secondary.windowSeconds, DEFAULT_SECONDARY_WINDOW_SECONDS) : null;
 			return {
 				primaryPercent,
 				secondaryPercent,
-				level: windowLevelOf(secondaryPercent !== null ? Math.max(primaryPercent, secondaryPercent) : primaryPercent, snapshot.limitReached),
-				pillText: secondaryPercent !== null ? `5h ${primaryPercent}% · 7d ${secondaryPercent}%` : `5h ${primaryPercent}%`,
+				level,
+				pillText: secondaryPercent !== null && secondaryLabel !== null ? `${primaryLabel} ${primaryPercent}% · ${secondaryLabel} ${secondaryPercent}%` : `${primaryLabel} ${primaryPercent}%`,
 				ringDash: `${(RING_CIRCUMFERENCE * primaryPercent / 100).toFixed(2)} ${RING_CIRCUMFERENCE.toFixed(2)}`
 			};
 		}
@@ -223,8 +264,6 @@ window.__ModuleLoader__.load({
 			"quota.loading": "正在获取 Codex 限额…",
 			"quota.refresh": "↻ 刷新",
 			"quota.refreshing": "↻ 刷新中…",
-			"quota.window5h": "5 小时窗口",
-			"quota.window7d": "7 天窗口",
 			"quota.usedPrefix": "已用 ",
 			"quota.remainPrefix": "剩余 "
 		};
@@ -233,8 +272,6 @@ window.__ModuleLoader__.load({
 			"quota.loading": "Loading Codex quota…",
 			"quota.refresh": "↻ Refresh",
 			"quota.refreshing": "↻ Refreshing…",
-			"quota.window5h": "5-hour window",
-			"quota.window7d": "7-day window",
 			"quota.usedPrefix": "Used ",
 			"quota.remainPrefix": "Remaining "
 		};
@@ -357,7 +394,7 @@ window.__ModuleLoader__.load({
 				onClick: () => {
 					quotaStore.refresh(true);
 				}
-			}, quotaSnap.loading ? t("quota.refreshing") : t("quota.refresh"))), quota !== null ? renderWindowSection(t("quota.window5h"), quota.primary, primaryReached) : quotaSnap.loading || quotaSnap.error === null ? h("div", { className: "dsh-codex-quota-meta" }, t("quota.loading")) : null, quota?.secondary !== null && quota?.secondary !== void 0 ? renderWindowSection(t("quota.window7d"), quota.secondary, secondaryReached) : null, quotaSnap.error !== null ? h("div", { className: "dsh-codex-quota-error" }, quotaSnap.error) : null) : null);
+			}, quotaSnap.loading ? t("quota.refreshing") : t("quota.refresh"))), quota !== null ? renderWindowSection(formatWindowTitle(quota.primary.windowSeconds, locale, DEFAULT_PRIMARY_WINDOW_SECONDS), quota.primary, primaryReached) : quotaSnap.loading || quotaSnap.error === null ? h("div", { className: "dsh-codex-quota-meta" }, t("quota.loading")) : null, quota?.secondary !== null && quota?.secondary !== void 0 ? renderWindowSection(formatWindowTitle(quota.secondary.windowSeconds, locale, DEFAULT_SECONDARY_WINDOW_SECONDS), quota.secondary, secondaryReached) : null, quotaSnap.error !== null ? h("div", { className: "dsh-codex-quota-error" }, quotaSnap.error) : null) : null);
 		}
 		const inject = ["slots", "locale"];
 		function apply(ctx) {
@@ -411,6 +448,8 @@ window.__ModuleLoader__.load({
 			isCodexProvider,
 			didTurnFinish,
 			windowLevelOf,
+			formatWindowShortLabel,
+			formatWindowTitle,
 			formatQuotaSummary,
 			formatResetCountdown,
 			createQuotaStore,

package/lib/index.d.ts

@@ -81,6 +81,7 @@ declare function sanitizeCodexPayload(payload: Record<string, unknown> | null |
 declare function safeErrorMessage(error: unknown): string;
 interface CodexQuotaWindow {
   readonly usedPercent: number;
+  readonly windowSeconds?: number | null | undefined;
   readonly resetAt: number | null;
 }
 interface CodexQuotaSnapshot {

package/lib/index.js

@@ -229,6 +229,8 @@ function parseWindow(raw, fetchedAtMs) {
 	const record = raw;
 	const usedRaw = record.used_percent;
 	if (typeof usedRaw !== "number" || !Number.isFinite(usedRaw)) return null;
+	const windowSecRaw = record.limit_window_seconds;
+	const windowSeconds = typeof windowSecRaw === "number" && Number.isFinite(windowSecRaw) && windowSecRaw > 0 ? Math.round(windowSecRaw) : null;
 	const resetAtRaw = record.reset_at;
 	const resetAfterRaw = record.reset_after_seconds;
 	let resetAt = null;
@@ -236,6 +238,7 @@ function parseWindow(raw, fetchedAtMs) {
 	else if (typeof resetAfterRaw === "number" && Number.isFinite(resetAfterRaw) && resetAfterRaw >= 0) resetAt = Math.floor(fetchedAtMs / 1e3) + Math.round(resetAfterRaw);
 	return {
 		usedPercent: clampPercent(usedRaw),
+		windowSeconds,
 		resetAt
 	};
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lyogvce/dsh-codex-subscription",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "复用本机 ~/.codex 订阅凭证与 models_cache.json 模型缓存，在 DSH 中通过 SSE 直连调用 Codex 模型。",
   "type": "module",
   "main": "./lib/index.js",