dsh-subscriptions 0.2.0 → 0.2.2

package/lib/client/ProviderModelEditor.js

@@ -1,10 +1,15 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { forwardRef, useEffect, useImperativeHandle, useRef, useState } from 'react';
+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' };
+const actions = {
+    display: 'flex',
+    flexWrap: 'wrap',
+    gap: 8,
+    alignItems: 'center',
+};
 /**
  * Embedded section of the account manager dialog. It owns the model draft
  * (visibility, effort, context, tools) but not its submission: the dialog
@@ -21,12 +26,19 @@ export const ProviderModelEditor = forwardRef(function ProviderModelEditor({ pro
     const [dirty, setDirty] = useState(false);
     const [error, setError] = useState('');
     const generation = useRef(0);
-    useEffect(() => () => { generation.current++; }, []);
-    useEffect(() => { onDirtyChange?.(dirty); }, [dirty]);
+    useEffect(() => () => {
+        generation.current++;
+    }, []);
+    // Notify only when dirty changes. The parent passes a fresh callback each render.
+    /* eslint-disable react-hooks/exhaustive-deps -- onDirtyChange is not a trigger */
+    useEffect(() => {
+        onDirtyChange?.(dirty);
+    }, [dirty]);
+    /* eslint-enable react-hooks/exhaustive-deps */
     function reset(data) {
         setCatalog(data);
         setDraft(data.settings);
-        setEfforts(Object.fromEntries(data.models.map(model => [model.id, model.configured ?? ''])));
+        setEfforts(Object.fromEntries(data.models.map((model) => [model.id, model.configured ?? ''])));
         setContexts(Object.fromEntries(Object.entries(data.settings.contextWindows ?? {}).map(([id, value]) => [id, String(value)])));
         setDirty(false);
     }
