@qduc/term2 0.11.1 → 0.13.0

package/dist/hooks/use-handoff-flow.js

@@ -1,141 +1,132 @@
-import { useCallback, useEffect, useReducer, useRef } from 'react';
-import { parseInput } from '../utils/input-parser.js';
-import { parseModelProviderArg } from '../utils/ai/model-provider-arg.js';
-import { handoffFlowReducer, createInitialHandoffState, composeHandoffMessage, } from './handoff-flow-reducer.js';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { HandoffSession } from '../services/handoff/handoff-session.js';
 const MODEL_TRIGGER = '/model ';
+const EFFORT_TRIGGER = '/effort ';
 export const useHandoffFlow = (deps) => {
-    const { clearConversationAndRefreshBanner, addSystemMessage, sendUserMessage, replaceInput, setInputAndCursor, setMode, setTriggerIndex, mode, settingsService, applyRuntimeSetting, setModel, } = deps;
-    const [handoffState, dispatch] = useReducer(handoffFlowReducer, null, createInitialHandoffState);
-    const prevRef = useRef({ mode, handoffState });
-    const sendCapturedHandoff = useCallback(async (state) => {
-        if (state.stage !== 'selecting_model' && state.stage !== 'selecting_effort')
-            return false;
-        const isPlanMode = settingsService.get('app.planMode') || false;
-        if (isPlanMode) {
-            dispatch({ type: 'handoff/standard_mode_requested' });
-            replaceInput('');
-            return true;
-        }
-        dispatch({ type: 'handoff/sent' });
-        replaceInput('');
-        await sendUserMessage({ text: composeHandoffMessage(state) });
-        return true;
-    }, [settingsService, sendUserMessage, replaceInput]);
+    const { clearConversationAndRefreshBanner, addSystemMessage, sendUserMessage, replaceInput, controller, settingsService, applyRuntimeSetting, setModel, configurationService, } = deps;
+    const handoffSession = useMemo(() => new HandoffSession({
+        clearConversationAndRefreshBanner,
+        addSystemMessage,
+        sendUserMessage,
+        settingsService,
+        applyRuntimeSetting,
+        setModel,
+        configurationService,
+    }), [
+        clearConversationAndRefreshBanner,
+        addSystemMessage,
+        sendUserMessage,
+        settingsService,
+        applyRuntimeSetting,
+        setModel,
+        configurationService,
+    ]);
+    const [handoffState, setHandoffState] = useState(() => handoffSession.getState());
+    useEffect(() => handoffSession.subscribe(setHandoffState), [handoffSession]);
+    const handoffStateRef = useRef(handoffState);
+    handoffStateRef.current = handoffState;
+    // Tracks whether the model frame is currently on the controller's stack, so
+    // the subscription below can detect the true->false "just closed"
+    // transition rather than reacting to every stack change (typing while the
+    // menu stays open, opening a different frame, ...).
+    const hadModelFrameRef = useRef(false);
+    // Set synchronously by `handleModelSubmitPrompt` when it consumes a
+    // submit-prompt intent for the model this handoff opened. Read by the
+    // "closed" detector below to distinguish an accepted selection from an
+    // escape that closed the picker with nothing chosen.
+    const modelSelectionHandledRef = useRef(false);
     const completeHandoffWithEffort = useCallback(async (effort) => {
-        const state = handoffState;
-        if (!state)
-            return;
-        settingsService.set('agent.reasoningEffort', effort);
-        applyRuntimeSetting('agent.reasoningEffort', effort);
-        await sendCapturedHandoff(state);
-    }, [handoffState, settingsService, applyRuntimeSetting, sendCapturedHandoff]);
+        if (await handoffSession.completeHandoffWithEffort(effort))
+            replaceInput('');
+    }, [handoffSession, replaceInput]);
+    // Replaces the `mode` projection this used to watch (mode returning to
+    // 'text' while still in the 'selecting_model' stage meant "the picker
+    // closed without an explicit accept"). The controller's stack is the
+    // source of truth now: a 'model' frame leaving the stack is the same
+    // event, and it fires for both an accepted selection (closed via the
+    // submit-prompt intent below) and an escape (closed with no intent).
+    //
+    // The two cases are not distinguishable at the moment this subscriber
+    // runs: `MenuControllerImpl.dispatch` calls `notify()` (which reaches this
+    // subscriber) *before* it invokes the intent host, so an accepted
+    // selection's `handleModelSubmitPrompt` call has not happened yet. The
+    // `queueMicrotask` defers the decision until the rest of that synchronous
+    // dispatch — including a synchronous `handleModelSubmitPrompt` call — has
+    // run, so `modelSelectionHandledRef` is settled before it is read. This
+    // does not depend on React's render/batching timing at all, only on plain
+    // JS microtask ordering within the same call stack.
     useEffect(() => {
-        const prev = prevRef.current;
-        prevRef.current = { mode, handoffState };
-        if (mode !== 'text' || handoffState?.stage !== 'selecting_model')
-            return;
-        if (prev.mode === 'text' || prev.handoffState !== handoffState)
-            return;
-        void sendCapturedHandoff(handoffState);
-    }, [handoffState, mode, sendCapturedHandoff]);
+        return controller.subscribe(() => {
+            const hasModelFrame = controller.getSnapshot().stack.some((frame) => frame.kind === 'model');
+            const hadModelFrame = hadModelFrameRef.current;
+            hadModelFrameRef.current = hasModelFrame;
+            if (!hadModelFrame || hasModelFrame)
+                return;
+            queueMicrotask(() => {
+                if (modelSelectionHandledRef.current) {
+                    modelSelectionHandledRef.current = false;
+                    return;
+                }
+                const state = handoffStateRef.current;
+                if (state?.stage !== 'selecting_model')
+                    return;
+                void handoffSession.sendCapturedHandoff().then((handled) => {
+                    if (handled)
+                        replaceInput('');
+                });
+            });
+        });
+    }, [controller, handoffSession, replaceInput]);
     const startHandoff = useCallback((capturedText) => {
-        dispatch({ type: 'handoff/started', capturedText });
-    }, []);
+        handoffSession.startHandoff(capturedText);
+    }, [handoffSession]);
     const confirmHandoff = useCallback(async () => {
-        if (!handoffState)
+        if (!(await handoffSession.confirmHandoff()))
             return;
-        await clearConversationAndRefreshBanner();
-        dispatch({ type: 'handoff/model_confirmed' });
-        setInputAndCursor(MODEL_TRIGGER, MODEL_TRIGGER.length, MODEL_TRIGGER.length);
-        setMode('model_selection');
-        setTriggerIndex(MODEL_TRIGGER.length);
-    }, [clearConversationAndRefreshBanner, handoffState, setInputAndCursor, setMode, setTriggerIndex]);
+        modelSelectionHandledRef.current = false;
+        controller.replaceText(MODEL_TRIGGER, MODEL_TRIGGER.length);
+    }, [handoffSession, controller]);
     const declineHandoff = useCallback(async () => {
-        const state = handoffState;
-        if (!state)
-            return;
-        const isPlanMode = settingsService.get('app.planMode') || false;
-        if (isPlanMode) {
-            await clearConversationAndRefreshBanner();
-            dispatch({ type: 'handoff/standard_mode_requested' });
+        if (await handoffSession.declineHandoff())
             replaceInput('');
-            return;
-        }
-        await clearConversationAndRefreshBanner();
-        dispatch({ type: 'handoff/sent' });
-        replaceInput('');
-        if (state.capturedText) {
-            await sendUserMessage({ text: composeHandoffMessage(state) });
-        }
-    }, [clearConversationAndRefreshBanner, handoffState, sendUserMessage, replaceInput, settingsService]);
+    }, [handoffSession, replaceInput]);
     const cancelHandoff = useCallback(() => {
-        dispatch({ type: 'handoff/cancelled' });
-        replaceInput('');
-        addSystemMessage('Handoff cancelled');
-    }, [addSystemMessage, replaceInput]);
+        if (handoffSession.cancelHandoff())
+            replaceInput('');
+    }, [handoffSession, replaceInput]);
     const confirmStandardMode = useCallback(async () => {
-        const state = handoffState;
-        if (!state)
-            return;
-        settingsService.set('app.planMode', false);
-        applyRuntimeSetting('app.planMode', false);
-        addSystemMessage('Plan mode disabled - switched to Standard mode');
-        dispatch({ type: 'handoff/sent' });
-        replaceInput('');
-        if (state.capturedText) {
-            await sendUserMessage({ text: composeHandoffMessage(state) });
-        }
-    }, [handoffState, settingsService, applyRuntimeSetting, addSystemMessage, sendUserMessage, replaceInput]);
+        if (await handoffSession.confirmStandardMode())
+            replaceInput('');
+    }, [handoffSession, replaceInput]);
     const declineStandardMode = useCallback(async () => {
-        const state = handoffState;
-        if (!state)
-            return;
-        dispatch({ type: 'handoff/sent' });
-        replaceInput('');
-        if (state.capturedText) {
-            await sendUserMessage({ text: composeHandoffMessage(state) });
-        }
-    }, [handoffState, sendUserMessage, replaceInput]);
+        if (await handoffSession.declineStandardMode())
+            replaceInput('');
+    }, [handoffSession, replaceInput]);
     const submitHandoffInput = useCallback(async (turn) => {
         const state = handoffState;
         if (!state)
             return false;
         if (state.stage === 'entering_message') {
-            const handoffMessage = turn.text.trim() || 'Implement this';
-            dispatch({ type: 'handoff/message_captured', handoffMessage });
-            replaceInput('');
-            return true;
-        }
-        if (state.stage === 'selecting_model') {
-            const parsedInput = parseInput(turn.text);
-            const modelArg = parsedInput.type === 'slash-command' ? parsedInput.args : turn.text;
-            const { modelId, provider } = parseModelProviderArg(modelArg);
-            if (modelId) {
-                settingsService.set('agent.model', modelId);
-                if (provider) {
-                    settingsService.set('agent.provider', provider);
-                    applyRuntimeSetting('agent.provider', provider);
-                }
-                applyRuntimeSetting('agent.model', modelId);
-                setModel(modelId);
+            if (handoffSession.captureMessage(turn.text)) {
+                replaceInput('');
+                return true;
             }
-            dispatch({ type: 'handoff/model_selected' });
-            setInputAndCursor('/effort ', '/effort '.length, '/effort '.length);
-            setMode('text');
-            setTriggerIndex(null);
-            return true;
         }
+        // Model selection no longer reaches here: the direct `/model ` trigger
+        // is controller-owned, so an accepted selection closes through a
+        // correlated submit-prompt intent (see `handleModelSubmitPrompt`)
+        // rather than a turn routed through the app's `handleSubmit`.
         return false;
-    }, [
-        applyRuntimeSetting,
-        handoffState,
-        replaceInput,
-        setInputAndCursor,
-        setMode,
-        setModel,
-        setTriggerIndex,
-        settingsService,
-    ]);
+    }, [handoffState, handoffSession, replaceInput]);
+    const handleModelSubmitPrompt = useCallback((text) => {
+        const state = handoffState;
+        if (!state || state.stage !== 'selecting_model')
+            return false;
+        handoffSession.selectModel(text);
+        modelSelectionHandledRef.current = true;
+        controller.replaceText(EFFORT_TRIGGER, EFFORT_TRIGGER.length);
+        return true;
+    }, [handoffState, handoffSession, controller]);
     return {
         handoffState,
         startHandoff,
@@ -146,6 +137,7 @@ export const useHandoffFlow = (deps) => {
         confirmStandardMode,
         declineStandardMode,
         completeHandoffWithEffort,
+        handleModelSubmitPrompt,
     };
 };
 //# sourceMappingURL=use-handoff-flow.js.map

