dsh-plugin-subscription-oauth 0.11.0 → 0.12.2

package/lib/auth/mimo-flow.d.ts

@@ -63,6 +63,8 @@ export interface MimoSessionCookies {
 /** The Xiaomi sign-in has lapsed and the account must sign in again. */
 export declare class MimoSignInLapsed extends Error {
 }
+/** The open platform's origin (the Token Plan lives here, not at a MiMo server). */
+export declare const MIMO_PLATFORM = "https://platform.xiaomimimo.com";
 /**
  * Sign the account on at a MiMo server, following the serviceLogin redirects.
  *
@@ -118,6 +120,8 @@ export declare function refreshMimoSession(creds: MimoCredentials, fetchFn: type
 export interface MimoUsageWindow {
     label: string;
     usedPercent?: number;
+    used?: number;
+    limit?: number;
     resetsAt?: number;
 }
 /** The account's plan and weekly allowance, for the Settings card and chip. */
@@ -126,4 +130,9 @@ export declare function readMimoUsage(session: MimoSessionCookies, creds: MimoCr
     renewsAt?: number;
     windows: MimoUsageWindow[];
 }>;
+/** The account's Token Plan as a usable API credential, or null when it has none. */
+export declare function readMimoPlanKey(creds: MimoCredentials, fetchFn: typeof fetch): Promise<{
+    key: string;
+    base: string;
+} | null>;
 export {};

package/lib/auth/mimo-flow.js

@@ -144,6 +144,10 @@ export class Jar {
 /** The Xiaomi sign-in has lapsed and the account must sign in again. */
 export class MimoSignInLapsed extends Error {
 }
+/** The open platform's origin (the Token Plan lives here, not at a MiMo server). */
+export const MIMO_PLATFORM = 'https://platform.xiaomimimo.com';
+/** A plan the app refused covers for this long before its endpoint is asked again. */
+const TP_LIFE_MS = 60 * 60 * 1000;
 const appHeaders = () => ({
     'User-Agent': USER_AGENT,
     'X-Client-Version': APP_VERSION,
@@ -457,5 +461,172 @@ export async function readMimoUsage(session, creds, fetchFn) {
     catch {
         // The plan alone, when the week's allowance can't be read.
     }
+    // The Token Plan at the open platform, an aside the app's requests don't spend.
+    const tokenPlan = await readMimoTokenPlan(creds, fetchFn);
+    if (tokenPlan !== null) {
+        if (current === undefined) {
+            plan = tokenPlan.plan;
+            if (tokenPlan.until !== undefined)
+                renewsAt = tokenPlan.until;
+        }
+        if (tokenPlan.window !== undefined)
+            windows.push(tokenPlan.window);
+    }
     return { plan, ...renewsAt === undefined ? {} : { renewsAt }, windows };
 }
+/** A short count of the Token Plan's credits, "6.81M" / "4.1B" / "12K". */
+function mimoCredits(value) {
+    for (const [divisor, unit] of [[1e9, 'B'], [1e6, 'M'], [1e3, 'K']]) {
+        if (value >= divisor)
+            return `${Number((value / divisor).toPrecision(3))}${unit}`;
+    }
+    return String(value);
+}
+/** Read one of the platform's /api/v1 pages, signing on afresh when the session is gone. */
+async function mimoPlatformPage(creds, path, cookies, fetchFn) {
+    const url = `${MIMO_PLATFORM}/api/v1${path}`;
+    const ask = async (cookie) => {
+        const response = await fetchFn(url, {
+            headers: cookie === '' ? {} : { Cookie: cookie },
+            redirect: 'manual',
+            signal: AbortSignal.timeout(20_000),
+        });
+        return { status: response.status, text: await response.text() };
+    };
+    const parse = (text) => {
+        try {
+            const value = JSON.parse(text);
+            return value?.code === 0 ? (isRecord(value.data) ? value.data : null) : undefined;
+        }
+        catch {
+            return undefined;
+        }
+    };
+    if (cookies !== undefined && Object.keys(cookies).length > 0) {
+        const { status, text } = await ask(cookieHeaderOf(cookies));
+        const data = status === 200 ? parse(text) : undefined;
+        if (data !== undefined)
+            return { cookies, data };
+    }
+    let { status, text } = await ask('');
+    let login;
+    try {
+        login = JSON.parse(text).loginUrl;
+    }
+    catch {
+        login = undefined;
+    }
+    if (status !== 401 || typeof login !== 'string' || !login.startsWith('https://account.xiaomi.com/')) {
+        throw new Error(`Xiaomi MiMo platform ${path}: HTTP ${status}`);
+    }
+    // Follow the serviceLogin redirect with the passToken, collecting the platform's cookies.
+    const jar = new Jar();
+    for (const [key, value] of [
+        ['userId', creds.userId], ['passToken', creds.passToken], ['cUserId', creds.cUserId],
+        ['deviceId', creds.deviceId], ['pass_ua', 'pc'], ['uLocale', 'zh_CN'],
+    ]) {
+        if (value)
+            jar.seed('https://account.xiaomi.com', key, value);
+    }
+    let at = login;
+    for (let hop = 0;; hop++) {
+        if (hop > 10)
+            throw new Error('Xiaomi MiMo platform sign-in: too many redirects');
+        const cookie = jar.header(at);
+        const response = await fetchFn(at, {
+            headers: cookie === '' ? {} : { Cookie: cookie },
+            redirect: 'manual',
+            signal: AbortSignal.timeout(20_000),
+        });
+        jar.take(response, at);
+        const location = response.headers.get('location');
+        if (response.status < 300 || response.status >= 400 || !location) {
+            status = response.status;
+            text = await response.text();
+            break;
+        }
+        await response.arrayBuffer().catch(() => { });
+        const next = new URL(location, at);
+        if (next.protocol === 'http:' && next.host === new URL(MIMO_PLATFORM).host)
+            next.protocol = 'https:';
+        at = next.href;
+    }
+    const data = status === 200 ? parse(text) : undefined;
+    if (data === undefined)
+        throw new Error(`Xiaomi MiMo platform ${path}: the Xiaomi account didn't sign on (HTTP ${status})`);
+    return { cookies: jar.forOrigin(`${MIMO_PLATFORM}/`), data };
+}
+/** Read the account's Token Plan, or null when it has none or the platform can't be read. */
+async function readMimoTokenPlan(creds, fetchFn) {
+    try {
+        const detail = await mimoPlatformPage(creds, '/tokenPlan/detail', undefined, fetchFn);
+        const p = detail.data;
+        const name = p !== null && typeof p.planName === 'string' ? p.planName.trim() : '';
+        if (name === '' || p?.expired !== false)
+            return null;
+        const out = { plan: `Token Plan ${name}` };
+        const end = typeof p.currentPeriodEnd === 'string' && /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(p.currentPeriodEnd)
+            ? Date.parse(p.currentPeriodEnd.replace(' ', 'T') + 'Z')
+            : NaN;
+        if (!Number.isNaN(end))
+            out.until = end;
+        try {
+            const usage = await mimoPlatformPage(creds, '/tokenPlan/usage', detail.cookies, fetchFn);
+            const u = usage.data;
+            const items = [
+                ...(isRecord(u) && isRecord(u.monthUsage) && Array.isArray(u.monthUsage.items) ? u.monthUsage.items : []),
+                ...(isRecord(u) && isRecord(u.usage) && Array.isArray(u.usage.items) ? u.usage.items : []),
+            ].filter(isRecord);
+            const it = items.find((x) => x.name === 'month_total_token') ?? items.find((x) => x.name === 'plan_total_token');
+            const used = typeof it?.used === 'number' ? it.used : NaN;
+            const limit = typeof it?.limit === 'number' ? it.limit : NaN;
+            if (Number.isFinite(used) && Number.isFinite(limit) && limit > 0) {
+                const window = {
+                    label: 'Token Plan',
+                    usedPercent: Math.max(0, Math.min(100, (100 * used) / limit)),
+                    used,
+                    limit,
+                };
+                if (out.until !== undefined)
+                    window.resetsAt = out.until;
+                out.window = window;
+            }
+        }
+        catch {
+            // The plan alone, when its usage can't be read.
+        }
+        return out;
+    }
+    catch {
+        return null;
+    }
+}
+/** The account's Token Plan as a usable API credential, or null when it has none. */
+export async function readMimoPlanKey(creds, fetchFn) {
+    try {
+        let cookies;
+        const read = async (path) => {
+            const result = await mimoPlatformPage(creds, path, cookies, fetchFn);
+            cookies = result.cookies;
+            return result.data;
+        };
+        const detail = await read('/tokenPlan/detail');
+        if (detail === null || typeof detail.planName !== 'string' || detail.planName.trim() === '' || detail.expired !== false) {
+            return null;
+        }
+        const keyInfo = await read('/tokenPlan/apiKey');
+        const base = typeof keyInfo?.openaiBaseUrl === 'string' && /^https:\/\/[^/]+\.xiaomimimo\.com\//.test(keyInfo.openaiBaseUrl)
+            ? keyInfo.openaiBaseUrl.replace(/\/+$/, '')
+            : '';
+        if (base === '')
+            return null;
+        const raw = await read('/tokenPlan/apiKey/raw');
+        const rawKey = typeof raw === 'string' ? raw : '';
+        if (!rawKey.startsWith('tp-'))
+            return null;
+        return { key: rawKey, base };
+    }
+    catch {
+        return null;
+    }
+}

package/lib/auth/registry.d.ts

@@ -8,6 +8,7 @@
  *
  * @module dsh-plugin-subscription-oauth/auth/registry
  */
+import type { ModelPreferences } from '../settings.js';
 import type { LoginStart, ModelVariants, ProviderStatus, RefreshResult, SubscriptionStatus, UsageResult } from '../protocol.js';
 import type { LlmAdapter } from '@deepseek-ai/dsh-llm';
 import type { ProviderLoginStart, ProviderRefreshResult, ProviderUsageResult } from './provider-controller.js';
@@ -41,8 +42,9 @@ export interface ProviderRoute {
  * failure: the message names the routes that do exist.
  */
 export declare class SubscriptionRegistry {
+    private readonly preferences;
     private readonly byId;
-    constructor(routes: readonly ProviderRoute[]);
+    constructor(routes: readonly ProviderRoute[], preferences: ModelPreferences);
     /** Route keys this registry serves, in display order. */
     ids(): readonly string[];
     /** Every route, in registration order. */
@@ -92,4 +94,11 @@ export declare class SubscriptionRegistry {
     reload(): Promise<SubscriptionStatus>;
     /** The fast and image variants for one model, as the route's discovery reported them. */
     modelVariants(provider: string, id: string): Promise<ModelVariants | undefined>;
+    /** Whether the `auto` provider is offered; flips it. */
+    autoState(): Promise<{
+        enabled: boolean;
+    }>;
+    setAutoOn(enabled: boolean): Promise<{
+        enabled: boolean;
+    }>;
 }

package/lib/auth/registry.js

@@ -29,8 +29,10 @@ function displayRank(id) {
  * failure: the message names the routes that do exist.
  */
 export class SubscriptionRegistry {
+    preferences;
     byId;
-    constructor(routes) {
+    constructor(routes, preferences) {
+        this.preferences = preferences;
         this.byId = new Map(routes.map((route) => [route.id, route]));
     }
     /** Route keys this registry serves, in display order. */
@@ -151,4 +153,12 @@ export class SubscriptionRegistry {
         const route = this.route(provider);
         return route.modelVariants?.(id);
     }
+    /** Whether the `auto` provider is offered; flips it. */
+    async autoState() {
+        return { enabled: (await this.preferences.autoPreferences()).enabled };
+    }
+    async setAutoOn(enabled) {
+        await this.preferences.setAutoOn(enabled);
+        return { enabled };
+    }
 }

package/lib/auth/rpc.js

@@ -155,6 +155,14 @@ async function runEndpoint(registry, endpoint, payload, balance) {
         }
         case 'usage':
             return registry.usage(requiredProvider(payload, endpoint), booleanField(payload, 'force'));
+        case 'auto-state':
+            return registry.autoState();
+        case 'setAutoOn': {
+            const enabled = booleanField(payload, 'enabled');
+            if (enabled === undefined)
+                throw new ProviderError('setAutoOn requires an enabled flag', BAD_REQUEST);
+            return registry.setAutoOn(enabled);
+        }
         case 'deepseek-balance': {
             // The DeepSeek account's balance, read on the node half through the host's own
             // account service. The browser cannot call that service directly (it sits behind

package/lib/client/SubscriptionsSection.js

@@ -1,4 +1,4 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 /**
  * Subscriptions settings page.
  *
@@ -134,13 +134,21 @@ const styles = {
     cardBody: { display: 'flex', flexDirection: 'column', gap: 10, marginTop: 2 },
     /** The one-line state a folded card shows in place of its body. */
     cardSummary: { fontSize: 12, lineHeight: '18px', color: 'var(--dsw-alias-label-tertiary)' },
-    dot: { width: 8, height: 8, borderRadius: '50%', flexShrink: 0, boxShadow: '0 0 0 3px var(--dsw-alias-state-success-primary, transparent)' },
-    name: { fontWeight: 600, fontSize: 14, lineHeight: '22px', color: 'var(--dsw-alias-label-primary)' },
-    providerId: {
-        fontSize: 11, lineHeight: '16px', color: 'var(--dsw-alias-label-dimmed)',
-        padding: '1px 6px', borderRadius: 999, background: 'var(--dsw-alias-bg-layer-3, var(--dsw-alias-bg-layer-1))',
-        fontFamily: 'monospace',
+    /** The status indicator: filled when live, a hollow ring when not. */
+    dot: {
+        width: 8, height: 8, borderRadius: '50%', flexShrink: 0,
+        border: '1.5px solid var(--dsw-alias-label-dimmed)',
+        background: 'transparent',
+    },
+    dotLive: {
+        borderColor: 'var(--dsw-alias-state-success-primary, #067647)',
+        background: 'var(--dsw-alias-state-success-primary, #067647)',
     },
+    dotBusy: {
+        borderColor: 'var(--dsw-alias-state-warn-primary, #f5a524)',
+        background: 'var(--dsw-alias-state-warn-primary, #f5a524)',
+    },
+    name: { fontWeight: 600, fontSize: 14, lineHeight: '22px', color: 'var(--dsw-alias-label-primary)' },
     statusLine: { margin: 0, fontSize: 12, lineHeight: '18px', color: 'var(--dsw-alias-label-tertiary)' },
     errorLine: { margin: 0, fontSize: 12, lineHeight: '18px', color: 'var(--dsw-alias-state-error-primary)' },
     successLine: { margin: 0, fontSize: 12, lineHeight: '18px', color: 'var(--dsw-alias-state-success-primary)' },
@@ -234,6 +242,10 @@ const styles = {
         padding: '8px 10px', borderRadius: 'var(--dsw-radius-md, 10px)',
         background: 'var(--dsw-alias-bg-layer-1)', border: '0.5px solid var(--dsw-alias-border-l2)',
     },
+    /** The metered windows under one account row: no border, just the meters. */
+    usageInline: { display: 'flex', flexDirection: 'column', gap: 6, marginTop: 4 },
+    /** The auto provider's on/off row: a label and its switch. */
+    autoSwitchRow: { display: 'flex', alignItems: 'center', gap: 8, justifyContent: 'space-between' },
     modelRow: {
         display: 'flex', alignItems: 'flex-start', gap: 8,
         cursor: 'pointer', fontSize: 13, lineHeight: '20px',
@@ -275,13 +287,13 @@ const styles = {
     modalActions: { display: 'flex', gap: 8, justifyContent: 'flex-end', marginTop: 2 },
     divider: { borderTop: '0.5px solid var(--dsw-alias-border-l2)' },
 };
-/** Status dot color for one provider's connection state. */
-function dotColor(status) {
+/** Status dot style for one provider's connection state. */
+function dotStyle(status) {
     if (status.busy)
-        return 'var(--dsw-alias-state-warn-label)';
+        return styles.dotBusy;
     if (status.loggedIn)
-        return 'var(--dsw-alias-state-success-primary)';
-    return 'var(--dsw-alias-label-dimmed)';
+        return styles.dotLive;
+    return {};
 }
 /** Localized label for one provider-owned detail row. */
 function detailLabel(t, row) {
@@ -301,7 +313,14 @@ function windowAmount(window) {
         return `${String(window.used)}/${String(window.limit)}`;
     return '—';
 }
-/** One account's plan and metered allowances. */
+/** One account's metered windows, rendered under its account row. */
+function AccountUsage(props) {
+    const { entry, t } = props;
+    if (entry === undefined)
+        return null;
+    return (_jsxs("div", { style: styles.usageInline, children: [entry.windows.map((window) => (_jsxs("div", { style: styles.usageRow, children: [_jsxs("div", { style: styles.usageLine, children: [_jsxs("span", { style: styles.modelName, children: [windowLabel(t, window), ' · ', windowAmount(window)] }), _jsx("span", { style: styles.modelMeta, children: window.resetsAt === undefined ? '' : formatReset(window.resetsAt, t) })] }), window.usedPercent !== undefined && (_jsx("div", { className: "dsh-subscription-meter", children: _jsx("span", { style: { width: `${String(Math.min(100, Math.max(0, window.usedPercent)))}%` }, "data-exhausted": window.usedPercent >= 90 ? 'true' : 'false' }) }))] }, `${entry.account}-${window.label}`))), entry.windows.length === 0 && (_jsx("p", { style: styles.statusLine, children: t('usageNone') }))] }));
+}
+/** The plan-and-usage block for the whole route. */
 function UsageBlock(props) {
     const { usage, error, t, busyAction, onRefresh } = props;
     return (_jsxs("div", { style: styles.usage, children: [_jsxs("div", { style: styles.usageHeader, children: [_jsx("span", { style: styles.catalogTitle, children: t('usageTitle') }), _jsx("button", { type: "button", className: "dsh-subscription-quiet", style: styles.pushRight, disabled: busyAction, onClick: onRefresh, children: busyAction ? t('refreshing') : t('usageRefresh') })] }), error !== undefined && _jsx("p", { className: "dsh-subscription-error", children: t('usageError', { message: error }) }), usage.length === 0 && error === undefined && _jsx("p", { style: styles.statusLine, children: t('usageNone') }), usage.map((entry) => (_jsxs("div", { style: styles.usageAccount, children: [_jsxs("div", { style: styles.usageLine, children: [_jsxs("span", { style: styles.modelMeta, children: [entry.plan === undefined ? entry.account : t('usagePlan', { plan: entry.plan }), entry.renewsAt === undefined ? '' : ` · ${t('usageRenews', { time: formatTime(entry.renewsAt) })}`] }), _jsx("span", { style: styles.modelMeta, children: t('usageFetched', { time: formatTime(entry.fetchedAt) }) })] }), entry.windows.map((window) => (_jsxs("div", { style: styles.usageRow, children: [_jsxs("div", { style: styles.usageLine, children: [_jsxs("span", { style: styles.modelName, children: [windowLabel(t, window), ' · ', windowAmount(window)] }), _jsx("span", { style: styles.modelMeta, children: window.resetsAt === undefined ? '' : formatReset(window.resetsAt, t) })] }), window.usedPercent !== undefined && (_jsx("div", { className: "dsh-subscription-meter", children: _jsx("span", { style: { width: `${String(Math.min(100, Math.max(0, window.usedPercent)))}%` }, "data-exhausted": window.usedPercent >= 90 ? 'true' : 'false' }) }))] }, `${entry.account}-${window.label}`)))] }, entry.account)))] }));
@@ -500,9 +519,12 @@ function ProviderCard(props) {
     return (_jsxs("div", { style: cardOpen ? { ...styles.card, ...styles.cardOpen } : styles.card, children: [_jsxs("div", { style: styles.cardHeader, role: "button", tabIndex: 0, "aria-expanded": cardOpen, onClick: toggleCardOpen, onKeyDown: (event) => { if (event.key === 'Enter' || event.key === ' ') {
                     event.preventDefault();
                     toggleCardOpen();
-                } }, children: [_jsx("span", { style: { ...styles.dot, background: dotColor(status) }, "aria-hidden": "true" }), _jsx("span", { style: styles.name, children: status.displayName }), _jsx("span", { style: styles.providerId, children: status.provider }), status.loggedIn && _jsx("span", { style: styles.badgeDefault, children: t('badgeLive') }), _jsx("span", { style: styles.cardSummary, children: summaryLine }), _jsx("button", { type: "button", className: "dsh-subscription-quiet", style: styles.pushRight, "aria-expanded": cardOpen, "aria-controls": `dsh-subscription-card-${status.provider}`, onClick: (event) => { event.stopPropagation(); toggleCardOpen(); }, children: cardOpen ? t('collapse') : t('edit') })] }), _jsxs("div", { id: `dsh-subscription-card-${status.provider}`, style: cardOpen ? styles.cardBody : { ...styles.cardBody, display: 'none' }, children: [connectable && !status.loggedIn && !busy && _jsx("p", { style: styles.statusLine, children: t('statusSignIn') }), status.lastError !== undefined && (_jsx("p", { className: "dsh-subscription-error", children: t('lastError', { message: status.lastError }) })), message?.tone === 'error' && _jsx("p", { className: "dsh-subscription-error", children: message.text }), message?.tone === 'success' && _jsx("p", { className: "dsh-subscription-success", children: message.text }), accounts.map((account) => (_jsx("div", { style: styles.accountRow, children: _jsxs("div", { style: styles.accountHeader, children: [_jsx("button", { type: "button", style: styles.starButton, title: account.isDefault ? t('defaultBadge') : t('makeDefault'), "aria-label": account.isDefault ? t('defaultBadge') : t('makeDefault'), disabled: busyAction || account.isDefault, onClick: () => { props.onSetDefault(account.account); }, children: account.isDefault ? '★' : '☆' }), _jsx("span", { style: styles.accountName, children: account.label }), account.isDefault && _jsx("span", { style: styles.badgeDefault, children: t('defaultBadge') }), account.needsLogin === true && (_jsx("span", { style: styles.badgeWarn, title: t('accountNeedsLoginHint'), children: t('accountNeedsLogin') })), _jsx("span", { style: styles.statusLine, children: account.expired
-                                        ? t('accountExpired')
-                                        : t('accountExpires', { time: formatTime(account.expiresAt) }) }), _jsx("button", { type: "button", className: "dsh-subscription-quiet", style: styles.pushRight, disabled: busyAction, onClick: () => { props.onLogout(account.account); }, children: t('logout') })] }) }, account.account))), status.loggedIn && (_jsxs("div", { style: styles.catalog, children: [_jsxs("div", { style: styles.catalogHeader, children: [_jsxs("button", { type: "button", className: "dsh-subscription-disclosure", style: styles.disclosure, "aria-expanded": modelsOpen, "aria-controls": `dsh-subscription-models-${status.provider}`, onClick: toggleModelsOpen, children: [_jsx("span", { style: styles.chevron, "aria-hidden": "true", children: modelsOpen ? '▾' : '▸' }), _jsx("span", { style: styles.catalogTitle, children: t('modelsTitle') })] }), _jsxs("span", { style: styles.catalogMeta, children: [t('modelsCount', { count: models.length }), ' · ', liveCatalog ? t('modelsLive') : t('modelsBuiltIn'), hiddenCount === 0 ? '' : ` ${t('modelsHiddenCount', { count: hiddenCount })}`] }), _jsx("button", { type: "button", className: "dsh-subscription-quiet", style: styles.pushRight, disabled: busyAction, onClick: props.onRefreshModels, children: busyAction ? t('refreshing') : t('refresh') }), _jsx("button", { type: "button", className: "dsh-subscription-quiet", disabled: busyAction || !connectable, title: t('modelsAddHint'), onClick: () => { setAdding((open) => !open); }, children: t('modelsAdd') })] }), adding && (_jsxs("form", { style: styles.addRow, onSubmit: (event) => {
+                } }, children: [_jsx("span", { style: { ...styles.dot, ...dotStyle(status) }, "aria-hidden": "true" }), _jsx("span", { style: styles.name, children: status.displayName }), status.loggedIn && _jsx("span", { style: styles.badgeDefault, children: t('badgeLive') }), _jsx("span", { style: styles.cardSummary, children: summaryLine }), _jsx("button", { type: "button", className: "dsh-subscription-quiet", style: styles.pushRight, "aria-expanded": cardOpen, "aria-controls": `dsh-subscription-card-${status.provider}`, onClick: (event) => { event.stopPropagation(); toggleCardOpen(); }, children: cardOpen ? t('collapse') : t('edit') })] }), _jsxs("div", { id: `dsh-subscription-card-${status.provider}`, style: cardOpen ? styles.cardBody : { ...styles.cardBody, display: 'none' }, children: [connectable && !status.loggedIn && !busy && _jsx("p", { style: styles.statusLine, children: t('statusSignIn') }), status.lastError !== undefined && (_jsx("p", { className: "dsh-subscription-error", children: t('lastError', { message: status.lastError }) })), message?.tone === 'error' && _jsx("p", { className: "dsh-subscription-error", children: message.text }), message?.tone === 'success' && _jsx("p", { className: "dsh-subscription-success", children: message.text }), status.provider === 'auto' && props.onSetAutoOn !== undefined && (_jsxs("label", { style: styles.autoSwitchRow, children: [_jsx("span", { style: styles.modelName, children: t('autoSwitchLabel') }), _jsx("input", { type: "checkbox", className: "dsh-subscription-switch", checked: props.autoOn ?? true, disabled: busyAction, onChange: (event) => { props.onSetAutoOn?.(event.target.checked); } })] })), accounts.map((account) => {
+                        const usageEntry = (status.usage ?? []).find((entry) => entry.account === account.account);
+                        return (_jsxs("div", { style: styles.accountRow, children: [_jsxs("div", { style: styles.accountHeader, children: [_jsx("button", { type: "button", style: styles.starButton, title: account.isDefault ? t('defaultBadge') : t('makeDefault'), "aria-label": account.isDefault ? t('defaultBadge') : t('makeDefault'), disabled: busyAction || account.isDefault, onClick: () => { props.onSetDefault(account.account); }, children: account.isDefault ? '★' : '☆' }), _jsx("span", { style: styles.accountName, children: account.label }), account.isDefault && _jsx("span", { style: styles.badgeDefault, children: t('defaultBadge') }), account.needsLogin === true && (_jsx("span", { style: styles.badgeWarn, title: t('accountNeedsLoginHint'), children: t('accountNeedsLogin') })), usageEntry?.plan !== undefined && (_jsx("span", { style: styles.badge, children: t('usagePlan', { plan: usageEntry.plan }) })), _jsx("span", { style: styles.statusLine, children: account.expired
+                                                ? t('accountExpired')
+                                                : t('accountExpires', { time: formatTime(account.expiresAt) }) }), _jsx("button", { type: "button", className: "dsh-subscription-quiet", style: styles.pushRight, disabled: busyAction, onClick: () => { props.onLogout(account.account); }, children: t('logout') })] }), _jsx(AccountUsage, { entry: usageEntry, t: t })] }, account.account));
+                    }), status.loggedIn && (_jsxs("div", { style: styles.catalog, children: [_jsxs("div", { style: styles.catalogHeader, children: [_jsxs("button", { type: "button", className: "dsh-subscription-disclosure", style: styles.disclosure, "aria-expanded": modelsOpen, "aria-controls": `dsh-subscription-models-${status.provider}`, onClick: toggleModelsOpen, children: [_jsx("span", { style: styles.chevron, "aria-hidden": "true", children: modelsOpen ? '▾' : '▸' }), _jsx("span", { style: styles.catalogTitle, children: t('modelsTitle') })] }), _jsxs("span", { style: styles.catalogMeta, children: [t('modelsCount', { count: models.length }), ' · ', liveCatalog ? t('modelsLive') : t('modelsBuiltIn'), hiddenCount === 0 ? '' : ` ${t('modelsHiddenCount', { count: hiddenCount })}`] }), _jsx("button", { type: "button", className: "dsh-subscription-quiet", style: styles.pushRight, disabled: busyAction, onClick: props.onRefreshModels, children: busyAction ? t('refreshing') : t('refresh') }), _jsx("button", { type: "button", className: "dsh-subscription-quiet", disabled: busyAction || !connectable, title: t('modelsAddHint'), onClick: () => { setAdding((open) => !open); }, children: t('modelsAdd') })] }), adding && (_jsxs("form", { style: styles.addRow, onSubmit: (event) => {
                                     event.preventDefault();
                                     const id = draft.trim();
                                     if (id.length === 0)
@@ -525,7 +547,7 @@ function ProviderCard(props) {
                                                     ? { ...styles.modelRowGrow, cursor: 'pointer' }
                                                     : { ...styles.modelRowGrow, cursor: 'pointer', color: 'var(--dsw-alias-label-dimmed)' }, title: model.visible ? t('modelsHidden') : t('modelsShow'), children: [_jsx("input", { type: "checkbox", className: "dsh-subscription-switch", role: "switch", checked: model.visible, disabled: busyAction, "aria-label": `${t('modelsShow')} · ${model.name}`, onChange: (event) => { props.onSetModelVisible(model.id, event.target.checked); } }), _jsxs("span", { style: styles.modelBody, children: [_jsxs("span", { style: styles.modelName, children: [model.name, model.source === undefined ? null : _jsx("span", { style: styles.badge, children: model.source })] }), _jsxs("span", { style: styles.modelMeta, children: [model.id, ' · ', t('modelsContext', { tokens: formatTokens(model.contextWindow) }), model.defaultEffort === undefined ? '' : ` · ${model.defaultEffort}`, model.inputModalities === undefined || model.inputModalities.length === 0
                                                                         ? ''
-                                                                        : ` · ${model.inputModalities.join('/')}`] })] })] }), model.userAdded === true && (_jsx("button", { type: "button", className: "dsh-subscription-quiet", style: styles.removeButton, disabled: busyAction, title: t('modelsRemove'), "aria-label": `${t('modelsRemove')} · ${model.name}`, onClick: () => { props.onRemoveModel(model.id); }, children: "\u00D7" }))] }, model.id))), models.length === 0 && (_jsx("p", { style: styles.statusLine, children: status.provider === 'auto' ? t('modelsAutoChainEmpty') : t('modelsEmpty') }))] }))] })), _jsx(UsageBlock, { usage: status.usage ?? [], ...status.usageError === undefined ? {} : { error: status.usageError }, t: t, busyAction: busyAction, onRefresh: props.onRefreshUsage }), connectable && (_jsxs("div", { style: styles.actions, children: [!busy && (_jsx("button", { type: "button", disabled: busyAction, onClick: props.onLogin, children: accounts.length === 0 ? t('connect') : t('addAccount') })), !busy && (_jsx("button", { type: "button", disabled: busyAction, onClick: () => { setManageOpen(true); }, children: t('manage') })), busy && (_jsx("button", { type: "button", disabled: busyAction, onClick: props.onCancel, children: t('cancel') }))] })), connectable && accounts.length > 0 && _jsx("p", { style: styles.statusLine, children: t('hint') }), busy && status.pending !== undefined && (_jsx(PendingLogin, { prompt: status.pending, t: t, copied: copied, onCopy: (code) => { void copyCode(code); } }))] }), _jsxs("dialog", { ref: dialog, className: "dsh-subscription-manager", "aria-labelledby": `dsh-subscription-manage-${status.provider}`, 
+                                                                        : ` · ${model.inputModalities.join('/')}`] })] })] }), model.userAdded === true && (_jsx("button", { type: "button", className: "dsh-subscription-quiet", style: styles.removeButton, disabled: busyAction, title: t('modelsRemove'), "aria-label": `${t('modelsRemove')} · ${model.name}`, onClick: () => { props.onRemoveModel(model.id); }, children: "\u00D7" }))] }, model.id))), models.length === 0 && (_jsx("p", { style: styles.statusLine, children: status.provider === 'auto' ? t('modelsAutoChainEmpty') : t('modelsEmpty') }))] }))] })), connectable && (_jsxs("div", { style: styles.actions, children: [!busy && (_jsx("button", { type: "button", disabled: busyAction, onClick: props.onLogin, children: accounts.length === 0 ? t('connect') : t('addAccount') })), !busy && (_jsx("button", { type: "button", disabled: busyAction, onClick: () => { setManageOpen(true); }, children: t('manage') })), busy && (_jsx("button", { type: "button", disabled: busyAction, onClick: props.onCancel, children: t('cancel') }))] })), connectable && accounts.length > 0 && _jsx("p", { style: styles.statusLine, children: t('hint') }), busy && status.pending !== undefined && (_jsx(PendingLogin, { prompt: status.pending, t: t, copied: copied, onCopy: (code) => { void copyCode(code); } }))] }), _jsxs("dialog", { ref: dialog, className: "dsh-subscription-manager", "aria-labelledby": `dsh-subscription-manage-${status.provider}`, 
                 // A closed `<dialog>` is hidden by the user-agent stylesheet, and an
                 // inline `display` would override that rule — so the open state has to
                 // be restated here rather than left to `showModal()` alone.
@@ -543,8 +565,20 @@ export function SubscriptionsSection(props) {
     const [error, setError] = useState(undefined);
     const [messages, setMessages] = useState({});
     const [busyAction, setBusyAction] = useState(false);
+    const [autoOn, setAutoOn] = useState(true);
     const mounted = useRef(true);
     const timer = useRef(undefined);
+    /** Read whether the `auto` provider is offered, so its card can render the switch. */
+    useEffect(() => {
+        if (call === undefined)
+            return;
+        let live = true;
+        void call('auto-state', undefined)
+            .then((result) => { if (live)
+            setAutoOn(result.enabled); })
+            .catch(() => { });
+        return () => { live = false; };
+    }, [call]);
     /** Fetch the current state; a failure is shown rather than swallowed. */
     const refresh = useCallback(async () => {
         if (call === undefined)
@@ -561,6 +595,27 @@ export function SubscriptionsSection(props) {
                 setError(t('actionFailed', { message: messageOf(caught) }));
         }
     }, [call, t]);
+    /** Flip the `auto` provider on or off. */
+    const setAuto = useCallback(async (enabled) => {
+        if (call === undefined)
+            return;
+        setBusyAction(true);
+        try {
+            const result = await call('setAutoOn', { enabled });
+            if (!mounted.current)
+                return;
+            setAutoOn(result.enabled);
+            await refresh();
+        }
+        catch (caught) {
+            if (mounted.current)
+                setError(t('actionFailed', { message: messageOf(caught) }));
+        }
+        finally {
+            if (mounted.current)
+                setBusyAction(false);
+        }
+    }, [call, refresh, t]);
     const stopPolling = useCallback(() => {
         if (timer.current !== undefined) {
             clearInterval(timer.current);
@@ -804,5 +859,5 @@ export function SubscriptionsSection(props) {
     }, [act, call]);
     if (call === undefined)
         return _jsx("p", { style: styles.intro, children: t('unavailable') });
-    return (_jsxs("div", { className: "dsh-subscriptions-settings", style: styles.section, children: [_jsx("style", { children: subscriptionsCss }), _jsxs("div", { style: styles.sectionHeader, children: [_jsx("h2", { style: styles.heading, children: t('nav') }), _jsx("p", { style: styles.intro, children: t('intro') })] }), error !== undefined && _jsx("p", { className: "dsh-subscription-error", children: error }), status === undefined && _jsx("p", { style: styles.statusLine, children: t('loading') }), orderedProviders.map((provider) => (_jsx(ProviderCard, { status: provider, t: t, busyAction: busyAction, ...messages[provider.provider] === undefined ? {} : { message: messages[provider.provider] }, onLogin: () => { login(provider.provider); }, onCancel: () => { cancel(provider.provider); }, onLogout: (account) => { logout(provider.provider, account); }, onSetDefault: (account) => { setDefault(provider.provider, account); }, onRefreshToken: (account) => { refreshToken(provider.provider, account); }, onRefreshModels: () => { refreshModels(provider.provider); }, onSetModelVisible: (id, visible) => { setModelVisible(provider.provider, id, visible); }, onSetModelOrder: (ids) => { setModelOrder(provider.provider, ids); }, onAddModel: (id) => { addModel(provider.provider, id); }, onRemoveModel: (id) => { removeModel(provider.provider, id); }, onRefreshUsage: () => { refreshUsage(provider.provider); }, onReload: () => { reload(provider.provider); } }, provider.provider)))] }));
+    return (_jsxs("div", { className: "dsh-subscriptions-settings", style: styles.section, children: [_jsx("style", { children: subscriptionsCss }), _jsxs("div", { style: styles.sectionHeader, children: [_jsx("h2", { style: styles.heading, children: t('nav') }), _jsx("p", { style: styles.intro, children: t('intro') })] }), error !== undefined && _jsx("p", { className: "dsh-subscription-error", children: error }), status === undefined && _jsx("p", { style: styles.statusLine, children: t('loading') }), orderedProviders.map((provider) => (_jsx(ProviderCard, { status: provider, t: t, busyAction: busyAction, ...messages[provider.provider] === undefined ? {} : { message: messages[provider.provider] }, onLogin: () => { login(provider.provider); }, onCancel: () => { cancel(provider.provider); }, onLogout: (account) => { logout(provider.provider, account); }, onSetDefault: (account) => { setDefault(provider.provider, account); }, onRefreshToken: (account) => { refreshToken(provider.provider, account); }, onRefreshModels: () => { refreshModels(provider.provider); }, onSetModelVisible: (id, visible) => { setModelVisible(provider.provider, id, visible); }, onSetModelOrder: (ids) => { setModelOrder(provider.provider, ids); }, onAddModel: (id) => { addModel(provider.provider, id); }, onRemoveModel: (id) => { removeModel(provider.provider, id); }, onRefreshUsage: () => { refreshUsage(provider.provider); }, onReload: () => { reload(provider.provider); }, ...provider.provider !== 'auto' ? {} : { autoOn, onSetAutoOn: (enabled) => { void setAuto(enabled); } } }, provider.provider)))] }));
 }

package/lib/client/UsageChip.js

@@ -207,12 +207,18 @@ export function mergeAccountWindows(readings) {
         if (withPercent.length === 0)
             continue;
         const usedPercent = withPercent.reduce((sum, window) => sum + (window.usedPercent ?? 0), 0) / withPercent.length;
+        // A credit window carries the raw figures too; keep them so the compact line can read
+        // money as money (0/1500) rather than as a spent share (0%), which misreads an empty
+        // balance as nothing to meter.
+        const used = list.reduce((sum, window) => sum + (window.used ?? 0), 0);
+        const limit = list.reduce((sum, window) => sum + (window.limit ?? 0), 0);
         // The pool's reset is the soonest account reset: the window refills when the first
         // account's does.
         const resets = list.map((window) => window.resetsAt).filter((at) => typeof at === 'number');
         merged.push({
             label,
             usedPercent: Math.max(0, Math.min(100, usedPercent)),
+            ...limit > 0 ? { used, limit } : {},
             ...resets.length === 0 ? {} : { resetsAt: Math.min(...resets) },
         });
     }
@@ -430,7 +436,9 @@ export function UsageChip({ call, t, isOwnProvider, accountBalance, ccSwitchBala
                     // The document listener would otherwise close what this click just opened.
                     event.stopPropagation();
                     setOpen((was) => !was);
-                }, children: [_jsx("span", { className: "dsh-subscription-usage-chip-label", children: short }), merged.map((window) => (_jsxs("span", { className: "dsh-subscription-usage-chip-cell", children: [_jsx("span", { className: "dsh-subscription-usage-chip-window", children: shortWindow(window.label) }), _jsx("span", { className: "dsh-subscription-usage-chip-value", children: `${String(Math.round(window.usedPercent ?? 0))}%` })] }, window.label)))] }), open && (_jsxs("span", { className: "dsh-subscription-usage-chip-panel", role: "status", children: [_jsx("span", { className: "dsh-subscription-usage-chip-full", children: t('usageChipFull', { provider: selected ?? '' }) }), accountReadings.map((account) => (_jsxs("span", { className: "dsh-subscription-usage-chip-account", children: [_jsx("span", { className: "dsh-subscription-usage-chip-meterHead", children: _jsx("span", { children: account.plan ?? account.account }) }), account.windows.map((window) => {
+                }, children: [_jsx("span", { className: "dsh-subscription-usage-chip-label", children: short }), merged.map((window) => (_jsxs("span", { className: "dsh-subscription-usage-chip-cell", children: [_jsx("span", { className: "dsh-subscription-usage-chip-window", children: shortWindow(window.label) }), _jsx("span", { className: "dsh-subscription-usage-chip-value", children: window.used !== undefined && window.limit !== undefined
+                                    ? `${String(window.used)}/${String(window.limit)}`
+                                    : `${String(Math.round(window.usedPercent ?? 0))}%` })] }, window.label)))] }), open && (_jsxs("span", { className: "dsh-subscription-usage-chip-panel", role: "status", children: [_jsx("span", { className: "dsh-subscription-usage-chip-full", children: t('usageChipFull', { provider: selected ?? '' }) }), accountReadings.map((account) => (_jsxs("span", { className: "dsh-subscription-usage-chip-account", children: [_jsx("span", { className: "dsh-subscription-usage-chip-meterHead", children: _jsx("span", { children: account.plan ?? account.account }) }), account.windows.map((window) => {
                                 const windowReset = formatReset(window.resetsAt, now);
                                 // A credit balance reads as money (`used`/`limit`), a quota as a percent.
                                 const amount = window.usedPercent === undefined && window.used !== undefined && window.limit !== undefined

package/lib/client/locales.d.ts

@@ -60,6 +60,7 @@ export declare const en: {
     readonly modelsDrag: "Drag to re-order (or press ↑ / ↓ here)";
     readonly modelsAutoChainOff: "Take out of Auto";
     readonly modelsAutoChainEmpty: "No model is enabled, so Auto has nothing to try.";
+    readonly autoSwitchLabel: "Offer Auto in the model picker";
     readonly modelsPinned: "pinned";
     readonly usageTitle: "Plan and usage";
     readonly usagePlan: "Plan: {plan}";
@@ -157,6 +158,7 @@ export declare const zh: {
     modelsDrag: string;
     modelsAutoChainOff: string;
     modelsAutoChainEmpty: string;
+    autoSwitchLabel: string;
     modelsPinned: string;
     usageTitle: string;
     usagePlan: string;

package/lib/client/locales.js

@@ -60,6 +60,7 @@ export const en = {
     modelsDrag: 'Drag to re-order (or press ↑ / ↓ here)',
     modelsAutoChainOff: 'Take out of Auto',
     modelsAutoChainEmpty: 'No model is enabled, so Auto has nothing to try.',
+    autoSwitchLabel: 'Offer Auto in the model picker',
     modelsPinned: 'pinned',
     usageTitle: 'Plan and usage',
     usagePlan: 'Plan: {plan}',
@@ -155,6 +156,7 @@ export const zh = {
     modelsDrag: '拖动调整顺序（也可在此按 ↑ / ↓）',
     modelsAutoChainOff: '从自动中移除',
     modelsAutoChainEmpty: '没有启用任何模型，自动没有可尝试的模型。',
+    autoSwitchLabel: '在模型选择器中提供 Auto',
     modelsPinned: '固定',
     usageTitle: '套餐与额度',
     usagePlan: '套餐：{plan}',