dexto 1.5.7 → 1.6.0

package/dist/cli/ink-cli/components/overlays/CustomModelWizard.js

@@ -10,10 +10,10 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  */
 import { useState, useEffect, forwardRef, useImperativeHandle, useCallback, useRef, } from 'react';
 import { Box, Text } from 'ink';
-import { saveCustomModel, deleteCustomModel, CUSTOM_MODEL_PROVIDERS, saveProviderApiKey, getProviderKeyStatus, resolveApiKeyForProvider, determineApiKeyStorage, } from '@dexto/agent-management';
+import { saveCustomModel, deleteCustomModel, saveProviderApiKey, getProviderKeyStatus, resolveApiKeyForProvider, determineApiKeyStorage, } from '@dexto/agent-management';
 import { logger } from '@dexto/core';
 // Import from new modular architecture
-import { getProviderConfig, getAvailableProviders, runAsyncValidation, } from './custom-model-wizard/provider-config.js';
+import { getProviderConfig, getAvailableProviders, getProviderByMenuIndex, runAsyncValidation, } from './custom-model-wizard/provider-config.js';
 import { ProviderSelector, WizardStepInput, SetupInfoBanner, ApiKeyStep, } from './custom-model-wizard/shared/index.js';
 import LocalModelWizard from './custom-model-wizard/LocalModelWizard.js';
 /**
@@ -54,6 +54,7 @@ const CustomModelWizard = forwardRef(function CustomModelWizard({ isVisible, onC
             if (initialModel) {
                 // Editing mode - pre-populate from initialModel
                 const provider = initialModel.provider ?? 'openai-compatible';
+                const providers = getAvailableProviders();
                 setSelectedProvider(provider);
                 setOriginalName(initialModel.name);
                 setValues({
@@ -61,11 +62,14 @@ const CustomModelWizard = forwardRef(function CustomModelWizard({ isVisible, onC
                     baseURL: initialModel.baseURL ?? '',
                     displayName: initialModel.displayName ?? '',
                     maxInputTokens: initialModel.maxInputTokens?.toString() ?? '',
+                    reasoningEffort: initialModel.reasoningEffort ?? '',
                     apiKey: initialModel.apiKey ?? '',
+                    filePath: initialModel.filePath ?? '',
                 });
                 setCurrentStep(0);
                 setCurrentInput(initialModel.name);
-                setProviderIndex(CUSTOM_MODEL_PROVIDERS.indexOf(provider));
+                const idx = providers.indexOf(provider);
+                setProviderIndex(idx >= 0 ? idx : 0);
             }
             else {
                 // Adding mode - reset everything
@@ -82,7 +86,7 @@ const CustomModelWizard = forwardRef(function CustomModelWizard({ isVisible, onC
         }
     }, [isVisible, initialModel]);
     const handleProviderSelect = useCallback(() => {
-        const provider = CUSTOM_MODEL_PROVIDERS[providerIndex];
+        const provider = getProviderByMenuIndex(providerIndex);
         if (provider) {
             setSelectedProvider(provider);
             setCurrentStep(0);

package/dist/cli/ink-cli/components/overlays/LogLevelSelector.js

@@ -8,7 +8,7 @@ import { Box, Text } from 'ink';
 import { BaseSelector } from '../base/BaseSelector.js';
 // Log levels matching DextoLogger's supported levels
 const LOG_LEVELS = [
-    { level: 'error', description: 'Errors only', icon: '❌' },
+    { level: 'error', description: 'Errors only', icon: '!' },
     { level: 'warn', description: 'Warnings and above', icon: '⚠️' },
     { level: 'info', description: 'Info and above (default)', icon: 'ℹ️' },
     { level: 'debug', description: 'Debug information', icon: '🔍' },

package/dist/cli/ink-cli/components/overlays/McpRemoveSelector.js

@@ -47,7 +47,7 @@ const McpRemoveSelector = forwardRef(function McpRemoveSelector({ isVisible, onS
             case 'auth-required':
                 return '🔐';
             case 'error':
-                return '❌';
+                return '!';
         }
     };
     // Get display text for status

package/dist/cli/ink-cli/components/overlays/ModelSelectorRefactored.d.ts

@@ -11,6 +11,7 @@ type ReasoningEffort = 'none' | 'minimal' | 'low' | 'medium' | 'high' | 'xhigh';
 interface ModelSelectorProps {
     isVisible: boolean;
     onSelectModel: (provider: LLMProvider, model: string, displayName?: string, baseURL?: string, reasoningEffort?: ReasoningEffort) => void;
+    onSetDefaultModel: (provider: LLMProvider, model: string, displayName?: string, baseURL?: string, reasoningEffort?: ReasoningEffort) => Promise<void>;
     onClose: () => void;
     onAddCustomModel: () => void;
     onEditCustomModel: (model: CustomModel) => void;

package/dist/cli/ink-cli/components/overlays/ModelSelectorRefactored.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ModelSelectorRefactored.d.ts","sourceRoot":"","sources":["../../../../../src/cli/ink-cli/components/overlays/ModelSelectorRefactored.tsx"],"names":[],"mappings":"AAAA;;;;;GAKG;AAYH,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qCAAqC,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAO3D,OAAO,EAKH,KAAK,WAAW,EACnB,MAAM,yBAAyB,CAAC;AAEjC,KAAK,eAAe,GAAG,MAAM,GAAG,SAAS,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,CAAC;AAEhF,UAAU,kBAAkB;IACxB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,CACX,QAAQ,EAAE,WAAW,EACrB,KAAK,EAAE,MAAM,EACb,WAAW,CAAC,EAAE,MAAM,EACpB,OAAO,CAAC,EAAE,MAAM,EAChB,eAAe,CAAC,EAAE,eAAe,KAChC,IAAI,CAAC;IACV,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,gBAAgB,EAAE,MAAM,IAAI,CAAC;IAC7B,iBAAiB,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IAChD,KAAK,EAAE,UAAU,CAAC;CACrB;AAED,MAAM,WAAW,mBAAmB;IAChC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAmDD;;GAEG;AACH,QAAA,MAAM,aAAa,oHAitBjB,CAAC;AAEH,eAAe,aAAa,CAAC"}
+{"version":3,"file":"ModelSelectorRefactored.d.ts","sourceRoot":"","sources":["../../../../../src/cli/ink-cli/components/overlays/ModelSelectorRefactored.tsx"],"names":[],"mappings":"AAAA;;;;;GAKG;AAYH,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qCAAqC,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAO3D,OAAO,EAMH,KAAK,WAAW,EACnB,MAAM,yBAAyB,CAAC;AAGjC,KAAK,eAAe,GAAG,MAAM,GAAG,SAAS,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,CAAC;AAEhF,UAAU,kBAAkB;IACxB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,CACX,QAAQ,EAAE,WAAW,EACrB,KAAK,EAAE,MAAM,EACb,WAAW,CAAC,EAAE,MAAM,EACpB,OAAO,CAAC,EAAE,MAAM,EAChB,eAAe,CAAC,EAAE,eAAe,KAChC,IAAI,CAAC;IACV,iBAAiB,EAAE,CACf,QAAQ,EAAE,WAAW,EACrB,KAAK,EAAE,MAAM,EACb,WAAW,CAAC,EAAE,MAAM,EACpB,OAAO,CAAC,EAAE,MAAM,EAChB,eAAe,CAAC,EAAE,eAAe,KAChC,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,gBAAgB,EAAE,MAAM,IAAI,CAAC;IAC7B,iBAAiB,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IAChD,KAAK,EAAE,UAAU,CAAC;CACrB;AAED,MAAM,WAAW,mBAAmB;IAChC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAoDD;;GAEG;AACH,QAAA,MAAM,aAAa,oHAq3BjB,CAAC;AAEH,eAAe,aAAa,CAAC"}

package/dist/cli/ink-cli/components/overlays/ModelSelectorRefactored.js

@@ -8,7 +8,8 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { useState, useEffect, forwardRef, useRef, useImperativeHandle, useMemo, useCallback, } from 'react';
 import { Box, Text } from 'ink';
 import { listOllamaModels, DEFAULT_OLLAMA_URL, getLocalModelById, isReasoningCapableModel, } from '@dexto/core';
-import { loadCustomModels, deleteCustomModel, getAllInstalledModels, isDextoAuthEnabled, } from '@dexto/agent-management';
+import { loadCustomModels, deleteCustomModel, getAllInstalledModels, loadGlobalPreferences, isDextoAuthEnabled, } from '@dexto/agent-management';
+import { getLLMProviderDisplayName } from '../../utils/llm-provider-display.js';
 function isAddCustomOption(item) {
     return 'type' in item && item.type === 'add-custom';
 }
@@ -34,7 +35,7 @@ const REASONING_EFFORT_OPTIONS = [
 /**
  * Model selector with search and custom model support
  */