package/dist/hooks/use-handoff-flow.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-handoff-flow.js","sourceRoot":"","sources":["../../source/hooks/use-handoff-flow.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-handoff-flow.js","sourceRoot":"","sources":["../../source/hooks/use-handoff-flow.ts"],"names":[],"mappings":"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"}

package/dist/hooks/use-model-selection.d.ts

@@ -26,5 +26,6 @@ export declare const useModelSelection: (deps: {
     refresh: () => void;
     canSwitchProvider: boolean;
     modelSettingConfig: import("../utils/ai/model-settings.js").ModelSettingConfig | undefined;
+    credentialRevision: number;
 };
 //# sourceMappingURL=use-model-selection.d.ts.map

package/dist/hooks/use-model-selection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-model-selection.d.ts","sourceRoot":"","sources":["../../source/hooks/use-model-selection.ts"],"names":[],"mappings":"AAEA,OAAO,EAA8C,KAAK,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAE1G,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAI3F,eAAO,MAAM,iBAAiB,SAAU;IAAE,cAAc,EAAE,eAAe,CAAC;IAAC,eAAe,EAAE,gBAAgB,CAAA;CAAE;;;;;;;;;;uBA4J7F,MAAM;;;;;;;;;iCAiEP,MAAM,GAAG,MAAM;;;;CAwD9B,CAAC"}
+{"version":3,"file":"use-model-selection.d.ts","sourceRoot":"","sources":["../../source/hooks/use-model-selection.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgB,KAAK,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAU3F,eAAO,MAAM,iBAAiB,SAAU;IAAE,cAAc,EAAE,eAAe,CAAC;IAAC,eAAe,EAAE,gBAAgB,CAAA;CAAE;;;;;;;;;;uBA4M7F,MAAM;;;;;;;;;iCAgEP,MAAM,GAAG,MAAM;;;;;CA2C9B,CAAC"}

package/dist/hooks/use-model-selection.js

@@ -1,12 +1,14 @@
 import { useCallback, useEffect, useMemo, useState, useRef } from 'react';
 import { useInputContext } from '../context/InputContext.js';
-import { fetchModels, filterModels, clearModelCache } from '../services/model-service.js';
-import { getProviderIds, sortProvidersByOrder } from '../providers/index.js';
+import { filterModels } from '../services/model-service.js';
+import { ModelCatalogSession } from '../services/models/model-catalog-session.js';
 import { parseModelProviderArg } from '../utils/ai/model-provider-arg.js';
 import { getModelSettingConfigForInput } from '../utils/ai/model-settings.js';
+import { getProviderCredentialSettingKey, getProviderIdForCredentialSettingKey, resolveProviderCredentials, } from '../utils/ai/provider-credentials.js';
 export const useModelSelection = (deps) => {
     const { loggingService, settingsService } = deps;
-    const { mode, setMode, input, cursorOffset, triggerIndex, setTriggerIndex } = useInputContext();
+    const { mode, input, cursorOffset, triggerIndex, controller } = useInputContext();
+    const catalogSession = useMemo(() => new ModelCatalogSession({ settingsService, loggingService }), [settingsService, loggingService]);
     const [models, setModels] = useState([]);
     const [loading, setLoading] = useState(false);
     const [error, setError] = useState(null);
@@ -14,26 +16,56 @@ export const useModelSelection = (deps) => {
     const [provider, setProvider] = useState(null);
     const [scrollOffset, setScrollOffset] = useState(0);
     const providerRef = useRef(null);
-    const failedProvidersRef = useRef(new Set());
     const isInitialLoadRef = useRef(true);
-    const loadRequestIdRef = useRef(0);
     const [refreshKey, setRefreshKey] = useState(0);
-    const modelsByProviderRef = useRef(new Map());
+    const [credentialRevision, setCredentialRevision] = useState(0);
     const shouldPreselectRef = useRef(false);
-    const isOpen = mode === 'model_selection';
+    const controllerFrame = controller.getSnapshot().stack.at(-1);
+    const isControllerOpen = controllerFrame?.kind === 'model';
+    const isOpen = isControllerOpen || mode === 'model_selection';
+    // getModelSettingConfigForInput reads the raw composer text directly, which
+    // is authoritative whether or not the model graph is controller-owned.
     const modelSettingConfig = getModelSettingConfigForInput(input);
     const canSwitchProvider = true;
+    useEffect(() => {
+        const unsubscribe = settingsService.onChange?.((changedKey) => {
+            if (!changedKey ||
+                changedKey === getProviderCredentialSettingKey('openai') ||
+                changedKey === getProviderCredentialSettingKey('openrouter')) {
+                const providerId = getProviderIdForCredentialSettingKey(changedKey);
+                if (providerId)
+                    catalogSession.invalidate(providerId);
+                else
+                    catalogSession.clear();
+                setCredentialRevision((revision) => revision + 1);
+            }
+            else if (changedKey === 'providers') {
+                catalogSession.clear();
+                setCredentialRevision((revision) => revision + 1);
+            }
+        });
+        return unsubscribe;
+    }, [settingsService]);
+    // While the model graph is controller-owned, the binding is the source of
+    // truth for both the query and the replacement start. Keep the legacy
+    // triggerIndex projection for callers that still use this hook directly.
+    const activeTriggerIndex = isControllerOpen ? controllerFrame.binding.replacement.start : triggerIndex;
     const query = useMemo(() => {
-        if (!isOpen || triggerIndex === null)
+        if (!isOpen)
+            return '';
+        if (isControllerOpen)
+            return parseModelProviderArg(controllerFrame.binding.query).modelId;
+        if (triggerIndex === null)
             return '';
         const end = Math.min(cursorOffset, input.length);
         return parseModelProviderArg(input.slice(triggerIndex, end)).modelId;
-    }, [isOpen, triggerIndex, input, cursorOffset]);
+    }, [isOpen, isControllerOpen, controllerFrame, triggerIndex, input, cursorOffset]);
     const getInitialProvider = useCallback(() => {
-        return modelSettingConfig
-            ? settingsService.get(modelSettingConfig.providerKey) ??
-                settingsService.get(modelSettingConfig.fallbackProviderKey ?? modelSettingConfig.providerKey)
+        const raw = modelSettingConfig
+            ? settingsService.getDynamic(modelSettingConfig.providerKey) ??
+                settingsService.getDynamic(modelSettingConfig.fallbackProviderKey ?? modelSettingConfig.providerKey)
             : settingsService.get('agent.provider');
+        return typeof raw === 'string' ? raw : null;
     }, [modelSettingConfig, settingsService]);
     const setCurrentProvider = useCallback((nextProvider) => {
         providerRef.current = nextProvider;
@@ -44,21 +76,40 @@ export const useModelSelection = (deps) => {
             if (providerRef.current === null) {
                 setCurrentProvider(getInitialProvider());
             }
-            failedProvidersRef.current.clear();
+            catalogSession.begin();
             isInitialLoadRef.current = true;
             shouldPreselectRef.current = true;
         }
-    }, [isOpen, getInitialProvider, setCurrentProvider]);
+    }, [isOpen, getInitialProvider, setCurrentProvider, catalogSession]);
     useEffect(() => {
         if (!isOpen || !provider)
             return;
-        const requestId = ++loadRequestIdRef.current;
-        const isCurrentRequest = () => requestId === loadRequestIdRef.current;
-        const cachedModels = modelsByProviderRef.current.get(provider);
+        const credentialResolution = resolveProviderCredentials(settingsService, provider);
+        if (credentialResolution.required && !credentialResolution.configured) {
+            const modelKey = modelSettingConfig ? modelSettingConfig.modelKey : 'agent.model';
+            const configuredModel = settingsService.getDynamic(modelKey);
+            const unavailableModels = typeof configuredModel === 'string' && configuredModel
+                ? [
+                    {
+                        id: configuredModel,
+                        provider,
+                        unavailableReason: credentialResolution.unavailableReason ?? 'missing-credentials',
+                    },
+                ]
+                : [];
+            setModels(unavailableModels);
+            setSelectedIndex(0);
+            setScrollOffset(0);
+            setLoading(false);
+            setError(null);
+            isInitialLoadRef.current = false;
+            return;
+        }
+        const cachedModels = catalogSession.getCached(provider);
         const load = async () => {
             // If already marked as failed, don't try again in this session
             // unless it's the only one left (covered by logic below)
-            if (failedProvidersRef.current.has(provider) && !isInitialLoadRef.current) {
+            if (!catalogSession.shouldRetry(provider, isInitialLoadRef.current)) {
                 return;
             }
             setModels(cachedModels ?? []);
@@ -66,44 +117,37 @@ export const useModelSelection = (deps) => {
             setScrollOffset(0);
             setLoading(!cachedModels);
             setError(null);
+            let stale = false;
             try {
-                const fetched = await fetchModels({ settingsService, loggingService }, provider);
-                if (!isCurrentRequest())
+                const result = await catalogSession.load(provider);
+                if (result.kind === 'stale') {
+                    stale = true;
                     return;
-                modelsByProviderRef.current.set(provider, fetched);
-                setModels(fetched);
+                }
+                setModels(result.models);
                 isInitialLoadRef.current = false;
             }
             catch (err) {
-                if (!isCurrentRequest())
-                    return;
                 const message = err instanceof Error ? err.message : String(err);
-                loggingService.warn(`Model selection fetch failed for ${provider}`, { error: message });
-                failedProvidersRef.current.add(provider);
                 setError(message);
             }
             finally {
-                if (isCurrentRequest()) {
+                if (!stale)
                     setLoading(false);
-                }
             }
         };
         load().catch((err) => {
-            if (!isCurrentRequest())
-                return;
             const message = err instanceof Error ? err.message : String(err);
             setError(message);
             setLoading(false);
         });
-    }, [isOpen, provider, settingsService, loggingService, refreshKey]);
+    }, [isOpen, provider, catalogSession, refreshKey, credentialRevision, modelSettingConfig, settingsService]);
     const refresh = useCallback(() => {
         if (!isOpen || !provider)
             return;
-        failedProvidersRef.current.delete(provider);
-        modelsByProviderRef.current.delete(provider);
-        clearModelCache(provider);
+        catalogSession.refresh(provider);
         setRefreshKey((k) => k + 1);
-    }, [isOpen, provider]);
+    }, [isOpen, provider, catalogSession]);
     const filteredModels = useMemo(() => {
         return filterModels(models, query);
     }, [models, query]);
