dsh-subscriptions 0.3.0 → 0.3.1

package/README.md

@@ -161,8 +161,8 @@ text. No live account was used to verify what Anthropic returns. See
 
 ## Install
 
-Current source is tested with DSH `0.1.7-rc.2`, `0.2.0-rc.2`, `0.2.1-rc.2`, and
-`0.2.1-rc.5`. The package's peers admit `>=0.1.7-rc.2 <0.3.0-0`: untested
+Current source is tested with DSH `0.1.7-rc.2`, `0.2.0-rc.2`, `0.2.1-rc.5`, and
+`0.2.2-rc.1`. The package's peers admit `>=0.1.7-rc.2 <0.3.0-0`: untested
 versions inside that range install but are unsupported, and versions outside it
 need an explicit `dsh plugin allow-version` exemption. `dsh plugin add` checks
 those ranges with `includePrerelease` semantics, so the admitted set covers

package/lib/client/SubscriptionUsageBadge.d.ts

@@ -68,6 +68,7 @@ export declare function groupUsageDisplays(roster: readonly UsageRosterEntry[],
 export declare function loadBadgeRoster(rpc: ConnectionHandle['rpc']): Promise<{
     roster: UsageRosterEntry[];
     refreshed: Set<BadgeProvider>;
+    visibleModels: Map<BadgeProvider, string[]>;
 }>;
 export declare function usageOf(rpc: ConnectionHandle['rpc'], { provider, account }: UsageRosterEntry): Promise<ProviderUsage>;
 /**
@@ -119,7 +120,12 @@ export declare function rotatingDisplay(displays: readonly ProviderUsageDisplay[
 export declare function expandedDisplays(displays: readonly ProviderUsageDisplay[], current: string | undefined): readonly ProviderUsageDisplay[];
 type Translate = (key: SubscriptionsKey, params?: Record<string, unknown>) => string;
 export declare function SubscriptionUsageBadge({ rpc, currentModel, t, rotationMs, }: SubscriptionUsageBadgeProps): import("react").JSX.Element;
-/** Preview each account independently; all remaining quotas stay accessible. */
+/** Warn only when every displayed Codex account has a known exhausted window. */
+export declare function CodexExhaustionNotice({ display, translate, }: {
+    display: ProviderUsageDisplay;
+    translate: Translate;
+}): import("react").JSX.Element | null;
+/** Preview each account independently; remaining visible quotas stay accessible. */
 export declare function AccountWindows({ windows, model, provider, translate, observedAt, stale, }: {
     windows: readonly UsageWindow[];
     model: string | undefined;

package/lib/client/SubscriptionUsageBadge.js

@@ -35,6 +35,7 @@ import { en } from './locales.js';
 import { hostIcon } from './host-icons.js';
 import { HOST_CONTRACT, markerSelector } from './host-contract.js';
 import { USAGE_BADGE_REFRESH_EVENT, useUsageBadgeMode, } from './usage-badge-preferences.js';
+import { visibleUsageWindows } from './usage-window-filter.js';
 /** DSH renamed the data icon in 0.1.7; retain older supported hosts too. */
 export function usageBadgeIcon(icons) {
     return hostIcon(icons, 'DataOutline');
@@ -115,6 +116,7 @@ export async function loadBadgeRoster(rpc) {
     ]);
     const roster = [];
     const refreshed = new Set();
+    const visibleModels = new Map();
     if (subscriptions.status === 'fulfilled') {
         for (const provider of [
             'codex',
@@ -124,6 +126,9 @@ export async function loadBadgeRoster(rpc) {
             'antigravity',
         ]) {
             refreshed.add(provider);
+            const visible = subscriptions.value.providers[provider]?.visibleModels;
+            if (visible !== undefined)
+                visibleModels.set(provider, visible);
             for (const account of accountsOf(subscriptions.value.providers[provider]))
                 roster.push({ provider, account });
         }
@@ -144,7 +149,7 @@ export async function loadBadgeRoster(rpc) {
                 });
         }
     }
-    return { roster, refreshed };
+    return { roster, refreshed, visibleModels };
 }
 export async function usageOf(rpc, { provider, account }) {
     if (provider === 'opencode-go' ||
@@ -370,7 +375,7 @@ export function SubscriptionUsageBadge({ rpc, currentModel, t, rotationMs, }) {
             return;
         inflightRef.current = true;
         try {
-            const { roster, refreshed } = await loadBadgeRoster(rpc);
+            const { roster, refreshed, visibleModels } = await loadBadgeRoster(rpc);
             if (!mountedRef.current)
                 return;
             const lastKnown = lastKnownRef.current;
@@ -421,6 +426,9 @@ export function SubscriptionUsageBadge({ rpc, currentModel, t, rotationMs, }) {
                     ...display,
                     accounts: display.accounts.map((account) => ({
                         ...account,
+                        // Filter only the display row, not lastKnown: restoring visibility
+                        // must work even when the next usage request fails and uses cache.
+                        windows: visibleUsageWindows(display.provider, account.windows, visibleModels.get(display.provider)),
                         ...observationsRef.current.get(`${display.provider}:${account.key}`),
                     })),
                 })),
@@ -612,7 +620,7 @@ export function SubscriptionUsageBadge({ rpc, currentModel, t, rotationMs, }) {
                 }, onMouseLeave: () => {
                     setHover(false);
                 }, onClick: toggle, children: [_jsx(UsageBadgeIcon, {}), _jsx("span", { style: styles.label, children: label })] }), open &&
-                createPortal(_jsxs("div", { ref: panelRef, role: "dialog", "aria-label": title, className: "dsh-subscription-usage-panel", style: { ...styles.panel, ...(pos ?? MEASURE_STYLE) }, children: [_jsx("div", { style: styles.title, children: _jsxs("span", { style: styles.titleLabel, children: [_jsx(UsageBadgeIcon, {}), title] }) }), _jsx("div", { style: styles.titleRule, "aria-hidden": true }), expanded.map((d, index) => (_jsxs("section", { style: index === 0 ? undefined : styles.section, children: [_jsxs("div", { style: styles.providerRow, children: [_jsxs("span", { style: styles.providerName, children: [d.name, d.provider === current && (_jsx("span", { style: styles.currentTag, children: translate('usageBadgeCurrent') }))] }), d.accounts.length === 1 && (_jsx(AccountMeta, { account: d.accounts[0], translate: translate }))] }), d.accounts.map((account, accountIndex) => (_jsxs("div", { style: accountIndex === 0 ? undefined : styles.accountBlock, children: [d.accounts.length > 1 && (_jsx("div", { style: styles.accountRow, children: _jsx(AccountMeta, { account: account, translate: translate }) })), _jsx(AccountWindows, { windows: account.windows, observedAt: account.observedAt, stale: account.stale, model: d.provider === dialogProvider ? dialogModel : undefined, provider: d.provider, translate: translate }, `${d.provider}:${dialogModel ?? ''}`)] }, account.key)))] }, d.provider)))] }), document.body)] }));
+                createPortal(_jsxs("div", { ref: panelRef, role: "dialog", "aria-label": title, className: "dsh-subscription-usage-panel", style: { ...styles.panel, ...(pos ?? MEASURE_STYLE) }, children: [_jsx("div", { style: styles.title, children: _jsxs("span", { style: styles.titleLabel, children: [_jsx(UsageBadgeIcon, {}), title] }) }), _jsx("div", { style: styles.titleRule, "aria-hidden": true }), expanded.map((d, index) => (_jsxs("section", { style: index === 0 ? undefined : styles.section, children: [_jsxs("div", { style: styles.providerRow, children: [_jsxs("span", { style: styles.providerName, children: [d.name, d.provider === current && (_jsx("span", { style: styles.currentTag, children: translate('usageBadgeCurrent') }))] }), d.accounts.length === 1 && (_jsx(AccountMeta, { account: d.accounts[0], translate: translate }))] }), _jsx(CodexExhaustionNotice, { display: d, translate: translate }), d.accounts.map((account, accountIndex) => (_jsxs("div", { style: accountIndex === 0 ? undefined : styles.accountBlock, children: [d.accounts.length > 1 && (_jsx("div", { style: styles.accountRow, children: _jsx(AccountMeta, { account: account, translate: translate }) })), _jsx(AccountWindows, { windows: account.windows, observedAt: account.observedAt, stale: account.stale, model: d.provider === dialogProvider ? dialogModel : undefined, provider: d.provider, translate: translate }, `${d.provider}:${dialogModel ?? ''}`)] }, account.key)))] }, d.provider)))] }), document.body)] }));
     return (_jsxs(_Fragment, { children: [seat, statsRow !== null && statsRow.isConnected
                 ? createPortal(pill, statsRow)
                 : pill] }));
