dsh-subscriptions 0.2.0 → 0.2.2

package/lib/auth/device-flow.js

@@ -70,18 +70,24 @@ export class DeviceFlowManager {
         const response = await fetchFn(spec.deviceCodeUrl, {
             method: 'POST',
             headers: {
-                'accept': 'application/json',
+                accept: 'application/json',
                 'content-type': 'application/x-www-form-urlencoded',
             },
-            body: new URLSearchParams({ client_id: spec.clientId, scope: spec.scope }).toString(),
+            body: new URLSearchParams({
+                client_id: spec.clientId,
+                scope: spec.scope,
+            }).toString(),
         });
         if (!response.ok) {
             throw new Error(`${provider} device-code request failed (HTTP ${String(response.status)})`);
         }
-        const wire = await parseProviderJson(response, 'device code request');
-        if (typeof wire.device_code !== 'string' || wire.device_code.length === 0
-            || typeof wire.user_code !== 'string' || wire.user_code.length === 0
-            || typeof wire.verification_uri !== 'string' || wire.verification_uri.length === 0) {
+        const wire = (await parseProviderJson(response, 'device code request'));
+        if (typeof wire.device_code !== 'string' ||
+            wire.device_code.length === 0 ||
+            typeof wire.user_code !== 'string' ||
+            wire.user_code.length === 0 ||
+            typeof wire.verification_uri !== 'string' ||
+            wire.verification_uri.length === 0) {
             throw new Error(`${provider} device-code response is missing device_code/user_code/verification_uri`);
         }
         const intervalSec = typeof wire.interval === 'number' && wire.interval > 0
@@ -124,7 +130,7 @@ export class DeviceFlowManager {
                 const pollResponse = await fetchFn(spec.tokenUrl, {
                     method: 'POST',
                     headers: {
-                        'accept': 'application/json',
+                        accept: 'application/json',
                         'content-type': 'application/x-www-form-urlencoded',
                     },
                     body: new URLSearchParams({
@@ -134,8 +140,9 @@ export class DeviceFlowManager {
                     }).toString(),
                     signal: controller.signal,
                 });
-                const result = await parseProviderJson(pollResponse, 'device token poll');
-                if (typeof result.access_token === 'string' && result.access_token.length > 0) {
+                const result = (await parseProviderJson(pollResponse, 'device token poll'));
+                if (typeof result.access_token === 'string' &&
+                    result.access_token.length > 0) {
                     settle(undefined, result.access_token);
                     return;
                 }

package/lib/auth/oauth-flow.js

@@ -9,9 +9,9 @@ import { createServer } from 'node:http';
 import { createPkce, randomHex, randomToken } from './pkce.js';
 /** Default attempt lifetime: three minutes for the user to complete login. */
 export const DEFAULT_FLOW_TIMEOUT_MS = 180_000;
-const SUCCESS_PAGE = '<!doctype html><html><head><meta charset="utf-8"><title>Login successful</title></head>'
-    + '<body style="font-family:sans-serif"><h1>Login successful</h1>'
-    + '<p>You can close this tab and return to DeepSeek Harness.</p></body></html>';
+const SUCCESS_PAGE = '<!doctype html><html><head><meta charset="utf-8"><title>Login successful</title></head>' +
+    '<body style="font-family:sans-serif"><h1>Login successful</h1>' +
+    '<p>You can close this tab and return to DeepSeek Harness.</p></body></html>';
 function authorizationFailure(error) {
     // Safe means this failure path carries no provider-controlled free text,
     // not that no secret can exist elsewhere in the system.
@@ -40,13 +40,13 @@ function authorizationFailure(error) {
             category = 'temporarily_unavailable';
             break;
     }
-    return 'authorization failed'
-        + (category === undefined ? '' : ` (${category})`)
-        + ': [provider message omitted]';
+    return ('authorization failed' +
+        (category === undefined ? '' : ` (${category})`) +
+        ': [provider message omitted]');
 }
 function failurePage(detail) {
-    return '<!doctype html><html><head><meta charset="utf-8"><title>Login failed</title></head>'
-        + `<body style="font-family:sans-serif"><h1>Login failed</h1><p>${detail.replace(/[<>&]/g, '')}</p></body></html>`;
+    return ('<!doctype html><html><head><meta charset="utf-8"><title>Login failed</title></head>' +
+        `<body style="font-family:sans-serif"><h1>Login failed</h1><p>${detail.replace(/[<>&]/g, '')}</p></body></html>`);
 }
 /**
  * Loopback addresses one listen host covers. `localhost` resolves to ::1 or
@@ -69,7 +69,7 @@ function familyUnavailable(error) {
  */
 async function listen(handler, spec) {
     const hosts = listenHosts(spec.host);
-    const candidates = spec.ports.flatMap(port => (port === 0 ? [0, 0, 0] : [port]));
+    const candidates = spec.ports.flatMap((port) => port === 0 ? [0, 0, 0] : [port]);
     let lastError;
     for (const candidate of candidates) {
         const servers = [];
@@ -161,6 +161,8 @@ export class OAuthFlowManager {
             rejectCode = reject;
         });
         let settled = false;
+        // Assigned after listen(); a callback that arrives first must see it absent.
+        // eslint-disable-next-line prefer-const -- the single write is after the listener exists
         let timer;
         let servers = [];
         const handler = (request, response) => {
@@ -177,7 +179,8 @@ export class OAuthFlowManager {
                 response.end('state mismatch');
                 return;
             }
-            if (url.searchParams.has('error_description') || url.searchParams.has('error')) {
+            if (url.searchParams.has('error_description') ||
+                url.searchParams.has('error')) {
                 const detail = authorizationFailure(url.searchParams.get('error'));
                 response.writeHead(200, { 'content-type': 'text/html' });
                 response.end(failurePage(detail));

package/lib/auth/rpc.js

@@ -21,18 +21,44 @@ export const SUBSCRIPTIONS_AUTH_PREFIX = 'subscriptions-auth.';
  * Kept in one place so the route table and the switch cannot drift apart.
  */
 export const SUBSCRIPTIONS_AUTH_ENDPOINTS = [
-    'providerSettings', 'setProviderSettings',
-    'status', 'login', 'manual', 'cancel', 'logout', 'setDefault', 'usage',
-    'externalStatus', 'externalUsage',
-    'cursorStatus', 'cursorLogin', 'cursorCancel', 'cursorLogout', 'cursorUsage', 'cursorModels',
-    'cursorSettings', 'cursorSetSettings',
-    'ollamaSettings', 'ollamaSetSettings', 'ollamaModels',
-    'image', 'video', 'prepareReset', 'consumeReset',
-    'speed', 'setSpeed',
-    'modelDefaults', 'setModelDefault',
+    'providerSettings',
+    'setProviderSettings',
+    'status',
+    'login',
+    'manual',
+    'cancel',
+    'logout',
+    'setDefault',
+    'usage',
+    'externalStatus',
+    'externalUsage',
+    'cursorStatus',
+    'cursorLogin',
+    'cursorCancel',
+    'cursorLogout',
+    'cursorUsage',
+    'cursorModels',
+    'cursorSettings',
+    'cursorSetSettings',
+    'ollamaSettings',
+    'ollamaSetSettings',
+    'ollamaModels',
+    'image',
+    'video',
+    'prepareReset',
+    'consumeReset',
+    'speed',
+    'setSpeed',
+    'modelDefaults',
+    'setModelDefault',
 ];
 /** Media types the attachment store accepts (ImageMediaType). */
-const IMAGE_MEDIA_TYPES = ['image/png', 'image/jpeg', 'image/webp', 'image/gif'];
+const IMAGE_MEDIA_TYPES = [
+    'image/png',
+    'image/jpeg',
+    'image/webp',
+    'image/gif',
+];
 /** Bare MP4 file names the `video` endpoint accepts (no path separators). */
 const VIDEO_NAME_PATTERN = /^[\w.-]+\.mp4$/;
 /** Payload carried no usable provider id — an RPC client bug, not a server failure. */
@@ -42,9 +68,16 @@ function readEnvelope(body) {
     if (typeof body !== 'object' || body === null)
         return undefined;
     const record = body;
-    if (record.type !== 'client-request' || typeof record.rpcId !== 'string' || typeof record.method !== 'string')
+    if (record.type !== 'client-request' ||
+        typeof record.rpcId !== 'string' ||
+        typeof record.method !== 'string')
         return undefined;
-    return { type: 'client-request', rpcId: record.rpcId, method: record.method, payload: record.payload };
+    return {
+        type: 'client-request',
+        rpcId: record.rpcId,
+        method: record.method,
+        payload: record.payload,
+    };
 }
 function serverResponse(rpcId, result) {
     return Response.json({ type: 'server-response', rpcId, result });
@@ -64,8 +97,14 @@ function fetchRouteFor(endpoint, handler) {
         methods: ['POST'],
         requestBody: 'buffered',
         fetch: async (request) => {
-            if (request.headers.get('content-type')?.split(';', 1)[0]?.trim().toLowerCase() !== 'application/json') {
-                return new Response('content type must be application/json', { status: 415 });
+            if (request.headers
+                .get('content-type')
+                ?.split(';', 1)[0]
+                ?.trim()
+                .toLowerCase() !== 'application/json') {
+                return new Response('content type must be application/json', {
+                    status: 415,
+                });
             }
             let body;
             try {
@@ -79,7 +118,11 @@ function fetchRouteFor(endpoint, handler) {
                 const rawId = body?.rpcId;
                 return serverResponse(typeof rawId === 'string' ? rawId : 'invalid-request', {
                     ok: false,
-                    error: { code: 'gateway/bad-request', message: 'invalid client-request message', details: { issues: [] } },
+                    error: {
+                        code: 'gateway/bad-request',
+                        message: 'invalid client-request message',
+                        details: { issues: [] },
+                    },
                 });
             }
             if (envelope.method !== method) {
@@ -103,7 +146,10 @@ function failure(error) {
     const message = error instanceof Error ? error.message : String(error);
     if (error instanceof BadRequest) {
         // The issues array is zod-shaped upstream; this channel validates by hand.
-        return { ok: false, error: { code: 'bad-request', message, details: { issues: [] } } };
+        return {
+            ok: false,
+            error: { code: 'bad-request', message, details: { issues: [] } },
+        };
     }
     return { ok: false, error: { code: 'internal', message, details: {} } };
 }
@@ -111,7 +157,8 @@ function readProvider(payload) {
     if (typeof payload !== 'object' || payload === null)
         throw new BadRequest('payload must be an object');
     const provider = payload.provider;
-    if (typeof provider !== 'string' || !PROVIDER_IDS.includes(provider)) {
+    if (typeof provider !== 'string' ||
+        !PROVIDER_IDS.includes(provider)) {
         throw new BadRequest(`payload.provider must be one of ${PROVIDER_IDS.join(', ')}`);
     }
     return provider;
@@ -183,7 +230,8 @@ function readImageRef(payload) {
         throw new BadRequest('payload.attachmentId must be a non-empty string');
     }
     const mediaType = record.mediaType;
-    if (typeof mediaType !== 'string' || !IMAGE_MEDIA_TYPES.includes(mediaType)) {
+    if (typeof mediaType !== 'string' ||
+        !IMAGE_MEDIA_TYPES.includes(mediaType)) {
         throw new BadRequest(`payload.mediaType must be one of ${IMAGE_MEDIA_TYPES.join(', ')}`);
     }
     for (const field of ['bytes', 'width', 'height']) {
@@ -202,7 +250,7 @@ function readImageRef(payload) {
         bytes: record.bytes,
         width: record.width,
         height: record.height,
-        ...name === undefined ? {} : { name: name },
+        ...(name === undefined ? {} : { name: name }),
     };
 }
 /**
@@ -253,11 +301,14 @@ async function dispatch(controller, speed, modelDefaults, endpoint, payload, sig
             // One provider's failure (a corrupt store entry, a broken flow) must not
             // blind the whole page: it degrades to an error detail on that provider
             // while the others still report their real status.
-            const entries = await Promise.all(PROVIDER_IDS.map(async (provider) => [provider, await controller.status(provider).catch((error) => ({
+            const entries = await Promise.all(PROVIDER_IDS.map(async (provider) => [
+                provider,
+                await controller.status(provider).catch((error) => ({
                     busy: false,
                     accounts: [],
                     detail: error instanceof Error ? error.message : String(error),
-                }))]));
+                })),
+            ]));
             return ok({ providers: Object.fromEntries(entries) });
         }
         case 'login': {
@@ -364,8 +415,8 @@ async function dispatch(controller, speed, modelDefaults, endpoint, payload, sig
                 }
             }
             return ok(await ollama.models({
-                ...apiKey === undefined ? {} : { apiKey },
-                ...baseURL === undefined ? {} : { baseURL },
+                ...(apiKey === undefined ? {} : { apiKey }),
+                ...(baseURL === undefined ? {} : { baseURL }),
             }, signal));
         }
         case 'prepareReset':

package/lib/auth/store.js

@@ -18,7 +18,13 @@ import { chmod, mkdir, readFile, rename, rm, writeFile } from 'node:fs/promises'
 import { dirname } from 'node:path';
 import { dshHomePath } from '@deepseek-ai/dsh-home-paths';
 /** Every provider route, in display order. */
-export const PROVIDER_IDS = ['codex', 'claude', 'grok', 'copilot', 'antigravity'];
+export const PROVIDER_IDS = [
+    'codex',
+    'claude',
+    'grok',
+    'copilot',
+    'antigravity',
+];
 /**
  * The stable identity of one session's account: Codex keys on workspace AND
  * user (email fallback, workspace-only for unidentified legacy sessions),
@@ -37,40 +43,53 @@ export function accountKeyOf(provider, session) {
     switch (provider) {
         case 'codex': {
             const codex = session;
-            const payload = typeof codex.idToken === 'string' ? decodeJwtPayload(codex.idToken) : undefined;
+            const payload = typeof codex.idToken === 'string'
+                ? decodeJwtPayload(codex.idToken)
+                : undefined;
             const auth = claimObject(payload?.['https://api.openai.com/auth']);
             const user = nonEmpty(auth?.chatgpt_user_id) ?? nonEmpty(auth?.user_id);
             const profile = claimObject(payload?.['https://api.openai.com/profile']);
-            const email = nonEmpty(codex.emailAddress) ?? nonEmpty(payload?.email) ?? nonEmpty(profile?.email);
+            const email = nonEmpty(codex.emailAddress) ??
+                nonEmpty(payload?.email) ??
+                nonEmpty(profile?.email);
             if (user === undefined && email === undefined)
                 return codex.accountId;
             // JSON tuple encoding avoids separator collisions and distinguishes IDs from emails.
-            return JSON.stringify([codex.accountId, user === undefined ? 'email' : 'user', user ?? email.toLowerCase()]);
+            return JSON.stringify([
+                codex.accountId,
+                user === undefined ? 'email' : 'user',
+                user ?? email.toLowerCase(),
+            ]);
         }
         case 'claude':
-            return session.emailAddress ?? tokenHash(session.refreshToken);
+            return (session.emailAddress ??
+                tokenHash(session.refreshToken));
         case 'grok':
             return session.account ?? tokenHash(session.refreshToken);
         case 'antigravity':
-            return session.account ?? tokenHash(session.refreshToken);
+            return (session.account ??
+                tokenHash(session.refreshToken));
         case 'copilot':
-            return session.account ?? tokenHash(session.refreshToken);
+            return (session.account ?? tokenHash(session.refreshToken));
     }
 }
 function nonEmpty(value) {
-    return typeof value === 'string' && value.trim().length > 0 ? value.trim() : undefined;
+    return typeof value === 'string' && value.trim().length > 0
+        ? value.trim()
+        : undefined;
 }
 function claimObject(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value)
-        ? value : undefined;
+        ? value
+        : undefined;
 }
 /** Resolve only recorded aliases, not an ambiguous workspace-wide match. */
 function resolveAccount(entry, key) {
     const seen = new Set();
-    while (!Object.hasOwn(entry.accounts, key)
-        && entry.aliases !== undefined
-        && Object.hasOwn(entry.aliases, key)
-        && !seen.has(key)) {
+    while (!Object.hasOwn(entry.accounts, key) &&
+        entry.aliases !== undefined &&
+        Object.hasOwn(entry.aliases, key) &&
+        !seen.has(key)) {
         seen.add(key);
         key = entry.aliases[key];
     }
@@ -107,9 +126,13 @@ export async function resolveAccountKey(provider, account, path = authFilePath()
 }
 /** Migrate workspace-only keys once; retain collisions rather than discard credentials. */
 function codexEmail(session) {
-    const payload = typeof session.idToken === 'string' ? decodeJwtPayload(session.idToken) : undefined;
+    const payload = typeof session.idToken === 'string'
+        ? decodeJwtPayload(session.idToken)
+        : undefined;
     const profile = claimObject(payload?.['https://api.openai.com/profile']);
-    return (nonEmpty(session.emailAddress) ?? nonEmpty(payload?.email) ?? nonEmpty(profile?.email))?.toLowerCase();
+    return (nonEmpty(session.emailAddress) ??
+        nonEmpty(payload?.email) ??
+        nonEmpty(profile?.email))?.toLowerCase();
 }
 function codexUserKey(session) {
     const key = accountKeyOf('codex', session);
@@ -179,13 +202,16 @@ function assertSessionShape(provider, account, value) {
         throw new Error(`subscriptions auth store: entry "${provider}/${account}" is not an object; fix or delete the store file`);
     }
     const entry = value;
-    if (typeof entry.accessToken !== 'string' || entry.accessToken.length === 0
-        || typeof entry.refreshToken !== 'string' || entry.refreshToken.length === 0
-        || typeof entry.expiresAt !== 'number' || !Number.isFinite(entry.expiresAt)) {
+    if (typeof entry.accessToken !== 'string' ||
+        entry.accessToken.length === 0 ||
+        typeof entry.refreshToken !== 'string' ||
+        entry.refreshToken.length === 0 ||
+        typeof entry.expiresAt !== 'number' ||
+        !Number.isFinite(entry.expiresAt)) {
         throw new Error(`subscriptions auth store: entry "${provider}/${account}" is missing accessToken/refreshToken/expiresAt; fix or delete the store file`);
     }
-    if (provider === 'antigravity'
-        && (typeof entry.projectId !== 'string' || entry.projectId.length === 0)) {
+    if (provider === 'antigravity' &&
+        (typeof entry.projectId !== 'string' || entry.projectId.length === 0)) {
         throw new Error('subscriptions auth store: entry "antigravity" is missing projectId; log out and complete Antigravity login again');
     }
 }
@@ -261,12 +287,19 @@ function parseStore(text, path) {
                 continue;
             }
             const session = record;
-            const key = provider === 'codex' ? session.accountId : accountKeyOf(provider, session);
-            store[provider] = { default: key, accounts: { [key]: session } };
+            const key = provider === 'codex'
+                ? session.accountId
+                : accountKeyOf(provider, session);
+            store[provider] = {
+                default: key,
+                accounts: { [key]: session },
+            };
             continue;
         }
         const accounts = record.accounts;
-        if (typeof accounts !== 'object' || accounts === null || Array.isArray(accounts)) {
+        if (typeof accounts !== 'object' ||
+            accounts === null ||
+            Array.isArray(accounts)) {
             console.warn(`subscriptions auth store: entry "${provider}" has no accounts map; skipped`);
             continue;
         }
@@ -288,7 +321,11 @@ function parseStore(text, path) {
         const validDefault = record.default === undefined || record.default in kept
             ? record.default
             : Object.keys(kept)[0];
-        store[provider] = { ...record, default: validDefault, accounts: kept };
+        store[provider] = {
+            ...record,
+            default: validDefault,
+            accounts: kept,
+        };
     }
     if (store.codex !== undefined)
         migrateCodex(store.codex);
@@ -299,9 +336,12 @@ function isValidSessionShape(value) {
     if (typeof value !== 'object' || value === null)
         return false;
     const entry = value;
-    return typeof entry.accessToken === 'string' && entry.accessToken.length > 0
-        && typeof entry.refreshToken === 'string' && entry.refreshToken.length > 0
-        && typeof entry.expiresAt === 'number' && Number.isFinite(entry.expiresAt);
+    return (typeof entry.accessToken === 'string' &&
+        entry.accessToken.length > 0 &&
+        typeof entry.refreshToken === 'string' &&
+        entry.refreshToken.length > 0 &&
+        typeof entry.expiresAt === 'number' &&
+        Number.isFinite(entry.expiresAt));
 }
 /** Persist the whole store atomically with owner-only permissions. */
 async function writeStore(store, path) {
@@ -361,7 +401,10 @@ export async function listAccounts(provider, path = authFilePath()) {
     const entry = (await loadStore(path))[provider];
     if (entry === undefined)
         return [];
-    const accounts = Object.entries(entry.accounts).map(([key, session]) => ({ key, session }));
+    const accounts = Object.entries(entry.accounts).map(([key, session]) => ({
+        key,
+        session,
+    }));
     accounts.sort((a, b) => Number(b.key === entry.default) - Number(a.key === entry.default));
     return accounts;
 }
@@ -402,7 +445,8 @@ export async function saveAccountSession(provider, account, session, path = auth
         if (entry !== undefined) {
             account = resolveAccount(entry, account);
             if (provider === 'codex') {
-                account = reconcileCodexIdentity(entry, session) ?? accountKeyOf('codex', session);
+                account =
+                    reconcileCodexIdentity(entry, session) ?? accountKeyOf('codex', session);
             }
         }
         ;
@@ -439,7 +483,9 @@ export async function deleteAccountSession(provider, account, path = authFilePat
             ;
             store[provider] = {
                 ...entry,
-                ...entry.default === account ? { default: Object.keys(accounts)[0] } : { default: entry.default },
+                ...(entry.default === account
+                    ? { default: Object.keys(accounts)[0] }
+                    : { default: entry.default }),
                 accounts,
             };
         }
@@ -462,7 +508,10 @@ export async function setDefaultAccount(provider, account, path = authFilePath()
             throw new Error(`no ${provider} account "${account}" is logged in`);
         }
         ;
-        store[provider] = { ...entry, default: account };
+        store[provider] = {
+            ...entry,
+            default: account,
+        };
         await writeStore(store, path);
     });
 }

package/lib/client/CursorCard.d.ts

@@ -2,7 +2,7 @@ import type { ConnectionHandle } from '@deepseek-ai/dsh-api-remotes/client';
 import type { SubscriptionsSectionInjected } from './SubscriptionsSection.js';
 type Translate = SubscriptionsSectionInjected['t'];
 /** Cursor's single connected account, rendered with the same card and Manage dialog as the other providers. */
-export declare function CursorCard({ rpc, t }: {
+export declare function CursorCard({ rpc, t, }: {
     rpc: ConnectionHandle['rpc'];
     t: Translate;
 }): import("react").JSX.Element;

package/lib/client/CursorCard.js

@@ -10,7 +10,7 @@ function message(error) {
     return error instanceof Error ? error.message : String(error);
 }
 /** Cursor's single connected account, rendered with the same card and Manage dialog as the other providers. */
-export function CursorCard({ rpc, t }) {
+export function CursorCard({ rpc, t, }) {
     const [status, setStatus] = useState();
     const [usage, setUsage] = useState();
     const [observedAt, setObservedAt] = useState();
@@ -56,15 +56,21 @@ export function CursorCard({ rpc, t }) {
             setLoading(false);
         }
     }, [rpc]);
-    useEffect(() => { void refreshStatus(); }, [refreshStatus]);
+    useEffect(() => {
+        void refreshStatus();
+    }, [refreshStatus]);
     useEffect(() => {
         if (status?.busy !== true)
             return;
-        const timer = setInterval(() => { void refreshStatus(); }, 2000);
+        const timer = setInterval(() => {
+            void refreshStatus();
+        }, 2000);
         return () => clearInterval(timer);
     }, [status?.busy, refreshStatus]);
-    useEffect(() => { if (status?.authenticated === true)
-        void refreshUsage(); }, [status?.authenticated, refreshUsage]);
+    useEffect(() => {
+        if (status?.authenticated === true)
+            void refreshUsage();
+    }, [status?.authenticated, refreshUsage]);
     const login = async () => {
         setError(undefined);
         try {
@@ -102,16 +108,44 @@ export function CursorCard({ rpc, t }) {
         }
     };
     const connected = status?.authenticated === true;
-    return _jsxs("div", { style: styles.card, children: [_jsxs("div", { style: styles.header, children: [_jsx("span", { style: { ...styles.dot, background: status?.busy ? 'var(--dsw-alias-state-warn-label)'
-                                : connected ? 'var(--dsw-alias-state-success-primary)' : 'var(--dsw-alias-label-dimmed)' } }), _jsx("span", { style: styles.name, children: t('cursorTitle') })] }), _jsx("p", { style: styles.status, children: status === undefined ? t('checking') : status.busy ? t('loginInProgress')
-                    : connected ? t('loggedInCount', { count: 1 }) : t('notLoggedIn') }), error !== undefined && _jsx("p", { style: styles.error, children: error }), connected && _jsxs("div", { style: styles.account, children: [_jsxs("div", { style: styles.accountHeader, children: [_jsx("span", { style: styles.defaultStar, title: t('defaultBadge'), children: "\u2605" }), _jsx("span", { style: styles.accountName, children: "Cursor" }), status.expiresAt !== undefined && _jsx("span", { style: styles.status, children: t('accountExpires', { date: new Date(status.expiresAt).toLocaleString() }) }), _jsx("button", { type: "button", style: { ...styles.button, marginLeft: 'auto', flexShrink: 0 }, onClick: () => { void logout(); }, children: t('logout') })] }), _jsxs("div", { style: styles.usage, children: [_jsxs("div", { style: styles.usageHeader, children: [_jsx("span", { style: styles.usageTitle, children: t('usageTitle') }), usage?.plan !== undefined && _jsx("span", { style: styles.status, children: t('usagePlan', { plan: usage.plan }) }), _jsx("button", { type: "button", style: styles.usageRefresh, disabled: loading, onClick: () => { void refreshUsage(); }, children: t('usageRefresh') })] }), loading && usage === undefined && _jsx("p", { style: styles.status, children: t('usageLoading') }), usage?.windows?.length === 0 && _jsx("p", { style: styles.status, children: t('usageEmpty') }), usage?.windows?.map((window, index) => {
+    return (_jsxs("div", { style: styles.card, children: [_jsxs("div", { style: styles.header, children: [_jsx("span", { style: {
+                            ...styles.dot,
+                            background: status?.busy
+                                ? 'var(--dsw-alias-state-warn-label)'
+                                : connected
+                                    ? 'var(--dsw-alias-state-success-primary)'
+                                    : 'var(--dsw-alias-label-dimmed)',
+                        } }), _jsx("span", { style: styles.name, children: t('cursorTitle') })] }), _jsx("p", { style: styles.status, children: status === undefined
+                    ? t('checking')
+                    : status.busy
+                        ? t('loginInProgress')
+                        : connected
+                            ? t('loggedInCount', { count: 1 })
+                            : t('notLoggedIn') }), error !== undefined && _jsx("p", { style: styles.error, children: error }), connected && (_jsxs("div", { style: styles.account, children: [_jsxs("div", { style: styles.accountHeader, children: [_jsx("span", { style: styles.defaultStar, title: t('defaultBadge'), children: "\u2605" }), _jsx("span", { style: styles.accountName, children: "Cursor" }), status.expiresAt !== undefined && (_jsx("span", { style: styles.status, children: t('accountExpires', {
+                                    date: new Date(status.expiresAt).toLocaleString(),
+                                }) })), _jsx("button", { type: "button", style: { ...styles.button, marginLeft: 'auto', flexShrink: 0 }, onClick: () => {
+                                    void logout();
+                                }, children: t('logout') })] }), _jsxs("div", { style: styles.usage, children: [_jsxs("div", { style: styles.usageHeader, children: [_jsx("span", { style: styles.usageTitle, children: t('usageTitle') }), usage?.plan !== undefined && (_jsx("span", { style: styles.status, children: t('usagePlan', { plan: usage.plan }) })), _jsx("button", { type: "button", style: styles.usageRefresh, disabled: loading, onClick: () => {
+                                            void refreshUsage();
+                                        }, children: t('usageRefresh') })] }), loading && usage === undefined && (_jsx("p", { style: styles.status, children: t('usageLoading') })), usage?.windows?.length === 0 && (_jsx("p", { style: styles.status, children: t('usageEmpty') })), usage?.windows?.map((window, index) => {
                                 const percent = displayUsedPercent(window.usedPercent);
-                                const label = window.scope === 'Included' ? t('cursorIncluded')
-                                    : window.scope === 'Cursor Models' ? t('cursorModels')
-                                        : window.scope === 'Other Models' ? t('cursorOtherModels')
-                                            : window.scope === 'Included requests' ? t('cursorIncludedRequests')
-                                                : window.scope ?? t('usageWindow');
-                                return _jsxs("div", { style: styles.usageRow, children: [_jsxs("div", { style: styles.usageMeta, children: [_jsx("span", { children: label }), _jsxs("span", { children: [percent === undefined ? t('usageMeterInvalid') : `${percent}%`, window.resetsAt === undefined ? ''
-                                                            : ` · ${t('usageResets', { date: new Date(window.resetsAt).toLocaleString() })}`] })] }), _jsx(UsageMeter, { window: window, t: t, observedAt: observedAt, stale: usageStale })] }, index);
-                            })] })] }), _jsxs("div", { style: styles.actions, children: [status?.authenticated === false && !status.busy && _jsx("button", { type: "button", style: styles.button, onClick: () => { void login(); }, children: t('login') }), _jsx("button", { type: "button", style: styles.button, "aria-haspopup": "dialog", onClick: () => setManage(true), children: t('accountsManage') }), status?.busy === true && _jsx("button", { type: "button", style: styles.button, onClick: () => { void cancel(); }, children: t('cancel') })] }), status?.busy === true && authorizeUrl !== undefined && _jsx("a", { href: authorizeUrl, target: "_blank", rel: "noopener noreferrer", children: t('cursorOpenLogin') }), manage && _jsx(ProviderAccountManager, { provider: "cursor-subscription", name: "Cursor", rpc: rpc, t: t, onClose: () => setManage(false) })] });
+                                const label = window.scope === 'Included'
+                                    ? t('cursorIncluded')
+                                    : window.scope === 'Cursor Models'
+                                        ? t('cursorModels')
+                                        : window.scope === 'Other Models'
+                                            ? t('cursorOtherModels')
+                                            : window.scope === 'Included requests'
+                                                ? t('cursorIncludedRequests')
+                                                : (window.scope ?? t('usageWindow'));
+                                return (_jsxs("div", { style: styles.usageRow, children: [_jsxs("div", { style: styles.usageMeta, children: [_jsx("span", { children: label }), _jsxs("span", { children: [percent === undefined
+                                                            ? t('usageMeterInvalid')
+                                                            : `${percent}%`, window.resetsAt === undefined
+                                                            ? ''
+                                                            : ` · ${t('usageResets', { date: new Date(window.resetsAt).toLocaleString() })}`] })] }), _jsx(UsageMeter, { window: window, t: t, observedAt: observedAt, stale: usageStale })] }, index));
+                            })] })] })), _jsxs("div", { style: styles.actions, children: [status?.authenticated === false && !status.busy && (_jsx("button", { type: "button", style: styles.button, onClick: () => {
+                            void login();
+                        }, children: t('login') })), _jsx("button", { type: "button", style: styles.button, "aria-haspopup": "dialog", onClick: () => setManage(true), children: t('accountsManage') }), status?.busy === true && (_jsx("button", { type: "button", style: styles.button, onClick: () => {
+                            void cancel();
+                        }, children: t('cancel') }))] }), status?.busy === true && authorizeUrl !== undefined && (_jsx("a", { href: authorizeUrl, target: "_blank", rel: "noopener noreferrer", children: t('cursorOpenLogin') })), manage && (_jsx(ProviderAccountManager, { provider: "cursor-subscription", name: "Cursor", rpc: rpc, t: t, onClose: () => setManage(false) }))] }));
 }

package/lib/client/ExternalUsageCards.d.ts

@@ -12,7 +12,7 @@ type Translate = SubscriptionsSectionInjected['t'];
  */
 export declare function externalUsageWindowLabel(t: Translate, window: UsageWindow): string;
 /** Quota cards for API-key providers already available through DSH itself. */
-export declare function ExternalUsageCards({ rpc, t }: {
+export declare function ExternalUsageCards({ rpc, t, }: {
     rpc: ConnectionHandle['rpc'];
     t: Translate;
 }): import("react").JSX.Element;