dsh-plugin-subscriptions 0.5.3 → 0.6.0

package/lib/client/SubscriptionsSection.js

@@ -19,6 +19,17 @@ import { en } from './locales.js';
 const SUBSCRIPTIONS_AUTH_CHANNEL = '/subscriptions-auth';
 /** Poll cadence while a provider login attempt is busy. */
 const POLL_INTERVAL_MS = 2000;
+/**
+ * Model count above which the expanded default-effort list also offers a name
+ * filter; below it the list is short enough to scan.
+ */
+const MODEL_FILTER_THRESHOLD = 8;
+/**
+ * Height cap of the expanded default-effort list, in px. Past it the list
+ * scrolls internally so a provider with dozens of models cannot stretch the
+ * card (roughly 7 rows, which keeps the next card's header on screen).
+ */
+const MODEL_LIST_MAX_HEIGHT = 260;
 /** Card display metadata, in page order (names are brand names, not translated). */
 const PROVIDERS = [
     { id: 'codex', name: 'Codex (ChatGPT)' },
@@ -141,6 +152,46 @@ const styles = {
         background: 'var(--dsw-alias-bg-layer-1)', border: '1px solid var(--dsw-alias-border-l2)',
     },
     usageFill: { height: '100%', borderRadius: 3 },
+    defaultEffort: {
+        display: 'flex', flexDirection: 'column', gap: 6, marginTop: 4,
+        borderTop: '1px solid var(--dsw-alias-border-l2)', paddingTop: 8,
+    },
+    /** The always-visible disclosure header: title, summary, chevron. */
+    defaultEffortToggle: {
+        boxSizing: 'border-box', display: 'flex', alignItems: 'center', gap: 8,
+        width: '100%', padding: 0, border: 'none', background: 'transparent',
+        font: 'inherit', textAlign: 'left', cursor: 'pointer',
+    },
+    defaultEffortChevron: {
+        marginLeft: 'auto', flexShrink: 0, fontSize: 10, lineHeight: '18px',
+        color: 'var(--dsw-alias-label-tertiary)',
+    },
+    /** Body of the expanded disclosure: bounded height so a long catalog scrolls. */
+    defaultEffortList: {
+        display: 'flex', flexDirection: 'column', gap: 6,
+        maxHeight: MODEL_LIST_MAX_HEIGHT, overflowY: 'auto', paddingRight: 2,
+    },
+    defaultEffortRow: { display: 'flex', alignItems: 'center', justifyContent: 'space-between', gap: 8 },
+    defaultEffortName: {
+        fontSize: 12, lineHeight: '18px', color: 'var(--dsw-alias-label-primary)',
+        overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap',
+    },
+    defaultEffortSaving: {
+        marginLeft: 'auto', flexShrink: 0,
+        fontSize: 12, lineHeight: '18px', color: 'var(--dsw-alias-label-tertiary)',
+    },
+    defaultEffortSelect: {
+        maxWidth: 220, flexShrink: 0, height: 28, boxSizing: 'border-box',
+        border: '1px solid var(--dsw-alias-border-l2)', borderRadius: 8,
+        padding: '0 8px', font: 'inherit', fontSize: 12, lineHeight: '18px',
+        background: 'var(--dsw-alias-bg-layer-1)', color: 'var(--dsw-alias-label-primary)',
+    },
+    defaultEffortFilter: {
+        height: 28, width: '100%', boxSizing: 'border-box',
+        border: '1px solid var(--dsw-alias-border-l2)', borderRadius: 8,
+        padding: '0 8px', font: 'inherit', fontSize: 12, lineHeight: '18px',
+        background: 'var(--dsw-alias-bg-layer-1)', color: 'var(--dsw-alias-label-primary)',
+    },
     manual: { marginTop: 4, fontSize: 12, lineHeight: '18px', color: 'var(--dsw-alias-label-secondary)' },
     manualRow: { display: 'flex', gap: 8, marginTop: 6 },
     manualInput: {
@@ -197,6 +248,16 @@ function dotColor(status) {
         return 'var(--dsw-alias-state-success-primary)';
     return 'var(--dsw-alias-label-dimmed)';
 }
+/**
+ * Whether a provider has at least one connected account. Multi-account made
+ * "logged in" a property of the account list rather than a flag, so every
+ * logged-in test goes through this one predicate.
+ * @param status - the provider's last reported state, possibly absent.
+ * @returns true when the provider serves at least one account.
+ */
+function hasAccount(status) {
+    return (status?.accounts.length ?? 0) > 0;
+}
 /**
  * One-line status text for one provider state.
  * @param t - section translate.
@@ -250,6 +311,65 @@ function messageColor(tone) {
         ? 'var(--dsw-alias-state-error-primary)'
         : 'var(--dsw-alias-state-success-primary)';
 }
+/**
+ * Derive one provider's default-effort section from its catalog and filter.
+ * Pure so the collapsed-header counts and the filter stay testable without a
+ * DOM: rows come only from models that advertise levels, the count of the rest
+ * rides as one line, and the filter matches display name or model id.
+ * @param models - the provider's catalog models, or undefined while loading.
+ * @param filter - the raw filter input (trimmed and lowercased here).
+ * @returns the section's rows and header counts.
+ */
+export function deriveModelDefaultsView(models, filter) {
+    const all = models ?? [];
+    const withEfforts = all.filter(model => model.efforts.length > 0);
+    const query = filter.trim().toLowerCase();
+    const shown = query === ''
+        ? withEfforts
+        : withEfforts.filter(model => model.name.toLowerCase().includes(query)
+            || model.id.toLowerCase().includes(query));
+    return {
+        shown,
+        total: withEfforts.length,
+        overridden: withEfforts.filter(model => model.configured !== undefined).length,
+        withoutEfforts: all.length - withEfforts.length,
+        showFilter: withEfforts.length > MODEL_FILTER_THRESHOLD,
+    };
+}
+/**
+ * Whether the default-effort catalog needs (re)fetching.
+ *
+ * Fetching is gated on an *attempt* signature rather than on the payload
+ * being empty: an empty answer is a legitimate result (a narrowed
+ * `config.providers`, or a catalog that is momentarily unavailable), and
+ * treating it as "not loaded yet" re-ran this effect forever. The signature
+ * also covers the accounts, so logging a second provider in refetches
+ * instead of leaving that card on the previous answer.
+ * @param input - the decision inputs.
+ * @returns true when the caller should start a fetch.
+ */
+export function shouldFetchModelDefaults(input) {
+    if (input.failed)
+        return false;
+    if (input.loggedIn.length === 0)
+        return false;
+    // Only an open disclosure pays for the per-model live resolve.
+    if (!input.open.some(provider => input.loggedIn.includes(provider)))
+        return false;
+    return input.loadedFor !== input.signature;
+}
+/**
+ * Stable signature of the accounts a catalog answer depends on. A change
+ * means a previous answer is stale (an account arrived or left), so the next
+ * open disclosure refetches.
+ * @param statuses - the per-provider status snapshot.
+ * @returns a signature string, stable across renders with equal accounts.
+ */
+export function modelDefaultsSignature(statuses) {
+    return PROVIDERS
+        .map(({ id }) => `${id}:${(statuses[id]?.accounts ?? []).map(account => account.key).sort().join(',')}`)
+        .join('|');
+}
 /**
  * The Subscriptions settings page component.
  * @param props - the slot inject face ({@link SubscriptionsSectionInjected}).
@@ -289,6 +409,24 @@ export function SubscriptionsSection(props) {
     const [proxyTesting, setProxyTesting] = useState(false);
     const [proxyMessage, setProxyMessage] = useState(undefined);
     const [proxyTestResult, setProxyTestResult] = useState(undefined);
+    /** Per-model default-effort picker state as answered by `modelDefaults`. */
+    const [modelDefaults, setModelDefaults] = useState({});
+    const [modelDefaultsLoading, setModelDefaultsLoading] = useState(false);
+    const [modelDefaultsLoadError, setModelDefaultsLoadError] = useState(undefined);
+    /** One set in flight: the `${provider}/${model}` key. */
+    const [modelDefaultsSaving, setModelDefaultsSaving] = useState(undefined);
+    /** Per-model save failures, keyed `${provider}/${model}`. */
+    const [modelDefaultsSaveErrors, setModelDefaultsSaveErrors] = useState({});
+    /** Providers whose default-effort disclosure is open (collapsed by default). */
+    const [modelDefaultsOpen, setModelDefaultsOpen] = useState({});
+    /** Per-provider name filter of the expanded list. */
+    const [modelDefaultsFilters, setModelDefaultsFilters] = useState({});
+    /** Account signature the last completed catalog fetch was answered for. */
+    const [modelDefaultsLoadedFor, setModelDefaultsLoadedFor] = useState(undefined);
+    /** Optimistic in-flight selections, keyed `${provider}/${model}` ('' = follow provider). */
+    const [modelDefaultsPending, setModelDefaultsPending] = useState({});
+    /** Guard the catalog effect against concurrent loads. */
+    const modelDefaultsInflightRef = useRef(false);
     const setProviderError = useCallback((provider, message) => {
         if (!mountedRef.current)
             return;
@@ -366,14 +504,14 @@ export function SubscriptionsSection(props) {
             pollersRef.current.clear();
         };
     }, [refresh, startPolling]);
-    const loadUsage = useCallback(async (provider, account) => {
+    const loadUsage = useCallback(async (provider, account, force = false) => {
         const key = `${provider}:${account}`;
         if (rpc === undefined || usageInflightRef.current.has(key))
             return;
         usageInflightRef.current.add(key);
         setUsageLoading(prev => ({ ...prev, [key]: true }));
         try {
-            const usage = await callSubscriptionsAuth(rpc, 'usage', { provider, account });
+            const usage = await callSubscriptionsAuth(rpc, 'usage', { provider, account, ...force ? { force: true } : {} });
             if (!mountedRef.current)
                 return;
             setUsages(prev => ({ ...prev, [key]: usage }));
@@ -409,6 +547,146 @@ export function SubscriptionsSection(props) {
         setUsages(prev => dropStale(prev, live));
         setUsageErrors(prev => dropStale(prev, live));
     }, [statuses, usages, usageErrors, loadUsage]);
+    const loadModelDefaultsData = useCallback(async (signature) => {
+        if (rpc === undefined || modelDefaultsInflightRef.current)
+            return;
+        modelDefaultsInflightRef.current = true;
+        setModelDefaultsLoading(true);
+        try {
+            const catalog = await callSubscriptionsAuth(rpc, 'modelDefaults', {});
+            if (!mountedRef.current)
+                return;
+            const next = {};
+            for (const entry of catalog)
+                next[entry.provider] = entry;
+            setModelDefaults(next);
+            setModelDefaultsLoadError(undefined);
+            // Latch the answered signature, empty answer included: an empty catalog
+            // is a result, not a missing load, and re-deriving "loaded" from the
+            // payload re-triggered this fetch on every render.
+            setModelDefaultsLoadedFor(signature);
+            // The shown state is now authoritative; stale per-row failures would
+            // otherwise linger next to rows that are correct again.
+            setModelDefaultsSaveErrors({});
+        }
+        catch (error) {
+            if (mountedRef.current)
+                setModelDefaultsLoadError(messageOf(error));
+        }
+        finally {
+            modelDefaultsInflightRef.current = false;
+            if (mountedRef.current)
+                setModelDefaultsLoading(false);
+        }
+    }, [rpc]);
+    // Fetch the default-effort catalogs only once a card's list is expanded: the
+    // node half resolves live model info per model, so a collapsed page must not
+    // pay for it. One fetch covers every logged-in provider (the node half
+    // answers them together), and the levels follow the picker's catalog union
+    // across that provider's accounts. The account signature drives refetching,
+    // so connecting another provider or account does not leave an open card on
+    // the previous answer. Everything resets once the last account logs out.
+    useEffect(() => {
+        const loggedIn = PROVIDERS.filter(({ id }) => hasAccount(statuses[id])).map(({ id }) => id);
+        const signature = modelDefaultsSignature(statuses);
+        if (loggedIn.length > 0) {
+            const open = PROVIDERS.filter(({ id }) => modelDefaultsOpen[id] === true).map(({ id }) => id);
+            if (shouldFetchModelDefaults({
+                loggedIn,
+                open,
+                loadedFor: modelDefaultsLoadedFor,
+                signature,
+                failed: modelDefaultsLoadError !== undefined,
+            })) {
+                void loadModelDefaultsData(signature);
+            }
+        }
+        else if (modelDefaultsLoadedFor !== undefined
+            || Object.keys(modelDefaults).length > 0
+            || Object.keys(modelDefaultsOpen).length > 0) {
+            setModelDefaults({});
+            setModelDefaultsSaveErrors({});
+            setModelDefaultsLoadError(undefined);
+            setModelDefaultsLoadedFor(undefined);
+            setModelDefaultsLoading(false);
+            setModelDefaultsOpen({});
+            setModelDefaultsFilters({});
+        }
+    }, [
+        statuses,
+        modelDefaults,
+        modelDefaultsOpen,
+        modelDefaultsLoadError,
+        modelDefaultsLoadedFor,
+        loadModelDefaultsData,
+    ]);
+    /** Open or close one provider's default-effort disclosure. */
+    const toggleModelDefaults = useCallback((provider) => {
+        setModelDefaultsOpen(prev => ({ ...prev, [provider]: prev[provider] !== true }));
+    }, []);
+    const setModelDefault = useCallback(async (provider, model, effort) => {
+        if (rpc === undefined)
+            return;
+        const key = `${provider}/${model}`;
+        setModelDefaultsSaving(key);
+        // Hold the picked level locally for the duration of the save: the select
+        // is controlled by server state, which only updates after the round trip,
+        // so without this the row visibly snaps back to "Follow provider" (greyed
+        // out) mid-save and reads as a rejected change.
+        setModelDefaultsPending(prev => ({ ...prev, [key]: effort ?? '' }));
+        setModelDefaultsSaveErrors((prev) => {
+            const next = { ...prev };
+            delete next[key];
+            return next;
+        });
+        try {
+            await callSubscriptionsAuth(rpc, 'setModelDefault', {
+                provider,
+                model,
+                ...(effort === undefined ? {} : { effort }),
+            });
+            if (!mountedRef.current)
+                return;
+            setModelDefaults((prev) => {
+                const section = prev[provider];
+                if (section === undefined)
+                    return prev;
+                return {
+                    ...prev,
+                    [provider]: {
+                        ...section,
+                        models: section.models.map((entry) => {
+                            if (entry.id !== model)
+                                return entry;
+                            if (effort !== undefined)
+                                return { ...entry, configured: effort };
+                            // Cleared: drop the key rather than keep the stale level, or the
+                            // select would snap back and the header would keep counting it.
+                            const { configured: _cleared, ...rest } = entry;
+                            return rest;
+                        }),
+                    },
+                };
+            });
+        }
+        catch (error) {
+            if (mountedRef.current)
+                setModelDefaultsSaveErrors((prev) => ({ ...prev, [key]: messageOf(error) }));
+        }
+        finally {
+            if (mountedRef.current) {
+                setModelDefaultsSaving(current => current === key ? undefined : current);
+                // Drop the optimistic value: on success the server state now carries
+                // it, on failure the row must fall back to the real stored level
+                // rather than keep showing a change that did not land.
+                setModelDefaultsPending((prev) => {
+                    const next = { ...prev };
+                    delete next[key];
+                    return next;
+                });
+            }
+        }
+    }, [rpc]);
     const login = useCallback(async (provider, method) => {
         if (rpc === undefined)
             return;
@@ -625,12 +903,55 @@ export function SubscriptionsSection(props) {
                             return (_jsxs("div", { style: styles.accountRow, children: [_jsxs("div", { style: styles.accountHeader, children: [_jsx("button", { type: "button", style: styles.starButton, title: account.isDefault ? t('defaultBadge') : t('setDefault'), onClick: () => {
                                                     if (!account.isDefault)
                                                         void setDefault(id, account.key);
-                                                }, children: account.isDefault ? '★' : '☆' }), _jsx("span", { style: styles.accountName, children: display }), account.plan !== undefined && (_jsx("span", { style: styles.usagePlan, children: account.plan })), account.expiresAt !== undefined && (_jsx("span", { style: styles.statusLine, children: t('accountExpires', { date: new Date(account.expiresAt).toLocaleString() }) })), _jsx("button", { type: "button", style: { ...styles.button, marginLeft: 'auto', flexShrink: 0 }, onClick: () => { void logout(id, account.key, display, name); }, 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, ...usageLoading[usageKey] === true ? { opacity: 0.5, cursor: 'default' } : {} }, disabled: usageLoading[usageKey] === true, onClick: () => { void loadUsage(id, account.key); }, 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) => {
+                                                }, children: account.isDefault ? '★' : '☆' }), _jsx("span", { style: styles.accountName, children: display }), account.plan !== undefined && (_jsx("span", { style: styles.usagePlan, children: account.plan })), account.expiresAt !== undefined && (_jsx("span", { style: styles.statusLine, children: t('accountExpires', { date: new Date(account.expiresAt).toLocaleString() }) })), _jsx("button", { type: "button", style: { ...styles.button, marginLeft: 'auto', flexShrink: 0 }, onClick: () => { void logout(id, account.key, display, name); }, 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, ...usageLoading[usageKey] === true ? { opacity: 0.5, cursor: 'default' } : {} }, 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) => {
                                                 const percent = Math.min(100, Math.max(0, window.usedPercent));
                                                 return (_jsxs("div", { style: styles.usageRow, children: [_jsxs("div", { style: styles.usageMeta, children: [_jsx("span", { children: usageWindowLabel(t, window) }), _jsxs("span", { children: [`${String(Math.round(percent))}%`, window.resetsAt !== undefined
                                                                             && ` · ${t('usageResets', { date: new Date(window.resetsAt).toLocaleString() })}`] })] }), _jsx("div", { style: styles.usageTrack, children: _jsx("div", { style: { ...styles.usageFill, width: `${String(percent)}%`, background: usageBarColor(percent) } }) })] }, index));
                                             })] }))] }, account.key));
-                        }), _jsxs("div", { style: styles.actions, children: [!busy && accounts.length === 0 && (_jsx("button", { type: "button", style: styles.button, onClick: () => { void login(id); }, children: t('login') })), !busy && accounts.length > 0 && id === 'claude' && (_jsxs(_Fragment, { children: [_jsx("button", { type: "button", style: styles.button, onClick: () => { void login(id, 'oauth'); }, children: t('addAccountOAuth') }), _jsx("button", { type: "button", style: styles.button, onClick: () => { void login(id, 'keychain'); }, children: t('addAccountKeychain') })] })), !busy && accounts.length > 0 && id !== 'claude' && (_jsx("button", { type: "button", style: styles.button, onClick: () => { void login(id); }, children: t('addAccount') })), busy && (_jsx("button", { type: "button", style: styles.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", style: styles.button, onClick: () => { copyDeviceCode(id, deviceCode.userCode); }, children: copiedCode === id ? t('deviceCodeCopied') : t('deviceCodeCopy') }), _jsx("button", { type: "button", style: styles.button, onClick: () => { window.open(deviceCode.verificationUrl, '_blank', 'noopener'); }, children: t('deviceCodeOpenPage') })] })] })), busy && deviceCode === undefined && (_jsxs("details", { style: styles.manual, children: [_jsx("summary", { children: t('manualSummary') }), _jsxs("div", { style: styles.manualRow, children: [_jsx("input", { style: styles.manualInput, value: manualDrafts[id], placeholder: t('manualPlaceholder'), onChange: event => setManualDrafts(prev => ({ ...prev, [id]: event.target.value })) }), _jsx("button", { type: "button", style: styles.button, onClick: () => { void submitManual(id); }, children: t('submit') })] })] }))] }, id));
+                        }), _jsxs("div", { style: styles.actions, children: [!busy && accounts.length === 0 && (_jsx("button", { type: "button", style: styles.button, onClick: () => { void login(id); }, children: t('login') })), !busy && accounts.length > 0 && id === 'claude' && (_jsxs(_Fragment, { children: [_jsx("button", { type: "button", style: styles.button, onClick: () => { void login(id, 'oauth'); }, children: t('addAccountOAuth') }), _jsx("button", { type: "button", style: styles.button, onClick: () => { void login(id, 'keychain'); }, children: t('addAccountKeychain') })] })), !busy && accounts.length > 0 && id !== 'claude' && (_jsx("button", { type: "button", style: styles.button, onClick: () => { void login(id); }, children: t('addAccount') })), busy && (_jsx("button", { type: "button", style: styles.button, onClick: () => { void cancel(id); }, children: t('cancel') }))] }), !busy && accounts.length > 0 && (_jsx("p", { style: styles.statusLine, children: t('addAccountHint') })), accounts.length > 0 && (() => {
+                            // Collapsed by default: providers with a large catalog (Copilot
+                            // lists dozens of models) must not push the page down. The
+                            // header carries the summary so the collapsed state still says
+                            // how many models are overridden. The section is per provider,
+                            // not per account: the override keys off the model id, which the
+                            // pool shares across a provider's accounts.
+                            const open = modelDefaultsOpen[id] === true;
+                            const catalog = modelDefaults[id];
+                            const filter = modelDefaultsFilters[id] ?? '';
+                            const view = deriveModelDefaultsView(catalog?.models, filter);
+                            const saveErrors = Object.entries(modelDefaultsSaveErrors).filter(([key]) => key.startsWith(`${id}/`));
+                            return (_jsxs("div", { style: styles.defaultEffort, children: [_jsxs("button", { type: "button", style: styles.defaultEffortToggle, "aria-expanded": open, onClick: () => { toggleModelDefaults(id); }, children: [_jsx("span", { style: styles.usageTitle, children: t('modelDefaultsTitle') }), _jsx("span", { style: styles.usagePlan, children: catalog === undefined
+                                                    ? (modelDefaultsLoading ? t('modelDefaultsLoading') : '')
+                                                    : view.total === 0
+                                                        ? t('modelDefaultsSummaryEmpty')
+                                                        : view.overridden === 0
+                                                            ? t('modelDefaultsSummaryNone', { total: view.total })
+                                                            : t('modelDefaultsSummary', { total: view.total, configured: view.overridden }) }), _jsx("span", { style: styles.defaultEffortChevron, "aria-hidden": "true", children: open ? '▲' : '▼' })] }), saveErrors.map(([key, message]) => (
+                                    // Named: the failing row may be scrolled out of the
+                                    // bounded list, and several anonymous "Save failed" lines
+                                    // cannot be told apart.
+                                    _jsx("p", { style: styles.errorLine, role: "alert", children: t('modelDefaultsSaveFailedNamed', {
+                                            model: catalog?.models.find(entry => `${id}/${entry.id}` === key)?.name
+                                                ?? key.slice(id.length + 1),
+                                            message,
+                                        }) }, key))), open && (_jsxs(_Fragment, { children: [_jsx("p", { style: styles.statusLine, children: t('modelDefaultsHint') }), modelDefaultsLoadError !== undefined && (_jsxs(_Fragment, { children: [_jsx("p", { style: styles.errorLine, children: t('modelDefaultsLoadFailed', { message: modelDefaultsLoadError }) }), _jsx("div", { style: styles.actions, children: _jsx("button", { type: "button", style: styles.button, onClick: () => {
+                                                                // Clearing the latch lets the effect pick the
+                                                                // fetch back up on the next render.
+                                                                setModelDefaultsLoadError(undefined);
+                                                            }, children: t('modelDefaultsRetry') }) })] })), modelDefaultsLoadError === undefined && catalog === undefined && (_jsx("p", { style: styles.statusLine, children: t('modelDefaultsLoading') })), view.showFilter && (_jsx("input", { style: styles.defaultEffortFilter, value: filter, placeholder: t('modelDefaultsFilterPlaceholder'), "aria-label": t('modelDefaultsFilterPlaceholder'), onChange: (event) => {
+                                                    setModelDefaultsFilters(prev => ({ ...prev, [id]: event.target.value }));
+                                                } })), view.shown.length > 0 && (_jsx("div", { style: styles.defaultEffortList, children: view.shown.map((model) => {
+                                                    const rowKey = `${id}/${model.id}`;
+                                                    const saving = modelDefaultsSaving === rowKey;
+                                                    // Ids carry the provider: a model id alone repeats
+                                                    // across cards, and duplicate ids break the label
+                                                    // association the select relies on.
+                                                    const labelId = `dsh-model-default-${id}-${model.id}`;
+                                                    return (_jsxs("div", { style: styles.defaultEffortRow, children: [_jsx("span", { id: labelId, style: styles.defaultEffortName, title: model.id, children: model.name }), saving && (_jsx("span", { style: styles.defaultEffortSaving, children: t('modelDefaultsSaving') })), _jsxs("select", { style: styles.defaultEffortSelect, "aria-labelledby": labelId, value: modelDefaultsPending[rowKey] ?? model.configured ?? '', disabled: saving, onChange: (event) => {
+                                                                    void setModelDefault(id, model.id, event.target.value === '' ? undefined : event.target.value);
+                                                                }, children: [_jsx("option", { value: "", children: t('modelDefaultsFollowProvider') }), model.efforts.map(effort => (_jsx("option", { value: effort.id, children: effort.name }, effort.id)))] })] }, model.id));
+                                                }) })), catalog !== undefined && view.shown.length === 0 && filter.trim() !== '' && (_jsx("p", { style: styles.statusLine, children: t('modelDefaultsFilterEmpty', { query: filter.trim() }) })), view.withoutEfforts > 0 && (_jsx("p", { style: styles.statusLine, children: t('modelDefaultsNoLevels', { count: view.withoutEfforts }) }))] }))] }));
+                        })(), 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", style: styles.button, onClick: () => { copyDeviceCode(id, deviceCode.userCode); }, children: copiedCode === id ? t('deviceCodeCopied') : t('deviceCodeCopy') }), _jsx("button", { type: "button", style: styles.button, onClick: () => { window.open(deviceCode.verificationUrl, '_blank', 'noopener'); }, children: t('deviceCodeOpenPage') })] })] })), busy && deviceCode === undefined && (_jsxs("details", { style: styles.manual, children: [_jsx("summary", { children: t('manualSummary') }), _jsxs("div", { style: styles.manualRow, children: [_jsx("input", { style: styles.manualInput, value: manualDrafts[id], placeholder: t('manualPlaceholder'), onChange: event => setManualDrafts(prev => ({ ...prev, [id]: event.target.value })) }), _jsx("button", { type: "button", style: styles.button, onClick: () => { void submitManual(id); }, children: t('submit') })] })] }))] }, id));
             }), proxyOpen && (_jsx("div", { style: styles.modalOverlay, onClick: () => setProxyOpen(false), children: _jsxs("div", { style: styles.modal, onClick: event => event.stopPropagation(), children: [_jsxs("div", { style: styles.modalHeader, children: [_jsx("span", { style: styles.modalTitle, children: t('proxyDialogTitle') }), _jsx("button", { type: "button", style: { ...styles.button, marginLeft: 'auto' }, onClick: () => setProxyOpen(false), children: t('proxyDialogClose') })] }), _jsxs("label", { style: styles.proxyCheck, children: [_jsx("input", { type: "checkbox", checked: proxyEnabled, onChange: event => setProxyEnabled(event.target.checked) }), _jsx("span", { children: t('proxyEnabled') })] }), _jsxs("label", { style: styles.proxyField, children: [_jsx("span", { style: styles.proxyLabel, children: t('proxyUrl') }), _jsx("input", { style: styles.proxyInput, value: proxyUrl, placeholder: t('proxyUrlPlaceholder'), onChange: event => setProxyUrl(event.target.value) }), _jsx("p", { style: styles.proxyHint, children: t('proxyUrlHint') })] }), _jsxs("label", { style: styles.proxyField, children: [_jsx("span", { style: styles.proxyLabel, children: t('proxyUsername') }), _jsx("input", { style: styles.proxyInput, value: proxyUsername, placeholder: t('proxyUsernamePlaceholder'), onChange: event => setProxyUsername(event.target.value) })] }), _jsxs("div", { style: styles.proxyField, children: [_jsx("span", { style: styles.proxyLabel, children: t('proxyPassword') }), _jsx("input", { type: "password", style: styles.proxyInput, value: proxyPassword, placeholder: t('proxyPasswordPlaceholder'), onChange: event => setProxyPassword(event.target.value) }), _jsxs("label", { style: styles.proxyCheck, children: [_jsx("input", { type: "checkbox", checked: proxyClearPassword, onChange: event => setProxyClearPassword(event.target.checked) }), _jsx("span", { children: t('proxyClearPassword') })] })] }), _jsxs("label", { style: styles.proxyField, children: [_jsx("span", { style: styles.proxyLabel, children: t('proxyBypass') }), _jsx("input", { style: styles.proxyInput, value: proxyBypass, placeholder: t('proxyBypassPlaceholder'), onChange: event => setProxyBypass(event.target.value) }), _jsx("p", { style: styles.proxyHint, children: t('proxyBypassHint') })] }), _jsx("p", { style: styles.proxyHint, children: t('proxyNote') }), proxyMessage !== undefined && (_jsx("p", { style: { ...styles.proxyMessage, color: messageColor(proxyMessage.tone) }, children: proxyMessage.text })), proxyTestResult !== undefined && (_jsx("p", { style: {
                                 ...styles.proxyMessage,
                                 color: proxyTestResult.ok

package/lib/client/VideoGenerateToolview.d.ts

@@ -1,5 +1,5 @@
 import type { ConnectionHandle } from '@deepseek-ai/dsh-api-remotes/client';
-import type { ToolCallBlock } from '@deepseek-ai/dsh-client-runtime/client';
+import type { ToolCallBlock } from '@deepseek-ai/dsh-client-ui-conversation/client';
 import type { SubscriptionsKey } from './locales.js';
 /** Mirror of ui-tool's ToolCallOwnerProps (see ImageGenerateToolview). */
 interface ToolCallOwnerProps {

package/lib/client/index.d.ts

@@ -1,12 +1,4 @@
-/**
- * Subscription OAuth login page, browser half. Registers the Subscriptions
- * settings section; every login state fact arrives through the node half's
- * `/subscriptions-auth` RPC channel — this plugin holds no credential state of its
- * own. Section copy rides the client locale service: one 'settings.subscriptions'
- * namespace with zh/en dictionaries, rebound per read so the nav label and
- * page text follow the active locale.
- */
-import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client';
+import type { Context as ClientContext } from '@deepseek-ai/cordis';
 import type { SubscriptionsKey } from './locales.js';
 export type { SubscriptionsSectionInjected, SubscriptionsSectionProps } from './SubscriptionsSection.js';
 export type { ImageGenerateToolviewInjected, ImageGenerateToolviewProps } from './ImageGenerateToolview.js';

package/lib/client/index.js

@@ -33,8 +33,8 @@ export function apply(ctx) {
         document.head.appendChild(style);
         return () => style.remove();
     }, 'dsh-plugin-subscriptions: settings panel breathing room');
-    // The client-runtime Context merge types `connection` as the host handle;
-    // in the browser shell the same key holds the full client ConnectionHandle.
+    // The shell's Context merge types `connection` as the host handle; in the
+    // browser shell the same key holds the full client ConnectionHandle.
     const connection = ctx.get('connection');
     const t = ctx.locale.bind(NS);
     const injected = () => ({ rpc: connection.rpc, t });
@@ -68,13 +68,16 @@ export function apply(ctx) {
     // The composer Speed toggle (codex fast tier) sits in the right tool row,
     // just left of the model selector; the framework synthesizes its `t` seat
     // from `locale: NS`, and the inject face binds each session's RPC calls.
+    // The current-model read rides ui-model-selection's `modelDirectories`
+    // service, resolved lazily so registration order never matters.
+    const models = () => ctx.get('modelDirectories');
     ctx.slots.inject('conversation.input.right', () => ctx.slots.register({
         name: 'conversation.input.right',
         id: 'codex-speed',
         order: 0,
         locale: NS,
         inject: (sessionId) => ({
-            loadSpeed: createSpeedLoader(connection, sessionId),
+            loadSpeed: createSpeedLoader(connection, models, sessionId),
             setSpeed: createSpeedSetter(connection, sessionId),
         }),
     }, SpeedSelect));
@@ -92,7 +95,7 @@ export function apply(ctx) {
             ui: {
                 kind: 'popupSelect',
                 options: async (session) => {
-                    const state = await createSpeedLoader(connection, session.sessionId)();
+                    const state = await createSpeedLoader(connection, models, session.sessionId)();
                     if (!state.visible)
                         throw new Error(t('commandFastUnavailable'));
                     return [

package/lib/client/locales.d.ts

@@ -37,6 +37,20 @@ export declare const en: {
     usageWindow: string;
     usageResets: string;
     usagePlan: string;
+    modelDefaultsTitle: string;
+    modelDefaultsHint: string;
+    modelDefaultsFollowProvider: string;
+    modelDefaultsNoLevels: string;
+    modelDefaultsLoading: string;
+    modelDefaultsLoadFailed: string;
+    modelDefaultsRetry: string;
+    modelDefaultsSaving: string;
+    modelDefaultsSaveFailedNamed: string;
+    modelDefaultsSummary: string;
+    modelDefaultsSummaryNone: string;
+    modelDefaultsSummaryEmpty: string;
+    modelDefaultsFilterPlaceholder: string;
+    modelDefaultsFilterEmpty: string;
     generating: string;
     image: string;
     viewImage: string;
@@ -126,6 +140,20 @@ export declare const zh: {
     usageWindow: string;
     usageResets: string;
     usagePlan: string;
+    modelDefaultsTitle: string;
+    modelDefaultsHint: string;
+    modelDefaultsFollowProvider: string;
+    modelDefaultsNoLevels: string;
+    modelDefaultsLoading: string;
+    modelDefaultsLoadFailed: string;
+    modelDefaultsRetry: string;
+    modelDefaultsSaving: string;
+    modelDefaultsSaveFailedNamed: string;
+    modelDefaultsSummary: string;
+    modelDefaultsSummaryNone: string;
+    modelDefaultsSummaryEmpty: string;
+    modelDefaultsFilterPlaceholder: string;
+    modelDefaultsFilterEmpty: string;
     generating: string;
     image: string;
     viewImage: string;

package/lib/client/locales.js

@@ -37,6 +37,20 @@ export const en = {
     usageWindow: 'Window',
     usageResets: 'resets {date}',
     usagePlan: 'Plan: {plan}',
+    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',
+    modelDefaultsNoLevels: '{count} model(s) advertise no reasoning levels and always follow the provider.',
+    modelDefaultsLoading: 'Loading models…',
+    modelDefaultsLoadFailed: 'Failed to load models: {message}',
+    modelDefaultsRetry: 'Retry',
+    modelDefaultsSaving: 'Saving…',
+    modelDefaultsSaveFailedNamed: 'Save failed for {model}: {message}',
+    modelDefaultsSummary: '{total} model(s) · {configured} overridden',
+    modelDefaultsSummaryNone: '{total} model(s) · following the provider',
+    modelDefaultsSummaryEmpty: 'No model advertises reasoning levels',
+    modelDefaultsFilterPlaceholder: 'Filter models',
+    modelDefaultsFilterEmpty: 'No model matches “{query}”.',
     generating: 'Generating image…',
     image: 'image',
     viewImage: 'View image',
@@ -126,6 +140,20 @@ export const zh = {
     usageWindow: '窗口',
     usageResets: '{date} 重置',
     usagePlan: '计划：{plan}',
+    modelDefaultsTitle: '默认推理档',
+    modelDefaultsHint: '切换到该模型时，模型选择器会预选此档位；没有推理档的模型始终跟随服务商默认。',
+    modelDefaultsFollowProvider: '跟随服务商',
+    modelDefaultsNoLevels: '{count} 个模型未声明推理档，始终跟随服务商默认。',
+    modelDefaultsLoading: '加载模型中…',
+    modelDefaultsLoadFailed: '模型加载失败：{message}',
+    modelDefaultsRetry: '重试',
+    modelDefaultsSaving: '保存中…',
+    modelDefaultsSaveFailedNamed: '{model} 保存失败：{message}',
+    modelDefaultsSummary: '{total} 个模型 · {configured} 个已覆盖',
+    modelDefaultsSummaryNone: '{total} 个模型 · 全部跟随服务商',
+    modelDefaultsSummaryEmpty: '没有模型声明推理档',
+    modelDefaultsFilterPlaceholder: '筛选模型',
+    modelDefaultsFilterEmpty: '没有匹配「{query}」的模型。',
     generating: '正在生成图片…',
     image: '图片',
     viewImage: '查看图片',