-const ModelSelector = forwardRef(function ModelSelector({ isVisible, onSelectModel, onClose, onAddCustomModel, onEditCustomModel, agent }, ref) {
+const ModelSelector = forwardRef(function ModelSelector({ isVisible, onSelectModel, onSetDefaultModel, onClose, onAddCustomModel, onEditCustomModel, agent, }, ref) {
     const [models, setModels] = useState([]);
     const [customModels, setCustomModels] = useState([]);
     const [isLoading, setIsLoading] = useState(false);
@@ -48,6 +49,8 @@ const ModelSelector = forwardRef(function ModelSelector({ isVisible, onSelectMod
     // Reasoning effort sub-step state
     const [pendingReasoningModel, setPendingReasoningModel] = useState(null);
     const [reasoningEffortIndex, setReasoningEffortIndex] = useState(0); // Default to 'Auto' (index 0)
+    const [isSettingDefault, setIsSettingDefault] = useState(false); // Track if setting as default vs normal selection
+    const [refreshVersion, setRefreshVersion] = useState(0);
     // Keep ref in sync
     selectedIndexRef.current = selectedIndex;
     // Clear delete confirmation timeout on unmount
@@ -70,6 +73,7 @@ const ModelSelector = forwardRef(function ModelSelector({ isVisible, onSelectMod
         setCustomModelAction(null);
         setPendingDeleteConfirm(false);
         setPendingReasoningModel(null);
+        setIsSettingDefault(false);
         setReasoningEffortIndex(0); // Default to 'Auto'
         if (deleteTimeoutRef.current) {
             clearTimeout(deleteTimeoutRef.current);
@@ -77,13 +81,18 @@ const ModelSelector = forwardRef(function ModelSelector({ isVisible, onSelectMod
         }
         const fetchModels = async () => {
             try {
-                const [allModels, providers, currentConfig, loadedCustomModels] = await Promise.all([
+                const [allModels, providers, currentConfig, loadedCustomModels, preferences] = await Promise.all([
                     Promise.resolve(agent.getSupportedModels()),
                     Promise.resolve(agent.getSupportedProviders()),
                     Promise.resolve(agent.getCurrentLLMConfig()),
                     loadCustomModels(),
+                    loadGlobalPreferences().catch(() => null),
                 ]);
                 const modelList = [];
+                const defaultProvider = preferences?.llm.provider;
+                const defaultModel = preferences?.llm.model;
+                const defaultBaseURL = preferences?.llm.baseURL;
+                const defaultReasoningEffort = preferences?.llm.reasoningEffort;
                 // Fetch dynamic models for local providers
                 let ollamaModels = [];
                 let localModels = [];
@@ -109,8 +118,8 @@ const ModelSelector = forwardRef(function ModelSelector({ isVisible, onSelectMod
                         provider: customProvider,
                         name: custom.name,
                         displayName: custom.displayName || custom.name,
-                        maxInputTokens: custom.maxInputTokens || 128000,
-                        isDefault: false,
+                        maxInputTokens: custom.maxInputTokens ?? 128000,
+                        isDefault: customProvider === defaultProvider && custom.name === defaultModel,
                         isCurrent: currentConfig.provider === customProvider &&
                             currentConfig.model === custom.name,
                         isCustom: true,
@@ -118,6 +127,9 @@ const ModelSelector = forwardRef(function ModelSelector({ isVisible, onSelectMod
                     if (custom.baseURL) {
                         modelOption.baseURL = custom.baseURL;
                     }
+                    if (custom.reasoningEffort) {
+                        modelOption.reasoningEffort = custom.reasoningEffort;
+                    }
                     modelList.push(modelOption);
                 }
                 // Add registry models
@@ -134,13 +146,13 @@ const ModelSelector = forwardRef(function ModelSelector({ isVisible, onSelectMod
                     if (provider === 'ollama' || provider === 'local' || provider === 'vertex') {
                         continue;
                     }
-                    // Skip dexto provider when feature is not enabled
-                    if (provider === 'dexto' && !isDextoAuthEnabled()) {
+                    // Skip dexto-nova provider when feature is not enabled
+                    if (provider === 'dexto-nova' && !isDextoAuthEnabled()) {
                         continue;
                     }
                     const providerModels = allModels[provider];
                     for (const model of providerModels) {
-                        // For dexto provider, models have originalProvider field
+                        // For dexto-nova provider, models have originalProvider field
                         // showing which provider the model originally came from
                         const originalProvider = 'originalProvider' in model ? model.originalProvider : undefined;
                         modelList.push({
@@ -148,10 +160,20 @@ const ModelSelector = forwardRef(function ModelSelector({ isVisible, onSelectMod
                             name: model.name,
                             displayName: model.displayName,
                             maxInputTokens: model.maxInputTokens,
-                            isDefault: model.isDefault,
+                            isDefault: provider === defaultProvider && model.name === defaultModel,
                             isCurrent: provider === currentConfig.provider &&
                                 model.name === currentConfig.model,
                             isCustom: false,
+                            ...(defaultReasoningEffort &&
+                                provider === defaultProvider &&
+                                model.name === defaultModel
+                                ? { reasoningEffort: defaultReasoningEffort }
+                                : {}),
+                            ...(defaultBaseURL &&
+                                provider === defaultProvider &&
+                                model.name === defaultModel
+                                ? { baseURL: defaultBaseURL }
+                                : {}),
                             // Store original provider for display purposes
                             ...(originalProvider && { originalProvider }),
                         });
@@ -164,7 +186,7 @@ const ModelSelector = forwardRef(function ModelSelector({ isVisible, onSelectMod
                         name: ollamaModel.name,
                         displayName: ollamaModel.name,
                         maxInputTokens: 128000, // Default, actual varies by model
-                        isDefault: false,
+                        isDefault: defaultProvider === 'ollama' && defaultModel === ollamaModel.name,
                         isCurrent: currentConfig.provider === 'ollama' &&
                             currentConfig.model === ollamaModel.name,
                         isCustom: false,
@@ -181,7 +203,7 @@ const ModelSelector = forwardRef(function ModelSelector({ isVisible, onSelectMod
                         name: localModel.id,
                         displayName,
                         maxInputTokens,
-                        isDefault: false,
+                        isDefault: defaultProvider === 'local' && defaultModel === localModel.id,
                         isCurrent: currentConfig.provider === 'local' &&
                             currentConfig.model === localModel.id,
                         isCustom: false,
@@ -196,10 +218,15 @@ const ModelSelector = forwardRef(function ModelSelector({ isVisible, onSelectMod
                             name: model.name,
                             displayName: model.displayName,
                             maxInputTokens: model.maxInputTokens,
-                            isDefault: model.isDefault,
+                            isDefault: defaultProvider === 'vertex' && defaultModel === model.name,
                             isCurrent: currentConfig.provider === 'vertex' &&
                                 currentConfig.model === model.name,
                             isCustom: false,
+                            ...(defaultReasoningEffort &&
+                                defaultProvider === 'vertex' &&
+                                defaultModel === model.name
+                                ? { reasoningEffort: defaultReasoningEffort }
+                                : {}),
                         });
                     }
                 }
@@ -226,7 +253,7 @@ const ModelSelector = forwardRef(function ModelSelector({ isVisible, onSelectMod
         return () => {
             cancelled = true;
         };
-    }, [isVisible, agent]);
+    }, [isVisible, agent, refreshVersion]);
     // Filter models based on search query
     const filteredItems = useMemo(() => {
         const addCustomOption = { type: 'add-custom' };
@@ -293,6 +320,7 @@ const ModelSelector = forwardRef(function ModelSelector({ isVisible, onSelectMod
                 if (key.escape) {
                     // Go back to model selection
                     setPendingReasoningModel(null);
+                    setIsSettingDefault(false);
                     return true;
                 }
                 if (key.upArrow) {
@@ -306,8 +334,21 @@ const ModelSelector = forwardRef(function ModelSelector({ isVisible, onSelectMod
                 if (key.return) {
                     const selectedOption = REASONING_EFFORT_OPTIONS[reasoningEffortIndex];
                     const reasoningEffort = selectedOption?.value === 'auto' ? undefined : selectedOption?.value;
-                    onSelectModel(pendingReasoningModel.provider, pendingReasoningModel.name, pendingReasoningModel.displayName, pendingReasoningModel.baseURL, reasoningEffort);
+                    if (isSettingDefault) {
+                        // Setting as default model
+                        clearActionState();
+                        void (async () => {
+                            await onSetDefaultModel(pendingReasoningModel.provider, pendingReasoningModel.name, pendingReasoningModel.displayName, pendingReasoningModel.baseURL, reasoningEffort);
+                            setRefreshVersion((prev) => prev + 1);
+                            onClose(); // Close overlay after setting default
+                        })();
+                    }
+                    else {
+                        // Normal model selection
+                        onSelectModel(pendingReasoningModel.provider, pendingReasoningModel.name, pendingReasoningModel.displayName, pendingReasoningModel.baseURL, reasoningEffort);
+                    }
                     setPendingReasoningModel(null);
+                    setIsSettingDefault(false);
                     return true;
                 }
                 return true; // Consume all input in reasoning effort mode
@@ -324,26 +365,50 @@ const ModelSelector = forwardRef(function ModelSelector({ isVisible, onSelectMod
             }
             const itemsLength = filteredItems.length;
             const currentItem = filteredItems[selectedIndexRef.current];
-            const isOnCustomModel = currentItem && !isAddCustomOption(currentItem) && currentItem.isCustom;
-            // Right arrow - enter/advance action mode for custom models
+            const isCustomActionItem = currentItem && !isAddCustomOption(currentItem) && currentItem.isCustom;
+            const isSelectableItem = currentItem && !isAddCustomOption(currentItem);
+            const isOnActionItem = isCustomActionItem || isSelectableItem;
+            // Right arrow - enter/advance action mode for custom or selectable models
             if (key.rightArrow) {
-                if (!isOnCustomModel)
+                if (!isOnActionItem)
                     return false;
                 if (customModelAction === null) {
-                    // Enter edit mode
-                    setCustomModelAction('edit');
+                    if (isCustomActionItem) {
+                        setCustomModelAction('edit');
+                    }
+                    else {
+                        setCustomModelAction('default');
+                    }
                     return true;
                 }
-                else if (customModelAction === 'edit') {
-                    // Advance to delete mode
-                    setCustomModelAction('delete');
-                    setPendingDeleteConfirm(false);
+                if (customModelAction === 'edit') {
+                    setCustomModelAction('default');
                     return true;
                 }
-                else if (customModelAction === 'delete') {
-                    // In delete mode, right arrow confirms deletion
+                if (customModelAction === 'default') {
+                    if (isCustomActionItem) {
+                        setCustomModelAction('delete');
+                        setPendingDeleteConfirm(false);
+                        return true;
+                    }
+                    const actionItem = currentItem;
+                    // Check if reasoning-capable, show reasoning effort selection
+                    if (isReasoningCapableModel(actionItem.name)) {
+                        setPendingReasoningModel(actionItem);
+                        setIsSettingDefault(true);
+                        setReasoningEffortIndex(0); // Default to 'Auto'
+                        return true;
+                    }
+                    clearActionState();
+                    void (async () => {
+                        await onSetDefaultModel(actionItem.provider, actionItem.name, actionItem.displayName, actionItem.baseURL, actionItem.reasoningEffort);
+                        setRefreshVersion((prev) => prev + 1);
+                        onClose(); // Close overlay after setting default
+                    })();
+                    return true;
+                }
+                if (customModelAction === 'delete') {
                     if (pendingDeleteConfirm) {
-                        // Second press - actually delete
                         if (deleteTimeoutRef.current) {
                             clearTimeout(deleteTimeoutRef.current);
                             deleteTimeoutRef.current = null;
@@ -352,7 +417,6 @@ const ModelSelector = forwardRef(function ModelSelector({ isVisible, onSelectMod
                         void handleDeleteCustomModel(currentItem);
                     }
                     else {
-                        // First press in delete mode - set pending confirmation
                         setPendingDeleteConfirm(true);
                         if (deleteTimeoutRef.current) {
                             clearTimeout(deleteTimeoutRef.current);
@@ -360,7 +424,7 @@ const ModelSelector = forwardRef(function ModelSelector({ isVisible, onSelectMod
                         deleteTimeoutRef.current = setTimeout(() => {
                             setPendingDeleteConfirm(false);
                             deleteTimeoutRef.current = null;
-                        }, 3000); // 3 second timeout
+                        }, 3000);
                     }
                     return true;
                 }
@@ -368,7 +432,7 @@ const ModelSelector = forwardRef(function ModelSelector({ isVisible, onSelectMod
             // Left arrow - go back in action mode
             if (key.leftArrow) {
                 if (customModelAction === 'delete') {
-                    setCustomModelAction('edit');
+                    setCustomModelAction('default');
                     setPendingDeleteConfirm(false);
                     if (deleteTimeoutRef.current) {
                         clearTimeout(deleteTimeoutRef.current);
@@ -376,7 +440,16 @@ const ModelSelector = forwardRef(function ModelSelector({ isVisible, onSelectMod
                     }
                     return true;
                 }
-                else if (customModelAction === 'edit') {
+                if (customModelAction === 'default') {
+                    if (isCustomActionItem) {
+                        setCustomModelAction('edit');
+                    }
+                    else {
+                        setCustomModelAction(null);
+                    }
+                    return true;
+                }
+                if (customModelAction === 'edit') {
                     setCustomModelAction(null);
                     return true;
                 }
@@ -445,6 +518,22 @@ const ModelSelector = forwardRef(function ModelSelector({ isVisible, onSelectMod
                         }
                         return true;
                     }
+                    if (customModelAction === 'default') {
+                        // Check if reasoning-capable, show reasoning effort selection
+                        if (isReasoningCapableModel(item.name)) {
+                            setPendingReasoningModel(item);
+                            setIsSettingDefault(true);
+                            setReasoningEffortIndex(0); // Default to 'Auto'
+                            return true;
+                        }
+                        clearActionState();
+                        void (async () => {
+                            await onSetDefaultModel(item.provider, item.name, item.displayName, item.baseURL, item.reasoningEffort);
+                            setRefreshVersion((prev) => prev + 1);
+                            onClose(); // Close overlay after setting default
+                        })();
+                        return true;
+                    }
                     if (customModelAction === 'delete' && item.isCustom) {
                         if (pendingDeleteConfirm) {
                             // Already confirmed, delete
@@ -482,6 +571,7 @@ const ModelSelector = forwardRef(function ModelSelector({ isVisible, onSelectMod
         filteredItems,
         onClose,
         onSelectModel,
+        onSetDefaultModel,
         onAddCustomModel,
         onEditCustomModel,
         customModelAction,
@@ -490,6 +580,7 @@ const ModelSelector = forwardRef(function ModelSelector({ isVisible, onSelectMod
         handleDeleteCustomModel,
         pendingReasoningModel,
         reasoningEffortIndex,
+        isSettingDefault,
     ]);
     if (!isVisible)
         return null;
@@ -498,30 +589,42 @@ const ModelSelector = forwardRef(function ModelSelector({ isVisible, onSelectMod
     }
     // Reasoning effort sub-step UI
     if (pendingReasoningModel) {
-        return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { paddingX: 0, paddingY: 0, children: _jsx(Text, { color: "cyan", bold: true, children: "Configure Reasoning Effort" }) }), _jsx(Box, { paddingX: 0, paddingY: 0, children: _jsxs(Text, { color: "gray", children: ["for ", pendingReasoningModel.displayName || pendingReasoningModel.name] }) }), _jsx(Box, { paddingX: 0, paddingY: 0, children: _jsx(Text, { color: "gray", children: "\u2191\u2193 navigate, Enter select, Esc back" }) }), _jsx(Box, { paddingX: 0, paddingY: 0, children: _jsx(Text, { color: "gray", children: '─'.repeat(50) }) }), REASONING_EFFORT_OPTIONS.map((option, index) => {
+        return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { paddingX: 0, paddingY: 0, children: _jsxs(Text, { color: "cyan", bold: true, children: ["Configure Reasoning Effort", isSettingDefault && _jsx(Text, { color: "gray", children: " (Setting as Default)" })] }) }), _jsx(Box, { paddingX: 0, paddingY: 0, children: _jsxs(Text, { color: "gray", children: ["for ", pendingReasoningModel.displayName || pendingReasoningModel.name] }) }), _jsx(Box, { paddingX: 0, paddingY: 0, children: _jsx(Text, { color: "gray", children: "\u2191\u2193 navigate, Enter select, Esc back" }) }), _jsx(Box, { paddingX: 0, paddingY: 0, children: _jsx(Text, { color: "gray", children: '─'.repeat(50) }) }), REASONING_EFFORT_OPTIONS.map((option, index) => {
                     const isSelected = index === reasoningEffortIndex;
                     return (_jsxs(Box, { paddingX: 0, paddingY: 0, children: [_jsxs(Text, { color: isSelected ? 'cyan' : 'gray', bold: isSelected, children: [isSelected ? '› ' : '  ', option.label] }), _jsxs(Text, { color: isSelected ? 'white' : 'gray', children: [' ', "- ", option.description] })] }, option.value));
                 })] }));
     }
     const visibleItems = filteredItems.slice(scrollOffset, scrollOffset + MAX_VISIBLE_ITEMS);
     const hasCustomModels = customModels.length > 0;
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { paddingX: 0, paddingY: 0, children: _jsxs(Text, { color: "cyan", bold: true, children: ["Select Model (", selectedIndex + 1, "/", filteredItems.length, ")"] }) }), _jsxs(Box, { paddingX: 0, paddingY: 0, children: [_jsx(Text, { color: "gray", children: "\u2191\u2193 navigate, Enter select, Esc close" }), hasCustomModels && _jsx(Text, { color: "gray", children: ", \u2192\u2190 for custom actions" })] }), _jsxs(Box, { paddingX: 0, paddingY: 0, children: [_jsx(Text, { color: "gray", children: "\uD83D\uDD0D " }), _jsx(Text, { color: searchQuery ? 'white' : 'gray', children: searchQuery || 'Type to search...' }), _jsx(Text, { color: "cyan", children: "\u258C" })] }), _jsx(Box, { paddingX: 0, paddingY: 0, children: _jsx(Text, { color: "gray", children: '─'.repeat(50) }) }), visibleItems.map((item, visibleIndex) => {
+    const hasActionableItems = filteredItems.some((item) => !isAddCustomOption(item));
+    const selectedItem = filteredItems[selectedIndex];
+    const isSelectedCustom = selectedItem && !isAddCustomOption(selectedItem) && selectedItem.isCustom;
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { paddingX: 0, paddingY: 0, children: _jsxs(Text, { color: "cyan", bold: true, children: ["Select Model (", selectedIndex + 1, "/", filteredItems.length, ")"] }) }), _jsxs(Box, { paddingX: 0, paddingY: 0, children: [_jsx(Text, { color: "gray", children: "\u2191\u2193 navigate, Enter select, Esc close" }), hasActionableItems && _jsx(Text, { color: "gray", children: ", \u2192\u2190 for actions" })] }), _jsxs(Box, { paddingX: 0, paddingY: 0, children: [_jsx(Text, { color: "gray", children: "\uD83D\uDD0D " }), _jsx(Text, { color: searchQuery ? 'white' : 'gray', children: searchQuery || 'Type to search...' }), _jsx(Text, { color: "cyan", children: "\u258C" })] }), _jsx(Box, { paddingX: 0, paddingY: 0, children: _jsx(Text, { color: "gray", children: '─'.repeat(50) }) }), visibleItems.map((item, visibleIndex) => {
                 const actualIndex = scrollOffset + visibleIndex;
                 const isSelected = actualIndex === selectedIndex;
                 if (isAddCustomOption(item)) {
                     return (_jsx(Box, { paddingX: 0, paddingY: 0, children: _jsx(Text, { color: isSelected ? 'green' : 'gray', bold: isSelected, children: "\u2795 Add custom model..." }) }, "add-custom"));
                 }
                 // Show action buttons for selected custom models
-                const showActions = isSelected && item.isCustom;
-                // Show original provider for gateway models (e.g., dexto showing openai models)
-                const providerDisplay = item.originalProvider
-                    ? `${item.originalProvider} via ${item.provider}`
-                    : item.provider;
-                return (_jsxs(Box, { paddingX: 0, paddingY: 0, children: [item.isCustom && _jsx(Text, { color: isSelected ? 'orange' : 'gray', children: "\u2605 " }), _jsx(Text, { color: isSelected ? 'cyan' : 'gray', bold: isSelected, children: item.displayName || item.name }), _jsxs(Text, { color: isSelected ? 'white' : 'gray', children: [" (", providerDisplay, ")"] }), _jsxs(Text, { color: isSelected ? 'white' : 'gray', children: [' ', "\u2022 ", item.maxInputTokens.toLocaleString(), " tokens"] }), item.isDefault && (_jsx(Text, { color: isSelected ? 'white' : 'gray', children: " [DEFAULT]" })), item.isCurrent && !showActions && (_jsxs(Text, { color: isSelected ? 'cyan' : 'gray', bold: isSelected, children: [' ', "\u2190 Current"] })), showActions && (_jsxs(_Fragment, { children: [_jsx(Text, { children: " " }), _jsxs(Text, { color: customModelAction === 'edit' ? 'green' : 'gray', bold: customModelAction === 'edit', inverse: customModelAction === 'edit', children: [' ', "Edit", ' '] }), _jsx(Text, { children: " " }), _jsxs(Text, { color: customModelAction === 'delete' ? 'red' : 'gray', bold: customModelAction === 'delete', inverse: customModelAction === 'delete', children: [' ', "Delete", ' '] })] }))] }, `${item.provider}-${item.name}-${item.isCustom ? 'custom' : 'registry'}`));
-            }), filteredItems.length > MAX_VISIBLE_ITEMS && (_jsx(Box, { paddingX: 0, paddingY: 0, children: _jsxs(Text, { color: "gray", children: [scrollOffset > 0 ? '↑ more above' : '', scrollOffset > 0 && scrollOffset + MAX_VISIBLE_ITEMS < filteredItems.length
-                            ? ' | '
+                const showActions = isSelected && !isAddCustomOption(item);
+                // Keep the UI label simple: show the actual provider being selected.
+                // Gateway routing details are intentionally hidden from the main picker.
+                const providerDisplay = getLLMProviderDisplayName(item.provider);
+                return (_jsxs(Box, { paddingX: 0, paddingY: 0, children: [item.isCustom && _jsx(Text, { color: isSelected ? 'orange' : 'gray', children: "\u2605 " }), _jsx(Text, { color: isSelected ? 'cyan' : 'gray', bold: isSelected, children: item.displayName || item.name }), _jsxs(Text, { color: isSelected ? 'white' : 'gray', children: [" (", providerDisplay, ")"] }), _jsxs(Text, { color: isSelected ? 'white' : 'gray', children: [' ', "\u2022 ", item.maxInputTokens.toLocaleString(), " tokens"] }), item.isDefault && (_jsx(Text, { color: isSelected ? 'white' : 'gray', children: " [DEFAULT]" })), item.isCurrent && !showActions && (_jsxs(Text, { color: isSelected ? 'cyan' : 'gray', bold: isSelected, children: [' ', "\u2190 Current"] })), showActions && (_jsxs(_Fragment, { children: [item.isCustom && (_jsxs(_Fragment, { children: [_jsx(Text, { children: " " }), _jsxs(Text, { color: customModelAction === 'edit' ? 'green' : 'gray', bold: customModelAction === 'edit', inverse: customModelAction === 'edit', children: [' ', "Edit", ' '] })] })), _jsx(Text, { children: " " }), _jsxs(Text, { color: customModelAction === 'default' ? 'cyan' : 'gray', bold: customModelAction === 'default', inverse: customModelAction === 'default', children: [' ', "Set as Default", ' '] }), item.isCustom && (_jsxs(_Fragment, { children: [_jsx(Text, { children: " " }), _jsxs(Text, { color: customModelAction === 'delete' ? 'red' : 'gray', bold: customModelAction === 'delete', inverse: customModelAction === 'delete', children: [' ', "Delete", ' '] })] }))] }))] }, `${item.provider}-${item.name}-${item.isCustom ? 'custom' : 'registry'}`));
+            }), filteredItems.length > MAX_VISIBLE_ITEMS && (_jsx(Box, { paddingX: 0, paddingY: 0, children: _jsxs(Text, { color: "gray", wrap: "truncate", children: [scrollOffset > 0 ? '↑ more above' : '', scrollOffset > 0 && scrollOffset + MAX_VISIBLE_ITEMS < filteredItems.length
+                            ? ' • '
                             : '', scrollOffset + MAX_VISIBLE_ITEMS < filteredItems.length
                             ? '↓ more below'
-                            : ''] }) })), customModelAction === 'delete' && pendingDeleteConfirm && (_jsx(Box, { paddingX: 0, paddingY: 0, marginTop: 1, children: _jsx(Text, { color: "yellowBright", children: "\u26A0\uFE0F Press \u2192 or Enter again to confirm delete" }) })), customModelAction && !pendingDeleteConfirm && (_jsx(Box, { paddingX: 0, paddingY: 0, marginTop: 1, children: _jsxs(Text, { color: "gray", children: ["\u2190 ", customModelAction === 'edit' ? 'deselect' : 'edit', " | \u2192", ' ', customModelAction === 'edit' ? 'delete' : 'confirm', " | Enter", ' ', customModelAction] }) }))] }));
+                            : ''] }) })), customModelAction === 'delete' && pendingDeleteConfirm && (_jsx(Box, { paddingX: 0, paddingY: 0, marginTop: 1, children: _jsx(Text, { color: "yellowBright", children: "\u26A0\uFE0F Press \u2192 or Enter again to confirm delete" }) })), customModelAction && !pendingDeleteConfirm && (_jsx(Box, { paddingX: 0, paddingY: 0, marginTop: 1, children: _jsxs(Text, { color: "gray", children: ["\u2190", ' ', customModelAction === 'edit'
+                            ? 'deselect'
+                            : isSelectedCustom
+                                ? 'edit'
+                                : 'deselect', ' ', "| \u2192", ' ', customModelAction === 'edit'
+                            ? 'default'
+                            : customModelAction === 'default'
+                                ? isSelectedCustom
+                                    ? 'delete'
+                                    : 'confirm'
+                                : 'confirm', ' ', "| Enter ", customModelAction] }) }))] }));
 });
 export default ModelSelector;

package/dist/cli/ink-cli/components/overlays/ToolBrowser.d.ts

@@ -4,7 +4,7 @@
  * Features:
  * - Search/filter tools by name
  * - View tool details (description, schema)
- * - Shows source (MCP server or Internal)
+ * - Shows source (MCP server or Local)
  */
 import React from 'react';
 import type { Key } from '../../hooks/useInputOrchestrator.js';
@@ -13,6 +13,7 @@ interface ToolBrowserProps {
     isVisible: boolean;
     onClose: () => void;
     agent: DextoAgent;
+    sessionId: string | null;
 }
 export interface ToolBrowserHandle {
     handleInput: (input: string, key: Key) => boolean;

package/dist/cli/ink-cli/components/overlays/ToolBrowser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ToolBrowser.d.ts","sourceRoot":"","sources":["../../../../../src/cli/ink-cli/components/overlays/ToolBrowser.tsx"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAON,MAAM,OAAO,CAAC;AAEf,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qCAAqC,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAI9C,UAAU,gBAAgB;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,KAAK,EAAE,UAAU,CAAC;CACrB;AAED,MAAM,WAAW,iBAAiB;IAC9B,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAeD;;GAEG;AACH,QAAA,MAAM,WAAW,4FAoWf,CAAC;AAyQH,eAAe,WAAW,CAAC"}
+{"version":3,"file":"ToolBrowser.d.ts","sourceRoot":"","sources":["../../../../../src/cli/ink-cli/components/overlays/ToolBrowser.tsx"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAON,MAAM,OAAO,CAAC;AAEf,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qCAAqC,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAI9C,UAAU,gBAAgB;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAED,MAAM,WAAW,iBAAiB;IAC9B,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAmBD;;GAEG;AACH,QAAA,MAAM,WAAW,4FAspBf,CAAC;AAyZH,eAAe,WAAW,CAAC"}