@@ -35,7 +47,9 @@ export const ProviderModelEditor = forwardRef(function ProviderModelEditor({ pro
         setBusy(true);
         setError('');
         try {
-            const data = await callSubscriptionsAuth(rpc, provider === 'cursor-subscription' ? 'cursorSettings' : 'providerSettings', { provider, force });
+            const data = await callSubscriptionsAuth(rpc, provider === 'cursor-subscription'
+                ? 'cursorSettings'
+                : 'providerSettings', { provider, force });
             if (generation.current === request)
                 reset(data);
         }
@@ -48,8 +62,16 @@ export const ProviderModelEditor = forwardRef(function ProviderModelEditor({ pro
                 setBusy(false);
         }
     }
-    function edit(next) { setDraft(next); setDirty(true); }
-    useEffect(() => { void load(); }, [provider, rpc]);
+    function edit(next) {
+        setDraft(next);
+        setDirty(true);
+    }
+    // `load` is a new function each render; provider and rpc are the triggers.
+    /* eslint-disable react-hooks/exhaustive-deps -- avoid refetching every render */
+    useEffect(() => {
+        void load();
+    }, [provider, rpc]);
+    /* eslint-enable react-hooks/exhaustive-deps */
     useImperativeHandle(ref, () => ({
         collect() {
             if (!catalog || !dirty)
@@ -59,47 +81,106 @@ export const ProviderModelEditor = forwardRef(function ProviderModelEditor({ pro
                 if (!text.trim())
                     continue;
                 const value = Number(text);
-                if (!/^\d+$/.test(text.trim()) || !Number.isSafeInteger(value) || value <= 0) {
+                if (!/^\d+$/.test(text.trim()) ||
+                    !Number.isSafeInteger(value) ||
+                    value <= 0) {
                     setError(t('modelsContextInvalid', { model }));
                     return undefined;
                 }
                 windows[model] = value;
             }
             setError('');
-            const { accounts: _accounts, ...settings } = { ...draft, ...(supportsContext(provider) ? { contextWindows: windows } : {}) };
+            const { accounts: _accounts, ...settings } = {
+                ...draft,
+                ...(supportsContext(provider) ? { contextWindows: windows } : {}),
+            };
             return {
                 settings,
-                efforts: catalog.models.flatMap(model => {
+                efforts: catalog.models.flatMap((model) => {
                     const effort = efforts[model.id] ?? '';
-                    return effort === (model.configured ?? '') || !model.efforts?.length ? [] : [{ model: model.id, effort }];
+                    return effort === (model.configured ?? '') ||
+                        !model.efforts?.length
+                        ? []
+                        : [{ model: model.id, effort }];
                 }),
             };
         },
-    }), [catalog, dirty, draft, contexts, efforts, provider]);
+    }), [catalog, dirty, draft, contexts, efforts, provider, t]);
     const allModels = catalog?.models ?? [];
-    const known = new Set(allModels.map(model => model.id));
-    const missing = (draft.visibleModels ?? []).filter(id => !known.has(id)).map(id => ({ id, name: id }));
-    const models = [...allModels, ...missing].filter(model => `${model.name} ${model.id}`.toLowerCase().includes(query.trim().toLowerCase()));
-    const selected = new Set(draft.visibleModels ?? allModels.map(model => model.id));
-    return _jsxs("div", { style: { borderTop: border, marginTop: 12, paddingTop: 12 }, children: [_jsx("h3", { style: { margin: 0 }, children: t('modelsEdit') }), _jsxs("div", { style: { display: 'grid', gap: 12, marginTop: 12 }, children: [_jsx("p", { className: "dsh-subscription-hint", children: t(provider === 'cursor-subscription' ? 'cursorManageHint' : 'modelsHint') }), error && _jsx("p", { role: "alert", children: error }), _jsxs("div", { style: actions, children: [_jsx("button", { type: "button", className: "dsh-subscription-quiet", disabled: busy || disabled || dirty, onClick: () => { void load(true); }, children: t('usageRefresh') }), busy && _jsx("span", { role: "status", children: t('modelDefaultsLoading') })] }), catalog && _jsxs("fieldset", { disabled: busy || disabled, style: { border: 0, padding: 0, margin: 0, minWidth: 0, display: 'grid', gap: 12 }, children: [_jsxs("label", { children: [_jsx("input", { type: "checkbox", checked: draft.visibleModels === undefined, onChange: event => {
+    const known = new Set(allModels.map((model) => model.id));
+    const missing = (draft.visibleModels ?? [])
+        .filter((id) => !known.has(id))
+        .map((id) => ({ id, name: id }));
+    const models = [...allModels, ...missing].filter((model) => `${model.name} ${model.id}`
+        .toLowerCase()
+        .includes(query.trim().toLowerCase()));
+    const selected = new Set(draft.visibleModels ?? allModels.map((model) => model.id));
+    return (_jsxs("div", { style: { borderTop: border, marginTop: 12, paddingTop: 12 }, children: [_jsx("h3", { style: { margin: 0 }, children: t('modelsEdit') }), _jsxs("div", { style: { display: 'grid', gap: 12, marginTop: 12 }, children: [_jsx("p", { className: "dsh-subscription-hint", children: t(provider === 'cursor-subscription'
+                            ? 'cursorManageHint'
+                            : 'modelsHint') }), error && _jsx("p", { role: "alert", children: error }), _jsxs("div", { style: actions, children: [_jsx("button", { type: "button", className: "dsh-subscription-quiet", disabled: busy || disabled || dirty, onClick: () => {
+                                    void load(true);
+                                }, children: t('usageRefresh') }), busy && _jsx("span", { role: "status", children: t('modelDefaultsLoading') })] }), catalog && (_jsxs("fieldset", { disabled: busy || disabled, style: {
+                            border: 0,
+                            padding: 0,
+                            margin: 0,
+                            minWidth: 0,
+                            display: 'grid',
+                            gap: 12,
+                        }, children: [_jsxs("label", { children: [_jsx("input", { type: "checkbox", checked: draft.visibleModels === undefined, onChange: (event) => {
                                             const next = { ...draft };
                                             if (event.target.checked)
                                                 delete next.visibleModels;
                                             else
-                                                next.visibleModels = allModels.map(model => model.id);
+                                                next.visibleModels = allModels.map((model) => model.id);
                                             edit(next);
-                                        } }), " ", t('modelsAutomatic')] }), _jsxs("div", { style: actions, children: [_jsx("input", { style: { flex: '1 1 180px' }, value: query, onChange: event => setQuery(event.target.value), placeholder: t('modelDefaultsFilterPlaceholder'), "aria-label": t('modelDefaultsFilterPlaceholder') }), _jsx("button", { type: "button", onClick: () => edit({ ...draft, visibleModels: allModels.map(model => model.id) }), children: t('modelsSelectAll') }), _jsx("button", { type: "button", onClick: () => edit({ ...draft, visibleModels: [] }), children: t('modelsSelectNone') })] }), _jsxs("div", { style: { maxHeight: 360, overflowY: 'auto', display: 'grid', gap: 8 }, children: [models.map(model => _jsxs("div", { style: { borderBottom: border, padding: '8px 2px', display: 'grid', gap: 8 }, children: [_jsxs("label", { style: { overflowWrap: 'anywhere' }, children: [_jsx("input", { type: "checkbox", checked: selected.has(model.id), onChange: event => {
+                                        } }), ' ', t('modelsAutomatic')] }), _jsxs("div", { style: actions, children: [_jsx("input", { style: { flex: '1 1 180px' }, value: query, onChange: (event) => setQuery(event.target.value), placeholder: t('modelDefaultsFilterPlaceholder'), "aria-label": t('modelDefaultsFilterPlaceholder') }), _jsx("button", { type: "button", onClick: () => edit({
+                                            ...draft,
+                                            visibleModels: allModels.map((model) => model.id),
+                                        }), children: t('modelsSelectAll') }), _jsx("button", { type: "button", onClick: () => edit({ ...draft, visibleModels: [] }), children: t('modelsSelectNone') })] }), _jsxs("div", { style: {
+                                    maxHeight: 360,
+                                    overflowY: 'auto',
+                                    display: 'grid',
+                                    gap: 8,
+                                }, children: [models.map((model) => (_jsxs("div", { style: {
+                                            borderBottom: border,
+                                            padding: '8px 2px',
+                                            display: 'grid',
+                                            gap: 8,
+                                        }, children: [_jsxs("label", { style: { overflowWrap: 'anywhere' }, children: [_jsx("input", { type: "checkbox", checked: selected.has(model.id), onChange: (event) => {
                                                             const next = new Set(selected);
                                                             if (event.target.checked)
                                                                 next.add(model.id);
                                                             else
                                                                 next.delete(model.id);
                                                             edit({ ...draft, visibleModels: [...next] });
-                                                        } }), " ", model.name, !known.has(model.id) && ` (${t('modelsUnavailable')})`] }), _jsxs("div", { style: actions, children: [(model.efforts?.length ?? 0) > 0 && _jsxs("label", { style: actions, children: [t('modelDefaultsTitle'), _jsxs("select", { "aria-label": `${model.name} ${t('modelDefaultsTitle')}`, value: efforts[model.id] ?? '', onChange: event => {
-                                                                    setEfforts({ ...efforts, [model.id]: event.target.value });
+                                                        } }), ' ', model.name, !known.has(model.id) && ` (${t('modelsUnavailable')})`] }), _jsxs("div", { style: actions, children: [(model.efforts?.length ?? 0) > 0 && (_jsxs("label", { style: actions, children: [t('modelDefaultsTitle'), _jsxs("select", { "aria-label": `${model.name} ${t('modelDefaultsTitle')}`, value: efforts[model.id] ?? '', onChange: (event) => {
+                                                                    setEfforts({
+                                                                        ...efforts,
+                                                                        [model.id]: event.target.value,
+                                                                    });
                                                                     setDirty(true);
-                                                                }, children: [_jsx("option", { value: "", children: t('modelDefaultsFollowProvider') }), model.configured && !model.efforts?.some(effort => effort.id === model.configured) &&
-                                                                        _jsxs("option", { value: model.configured, disabled: true, children: [model.configured, " (", t('modelsUnavailable'), ")"] }), model.efforts?.map(effort => _jsx("option", { value: effort.id, children: effort.name }, effort.id))] })] }), supportsContext(provider) && model.maxContextWindow !== undefined && _jsxs("div", { style: actions, children: [_jsxs("label", { style: actions, children: [t('modelsContext'), _jsx("input", { style: { width: 140 }, inputMode: "numeric", value: contexts[model.id] ?? '', "aria-label": `${model.name} ${t('modelsContext')}`, placeholder: String(model.defaultContextWindow), onChange: event => { setContexts({ ...contexts, [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))] })] })] })] });
+                                                                }, children: [_jsx("option", { value: "", children: t('modelDefaultsFollowProvider') }), model.configured &&
+                                                                        !model.efforts?.some((effort) => effort.id === model.configured) && (_jsxs("option", { value: model.configured, disabled: true, children: [model.configured, " (", t('modelsUnavailable'), ")"] })), model.efforts?.map((effort) => (_jsx("option", { value: effort.id, children: effort.name }, effort.id)))] })] })), supportsContext(provider) &&
+                                                        model.maxContextWindow !== undefined && (_jsxs("div", { style: actions, children: [_jsxs("label", { style: actions, children: [t('modelsContext'), _jsx("input", { style: { width: 140 }, inputMode: "numeric", value: contexts[model.id] ?? '', "aria-label": `${model.name} ${t('modelsContext')}`, placeholder: String(model.defaultContextWindow), onChange: (event) => {
+                                                                            setContexts({
+                                                                                ...contexts,
+                                                                                [model.id]: event.target.value,
+                                                                            });
+                                                                            setDirty(true);
+                                                                        } })] }), _jsx("small", { children: t('modelsContextBounds', {
+                                                                    default: model.defaultContextWindow,
+                                                                    max: model.maxContextWindow,
+                                                                }) })] }))] })] }, 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/SpeedSelect.d.ts

@@ -19,16 +19,28 @@ export interface SpeedSelectState {
  * ship it with this shape; it replaces rc.2's `connection.api.sessions.models`
  * read, which the 0.1.2-alpha removed along with the whole `.api` face.
  */
+/** Selected model pushed by ui-model-selection's directory store. */
+export interface ModelSelectionSnapshot {
+    current: {
+        provider: string;
+        model: string;
+    } | null;
+}
+/**
+ * The directory store (`ModelDirectory.store`). Present on hosts that publish
+ * selection changes; absent on a directory that only offers `load()`.
+ */
+export interface ModelSelectionStore {
+    subscribe(listener: () => void): () => void;
+    getSnapshot(): ModelSelectionSnapshot;
+}
 export interface ModelDirectoriesLike {
     /** Resolve one session's shared model directory (throws for unknown sessions). */
     directoryFor(sessionId: string): {
         /** Load the directory; `current` is the session's effective model selection. */
-        load(): Promise<{
-            current: {
-                provider: string;
-                model: string;
-            } | null;
-        }>;
+        load(): Promise<ModelSelectionSnapshot>;
+        /** Pushes selection changes. Missing when the host only offers `load()`. */
+        store?: ModelSelectionStore;
     };
 }
 /** Injected dependencies of {@link SpeedSelect} (slot `inject`, session-bound). */
@@ -37,6 +49,12 @@ export interface SpeedSelectInjected {
     loadSpeed: () => Promise<SpeedSelectState>;
     /** Set the session's speed tier; resolves false when the write failed. */
     setSpeed: (tier: SpeedTier) => Promise<boolean>;
+    /**
+     * Subscribe to the session's selected model. The listener runs when
+     * `provider` or `model` changes, and once when a directory that was missing
+     * at subscribe time becomes available. The returned function detaches it.
+     */
+    watchModel: (listener: () => void) => () => void;
 }
 /**
  * Props delivered by the slot outlet: the framework session kit and InputZone
@@ -46,9 +64,10 @@ export interface SpeedSelectInjected {
 export type SpeedSelectProps = PropsRuntime<'conversation.input.right'> & Partial<SpeedSelectInjected> & Partial<PropsLocale<'settings.subscriptions'>>;
 /**
  * The `loadSpeed` half of the inject face: the plugin's own speed state plus
- * the host's current model selection (the visibility gate). A model-RPC
- * failure throws rather than answering "hidden" — the caller keeps its last
- * known state, so a transient failure never locks the toggle away.
+ * the host's current model selection (the visibility gate). A session whose
+ * model selection is unavailable (an addressed subagent) answers hidden.
+ * Any other model-directory failure throws, so the caller keeps its last
+ * known state instead of locking the toggle away.
  *
  * `sessionId` is a plain string: slot and command contexts brand it through
  * different dsh-session copies, and only the service boundary needs one.
@@ -58,14 +77,43 @@ export type SpeedSelectProps = PropsRuntime<'conversation.input.right'> & Partia
  * at all) simply keeps the toggle hidden.
  */
 export declare function createSpeedLoader(connection: ConnectionHandle, models: () => ModelDirectoriesLike | undefined, sessionId: string): SpeedSelectInjected['loadSpeed'];
+/** Stable identity of a model selection. Empty when nothing is selected. */
+export declare function modelSelectionKey(current: ModelSelectionSnapshot['current'] | undefined): string;
+/**
+ * How often a host without a directory store is re-read, and how often a
+ * missing directory service is retried. Neither interval calls
+ * `subscriptions-auth.speed`.
+ */
+export declare const MODEL_DIRECTORY_POLL_INTERVAL_MS = 3000;
+/**
+ * Mount reads of `speed`, including the first attempt. Further failures stop
+ * instead of polling for the life of the composer.
+ */
+export declare const SPEED_MOUNT_READ_ATTEMPTS = 4;
+/** Fired after `/fast` writes a tier, so an open composer re-reads `speed`. */
+export declare const SPEED_CHANGED_EVENT = "dsh:subscriptions:speed-changed";
+/** Tell mounted Speed controls that this page changed a session tier. */
+export declare function notifySpeedChanged(): void;
+/**
+ * Subscribe to the session's selected model. A directory store notifies the
+ * listener only when `provider` or `model` changes. A directory with no store
+ * is re-read on {@link MODEL_DIRECTORY_POLL_INTERVAL_MS}; a service that is
+ * not registered yet, or whose `directoryFor` throws, is retried on that same
+ * interval. The first successful attach after a miss notifies once, so a
+ * mount that ran before the service existed reads `speed` again.
+ */
+export declare function createModelSelectionWatch(models: () => ModelDirectoriesLike | undefined, sessionId: string): SpeedSelectInjected['watchModel'];
 /** The `setSpeed` half of the inject face: boolean outcome for the component's busy state. */
 export declare function createSpeedSetter(connection: ConnectionHandle, sessionId: string): SpeedSelectInjected['setSpeed'];
 /**
  * The composer Speed control: a trigger reading `速度 · 快速`/`速度 · 标准`
  * that opens a two-row menu (standard/fast with descriptions, check mark on
- * the current tier). The host pushes nothing on a model switch, so the
- * control re-reads on a slow poll with a single-flight guard; a failed read
- * keeps the last known state, so a transient RPC failure can never lock the
- * toggle away (the earlier mount-only load had no recovery path).
+ * the current tier). It reads `subscriptions-auth.speed` on mount, when the
+ * menu opens, when {@link SpeedSelectInjected.watchModel} reports a new
+ * selected model, and when {@link notifySpeedChanged} fires. Until the first
+ * read succeeds, a failure is retried on
+ * {@link MODEL_DIRECTORY_POLL_INTERVAL_MS}, at most
+ * {@link SPEED_MOUNT_READ_ATTEMPTS} times; after that, a failed read keeps
+ * the last known state.
  */
-export declare function SpeedSelect({ loadSpeed, setSpeed, t }: SpeedSelectProps): import("react").JSX.Element | null;
+export declare function SpeedSelect({ loadSpeed, setSpeed, watchModel, t, }: SpeedSelectProps): import("react").JSX.Element | null;