dsh-subscriptions 0.1.3 → 0.1.5

package/README.md

@@ -97,6 +97,43 @@ in **Settings → Subscriptions**.
 
 ![Usage dialog with elapsed-time cursors](docs/images/usage-badge.png)
 
+#### Codex usage limit resets
+
+The Codex account card shows banked full-reset credits and their expirations
+in a closed disclosure. A failed optional lookup reports an error without
+hiding ordinary quota windows. **Use…** selects the earliest-expiring available
+credit and requires a fresh unscoped weekly reading of at least 80%, then an
+explicit confirmation and acknowledgment. Confirmation expires after 60
+seconds; the server rechecks usage and credit availability before submission.
+
+One reset consumes one credit and resets weekly and 5-hour limits. This
+interface cannot undo it. An unconfirmed outcome blocks further redemption
+for that account in the current host process. Restarting clears that block,
+but must not be used to bypass it: check credits and limits in Codex before
+retrying, because the first submission may already have spent a credit.
+The private endpoint is covered by offline fakes, not live-account checks.
+See the [manual reset decision](.agents/notes/implemented/provider/2026-10-04-codex-manual-reset.md)
+for the retry boundary and verification limits.
+
+#### Claude usage limit resets
+
+The Claude account card shows banked limit resets from Anthropic's
+`cedar_ember` program, in the same closed disclosure Codex uses. It lists one
+row per grant, not one per credit, and the summary counts remaining resets by
+summing `resetsLeft` over grants that are neither expired nor paused. Each row
+states whether that grant is available, not yet usable, paused, exhausted, or
+expired, with its remaining count and when it lapses. That time is the grant's
+expiry: it is not a window reset and does not move the elapsed-time cursor.
+
+This is **display only**. `claimable` is shown as data on a text row, and the
+page has no control that spends a Claude reset, because the response shape is
+not an Anthropic contract. An ineligible account, a grant-less block, or a
+rejected optional query leaves ordinary session and weekly windows untouched
+and shows no list; a failed lookup shows a fixed sentence rather than the
+provider's text. No live account was used to verify what Anthropic returns. See
+[the evidence and limits](docs/claude-banked-resets.md) and the
+[display decision](.agents/notes/implemented/provider/2026-10-08-claude-banked-reset-display.md).
+
 ## Install
 
 Current source is tested with DSH `0.1.7-rc.2`, `0.2.0-rc.1`, and
@@ -183,6 +220,33 @@ usage.
 The plugin follows DSH network settings. Its former proxy configuration and
 UI have been retired; an old plugin proxy config file is ignored.
 
+## Claude prompt-cache TTL
+
+Set `claudePromptCacheTtl: '5m'` (default) or `'1h'` in the plugin config and
+restart DSH. This affects Claude only; other providers keep their own caching.
+Five minutes omits the wire `ttl` field, preserving the existing request. One
+hour adds `ttl: "1h"` to the tools+system prefix and up to three conversation
+breakpoints. All marks share one TTL: Anthropic rejects a one-hour mark after
+a five-minute mark. Requests classified with `purpose` as compaction or
+session-title keep five minutes. Unclassified calls, including subagents and
+calls from hosts that do not supply `purpose`, follow the configured TTL.
+The TTL setting does not require a newer host capability or dependency.
+
+Cache reads have the same API price for either TTL. One-hour writes are priced
+at 2× base input instead of 1.25×. They may pay off with reusable prefixes and
+5–60-minute pauses; benefits depend on the workload and do not establish
+subscription quota savings. Frequent reuse within five minutes may not offset
+the higher write price. Claude Code requests one hour for its main subscription
+conversation; see
+[Claude Code's prompt-caching notes](https://code.claude.com/docs/en/prompt-caching#which-ttl-each-request-gets).
+
+Changing TTL on a cached conversation may rewrite the prefix. Upstream testing
+found that the first one-hour request after five-minute writes rewrote a
+conversation-tail prefix, while a system-only breakpoint could hit. A
+five-minute request can read a one-hour entry; a one-hour-marked read does not
+upgrade an existing five-minute entry's lifetime. These observations are not
+live-account verification of this fork.
+
 ## Usage coloring
 
 **Settings → Subscriptions → Usage coloring** offers one browser-local dropdown:

package/lib/auth/device-flow.js

@@ -8,6 +8,7 @@
  * engines uniformly.
  */
 import { hostFetch } from '../http.js';
+import { parseProviderJson } from '../providers/common.js';
 /** Default poll interval when the device-code response omits one. */
 const DEFAULT_INTERVAL_SEC = 5;
 /** Default device-code lifetime when the response omits one (GitHub: 15 minutes). */
@@ -77,7 +78,7 @@ export class DeviceFlowManager {
         if (!response.ok) {
             throw new Error(`${provider} device-code request failed (HTTP ${String(response.status)})`);
         }
-        const wire = await response.json();
+        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) {
@@ -133,7 +134,7 @@ export class DeviceFlowManager {
                     }).toString(),
                     signal: controller.signal,
                 });
-                const result = await pollResponse.json();
+                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;
@@ -152,7 +153,9 @@ export class DeviceFlowManager {
                         settle(new Error('the device code expired before authorization completed'));
                         return;
                     default:
-                        settle(new Error(`${provider} device-flow polling failed: ${result.error_description ?? result.error ?? `HTTP ${String(pollResponse.status)}`}`));
+                        // Safe means this failure path carries no provider-controlled free text,
+                        // not that no secret can exist elsewhere in the system.
+                        settle(new Error(`${provider} device-flow polling failed (HTTP ${String(pollResponse.status)}): [provider response body omitted]`));
                         return;
                 }
             }

package/lib/auth/oauth-flow.js

