dsh-subscriptions 0.2.0 → 0.2.3

package/lib/client/OllamaSettingsManager.js

@@ -6,7 +6,12 @@ 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' };
+const actions = {
+    display: 'flex',
+    flexWrap: 'wrap',
+    gap: 8,
+    alignItems: 'center',
+};
 function message(error) {
     return error instanceof Error ? error.message : String(error);
 }
@@ -17,7 +22,9 @@ function capabilities(t, model) {
         model.vision === true ? t('ollamaCapVision') : false,
         model.thinking === true ? t('ollamaCapThinking') : false,
         context === undefined ? false : t('ollamaContext', { tokens: context }),
-    ].filter(Boolean).join(' · ');
+    ]
+        .filter(Boolean)
+        .join(' · ');
 }
 /**
  * Ollama Cloud settings dialog. It owns one draft (model list, web toggle,
@@ -70,7 +77,8 @@ export function OllamaSettingsManager({ rpc, t, onClose, onSaved }) {
         let current = true;
         setLoading(true);
         setError('');
-        void callSubscriptionsAuth(rpc, 'ollamaSettings', {}).then(data => {
+        void callSubscriptionsAuth(rpc, 'ollamaSettings', {})
+            .then((data) => {
             if (!current)
                 return;
             setView(data);
@@ -80,12 +88,20 @@ export function OllamaSettingsManager({ rpc, t, onClose, onSaved }) {
             setStash(new Map());
             setContextText({});
             setDirty(false);
-        }).catch(failure => {
+        })
+            .catch((failure) => {
             if (current)
                 setError(t('ollamaModelsLoadFailed', { message: message(failure) }));
-        }).finally(() => { if (current)
-            setLoading(false); });
-        return () => { current = false; };
+        })
+            .finally(() => {
+            if (current)
+                setLoading(false);
+        });
+        return () => {
+            current = false;
+        };
+        // `t` only formats the load error. A new translator must not refetch.
+        // eslint-disable-next-line react-hooks/exhaustive-deps -- refetch on rpc and attempt only
     }, [rpc, attempt]);
     function edit(next) {
         setDraft(next);
@@ -99,7 +115,10 @@ export function OllamaSettingsManager({ rpc, t, onClose, onSaved }) {
         setFetching(true);
         setFetchError('');
         try {
-            const value = await callSubscriptionsAuth(rpc, 'ollamaModels', { ...(apiKey ? { apiKey } : {}), ...(draft.baseURL ? { baseURL: draft.baseURL } : {}) });
+            const value = await callSubscriptionsAuth(rpc, 'ollamaModels', {
+                ...(apiKey ? { apiKey } : {}),
+                ...(draft.baseURL ? { baseURL: draft.baseURL } : {}),
+            });
             if (!alive.current)
                 return;
             setCandidates(value.models);
@@ -150,7 +169,7 @@ export function OllamaSettingsManager({ rpc, t, onClose, onSaved }) {
         try {
             await callSubscriptionsAuth(rpc, 'ollamaSetSettings', { settings: {} });
             if (alive.current) {
-                setAttempt(value => value + 1);
+                setAttempt((value) => value + 1);
                 onSaved();
             }
         }
@@ -178,15 +197,17 @@ export function OllamaSettingsManager({ rpc, t, onClose, onSaved }) {
      * (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 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,
+            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 }),
@@ -194,13 +215,15 @@ export function OllamaSettingsManager({ rpc, t, onClose, onSaved }) {
         };
     };
     const rows = [
-        ...(draft.models ?? []).map(model => asRow(model, true)),
-        ...[...stash.values()].filter(model => !present.has(model.id)).map(model => asRow(model, false)),
+        ...(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)),
+            .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()));
+    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) });
@@ -210,37 +233,97 @@ export function OllamaSettingsManager({ rpc, t, onClose, onSaved }) {
     }
     /** Keep the typed text; only a valid number (or blank) reaches the draft. */
     function setContext(id, text) {
-        setContextText(current => ({ ...current, [id]: text }));
+        setContextText((current) => ({ ...current, [id]: text }));
         const tokens = parseContextInput(text);
         if (tokens !== null)
-            edit({ ...draft, models: setModelContext(draft.models ?? [], id, tokens) });
+            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);
+        .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 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 => {
+                                                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: () => {
+                                                                    } }), ' ', 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') })] })] })] })] });
+                                                                    }, 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/ProviderAccountManager.d.ts