@@ -635,6 +643,15 @@ function statsScopeOf(seat) {
     }
     return seat.parentElement;
 }
+/** Warn only when every displayed Codex account has a known exhausted window. */
+export function CodexExhaustionNotice({ display, translate, }) {
+    if (display.provider !== 'codex' ||
+        display.accounts.length === 0 ||
+        display.accounts.some((account) => account.windows.length === 0 ||
+            !account.windows.some((window) => window.usedPercent >= 100)))
+        return null;
+    return (_jsx("p", { role: "status", style: { ...styles.providerMeta, margin: '8px 0 0' }, children: translate('usageBadgeAllCodexExhausted') }));
+}
 /**
  * One account's handle and plan: `★ ys@example.com · 计划：pro`. The star
  * marks the default account (the one direct routes serve and the collapsed
@@ -649,8 +666,10 @@ function AccountMeta({ account, translate, }) {
     ].filter((part) => part !== undefined && part !== '');
     return (_jsxs("span", { style: styles.providerMeta, title: account.account, children: [account.isDefault && (_jsxs("span", { style: styles.defaultStar, "aria-label": "default", children: ["\u2605", ' '] })), parts.join(' · ')] }));
 }
-/** Preview each account independently; all remaining quotas stay accessible. */
+/** Preview each account independently; remaining visible quotas stay accessible. */
 export function AccountWindows({ windows, model, provider, translate, observedAt, stale, }) {
+    if (windows.length === 0)
+        return (_jsx("p", { style: styles.providerMeta, children: translate('usageNoVisibleModels') }));
     const { shown, hidden } = previewWindows(windows, model, provider);
     const rows = (items) => (_jsx("dl", { style: styles.details, children: items.map((w, i) => (_jsx(WindowRow, { label: `${usageWindowLabel(translate, w)}${model !== undefined && w.scope === model ? ` · ${translate('usageBadgeCurrent')}` : ''}`, window: w, t: translate, observedAt: observedAt, stale: stale }, i))) }));
     return (_jsxs(_Fragment, { children: [rows(shown), hidden.length > 0 && (_jsxs("details", { style: styles.moreWindows, children: [_jsx("summary", { style: styles.moreSummary, children: translate('usageBadgeMoreWindows', { count: hidden.length }) }), rows(hidden)] }))] }));

package/lib/client/locales.d.ts

@@ -188,6 +188,7 @@ export declare const en: {
     usageBadgeModelCount: string;
     usageBadgeModelUnavailable: string;
     usageBadgeMoreWindows: string;
+    usageBadgeAllCodexExhausted: string;
     speed: string;
     speedStandard: string;
     speedStandardDescription: string;
@@ -418,6 +419,7 @@ export declare const zh: {
     usageBadgeModelCount: string;
     usageBadgeModelUnavailable: string;
     usageBadgeMoreWindows: string;
+    usageBadgeAllCodexExhausted: string;
     speed: string;
     speedStandard: string;
     speedStandardDescription: string;

package/lib/client/locales.js

@@ -188,6 +188,7 @@ export const en = {
     usageBadgeModelCount: '{count} model quotas',
     usageBadgeModelUnavailable: 'Current model quota unavailable',
     usageBadgeMoreWindows: 'More quota windows ({count})',
+    usageBadgeAllCodexExhausted: 'All displayed Codex accounts report exhausted subscription quota. New requests stop before spending paid credits. After an external reset, use Settings > Subscriptions > Refresh to re-check usage.',
     speed: 'Speed',
     speedStandard: 'Standard',
     speedStandardDescription: 'Default speed',
@@ -426,6 +427,7 @@ export const zh = {
     usageBadgeModelCount: '{count} 个模型配额',
     usageBadgeModelUnavailable: '当前模型暂无配额数据',
     usageBadgeMoreWindows: '更多配额窗口（{count}）',
+    usageBadgeAllCodexExhausted: '当前显示的所有 Codex 账号都报告订阅额度已耗尽。新请求会在消耗付费额度前停止；外部额度重置后，请使用“设置 > 订阅 > 刷新”重新检查用量。',
     speed: '速度',
     speedStandard: '标准',
     speedStandardDescription: '默认速度',

package/lib/client.js

@@ -223,6 +223,7 @@ const en = {
 	usageBadgeModelCount: "{count} model quotas",
 	usageBadgeModelUnavailable: "Current model quota unavailable",
 	usageBadgeMoreWindows: "More quota windows ({count})",
+	usageBadgeAllCodexExhausted: "All displayed Codex accounts report exhausted subscription quota. New requests stop before spending paid credits. After an external reset, use Settings > Subscriptions > Refresh to re-check usage.",
 	speed: "Speed",
 	speedStandard: "Standard",
 	speedStandardDescription: "Default speed",
@@ -453,6 +454,7 @@ const zh = {
 	usageBadgeModelCount: "{count} 个模型配额",
 	usageBadgeModelUnavailable: "当前模型暂无配额数据",
 	usageBadgeMoreWindows: "更多配额窗口（{count}）",
+	usageBadgeAllCodexExhausted: "当前显示的所有 Codex 账号都报告订阅额度已耗尽。新请求会在消耗付费额度前停止；外部额度重置后，请使用“设置 > 订阅 > 刷新”重新检查用量。",
 	speed: "速度",
 	speedStandard: "标准",
 	speedStandardDescription: "默认速度",
@@ -5793,6 +5795,7 @@ async function loadBadgeRoster(rpc) {
 	const [subscriptions, external] = await Promise.allSettled([callSubscriptionsAuth(rpc, "status", {}), callSubscriptionsAuth(rpc, "externalStatus", {})]);
 	const roster = [];
 	const refreshed = /* @__PURE__ */ new Set();
+	const visibleModels = /* @__PURE__ */ new Map();
 	if (subscriptions.status === "fulfilled") for (const provider of [
 		"codex",
 		"claude",
@@ -5801,6 +5804,8 @@ async function loadBadgeRoster(rpc) {
 		"antigravity"
 	]) {
 		refreshed.add(provider);
+		const visible = subscriptions.value.providers[provider]?.visibleModels;
+		if (visible !== void 0) visibleModels.set(provider, visible);
 		for (const account of accountsOf(subscriptions.value.providers[provider])) roster.push({
 			provider,
 			account
@@ -5824,7 +5829,8 @@ async function loadBadgeRoster(rpc) {
 	}
 	return {
 		roster,
-		refreshed
+		refreshed,
+		visibleModels
 	};
 }
 async function usageOf(rpc, { provider, account }) {
@@ -5993,7 +5999,7 @@ function SubscriptionUsageBadge({ rpc, currentModel, t, rotationMs }) {
 		if (rpc === void 0 || inflightRef.current) return;
 		inflightRef.current = true;
 		try {
-			const { roster, refreshed } = await loadBadgeRoster(rpc);
+			const { roster, refreshed, visibleModels } = await loadBadgeRoster(rpc);
 			if (!mountedRef.current) return;
 			const lastKnown = lastKnownRef.current;
 			const live = new Set(roster.map(({ provider, account }) => usageKeyOf(provider, account)));
@@ -6040,6 +6046,7 @@ function SubscriptionUsageBadge({ rpc, currentModel, t, rotationMs }) {
 				...display,
 				accounts: display.accounts.map((account) => ({
 					...account,
+					windows: visibleUsageWindows(display.provider, account.windows, visibleModels.get(display.provider)),
 					...observationsRef.current.get(`${display.provider}:${account.key}`)
 				}))
 			})), ...previous.filter((display) => !refreshed.has(display.provider)).map((display) => ({
@@ -6226,35 +6233,42 @@ function SubscriptionUsageBadge({ rpc, currentModel, t, rotationMs }) {
 					}),
 					expanded.map((d, index) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
 						style: index === 0 ? void 0 : styles.section,
-						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-							style: styles.providerRow,
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-								style: styles.providerName,
-								children: [d.name, d.provider === current && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-									style: styles.currentTag,
-									children: translate("usageBadgeCurrent")
+						children: [
+							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								style: styles.providerRow,
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+									style: styles.providerName,
+									children: [d.name, d.provider === current && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										style: styles.currentTag,
+										children: translate("usageBadgeCurrent")
+									})]
+								}), d.accounts.length === 1 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(AccountMeta, {
+									account: d.accounts[0],
+									translate
 								})]
-							}), d.accounts.length === 1 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(AccountMeta, {
-								account: d.accounts[0],
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)(CodexExhaustionNotice, {
+								display: d,
 								translate
-							})]
-						}), d.accounts.map((account, accountIndex) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-							style: accountIndex === 0 ? void 0 : styles.accountBlock,
-							children: [d.accounts.length > 1 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-								style: styles.accountRow,
-								children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(AccountMeta, {
-									account,
+							}),
+							d.accounts.map((account, accountIndex) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								style: accountIndex === 0 ? void 0 : styles.accountBlock,
+								children: [d.accounts.length > 1 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+									style: styles.accountRow,
+									children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(AccountMeta, {
+										account,
+										translate
+									})
+								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(AccountWindows, {
+									windows: account.windows,
+									observedAt: account.observedAt,
+									stale: account.stale,
+									model: d.provider === dialogProvider ? dialogModel : void 0,
+									provider: d.provider,
 									translate
-								})
-							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(AccountWindows, {
-								windows: account.windows,
-								observedAt: account.observedAt,
-								stale: account.stale,
-								model: d.provider === dialogProvider ? dialogModel : void 0,
-								provider: d.provider,
-								translate
-							}, `${d.provider}:${dialogModel ?? ""}`)]
-						}, account.key))]
+								}, `${d.provider}:${dialogModel ?? ""}`)]
+							}, account.key))
+						]
 					}, d.provider))
 				]
 			}), document.body)