@@ -12,6 +12,38 @@ 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>';
+function authorizationFailure(error) {
+    // Safe means this failure path carries no provider-controlled free text,
+    // not that no secret can exist elsewhere in the system.
+    // RFC 6749 §4.1.2.1 categories select local literals, never provider prose.
+    let category;
+    switch (error) {
+        case 'invalid_request':
+            category = 'invalid_request';
+            break;
+        case 'unauthorized_client':
+            category = 'unauthorized_client';
+            break;
+        case 'access_denied':
+            category = 'access_denied';
+            break;
+        case 'unsupported_response_type':
+            category = 'unsupported_response_type';
+            break;
+        case 'invalid_scope':
+            category = 'invalid_scope';
+            break;
+        case 'server_error':
+            category = 'server_error';
+            break;
+        case 'temporarily_unavailable':
+            category = 'temporarily_unavailable';
+            break;
+    }
+    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>`;
@@ -138,19 +170,20 @@ export class OAuthFlowManager {
                 response.end('not found');
                 return;
             }
-            const errorDescription = url.searchParams.get('error_description') ?? url.searchParams.get('error');
-            if (errorDescription !== null) {
-                response.writeHead(200, { 'content-type': 'text/html' });
-                response.end(failurePage(errorDescription));
-                settle(new Error(`authorization failed: ${errorDescription}`));
-                return;
-            }
             if (url.searchParams.get('state') !== input.state) {
-                // A stray or replayed redirect must not kill the real attempt.
+                // A stray or replayed redirect must not kill the real attempt, even on error.
+                // RFC 6749 §4.1.2.1 requires errors to echo the state sent in the request.
                 response.writeHead(400, { 'content-type': 'text/plain' });
                 response.end('state mismatch');
                 return;
             }
+            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));
+                settle(new Error(detail));
+                return;
+            }
             const code = url.searchParams.get('code');
             if (code === null || code.length === 0) {
                 response.writeHead(400, { 'content-type': 'text/plain' });

package/lib/auth/rpc.d.ts

@@ -23,7 +23,7 @@ export declare const SUBSCRIPTIONS_AUTH_PREFIX = "subscriptions-auth.";
  * Every endpoint {@link dispatch} answers; each gets one exact Fetch route.
  * Kept in one place so the route table and the switch cannot drift apart.
  */
-export declare const SUBSCRIPTIONS_AUTH_ENDPOINTS: readonly ["providerSettings", "setProviderSettings", "status", "login", "manual", "cancel", "logout", "setDefault", "usage", "externalStatus", "externalUsage", "cursorStatus", "cursorLogin", "cursorCancel", "cursorLogout", "cursorUsage", "cursorModels", "cursorSettings", "cursorSetSettings", "image", "video", "speed", "setSpeed", "modelDefaults", "setModelDefault"];
+export declare const SUBSCRIPTIONS_AUTH_ENDPOINTS: readonly ["providerSettings", "setProviderSettings", "status", "login", "manual", "cancel", "logout", "setDefault", "usage", "externalStatus", "externalUsage", "cursorStatus", "cursorLogin", "cursorCancel", "cursorLogout", "cursorUsage", "cursorModels", "cursorSettings", "cursorSetSettings", "image", "video", "prepareReset", "consumeReset", "speed", "setSpeed", "modelDefaults", "setModelDefault"];
 /** Decoded image bytes returned by the `image` endpoint. */
 export interface ImageBytesResult {
     mediaType: string;
@@ -121,6 +121,8 @@ export interface ModelDefaultsController {
 }
 /** Provider-agnostic auth operations the RPC handler delegates to. */
 export interface AuthController {
+    prepareReset?(account: string, signal: AbortSignal): Promise<unknown>;
+    consumeReset?(account: string, ticket: string, signal: AbortSignal): Promise<void>;
     /** Current status of one provider. */
     status(provider: ProviderId): Promise<ProviderStatus>;
     /**

package/lib/auth/rpc.js

@@ -25,7 +25,7 @@ export const SUBSCRIPTIONS_AUTH_ENDPOINTS = [
     'externalStatus', 'externalUsage',
     'cursorStatus', 'cursorLogin', 'cursorCancel', 'cursorLogout', 'cursorUsage', 'cursorModels',
     'cursorSettings', 'cursorSetSettings',
-    'image', 'video',
+    'image', 'video', 'prepareReset', 'consumeReset',
     'speed', 'setSpeed',
     'modelDefaults', 'setModelDefault',
 ];
@@ -322,6 +322,15 @@ async function dispatch(controller, speed, modelDefaults, endpoint, payload, sig
                 throw new BadRequest('payload must be an object');
             await cursor.setSettings(payload.settings);
             return ok({ ok: true });
+        case 'prepareReset':
+            if (!controller.prepareReset)
+                throw new BadRequest('Reset redemption unavailable');
+            return ok(await controller.prepareReset(readString(payload, 'account'), signal));
+        case 'consumeReset':
+            if (!controller.consumeReset)
+                throw new BadRequest('Reset redemption unavailable');
+            await controller.consumeReset(readString(payload, 'account'), readString(payload, 'ticket'), signal);
+            return ok({ ok: true });
         case 'image':
             return ok(await controller.readImage(readImageRef(payload), signal));
         case 'video':

package/lib/client/ProviderAccountManager.js

@@ -3,13 +3,8 @@ import { useEffect, useId, useRef, useState } from 'react';
 import { callSubscriptionsAuth } from './subscriptions-rpc.js';
 import { accountModelRows, accountPoolSelection, mergeAccountChanges, mergeLatestAccounts } from './account-preferences.js';
 import { ProviderModelEditor } from './ProviderModelEditor.js';
-const border = '1px solid var(--dsw-alias-border-l2)';
-const control = {
-    font: 'inherit', color: 'inherit', background: 'var(--dsw-alias-bg-layer-1)',
-    border, borderRadius: 8, padding: '7px 12px', minWidth: 0,
-};
-const button = { ...control, cursor: 'pointer' };
-const hint = { margin: 0, fontSize: 12, lineHeight: 1.6, color: 'var(--dsw-alias-label-tertiary)' };
+import { providerSettingsCss } from './provider-settings-styles.js';
+const border = '0.5px solid var(--dsw-alias-border-l2)';
 const stack = { display: 'grid', gap: 12, minWidth: 0 };
 const actions = { display: 'flex', flexWrap: 'wrap', gap: 8, alignItems: 'center' };
 /** Native top-layer dialog provides keyboard containment, Escape and focus restoration. */
@@ -110,38 +105,36 @@ export function ProviderAccountManager({ provider, name, rpc, t, onClose }) {
                 setSaving(false);
         }
     }
-    return _jsx("dialog", { ref: dialog, "aria-labelledby": title, "aria-describedby": description, onCancel: event => { if (saveLock.current)
-            event.preventDefault(); }, onClose: onClose, style: { width: 620, maxWidth: 'calc(100vw - 32px)', maxHeight: 'calc(100dvh - 32px)', boxSizing: 'border-box',
-            padding: 0, border, borderRadius: 16, color: 'var(--dsw-alias-label-primary)',
-            background: 'var(--dsw-alias-bg-layer-1)', boxShadow: '0 20px 70px #0004', overflow: 'auto' }, children: _jsxs("div", { style: { ...stack, padding: 20 }, children: [_jsxs("header", { style: { ...actions, justifyContent: 'space-between' }, children: [_jsx("h2", { id: title, style: { margin: 0, fontSize: 18 }, children: t('accountsTitle', { provider: name }) }), _jsx("button", { type: "button", autoFocus: true, style: button, disabled: saving, onClick: onClose, children: t('imageClose') })] }), _jsx("p", { id: description, style: hint, children: t(provider === 'cursor-subscription' ? 'cursorAccountsHint' : 'accountsHint') }), error && _jsx("p", { role: "alert", style: { ...hint, color: 'var(--dsw-alias-state-error-primary)' }, children: error }), loading && _jsx("p", { role: "status", style: hint, children: t('accountsLoading') }), !loading && !catalog && _jsx("button", { type: "button", style: button, onClick: () => setAttempt(value => value + 1), children: t('modelDefaultsRetry') }), catalog && _jsxs("fieldset", { disabled: saving || loading, style: { ...stack, border: 0, margin: 0, padding: 0 }, children: [catalog.accounts.length === 0 && _jsx("p", { style: hint, children: t(provider === 'cursor-subscription' ? 'cursorManageSignIn' : 'accountsEmpty') }), provider === 'cursor-subscription' && catalog.accounts.length > 0 &&
-                            _jsxs("fieldset", { style: { border, borderRadius: 12, padding: 14 }, children: [_jsx("legend", { style: { padding: '0 6px', fontWeight: 600, fontSize: 14 }, children: name }), _jsx("p", { style: hint, children: t('cursorConnected') })] }), provider !== 'cursor-subscription' && catalog.accounts.map(account => {
-                            const preferences = changes[account.key] ?? catalog.settings.accounts?.[account.key] ?? {};
-                            const selected = accountPoolSelection(preferences, account.models);
-                            const models = accountModelRows(account, preferences);
-                            return _jsxs("fieldset", { style: { ...stack, border, borderRadius: 12, padding: 14, margin: 0 }, children: [_jsx("legend", { style: { padding: '0 6px', fontWeight: 600, fontSize: 14, overflowWrap: 'anywhere', maxWidth: '100%' }, children: account.label }), account.unavailable && _jsx("p", { style: hint, children: t('accountsCatalogUnavailable') }), _jsxs("label", { style: { ...stack, gap: 6 }, children: [_jsx("span", { style: { fontSize: 12 }, children: t('accountsAlias') }), _jsx("input", { style: control, value: preferences.alias ?? '', placeholder: account.label, onChange: event => {
-                                                    const next = { ...preferences };
-                                                    if (event.target.value.trim())
-                                                        next.alias = event.target.value;
-                                                    else
-                                                        delete next.alias;
-                                                    edit(account.key, next);
-                                                } })] }), _jsxs("label", { children: [_jsx("input", { type: "checkbox", checked: preferences.poolEnabled !== false, onChange: event => edit(account.key, { ...preferences, poolEnabled: event.target.checked }) }), " ", t('accountsPoolEnabled')] }), _jsxs("label", { children: [_jsx("input", { type: "checkbox", checked: preferences.independentEntry === true, onChange: event => edit(account.key, { ...preferences, independentEntry: event.target.checked }) }), " ", t('accountsIndependent')] }), _jsx("p", { style: hint, children: t('accountsIndependentHint') }), _jsxs("details", { children: [_jsxs("summary", { style: { cursor: 'pointer', fontSize: 13 }, children: [t('accountsModels'), " \u00B7 ", preferences.poolModels === undefined
-                                                        ? t('accountsModelsAll') : t('accountsModelsCount', { count: preferences.poolModels.length })] }), _jsxs("div", { style: { ...stack, marginTop: 12 }, children: [_jsx("p", { style: hint, children: t('accountsModelsHint') }), _jsxs("label", { children: [_jsx("input", { type: "checkbox", checked: preferences.poolModels === undefined, onChange: event => {
-                                                                    const next = { ...preferences };
-                                                                    if (event.target.checked)
-                                                                        delete next.poolModels;
-                                                                    else
-                                                                        next.poolModels = account.models.map(model => model.id);
-                                                                    edit(account.key, next);
-                                                                } }), " ", t('accountsModelsAutomatic')] }), _jsxs("div", { style: actions, children: [_jsx("button", { type: "button", style: button, onClick: () => edit(account.key, { ...preferences, poolModels: models.map(model => model.id) }), children: t('modelsSelectAll') }), _jsx("button", { type: "button", style: button, onClick: () => edit(account.key, { ...preferences, poolModels: [] }), children: t('modelsSelectNone') })] }), _jsxs("div", { style: { ...stack, gap: 8, maxHeight: 240, overflowY: 'auto' }, children: [models.map(model => _jsxs("label", { style: { fontSize: 13, overflowWrap: 'anywhere' }, children: [_jsx("input", { type: "checkbox", checked: selected.has(model.id), onChange: event => {
-                                                                            const next = new Set(selected);
-                                                                            if (event.target.checked)
-                                                                                next.add(model.id);
-                                                                            else
-                                                                                next.delete(model.id);
-                                                                            edit(account.key, { ...preferences, poolModels: [...next] });
-                                                                        } }), " ", model.name, model.unavailable && ` (${t('modelsUnavailable')})`] }, model.id)), models.length === 0 && _jsx("p", { style: hint, children: t('accountsNoModels') })] })] })] })] }, account.key);
-                        })] }), (provider !== 'cursor-subscription' || (catalog?.accounts.length ?? 0) > 0) &&
-                    _jsx(ProviderModelEditor, { ref: editor, provider: provider, rpc: rpc, t: t, disabled: saving, onDirtyChange: setModelsDirty }), _jsxs("footer", { style: { ...stack, gap: 8, borderTop: border, padding: '14px 0 0',
-                        position: 'sticky', bottom: 0, background: 'var(--dsw-alias-bg-layer-1)' }, children: [saveError && _jsx("p", { role: "alert", style: { ...hint, color: 'var(--dsw-alias-state-error-primary)' }, children: saveError }), _jsxs("div", { style: { ...actions, justifyContent: 'flex-end' }, children: [_jsx("button", { type: "button", style: button, disabled: saving, onClick: onClose, children: t('cancel') }), _jsx("button", { type: "button", style: { ...button, fontWeight: 600 }, disabled: loading || saving || (!Object.keys(changes).length && !modelsDirty), onClick: () => { void save(); }, children: saving ? t('modelDefaultsSaving') : t('modelsSave') })] })] })] }) });
+    return _jsxs("dialog", { className: "dsh-subscription-manager", ref: dialog, "aria-labelledby": title, "aria-describedby": description, onCancel: event => { if (saveLock.current)
+            event.preventDefault(); }, onClose: onClose, style: { width: 620, maxWidth: 'calc(100vw - 32px)', maxHeight: 'calc(100dvh - 32px)', overflow: 'auto' }, children: [_jsx("style", { children: providerSettingsCss }), _jsxs("div", { style: { ...stack, padding: 20 }, children: [_jsxs("header", { style: { ...actions, justifyContent: 'space-between' }, children: [_jsx("h2", { id: title, style: { margin: 0 }, children: t('accountsTitle', { provider: name }) }), _jsx("button", { type: "button", autoFocus: true, disabled: saving, onClick: onClose, children: t('imageClose') })] }), _jsx("p", { id: description, className: "dsh-subscription-hint", children: t(provider === 'cursor-subscription' ? 'cursorAccountsHint' : 'accountsHint') }), error && _jsx("p", { role: "alert", children: error }), loading && _jsx("p", { role: "status", className: "dsh-subscription-hint", children: t('accountsLoading') }), !loading && !catalog && _jsx("button", { type: "button", onClick: () => setAttempt(value => value + 1), children: t('modelDefaultsRetry') }), catalog && _jsxs("fieldset", { disabled: saving || loading, style: { ...stack, border: 0, margin: 0, padding: 0 }, children: [catalog.accounts.length === 0 && _jsx("p", { className: "dsh-subscription-hint", children: t(provider === 'cursor-subscription' ? 'cursorManageSignIn' : 'accountsEmpty') }), provider === 'cursor-subscription' && catalog.accounts.length > 0 &&
+                                _jsxs("fieldset", { style: { border, borderRadius: 'var(--dsw-radius-lg, 12px)', padding: 14 }, children: [_jsx("legend", { style: { padding: '0 6px' }, children: name }), _jsx("p", { className: "dsh-subscription-hint", children: t('cursorConnected') })] }), provider !== 'cursor-subscription' && catalog.accounts.map(account => {
+                                const preferences = changes[account.key] ?? catalog.settings.accounts?.[account.key] ?? {};
+                                const selected = accountPoolSelection(preferences, account.models);
+                                const models = accountModelRows(account, preferences);
+                                return _jsxs("fieldset", { style: { ...stack, border, borderRadius: 'var(--dsw-radius-lg, 12px)', padding: 14, margin: 0 }, children: [_jsx("legend", { style: { padding: '0 6px', overflowWrap: 'anywhere', maxWidth: '100%' }, children: account.label }), account.unavailable && _jsx("p", { className: "dsh-subscription-hint", children: t('accountsCatalogUnavailable') }), _jsxs("label", { style: { ...stack, gap: 6 }, children: [_jsx("span", { className: "dsh-subscription-label", children: t('accountsAlias') }), _jsx("input", { value: preferences.alias ?? '', placeholder: account.label, onChange: event => {
+                                                        const next = { ...preferences };
+                                                        if (event.target.value.trim())
+                                                            next.alias = event.target.value;
+                                                        else
+                                                            delete next.alias;
+                                                        edit(account.key, next);
+                                                    } })] }), _jsxs("label", { children: [_jsx("input", { type: "checkbox", checked: preferences.poolEnabled !== false, onChange: event => edit(account.key, { ...preferences, poolEnabled: event.target.checked }) }), " ", t('accountsPoolEnabled')] }), _jsxs("label", { children: [_jsx("input", { type: "checkbox", checked: preferences.independentEntry === true, onChange: event => edit(account.key, { ...preferences, independentEntry: event.target.checked }) }), " ", t('accountsIndependent')] }), _jsx("p", { className: "dsh-subscription-hint", children: t('accountsIndependentHint') }), _jsxs("details", { children: [_jsxs("summary", { style: { cursor: 'pointer', fontSize: 13 }, children: [t('accountsModels'), " \u00B7 ", preferences.poolModels === undefined
+                                                            ? t('accountsModelsAll') : t('accountsModelsCount', { count: preferences.poolModels.length })] }), _jsxs("div", { style: { ...stack, marginTop: 12 }, children: [_jsx("p", { className: "dsh-subscription-hint", children: t('accountsModelsHint') }), _jsxs("label", { children: [_jsx("input", { type: "checkbox", checked: preferences.poolModels === undefined, onChange: event => {
+                                                                        const next = { ...preferences };
+                                                                        if (event.target.checked)
+                                                                            delete next.poolModels;
+                                                                        else
+                                                                            next.poolModels = account.models.map(model => model.id);
+                                                                        edit(account.key, next);
+                                                                    } }), " ", t('accountsModelsAutomatic')] }), _jsxs("div", { style: actions, children: [_jsx("button", { type: "button", onClick: () => edit(account.key, { ...preferences, poolModels: models.map(model => model.id) }), children: t('modelsSelectAll') }), _jsx("button", { type: "button", onClick: () => edit(account.key, { ...preferences, poolModels: [] }), children: t('modelsSelectNone') })] }), _jsxs("div", { style: { ...stack, gap: 8, maxHeight: 240, overflowY: 'auto' }, children: [models.map(model => _jsxs("label", { style: { overflowWrap: 'anywhere' }, children: [_jsx("input", { type: "checkbox", checked: selected.has(model.id), onChange: event => {
+                                                                                const next = new Set(selected);
+                                                                                if (event.target.checked)
+                                                                                    next.add(model.id);
+                                                                                else
+                                                                                    next.delete(model.id);
+                                                                                edit(account.key, { ...preferences, poolModels: [...next] });
+                                                                            } }), " ", model.name, model.unavailable && ` (${t('modelsUnavailable')})`] }, model.id)), models.length === 0 && _jsx("p", { className: "dsh-subscription-hint", children: t('accountsNoModels') })] })] })] })] }, account.key);
+                            })] }), (provider !== 'cursor-subscription' || (catalog?.accounts.length ?? 0) > 0) &&
+                        _jsx(ProviderModelEditor, { ref: editor, provider: provider, rpc: rpc, t: t, disabled: saving, onDirtyChange: setModelsDirty }), _jsxs("footer", { style: { ...stack, gap: 8, borderTop: border, padding: '14px 0 8px',
+                            position: 'sticky', bottom: 0, background: 'var(--dsw-alias-bg-layer-2, var(--dsw-alias-bg-layer-1))' }, children: [saveError && _jsx("p", { role: "alert", children: saveError }), _jsxs("div", { style: { ...actions, justifyContent: 'flex-end' }, children: [_jsx("button", { type: "button", disabled: saving, onClick: onClose, children: t('cancel') }), _jsx("button", { type: "button", className: "dsh-subscription-primary", disabled: loading || saving || (!Object.keys(changes).length && !modelsDirty), onClick: () => { void save(); }, children: saving ? t('modelDefaultsSaving') : t('modelsSave') })] })] })] })] });
 }

package/lib/client/ProviderModelEditor.js

@@ -1,11 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { forwardRef, useEffect, useImperativeHandle, useRef, useState } from 'react';
 import { callSubscriptionsAuth } from './subscriptions-rpc.js';
-const border = '1px solid var(--dsw-alias-border-l2, #ddd)';
-const control = {
-    font: 'inherit', color: 'inherit', background: 'transparent', border,
-    borderRadius: 8, padding: '6px 10px', minWidth: 0,
-};
+const border = '0.5px solid var(--dsw-alias-border-l2, #ddd)';
 const actions = { display: 'flex', flexWrap: 'wrap', gap: 8, alignItems: 'center' };
 /**
  * Embedded section of the account manager dialog. It owns the model draft
@@ -83,25 +79,25 @@ export const ProviderModelEditor = forwardRef(function ProviderModelEditor({ pro
     const missing = (draft.visibleModels ?? []).filter(id => !known.has(id)).map(id => ({ id, name: id }));
     const models = [...allModels, ...missing].filter(model => `${model.name} ${model.id}`.toLowerCase().includes(query.trim().toLowerCase()));
     const selected = new Set(draft.visibleModels ?? allModels.map(model => model.id));
-    return _jsxs("div", { style: { borderTop: border, marginTop: 12, paddingTop: 12 }, children: [_jsx("h3", { style: { margin: 0, fontSize: 15 }, children: t('modelsEdit') }), _jsxs("div", { style: { display: 'grid', gap: 12, marginTop: 12 }, children: [_jsx("p", { style: { margin: 0 }, children: t(provider === 'cursor-subscription' ? 'cursorManageHint' : 'modelsHint') }), error && _jsx("p", { role: "alert", style: { margin: 0, color: 'var(--dsw-alias-state-error-primary, #b42318)' }, children: error }), _jsxs("div", { style: actions, children: [_jsx("button", { type: "button", style: control, disabled: busy || disabled || dirty, onClick: () => { void load(true); }, children: t('usageRefresh') }), busy && _jsx("span", { role: "status", children: t('modelDefaultsLoading') })] }), catalog && _jsxs("fieldset", { disabled: busy || disabled, style: { border: 0, padding: 0, margin: 0, minWidth: 0, display: 'grid', gap: 12 }, children: [_jsxs("label", { children: [_jsx("input", { type: "checkbox", checked: draft.visibleModels === undefined, onChange: event => {
+    return _jsxs("div", { style: { borderTop: border, marginTop: 12, paddingTop: 12 }, children: [_jsx("h3", { style: { margin: 0 }, children: t('modelsEdit') }), _jsxs("div", { style: { display: 'grid', gap: 12, marginTop: 12 }, children: [_jsx("p", { className: "dsh-subscription-hint", children: t(provider === 'cursor-subscription' ? 'cursorManageHint' : 'modelsHint') }), error && _jsx("p", { role: "alert", children: error }), _jsxs("div", { style: actions, children: [_jsx("button", { type: "button", className: "dsh-subscription-quiet", disabled: busy || disabled || dirty, onClick: () => { void load(true); }, children: t('usageRefresh') }), busy && _jsx("span", { role: "status", children: t('modelDefaultsLoading') })] }), catalog && _jsxs("fieldset", { disabled: busy || disabled, style: { border: 0, padding: 0, margin: 0, minWidth: 0, display: 'grid', gap: 12 }, children: [_jsxs("label", { children: [_jsx("input", { type: "checkbox", checked: draft.visibleModels === undefined, onChange: event => {
                                             const next = { ...draft };
                                             if (event.target.checked)
                                                 delete next.visibleModels;
                                             else
                                                 next.visibleModels = allModels.map(model => model.id);
                                             edit(next);
-                                        } }), " ", t('modelsAutomatic')] }), _jsxs("div", { style: actions, children: [_jsx("input", { style: { ...control, flex: '1 1 180px' }, value: query, onChange: event => setQuery(event.target.value), placeholder: t('modelDefaultsFilterPlaceholder'), "aria-label": t('modelDefaultsFilterPlaceholder') }), _jsx("button", { type: "button", style: control, onClick: () => edit({ ...draft, visibleModels: allModels.map(model => model.id) }), children: t('modelsSelectAll') }), _jsx("button", { type: "button", style: control, onClick: () => edit({ ...draft, visibleModels: [] }), children: t('modelsSelectNone') })] }), _jsxs("div", { style: { maxHeight: 360, overflowY: 'auto', display: 'grid', gap: 8 }, children: [models.map(model => _jsxs("div", { style: { borderBottom: border, padding: '8px 2px', display: 'grid', gap: 8 }, children: [_jsxs("label", { style: { overflowWrap: 'anywhere' }, children: [_jsx("input", { type: "checkbox", checked: selected.has(model.id), onChange: event => {
+                                        } }), " ", t('modelsAutomatic')] }), _jsxs("div", { style: actions, children: [_jsx("input", { style: { flex: '1 1 180px' }, value: query, onChange: event => setQuery(event.target.value), placeholder: t('modelDefaultsFilterPlaceholder'), "aria-label": t('modelDefaultsFilterPlaceholder') }), _jsx("button", { type: "button", onClick: () => edit({ ...draft, visibleModels: allModels.map(model => model.id) }), children: t('modelsSelectAll') }), _jsx("button", { type: "button", onClick: () => edit({ ...draft, visibleModels: [] }), children: t('modelsSelectNone') })] }), _jsxs("div", { style: { maxHeight: 360, overflowY: 'auto', display: 'grid', gap: 8 }, children: [models.map(model => _jsxs("div", { style: { borderBottom: border, padding: '8px 2px', display: 'grid', gap: 8 }, children: [_jsxs("label", { style: { overflowWrap: 'anywhere' }, children: [_jsx("input", { type: "checkbox", checked: selected.has(model.id), onChange: event => {
                                                             const next = new Set(selected);
                                                             if (event.target.checked)
                                                                 next.add(model.id);
                                                             else
                                                                 next.delete(model.id);
                                                             edit({ ...draft, visibleModels: [...next] });
-                                                        } }), " ", model.name, !known.has(model.id) && ` (${t('modelsUnavailable')})`] }), _jsxs("div", { style: actions, children: [(model.efforts?.length ?? 0) > 0 && _jsxs("label", { style: actions, children: [t('modelDefaultsTitle'), _jsxs("select", { style: control, "aria-label": `${model.name} ${t('modelDefaultsTitle')}`, value: efforts[model.id] ?? '', onChange: event => {
+                                                        } }), " ", model.name, !known.has(model.id) && ` (${t('modelsUnavailable')})`] }), _jsxs("div", { style: actions, children: [(model.efforts?.length ?? 0) > 0 && _jsxs("label", { style: actions, children: [t('modelDefaultsTitle'), _jsxs("select", { "aria-label": `${model.name} ${t('modelDefaultsTitle')}`, value: efforts[model.id] ?? '', onChange: event => {
                                                                     setEfforts({ ...efforts, [model.id]: event.target.value });
                                                                     setDirty(true);
                                                                 }, children: [_jsx("option", { value: "", children: t('modelDefaultsFollowProvider') }), model.configured && !model.efforts?.some(effort => effort.id === model.configured) &&
-                                                                        _jsxs("option", { value: model.configured, disabled: true, children: [model.configured, " (", t('modelsUnavailable'), ")"] }), model.efforts?.map(effort => _jsx("option", { value: effort.id, children: effort.name }, effort.id))] })] }), provider === 'codex' && model.maxContextWindow !== undefined && _jsxs("div", { style: actions, children: [_jsxs("label", { style: actions, children: [t('modelsContext'), _jsx("input", { style: { ...control, width: 140 }, inputMode: "numeric", value: contexts[model.id] ?? '', "aria-label": `${model.name} ${t('modelsContext')}`, placeholder: String(model.defaultContextWindow), onChange: event => { setContexts({ ...contexts, [model.id]: event.target.value }); setDirty(true); } })] }), _jsx("small", { children: t('modelsContextBounds', { default: model.defaultContextWindow, max: model.maxContextWindow }) })] })] })] }, model.id)), models.length === 0 && _jsx("span", { children: t('modelDefaultsFilterEmpty', { query }) })] }), provider === 'codex' && _jsx("small", { children: t('modelsContextHint') }), catalog.tools.length > 0 && _jsxs("div", { style: { display: 'grid', gap: 8 }, children: [_jsx("strong", { children: t('modelsTools') }), _jsx("small", { children: t('modelsToolsHint') }), catalog.tools.map(tool => _jsxs("label", { children: [_jsx("input", { type: "checkbox", checked: draft.tools?.[tool] !== false, onChange: event => edit({
+                                                                        _jsxs("option", { value: model.configured, disabled: true, children: [model.configured, " (", t('modelsUnavailable'), ")"] }), model.efforts?.map(effort => _jsx("option", { value: effort.id, children: effort.name }, effort.id))] })] }), provider === 'codex' && model.maxContextWindow !== undefined && _jsxs("div", { style: actions, children: [_jsxs("label", { style: actions, children: [t('modelsContext'), _jsx("input", { style: { width: 140 }, inputMode: "numeric", value: contexts[model.id] ?? '', "aria-label": `${model.name} ${t('modelsContext')}`, placeholder: String(model.defaultContextWindow), onChange: event => { setContexts({ ...contexts, [model.id]: event.target.value }); setDirty(true); } })] }), _jsx("small", { children: t('modelsContextBounds', { default: model.defaultContextWindow, max: model.maxContextWindow }) })] })] })] }, model.id)), models.length === 0 && _jsx("span", { children: t('modelDefaultsFilterEmpty', { query }) })] }), provider === 'codex' && _jsx("small", { children: t('modelsContextHint') }), catalog.tools.length > 0 && _jsxs("div", { style: { display: 'grid', gap: 8 }, children: [_jsx("strong", { children: t('modelsTools') }), _jsx("small", { children: t('modelsToolsHint') }), catalog.tools.map(tool => _jsxs("label", { children: [_jsx("input", { type: "checkbox", checked: draft.tools?.[tool] !== false, onChange: event => edit({
                                                     ...draft, tools: { ...draft.tools, [tool]: event.target.checked },
                                                 }) }), " ", t(tool === 'image_generate' ? 'modelsImage' : tool === 'video_generate' ? 'modelsVideo' : tool === 'web_search' ? 'modelsWebSearch' : 'modelsSearch')] }, tool))] })] })] })] });
 });

package/lib/client/SpeedSelect.js

@@ -14,6 +14,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  */
 import { useEffect, useRef, useState } from 'react';
 import { callSubscriptionsAuth } from './SubscriptionsSection.js';
+import { subscriptionChromeCss } from './provider-settings-styles.js';
 import { en } from './locales.js';
 /**
  * The `loadSpeed` half of the inject face: the plugin's own speed state plus
@@ -136,12 +137,12 @@ export function SpeedSelect({ loadSpeed, setSpeed, t }) {
     const tierName = (tier) => translate(tier === 'fast' ? 'speedFast' : 'speedStandard');
     const tierDescription = (tier) => translate(tier === 'fast' ? 'speedFastDescription' : 'speedStandardDescription');
     const triggerLabel = `${translate('speed')} · ${tierName(state.tier)}`;
-    return (_jsxs("div", { ref: rootRef, style: styles.root, onKeyDown: (event) => {
+    return (_jsxs("div", { ref: rootRef, className: "dsh-subscription-speed", style: styles.root, onKeyDown: (event) => {
             if (event.key === 'Escape' && open) {
                 event.preventDefault();
                 setOpen(false);
             }
-        }, children: [open && (_jsx("div", { style: styles.menu, role: "menu", "aria-label": translate('speed'), children: TIERS.map(tier => (_jsxs("button", { type: "button", role: "menuitemradio", "aria-checked": tier === state.tier, style: styles.item, disabled: busy, onClick: () => { choose(tier); }, children: [_jsx("span", { style: styles.itemCheck, children: tier === state.tier ? '✓' : '' }), _jsxs("span", { style: styles.itemText, children: [_jsx("span", { style: styles.itemName, children: tierName(tier) }), _jsx("span", { style: styles.itemDescription, children: tierDescription(tier) })] })] }, tier))) })), _jsx("button", { type: "button", style: styles.trigger, "aria-haspopup": "menu", "aria-expanded": open, title: triggerLabel, disabled: busy, onClick: () => {
+        }, children: [_jsx("style", { children: subscriptionChromeCss }), open && (_jsx("div", { style: styles.menu, role: "menu", "aria-label": translate('speed'), children: TIERS.map(tier => (_jsxs("button", { type: "button", role: "menuitemradio", "aria-checked": tier === state.tier, style: styles.item, disabled: busy, onClick: () => { choose(tier); }, children: [_jsx("span", { style: styles.itemCheck, children: tier === state.tier ? '✓' : '' }), _jsxs("span", { style: styles.itemText, children: [_jsx("span", { style: styles.itemName, children: tierName(tier) }), _jsx("span", { style: styles.itemDescription, children: tierDescription(tier) })] })] }, tier))) })), _jsx("button", { type: "button", style: styles.trigger, "aria-haspopup": "menu", "aria-expanded": open, title: triggerLabel, disabled: busy, onClick: () => {
                     if (open)
                         setOpen(false);
                     else
@@ -151,20 +152,20 @@ export function SpeedSelect({ loadSpeed, setSpeed, t }) {
 const styles = {
     root: { position: 'relative', display: 'inline-flex' },
     trigger: {
-        border: '1px solid var(--dsw-alias-border-l2)', borderRadius: 8,
-        background: 'transparent', color: 'var(--dsw-alias-label-secondary)',
+        border: '0.5px solid var(--dsw-alias-border-l3)', borderRadius: 'var(--dsw-radius-sm, 8px)',
+        background: 'var(--dsh-subscription-speed-hover, transparent)', color: 'var(--dsw-alias-label-secondary)',
         font: 'inherit', fontSize: 12, lineHeight: '18px',
         padding: '2px 8px', cursor: 'pointer', whiteSpace: 'nowrap',
     },
     menu: {
         position: 'absolute', bottom: '100%', right: 0, marginBottom: 4,
         minWidth: 180, padding: 4, zIndex: 20,
-        background: 'var(--dsw-alias-bg-layer-1)', border: '1px solid var(--dsw-alias-border-l2)',
-        borderRadius: 8, display: 'flex', flexDirection: 'column', gap: 2,
+        background: 'var(--dsw-specific-menu, var(--dsw-alias-bg-layer-2))', border: 0,
+        boxShadow: 'var(--dsw-elevation-prominent)', borderRadius: 'var(--dsw-radius-lg, 16px)', display: 'flex', flexDirection: 'column', gap: 2,
     },
     item: {
         display: 'flex', alignItems: 'flex-start', gap: 6, width: '100%',
-        border: 'none', borderRadius: 6, background: 'transparent',
+        border: 'none', borderRadius: 'var(--dsw-radius-sm, 8px)', background: 'var(--dsh-subscription-speed-hover, transparent)',
         padding: '6px 8px', cursor: 'pointer', font: 'inherit', textAlign: 'left',
     },
     itemCheck: {

package/lib/client/SubscriptionUsageBadge.js

@@ -24,6 +24,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  * 'settings.subscriptions' namespace.
  */
 import { useCallback, useEffect, useRef, useState } from 'react';
+import { subscriptionChromeCss } from './provider-settings-styles.js';
 import { createPortal } from 'react-dom';
 import * as primitives from '@deepseek-ai/dsh-client-ui-primitives';
 import { useAnchoredPosition, useDismissOnOutsidePointer } from '@deepseek-ai/dsh-client-ui-primitives';
@@ -513,7 +514,7 @@ export function SubscriptionUsageBadge({ rpc, currentModel, t, rotationMs }) {
         if (next)
             void refresh();
     };
-    const pill = (_jsxs("span", { ref: rootRef, style: styles.anchor, children: [_jsxs("button", { type: "button", style: { ...styles.pill, ...(hover || open ? styles.pillActive : {}) }, "aria-haspopup": "dialog", "aria-expanded": open, "aria-label": `${title} · ${label}`, title: title, onMouseEnter: () => { setHover(true); }, 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, 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)] }));
+    const pill = (_jsxs("span", { ref: rootRef, style: styles.anchor, children: [_jsx("style", { children: subscriptionChromeCss }), _jsxs("button", { type: "button", className: "dsh-subscription-usage-pill", style: { ...styles.pill, ...(hover || open ? styles.pillActive : {}) }, "aria-haspopup": "dialog", "aria-expanded": open, "aria-label": `${title} · ${label}`, title: title, onMouseEnter: () => { setHover(true); }, 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)] }));
     return (_jsxs(_Fragment, { children: [seat, statsRow !== null && statsRow.isConnected ? createPortal(pill, statsRow) : pill] }));
 }
 /**
@@ -564,9 +565,9 @@ const styles = {
     pill: {
         boxSizing: 'border-box', maxWidth: '100%',
         color: 'var(--dsw-alias-label-tertiary)',
-        font: 'inherit', fontSize: 'var(--dsh-content-font-size-secondary, 13px)',
-        fontVariantNumeric: 'tabular-nums', lineHeight: '20px', whiteSpace: 'nowrap',
-        background: 'transparent', border: 'none', borderRadius: 24,
+        font: 'inherit', fontSize: 'calc(var(--dsh-content-font-size-secondary, 13px) - 1px)',
+        fontVariantNumeric: 'tabular-nums', lineHeight: 'calc(20px + var(--dsh-content-font-delta-secondary, 0px))', whiteSpace: 'nowrap',
+        background: 'transparent', border: 'none', borderRadius: 999,
         alignItems: 'center', gap: 6, padding: '1px 8px', display: 'inline-flex', cursor: 'pointer',
     },
     pillActive: {
@@ -586,7 +587,7 @@ const styles = {
         maxHeight: 'min(560px, 100dvh - 24px)', overflowY: 'auto', overscrollBehavior: 'contain',
         boxShadow: 'var(--dsw-elevation-prominent)',
         color: 'var(--dsw-alias-label-secondary)', cursor: 'default',
-        border: 0, borderRadius: 12, padding: 16, fontSize: 12, lineHeight: '18px',
+        border: 0, borderRadius: 'var(--dsw-radius-lg, 16px)', padding: 16, fontSize: 12, lineHeight: '18px',
     },
     title: {
         color: 'var(--dsw-alias-label-primary)', display: 'flex',