@@ -9,5 +9,5 @@ interface Props {
     onClose: () => void;
 }
 /** Native top-layer dialog provides keyboard containment, Escape and focus restoration. */
-export declare function ProviderAccountManager({ provider, name, rpc, t, onClose }: Props): import("react").JSX.Element;
+export declare function ProviderAccountManager({ provider, name, rpc, t, onClose, }: Props): import("react").JSX.Element;
 export {};

package/lib/client/ProviderAccountManager.js

@@ -1,14 +1,19 @@
 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 { accountModelRows, accountPoolSelection, mergeAccountChanges, mergeLatestAccounts } from './account-preferences.js';
+import { accountModelRows, accountPoolSelection, mergeAccountChanges, mergeLatestAccounts, mergePromptCacheTtl, } from './account-preferences.js';
 import { ProviderModelEditor } from './ProviderModelEditor.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' };
+const actions = {
+    display: 'flex',
+    flexWrap: 'wrap',
+    gap: 8,
+    alignItems: 'center',
+};
 /** Native top-layer dialog provides keyboard containment, Escape and focus restoration. */
-export function ProviderAccountManager({ provider, name, rpc, t, onClose }) {
+export function ProviderAccountManager({ provider, name, rpc, t, onClose, }) {
     const dialog = useRef(null);
     const title = useId();
     const description = useId();
@@ -20,6 +25,9 @@ export function ProviderAccountManager({ provider, name, rpc, t, onClose }) {
     const [saveError, setSaveError] = useState('');
     const [attempt, setAttempt] = useState(0);
     const [modelsDirty, setModelsDirty] = useState(false);
+    // The Claude prompt-cache TTL draft: undefined follows the plugin config.
+    const [ttlDraft, setTtlDraft] = useState();
+    const [ttlDirty, setTtlDirty] = useState(false);
     const alive = useRef(true);
     const saveLock = useRef(false);
     const editor = useRef(null);
@@ -39,18 +47,34 @@ export function ProviderAccountManager({ provider, name, rpc, t, onClose }) {
         let current = true;
         setLoading(true);
         setError('');
-        void callSubscriptionsAuth(rpc, provider === 'cursor-subscription' ? 'cursorSettings' : 'providerSettings', { provider }).then(data => {
-            if (current)
+        void callSubscriptionsAuth(rpc, provider === 'cursor-subscription'
+            ? 'cursorSettings'
+            : 'providerSettings', { provider })
+            .then((data) => {
+            if (current) {
                 setCatalog(data);
-        }).catch(error => {
+                setTtlDraft(data.settings.promptCacheTtl);
+                setTtlDirty(false);
+            }
+        })
+            .catch((error) => {
+            if (current)
+                setError(t('accountsLoadFailed', {
+                    message: error instanceof Error ? error.message : String(error),
+                }));
+        })
+            .finally(() => {
             if (current)
-                setError(t('accountsLoadFailed', { message: error instanceof Error ? error.message : String(error) }));
-        }).finally(() => { if (current)
-            setLoading(false); });
-        return () => { current = false; };
+                setLoading(false);
+        });
+        return () => {
+            current = false;
+        };
+        // `t` only formats the load error. A new translator must not refetch.
+        // eslint-disable-next-line react-hooks/exhaustive-deps -- refetch on provider, rpc, and attempt only
     }, [provider, rpc, attempt]);
     function edit(key, next) {
-        setChanges(current => ({ ...current, [key]: next }));
+        setChanges((current) => ({ ...current, [key]: next }));
     }
     /**
      * One submit for both drafts: the model editor's (visibility, effort,
@@ -72,7 +96,11 @@ export function ProviderAccountManager({ provider, name, rpc, t, onClose }) {
         try {
             if (provider !== 'cursor-subscription') {
                 for (const { model, effort } of models.efforts) {
-                    await callSubscriptionsAuth(rpc, 'setModelDefault', { provider, model, ...(effort ? { effort } : {}) });
+                    await callSubscriptionsAuth(rpc, 'setModelDefault', {
+                        provider,
+                        model,
+                        ...(effort ? { effort } : {}),
+                    });
                     savedEfforts++;
                     if (!alive.current)
                         return;
@@ -80,15 +108,28 @@ export function ProviderAccountManager({ provider, name, rpc, t, onClose }) {
             }
             // 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, provider === 'cursor-subscription'
+                ? 'cursorSettings'
+                : 'providerSettings', { provider });
             if (!alive.current)
                 return;
             if (provider === 'cursor-subscription') {
-                await callSubscriptionsAuth(rpc, 'cursorSetSettings', { settings: models.settings ?? latest.settings });
+                await callSubscriptionsAuth(rpc, 'cursorSetSettings', {
+                    settings: models.settings ?? latest.settings,
+                });
             }
             else {
-                const base = models.settings === undefined ? latest.settings : mergeLatestAccounts(models.settings, latest.settings);
-                await callSubscriptionsAuth(rpc, 'setProviderSettings', { provider, settings: mergeAccountChanges(base, 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();
@@ -96,7 +137,8 @@ export function ProviderAccountManager({ provider, name, rpc, t, onClose }) {
         catch (error) {
             if (alive.current) {
                 const message = error instanceof Error ? error.message : String(error);
-                setSaveError((savedEfforts ? t('modelsPartialSave') + ' ' : '') + t('accountsSaveFailed', { message }));
+                setSaveError((savedEfforts ? t('modelsPartialSave') + ' ' : '') +
+                    t('accountsSaveFailed', { message }));
             }
         }
         finally {
@@ -105,36 +147,109 @@ export function ProviderAccountManager({ provider, name, rpc, t, onClose }) {
                 setSaving(false);
         }
     }
-    return _jsxs("dialog", { className: "dsh-subscription-manager", ref: dialog, "aria-labelledby": title, "aria-describedby": description, onCancel: event => { if (saveLock.current)
-            event.preventDefault(); }, onClose: onClose, style: { width: 620, maxWidth: 'calc(100vw - 32px)', maxHeight: 'calc(100dvh - 32px)', overflow: 'auto' }, children: [_jsx("style", { children: providerSettingsCss }), _jsxs("div", { style: { ...stack, padding: 20 }, children: [_jsxs("header", { style: { ...actions, justifyContent: 'space-between' }, children: [_jsx("h2", { id: title, style: { margin: 0 }, children: t('accountsTitle', { provider: name }) }), _jsx("button", { type: "button", autoFocus: true, disabled: saving, onClick: onClose, children: t('imageClose') })] }), _jsx("p", { id: description, className: "dsh-subscription-hint", children: t(provider === 'cursor-subscription' ? 'cursorAccountsHint' : 'accountsHint') }), error && _jsx("p", { role: "alert", children: error }), loading && _jsx("p", { role: "status", className: "dsh-subscription-hint", children: t('accountsLoading') }), !loading && !catalog && _jsx("button", { type: "button", onClick: () => setAttempt(value => value + 1), children: t('modelDefaultsRetry') }), catalog && _jsxs("fieldset", { disabled: saving || loading, style: { ...stack, border: 0, margin: 0, padding: 0 }, children: [catalog.accounts.length === 0 && _jsx("p", { className: "dsh-subscription-hint", children: t(provider === 'cursor-subscription' ? 'cursorManageSignIn' : 'accountsEmpty') }), provider === 'cursor-subscription' && catalog.accounts.length > 0 &&
-                                _jsxs("fieldset", { style: { border, borderRadius: 'var(--dsw-radius-lg, 12px)', padding: 14 }, children: [_jsx("legend", { style: { padding: '0 6px' }, children: name }), _jsx("p", { className: "dsh-subscription-hint", children: t('cursorConnected') })] }), provider !== 'cursor-subscription' && catalog.accounts.map(account => {
-                                const preferences = changes[account.key] ?? catalog.settings.accounts?.[account.key] ?? {};
-                                const selected = accountPoolSelection(preferences, account.models);
-                                const models = accountModelRows(account, preferences);
-                                return _jsxs("fieldset", { style: { ...stack, border, borderRadius: 'var(--dsw-radius-lg, 12px)', padding: 14, margin: 0 }, children: [_jsx("legend", { style: { padding: '0 6px', overflowWrap: 'anywhere', maxWidth: '100%' }, children: account.label }), account.unavailable && _jsx("p", { className: "dsh-subscription-hint", children: t('accountsCatalogUnavailable') }), _jsxs("label", { style: { ...stack, gap: 6 }, children: [_jsx("span", { className: "dsh-subscription-label", children: t('accountsAlias') }), _jsx("input", { value: preferences.alias ?? '', placeholder: account.label, onChange: event => {
-                                                        const next = { ...preferences };
-                                                        if (event.target.value.trim())
-                                                            next.alias = event.target.value;
-                                                        else
-                                                            delete next.alias;
-                                                        edit(account.key, next);
-                                                    } })] }), _jsxs("label", { children: [_jsx("input", { type: "checkbox", checked: preferences.poolEnabled !== false, onChange: event => edit(account.key, { ...preferences, poolEnabled: event.target.checked }) }), " ", t('accountsPoolEnabled')] }), _jsxs("label", { children: [_jsx("input", { type: "checkbox", checked: preferences.independentEntry === true, onChange: event => edit(account.key, { ...preferences, independentEntry: event.target.checked }) }), " ", t('accountsIndependent')] }), _jsx("p", { className: "dsh-subscription-hint", children: t('accountsIndependentHint') }), _jsxs("details", { children: [_jsxs("summary", { style: { cursor: 'pointer', fontSize: 13 }, children: [t('accountsModels'), " \u00B7 ", preferences.poolModels === undefined
-                                                            ? t('accountsModelsAll') : t('accountsModelsCount', { count: preferences.poolModels.length })] }), _jsxs("div", { style: { ...stack, marginTop: 12 }, children: [_jsx("p", { className: "dsh-subscription-hint", children: t('accountsModelsHint') }), _jsxs("label", { children: [_jsx("input", { type: "checkbox", checked: preferences.poolModels === undefined, onChange: event => {
-                                                                        const next = { ...preferences };
-                                                                        if (event.target.checked)
-                                                                            delete next.poolModels;
-                                                                        else
-                                                                            next.poolModels = account.models.map(model => model.id);
-                                                                        edit(account.key, next);
-                                                                    } }), " ", t('accountsModelsAutomatic')] }), _jsxs("div", { style: actions, children: [_jsx("button", { type: "button", onClick: () => edit(account.key, { ...preferences, poolModels: models.map(model => model.id) }), children: t('modelsSelectAll') }), _jsx("button", { type: "button", onClick: () => edit(account.key, { ...preferences, poolModels: [] }), children: t('modelsSelectNone') })] }), _jsxs("div", { style: { ...stack, gap: 8, maxHeight: 240, overflowY: 'auto' }, children: [models.map(model => _jsxs("label", { style: { overflowWrap: 'anywhere' }, children: [_jsx("input", { type: "checkbox", checked: selected.has(model.id), onChange: event => {
-                                                                                const next = new Set(selected);
-                                                                                if (event.target.checked)
-                                                                                    next.add(model.id);
-                                                                                else
-                                                                                    next.delete(model.id);
-                                                                                edit(account.key, { ...preferences, poolModels: [...next] });
-                                                                            } }), " ", model.name, model.unavailable && ` (${t('modelsUnavailable')})`] }, model.id)), models.length === 0 && _jsx("p", { className: "dsh-subscription-hint", children: t('accountsNoModels') })] })] })] })] }, account.key);
-                            })] }), (provider !== 'cursor-subscription' || (catalog?.accounts.length ?? 0) > 0) &&
-                        _jsx(ProviderModelEditor, { ref: editor, provider: provider, rpc: rpc, t: t, disabled: saving, onDirtyChange: setModelsDirty }), _jsxs("footer", { style: { ...stack, gap: 8, borderTop: border, padding: '14px 0 8px',
-                            position: 'sticky', bottom: 0, background: 'var(--dsw-alias-bg-layer-2, var(--dsw-alias-bg-layer-1))' }, children: [saveError && _jsx("p", { role: "alert", children: saveError }), _jsxs("div", { style: { ...actions, justifyContent: 'flex-end' }, children: [_jsx("button", { type: "button", disabled: saving, onClick: onClose, children: t('cancel') }), _jsx("button", { type: "button", className: "dsh-subscription-primary", disabled: loading || saving || (!Object.keys(changes).length && !modelsDirty), onClick: () => { void save(); }, children: saving ? t('modelDefaultsSaving') : t('modelsSave') })] })] })] })] });
+    return (_jsxs("dialog", { className: "dsh-subscription-manager", ref: dialog, "aria-labelledby": title, "aria-describedby": description, onCancel: (event) => {
+            if (saveLock.current)
+                event.preventDefault();
+        }, onClose: onClose, style: {
+            width: 620,
+            maxWidth: 'calc(100vw - 32px)',
+            maxHeight: 'calc(100dvh - 32px)',
+            overflow: 'auto',
+        }, children: [_jsx("style", { children: providerSettingsCss }), _jsxs("div", { style: { ...stack, padding: 20 }, children: [_jsxs("header", { style: { ...actions, justifyContent: 'space-between' }, children: [_jsx("h2", { id: title, style: { margin: 0 }, children: t('accountsTitle', { provider: name }) }), _jsx("button", { type: "button", autoFocus: true, disabled: saving, onClick: onClose, children: t('imageClose') })] }), _jsx("p", { id: description, className: "dsh-subscription-hint", children: t(provider === 'cursor-subscription'
+                            ? 'cursorAccountsHint'
+                            : 'accountsHint') }), error && _jsx("p", { role: "alert", children: error }), loading && (_jsx("p", { role: "status", className: "dsh-subscription-hint", children: t('accountsLoading') })), !loading && !catalog && (_jsx("button", { type: "button", onClick: () => setAttempt((value) => value + 1), children: t('modelDefaultsRetry') })), catalog && (_jsxs("fieldset", { disabled: saving || loading, style: { ...stack, border: 0, margin: 0, padding: 0 }, children: [catalog.accounts.length === 0 && (_jsx("p", { className: "dsh-subscription-hint", children: t(provider === 'cursor-subscription'
+                                    ? 'cursorManageSignIn'
+                                    : 'accountsEmpty') })), provider === 'cursor-subscription' &&
+                                catalog.accounts.length > 0 && (_jsxs("fieldset", { style: {
+                                    border,
+                                    borderRadius: 'var(--dsw-radius-lg, 12px)',
+                                    padding: 14,
+                                }, children: [_jsx("legend", { style: { padding: '0 6px' }, children: name }), _jsx("p", { className: "dsh-subscription-hint", children: t('cursorConnected') })] })), provider !== 'cursor-subscription' &&
+                                catalog.accounts.map((account) => {
+                                    const preferences = changes[account.key] ??
+                                        catalog.settings.accounts?.[account.key] ??
+                                        {};
+                                    const selected = accountPoolSelection(preferences, account.models);
+                                    const models = accountModelRows(account, preferences);
+                                    return (_jsxs("fieldset", { style: {
+                                            ...stack,
+                                            border,
+                                            borderRadius: 'var(--dsw-radius-lg, 12px)',
+                                            padding: 14,
+                                            margin: 0,
+                                        }, children: [_jsx("legend", { style: {
+                                                    padding: '0 6px',
+                                                    overflowWrap: 'anywhere',
+                                                    maxWidth: '100%',
+                                                }, children: account.label }), account.unavailable && (_jsx("p", { className: "dsh-subscription-hint", children: t('accountsCatalogUnavailable') })), _jsxs("label", { style: { ...stack, gap: 6 }, children: [_jsx("span", { className: "dsh-subscription-label", children: t('accountsAlias') }), _jsx("input", { value: preferences.alias ?? '', placeholder: account.label, onChange: (event) => {
+                                                            const next = { ...preferences };
+                                                            if (event.target.value.trim())
+                                                                next.alias = event.target.value;
+                                                            else
+                                                                delete next.alias;
+                                                            edit(account.key, next);
+                                                        } })] }), _jsxs("label", { children: [_jsx("input", { type: "checkbox", checked: preferences.poolEnabled !== false, onChange: (event) => edit(account.key, {
+                                                            ...preferences,
+                                                            poolEnabled: event.target.checked,
+                                                        }) }), ' ', t('accountsPoolEnabled')] }), _jsxs("label", { children: [_jsx("input", { type: "checkbox", checked: preferences.independentEntry === true, onChange: (event) => edit(account.key, {
+                                                            ...preferences,
+                                                            independentEntry: event.target.checked,
+                                                        }) }), ' ', t('accountsIndependent')] }), _jsx("p", { className: "dsh-subscription-hint", children: t('accountsIndependentHint') }), _jsxs("details", { children: [_jsxs("summary", { style: { cursor: 'pointer', fontSize: 13 }, children: [t('accountsModels'), " \u00B7", ' ', preferences.poolModels === undefined
+                                                                ? t('accountsModelsAll')
+                                                                : t('accountsModelsCount', {
+                                                                    count: preferences.poolModels.length,
+                                                                })] }), _jsxs("div", { style: { ...stack, marginTop: 12 }, children: [_jsx("p", { className: "dsh-subscription-hint", children: t('accountsModelsHint') }), _jsxs("label", { children: [_jsx("input", { type: "checkbox", checked: preferences.poolModels === undefined, onChange: (event) => {
+                                                                            const next = { ...preferences };
+                                                                            if (event.target.checked)
+                                                                                delete next.poolModels;
+                                                                            else
+                                                                                next.poolModels = account.models.map((model) => model.id);
+                                                                            edit(account.key, next);
+                                                                        } }), ' ', t('accountsModelsAutomatic')] }), _jsxs("div", { style: actions, children: [_jsx("button", { type: "button", onClick: () => edit(account.key, {
+                                                                            ...preferences,
+                                                                            poolModels: models.map((model) => model.id),
+                                                                        }), children: t('modelsSelectAll') }), _jsx("button", { type: "button", onClick: () => edit(account.key, {
+                                                                            ...preferences,
+                                                                            poolModels: [],
+                                                                        }), children: t('modelsSelectNone') })] }), _jsxs("div", { style: {
+                                                                    ...stack,
+                                                                    gap: 8,
+                                                                    maxHeight: 240,
+                                                                    overflowY: 'auto',
+                                                                }, children: [models.map((model) => (_jsxs("label", { style: { overflowWrap: 'anywhere' }, children: [_jsx("input", { type: "checkbox", checked: selected.has(model.id), onChange: (event) => {
+                                                                                    const next = new Set(selected);
+                                                                                    if (event.target.checked)
+                                                                                        next.add(model.id);
+                                                                                    else
+                                                                                        next.delete(model.id);
+                                                                                    edit(account.key, {
+                                                                                        ...preferences,
+                                                                                        poolModels: [...next],
+                                                                                    });
+                                                                                } }), ' ', model.name, model.unavailable &&
+                                                                                ` (${t('modelsUnavailable')})`] }, model.id))), models.length === 0 && (_jsx("p", { className: "dsh-subscription-hint", children: t('accountsNoModels') }))] })] })] })] }, account.key));
+                                })] })), (provider !== 'cursor-subscription' ||
+                        (catalog?.accounts.length ?? 0) > 0) && (_jsx(ProviderModelEditor, { ref: editor, provider: provider, rpc: rpc, t: t, disabled: saving, onDirtyChange: setModelsDirty })), provider === 'claude' && catalog && (_jsxs("div", { style: {
+                            ...stack,
+                            gap: 6,
+                            borderTop: border,
+                            marginTop: 12,
+                            paddingTop: 12,
+                        }, children: [_jsxs("label", { style: { ...stack, gap: 6 }, children: [_jsx("span", { className: "dsh-subscription-label", children: t('claudeCacheTtl') }), _jsxs("select", { "aria-label": t('claudeCacheTtl'), style: { width: 220 }, value: ttlDraft ?? '', disabled: saving, onChange: (event) => {
+                                            const value = event.target.value;
+                                            setTtlDraft(value === '' ? undefined : value);
+                                            setTtlDirty(true);
+                                        }, children: [_jsx("option", { value: "", children: t('claudeCacheTtlFollowConfig') }), _jsx("option", { value: "5m", children: t('claudeCacheTtl5m') }), _jsx("option", { value: "1h", children: t('claudeCacheTtl1h') })] })] }), _jsx("p", { className: "dsh-subscription-hint", children: t('claudeCacheTtlHint') })] })), _jsxs("footer", { style: {
+                            ...stack,
+                            gap: 8,
+                            borderTop: border,
+                            padding: '14px 0 8px',
+                            position: 'sticky',
+                            bottom: 0,
+                            background: 'var(--dsw-alias-bg-layer-2, var(--dsw-alias-bg-layer-1))',
+                        }, children: [saveError && _jsx("p", { role: "alert", children: saveError }), _jsxs("div", { style: { ...actions, justifyContent: 'flex-end' }, children: [_jsx("button", { type: "button", disabled: saving, onClick: onClose, children: t('cancel') }), _jsx("button", { type: "button", className: "dsh-subscription-primary", disabled: loading ||
+                                            saving ||
+                                            (!Object.keys(changes).length && !modelsDirty && !ttlDirty), onClick: () => {
+                                            void save();
+                                        }, children: saving ? t('modelDefaultsSaving') : t('modelsSave') })] })] })] })] }));
 }