dsh-subscriptions 0.2.2 → 0.3.0

package/README.md

@@ -10,9 +10,9 @@ reported quota in **Settings → Subscriptions**.
 
 ## What it adds
 
-- **Six subscription model sources:** Connect ChatGPT/Codex, Claude, Grok,
-  GitHub Copilot, Google Antigravity, or Cursor and choose their models in DSH's
-  picker. These routes use account sign-in, without provider API keys.
+- **Five subscription model sources:** Connect ChatGPT/Codex, Claude, Grok,
+  GitHub Copilot, or Google Antigravity and choose their models in DSH's picker.
+  These routes use account sign-in, without provider API keys.
 - **Ollama Cloud key route:** Add the `ollama-cloud` route with an
   `OLLAMA_API_KEY` credential. The route ships no model catalog: configure it on
   the Settings → Subscriptions card, which fetches the cloud list, ticks the
@@ -46,10 +46,10 @@ reported quota in **Settings → Subscriptions**.
 
 ## Screenshots
 
-Captured against DSH 0.2.0-rc.2 in the web UI with a local stub serving frozen
-provider responses, so each image shows a product state rather than a real
-account. Identities in the images are fabricated, and the quota percentages,
-catalogs, and reset countdowns are sample data.
+Captured against DSH 0.2.0-rc.2 and 0.2.1-rc.5 in the web UI with a local stub
+serving frozen provider responses, so each image shows a product state rather
+than a real account. Identities in the images are fabricated, and the quota
+percentages, catalogs, and reset countdowns are sample data.
 
 ### Subscriptions
 
@@ -77,10 +77,17 @@ the composer's tool row: Standard or Fast, per session.
 ![Speed toggle with the Standard/Fast menu open](docs/images/speed-toggle.png)
 
 **Settings → Subscriptions → provider → Manage** edits account aliases, pool
-participation, model allowlists, and the per-model effort, context, and tool
-settings. A context value only lowers the window a session plans against, never
-above what the provider advertises; Codex and Claude support it, and it does not
-enlarge the API's capacity.
+participation, model allowlists, and the per-model effort, subagent speed,
+context, and tool settings. A context value only lowers the window a session
+plans against, never above what the provider advertises; Codex and Claude
+support it, and it does not enlarge the API's capacity.
+
+For Codex, **Subagent default speed** applies to subsequent subagent requests
+using that model, regardless of the parent model. An explicit Speed choice in
+the subagent session overrides the saved default, and a parent's choice never
+propagates. The default survives restart; session overrides do not. Fast still
+requires current model support, and requests without live subagent metadata use
+Standard.
 
 ![Model settings](docs/images/model-settings.png)
 
@@ -154,15 +161,16 @@ text. No live account was used to verify what Anthropic returns. See
 
 ## Install
 
