dsh-subscriptions 0.2.3 → 0.3.1

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');
@@ -60,7 +61,6 @@ const PROVIDER_NAMES = {
     grok: 'Grok',
     copilot: 'Copilot',
     antigravity: 'Antigravity',
-    'cursor-subscription': 'Cursor',
     'opencode-go': 'OpenCode Go',
     'kimi-coding': 'Kimi Code',
     minimax: 'MiniMax',
@@ -110,13 +110,13 @@ export function groupUsageDisplays(roster, windowsOf, plans) {
 }
 /** Read each account source independently so a failing endpoint cannot hide the others. */
 export async function loadBadgeRoster(rpc) {
-    const [subscriptions, cursor, external] = await Promise.allSettled([
+    const [subscriptions, external] = await Promise.allSettled([
         callSubscriptionsAuth(rpc, 'status', {}),
-        callSubscriptionsAuth(rpc, 'cursorStatus', {}),
         callSubscriptionsAuth(rpc, 'externalStatus', {}),
     ]);
     const roster = [];
     const refreshed = new Set();
+    const visibleModels = new Map();
     if (subscriptions.status === 'fulfilled') {
         for (const provider of [
             'codex',
@@ -126,18 +126,13 @@ 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 });
         }
     }
-    if (cursor.status === 'fulfilled') {
-        refreshed.add('cursor-subscription');
-        if (cursor.value.authenticated)
-            roster.push({
-                provider: 'cursor-subscription',
-                account: { key: 'cursor', isDefault: true },
-            });
-    }
     if (external.status === 'fulfilled') {
         for (const [source, provider] of [
             ['opencode-go', 'opencode-go'],
@@ -154,11 +149,9 @@ export async function loadBadgeRoster(rpc) {
                 });
         }
     }
-    return { roster, refreshed };
+    return { roster, refreshed, visibleModels };
 }
 export async function usageOf(rpc, { provider, account }) {
-    if (provider === 'cursor-subscription')
-        return callSubscriptionsAuth(rpc, 'cursorUsage', {});
     if (provider === 'opencode-go' ||
         provider === 'kimi-coding' ||
         provider === 'minimax' ||
@@ -382,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;
@@ -433,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}`),
                     })),
                 })),
@@ -624,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] }));
@@ -647,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
@@ -661,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/SubscriptionsSection.js

@@ -19,7 +19,6 @@ import { visibleUsageWindows } from './usage-window-filter.js';
 import { ProviderAccountManager } from './ProviderAccountManager.js';
 import { providerSettingsCss } from './provider-settings-styles.js';
 import { ExternalUsageCards } from './ExternalUsageCards.js';
-import { CursorCard } from './CursorCard.js';
 import { OllamaCard } from './OllamaCard.js';
 import { UsageMeter } from './UsageMeter.js';
 import { ResetCreditsDisclosure, ResetCreditsErrorLine, showsResetCredits, } from './reset-credits-view.js';
@@ -720,7 +719,7 @@ export function SubscriptionsSection(props) {
                                             })) }), _jsx("button", { type: "button", onClick: () => {
                                                 void submitManual(id);
                                             }, children: t('submit') })] })] }))] }, id));
-            }), _jsx(CursorCard, { rpc: rpc, t: t }), _jsx(OllamaCard, { rpc: rpc, t: t }), _jsx(ExternalUsageCards, { rpc: rpc, t: t }), managedProvider && (_jsx(ProviderAccountManager, { provider: managedProvider.id, name: managedProvider.name, rpc: rpc, t: t, onClose: () => {
+            }), _jsx(OllamaCard, { rpc: rpc, t: t }), _jsx(ExternalUsageCards, { rpc: rpc, t: t }), managedProvider && (_jsx(ProviderAccountManager, { provider: managedProvider.id, name: managedProvider.name, rpc: rpc, t: t, onClose: () => {
                     setManagedProvider(undefined);
                     void refresh();
                 } })), _jsx("style", { children: '.subscriptions-reset-dialog::backdrop { background: var(--dsw-alias-bg-mask-1, #0006); backdrop-filter: var(--dsw-mask-blur, none); }' }), _jsx("dialog", { ref: resetDialogRef, className: "subscriptions-reset-dialog", "aria-labelledby": "subscriptions-reset-title", onCancel: () => setResetConfirmation(undefined), onClose: () => setResetConfirmation(undefined), style: {

package/lib/client/locales.d.ts

@@ -148,22 +148,6 @@ export declare const en: {
     externalUsageApiKey: string;
     externalUsageConfigure: string;
     externalUsageUnavailable: string;
-    cursorTitle: string;
-    cursorOpenLogin: string;
-    cursorWaiting: string;
-    cursorConnected: string;
-    cursorManageTitle: string;
-    cursorManageSignIn: string;
-    cursorAccountsHint: string;
-    cursorManageHint: string;
-    cursorFilterModels: string;
-    cursorModelsLoading: string;
-    cursorModelsError: string;
-    cursorModelsCount: string;
-    cursorIncluded: string;
-    cursorModels: string;
-    cursorOtherModels: string;
-    cursorIncludedRequests: string;
     modelDefaultsTitle: string;
     modelDefaultsHint: string;
     modelDefaultsFollowProvider: string;
@@ -204,6 +188,7 @@ export declare const en: {
     usageBadgeModelCount: string;
     usageBadgeModelUnavailable: string;
     usageBadgeMoreWindows: string;
+    usageBadgeAllCodexExhausted: string;
     speed: string;
     speedStandard: string;
     speedStandardDescription: string;
@@ -394,22 +379,6 @@ export declare const zh: {
     externalUsageApiKey: string;
     externalUsageConfigure: string;
     externalUsageUnavailable: string;
-    cursorTitle: string;
-    cursorOpenLogin: string;
-    cursorWaiting: string;
-    cursorConnected: string;
-    cursorManageTitle: string;
-    cursorManageSignIn: string;
-    cursorAccountsHint: string;
-    cursorManageHint: string;
-    cursorFilterModels: string;
-    cursorModelsLoading: string;
-    cursorModelsError: string;
-    cursorModelsCount: string;
-    cursorIncluded: string;
-    cursorModels: string;
-    cursorOtherModels: string;
-    cursorIncludedRequests: string;
     modelDefaultsTitle: string;
     modelDefaultsHint: string;
     modelDefaultsFollowProvider: string;
@@ -450,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

@@ -148,22 +148,6 @@ export const en = {
     externalUsageApiKey: 'API key',
     externalUsageConfigure: 'No API key found at {ref}. Add one in Settings → Models.',
     externalUsageUnavailable: 'Usage status unavailable: {message}',
-    cursorTitle: 'Cursor',
-    cursorOpenLogin: 'Open Cursor sign-in',
-    cursorWaiting: 'Waiting for Cursor sign-in…',
-    cursorConnected: 'Connected',
-    cursorManageTitle: 'Manage Cursor',
-    cursorManageSignIn: 'Sign in to see the models available to this Cursor account.',
-    cursorAccountsHint: 'Cursor uses one connected account. Choose which of its models appear in the model picker.',
-    cursorManageHint: 'Choose model visibility here. Refresh fetches the current models from Cursor; Save changes updates the model picker.',
-    cursorFilterModels: 'Filter models',
-    cursorModelsLoading: 'Loading Cursor models…',
-    cursorModelsError: 'Could not load Cursor models: {message}',
-    cursorModelsCount: '{count} models available',
-    cursorIncluded: 'Included usage',
-    cursorModels: 'Cursor Models',
-    cursorOtherModels: 'Other Models',
-    cursorIncludedRequests: 'Included requests',
     modelDefaultsTitle: 'Default reasoning effort',
     modelDefaultsHint: 'The model picker preselects this level when you switch to the model; models without levels always follow the provider.',
     modelDefaultsFollowProvider: 'Follow provider',
@@ -204,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',
@@ -402,22 +387,6 @@ export const zh = {
     externalUsageApiKey: 'API 密钥',
     externalUsageConfigure: '未在 {ref} 找到 API 密钥。请在「设置 → 模型」中添加。',
     externalUsageUnavailable: '无法获取用量状态：{message}',
-    cursorTitle: 'Cursor',
-    cursorOpenLogin: '打开 Cursor 登录页面',
-    cursorWaiting: '等待 Cursor 登录…',
-    cursorConnected: '已连接',
-    cursorManageTitle: '管理 Cursor',
-    cursorManageSignIn: '登录后可查看此 Cursor 账号可用的模型。',
-    cursorAccountsHint: 'Cursor 使用一个已连接账号。可在此选择模型选择器中显示的模型。',
-    cursorManageHint: '在此选择模型是否显示。刷新可从 Cursor 获取当前模型；保存更改后更新模型选择器。',
-    cursorFilterModels: '筛选模型',
-    cursorModelsLoading: '正在加载 Cursor 模型…',
-    cursorModelsError: '无法加载 Cursor 模型：{message}',
-    cursorModelsCount: '可用模型：{count} 个',
-    cursorIncluded: '套餐内用量',
-    cursorModels: 'Cursor 模型',
-    cursorOtherModels: '其他模型',
-    cursorIncludedRequests: '套餐内请求',
     modelDefaultsTitle: '默认推理档',
     modelDefaultsHint: '切换到该模型时，模型选择器会预选此档位；没有推理档的模型始终跟随服务商默认。',
     modelDefaultsFollowProvider: '跟随服务商',
@@ -458,6 +427,7 @@ export const zh = {
     usageBadgeModelCount: '{count} 个模型配额',
     usageBadgeModelUnavailable: '当前模型暂无配额数据',
     usageBadgeMoreWindows: '更多配额窗口（{count}）',
+    usageBadgeAllCodexExhausted: '当前显示的所有 Codex 账号都报告订阅额度已耗尽。新请求会在消耗付费额度前停止；外部额度重置后，请使用“设置 > 订阅 > 刷新”重新检查用量。',
     speed: '速度',
     speedStandard: '标准',
     speedStandardDescription: '默认速度',

package/lib/client/model-filter.js

@@ -21,7 +21,7 @@ export function savedModelIds(visibleModels, subagentSpeeds) {
  * accounts with failed discovery need a retry, not another login prompt.
  */
 export function modelEditorNotice(accounts) {
-    // Account-neutral editors such as Cursor use the neutral empty-catalog copy.
+    // Missing account evidence uses the neutral empty-catalog copy.
     if (accounts === undefined)
         return 'noModels';
     if (accounts.length === 0)

package/lib/client/subscription-card-styles.d.ts

@@ -1,3 +1,3 @@
 import type { CSSProperties } from 'react';
-/** Shared visual language for OAuth, Cursor, and built-in provider cards. */
+/** Shared visual language for OAuth and built-in provider cards. */
 export declare const subscriptionCardStyles: Record<string, CSSProperties>;

package/lib/client/subscription-card-styles.js

@@ -1,4 +1,4 @@
-/** Shared visual language for OAuth, Cursor, and built-in provider cards. */
+/** Shared visual language for OAuth and built-in provider cards. */
 export const subscriptionCardStyles = {
     card: {
         border: '1px solid var(--dsw-alias-border-l2)',