dsh-subscriptions 0.1.4 → 0.2.0

package/lib/client/OllamaSettingsManager.js

@@ -0,0 +1,246 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useEffect, useId, useRef, useState } from 'react';
+import { callSubscriptionsAuth } from './subscriptions-rpc.js';
+import { contextLabel, effortOptions, moveModel, parseContextInput, renameModel, setModelContext, setModelEffort, tickModel, tickModels, untickModel, untickModels, } from './ollama-draft.js';
+import { subscriptionCardStyles as styles } from './subscription-card-styles.js';
+import { providerSettingsCss } from './provider-settings-styles.js';
+const border = '0.5px solid var(--dsw-alias-border-l2)';
+const stack = { display: 'grid', gap: 12, minWidth: 0 };
+const actions = { display: 'flex', flexWrap: 'wrap', gap: 8, alignItems: 'center' };
+function message(error) {
+    return error instanceof Error ? error.message : String(error);
+}
+/** `vision · thinking · context 262K`, dropping whatever the model does not advertise. */
+function capabilities(t, model) {
+    const context = contextLabel(model.contextWindow);
+    return [
+        model.vision === true ? t('ollamaCapVision') : false,
+        model.thinking === true ? t('ollamaCapThinking') : false,
+        context === undefined ? false : t('ollamaContext', { tokens: context }),
+    ].filter(Boolean).join(' · ');
+}
+/**
+ * Ollama Cloud settings dialog. It owns one draft (model list, web toggle,
+ * base URL and credential reference) that Save writes in a single
+ * `ollamaSetSettings` call, so a failure keeps every edit. Fetching the cloud
+ * catalog is a read-only side trip, and a key typed for the fetch never
+ * leaves this component. The model list follows the shared model editor: a
+ * filter, select all/none over the filtered rows, and one checkbox per
+ * model, where ticking edits the draft and enables Save. Ollama adds what the
+ * shared editor lacks: a display name, ordering, and a local context window.
+ * Unticking keeps the row's full settings in a dialog-local stash, so ticking
+ * it again restores them even when the cloud listing no longer returns it.
+ */
+export function OllamaSettingsManager({ rpc, t, onClose, onSaved }) {
+    const dialog = useRef(null);
+    const title = useId();
+    const description = useId();
+    const [view, setView] = useState();
+    const [draft, setDraft] = useState({});
+    const [dirty, setDirty] = useState(false);
+    const [loading, setLoading] = useState(true);
+    const [saving, setSaving] = useState(false);
+    const [error, setError] = useState('');
+    const [saveError, setSaveError] = useState('');
+    const [attempt, setAttempt] = useState(0);
+    const [apiKey, setApiKey] = useState('');
+    const [candidates, setCandidates] = useState();
+    const [fetching, setFetching] = useState(false);
+    const [fetchError, setFetchError] = useState('');
+    const [query, setQuery] = useState('');
+    const [expanded, setExpanded] = useState(new Set());
+    const [stash, setStash] = useState(new Map());
+    const [contextText, setContextText] = useState({});
+    const alive = useRef(true);
+    const saveLock = useRef(false);
+    const fetchLock = useRef(false);
+    useEffect(() => {
+        alive.current = true;
+        const element = dialog.current;
+        const previous = document.activeElement;
+        element.showModal();
+        return () => {
+            alive.current = false;
+            element.close();
+            if (previous instanceof HTMLElement && previous.isConnected)
+                previous.focus();
+        };
+    }, []);
+    useEffect(() => {
+        let current = true;
+        setLoading(true);
+        setError('');
+        void callSubscriptionsAuth(rpc, 'ollamaSettings', {}).then(data => {
+            if (!current)
+                return;
+            setView(data);
+            // An unset store value inherits the deployed config: the checkbox
+            // shows the effective state, and ticking it writes the override.
+            setDraft({ ...data.settings });
+            setStash(new Map());
+            setContextText({});
+            setDirty(false);
+        }).catch(failure => {
+            if (current)
+                setError(t('ollamaModelsLoadFailed', { message: message(failure) }));
+        }).finally(() => { if (current)
+            setLoading(false); });
+        return () => { current = false; };
+    }, [rpc, attempt]);
+    function edit(next) {
+        setDraft(next);
+        setDirty(true);
+    }
+    /** Fetch the cloud catalog; a failure keeps the previous list and the draft. */
+    async function fetchCandidates() {
+        if (fetchLock.current)
+            return;
+        fetchLock.current = true;
+        setFetching(true);
+        setFetchError('');
+        try {
+            const value = await callSubscriptionsAuth(rpc, 'ollamaModels', { ...(apiKey ? { apiKey } : {}), ...(draft.baseURL ? { baseURL: draft.baseURL } : {}) });
+            if (!alive.current)
+                return;
+            setCandidates(value.models);
+        }
+        catch (failure) {
+            if (alive.current)
+                setFetchError(t('ollamaFetchFailed', { message: message(failure) }));
+        }
+        finally {
+            fetchLock.current = false;
+            if (alive.current)
+                setFetching(false);
+        }
+    }
+    /** Save the whole draft; a failure keeps the dialog open with every edit. */
+    async function save() {
+        if (saveLock.current)
+            return;
+        saveLock.current = true;
+        setSaving(true);
+        setSaveError('');
+        try {
+            await callSubscriptionsAuth(rpc, 'ollamaSetSettings', { settings: draft });
+            if (alive.current) {
+                onSaved();
+                onClose();
+            }
+        }
+        catch (failure) {
+            if (alive.current)
+                setSaveError(t('ollamaModelsSaveFailed', { message: message(failure) }));
+        }
+        finally {
+            saveLock.current = false;
+            if (alive.current)
+                setSaving(false);
+        }
+    }
+    /** Drop every stored override, then reload the draft from the deployment values. */
+    async function resetDefaults() {
+        if (saveLock.current)
+            return;
+        if (!window.confirm(t('ollamaResetConfirm')))
+            return;
+        saveLock.current = true;
+        setSaving(true);
+        setSaveError('');
+        try {
+            await callSubscriptionsAuth(rpc, 'ollamaSetSettings', { settings: {} });
+            if (alive.current) {
+                setAttempt(value => value + 1);
+                onSaved();
+            }
+        }
+        catch (failure) {
+            if (alive.current)
+                setSaveError(t('ollamaModelsSaveFailed', { message: message(failure) }));
+        }
+        finally {
+            saveLock.current = false;
+            if (alive.current)
+                setSaving(false);
+        }
+    }
+    function editOverride(field, value) {
+        const next = { ...draft };
+        if (value.trim())
+            next[field] = value;
+        else
+            delete next[field];
+        edit(next);
+    }
+    /**
+     * One list for both sources, like the shared editor: the ticked models in
+     * draft order first (so Move up/down is visible), then the unticked ones
+     * (stashed in this dialog, or fetched and not yet adopted). A kept model
+     * the fetch did not return stays listed, ticked or not.
+     */
+    const fetchedById = new Map((candidates ?? []).map(candidate => [candidate.id, candidate]));
+    const present = new Set((draft.models ?? []).map(model => model.id));
+    const asRow = (model, ticked) => {
+        const fetched = fetchedById.get(model.id);
+        // The latest fetch outranks the stored snapshot, matching the runtime:
+        // discovery is the ceiling and the snapshot only stands in without it.
+        const contextWindow = fetched?.contextWindow ?? model.contextWindow;
+        return {
+            id: model.id, name: model.name ?? fetched?.name ?? model.id, ticked,
+            vision: model.vision === true || fetched?.vision === true,
+            thinking: model.thinking === true || fetched?.thinking === true,
+            ...(contextWindow === undefined ? {} : { contextWindow }),
+            efforts: model.efforts ?? fetched?.efforts ?? [],
+        };
+    };
+    const rows = [
+        ...(draft.models ?? []).map(model => asRow(model, true)),
+        ...[...stash.values()].filter(model => !present.has(model.id)).map(model => asRow(model, false)),
+        ...(candidates ?? [])
+            .filter(candidate => !present.has(candidate.id) && !stash.has(candidate.id))
+            .map(candidate => asRow({ id: candidate.id }, false)),
+    ];
+    const shown = rows.filter(row => `${row.name} ${row.id}`.toLowerCase().includes(query.trim().toLowerCase()));
+    /** Rename and default-effort edits ride the tested draft helpers. */
+    function rename(id, name) {
+        edit({ ...draft, models: renameModel(draft.models ?? [], id, name) });
+    }
+    function setEffort(id, effort) {
+        edit({ ...draft, models: setModelEffort(draft.models ?? [], id, effort) });
+    }
+    /** Keep the typed text; only a valid number (or blank) reaches the draft. */
+    function setContext(id, text) {
+        setContextText(current => ({ ...current, [id]: text }));
+        const tokens = parseContextInput(text);
+        if (tokens !== null)
+            edit({ ...draft, models: setModelContext(draft.models ?? [], id, tokens) });
+    }
+    function applyTicks(next) {
+        setStash(next.stash);
+        edit({ ...draft, models: next.models });
+    }
+    const invalidContext = Object.entries(contextText)
+        .filter(([id, text]) => present.has(id) && parseContextInput(text) === null).map(([id]) => id);
+    return _jsxs("dialog", { className: "dsh-subscription-manager", ref: dialog, "aria-labelledby": title, "aria-describedby": description, onCancel: event => { if (saveLock.current)
+            event.preventDefault(); }, onClose: onClose, style: { width: 620, maxWidth: 'calc(100vw - 32px)', maxHeight: 'calc(100dvh - 32px)', overflow: 'auto' }, children: [_jsx("style", { children: providerSettingsCss }), _jsxs("div", { style: { ...stack, padding: 20 }, children: [_jsxs("header", { style: { ...actions, justifyContent: 'space-between' }, children: [_jsx("h2", { id: title, style: { margin: 0 }, children: t('ollamaManageTitle') }), _jsx("button", { type: "button", autoFocus: true, disabled: saving, onClick: onClose, children: t('imageClose') })] }), _jsx("p", { id: description, className: "dsh-subscription-hint", children: t('ollamaManageHint') }), view?.configOverridesModels === true && _jsx("p", { className: "dsh-subscription-hint", children: t('ollamaCatalogOverride') }), error && _jsx("p", { role: "alert", children: error }), loading && _jsx("p", { role: "status", className: "dsh-subscription-hint", children: t('modelDefaultsLoading') }), !loading && !view && _jsx("button", { type: "button", onClick: () => setAttempt(value => value + 1), children: t('modelDefaultsRetry') }), view && _jsxs("fieldset", { disabled: saving, style: { ...stack, border: 0, margin: 0, padding: 0, minWidth: 0 }, children: [_jsxs("div", { style: { borderTop: border, paddingTop: 12, display: 'grid', gap: 12 }, children: [_jsx("h3", { style: { margin: 0 }, children: t('modelsEdit') }), _jsxs("div", { style: actions, children: [_jsx("input", { type: "password", autoComplete: "off", style: { flex: '1 1 180px' }, "aria-label": t('ollamaKeyPlaceholder'), placeholder: t('ollamaKeyPlaceholder'), value: apiKey, onChange: event => setApiKey(event.target.value) }), _jsx("button", { type: "button", className: "dsh-subscription-quiet", disabled: fetching, onClick: () => { void fetchCandidates(); }, children: fetching ? t('ollamaFetching') : t('ollamaFetch') }), candidates !== undefined && _jsx("span", { className: "dsh-subscription-hint", children: t('ollamaCandidatesCount', { count: candidates.length }) })] }), _jsx("p", { className: "dsh-subscription-hint", children: t('ollamaKeyHint') }), fetchError && _jsx("p", { role: "alert", children: fetchError }), candidates?.length === 0 && _jsx("p", { className: "dsh-subscription-hint", children: t('ollamaCandidatesEmpty') }), _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: () => applyTicks(tickModels(draft.models ?? [], stash, candidates ?? [], shown.map(row => row.id))), children: t('modelsSelectAll') }), _jsx("button", { type: "button", onClick: () => applyTicks(untickModels(draft.models ?? [], stash, shown.map(row => row.id))), children: t('modelsSelectNone') })] }), _jsxs("div", { style: { maxHeight: 360, overflowY: 'auto', display: 'grid', gap: 8 }, children: [shown.map(row => {
+                                                const stored = (draft.models ?? []).find(entry => entry.id === row.id);
+                                                const index = (draft.models ?? []).findIndex(entry => entry.id === row.id);
+                                                const open = expanded.has(row.id);
+                                                const details = `${row.id}-details`;
+                                                const efforts = stored === undefined ? [] : effortOptions(stored, fetchedById.get(row.id)?.efforts, view.models.find(entry => entry.id === row.id)?.efforts);
+                                                const contextProblem = invalidContext.includes(row.id);
+                                                return _jsxs("div", { style: { borderBottom: border, padding: '8px 2px', display: 'grid', gap: 8 }, children: [_jsxs("label", { style: { overflowWrap: 'anywhere' }, children: [_jsx("input", { type: "checkbox", checked: row.ticked, onChange: event => {
+                                                                        applyTicks(event.target.checked
+                                                                            ? tickModel(draft.models ?? [], stash, candidates ?? [], row.id)
+                                                                            : untickModel(draft.models ?? [], stash, row.id));
+                                                                    } }), " ", row.name, " ", _jsx("span", { style: styles.status, children: capabilities(t, row) })] }), stored !== undefined && _jsxs("div", { style: actions, children: [row.thinking && efforts.length > 0 && _jsxs("label", { style: actions, children: [t('modelDefaultsTitle'), _jsxs("select", { "aria-label": `${row.name} ${t('modelDefaultsTitle')}`, value: stored.defaultEffort ?? '', onChange: event => setEffort(row.id, event.target.value), children: [_jsx("option", { value: "", children: t('modelDefaultsFollowProvider') }), efforts.map(effort => _jsx("option", { value: effort.id, disabled: effort.unavailable === true, children: effort.unavailable === true ? `${effort.name} (${t('modelsUnavailable')})` : effort.name }, effort.id))] })] }), row.thinking && efforts.length === 0 && _jsx("small", { children: t('ollamaEffortsUnknown') }), _jsxs("label", { style: actions, children: [t('modelsContext'), _jsx("input", { style: { width: 140 }, inputMode: "numeric", "aria-invalid": contextProblem, value: contextText[row.id] ?? (stored.contextOverride === undefined ? '' : String(stored.contextOverride)), "aria-label": `${row.name} ${t('modelsContext')}`, placeholder: row.contextWindow === undefined ? '' : String(row.contextWindow), onChange: event => setContext(row.id, event.target.value) })] }), row.contextWindow !== undefined && _jsx("small", { children: t('modelsContextBounds', { default: row.contextWindow, max: row.contextWindow }) }), _jsxs("button", { type: "button", className: "dsh-subscription-quiet", "aria-expanded": open, "aria-controls": details, "aria-label": `${row.name} ${t('ollamaRowDetails')}`, onClick: () => {
+                                                                        const next = new Set(expanded);
+                                                                        if (open)
+                                                                            next.delete(row.id);
+                                                                        else
+                                                                            next.add(row.id);
+                                                                        setExpanded(next);
+                                                                    }, children: [t('ollamaRowDetails'), " ", open ? '\u25BE' : '\u25B8'] })] }), contextProblem && _jsx("p", { role: "alert", children: t('modelsContextInvalid', { model: row.name }) }), stored !== undefined && open && _jsxs("div", { id: details, style: actions, children: [_jsxs("label", { style: actions, children: [t('ollamaDisplayName'), _jsx("input", { value: stored.name ?? '', placeholder: row.id, "aria-label": `${row.name} ${t('ollamaDisplayName')}`, onChange: event => rename(row.id, event.target.value), onBlur: event => rename(row.id, event.target.value.trim()) })] }), _jsx("button", { type: "button", disabled: index === 0, "aria-label": `${row.name} ${t('ollamaMoveUp')}`, onClick: () => edit({ ...draft, models: moveModel(draft.models ?? [], row.id, -1) }), children: t('ollamaMoveUp') }), _jsx("button", { type: "button", disabled: index === (draft.models ?? []).length - 1, "aria-label": `${row.name} ${t('ollamaMoveDown')}`, onClick: () => edit({ ...draft, models: moveModel(draft.models ?? [], row.id, 1) }), children: t('ollamaMoveDown') })] })] }, row.id);
+                                            }), shown.length === 0 && _jsx("span", { className: "dsh-subscription-hint", children: query.trim() ? t('modelDefaultsFilterEmpty', { query }) : t('ollamaModelsEmpty') })] }), _jsx("small", { children: t('modelsContextHint') })] }), _jsxs("label", { style: { ...stack, gap: 6 }, children: [_jsx("span", { className: "dsh-subscription-label", children: t('ollamaBaseURL') }), _jsx("input", { value: draft.baseURL ?? '', placeholder: view.effective.baseURL, onChange: event => editOverride('baseURL', event.target.value) })] }), _jsxs("label", { style: { ...stack, gap: 6 }, children: [_jsx("span", { className: "dsh-subscription-label", children: t('ollamaApiKeyRef') }), _jsx("input", { value: draft.apiKeyRef ?? '', placeholder: view.effective.apiKeyRef, onChange: event => editOverride('apiKeyRef', event.target.value) })] }), _jsx("p", { className: "dsh-subscription-hint", children: t('ollamaConnectionHint') }), _jsxs("label", { children: [_jsx("input", { type: "checkbox", checked: (draft.web ?? view.effective.web) === true, onChange: event => edit({ ...draft, web: event.target.checked }) }), " ", t('modelsWebSearch')] }), _jsx("p", { className: "dsh-subscription-hint", children: t('ollamaWebHint') })] }), _jsxs("footer", { style: { ...stack, gap: 8, borderTop: border, padding: '14px 0 8px',
+                            position: 'sticky', bottom: 0, background: 'var(--dsw-alias-bg-layer-2, var(--dsw-alias-bg-layer-1))' }, children: [saveError && _jsx("p", { role: "alert", children: saveError }), _jsxs("div", { style: { ...actions, justifyContent: 'flex-end' }, children: [_jsx("button", { type: "button", style: { marginRight: 'auto' }, disabled: loading || saving, onClick: () => { void resetDefaults(); }, children: t('ollamaResetDefaults') }), _jsx("button", { type: "button", disabled: saving, onClick: onClose, children: t('cancel') }), _jsx("button", { type: "button", className: "dsh-subscription-primary", disabled: loading || saving || !dirty || invalidContext.length > 0, onClick: () => { void save(); }, children: saving ? t('modelDefaultsSaving') : t('modelsSave') })] })] })] })] });
+}