-Current source is tested with DSH `0.1.7-rc.2`, `0.2.0-rc.2`, and `0.2.1-rc.2`.
-The package's peers admit `>=0.1.7-rc.2 <0.3.0-0`: untested versions inside that
-range install but are unsupported, and versions outside it need an explicit
-`dsh plugin allow-version` exemption. `dsh plugin add` checks those ranges with
-`includePrerelease` semantics, so the admitted set covers every host build from
-`0.1.7-rc.2` through the whole `0.2.x` line, prereleases included, and blocks
-the `0.3.0` line. See [docs/compatibility.md](docs/compatibility.md) for the
-support window and [docs/testing.md](docs/testing.md) for the test layers. With
-`dsh` available, install the plugin into the web profile from npm:
+Current source is tested with DSH `0.1.7-rc.2`, `0.2.0-rc.2`, `0.2.1-rc.2`, and
+`0.2.1-rc.5`. The package's peers admit `>=0.1.7-rc.2 <0.3.0-0`: untested
+versions inside that range install but are unsupported, and versions outside it
+need an explicit `dsh plugin allow-version` exemption. `dsh plugin add` checks
+those ranges with `includePrerelease` semantics, so the admitted set covers
+every host build from `0.1.7-rc.2` through the whole `0.2.x` line, prereleases
+included, and blocks the `0.3.0` line. See
+[docs/compatibility.md](docs/compatibility.md) for the support window and
+[docs/testing.md](docs/testing.md) for the test layers. With `dsh` available,
+install the plugin into the web profile from npm:
 
 ```sh
 dsh plugin --profile web add dsh-subscriptions
@@ -216,12 +224,6 @@ the checks and their limits.
   A manual check in an isolated `0.1.7-rc.2` web profile found the client bundle
   served and the auth and usage-status RPCs answering. Live sign-in and model
   requests on the supported DSH lines remain to be checked.
-- **Cursor:** Browser sign-in and live model discovery were verified in an
-  isolated `0.1.7-rc.2` profile. A successful live model request remains to be
-  verified. Its transport comes from
-  [orrinzeng/dsh-cursor-subscription](https://github.com/orrinzeng/dsh-cursor-subscription)
-  and uses an undocumented Cursor protocol; see the
-  [source note](docs/cursor-origin.md).
 - **OpenCode Go and Kimi Code:** Live usage responses were verified. Their API
   keys stay on the DSH host; the browser receives configured status and quota
   windows, not the keys.
@@ -231,12 +233,6 @@ the checks and their limits.
   browser test. Live chat, listing, usage, and web calls against `ollama.com`
   remain to be verified with a real key.
 
-Cursor uses one connected account and a live model catalog. Its model visibility
-selection persists under the DSH home directory, and automatic display follows
-newly discovered models. It ships no fallback model list and does not import the
-local `cursor-agent` credential cache. Individual usage comes from Cursor
-dashboard endpoints; the documented Admin API covers team usage.
-
 The plugin follows DSH network settings. Its former proxy configuration and UI
 have been retired; an old plugin proxy config file is ignored.
 

package/lib/auth/rpc.d.ts

@@ -12,7 +12,6 @@ import { type ProviderId } from './store.js';
 import type { ProviderUsage } from '../providers/common.js';
 import type { CliVersion } from '../providers/npm-cli-version.js';
 import type { ExternalUsageSource, ExternalUsageStatus } from '../providers/external-usage-controller.js';
-import type { CursorAuthStatus } from '../providers/cursor-auth.js';
 /**
  * Endpoint-name prefix under the shared `/api` channel: endpoint `status`
  * is served at `/api/subscriptions-auth.status`. The browser half calls
@@ -23,7 +22,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", "ollamaSettings", "ollamaSetSettings", "ollamaModels", "image", "video", "prepareReset", "consumeReset", "speed", "setSpeed", "modelDefaults", "setModelDefault"];
+export declare const SUBSCRIPTIONS_AUTH_ENDPOINTS: readonly ["providerSettings", "setProviderSettings", "status", "login", "manual", "cancel", "logout", "setDefault", "usage", "externalStatus", "externalUsage", "ollamaSettings", "ollamaSetSettings", "ollamaModels", "image", "video", "prepareReset", "consumeReset", "speed", "setSpeed", "modelDefaults", "setModelDefault"];
 /** Decoded image bytes returned by the `image` endpoint. */
 export interface ImageBytesResult {
     mediaType: string;
@@ -38,15 +37,15 @@ export interface VideoBytesResult {
 export type SpeedTier = 'standard' | 'fast';
 /** `speed` endpoint value: the session's choice plus the visibility list. */
 export interface SpeedState {
-    /** The session's current speed tier (default `standard`). */
+    /** Explicit session speed, or the subagent's model default when supplied. */
     tier: SpeedTier;
     /** Codex model ids whose catalog advertises a fast tier. */
     fastModels: string[];
 }
-/** Speed state the RPC handler delegates to (in-memory, per session). */
+/** Session overrides plus persisted subagent model defaults. */
 export interface SpeedController {
-    /** Current speed state: the session's tier and the fast-capable codex models. */
-    speed(sessionId: string): Promise<SpeedState>;
+    /** Pass the current Codex model to resolve a subagent's default speed. */
+    speed(sessionId: string, model?: string): Promise<SpeedState>;
     /** Set one session's speed tier. */
     setSpeed(sessionId: string, tier: SpeedTier): Promise<void>;
 }
@@ -65,6 +64,8 @@ export interface AccountStatus {
 }
 /** Login state of one provider, as rendered by the Settings page. */
 export interface ProviderStatus {
+    /** Saved picker visibility, attached by the status RPC from local preferences. */
+    visibleModels?: string[];
     /** Whether a login attempt is currently waiting for its code. */
     busy: boolean;
     /** Logged-in accounts, default first. */
@@ -110,6 +111,8 @@ export interface ProviderAccountCatalog {
 }
 /** Provider and account preference operations behind providerSettings/setProviderSettings. */
 export interface ProviderSettingsController {
+    /** Local picker selection, without triggering model discovery. */
+    visibleModels?(provider: ProviderId): string[] | undefined;
     get(provider: ProviderId, force: boolean): Promise<unknown>;
     set(provider: ProviderId, settings: unknown): Promise<void>;
 }
@@ -185,22 +188,6 @@ export interface ExternalUsageRpcController {
     status(): Promise<Record<ExternalUsageSource, ExternalUsageStatus>>;
     usage(source: ExternalUsageSource, signal: AbortSignal): Promise<ProviderUsage>;
 }
-/** Cursor account actions; OAuth tokens remain in the host credential service. */
-export interface CursorRpcController {
-    status(): Promise<CursorAuthStatus>;
-    login(): Promise<{
-        authorizeUrl: string;
-    }>;
-    cancel(): Promise<void>;
-    logout(): Promise<void>;
-    usage(signal: AbortSignal): Promise<ProviderUsage>;
-    models(force: boolean, signal: AbortSignal): Promise<{
-        id: string;
-        name: string;
-    }[]>;
-    settings(force: boolean, signal: AbortSignal): Promise<unknown>;
-    setSettings(input: unknown): Promise<void>;
-}
 /** One model in the Ollama Cloud picker catalog, with its capability flags. */
 export interface OllamaModelView {
     id: string;
@@ -276,7 +263,6 @@ export interface OllamaRpcController {
  * @param modelDefaults - optional per-model default-effort state backing `modelDefaults`/`setModelDefault`.
  * @param providerSettings - optional OAuth provider/account preferences.
  * @param externalUsage - optional credential-backed quota readers.
- * @param cursor - optional Cursor account and model-visibility actions.
  * @param ollama - optional Ollama Cloud catalog and connection settings.
  */
-export declare function registerAuthRpc(ctx: Context, controller: AuthController, speed: SpeedController, modelDefaults?: ModelDefaultsController | undefined, providerSettings?: ProviderSettingsController | undefined, externalUsage?: ExternalUsageRpcController | undefined, cursor?: CursorRpcController | undefined, ollama?: OllamaRpcController | undefined): void;
+export declare function registerAuthRpc(ctx: Context, controller: AuthController, speed: SpeedController, modelDefaults?: ModelDefaultsController | undefined, providerSettings?: ProviderSettingsController | undefined, externalUsage?: ExternalUsageRpcController | undefined, ollama?: OllamaRpcController | undefined): void;

package/lib/auth/rpc.js

@@ -32,14 +32,6 @@ export const SUBSCRIPTIONS_AUTH_ENDPOINTS = [
     'usage',
     'externalStatus',
     'externalUsage',
-    'cursorStatus',
-    'cursorLogin',
-    'cursorCancel',
-    'cursorLogout',
-    'cursorUsage',
-    'cursorModels',
-    'cursorSettings',
-    'cursorSetSettings',
     'ollamaSettings',
     'ollamaSetSettings',
     'ollamaModels',
@@ -284,7 +276,7 @@ function readSessionId(payload) {
         throw new BadRequest('payload must be an object');
     return readString(payload, 'sessionId');
 }
-async function dispatch(controller, speed, modelDefaults, endpoint, payload, signal, providerSettings, externalUsage, cursor, ollama) {
+async function dispatch(controller, speed, modelDefaults, endpoint, payload, signal, providerSettings, externalUsage, ollama) {
     switch (endpoint) {
         case 'providerSettings':
             if (!providerSettings)
@@ -309,7 +301,18 @@ async function dispatch(controller, speed, modelDefaults, endpoint, payload, sig
                     detail: error instanceof Error ? error.message : String(error),
                 })),
             ]));
-            return ok({ providers: Object.fromEntries(entries) });
+            return ok({
+                providers: Object.fromEntries(entries.map(([provider, status]) => {
+                    const visibleModels = providerSettings?.visibleModels?.(provider);
+                    return [
+                        provider,
+                        {
+                            ...status,
+                            ...(visibleModels === undefined ? {} : { visibleModels }),
+                        },
+                    ];
+                })),
+            });
         }
         case 'login': {
             const provider = readProvider(payload);
@@ -350,43 +353,6 @@ async function dispatch(controller, speed, modelDefaults, endpoint, payload, sig
             }
             return ok(await externalUsage.usage(source, signal));
         }
-        case 'cursorStatus':
-            if (!cursor)
-                throw new BadRequest('Cursor account is unavailable');
-            return ok(await cursor.status());
-        case 'cursorLogin':
-            if (!cursor)
-                throw new BadRequest('Cursor account is unavailable');
-            return ok(await cursor.login());
-        case 'cursorCancel':
-            if (!cursor)
-                throw new BadRequest('Cursor account is unavailable');
-            await cursor.cancel();
-            return ok({ ok: true });
-        case 'cursorLogout':
-            if (!cursor)
-                throw new BadRequest('Cursor account is unavailable');
-            await cursor.logout();
-            return ok({ ok: true });
-        case 'cursorUsage':
-            if (!cursor)
-                throw new BadRequest('Cursor account is unavailable');
-            return ok(await cursor.usage(signal));
-        case 'cursorModels':
-            if (!cursor)
-                throw new BadRequest('Cursor account is unavailable');
-            return ok(await cursor.models(readForce(payload), signal));
-        case 'cursorSettings':
-            if (!cursor)
-                throw new BadRequest('Cursor account is unavailable');
-            return ok(await cursor.settings(readForce(payload), signal));
-        case 'cursorSetSettings':
-            if (!cursor)
-                throw new BadRequest('Cursor account is unavailable');
-            if (payload === null || typeof payload !== 'object')
-                throw new BadRequest('payload must be an object');
-            await cursor.setSettings(payload.settings);
-            return ok({ ok: true });
         case 'ollamaSettings':
             if (!ollama)
                 throw new BadRequest('Ollama settings are unavailable');
@@ -433,7 +399,9 @@ async function dispatch(controller, speed, modelDefaults, endpoint, payload, sig
         case 'video':
             return ok(await controller.readVideo(readVideoName(payload), signal));
         case 'speed':
-            return ok(await speed.speed(readSessionId(payload)));
+            return ok(await speed.speed(readSessionId(payload), payload.model === undefined
+                ? undefined
+                : readString(payload, 'model')));
         case 'setSpeed':
             await speed.setSpeed(readSessionId(payload), readSpeedTier(payload));
             return ok({ ok: true });
@@ -462,10 +430,9 @@ async function dispatch(controller, speed, modelDefaults, endpoint, payload, sig
  * @param modelDefaults - optional per-model default-effort state backing `modelDefaults`/`setModelDefault`.
  * @param providerSettings - optional OAuth provider/account preferences.
  * @param externalUsage - optional credential-backed quota readers.
- * @param cursor - optional Cursor account and model-visibility actions.
  * @param ollama - optional Ollama Cloud catalog and connection settings.
  */
-export function registerAuthRpc(ctx, controller, speed, modelDefaults = undefined, providerSettings = undefined, externalUsage = undefined, cursor = undefined, ollama = undefined) {
+export function registerAuthRpc(ctx, controller, speed, modelDefaults = undefined, providerSettings = undefined, externalUsage = undefined, ollama = undefined) {
     // `connection` is not in this plugin's inject list (headless compositions
     // lack it), so its startup order is unconstrained: defer registration until
     // the service exists instead of probing once at apply time.
@@ -482,7 +449,7 @@ export function registerAuthRpc(ctx, controller, speed, modelDefaults = undefine
         const connection = ctx.get('connection');
         const handler = async (endpoint, payload, signal) => {
             try {
-                return await dispatch(controller, speed, modelDefaults, endpoint, payload, signal, providerSettings, externalUsage, cursor, ollama);
+                return await dispatch(controller, speed, modelDefaults, endpoint, payload, signal, providerSettings, externalUsage, ollama);
             }
             catch (error) {
                 return failure(error);

package/lib/client/ProviderAccountManager.d.ts

@@ -2,7 +2,7 @@ import type { ConnectionHandle } from '@deepseek-ai/dsh-api-remotes/client';
 import type { SubscriptionProvider } from './SubscriptionsSection.js';
 import type { SubscriptionsKey } from './locales.js';
 interface Props {
-    provider: SubscriptionProvider | 'cursor-subscription';
+    provider: SubscriptionProvider;
     name: string;
     rpc: ConnectionHandle['rpc'];
     t: (key: SubscriptionsKey, params?: Record<string, unknown>) => string;

package/lib/client/ProviderAccountManager.js

@@ -47,9 +47,7 @@ export function ProviderAccountManager({ provider, name, rpc, t, onClose, }) {
         let current = true;
         setLoading(true);
         setError('');
-        void callSubscriptionsAuth(rpc, provider === 'cursor-subscription'
-            ? 'cursorSettings'
-            : 'providerSettings', { provider })
+        void callSubscriptionsAuth(rpc, 'providerSettings', { provider })
             .then((data) => {
             if (current) {
                 setCatalog(data);
@@ -94,43 +92,32 @@ export function ProviderAccountManager({ provider, name, rpc, t, onClose, }) {
         setSaveError('');
         let savedEfforts = 0;
         try {
-            if (provider !== 'cursor-subscription') {
-                for (const { model, effort } of models.efforts) {
-                    await callSubscriptionsAuth(rpc, 'setModelDefault', {
-                        provider,
-                        model,
-                        ...(effort ? { effort } : {}),
-                    });
-                    savedEfforts++;
-                    if (!alive.current)
-                        return;
-                }
+            for (const { model, effort } of models.efforts) {
+                await callSubscriptionsAuth(rpc, 'setModelDefault', {
+                    provider,
+                    model,
+                    ...(effort ? { effort } : {}),
+                });
+                savedEfforts++;
+                if (!alive.current)
+                    return;
             }
             // Re-read before writing: another client may have saved since this
             // dialog loaded, and a stale snapshot must never be written back.
-            const latest = await callSubscriptionsAuth(rpc, provider === 'cursor-subscription'
-                ? 'cursorSettings'
-                : 'providerSettings', { provider });
+            const latest = await callSubscriptionsAuth(rpc, 'providerSettings', { provider });
             if (!alive.current)
                 return;
-            if (provider === 'cursor-subscription') {
-                await callSubscriptionsAuth(rpc, 'cursorSetSettings', {
-                    settings: models.settings ?? latest.settings,
-                });
-            }
-            else {
-                const base = models.settings === undefined
-                    ? latest.settings
-                    : mergeLatestAccounts(models.settings, latest.settings);
-                // The editor's draft carries the TTL it loaded, so the dialog always
-                // replaces it: the picker's choice when touched, otherwise the value
-                // from the freshly re-read settings.
-                const withTtl = mergePromptCacheTtl(base, ttlDirty ? ttlDraft : latest.settings.promptCacheTtl);
-                await callSubscriptionsAuth(rpc, 'setProviderSettings', {
-                    provider,
-                    settings: mergeAccountChanges(withTtl, changes),
-                });
-            }
+            const base = models.settings === undefined
+                ? latest.settings
+                : mergeLatestAccounts(models.settings, latest.settings);
+            // The editor's draft carries the TTL it loaded, so the dialog always
+            // replaces it: the picker's choice when touched, otherwise the value
+            // from the freshly re-read settings.
+            const withTtl = mergePromptCacheTtl(base, ttlDirty ? ttlDraft : latest.settings.promptCacheTtl);
+            await callSubscriptionsAuth(rpc, 'setProviderSettings', {
+                provider,
+                settings: mergeAccountChanges(withTtl, changes),
+            });
             if (alive.current)
                 onClose();
         }
@@ -155,81 +142,70 @@ export function ProviderAccountManager({ provider, name, rpc, t, onClose, }) {
             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 })), provider === 'claude' && catalog && (_jsxs("div", { style: {
+        }, 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('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('accountsEmpty') })), 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));
+                            })] })), _jsx(ProviderModelEditor, { ref: editor, provider: provider, rpc: rpc, t: t, disabled: saving, onDirtyChange: setModelsDirty }), provider === 'claude' && catalog && (_jsxs("div", { style: {
                             ...stack,
                             gap: 6,
                             borderTop: border,

package/lib/client/ProviderModelEditor.d.ts

@@ -3,7 +3,7 @@ import type { ProviderPreferences } from '../provider-settings.js';
 import type { SubscriptionProvider } from './SubscriptionsSection.js';
 import type { SubscriptionsKey } from './locales.js';
 interface Props {
-    provider: SubscriptionProvider | 'cursor-subscription';
+    provider: SubscriptionProvider;
     rpc: ConnectionHandle['rpc'];
     t: (key: SubscriptionsKey, params?: Record<string, unknown>) => string;
     /** Freeze the editor while the owning dialog submits. */