@vybestack/llxprt-code 0.4.7 → 0.5.0-nightly.251102.f115237d

package/dist/src/ui/hooks/useLoadProfileDialog.js

@@ -6,12 +6,10 @@
 import { useCallback, useState } from 'react';
 import { MessageType } from '../types.js';
 import { useAppDispatch } from '../contexts/AppDispatchContext.js';
-import { ProfileManager, AuthType } from '@vybestack/llxprt-code-core';
-import { SettingScope, } from '../../config/settings.js';
-import { getProviderManager } from '../../providers/providerManagerInstance.js';
-import { setProviderApiKey, setProviderBaseUrl, } from '../../providers/providerConfigUtils.js';
-export const useLoadProfileDialog = ({ addMessage, appState, config, settings, }) => {
+import { useRuntimeApi } from '../contexts/RuntimeContext.js';
+export const useLoadProfileDialog = ({ addMessage, appState, config: _config, settings: _settings, }) => {
     const appDispatch = useAppDispatch();
+    const runtime = useRuntimeApi();
     const showDialog = appState.openDialogs.loadProfile;
     const [profiles, setProfiles] = useState([]);
     const [isLoading, setIsLoading] = useState(false);
@@ -22,8 +20,7 @@ export const useLoadProfileDialog = ({ addMessage, appState, config, settings, }
         // Open dialog immediately to show loading state
         appDispatch({ type: 'OPEN_DIALOG', payload: 'loadProfile' });
         try {
-            const profileManager = new ProfileManager();
-            const availableProfiles = await profileManager.listProfiles();
+            const availableProfiles = await runtime.listSavedProfiles();
             setProfiles(availableProfiles);
         }
         catch (e) {
@@ -38,62 +35,26 @@ export const useLoadProfileDialog = ({ addMessage, appState, config, settings, }
         finally {
             setIsLoading(false);
         }
-    }, [addMessage, appDispatch]);
+    }, [addMessage, appDispatch, runtime]);
     const closeDialog = useCallback(() => appDispatch({ type: 'CLOSE_DIALOG', payload: 'loadProfile' }), [appDispatch]);
     const handleSelect = useCallback(async (profileName) => {
         try {
-            // Load the profile
-            const profileManager = new ProfileManager();
-            const profile = await profileManager.loadProfile(profileName);
-            // Apply settings in the correct order:
-            // 1. Set provider first
-            const providerManager = config.getProviderManager();
-            if (providerManager) {
-                providerManager.setActiveProvider(profile.provider);
-                // Ensure provider manager is set on config
-                config.setProviderManager(providerManager);
-                // Update the provider in config
-                config.setProvider(profile.provider);
-            }
-            // 2. Set model second
-            config.setModel(profile.model);
-            // 3. Apply ephemeral settings third
-            for (const [key, value] of Object.entries(profile.ephemeralSettings)) {
-                // Special handling for auth-key and base-url
-                if (key === 'auth-key' && typeof value === 'string') {
-                    // Set API key for the provider - use the concrete provider manager
-                    const concreteProviderManager = getProviderManager();
-                    await setProviderApiKey(concreteProviderManager, settings, value, config);
-                }
-                else if (key === 'base-url' && typeof value === 'string') {
-                    // Set base URL for the provider - use the concrete provider manager
-                    const concreteProviderManager = getProviderManager();
-                    await setProviderBaseUrl(concreteProviderManager, settings, value);
-                }
-                else {
-                    // Use setValue with SettingScope.User for other ephemeral settings
-                    settings.setValue(SettingScope.User, key, value);
-                }
-            }
-            // 4. Call provider.setModelParams()
-            const activeProvider = providerManager?.getActiveProvider();
-            if (activeProvider &&
-                'setModelParams' in activeProvider &&
-                activeProvider.setModelParams) {
-                if (profile.modelParams &&
-                    Object.keys(profile.modelParams).length > 0) {
-                    activeProvider.setModelParams(profile.modelParams);
-                }
-            }
-            // 5. Refresh auth to ensure provider is properly initialized
-            const currentAuthType = config.getContentGeneratorConfig()?.authType ||
-                AuthType.LOGIN_WITH_GOOGLE;
-            await config.refreshAuth(currentAuthType);
+            const result = await runtime.loadProfileByName(profileName);
+            const extra = (result.infoMessages ?? [])
+                .map((message) => `\n- ${message}`)
+                .join('');
             addMessage({
                 type: MessageType.INFO,
-                content: `Profile '${profileName}' loaded`,
+                content: `Profile '${profileName}' loaded${extra}`,
                 timestamp: new Date(),
             });
+            for (const warning of result.warnings ?? []) {
+                addMessage({
+                    type: MessageType.INFO,
+                    content: `⚠ ${warning}`,
+                    timestamp: new Date(),
+                });
+            }
         }
         catch (error) {
             // Handle specific error messages
@@ -136,7 +97,7 @@ export const useLoadProfileDialog = ({ addMessage, appState, config, settings, }
             }
         }
         appDispatch({ type: 'CLOSE_DIALOG', payload: 'loadProfile' });
-    }, [addMessage, appDispatch, config, settings]);
+    }, [addMessage, appDispatch, runtime]);
     return {
         showDialog,
         openDialog,

package/dist/src/ui/hooks/useLoadProfileDialog.js.map

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

package/dist/src/ui/hooks/useOpenAIProviderInfo.d.ts

@@ -14,5 +14,5 @@ export interface UseOpenAIProviderInfoReturn extends OpenAIProviderInfo {
  * @param config The Config instance from the app
  * @returns OpenAI provider information and helper methods
  */
-export declare function useOpenAIProviderInfo(config: Config): UseOpenAIProviderInfoReturn;
+export declare function useOpenAIProviderInfo(_config: Config): UseOpenAIProviderInfoReturn;
 export {};

package/dist/src/ui/hooks/useOpenAIProviderInfo.js

@@ -5,21 +5,26 @@
  */
 import { useState, useEffect, useCallback } from 'react';
 import { getOpenAIProviderInfo, } from '@vybestack/llxprt-code-core';
-import { getProviderManager } from '../../providers/providerManagerInstance.js';
+import { useRuntimeApi } from '../contexts/RuntimeContext.js';
 /**
  * React hook to access OpenAI provider information including conversation cache
  * @param config The Config instance from the app
  * @returns OpenAI provider information and helper methods
  */
-export function useOpenAIProviderInfo(config) {
-    const [providerInfo, setProviderInfo] = useState(() => getOpenAIProviderInfo(getProviderManager(config)));
+export function useOpenAIProviderInfo(_config) {
+    const runtime = useRuntimeApi();
+    const getProviderInfo = useCallback(() => {
+        const services = runtime.getCliRuntimeServices();
+        return getOpenAIProviderInfo(services.providerManager);
+    }, [runtime]);
+    const [providerInfo, setProviderInfo] = useState(() => getProviderInfo());
     const refresh = useCallback(() => {
-        setProviderInfo(getOpenAIProviderInfo(getProviderManager(config)));
-    }, [config]);
+        setProviderInfo(getProviderInfo());
+    }, [getProviderInfo]);
     // Refresh when config changes or model switches
     useEffect(() => {
         const checkInterval = setInterval(() => {
-            const newInfo = getOpenAIProviderInfo(getProviderManager(config));
+            const newInfo = getProviderInfo();
             // Only update if something changed
             if (newInfo.currentModel !== providerInfo.currentModel ||
                 newInfo.isResponsesAPI !== providerInfo.isResponsesAPI ||
@@ -28,7 +33,7 @@ export function useOpenAIProviderInfo(config) {
             }
         }, 1000); // Check every second
         return () => clearInterval(checkInterval);
-    }, [config, providerInfo]);
+    }, [providerInfo, getProviderInfo]);
     const getCachedConversation = useCallback((conversationId, parentId) => {
         if (!providerInfo.conversationCache) {
             return null;

package/dist/src/ui/hooks/useOpenAIProviderInfo.js.map

@@ -1 +1 @@
-{"version":3,"file":"useOpenAIProviderInfo.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useOpenAIProviderInfo.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACzD,OAAO,EAGL,qBAAqB,GACtB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAahF;;;;GAIG;AACH,MAAM,UAAU,qBAAqB,CACnC,MAAc;IAEd,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAqB,GAAG,EAAE,CACxE,qBAAqB,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAClD,CAAC;IAEF,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,EAAE;QAC/B,eAAe,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACrE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEb,gDAAgD;IAChD,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,aAAa,GAAG,WAAW,CAAC,GAAG,EAAE;YACrC,MAAM,OAAO,GAAG,qBAAqB,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC;YAElE,mCAAmC;YACnC,IACE,OAAO,CAAC,YAAY,KAAK,YAAY,CAAC,YAAY;gBAClD,OAAO,CAAC,cAAc,KAAK,YAAY,CAAC,cAAc;gBACtD,CAAC,OAAO,CAAC,QAAQ,KAAK,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,KAAK,IAAI,CAAC,EAChE,CAAC;gBACD,eAAe,CAAC,OAAO,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,qBAAqB;QAE/B,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAC5C,CAAC,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;IAE3B,MAAM,qBAAqB,GAAG,WAAW,CACvC,CAAC,cAAsB,EAAE,QAAgB,EAAE,EAAE;QAC3C,IAAI,CAAC,YAAY,CAAC,iBAAiB,EAAE,CAAC;YACpC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,YAAY,CAAC,iBAAiB,CAAC,GAAG,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;IACtE,CAAC,EACD,CAAC,YAAY,CAAC,iBAAiB,CAAC,CACjC,CAAC;IAEF,OAAO;QACL,GAAG,YAAY;QACf,OAAO;QACP,qBAAqB;KACtB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"useOpenAIProviderInfo.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useOpenAIProviderInfo.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACzD,OAAO,EAGL,qBAAqB,GACtB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAa9D;;;;GAIG;AACH,MAAM,UAAU,qBAAqB,CACnC,OAAe;IAEf,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;IAChC,MAAM,eAAe,GAAG,WAAW,CAAC,GAAG,EAAE;QACvC,MAAM,QAAQ,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC;QACjD,OAAO,qBAAqB,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IACzD,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IACd,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAqB,GAAG,EAAE,CACxE,eAAe,EAAE,CAClB,CAAC;IAEF,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,EAAE;QAC/B,eAAe,CAAC,eAAe,EAAE,CAAC,CAAC;IACrC,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;IAEtB,gDAAgD;IAChD,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,aAAa,GAAG,WAAW,CAAC,GAAG,EAAE;YACrC,MAAM,OAAO,GAAG,eAAe,EAAE,CAAC;YAElC,mCAAmC;YACnC,IACE,OAAO,CAAC,YAAY,KAAK,YAAY,CAAC,YAAY;gBAClD,OAAO,CAAC,cAAc,KAAK,YAAY,CAAC,cAAc;gBACtD,CAAC,OAAO,CAAC,QAAQ,KAAK,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,KAAK,IAAI,CAAC,EAChE,CAAC;gBACD,eAAe,CAAC,OAAO,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,qBAAqB;QAE/B,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAC5C,CAAC,EAAE,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC,CAAC;IAEpC,MAAM,qBAAqB,GAAG,WAAW,CACvC,CAAC,cAAsB,EAAE,QAAgB,EAAE,EAAE;QAC3C,IAAI,CAAC,YAAY,CAAC,iBAAiB,EAAE,CAAC;YACpC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,YAAY,CAAC,iBAAiB,CAAC,GAAG,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;IACtE,CAAC,EACD,CAAC,YAAY,CAAC,iBAAiB,CAAC,CACjC,CAAC;IAEF,OAAO;QACL,GAAG,YAAY;QACf,OAAO;QACP,qBAAqB;KACtB,CAAC;AACJ,CAAC"}

package/dist/src/ui/hooks/useProviderDialog.d.ts

@@ -17,7 +17,7 @@ interface UseProviderDialogParams {
     config: Config;
     onClear?: () => void;
 }
-export declare const useProviderDialog: ({ addMessage, onProviderChange, appState, config, onClear, }: UseProviderDialogParams) => {
+export declare const useProviderDialog: ({ addMessage, onProviderChange, appState, config: _config, onClear, }: UseProviderDialogParams) => {
     showDialog: boolean;
     openDialog: () => void;
     closeDialog: () => void;

package/dist/src/ui/hooks/useProviderDialog.js

@@ -4,31 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { useCallback, useState } from 'react';
-import { getProviderManager } from '../../providers/providerManagerInstance.js';
 import { MessageType } from '../types.js';
 import { useAppDispatch } from '../contexts/AppDispatchContext.js';
-import { AuthType } from '@vybestack/llxprt-code-core';
-const PROVIDER_SWITCH_EPHEMERAL_KEYS = [
-    'auth-key',
-    'auth-keyfile',
-    'base-url',
-    'context-limit',
-    'compression-threshold',
-    'tool-format',
-    'api-version',
-    'custom-headers',
-    'model',
-];
-export const useProviderDialog = ({ addMessage, onProviderChange, appState, config, onClear, }) => {
+import { useRuntimeApi } from '../contexts/RuntimeContext.js';
+export const useProviderDialog = ({ addMessage, onProviderChange, appState, config: _config, onClear, }) => {
     const appDispatch = useAppDispatch();
+    const runtime = useRuntimeApi();
     const showDialog = appState.openDialogs.provider;
     const [providers, setProviders] = useState([]);
     const [currentProvider, setCurrentProvider] = useState('');
     const openDialog = useCallback(() => {
         try {
-            const providerManager = getProviderManager();
-            setProviders(providerManager.listProviders());
-            setCurrentProvider(providerManager.getActiveProviderName());
+            setProviders(runtime.listProviders());
+            setCurrentProvider(runtime.getActiveProviderName());
             appDispatch({ type: 'OPEN_DIALOG', payload: 'provider' });
         }
         catch (e) {
@@ -38,77 +26,17 @@ export const useProviderDialog = ({ addMessage, onProviderChange, appState, conf
                 timestamp: new Date(),
             });
         }
-    }, [addMessage, appDispatch]);
+    }, [addMessage, appDispatch, runtime]);
     const closeDialog = useCallback(() => appDispatch({ type: 'CLOSE_DIALOG', payload: 'provider' }), [appDispatch]);
     const handleSelect = useCallback(async (providerName) => {
         try {
-            const providerManager = getProviderManager();
-            const prev = providerManager.getActiveProviderName();
-            // Reset provider-specific ephemeral settings before switching
-            for (const key of PROVIDER_SWITCH_EPHEMERAL_KEYS) {
-                config.setEphemeralSetting(key, undefined);
-            }
-            // Clear cached state on the target provider if possible
-            const providersMap = providerManager.providers;
-            if (providersMap && providersMap instanceof Map) {
-                const targetProvider = providersMap.get(providerName);
-                targetProvider?.clearState?.();
-            }
-            // Switch provider first
-            providerManager.setActiveProvider(providerName);
-            // Ensure provider manager is set on config and update provider reference
-            config.setProviderManager(providerManager);
-            config.setProvider(providerName);
-            const activeProvider = providerManager.getActiveProvider();
-            // Reset provider state that may linger between providers
-            activeProvider.setBaseUrl?.(undefined);
-            activeProvider.setModelParams?.({});
-            // Provider-specific defaults (e.g., qwen base URL)
-            if (providerName === 'qwen') {
-                const baseUrl = 'https://portal.qwen.ai/v1';
-                config.setEphemeralSetting('base-url', baseUrl);
-                activeProvider.setBaseUrl?.(baseUrl);
-            }
-            const defaultModel = activeProvider.getDefaultModel?.() ||
-                activeProvider.getCurrentModel?.() ||
-                '';
-            if (defaultModel) {
-                activeProvider.setModel?.(defaultModel);
-                config.setModel(defaultModel);
-            }
-            else {
-                config.setModel('');
-            }
-            // With HistoryService and ContentConverters, we can now keep conversation history
-            // when switching providers as the conversion handles format differences
-            // Determine appropriate auth type
-            let authType;
-            if (providerName === 'gemini') {
-                // When switching TO Gemini, determine appropriate auth
-                const currentAuthType = config.getContentGeneratorConfig()?.authType;
-                // If we were using provider auth, switch to appropriate Gemini auth
-                if (currentAuthType === AuthType.USE_PROVIDER || !currentAuthType) {
-                    if (process.env.GOOGLE_APPLICATION_CREDENTIALS) {
-                        authType = AuthType.USE_VERTEX_AI;
-                    }
-                    else if (process.env.GEMINI_API_KEY) {
-                        authType = AuthType.USE_GEMINI;
-                    }
-                    else {
-                        authType = AuthType.LOGIN_WITH_GOOGLE; // Default to OAuth
-                    }
-                }
-                else {
-                    // Keep existing Gemini auth type
-                    authType = currentAuthType;
-                }
-            }
-            else {
-                // When switching to non-Gemini provider
-                authType = AuthType.USE_PROVIDER;
-            }
-            // Refresh auth with the appropriate type
-            await config.refreshAuth(authType);
+            const prev = runtime.getActiveProviderName();
+            /**
+             * @plan:PLAN-20250218-STATELESSPROVIDER.P06
+             * @requirement:REQ-SP-005
+             * @pseudocode:cli-runtime.md line 9
+             */
+            const result = await runtime.switchActiveProvider(providerName);
             // Clear UI history to prevent tool call ID mismatches
             if (onClear) {
                 onClear();
@@ -118,15 +46,14 @@ export const useProviderDialog = ({ addMessage, onProviderChange, appState, conf
                 content: `Switched from ${prev || 'none'} to ${providerName}`,
                 timestamp: new Date(),
             });
-            // Show additional info for non-Gemini providers
-            if (providerName !== 'gemini') {
+            for (const info of result.infoMessages) {
                 addMessage({
                     type: MessageType.INFO,
-                    content: `Use /key to set API key if needed.`,
+                    content: info,
                     timestamp: new Date(),
                 });
             }
-            setCurrentProvider(providerName);
+            setCurrentProvider(result.nextProvider);
             onProviderChange?.();
         }
         catch (e) {
@@ -137,7 +64,7 @@ export const useProviderDialog = ({ addMessage, onProviderChange, appState, conf
             });
         }
         appDispatch({ type: 'CLOSE_DIALOG', payload: 'provider' });
-    }, [addMessage, onProviderChange, appDispatch, config, onClear]);
+    }, [addMessage, onProviderChange, appDispatch, onClear, runtime]);
     return {
         showDialog,
         openDialog,

package/dist/src/ui/hooks/useProviderDialog.js.map

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

package/dist/src/ui/hooks/useProviderModelDialog.d.ts

@@ -3,7 +3,7 @@
  * Copyright 2025 Vybestack LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { IModel } from '../../providers/index.js';
+import type { IModel } from '@vybestack/llxprt-code-core';
 import { MessageType } from '../types.js';
 import { AppState } from '../reducers/appReducer.js';
 interface UseProviderModelDialogParams {
@@ -21,6 +21,6 @@ export declare const useProviderModelDialog: ({ addMessage, onModelChange, appSt
     closeDialog: () => void;
     models: IModel[];
     currentModel: string;
-    handleSelect: (modelId: string) => void;
+    handleSelect: (modelId: string) => Promise<void>;
 };
 export {};

package/dist/src/ui/hooks/useProviderModelDialog.js

@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { useCallback, useState } from 'react';
-import { getProviderManager } from '../../providers/providerManagerInstance.js';
 import { MessageType } from '../types.js';
 import { useAppDispatch } from '../contexts/AppDispatchContext.js';
+import { useRuntimeApi } from '../contexts/RuntimeContext.js';
 export const useProviderModelDialog = ({ addMessage, onModelChange, appState, }) => {
     const appDispatch = useAppDispatch();
+    const runtime = useRuntimeApi();
     const showDialog = appState.openDialogs.providerModel;
     const [models, setModels] = useState([]);
     const [currentModel, setCurrentModel] = useState('');
     const openDialog = useCallback(async () => {
         try {
-            const provider = getProviderManager().getActiveProvider();
-            const list = await provider.getModels();
+            const list = await runtime.listAvailableModels();
             setModels(list);
-            setCurrentModel(provider.getCurrentModel?.() ?? '');
+            setCurrentModel(runtime.getActiveModelName());
             appDispatch({ type: 'OPEN_DIALOG', payload: 'providerModel' });
         }
         catch (e) {
@@ -27,29 +27,28 @@ export const useProviderModelDialog = ({ addMessage, onModelChange, appState, })
                 timestamp: new Date(),
             });
         }
-    }, [addMessage, appDispatch]);
+    }, [addMessage, appDispatch, runtime]);
     const closeDialog = useCallback(() => appDispatch({ type: 'CLOSE_DIALOG', payload: 'providerModel' }), [appDispatch]);
-    const handleSelect = useCallback((modelId) => {
+    const handleSelect = useCallback(async (modelId) => {
         try {
-            const provider = getProviderManager().getActiveProvider();
-            const prev = provider.getCurrentModel?.() ?? '';
-            provider.setModel?.(modelId);
+            const result = await runtime.setActiveModel(modelId);
             addMessage({
                 type: MessageType.INFO,
-                content: `Switched from ${prev} to ${modelId} in provider '${provider.name}'`,
+                content: `Switched from ${result.previousModel ?? 'unknown'} to ${result.nextModel} in provider '${result.providerName}'`,
                 timestamp: new Date(),
             });
             onModelChange?.();
         }
         catch (e) {
+            const status = runtime.getActiveProviderStatus();
             addMessage({
                 type: MessageType.ERROR,
-                content: `Failed to switch model: ${e instanceof Error ? e.message : String(e)}`,
+                content: `Failed to switch model for provider '${status.providerName ?? 'unknown'}': ${e instanceof Error ? e.message : String(e)}`,
                 timestamp: new Date(),
             });
         }
         appDispatch({ type: 'CLOSE_DIALOG', payload: 'providerModel' });
-    }, [addMessage, onModelChange, appDispatch]);
+    }, [addMessage, onModelChange, appDispatch, runtime]);
     return {
         showDialog,
         openDialog,

package/dist/src/ui/hooks/useProviderModelDialog.js.map

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

package/dist/src/ui/hooks/useReactToolScheduler.d.ts

@@ -26,7 +26,9 @@ export type TrackedCancelledToolCall = CancelledToolCall & {
     responseSubmittedToGemini?: boolean;
 };
 export type TrackedToolCall = TrackedScheduledToolCall | TrackedValidatingToolCall | TrackedWaitingToolCall | TrackedExecutingToolCall | TrackedCompletedToolCall | TrackedCancelledToolCall;
-export declare function useReactToolScheduler(onComplete: (tools: CompletedToolCall[]) => void, config: Config, setPendingHistoryItem: React.Dispatch<React.SetStateAction<HistoryItemWithoutId | null>>, getPreferredEditor: () => EditorType | undefined, onEditorClose: () => void): [TrackedToolCall[], ScheduleFn, MarkToolsAsSubmittedFn];
+export declare function useReactToolScheduler(onComplete: (schedulerId: symbol, tools: CompletedToolCall[], options: {
+    isPrimary: boolean;
+}) => Promise<void> | void, config: Config, setPendingHistoryItem: React.Dispatch<React.SetStateAction<HistoryItemWithoutId | null>>, getPreferredEditor: () => EditorType | undefined, onEditorClose: () => void): [TrackedToolCall[], ScheduleFn, MarkToolsAsSubmittedFn];
 /**
  * Transforms `TrackedToolCall` objects into `HistoryItemToolGroup` objects for UI display.
  */