dsh-subscriptions 0.2.2 → 0.3.0

package/lib/client/ProviderModelEditor.js

@@ -1,6 +1,7 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { forwardRef, useEffect, useImperativeHandle, useRef, useState, } from 'react';
 import { callSubscriptionsAuth } from './subscriptions-rpc.js';
+import { modelEditorState, savedModelIds } from './model-filter.js';
 /** Providers whose runtime honours a local context-window override. */
 const supportsContext = (provider) => provider === 'codex' || provider === 'claude';
 const border = '0.5px solid var(--dsw-alias-border-l2, #ddd)';
@@ -47,9 +48,7 @@ export const ProviderModelEditor = forwardRef(function ProviderModelEditor({ pro
         setBusy(true);
         setError('');
         try {
-            const data = await callSubscriptionsAuth(rpc, provider === 'cursor-subscription'
-                ? 'cursorSettings'
-                : 'providerSettings', { provider, force });
+            const data = await callSubscriptionsAuth(rpc, 'providerSettings', { provider, force });
             if (generation.current === request)
                 reset(data);
         }
@@ -108,18 +107,24 @@ export const ProviderModelEditor = forwardRef(function ProviderModelEditor({ pro
     }), [catalog, dirty, draft, contexts, efforts, provider, t]);
     const allModels = catalog?.models ?? [];
     const known = new Set(allModels.map((model) => model.id));
-    const missing = (draft.visibleModels ?? [])
+    const savedIds = savedModelIds(draft.visibleModels, draft.subagentSpeeds);
+    const missing = savedIds
         .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 }, 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: () => {
+    const editorState = modelEditorState({
+        discovered: allModels.length,
+        saved: missing.length,
+        matched: models.length,
+        accounts: catalog?.accounts,
+    });
+    const selected = new Set(draft.visibleModels ??
+        [...allModels, ...missing].map((model) => model.id));
+    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('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: {
+                                }, children: t('usageRefresh') }), busy && _jsx("span", { role: "status", children: t('modelDefaultsLoading') })] }), !busy && catalog && (_jsxs("fieldset", { disabled: busy || disabled, style: {
                             border: 0,
                             padding: 0,
                             margin: 0,
@@ -133,44 +138,57 @@ export const ProviderModelEditor = forwardRef(function ProviderModelEditor({ pro
                                             else
                                                 next.visibleModels = allModels.map((model) => model.id);
                                             edit(next);
-                                        } }), ' ', 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',
+                                        } }), ' ', t('modelsAutomatic')] }), editorState.listState === 'provider-empty' ? (_jsx("p", { className: "dsh-subscription-hint", children: t(editorState.noticeKey) })) : (_jsxs(_Fragment, { children: [_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: [_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", { "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)))] })] })), supportsContext(provider) &&
-                                                        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,
+                                        }, 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", { "aria-label": `${model.name} ${t('modelDefaultsTitle')}`, value: efforts[model.id] ?? '', onChange: (event) => {
+                                                                            setEfforts({
+                                                                                ...efforts,
                                                                                 [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 }) }))] }), supportsContext(provider) && (_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({
+                                                                        }, 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)))] })] })), supportsContext(provider) &&
+                                                                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,
+                                                                        }) })] }))] }), provider === 'codex' &&
+                                                        (model.fastTier === true ||
+                                                            Object.hasOwn(draft.subagentSpeeds ?? {}, model.id)) && (_jsxs("div", { style: { display: 'grid', gap: 6 }, children: [_jsxs("label", { style: actions, children: [t('modelsSubagentSpeed'), _jsxs("select", { "aria-label": `${model.name} ${t('modelsSubagentSpeed')}`, value: Object.hasOwn(draft.subagentSpeeds ?? {}, model.id)
+                                                                            ? draft.subagentSpeeds[model.id]
+                                                                            : 'standard', onChange: (event) => edit({
+                                                                            ...draft,
+                                                                            subagentSpeeds: {
+                                                                                ...draft.subagentSpeeds,
+                                                                                [model.id]: event.target
+                                                                                    .value,
+                                                                            },
+                                                                        }), children: [_jsx("option", { value: "standard", children: t('speedStandard') }), _jsxs("option", { value: "fast", disabled: !model.fastTier, children: [t('speedFast'), !model.fastTier &&
+                                                                                        ` (${t('modelsUnavailable')})`] })] })] }), _jsx("small", { children: t('modelsSubagentSpeedHint') })] }))] }, model.id))), models.length === 0 && (_jsx("span", { children: t('modelDefaultsFilterEmpty', { query }) }))] })] })), supportsContext(provider) && (_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,

package/lib/client/SpeedSelect.js

@@ -32,20 +32,21 @@ import { en } from './locales.js';
  */
 export function createSpeedLoader(connection, models, sessionId) {
     return async () => {
-        const state = await callSubscriptionsAuth(connection.rpc, 'speed', { sessionId });
         const directories = models();
-        if (directories === undefined)
-            return { visible: false, tier: state.tier };
-        let current;
-        try {
-            const loaded = await directories.directoryFor(sessionId).load();
-            current = loaded.current;
-        }
-        catch (error) {
-            if (!modelSelectionUnavailable(error))
-                throw error;
-            return { visible: false, tier: state.tier };
+        let current = null;
+        if (directories !== undefined) {
+            try {
+                current = (await directories.directoryFor(sessionId).load()).current;
+            }
+            catch (error) {
+                if (!modelSelectionUnavailable(error))
+                    throw error;
+            }
         }
+        const state = await callSubscriptionsAuth(connection.rpc, 'speed', {
+            sessionId,
+            ...(current?.provider === 'codex' ? { model: current.model } : {}),
+        });
         const visible = current !== null &&
             current.provider === 'codex' &&
             state.fastModels.includes(current.model);

package/lib/client/SubscriptionUsageBadge.d.ts

@@ -48,7 +48,7 @@ export interface ProviderUsageDisplay {
 /** The account the collapsed pill reads: the default one, else the first listed. */
 export declare function pillAccountOf(d: ProviderUsageDisplay): AccountUsageDisplay;
 /** Brand display names (short form for the compact badge). */
-export type BadgeProvider = SubscriptionProvider | 'cursor-subscription' | 'opencode-go' | 'kimi-coding' | 'minimax' | 'minimax-cn' | 'ollama-cloud';
+export type BadgeProvider = SubscriptionProvider | 'opencode-go' | 'kimi-coding' | 'minimax' | 'minimax-cn' | 'ollama-cloud';
 export interface UsageRosterEntry {
     provider: BadgeProvider;
     account: AccountStatus;

package/lib/client/SubscriptionUsageBadge.js

@@ -60,7 +60,6 @@ const PROVIDER_NAMES = {
     grok: 'Grok',
     copilot: 'Copilot',
     antigravity: 'Antigravity',
-    'cursor-subscription': 'Cursor',
     'opencode-go': 'OpenCode Go',
     'kimi-coding': 'Kimi Code',
     minimax: 'MiniMax',
@@ -110,9 +109,8 @@ export function groupUsageDisplays(roster, windowsOf, plans) {
 }
 /** Read each account source independently so a failing endpoint cannot hide the others. */
 export async function loadBadgeRoster(rpc) {
-    const [subscriptions, cursor, external] = await Promise.allSettled([
+    const [subscriptions, external] = await Promise.allSettled([
         callSubscriptionsAuth(rpc, 'status', {}),
-        callSubscriptionsAuth(rpc, 'cursorStatus', {}),
         callSubscriptionsAuth(rpc, 'externalStatus', {}),
     ]);
     const roster = [];
@@ -130,14 +128,6 @@ export async function loadBadgeRoster(rpc) {
                 roster.push({ provider, account });
         }
     }
-    if (cursor.status === 'fulfilled') {
-        refreshed.add('cursor-subscription');
-        if (cursor.value.authenticated)
-            roster.push({
-                provider: 'cursor-subscription',
-                account: { key: 'cursor', isDefault: true },
-            });
-    }
     if (external.status === 'fulfilled') {
         for (const [source, provider] of [
             ['opencode-go', 'opencode-go'],
@@ -157,8 +147,6 @@ export async function loadBadgeRoster(rpc) {
     return { roster, refreshed };
 }
 export async function usageOf(rpc, { provider, account }) {
-    if (provider === 'cursor-subscription')
-        return callSubscriptionsAuth(rpc, 'cursorUsage', {});
     if (provider === 'opencode-go' ||
         provider === 'kimi-coding' ||
         provider === 'minimax' ||

package/lib/client/SubscriptionsSection.d.ts

@@ -13,6 +13,8 @@ export interface AccountStatus {
 }
 /** One provider's login state as answered by the `status` endpoint. */
 export interface ProviderStatus {
+    /** Picker selection; absent follows discovery, [] hides all model quotas. */
+    visibleModels?: string[];
     busy: boolean;
     accounts: AccountStatus[];
     detail?: string;

package/lib/client/SubscriptionsSection.js

@@ -15,10 +15,10 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { en } from './locales.js';
 import { resetActionBlock } from './reset-action.js';
+import { visibleUsageWindows } from './usage-window-filter.js';
 import { ProviderAccountManager } from './ProviderAccountManager.js';
 import { providerSettingsCss } from './provider-settings-styles.js';
 import { ExternalUsageCards } from './ExternalUsageCards.js';
-import { CursorCard } from './CursorCard.js';
 import { OllamaCard } from './OllamaCard.js';
 import { UsageMeter } from './UsageMeter.js';
 import { ResetCreditsDisclosure, ResetCreditsErrorLine, showsResetCredits, } from './reset-credits-view.js';
@@ -641,6 +641,7 @@ export function SubscriptionsSection(props) {
                 return (_jsxs("div", { style: styles.card, children: [_jsxs("div", { style: styles.cardHeader, children: [_jsx("span", { style: { ...styles.dot, background: dotColor(status) } }), _jsx("span", { style: styles.name, children: name }), status?.clientVersion !== undefined && (_jsx("span", { style: styles.clientVersion, title: t('clientVersionHint'), children: clientVersionText(t, status.clientVersion) }))] }), _jsx("p", { style: styles.statusLine, children: statusText(t, status) }), status?.detail !== undefined && status.detail !== '' && (_jsx("p", { style: styles.statusLine, children: status.detail })), errors[id] !== undefined && (_jsx("p", { style: styles.errorLine, children: errors[id] })), accounts.map((account) => {
                             const usageKey = `${id}:${account.key}`;
                             const usage = usages[usageKey];
+                            const shownWindows = visibleUsageWindows(id, usage?.windows, status?.visibleModels);
                             const usageError = usageErrors[usageKey];
                             const display = account.account ?? account.key;
                             const sortedCredits = [...(usage?.resetCredits ?? [])].sort((a, b) => (a.expiresAt ?? Infinity) - (b.expiresAt ?? Infinity));
@@ -664,7 +665,9 @@ export function SubscriptionsSection(props) {
                                                 }, children: t('logout') })] }), showUsage && (_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.usagePlan, children: t('usagePlan', { plan: usage.plan }) })), _jsx("button", { type: "button", style: styles.usageRefresh, disabled: usageLoading[usageKey] === true, onClick: () => {
                                                             void loadUsage(id, account.key, true);
                                                         }, children: t('usageRefresh') })] }), usage === undefined && usageError === undefined && (_jsx("p", { style: styles.statusLine, children: t('usageLoading') })), usageError !== undefined && (_jsx("p", { style: styles.errorLine, children: t('usageError', { message: usageError }) })), usage?.windows !== undefined &&
-                                                usage.windows.length === 0 && (_jsx("p", { style: styles.statusLine, children: t('usageEmpty') })), (usage?.windows ?? []).map((window, index) => {
+                                                usage.windows.length === 0 && (_jsx("p", { style: styles.statusLine, children: t('usageEmpty') })), usage?.windows !== undefined &&
+                                                usage.windows.length > 0 &&
+                                                shownWindows.length === 0 && (_jsx("p", { style: styles.statusLine, children: t('usageNoVisibleModels') })), shownWindows.map((window, index) => {
                                                 const percent = displayUsedPercent(window.usedPercent);
                                                 return (_jsxs("div", { style: styles.usageRow, children: [_jsxs("div", { style: styles.usageMeta, children: [_jsx("span", { children: usageWindowLabel(t, window) }), _jsxs("span", { children: [percent === undefined
                                                                             ? t('usageMeterInvalid')
@@ -702,7 +705,7 @@ export function SubscriptionsSection(props) {
                                                 void login(id, 'keychain');
                                             }, children: t('addAccountKeychain') })] })), !busy && accounts.length > 0 && id !== 'claude' && (_jsx("button", { type: "button", onClick: () => {
                                         void login(id);
-                                    }, children: t('addAccount') })), _jsx("button", { type: "button", "aria-haspopup": "dialog", onClick: () => setManagedProvider({ id, name }), children: t('accountsManage') }), busy && (_jsx("button", { type: "button", onClick: () => {
+                                    }, children: t('addAccount') })), !busy && (_jsx("button", { type: "button", "aria-haspopup": "dialog", onClick: () => setManagedProvider({ id, name }), children: t('accountsManage') })), busy && (_jsx("button", { type: "button", onClick: () => {
                                         void cancel(id);
                                     }, children: t('cancel') }))] }), !busy && accounts.length > 0 && (_jsx("p", { style: styles.statusLine, children: t('addAccountHint') })), busy && deviceCode !== undefined && (_jsxs("div", { style: styles.deviceCode, children: [_jsx("span", { style: styles.statusLine, children: t('deviceCodePrompt') }), _jsx("span", { style: styles.deviceCodeText, children: deviceCode.userCode }), _jsxs("div", { style: styles.actions, children: [_jsx("button", { type: "button", onClick: () => {
                                                 copyDeviceCode(id, deviceCode.userCode);
@@ -716,7 +719,10 @@ export function SubscriptionsSection(props) {
                                             })) }), _jsx("button", { type: "button", onClick: () => {
                                                 void submitManual(id);
                                             }, children: t('submit') })] })] }))] }, id));
-            }), _jsx(CursorCard, { rpc: rpc, t: t }), _jsx(OllamaCard, { rpc: rpc, t: t }), _jsx(ExternalUsageCards, { rpc: rpc, t: t }), managedProvider && (_jsx(ProviderAccountManager, { provider: managedProvider.id, name: managedProvider.name, rpc: rpc, t: t, onClose: () => setManagedProvider(undefined) })), _jsx("style", { children: '.subscriptions-reset-dialog::backdrop { background: var(--dsw-alias-bg-mask-1, #0006); backdrop-filter: var(--dsw-mask-blur, none); }' }), _jsx("dialog", { ref: resetDialogRef, className: "subscriptions-reset-dialog", "aria-labelledby": "subscriptions-reset-title", onCancel: () => setResetConfirmation(undefined), onClose: () => setResetConfirmation(undefined), style: {
+            }), _jsx(OllamaCard, { rpc: rpc, t: t }), _jsx(ExternalUsageCards, { rpc: rpc, t: t }), managedProvider && (_jsx(ProviderAccountManager, { provider: managedProvider.id, name: managedProvider.name, rpc: rpc, t: t, onClose: () => {
+                    setManagedProvider(undefined);
+                    void refresh();
+                } })), _jsx("style", { children: '.subscriptions-reset-dialog::backdrop { background: var(--dsw-alias-bg-mask-1, #0006); backdrop-filter: var(--dsw-mask-blur, none); }' }), _jsx("dialog", { ref: resetDialogRef, className: "subscriptions-reset-dialog", "aria-labelledby": "subscriptions-reset-title", onCancel: () => setResetConfirmation(undefined), onClose: () => setResetConfirmation(undefined), style: {
                     ...styles.modal,
                     display: resetConfirmation ? 'flex' : 'none',
                     margin: 'auto',

package/lib/client/locales.d.ts

@@ -29,6 +29,8 @@ export declare const en: {
     modelsContextBounds: string;
     modelsContextHint: string;
     modelsContextInvalid: string;
+    modelsSubagentSpeed: string;
+    modelsSubagentSpeedHint: string;
     modelsTools: string;
     modelsToolsHint: string;
     modelsImage: string;
@@ -78,6 +80,7 @@ export declare const en: {
     usageRefresh: string;
     usageLoading: string;
     usageEmpty: string;
+    usageNoVisibleModels: string;
     usageUnsupported: string;
     usageError: string;
     usageSession: string;
@@ -145,22 +148,6 @@ export declare const en: {
     externalUsageApiKey: string;
     externalUsageConfigure: string;
     externalUsageUnavailable: string;
-    cursorTitle: string;
-    cursorOpenLogin: string;
-    cursorWaiting: string;
-    cursorConnected: string;
-    cursorManageTitle: string;
-    cursorManageSignIn: string;
-    cursorAccountsHint: string;
-    cursorManageHint: string;
-    cursorFilterModels: string;
-    cursorModelsLoading: string;
-    cursorModelsError: string;
-    cursorModelsCount: string;
-    cursorIncluded: string;
-    cursorModels: string;
-    cursorOtherModels: string;
-    cursorIncludedRequests: string;
     modelDefaultsTitle: string;
     modelDefaultsHint: string;
     modelDefaultsFollowProvider: string;
@@ -176,6 +163,9 @@ export declare const en: {
     modelDefaultsSummaryEmpty: string;
     modelDefaultsFilterPlaceholder: string;
     modelDefaultsFilterEmpty: string;
+    modelDefaultsNoModels: string;
+    modelDefaultsNoAccount: string;
+    modelDefaultsDiscoveryFailed: string;
     generating: string;
     image: string;
     viewImage: string;
@@ -269,6 +259,8 @@ export declare const zh: {
     modelsContextBounds: string;
     modelsContextHint: string;
     modelsContextInvalid: string;
+    modelsSubagentSpeed: string;
+    modelsSubagentSpeedHint: string;
     modelsTools: string;
     modelsToolsHint: string;
     modelsImage: string;
@@ -318,6 +310,7 @@ export declare const zh: {
     usageRefresh: string;
     usageLoading: string;
     usageEmpty: string;
+    usageNoVisibleModels: string;
     usageUnsupported: string;
     usageError: string;
     usageSession: string;
@@ -385,22 +378,6 @@ export declare const zh: {
     externalUsageApiKey: string;
     externalUsageConfigure: string;
     externalUsageUnavailable: string;
-    cursorTitle: string;
-    cursorOpenLogin: string;
-    cursorWaiting: string;
-    cursorConnected: string;
-    cursorManageTitle: string;
-    cursorManageSignIn: string;
-    cursorAccountsHint: string;
-    cursorManageHint: string;
-    cursorFilterModels: string;
-    cursorModelsLoading: string;
-    cursorModelsError: string;
-    cursorModelsCount: string;
-    cursorIncluded: string;
-    cursorModels: string;
-    cursorOtherModels: string;
-    cursorIncludedRequests: string;
     modelDefaultsTitle: string;
     modelDefaultsHint: string;
     modelDefaultsFollowProvider: string;
@@ -416,6 +393,9 @@ export declare const zh: {
     modelDefaultsSummaryEmpty: string;
     modelDefaultsFilterPlaceholder: string;
     modelDefaultsFilterEmpty: string;
+    modelDefaultsNoModels: string;
+    modelDefaultsNoAccount: string;
+    modelDefaultsDiscoveryFailed: string;
     generating: string;
     image: string;
     viewImage: string;

package/lib/client/locales.js

@@ -21,7 +21,7 @@ export const en = {
     accountsCatalogUnavailable: 'Model discovery is currently unavailable. Saved model selections are preserved.',
     modelsPartialSave: 'Some reasoning defaults were saved. Remaining changes are still in the draft; retry to finish.',
     modelsEdit: 'Edit model list',
-    modelsHint: 'Configure model visibility, default reasoning effort, context and tools here; Save changes below submits them together with the account settings. Hidden models remain usable by existing sessions; tool changes apply to new sessions.',
+    modelsHint: 'Configure model visibility, default reasoning effort, subagent speed, context and tools here; Save changes below submits them together with the account settings. Hidden models remain usable by existing sessions; tool changes apply to new sessions.',
     modelsAutomatic: 'Automatically show all models, including new models',
     modelsSelectAll: 'Select all',
     modelsSelectNone: 'Clear selection',
@@ -29,6 +29,8 @@ export const en = {
     modelsContextBounds: 'Default {default} · Maximum {max}',
     modelsContextHint: 'Leave blank to follow the provider. The requested window is capped by the account’s advertised maximum; account pools use the smallest member window. This controls local history and compaction, not the API’s capacity.',
     modelsContextInvalid: 'Enter a positive whole number of tokens for {model}.',
+    modelsSubagentSpeed: 'Subagent default speed',
+    modelsSubagentSpeedHint: 'Applies to subsequent subagent requests using this model, regardless of the parent model. Main conversations keep their own Speed setting. Fast requires model support.',
     modelsTools: 'Provider tools',
     modelsToolsHint: 'Changes apply only to sessions created after saving. Existing sessions keep their tools. Shared tools remain available if any supporting provider is enabled.',
     modelsImage: 'Image generation',
@@ -78,6 +80,7 @@ export const en = {
     usageRefresh: 'Refresh',
     usageLoading: 'Loading usage…',
     usageEmpty: 'No usage windows reported.',
+    usageNoVisibleModels: 'No usage windows for the models visible in the picker.',
     usageUnsupported: 'This endpoint has no usage surface.',
     usageError: 'Usage lookup failed: {message}',
     usageSession: '5-hour window',
@@ -145,22 +148,6 @@ export const en = {
     externalUsageApiKey: 'API key',
     externalUsageConfigure: 'No API key found at {ref}. Add one in Settings → Models.',
     externalUsageUnavailable: 'Usage status unavailable: {message}',
-    cursorTitle: 'Cursor',
-    cursorOpenLogin: 'Open Cursor sign-in',
-    cursorWaiting: 'Waiting for Cursor sign-in…',
-    cursorConnected: 'Connected',
-    cursorManageTitle: 'Manage Cursor',
-    cursorManageSignIn: 'Sign in to see the models available to this Cursor account.',
-    cursorAccountsHint: 'Cursor uses one connected account. Choose which of its models appear in the model picker.',
-    cursorManageHint: 'Choose model visibility here. Refresh fetches the current models from Cursor; Save changes updates the model picker.',
-    cursorFilterModels: 'Filter models',
-    cursorModelsLoading: 'Loading Cursor models…',
-    cursorModelsError: 'Could not load Cursor models: {message}',
-    cursorModelsCount: '{count} models available',
-    cursorIncluded: 'Included usage',
-    cursorModels: 'Cursor Models',
-    cursorOtherModels: 'Other Models',
-    cursorIncludedRequests: 'Included requests',
     modelDefaultsTitle: 'Default reasoning effort',
     modelDefaultsHint: 'The model picker preselects this level when you switch to the model; models without levels always follow the provider.',
     modelDefaultsFollowProvider: 'Follow provider',
@@ -176,6 +163,9 @@ export const en = {
     modelDefaultsSummaryEmpty: 'No model advertises reasoning levels',
     modelDefaultsFilterPlaceholder: 'Filter models',
     modelDefaultsFilterEmpty: 'No model matches “{query}”.',
+    modelDefaultsNoModels: 'This provider reports no models.',
+    modelDefaultsNoAccount: 'No connected accounts. Connect one on the provider card first.',
+    modelDefaultsDiscoveryFailed: 'Model discovery failed or timed out. Use Refresh to try again.',
     generating: 'Generating image…',
     image: 'image',
     viewImage: 'View image',
@@ -269,7 +259,7 @@ export const zh = {
     accountsCatalogUnavailable: '暂时无法获取模型目录，已保存的模型选择会被保留。',
     modelsPartialSave: '部分推理档已保存，其余更改仍保留在草稿中，请重试完成保存。',
     modelsEdit: '编辑模型列表',
-    modelsHint: '在此配置模型显示、默认推理档、上下文与工具，底部的「保存更改」会连同账号设置一起提交。隐藏模型不影响已有会话；工具开关对新建会话生效。',
+    modelsHint: '在此配置模型显示、默认推理档、子代理速度、上下文与工具，底部的「保存更改」会连同账号设置一起提交。隐藏模型不影响已有会话；工具开关对新建会话生效。',
     modelsAutomatic: '自动显示全部模型（包含以后新增的模型）',
     modelsSelectAll: '全选',
     modelsSelectNone: '清空选择',
@@ -277,6 +267,8 @@ export const zh = {
     modelsContextBounds: '默认 {default} · 最大 {max}',
     modelsContextHint: '留空跟随服务商。配置值按账号返回的最大窗口限制；账号池取各成员的最小窗口。此设置控制本地历史保留和压缩时机，不会扩大 API 本身的容量。',
     modelsContextInvalid: '请为 {model} 输入正整数 token 数。',
+    modelsSubagentSpeed: '子代理默认速度',
+    modelsSubagentSpeedHint: '对使用此模型的子代理后续请求生效，与父会话模型无关。主会话仍使用自己的速度设置；快速档仅在模型支持时生效。',
     modelsTools: 'Provider 工具',
     modelsToolsHint: '仅对保存后新建的会话生效，已有会话保留原工具。任一支持的服务商启用共享工具时，该工具仍会显示。',
     modelsImage: '图片生成',
@@ -326,6 +318,7 @@ export const zh = {
     usageRefresh: '刷新',
     usageLoading: '用量加载中…',
     usageEmpty: '服务商未返回任何用量窗口。',
+    usageNoVisibleModels: '选择器中的可见模型没有任何用量窗口。',
     usageUnsupported: '该端点不提供用量查询。',
     usageError: '用量查询失败：{message}',
     usageSession: '5 小时窗口',
@@ -393,22 +386,6 @@ export const zh = {
     externalUsageApiKey: 'API 密钥',
     externalUsageConfigure: '未在 {ref} 找到 API 密钥。请在「设置 → 模型」中添加。',
     externalUsageUnavailable: '无法获取用量状态：{message}',
-    cursorTitle: 'Cursor',
-    cursorOpenLogin: '打开 Cursor 登录页面',
-    cursorWaiting: '等待 Cursor 登录…',
-    cursorConnected: '已连接',
-    cursorManageTitle: '管理 Cursor',
-    cursorManageSignIn: '登录后可查看此 Cursor 账号可用的模型。',
-    cursorAccountsHint: 'Cursor 使用一个已连接账号。可在此选择模型选择器中显示的模型。',
-    cursorManageHint: '在此选择模型是否显示。刷新可从 Cursor 获取当前模型；保存更改后更新模型选择器。',
-    cursorFilterModels: '筛选模型',
-    cursorModelsLoading: '正在加载 Cursor 模型…',
-    cursorModelsError: '无法加载 Cursor 模型：{message}',
-    cursorModelsCount: '可用模型：{count} 个',
-    cursorIncluded: '套餐内用量',
-    cursorModels: 'Cursor 模型',
-    cursorOtherModels: '其他模型',
-    cursorIncludedRequests: '套餐内请求',
     modelDefaultsTitle: '默认推理档',
     modelDefaultsHint: '切换到该模型时，模型选择器会预选此档位；没有推理档的模型始终跟随服务商默认。',
     modelDefaultsFollowProvider: '跟随服务商',
@@ -424,6 +401,9 @@ export const zh = {
     modelDefaultsSummaryEmpty: '没有模型声明推理档',
     modelDefaultsFilterPlaceholder: '筛选模型',
     modelDefaultsFilterEmpty: '没有匹配「{query}」的模型。',
+    modelDefaultsNoModels: '这个服务商没有报告任何模型。',
+    modelDefaultsNoAccount: '还没有连接账号。请先在卡片上连接一个账号。',
+    modelDefaultsDiscoveryFailed: '模型列表发现失败或超时。可以点「刷新」重试。',
     generating: '正在生成图片…',
     image: '图片',
     viewImage: '查看图片',

package/lib/client/model-filter.d.ts

@@ -0,0 +1,37 @@
+import type { SubagentSpeedTier } from '../provider-settings.js';
+import type { AccountCatalogRow } from './account-preferences.js';
+/** What the model editor shows for the current filter state. */
+export type ModelListState = 'provider-empty' | 'filter-empty' | 'rows';
+/** Distinguish an empty provider from a query that filtered out every row. */
+export declare function modelListState(total: number, matched: number): ModelListState;
+/**
+ * Retain saved model ids when discovery returns no rows. A temporary catalog
+ * failure must not hide the visibility or subagent-speed settings they edit.
+ */
+export declare function savedModelIds(visibleModels: readonly string[] | undefined, subagentSpeeds: Readonly<Record<string, SubagentSpeedTier>> | undefined): string[];
+/** Which notice replaces inert model controls. */
+export type ModelEditorNotice = 'noAccount' | 'discoveryFailed' | 'noModels';
+/**
+ * Use account discovery evidence to explain an empty provider. Connected
+ * accounts with failed discovery need a retry, not another login prompt.
+ */
+export declare function modelEditorNotice(accounts: readonly AccountCatalogRow[] | undefined): ModelEditorNotice;
+/** Everything the component needs to choose rows or one explanatory notice. */
+export interface ModelEditorState {
+    listState: ModelListState;
+    /** Rendered only when `listState` is `provider-empty`. */
+    noticeKey: (typeof NOTICE_KEYS)[ModelEditorNotice];
+}
+/** Locale keys for the three empty states. */
+export declare const NOTICE_KEYS: {
+    readonly noAccount: "modelDefaultsNoAccount";
+    readonly discoveryFailed: "modelDefaultsDiscoveryFailed";
+    readonly noModels: "modelDefaultsNoModels";
+};
+/** Combine discovered and saved rows, filter results, and discovery evidence. */
+export declare function modelEditorState(input: {
+    discovered: number;
+    saved: number;
+    matched: number;
+    accounts: readonly AccountCatalogRow[] | undefined;
+}): ModelEditorState;

package/lib/client/model-filter.js

@@ -0,0 +1,45 @@
+/** Distinguish an empty provider from a query that filtered out every row. */
+export function modelListState(total, matched) {
+    if (total === 0)
+        return 'provider-empty';
+    return matched === 0 ? 'filter-empty' : 'rows';
+}
+/**
+ * Retain saved model ids when discovery returns no rows. A temporary catalog
+ * failure must not hide the visibility or subagent-speed settings they edit.
+ */
+export function savedModelIds(visibleModels, subagentSpeeds) {
+    return [
+        ...new Set([
+            ...(visibleModels ?? []),
+            ...Object.keys(subagentSpeeds ?? {}),
+        ]),
+    ];
+}
+/**
+ * Use account discovery evidence to explain an empty provider. Connected
+ * accounts with failed discovery need a retry, not another login prompt.
+ */
+export function modelEditorNotice(accounts) {
+    // Missing account evidence uses the neutral empty-catalog copy.
+    if (accounts === undefined)
+        return 'noModels';
+    if (accounts.length === 0)
+        return 'noAccount';
+    return accounts.every((account) => account.unavailable === true)
+        ? 'discoveryFailed'
+        : 'noModels';
+}
+/** Locale keys for the three empty states. */
+export const NOTICE_KEYS = {
+    noAccount: 'modelDefaultsNoAccount',
+    discoveryFailed: 'modelDefaultsDiscoveryFailed',
+    noModels: 'modelDefaultsNoModels',
+};
+/** Combine discovered and saved rows, filter results, and discovery evidence. */
+export function modelEditorState(input) {
+    return {
+        listState: modelListState(input.discovered + input.saved, input.matched),
+        noticeKey: NOTICE_KEYS[modelEditorNotice(input.accounts)],
+    };
+}

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

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

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

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