@@ -6279,6 +6293,18 @@ function statsScopeOf(seat) {
 	}
 	return seat.parentElement;
 }
+/** Warn only when every displayed Codex account has a known exhausted window. */
+function CodexExhaustionNotice({ display, translate }) {
+	if (display.provider !== "codex" || display.accounts.length === 0 || display.accounts.some((account) => account.windows.length === 0 || !account.windows.some((window$1) => window$1.usedPercent >= 100))) return null;
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+		role: "status",
+		style: {
+			...styles.providerMeta,
+			margin: "8px 0 0"
+		},
+		children: translate("usageBadgeAllCodexExhausted")
+	});
+}
 /**
 * One account's handle and plan: `★ ys@example.com · 计划：pro`. The star
 * marks the default account (the one direct routes serve and the collapsed
@@ -6296,8 +6322,12 @@ function AccountMeta({ account, translate }) {
 		}), parts.join(" · ")]
 	});
 }
-/** Preview each account independently; all remaining quotas stay accessible. */
+/** Preview each account independently; remaining visible quotas stay accessible. */
 function AccountWindows({ windows, model, provider, translate, observedAt, stale }) {
+	if (windows.length === 0) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+		style: styles.providerMeta,
+		children: translate("usageNoVisibleModels")
+	});
 	const { shown, hidden } = previewWindows(windows, model, provider);
 	const rows = (items) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("dl", {
 		style: styles.details,