@@ -117,8 +161,8 @@ export const useModelSelection = (deps) => {
         }
         if (shouldPreselectRef.current) {
             const modelKey = modelSettingConfig ? modelSettingConfig.modelKey : 'agent.model';
-            const currentModelValue = settingsService.get(modelKey);
-            if (currentModelValue) {
+            const currentModelValue = settingsService.getDynamic(modelKey);
+            if (typeof currentModelValue === 'string' && currentModelValue) {
                 const index = filteredModels.findIndex((m) => m.id === currentModelValue);
                 if (index >= 0) {
                     setSelectedIndex(index);
@@ -151,21 +195,20 @@ export const useModelSelection = (deps) => {
         if (mode === 'model_selection')
             return;
         setCurrentProvider(getInitialProvider());
-        setMode('model_selection');
-        setTriggerIndex(startIndex);
+        const editor = controller.getSnapshot().editor;
+        controller.replaceText(editor.text, Math.max(editor.cursor, startIndex));
         shouldPreselectRef.current = true;
         setSelectedIndex(0);
         setScrollOffset(0);
-    }, [mode, getInitialProvider, setCurrentProvider, setMode, setTriggerIndex]);
+    }, [mode, controller, getInitialProvider, setCurrentProvider]);
     const close = useCallback(() => {
         if (mode === 'model_selection') {
-            setMode('text');
-            setTriggerIndex(null);
+            controller.close();
             setCurrentProvider(null);
             setSelectedIndex(0);
             setScrollOffset(0);
         }
-    }, [mode, setCurrentProvider, setMode, setTriggerIndex]);
+    }, [mode, controller, setCurrentProvider]);
     const moveUp = useCallback(() => {
         shouldPreselectRef.current = false;
         setSelectedIndex((prev) => {
@@ -205,22 +248,12 @@ export const useModelSelection = (deps) => {
         return filteredModels[safeIndex];
     }, [filteredModels, selectedIndex]);
     const toggleProvider = useCallback((direction = 'next') => {
-        const allProviderIds = getProviderIds();
-        const providerOrder = settingsService.get('providerOrder') ?? [];
-        const orderedProviderIds = providerOrder.length > 0 ? sortProvidersByOrder(allProviderIds, providerOrder) : allProviderIds;
-        // If no providers available, stay on current
-        if (orderedProviderIds.length === 0)
+        const currentProvider = providerRef.current || getInitialProvider() || null;
+        const nextProvider = catalogSession.nextProvider(currentProvider, direction);
+        if (!nextProvider)
             return;
-        const currentProvider = providerRef.current || getInitialProvider() || orderedProviderIds[0];
-        const currentIndex = orderedProviderIds.indexOf(currentProvider);
-        const safeCurrentIndex = currentIndex >= 0 ? currentIndex : 0;
-        const nextIndex = direction === 'prev'
-            ? (safeCurrentIndex - 1 + orderedProviderIds.length) % orderedProviderIds.length
-            : (safeCurrentIndex + 1) % orderedProviderIds.length;
-        const nextProvider = orderedProviderIds[nextIndex];
-        const cachedModels = modelsByProviderRef.current.get(nextProvider);
+        const cachedModels = catalogSession.getCached(nextProvider);
         // If the user manually selects it, we should allow retrying it
-        failedProvidersRef.current.delete(nextProvider);
         shouldPreselectRef.current = true;
         setModels(cachedModels ?? []);
         setSelectedIndex(0);
@@ -228,10 +261,10 @@ export const useModelSelection = (deps) => {
         setLoading(!cachedModels);
         setError(null);
         setCurrentProvider(nextProvider);
-    }, [getInitialProvider, setCurrentProvider, settingsService]);
+    }, [getInitialProvider, setCurrentProvider, catalogSession]);
     return {
         isOpen,
-        triggerIndex,
+        triggerIndex: activeTriggerIndex, // Compatibility projection for legacy callers
         query,
         loading,
         error,
@@ -252,6 +285,7 @@ export const useModelSelection = (deps) => {
         refresh,
         canSwitchProvider,
         modelSettingConfig,
+        credentialRevision,
     };
 };
 //# sourceMappingURL=use-model-selection.js.map