dexto 1.5.7 → 1.5.8

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

@@ -12,14 +12,15 @@ import { Box, Text } from 'ink';
 import { useTerminalSize } from '../../hooks/useTerminalSize.js';
 import { writeToClipboard } from '../../utils/clipboardUtils.js';
 const MAX_VISIBLE_ITEMS = 12;
-const MAX_DETAIL_LINES = 15;
+const LIST_ACTIONS = ['view', 'config', 'back'];
 /**
  * Tool browser with search and detail views
  */
-const ToolBrowser = forwardRef(function ToolBrowser({ isVisible, onClose, agent }, ref) {
+const ToolBrowser = forwardRef(function ToolBrowser({ isVisible, onClose, agent, sessionId }, ref) {
     const { columns, rows } = useTerminalSize();
     const [tools, setTools] = useState([]);
     const [isLoading, setIsLoading] = useState(false);
+    const [loadError, setLoadError] = useState(null);
     const [selectedIndex, setSelectedIndex] = useState(0);
     const [searchQuery, setSearchQuery] = useState('');
     const [scrollOffset, setScrollOffset] = useState(0);
@@ -27,16 +28,33 @@ const ToolBrowser = forwardRef(function ToolBrowser({ isVisible, onClose, agent
     const [selectedTool, setSelectedTool] = useState(null);
     const [detailScrollOffset, setDetailScrollOffset] = useState(0);
     const [copyFeedback, setCopyFeedback] = useState(null);
+    const [listActionsIndex, setListActionsIndex] = useState(0);
+    const [configIndex, setConfigIndex] = useState(0);
+    const [scopeToolName, setScopeToolName] = useState(null);
+    const [scopeNextEnabled, setScopeNextEnabled] = useState(true);
+    const [scopeTarget, setScopeTarget] = useState('session');
     const selectedIndexRef = useRef(selectedIndex);
     const viewModeRef = useRef(viewMode);
     const detailScrollOffsetRef = useRef(detailScrollOffset);
     const detailMaxScrollOffsetRef = useRef(0);
     const selectedToolRef = useRef(null);
+    const toolsRef = useRef([]);
+    const listActionsIndexRef = useRef(listActionsIndex);
+    const configIndexRef = useRef(configIndex);
+    const scopeTargetRef = useRef(scopeTarget);
+    const scopeNextEnabledRef = useRef(scopeNextEnabled);
+    const scopeToolNameRef = useRef(scopeToolName);
     // Keep refs in sync
     selectedIndexRef.current = selectedIndex;
     viewModeRef.current = viewMode;
     detailScrollOffsetRef.current = detailScrollOffset;
     selectedToolRef.current = selectedTool;
+    toolsRef.current = tools;
+    listActionsIndexRef.current = listActionsIndex;
+    configIndexRef.current = configIndex;
+    scopeTargetRef.current = scopeTarget;
+    scopeNextEnabledRef.current = scopeNextEnabled;
+    scopeToolNameRef.current = scopeToolName;
     // Fetch tools from agent
     useEffect(() => {
         if (!isVisible)
@@ -48,14 +66,21 @@ const ToolBrowser = forwardRef(function ToolBrowser({ isVisible, onClose, agent
         setScrollOffset(0);
         setViewMode('list');
         setSelectedTool(null);
+        setListActionsIndex(0);
+        setConfigIndex(0);
+        setLoadError(null);
         const fetchTools = async () => {
             try {
-                const [allTools, mcpTools] = await Promise.all([
+                const [allTools, mcpTools, enabledTools, autoApprovedTools] = await Promise.all([
                     agent.getAllTools(),
                     agent.getAllMcpTools(),
+                    agent.getEnabledTools(sessionId || undefined),
+                    sessionId ? agent.getSessionAutoApproveTools(sessionId) : Promise.resolve([]),
                 ]);
                 const toolList = [];
                 const mcpToolNames = new Set(Object.keys(mcpTools));
+                const enabledToolNames = new Set(Object.keys(enabledTools));
+                const autoApprovedToolNames = new Set(autoApprovedTools ?? []);
                 for (const [toolName, toolInfo] of Object.entries(allTools)) {
                     const isMcpTool = mcpToolNames.has(toolName) || toolName.startsWith('mcp--');
                     // Extract server name from MCP tool name (format: mcp--serverName--toolName)
@@ -72,6 +97,8 @@ const ToolBrowser = forwardRef(function ToolBrowser({ isVisible, onClose, agent
                         source: isMcpTool ? 'mcp' : 'internal',
                         serverName,
                         inputSchema: toolInfo.parameters,
+                        isEnabled: enabledToolNames.has(toolName),
+                        isAutoApproved: autoApprovedToolNames.has(toolName),
                     });
                 }
                 // Sort: internal tools first, then MCP tools
@@ -84,12 +111,15 @@ const ToolBrowser = forwardRef(function ToolBrowser({ isVisible, onClose, agent
                 if (!cancelled) {
                     setTools(toolList);
                     setIsLoading(false);
+                    setLoadError(null);
                 }
             }
             catch (error) {
                 if (!cancelled) {
+                    const message = error instanceof Error ? error.message : 'Unknown error';
                     setTools([]);
                     setIsLoading(false);
+                    setLoadError(`Failed to load tools: ${message}`);
                 }
             }
         };
@@ -97,7 +127,7 @@ const ToolBrowser = forwardRef(function ToolBrowser({ isVisible, onClose, agent
         return () => {
             cancelled = true;
         };
-    }, [isVisible, agent]);
+    }, [isVisible, agent, sessionId]);
     // Filter tools based on search query
     const filteredTools = useMemo(() => {
         if (!searchQuery.trim()) {
@@ -126,14 +156,118 @@ const ToolBrowser = forwardRef(function ToolBrowser({ isVisible, onClose, agent
             setScrollOffset(selectedIndex - MAX_VISIBLE_ITEMS + 1);
         }
     }, [selectedIndex, scrollOffset]);
-    // Handle showing tool details
-    const showToolDetails = (tool) => {
+    const openListActions = (tool) => {
+        setSelectedTool(tool);
+        setListActionsIndex(0);
+        setViewMode('list-actions');
+    };
+    const openToolDetails = (tool) => {
         setSelectedTool(tool);
         setViewMode('detail');
         setDetailScrollOffset(0);
     };
-    // Handle going back to list
-    const goBackToList = () => {
+    const openConfigMenu = (tool) => {
+        setSelectedTool(tool);
+        setConfigIndex(0);
+        setViewMode('config');
+    };
+    const openScopePrompt = (tool) => {
+        const nextEnabled = !tool.isEnabled;
+        const nextScope = sessionId ? 'session' : 'global';
+        setSelectedTool(tool);
+        setScopeToolName(tool.name);
+        setScopeNextEnabled(nextEnabled);
+        setScopeTarget(nextScope);
+        setViewMode('scope');
+        scopeToolNameRef.current = tool.name;
+        scopeNextEnabledRef.current = nextEnabled;
+        scopeTargetRef.current = nextScope;
+    };
+    const closeScopePrompt = () => {
+        setViewMode('config');
+        setScopeToolName(null);
+    };
+    const applyToolToggle = async (overrideTarget) => {
+        const targetToolName = scopeToolNameRef.current ?? scopeToolName ?? selectedToolRef.current?.name;
+        if (!targetToolName)
+            return;
+        const effectiveTarget = overrideTarget ?? scopeTargetRef.current;
+        const nextEnabled = scopeNextEnabledRef.current;
+        const previousTools = toolsRef.current;
+        const updatedTools = previousTools.map((tool) => {
+            if (tool.name !== targetToolName) {
+                return tool;
+            }
+            const updatedTool = { ...tool, isEnabled: nextEnabled };
+            if (!nextEnabled && tool.isAutoApproved) {
+                updatedTool.isAutoApproved = false;
+            }
+            return updatedTool;
+        });
+        setTools(updatedTools);
+        const updatedSelected = updatedTools.find((tool) => tool.name === targetToolName) ?? null;
+        setSelectedTool(updatedSelected);
+        const autoApprovedTools = updatedTools
+            .filter((tool) => tool.isAutoApproved)
+            .map((tool) => tool.name);
+        if (sessionId) {
+            agent.setSessionAutoApproveTools(sessionId, autoApprovedTools);
+        }
+        const disabledTools = updatedTools
+            .filter((tool) => !tool.isEnabled)
+            .map((tool) => tool.name);
+        if (effectiveTarget === 'session' && sessionId) {
+            agent.setSessionDisabledTools(sessionId, disabledTools);
+        }
+        else if (effectiveTarget === 'global') {
+            try {
+                const { updateAgentPreferences, saveAgentPreferences, agentPreferencesExist } = await import('@dexto/agent-management');
+                if (agentPreferencesExist(agent.config.agentId)) {
+                    await updateAgentPreferences(agent.config.agentId, {
+                        tools: { disabled: disabledTools },
+                    });
+                }
+                else {
+                    await saveAgentPreferences(agent.config.agentId, {
+                        tools: { disabled: disabledTools },
+                    });
+                }
+                agent.setGlobalDisabledTools(disabledTools);
+            }
+            catch (_error) {
+                // If we can't persist, still keep session state so user sees effect
+                if (sessionId) {
+                    agent.setSessionDisabledTools(sessionId, disabledTools);
+                }
+                else {
+                    setTools(previousTools);
+                    setSelectedTool(previousTools.find((tool) => tool.name === targetToolName) ?? null);
+                }
+            }
+        }
+        closeScopePrompt();
+    };
+    const toggleAutoApprove = () => {
+        if (!sessionId)
+            return;
+        const updatedTools = toolsRef.current.map((tool) => tool.name === selectedToolRef.current?.name
+            ? { ...tool, isAutoApproved: !tool.isAutoApproved }
+            : tool);
+        const updatedSelected = updatedTools.find((tool) => tool.name === selectedToolRef.current?.name);
+        setTools(updatedTools);
+        setSelectedTool(updatedSelected ?? null);
+        const autoApprovedTools = updatedTools
+            .filter((tool) => tool.isAutoApproved)
+            .map((tool) => tool.name);
+        agent.setSessionAutoApproveTools(sessionId, autoApprovedTools);
+    };
+    const closeConfigMenu = () => {
+        setViewMode('list-actions');
+    };
+    const closeDetailView = () => {
+        setViewMode('list-actions');
+    };
+    const closeListActions = () => {
         setViewMode('list');
         setSelectedTool(null);
     };
@@ -142,13 +276,69 @@ const ToolBrowser = forwardRef(function ToolBrowser({ isVisible, onClose, agent
         handleInput: (input, key) => {
             if (!isVisible)
                 return false;
-            // In detail view (use ref to get latest value)
+            // Scope selection view
+            if (viewModeRef.current === 'scope') {
+                if (key.escape || key.backspace || key.delete) {
+                    closeScopePrompt();
+                    return true;
+                }
+                if (key.upArrow || key.downArrow) {
+                    setScopeTarget((prev) => (prev === 'session' ? 'global' : 'session'));
+                    return true;
+                }
+                if (key.return) {
+                    if (scopeTargetRef.current === 'session' && !sessionId) {
+                        setScopeTarget('global');
+                        scopeTargetRef.current = 'global';
+                        void applyToolToggle('global');
+                        return true;
+                    }
+                    void applyToolToggle();
+                    return true;
+                }
+                return true;
+            }
+            // Config menu view
+            if (viewModeRef.current === 'config') {
+                if (key.escape || key.backspace || key.delete) {
+                    closeConfigMenu();
+                    return true;
+                }
+                if (key.upArrow) {
+                    const nextIndex = (configIndexRef.current - 1 + 3) % 3;
+                    setConfigIndex(nextIndex);
+                    return true;
+                }
+                if (key.downArrow) {
+                    const nextIndex = (configIndexRef.current + 1) % 3;
+                    setConfigIndex(nextIndex);
+                    return true;
+                }
+                if (key.return) {
+                    const tool = selectedToolRef.current;
+                    if (tool) {
+                        if (configIndexRef.current === 0) {
+                            openScopePrompt(tool);
+                        }
+                        else if (configIndexRef.current === 1) {
+                            if (sessionId && tool.isEnabled) {
+                                toggleAutoApprove();
+                            }
+                        }
+                        else {
+                            closeConfigMenu();
+                        }
+                    }
+                    return true;
+                }
+                return true;
+            }
+            // Detail view
             if (viewModeRef.current === 'detail') {
                 if (key.escape || key.backspace || key.delete) {
-                    goBackToList();
+                    closeDetailView();
                     return true;
                 }
-                // Handle scrolling in detail view - check refs before setState to avoid flicker
                 if (key.upArrow) {
                     if (detailScrollOffsetRef.current > 0) {
                         setDetailScrollOffset((prev) => prev - 1);
@@ -178,10 +368,53 @@ const ToolBrowser = forwardRef(function ToolBrowser({ isVisible, onClose, agent
                     }
                     return true;
                 }
-                return true; // Consume all input in detail view
+                if (key.return) {
+                    const tool = selectedToolRef.current;
+                    if (tool) {
+                        openConfigMenu(tool);
+                    }
+                    return true;
+                }
+                return true;
+            }
+            // List action menu view
+            if (viewModeRef.current === 'list-actions') {
+                if (key.escape || key.backspace || key.delete) {
+                    closeListActions();
+                    return true;
+                }
+                if (key.upArrow) {
+                    const nextIndex = (listActionsIndexRef.current - 1 + LIST_ACTIONS.length) %
+                        LIST_ACTIONS.length;
+                    setListActionsIndex(nextIndex);
+                    return true;
+                }
+                if (key.downArrow) {
+                    const nextIndex = (listActionsIndexRef.current + 1) % LIST_ACTIONS.length;
+                    setListActionsIndex(nextIndex);
+                    return true;
+                }
+                if (key.return) {
+                    const tool = selectedToolRef.current;
+                    const action = LIST_ACTIONS[listActionsIndexRef.current];
+                    if (!tool) {
+                        closeListActions();
+                        return true;
+                    }
+                    if (action === 'view') {
+                        openToolDetails(tool);
+                    }
+                    else if (action === 'config') {
+                        openConfigMenu(tool);
+                    }
+                    else {
+                        closeListActions();
+                    }
+                    return true;
+                }
+                return true;
             }
             // In list view
-            // Escape closes
             if (key.escape) {
                 onClose();
                 return true;
@@ -224,33 +457,39 @@ const ToolBrowser = forwardRef(function ToolBrowser({ isVisible, onClose, agent
             if (key.return && itemsLength > 0) {
                 const tool = filteredTools[selectedIndexRef.current];
                 if (tool) {
-                    showToolDetails(tool);
+                    openListActions(tool);
                     return true;
                 }
             }
             return false;
         },
-    }), [isVisible, filteredTools, onClose, viewMode]);
+    }), [isVisible, filteredTools, onClose, sessionId]);
     if (!isVisible)
         return null;
     if (isLoading) {
         return (_jsx(Box, { paddingX: 0, paddingY: 0, children: _jsx(Text, { color: "gray", children: "Loading tools..." }) }));
     }
-    // Detail view
+    if (viewMode === 'list-actions' && selectedTool) {
+        return (_jsx(ToolActionsMenu, { tool: selectedTool, columns: columns, listActionsIndex: listActionsIndex }));
+    }
     if (viewMode === 'detail' && selectedTool) {
-        // Calculate max visible lines based on terminal height
-        const maxVisibleLines = Math.min(18, Math.max(5, rows - 6)); // Cap at 18 to reduce flicker
+        const maxVisibleLines = Math.min(18, Math.max(5, rows - 6));
         return (_jsx(ToolDetailView, { tool: selectedTool, columns: columns, scrollOffset: detailScrollOffset, maxVisibleLines: maxVisibleLines, maxScrollOffsetRef: detailMaxScrollOffsetRef, copyFeedback: copyFeedback }));
     }
+    if (viewMode === 'config' && selectedTool) {
+        return (_jsx(ToolSettingsView, { tool: selectedTool, columns: columns, configIndex: configIndex, sessionAvailable: Boolean(sessionId) }));
+    }
+    if (viewMode === 'scope' && selectedTool) {
+        return (_jsx(ToolScopeView, { tool: selectedTool, columns: columns, scopeTarget: scopeTarget, scopeNextEnabled: scopeNextEnabled, sessionAvailable: Boolean(sessionId) }));
+    }
     // List view
     const visibleTools = filteredTools.slice(scrollOffset, scrollOffset + MAX_VISIBLE_ITEMS);
-    // Show counts based on filtered results, not total
     const filteredInternalCount = filteredTools.filter((t) => t.source === 'internal').length;
     const filteredMcpCount = filteredTools.filter((t) => t.source === 'mcp').length;
-    return (_jsxs(Box, { flexDirection: "column", width: columns, children: [_jsxs(Box, { paddingX: 0, paddingY: 0, children: [_jsx(Text, { color: "cyan", bold: true, children: "Tool Browser" }), _jsxs(Text, { color: "gray", children: [' ', "(", filteredTools.length, " tools: ", filteredInternalCount, " internal,", ' ', filteredMcpCount, " MCP)"] })] }), _jsx(Box, { paddingX: 0, paddingY: 0, children: _jsx(Text, { color: "gray", children: "\u2191\u2193 navigate, Enter view details, Esc close" }) }), _jsxs(Box, { paddingX: 0, paddingY: 0, marginTop: 1, children: [_jsx(Text, { color: "gray", children: "Search: " }), _jsx(Text, { color: searchQuery ? 'white' : 'gray', children: searchQuery || 'Type to filter...' }), _jsx(Text, { color: "cyan", children: "\u258C" })] }), _jsx(Box, { paddingX: 0, paddingY: 0, children: _jsx(Text, { color: "gray", children: '─'.repeat(Math.min(60, columns - 2)) }) }), filteredTools.length === 0 ? (_jsx(Box, { paddingX: 0, paddingY: 0, children: _jsx(Text, { color: "gray", children: "No tools match your search" }) })) : (visibleTools.map((tool, visibleIndex) => {
+    return (_jsxs(Box, { flexDirection: "column", width: columns, children: [_jsxs(Box, { paddingX: 0, paddingY: 0, children: [_jsx(Text, { color: "cyan", bold: true, children: "Tool Browser" }), _jsxs(Text, { color: "gray", children: [' ', "(", filteredTools.length, " tools: ", filteredInternalCount, " internal,", ' ', filteredMcpCount, " MCP)"] })] }), _jsx(Box, { paddingX: 0, paddingY: 0, children: _jsx(Text, { color: "gray", children: "\u2191\u2193 navigate \u00B7 Enter options \u00B7 Esc close" }) }), _jsx(Box, { paddingX: 0, paddingY: 0, children: _jsx(Text, { color: "gray", children: "Type to search \u00B7 Backspace to delete" }) }), loadError && (_jsx(Box, { paddingX: 0, paddingY: 0, children: _jsx(Text, { color: "red", children: loadError }) })), _jsxs(Box, { paddingX: 0, paddingY: 0, marginTop: 1, children: [_jsx(Text, { color: "gray", children: "Search: " }), _jsx(Text, { color: searchQuery ? 'white' : 'gray', children: searchQuery || 'Type to filter...' }), _jsx(Text, { color: "cyan", children: "\u258C" })] }), _jsx(Box, { paddingX: 0, paddingY: 0, children: _jsx(Text, { color: "gray", children: '─'.repeat(Math.min(60, columns - 2)) }) }), filteredTools.length === 0 ? (_jsx(Box, { paddingX: 0, paddingY: 0, children: _jsx(Text, { color: "gray", children: "No tools match your search" }) })) : (visibleTools.map((tool, visibleIndex) => {
                 const actualIndex = scrollOffset + visibleIndex;
                 const isSelected = actualIndex === selectedIndex;
-                return (_jsxs(Box, { paddingX: 0, paddingY: 0, children: [_jsx(Text, { color: isSelected ? 'cyan' : 'white', children: isSelected ? '▶ ' : '  ' }), _jsx(Text, { color: isSelected ? 'cyan' : 'white', bold: isSelected, children: truncateText(tool.name, 35) }), _jsxs(Text, { color: tool.source === 'internal' ? 'magenta' : 'blue', children: [' ', "[", tool.source === 'internal' ? 'Internal' : 'MCP', "]"] }), tool.serverName && _jsxs(Text, { color: "gray", children: [" (", tool.serverName, ")"] })] }, tool.name));
+                return (_jsxs(Box, { paddingX: 0, paddingY: 0, children: [_jsx(Text, { color: isSelected ? 'cyan' : 'white', children: isSelected ? '▶ ' : '  ' }), _jsx(Text, { color: isSelected ? 'cyan' : 'white', bold: isSelected, children: truncateText(tool.name, 35) }), _jsxs(Text, { color: tool.source === 'internal' ? 'magenta' : 'blue', children: [' ', "[", tool.source === 'internal' ? 'Internal' : 'MCP', "]"] }), tool.serverName && _jsxs(Text, { color: "gray", children: [" (", tool.serverName, ")"] }), _jsxs(Text, { color: tool.isEnabled ? 'green' : 'red', children: [' ', tool.isEnabled ? 'Enabled' : 'Disabled'] }), tool.isAutoApproved && _jsx(Text, { color: "yellow", children: " [auto-approved]" })] }, tool.name));
             })), filteredTools.length > MAX_VISIBLE_ITEMS && (_jsx(Box, { paddingX: 0, paddingY: 0, marginTop: 1, children: _jsxs(Text, { color: "gray", children: [scrollOffset > 0 ? '↑ more above' : '', scrollOffset > 0 && scrollOffset + MAX_VISIBLE_ITEMS < filteredTools.length
                             ? ' | '
                             : '', scrollOffset + MAX_VISIBLE_ITEMS < filteredTools.length
@@ -299,36 +538,29 @@ function buildDetailLineData(tool, maxWidth) {
                 });
                 // Parameter description (wrapped)
                 if (description) {
-                    const paramDescLines = wrapText(description, maxWidth - 6).split('\n');
-                    for (const paramDescLine of paramDescLines) {
-                        lines.push({ type: 'param-desc', text: paramDescLine });
+                    const descLines = wrapText(description, maxWidth - 2).split('\n');
+                    for (const descLine of descLines) {
+                        lines.push({ type: 'param-desc', text: descLine });
                     }
                 }
                 // Enum values
-                if (enumValues) {
+                if (enumValues && enumValues.length > 0) {
                     lines.push({ type: 'param-enum', values: enumValues });
                 }
-                // Empty line between parameters
-                lines.push({ type: 'empty' });
             }
         }
-        else {
-            // Empty line before "no parameters"
-            lines.push({ type: 'empty' });
-            lines.push({ type: 'param-desc', text: 'No parameters' });
-        }
     }
     return lines;
 }
 /**
- * Render a single detail line from data
+ * Render a detail line based on type
  */
-function renderDetailLine(line, index) {
+function renderDetailLine(line, _index) {
     switch (line.type) {
         case 'title':
             return (_jsx(Text, { color: "cyan", bold: true, children: line.text }));
         case 'source':
-            return (_jsxs(_Fragment, { children: [_jsx(Text, { color: "gray", children: "Source: " }), _jsx(Text, { color: line.source === 'internal' ? 'magenta' : 'blue', children: line.source === 'internal' ? 'Internal' : 'MCP' }), line.serverName && _jsxs(Text, { color: "gray", children: [" (server: ", line.serverName, ")"] })] }));
+            return (_jsxs(Text, { color: line.source === 'internal' ? 'magenta' : 'blue', children: [line.source === 'internal' ? 'Internal Tool' : 'MCP Tool', line.serverName ? ` (${line.serverName})` : ''] }));
         case 'empty':
             return _jsx(Text, { children: " " });
         case 'header':
@@ -343,9 +575,9 @@ function renderDetailLine(line, index) {
             return (_jsxs(_Fragment, { children: [_jsx(Text, { children: " " }), _jsxs(Text, { color: "gray", children: ["Allowed: ", line.values.join(' | ')] })] }));
     }
 }
-/**
- * Tool detail view component with scrolling support
- */
+function ToolActionsMenu({ tool, columns, listActionsIndex, }) {
+    return (_jsxs(Box, { flexDirection: "column", width: columns, children: [_jsxs(Box, { paddingX: 0, paddingY: 0, children: [_jsx(Text, { color: "cyan", bold: true, children: "Tool Options" }), _jsxs(Text, { color: "gray", children: [" ", tool.name] })] }), _jsx(Box, { paddingX: 0, paddingY: 0, children: _jsxs(Text, { color: listActionsIndex === 0 ? 'cyan' : 'gray', children: [listActionsIndex === 0 ? '▶ ' : '  ', "View details"] }) }), _jsx(Box, { paddingX: 0, paddingY: 0, children: _jsxs(Text, { color: listActionsIndex === 1 ? 'cyan' : 'gray', children: [listActionsIndex === 1 ? '▶ ' : '  ', "Edit tool settings"] }) }), _jsx(Box, { paddingX: 0, paddingY: 0, children: _jsxs(Text, { color: listActionsIndex === 2 ? 'cyan' : 'gray', children: [listActionsIndex === 2 ? '▶ ' : '  ', "Back"] }) }), _jsx(Box, { paddingX: 0, paddingY: 0, children: _jsx(Text, { color: "gray", children: "\u2191\u2193 select \u00B7 Enter confirm \u00B7 Esc back" }) })] }));
+}
 function ToolDetailView({ tool, columns, scrollOffset, maxVisibleLines, maxScrollOffsetRef, copyFeedback, }) {
     const maxWidth = Math.min(80, columns - 4);
     // Build plain data for lines (memoized)
@@ -358,7 +590,7 @@ function ToolDetailView({ tool, columns, scrollOffset, maxVisibleLines, maxScrol
     // Calculate scroll indicators
     const hasMoreAbove = clampedOffset > 0;
     const hasMoreBelow = clampedOffset + maxVisibleLines < totalLines;
-    return (_jsxs(Box, { flexDirection: "column", width: columns, children: [_jsxs(Box, { paddingX: 0, paddingY: 0, children: [_jsx(Text, { color: "cyan", bold: true, children: "Tool Details" }), _jsx(Text, { color: "gray", children: " - \u2191\u2193 scroll, c copy schema, Esc back" }), copyFeedback && (_jsxs(Text, { color: "green", bold: true, children: [' ', copyFeedback] }))] }), _jsx(Box, { paddingX: 0, paddingY: 0, children: _jsx(Text, { color: "gray", children: '─'.repeat(Math.min(60, columns - 2)) }) }), _jsx(Box, { paddingX: 0, paddingY: 0, children: _jsx(Text, { color: "gray", children: hasMoreAbove ? `↑ ${clampedOffset} more above` : ' ' }) }), Array.from({ length: maxVisibleLines }, (_, i) => {
+    return (_jsxs(Box, { flexDirection: "column", width: columns, children: [_jsxs(Box, { paddingX: 0, paddingY: 0, children: [_jsx(Text, { color: "cyan", bold: true, children: "Tool Details" }), _jsx(Text, { color: "gray", children: " - \u2191\u2193 scroll, c copy schema, Enter settings, Esc back" }), copyFeedback && (_jsxs(Text, { color: "green", bold: true, children: [' ', copyFeedback] }))] }), _jsx(Box, { paddingX: 0, paddingY: 0, children: _jsx(Text, { color: "gray", children: '─'.repeat(Math.min(60, columns - 2)) }) }), _jsx(Box, { paddingX: 0, paddingY: 0, children: _jsx(Text, { color: "gray", children: hasMoreAbove ? `↑ ${clampedOffset} more above` : ' ' }) }), Array.from({ length: maxVisibleLines }, (_, i) => {
                 const absoluteIndex = clampedOffset + i;
                 const line = lineData[absoluteIndex];
                 return (_jsx(Box, { paddingX: 0, paddingY: 0, children: line ? renderDetailLine(line, absoluteIndex) : _jsx(Text, { children: " " }) }, i));
@@ -366,6 +598,16 @@ function ToolDetailView({ tool, columns, scrollOffset, maxVisibleLines, maxScrol
                         ? `↓ ${totalLines - clampedOffset - maxVisibleLines} more below`
                         : ' ' }) })] }));
 }
+function ToolSettingsView({ tool, columns, configIndex, sessionAvailable, }) {
+    const autoApproveDisabled = !tool.isEnabled;
+    const autoApproveUnavailable = !sessionAvailable || autoApproveDisabled;
+    return (_jsxs(Box, { flexDirection: "column", width: columns, children: [_jsxs(Box, { paddingX: 0, paddingY: 0, children: [_jsx(Text, { color: "cyan", bold: true, children: "Tool Settings" }), _jsxs(Text, { color: "gray", children: [" ", tool.name] })] }), _jsxs(Box, { paddingX: 0, paddingY: 0, children: [_jsx(Text, { color: "gray", children: "Status: " }), _jsx(Text, { color: tool.isEnabled ? 'green' : 'red', children: tool.isEnabled ? 'Enabled' : 'Disabled' }), _jsx(Text, { color: "gray", children: " \u00B7 Auto-approve: " }), _jsx(Text, { color: tool.isAutoApproved ? 'green' : 'red', children: tool.isAutoApproved ? 'On' : 'Off' }), _jsx(Text, { color: "gray", children: " (session)" })] }), autoApproveDisabled && (_jsx(Box, { paddingX: 0, paddingY: 0, children: _jsx(Text, { color: "yellow", children: "Enable the tool to allow auto-approve." }) })), _jsx(Box, { paddingX: 0, paddingY: 0, children: _jsxs(Text, { color: configIndex === 0 ? 'cyan' : 'gray', children: [configIndex === 0 ? '▶ ' : '  ', tool.isEnabled ? 'Disable tool' : 'Enable tool'] }) }), _jsx(Box, { paddingX: 0, paddingY: 0, children: _jsxs(Text, { color: configIndex === 1 ? (autoApproveUnavailable ? 'yellow' : 'cyan') : 'gray', children: [configIndex === 1 ? '▶ ' : '  ', tool.isAutoApproved
+                            ? 'Disable auto-approve (session)'
+                            : 'Enable auto-approve (session)'] }) }), !sessionAvailable && (_jsx(Box, { paddingX: 0, paddingY: 0, children: _jsx(Text, { color: "yellow", children: "Auto-approve requires an active session." }) })), _jsx(Box, { paddingX: 0, paddingY: 0, children: _jsxs(Text, { color: configIndex === 2 ? 'cyan' : 'gray', children: [configIndex === 2 ? '▶ ' : '  ', "Back"] }) }), _jsx(Box, { paddingX: 0, paddingY: 0, children: _jsx(Text, { color: "gray", children: "\u2191\u2193 select \u00B7 Enter confirm \u00B7 Esc back" }) })] }));
+}
+function ToolScopeView({ tool, columns, scopeTarget, scopeNextEnabled, sessionAvailable, }) {
+    return (_jsxs(Box, { flexDirection: "column", width: columns, children: [_jsxs(Box, { paddingX: 0, paddingY: 0, children: [_jsx(Text, { color: "cyan", bold: true, children: scopeNextEnabled ? 'Enable Tool' : 'Disable Tool' }), _jsxs(Text, { color: "gray", children: [" ", tool.name] })] }), _jsx(Box, { paddingX: 0, paddingY: 0, children: _jsx(Text, { color: "gray", children: "Apply to:" }) }), _jsx(Box, { paddingX: 0, paddingY: 0, children: _jsxs(Text, { color: scopeTarget === 'session' ? 'cyan' : 'gray', children: [scopeTarget === 'session' ? '▶ ' : '  ', "Session (default)"] }) }), _jsx(Box, { paddingX: 0, paddingY: 0, children: _jsxs(Text, { color: scopeTarget === 'global' ? 'cyan' : 'gray', children: [scopeTarget === 'global' ? '▶ ' : '  ', "Global (persisted)"] }) }), !sessionAvailable && scopeTarget === 'session' && (_jsx(Box, { paddingX: 0, paddingY: 0, children: _jsx(Text, { color: "yellow", children: "No active session; switching to global." }) })), _jsx(Box, { paddingX: 0, paddingY: 0, children: _jsx(Text, { color: "gray", children: "\u2191\u2193 choose scope \u00B7 Enter confirm \u00B7 Esc back" }) })] }));
+}
 /**
  * Truncate text to max length with ellipsis
  */

package/dist/cli/ink-cli/components/overlays/custom-model-wizard/provider-config.d.ts

@@ -20,9 +20,17 @@ export declare function getProviderConfig(provider: CustomModelProvider): Provid
 export declare function getProviderLabel(provider: CustomModelProvider): string;
 /**
  * Get all available provider types.
- * Filters out 'dexto' when the feature flag is disabled.
+ * Filters out 'dexto-nova' when the feature flag is disabled.
  */
 export declare function getAvailableProviders(): CustomModelProvider[];
+/**
+ * Maps a provider-selection menu index to the selected provider, using the same
+ * provider ordering as the UI.
+ *
+ * This avoids subtle bugs when the displayed ordering differs from the base
+ * CUSTOM_MODEL_PROVIDERS array (e.g. feature-flagged reordering).
+ */
+export declare function getProviderByMenuIndex(index: number): CustomModelProvider | undefined;
 /**
  * Check if a provider has async validation.
  */

package/dist/cli/ink-cli/components/overlays/custom-model-wizard/provider-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provider-config.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/ink-cli/components/overlays/custom-model-wizard/provider-config.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAe,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAQhF,OAAO,KAAK,EAAE,cAAc,EAAc,MAAM,YAAY,CAAC;AA4D7D;;;GAGG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,mBAAmB,EAAE,cAAc,CAybxE,CAAC;AAEF;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,cAAc,CAE/E;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,MAAM,CAGtE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,IAAI,mBAAmB,EAAE,CAG7D;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,OAAO,CAEzE;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACpC,QAAQ,EAAE,mBAAmB,EAC7B,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAMxB"}
+{"version":3,"file":"provider-config.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/ink-cli/components/overlays/custom-model-wizard/provider-config.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAe,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAQhF,OAAO,KAAK,EAAE,cAAc,EAAc,MAAM,YAAY,CAAC;AA4D7D;;;GAGG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,mBAAmB,EAAE,cAAc,CAgcxE,CAAC;AAEF;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,cAAc,CAE/E;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,MAAM,CAGtE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,IAAI,mBAAmB,EAAE,CAW7D;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS,CAIrF;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,OAAO,CAEzE;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACpC,QAAQ,EAAE,mBAAmB,EAC7B,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAMxB"}

package/dist/cli/ink-cli/components/overlays/custom-model-wizard/provider-config.js

@@ -120,6 +120,7 @@ export const PROVIDER_CONFIGS = {
                 validate: validators.slashFormat,
             },
             { ...DISPLAY_NAME_STEP, placeholder: 'e.g., Claude 3.5 Sonnet' },
+            MAX_INPUT_TOKENS_STEP,
             REASONING_EFFORT_STEP,
             {
                 ...API_KEY_STEP,
@@ -134,6 +135,9 @@ export const PROVIDER_CONFIGS = {
             if (values.displayName?.trim()) {
                 model.displayName = values.displayName.trim();
             }
+            if (values.maxInputTokens?.trim()) {
+                model.maxInputTokens = parseInt(values.maxInputTokens, 10);
+            }
             if (values.reasoningEffort?.trim()) {
                 model.reasoningEffort =
                     values.reasoningEffort.toLowerCase();
@@ -423,9 +427,9 @@ export const PROVIDER_CONFIGS = {
             docsUrl: 'https://docs.dexto.ai/docs/guides/supported-llm-providers#google-vertex-ai',
         },
     },
-    dexto: {
-        displayName: 'Dexto',
-        description: 'Access 100+ models with Dexto credits',
+    'dexto-nova': {
+        displayName: 'Dexto Nova',
+        description: 'Access 100+ models with Nova credits',
         steps: [
             {
                 field: 'name',
@@ -446,6 +450,9 @@ export const PROVIDER_CONFIGS = {
             if (values.displayName?.trim()) {
                 model.displayName = values.displayName.trim();
             }
+            if (values.maxInputTokens?.trim()) {
+                model.maxInputTokens = parseInt(values.maxInputTokens, 10);
+            }
             if (values.reasoningEffort?.trim()) {
                 model.reasoningEffort =
                     values.reasoningEffort.toLowerCase();
@@ -455,7 +462,7 @@ export const PROVIDER_CONFIGS = {
         asyncValidation: {
             field: 'name',
             validate: async (modelId) => {
-                // Reuse OpenRouter validation since Dexto uses OpenRouter model IDs
+                // Reuse OpenRouter validation since Dexto Nova uses OpenRouter model IDs
                 let status = lookupOpenRouterModel(modelId);
                 // If cache is stale/empty, try to refresh
                 if (status === 'unknown') {
@@ -469,14 +476,14 @@ export const PROVIDER_CONFIGS = {
                     }
                 }
                 if (status === 'invalid') {
-                    return `Model '${modelId}' not found. Dexto uses OpenRouter model IDs - check https://openrouter.ai/models`;
+                    return `Model '${modelId}' not found. Dexto Nova uses OpenRouter model IDs - check https://openrouter.ai/models`;
                 }
                 return null;
             },
         },
         setupInfo: {
-            title: 'Dexto Setup',
-            description: 'Add OpenRouter-format models that use your Dexto credits. Requires login: run `dexto login` first.',
+            title: 'Dexto Nova Setup',
+            description: 'Add OpenRouter-format models that use your Dexto Nova credits. Requires login: run `dexto login` first.',
             docsUrl: 'https://openrouter.ai/models',
         },
     },
@@ -497,11 +504,30 @@ export function getProviderLabel(provider) {
 }
 /**
  * Get all available provider types.
- * Filters out 'dexto' when the feature flag is disabled.
+ * Filters out 'dexto-nova' when the feature flag is disabled.
  */
 export function getAvailableProviders() {
     const dextoEnabled = isDextoAuthEnabled();
-    return CUSTOM_MODEL_PROVIDERS.filter((provider) => provider !== 'dexto' || dextoEnabled);
+    const providers = CUSTOM_MODEL_PROVIDERS.filter((provider) => provider !== 'dexto-nova' || dextoEnabled);
+    if (!dextoEnabled) {
+        return providers;
+    }
+    // When enabled, put Dexto Nova first for better UX.
+    const withoutDexto = providers.filter((p) => p !== 'dexto-nova');
+    return ['dexto-nova', ...withoutDexto];
+}
+/**
+ * Maps a provider-selection menu index to the selected provider, using the same
+ * provider ordering as the UI.
+ *
+ * This avoids subtle bugs when the displayed ordering differs from the base
+ * CUSTOM_MODEL_PROVIDERS array (e.g. feature-flagged reordering).
+ */
+export function getProviderByMenuIndex(index) {
+    const providers = getAvailableProviders();
+    if (index < 0 || index >= providers.length)
+        return undefined;
+    return providers[index];
 }
 /**
  * Check if a provider has async validation.

package/dist/cli/ink-cli/containers/InputContainer.js

@@ -417,7 +417,7 @@ export const InputContainer = forwardRef(function InputContainer({ buffer, input
                     {
                         id: generateMessageId('error'),
                         role: 'system',
-                        content: `❌ Error: ${error instanceof Error ? error.message : String(error)}`,
+                        content: `Error: ${error instanceof Error ? error.message : String(error)}`,
                         timestamp: new Date(),
                     },
                 ]);
@@ -545,7 +545,7 @@ export const InputContainer = forwardRef(function InputContainer({ buffer, input
                     {
                         id: generateMessageId('error'),
                         role: 'system',
-                        content: `❌ Error: ${error instanceof Error ? error.message : String(error)}`,
+                        content: `Error: ${error instanceof Error ? error.message : String(error)}`,
                         timestamp: new Date(),
                     },
                 ]);