package/lib/client/ProviderModelEditor.js

@@ -1,6 +1,8 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { forwardRef, useEffect, useImperativeHandle, useRef, useState } from 'react';
 import { callSubscriptionsAuth } from './subscriptions-rpc.js';
+/** 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)';
 const actions = { display: 'flex', flexWrap: 'wrap', gap: 8, alignItems: 'center' };
 /**
@@ -64,7 +66,7 @@ export const ProviderModelEditor = forwardRef(function ProviderModelEditor({ pro
                 windows[model] = value;
             }
             setError('');
-            const { accounts: _accounts, ...settings } = { ...draft, ...(provider === 'codex' ? { contextWindows: windows } : {}) };
+            const { accounts: _accounts, ...settings } = { ...draft, ...(supportsContext(provider) ? { contextWindows: windows } : {}) };
             return {
                 settings,
                 efforts: catalog.models.flatMap(model => {
@@ -97,7 +99,7 @@ export const ProviderModelEditor = forwardRef(function ProviderModelEditor({ pro
                                                                     setEfforts({ ...efforts, [model.id]: event.target.value });
                                                                     setDirty(true);
                                                                 }, children: [_jsx("option", { value: "", children: t('modelDefaultsFollowProvider') }), model.configured && !model.efforts?.some(effort => effort.id === model.configured) &&
-                                                                        _jsxs("option", { value: model.configured, disabled: true, children: [model.configured, " (", t('modelsUnavailable'), ")"] }), model.efforts?.map(effort => _jsx("option", { value: effort.id, children: effort.name }, effort.id))] })] }), provider === 'codex' && model.maxContextWindow !== undefined && _jsxs("div", { style: actions, children: [_jsxs("label", { style: actions, children: [t('modelsContext'), _jsx("input", { style: { width: 140 }, inputMode: "numeric", value: contexts[model.id] ?? '', "aria-label": `${model.name} ${t('modelsContext')}`, placeholder: String(model.defaultContextWindow), onChange: event => { setContexts({ ...contexts, [model.id]: event.target.value }); setDirty(true); } })] }), _jsx("small", { children: t('modelsContextBounds', { default: model.defaultContextWindow, max: model.maxContextWindow }) })] })] })] }, model.id)), models.length === 0 && _jsx("span", { children: t('modelDefaultsFilterEmpty', { query }) })] }), provider === 'codex' && _jsx("small", { children: t('modelsContextHint') }), catalog.tools.length > 0 && _jsxs("div", { style: { display: 'grid', gap: 8 }, children: [_jsx("strong", { children: t('modelsTools') }), _jsx("small", { children: t('modelsToolsHint') }), catalog.tools.map(tool => _jsxs("label", { children: [_jsx("input", { type: "checkbox", checked: draft.tools?.[tool] !== false, onChange: event => edit({
+                                                                        _jsxs("option", { value: model.configured, disabled: true, children: [model.configured, " (", t('modelsUnavailable'), ")"] }), model.efforts?.map(effort => _jsx("option", { value: effort.id, children: effort.name }, effort.id))] })] }), 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 }) })] })] })] }, 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, [tool]: event.target.checked },
                                                 }) }), " ", t(tool === 'image_generate' ? 'modelsImage' : tool === 'video_generate' ? 'modelsVideo' : tool === 'web_search' ? 'modelsWebSearch' : 'modelsSearch')] }, tool))] })] })] })] });
 });

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';
+export type BadgeProvider = SubscriptionProvider | 'cursor-subscription' | 'opencode-go' | 'kimi-coding' | 'minimax' | 'minimax-cn' | 'ollama-cloud';
 export interface UsageRosterEntry {
     provider: BadgeProvider;
     account: AccountStatus;

package/lib/client/SubscriptionUsageBadge.js

@@ -64,6 +64,7 @@ const PROVIDER_NAMES = {
     'kimi-coding': 'Kimi Code',
     'minimax': 'MiniMax',
     'minimax-cn': 'MiniMax CN',
+    'ollama-cloud': 'Ollama Cloud',
 };
 /** Key of one account's cached windows: `provider:accountKey`. */
 function usageKeyOf(provider, account) {
@@ -127,7 +128,7 @@ export async function loadBadgeRoster(rpc) {
     }
     if (external.status === 'fulfilled') {
         for (const [source, provider] of [
-            ['opencode-go', 'opencode-go'], ['kimi-code', 'kimi-coding'], ['minimax', 'minimax'], ['minimax-cn', 'minimax-cn'],
+            ['opencode-go', 'opencode-go'], ['kimi-code', 'kimi-coding'], ['minimax', 'minimax'], ['minimax-cn', 'minimax-cn'], ['ollama-cloud', 'ollama-cloud'],
         ]) {
             refreshed.add(provider);
             if (external.value[source]?.configured)
@@ -141,7 +142,7 @@ export async function loadBadgeRoster(rpc) {
 export async function usageOf(rpc, { provider, account }) {
     if (provider === 'cursor-subscription')
         return callSubscriptionsAuth(rpc, 'cursorUsage', {});
-    if (provider === 'opencode-go' || provider === 'kimi-coding' || provider === 'minimax' || provider === 'minimax-cn') {
+    if (provider === 'opencode-go' || provider === 'kimi-coding' || provider === 'minimax' || provider === 'minimax-cn' || provider === 'ollama-cloud') {
         return callSubscriptionsAuth(rpc, 'externalUsage', { source: provider === 'kimi-coding' ? 'kimi-code' : provider });
     }
     return callSubscriptionsAuth(rpc, 'usage', { provider, account: account.key });

package/lib/client/SubscriptionsSection.d.ts

@@ -33,6 +33,8 @@ export interface UsageWindow {
     startsAt?: number;
     windowDurationMs?: number;
     fixedWindow?: boolean;
+    /** Display-only assumed start; the marker rides it, never pace. */
+    displayStartsAt?: number;
 }
 /** `usage` endpoint value: the node half owns this shape. */
 export interface ProviderUsage {
@@ -64,23 +66,6 @@ export interface ResetCreditView {
     /** Epoch milliseconds until which the grant is visible but not usable. */
     cooldownUntil?: number;
 }
-/** One model's default-effort picker state as answered by `modelDefaults`. */
-export interface ModelDefaultView {
-    id: string;
-    name: string;
-    /** Advertised effort levels, in catalog order (empty when the model has no reasoning). */
-    efforts: {
-        id: string;
-        name: string;
-    }[];
-    /** The user-configured default effort, when set. */
-    configured?: string;
-}
-/** `modelDefaults` endpoint value: one provider's picker state. */
-export interface ModelDefaultsCatalog {
-    provider: SubscriptionProvider;
-    models: ModelDefaultView[];
-}
 /** Injected dependencies of {@link SubscriptionsSection} (slot `inject`). */
 export interface SubscriptionsSectionInjected {
     /** Generic logical-RPC caller over the Connection transport. */
@@ -102,63 +87,6 @@ export type SubscriptionsSectionProps = Partial<SubscriptionsSectionInjected>;
 export declare function clientVersionText(t: SubscriptionsSectionInjected['t'], clientVersion: ProviderStatus['clientVersion']): string;
 /** Meter fill color lives with the pace logic: fresh 90%+ is red, pace presets add a yellow lead threshold. */
 export { usageBarColor } from './usage-pace.js';
-/** What one provider's collapsible default-effort section renders. */
-export interface ModelDefaultsView {
-    /** Models with reasoning levels, after the name filter — one row each. */
-    shown: ModelDefaultView[];
-    /** Models with reasoning levels before filtering (the header total). */
-    total: number;
-    /** How many of those carry a user override (the header count). */
-    overridden: number;
-    /** Models without reasoning levels: one count line, never a row each. */
-    withoutEfforts: number;
-    /** Whether the list is long enough to deserve a filter box. */
-    showFilter: boolean;
-}
-/**
- * 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 declare function deriveModelDefaultsView(models: readonly ModelDefaultView[] | undefined, filter: string): ModelDefaultsView;
-/** Inputs of the default-effort fetch decision (see {@link shouldFetchModelDefaults}). */
-export interface ModelDefaultsFetchInput {
-    /** Providers that currently have at least one account. */
-    loggedIn: readonly SubscriptionProvider[];
-    /** Providers whose disclosure is open. */
-    open: readonly SubscriptionProvider[];
-    /** The account signature the last completed fetch was answered for. */
-    loadedFor: string | undefined;
-    /** The account signature of the current status snapshot. */
-    signature: string;
-    /** Whether the last attempt failed (a failure latches until Retry). */
-    failed: boolean;
-}
-/**
- * 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 declare function shouldFetchModelDefaults(input: ModelDefaultsFetchInput): boolean;
-/**
- * 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 declare function modelDefaultsSignature(statuses: Partial<Record<SubscriptionProvider, ProviderStatus>>): string;
 /**
  * The Subscriptions settings page component.
  * @param props - the slot inject face ({@link SubscriptionsSectionInjected}).

package/lib/client/SubscriptionsSection.js

@@ -1,8 +1,8 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 /**
  * Subscriptions settings section: one card per subscription provider with an
- * OAuth login/logout flow driven by the node half's `/subscriptions-auth` RPC
- * channel. Login state lives server-side; the page polls `status` only while
+ * OAuth login/logout flow driven by the node half's
+ * `/api/subscriptions-auth.<endpoint>` RPC routes. Login state lives server-side; the page polls `status` only while
  * a login attempt is busy, so an idle page never polls. All state is local
  * React state — the page has no store.
  *
@@ -19,6 +19,7 @@ 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';
 import { displayUsedPercent } from './usage-pace.js';
@@ -29,11 +30,6 @@ import { callSubscriptionsAuth, SubscriptionsAuthError } from './subscriptions-r
 export { callSubscriptionsAuth } from './subscriptions-rpc.js';
 /** 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;
 const CLIENT_VERSION_SOURCES = {
     npm: 'clientVersionNpm',
     local: 'clientVersionLocal',
@@ -192,65 +188,6 @@ function usageWindowLabel(t, window) {
 }
 /** Meter fill color lives with the pace logic: fresh 90%+ is red, pace presets add a yellow lead threshold. */
 export { usageBarColor } from './usage-pace.js';
-/**
- * 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}).
@@ -626,5 +563,5 @@ export function SubscriptionsSection(props) {
                                                             void prepareReset(account.key); },
                                                     } } : {}, ...resetAccount === account.key && resetMessage !== '' ? { statusMessage: resetMessage } : {} }))] }))] }, account.key));
                         }), _jsxs("div", { style: styles.actions, children: [!busy && accounts.length === 0 && (_jsx("button", { type: "button", onClick: () => { void login(id); }, children: t('login') })), !busy && accounts.length > 0 && id === 'claude' && (_jsxs(_Fragment, { children: [_jsx("button", { type: "button", onClick: () => { void login(id, 'oauth'); }, children: t('addAccountOAuth') }), _jsx("button", { type: "button", onClick: () => { 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: () => { 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); }, children: copiedCode === id ? t('deviceCodeCopied') : t('deviceCodeCopy') }), _jsx("button", { type: "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", onClick: () => { void submitManual(id); }, children: t('submit') })] })] }))] }, id));
-            }), _jsx(CursorCard, { 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: { ...styles.modal, display: resetConfirmation ? 'flex' : 'none', margin: 'auto', color: 'var(--dsw-alias-label-primary)' }, children: resetConfirmation && _jsxs(_Fragment, { children: [_jsx("h3", { id: "subscriptions-reset-title", style: { ...styles.modalTitle, margin: 0 }, children: t('resetUseConfirmTitle') }), _jsx("p", { style: { ...styles.statusLine, overflowWrap: 'anywhere' }, children: statuses.codex?.accounts.find(a => a.key === resetConfirmation.account)?.account ?? resetConfirmation.account }), _jsxs("div", { style: { ...styles.usageMeta, gap: 12 }, children: [_jsx("span", { children: t('usageWeekly') }), _jsxs("strong", { children: [Math.round(resetConfirmation.weeklyUsedPercent), "%"] })] }), _jsx("div", { style: styles.usageMeta, children: _jsx("span", { children: resetConfirmation.creditExpiresAt === undefined ? t('resetCreditExpiryUnknown') : t('resetCreditExpires', { date: new Date(resetConfirmation.creditExpiresAt).toLocaleString() }) }) }), _jsx("p", { style: { ...styles.statusLine, margin: '4px 0' }, children: t('resetUseWarning') }), _jsxs("label", { style: { display: 'flex', gap: 8, alignItems: 'flex-start', fontSize: 12 }, children: [_jsx("input", { type: "checkbox", checked: resetAcknowledged, onChange: e => setResetAcknowledged(e.target.checked) }), t('resetUseAcknowledge')] }), _jsxs("div", { className: "dsh-subscription-dialog-actions", style: { ...styles.actions, justifyContent: 'flex-end', marginTop: 8 }, children: [_jsx("button", { type: "button", autoFocus: true, onClick: () => setResetConfirmation(undefined), children: t('cancel') }), _jsx("button", { type: "button", className: "dsh-subscription-primary", disabled: !resetAcknowledged || resetBusy, onClick: () => { void consumeReset(); }, children: t('resetUseConfirm') })] })] }) })] }));
+            }), _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: { ...styles.modal, display: resetConfirmation ? 'flex' : 'none', margin: 'auto', color: 'var(--dsw-alias-label-primary)' }, children: resetConfirmation && _jsxs(_Fragment, { children: [_jsx("h3", { id: "subscriptions-reset-title", style: { ...styles.modalTitle, margin: 0 }, children: t('resetUseConfirmTitle') }), _jsx("p", { style: { ...styles.statusLine, overflowWrap: 'anywhere' }, children: statuses.codex?.accounts.find(a => a.key === resetConfirmation.account)?.account ?? resetConfirmation.account }), _jsxs("div", { style: { ...styles.usageMeta, gap: 12 }, children: [_jsx("span", { children: t('usageWeekly') }), _jsxs("strong", { children: [Math.round(resetConfirmation.weeklyUsedPercent), "%"] })] }), _jsx("div", { style: styles.usageMeta, children: _jsx("span", { children: resetConfirmation.creditExpiresAt === undefined ? t('resetCreditExpiryUnknown') : t('resetCreditExpires', { date: new Date(resetConfirmation.creditExpiresAt).toLocaleString() }) }) }), _jsx("p", { style: { ...styles.statusLine, margin: '4px 0' }, children: t('resetUseWarning') }), _jsxs("label", { style: { display: 'flex', gap: 8, alignItems: 'flex-start', fontSize: 12 }, children: [_jsx("input", { type: "checkbox", checked: resetAcknowledged, onChange: e => setResetAcknowledged(e.target.checked) }), t('resetUseAcknowledge')] }), _jsxs("div", { className: "dsh-subscription-dialog-actions", style: { ...styles.actions, justifyContent: 'flex-end', marginTop: 8 }, children: [_jsx("button", { type: "button", autoFocus: true, onClick: () => setResetConfirmation(undefined), children: t('cancel') }), _jsx("button", { type: "button", className: "dsh-subscription-primary", disabled: !resetAcknowledged || resetBusy, onClick: () => { void consumeReset(); }, children: t('resetUseConfirm') })] })] }) })] }));
 }

package/lib/client/UsageMeter.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState } from 'react';
-import { elapsedPercent, isUsageFresh, resetCountdownParts, usageBarColor, usageColorState, validUsage } from './usage-pace.js';
+import { displayStartPercent, elapsedPercent, isUsageFresh, resetCountdownParts, usageBarColor, usageColorState, validUsage } from './usage-pace.js';
 import { useUsageColorPreset } from './usage-color-preferences.js';
 /** Singular/plural locale keys per countdown unit (zh maps both to one string). */
 const UNIT_KEYS = {
@@ -20,11 +20,13 @@ export function UsageMeter({ window: quota, t, style, observedAt, stale }) {
     const valid = validUsage(quota.usedPercent);
     const used = valid ? quota.usedPercent : 0;
     const fresh = isUsageFresh(quota, { observedAt, stale }, current);
-    // The cursor is where the window stands in time. It needs only the window's
-    // own timing, so it stays for an unused, stale, aged or unobserved reading.
+    // The cursor is where the window stands in time: a provider-verified start
+    // through elapsedPercent, else the display-only assumption.
     const elapsed = elapsedPercent(quota, current);
+    const marker = elapsed ?? displayStartPercent(quota, current);
     // Comparing usage with elapsed time is meaningful only while the percentage
-    // is current; an old one is not set against today's clock.
+    // is current AND the start is verified: a display-estimated start must not
+    // color the bar — elapsed already excludes it, so pace below is safe.
     const pace = fresh ? elapsed : undefined;
     const state = usageColorState(quota.usedPercent, pace, preset, fresh);
     const lead = pace === undefined ? 0 : Math.round(used - pace);
@@ -34,7 +36,9 @@ export function UsageMeter({ window: quota, t, style, observedAt, stale }) {
         !valid ? '' : !fresh ? t('usageMeterStale') : state === 'red' ? t('usageMeterNearLimit')
             : pace === undefined && preset !== 'remaining' ? t('usageMeterUnknownTime')
                 : state === 'yellow' ? t('usageMeterAhead') : t('usageMeterNoWarning'),
-        elapsed === undefined ? '' : t('usageMeterPace', { elapsed: Math.round(elapsed) }),
+        // The elapsed-time line is a timing fact: it shows whenever the window's
+        // interval is known, even for a stale or invalid reading.
+        marker === undefined ? '' : t('usageMeterPace', { elapsed: Math.round(marker) }),
         pace === undefined ? '' : lead > 0 ? t('usageMeterPaceAhead', { points: lead })
             : lead < 0 ? t('usageMeterPaceBehind', { points: -lead }) : t('usageMeterPaceEven'),
         quota.resetsAt !== undefined && quota.resetsAt > current ? t('usageMeterReset', {
@@ -48,8 +52,8 @@ export function UsageMeter({ window: quota, t, style, observedAt, stale }) {
             background: 'var(--dsw-alias-bg-layer-1)', border: '1px solid var(--dsw-alias-border-l2)',
             ...style, position: 'relative',
         }, children: [_jsx("div", { style: { height: '100%', borderRadius: 'inherit', width: `${used}%`,
-                    background: usageBarColor(quota.usedPercent, pace, preset, fresh) } }), elapsed !== undefined && _jsx("span", { "aria-hidden": "true", "data-usage-time-marker": true, style: {
-                    position: 'absolute', left: `clamp(0px, calc(${elapsed}% - 1px), calc(100% - 2px))`,
+                    background: usageBarColor(quota.usedPercent, pace, preset, fresh) } }), marker !== undefined && _jsx("span", { "aria-hidden": "true", "data-usage-time-marker": true, style: {
+                    position: 'absolute', left: `clamp(0px, calc(${marker}% - 1px), calc(100% - 2px))`,
                     top: 0, bottom: 0, width: 2, background: 'var(--dsw-alias-label-primary)',
                     boxShadow: '0 0 0 1px var(--dsw-alias-bg-layer-1)',
                 } })] });