dexto 1.5.6 → 1.5.8

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

@@ -5,6 +5,7 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
  */
 import React, { useCallback, useRef, useImperativeHandle, forwardRef, useState } from 'react';
 import { Box } from 'ink';
+import path from 'path';
 import { ApprovalStatus, DenialReason, isUserMessage } from '@dexto/core';
 import { ApprovalPrompt, } from '../components/ApprovalPrompt.js';
 import { SlashCommandAutocomplete, } from '../components/SlashCommandAutocomplete.js';
@@ -22,6 +23,7 @@ import SessionSubcommandSelector from '../components/overlays/SessionSubcommandS
 import McpCustomTypeSelector from '../components/overlays/McpCustomTypeSelector.js';
 import McpCustomWizard from '../components/overlays/McpCustomWizard.js';
 import CustomModelWizard from '../components/overlays/CustomModelWizard.js';
+import { getProviderKeyStatus, loadGlobalPreferences, updateGlobalPreferences, } from '@dexto/agent-management';
 import ApiKeyInput from '../components/overlays/ApiKeyInput.js';
 import SearchOverlay from '../components/overlays/SearchOverlay.js';
 import PromptList from '../components/overlays/PromptList.js';
@@ -31,7 +33,12 @@ import PromptDeleteSelector from '../components/overlays/PromptDeleteSelector.js
 import SessionRenameOverlay from '../components/overlays/SessionRenameOverlay.js';
 import ContextStatsOverlay from '../components/overlays/ContextStatsOverlay.js';
 import ExportWizard from '../components/overlays/ExportWizard.js';
-import { DextoValidationError, LLMErrorCode } from '@dexto/core';
+import PluginManager from '../components/overlays/PluginManager.js';
+import PluginList from '../components/overlays/PluginList.js';
+import PluginActions from '../components/overlays/PluginActions.js';
+import MarketplaceBrowser from '../components/overlays/MarketplaceBrowser.js';
+import MarketplaceAddPrompt from '../components/overlays/MarketplaceAddPrompt.js';
+import { DextoValidationError, LLMErrorCode, getModelDisplayName } from '@dexto/core';
 import { createUserMessage, convertHistoryToUIMessages } from '../utils/messageFormatting.js';
 import { generateMessageId } from '../utils/idGenerator.js';
 import { capture } from '../../../analytics/index.js';
@@ -67,6 +74,13 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
     const sessionRenameRef = useRef(null);
     const contextStatsRef = useRef(null);
     const exportWizardRef = useRef(null);
+    const pluginManagerRef = useRef(null);
+    const pluginListRef = useRef(null);
+    const pluginActionsRef = useRef(null);
+    const marketplaceBrowserRef = useRef(null);
+    // State for selected plugin (for plugin-actions overlay)
+    const [selectedPlugin, setSelectedPlugin] = useState(null);
+    const marketplaceAddPromptRef = useRef(null);
     // Expose handleInput method via ref - routes to appropriate overlay
     useImperativeHandle(ref, () => ({
         handleInput: (inputStr, key) => {
@@ -126,6 +140,16 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                     return contextStatsRef.current?.handleInput(inputStr, key) ?? false;
                 case 'export-wizard':
                     return exportWizardRef.current?.handleInput(inputStr, key) ?? false;
+                case 'plugin-manager':
+                    return pluginManagerRef.current?.handleInput(inputStr, key) ?? false;
+                case 'plugin-list':
+                    return pluginListRef.current?.handleInput(inputStr, key) ?? false;
+                case 'plugin-actions':
+                    return pluginActionsRef.current?.handleInput(inputStr, key) ?? false;
+                case 'marketplace-browser':
+                    return (marketplaceBrowserRef.current?.handleInput(inputStr, key) ?? false);
+                case 'marketplace-add':
+                    return (marketplaceAddPromptRef.current?.handleInput(inputStr, key) ?? false);
                 default:
                     return false;
             }
@@ -160,6 +184,20 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
         if (options.enableAcceptEditsMode) {
             setUi((prev) => ({ ...prev, autoApproveEdits: true }));
         }
+        // Auto-disable plan mode when plan_create or plan_review is approved
+        // This signals the transition from planning phase to execution phase
+        const toolName = approval.metadata.toolName;
+        const isPlanTool = toolName === 'plan_create' ||
+            toolName === 'plan_review' ||
+            toolName === 'custom--plan_create' ||
+            toolName === 'custom--plan_review';
+        if (isPlanTool) {
+            setUi((prev) => ({
+                ...prev,
+                planModeActive: false,
+                planModeInitialized: false,
+            }));
+        }
         eventBus.emit('approval:response', {
             approvalId: approval.approvalId,
             status: ApprovalStatus.APPROVED,
@@ -173,15 +211,19 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
         });
         completeApproval();
     }, [approval, eventBus, completeApproval, setUi]);
-    const handleDeny = useCallback(() => {
+    const handleDeny = useCallback((feedback) => {
         if (!approval || !eventBus)
             return;
+        // Include user feedback in the denial message if provided
+        const message = feedback
+            ? `User requested changes: ${feedback}`
+            : 'User denied the tool execution';
         eventBus.emit('approval:response', {
             approvalId: approval.approvalId,
             status: ApprovalStatus.DENIED,
             sessionId: approval.sessionId,
             reason: DenialReason.USER_DENIED,
-            message: 'User denied the tool execution',
+            message,
         });
         completeApproval();
     }, [approval, eventBus, completeApproval]);
@@ -211,8 +253,43 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
         }
         return null;
     };
-    // Handle model selection
+    // Handle model selection (session-only)
     const handleModelSelect = useCallback(async (provider, model, displayName, baseURL, reasoningEffort) => {
+        // Session-only switch (default is set via explicit action)
+        // Pre-check: Dexto Nova provider requires OAuth login AND API key
+        // Check BEFORE closing the overlay so user can pick a different model
+        if (provider === 'dexto-nova') {
+            try {
+                const { canUseDextoProvider } = await import('../../utils/dexto-setup.js');
+                const canUse = await canUseDextoProvider();
+                if (!canUse) {
+                    setMessages((prev) => [
+                        ...prev,
+                        {
+                            id: generateMessageId('system'),
+                            role: 'system',
+                            content: 'Cannot switch to Dexto Nova model - authentication required. Run /login to authenticate.',
+                            timestamp: new Date(),
+                        },
+                    ]);
+                    // Don't close the overlay - let user pick a different model
+                    return;
+                }
+            }
+            catch (error) {
+                setMessages((prev) => [
+                    ...prev,
+                    {
+                        id: generateMessageId('error'),
+                        role: 'system',
+                        content: `Failed to verify Dexto Nova auth: ${error instanceof Error ? error.message : String(error)}`,
+                        timestamp: new Date(),
+                    },
+                ]);
+                // Don't close the overlay - let user pick a different model
+                return;
+            }
+        }
         setUi((prev) => ({ ...prev, activeOverlay: 'none', mcpWizardServerType: null }));
         buffer.setText('');
         setInput((prev) => ({ ...prev, historyIndex: -1 }));
@@ -252,6 +329,8 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                         provider: missingProvider,
                         model,
                         ...(displayName && { displayName }),
+                        ...(baseURL && { baseURL }),
+                        ...(reasoningEffort && { reasoningEffort }),
                     },
                 }));
                 setMessages((prev) => [
@@ -270,12 +349,99 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                 {
                     id: generateMessageId('error'),
                     role: 'system',
-                    content: `❌ Failed to switch model: ${error instanceof Error ? error.message : String(error)}`,
+                    content: `Failed to switch model: ${error instanceof Error ? error.message : String(error)}`,
                     timestamp: new Date(),
                 },
             ]);
         }
     }, [setUi, setInput, setMessages, setSession, agent, session.id, buffer]);
+    const handleSetDefaultModel = useCallback(async (provider, model, displayName, baseURL, reasoningEffort) => {
+        try {
+            const preferencesUpdate = {
+                provider,
+                model,
+                ...(baseURL ? { baseURL } : {}),
+                ...(reasoningEffort ? { reasoningEffort } : {}),
+            };
+            let providerEnvVar;
+            try {
+                const providerKeyStatus = await getProviderKeyStatus(provider);
+                providerEnvVar = providerKeyStatus?.envVar;
+            }
+            catch (error) {
+                agent.logger.debug(`Failed to resolve provider API key env var: ${error instanceof Error ? error.message : String(error)}`);
+            }
+            let existing = null;
+            try {
+                existing = await loadGlobalPreferences();
+            }
+            catch {
+                existing = null;
+            }
+            // Only preserve the API key if the provider hasn't changed
+            // If provider changed, use the new provider's env var
+            if (existing?.llm.provider === provider && existing?.llm.apiKey) {
+                preferencesUpdate.apiKey = existing.llm.apiKey;
+            }
+            else if (providerEnvVar) {
+                preferencesUpdate.apiKey = '$' + providerEnvVar;
+            }
+            await updateGlobalPreferences({
+                llm: preferencesUpdate,
+            });
+            try {
+                await agent.switchLLM({ provider: provider, model, baseURL, reasoningEffort }, session.id || undefined);
+                setSession((prev) => ({ ...prev, modelName: displayName || model }));
+                setMessages((prev) => [
+                    ...prev,
+                    {
+                        id: generateMessageId('system'),
+                        role: 'system',
+                        content: `✅ Default model set to ${displayName || model} (${provider})`,
+                        timestamp: new Date(),
+                    },
+                ]);
+            }
+            catch (error) {
+                const missingProvider = isApiKeyMissingError(error);
+                if (missingProvider) {
+                    setUi((prev) => ({
+                        ...prev,
+                        activeOverlay: 'api-key-input',
+                        pendingModelSwitch: {
+                            provider: missingProvider,
+                            model,
+                            ...(displayName && { displayName }),
+                            ...(baseURL && { baseURL }),
+                            ...(reasoningEffort && { reasoningEffort }),
+                        },
+                    }));
+                    setMessages((prev) => [
+                        ...prev,
+                        {
+                            id: generateMessageId('system'),
+                            role: 'system',
+                            content: `🔑 API key required for ${provider}`,
+                            timestamp: new Date(),
+                        },
+                    ]);
+                    return;
+                }
+                throw error;
+            }
+        }
+        catch (error) {
+            setMessages((prev) => [
+                ...prev,
+                {
+                    id: generateMessageId('error'),
+                    role: 'system',
+                    content: `Failed to set default model: ${error instanceof Error ? error.message : String(error)}`,
+                    timestamp: new Date(),
+                },
+            ]);
+        }
+    }, [agent, setMessages, setSession, setUi, session.id]);
     // State for editing custom model
     const [editingModel, setEditingModel] = useState(null);
     // Handle "Add custom model" from model selector
@@ -360,7 +526,14 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                     timestamp: new Date(),
                 },
             ]);
-            await agent.switchLLM({ provider: pending.provider, model: pending.model }, session.id || undefined);
+            await agent.switchLLM({
+                provider: pending.provider,
+                model: pending.model,
+                ...(pending.baseURL && { baseURL: pending.baseURL }),
+                ...(pending.reasoningEffort && {
+                    reasoningEffort: pending.reasoningEffort,
+                }),
+            }, session.id || undefined);
             // Update session state with display name (fallback to model ID)
             setSession((prev) => ({ ...prev, modelName: pendingDisplayName }));
             setMessages((prev) => [
@@ -379,7 +552,7 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                 {
                     id: generateMessageId('error'),
                     role: 'system',
-                    content: `❌ Failed to switch model: ${error instanceof Error ? error.message : String(error)}`,
+                    content: `Failed to switch model: ${error instanceof Error ? error.message : String(error)}`,
                     timestamp: new Date(),
                 },
             ]);
@@ -443,16 +616,19 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
             setMessages([]);
             setApproval(null);
             setApprovalQueue([]);
-            setSession({
-                id: newSessionId,
-                hasActiveSession: true,
-                modelName: session.modelName,
-            });
-            // Verify session exists
+            // Verify session exists first
             const sessionData = await agent.getSession(newSessionId);
             if (!sessionData) {
                 throw new Error(`Session ${newSessionId} not found`);
             }
+            // Get the actual model being used for this session (respects llmOverride)
+            const newSessionConfig = agent.getCurrentLLMConfig(newSessionId);
+            const newSessionModelName = getModelDisplayName(newSessionConfig.model, newSessionConfig.provider);
+            setSession({
+                id: newSessionId,
+                hasActiveSession: true,
+                modelName: newSessionModelName,
+            });
             // Load session history
             const history = await agent.getSessionHistory(newSessionId);
             if (history && history.length > 0) {
@@ -500,7 +676,7 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                 {
                     id: generateMessageId('error'),
                     role: 'system',
-                    content: `❌ Failed to switch session: ${error instanceof Error ? error.message : String(error)}`,
+                    content: `Failed to switch session: ${error instanceof Error ? error.message : String(error)}`,
                     timestamp: new Date(),
                 },
             ]);
@@ -580,7 +756,7 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                 {
                     id: generateMessageId('error'),
                     role: 'system',
-                    content: `❌ ${error instanceof Error ? error.message : String(error)}`,
+                    content: `${error instanceof Error ? error.message : String(error)}`,
                     timestamp: new Date(),
                 },
             ]);
@@ -658,7 +834,7 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                 {
                     id: generateMessageId('error'),
                     role: 'system',
-                    content: `❌ ${error instanceof Error ? error.message : String(error)}`,
+                    content: `${error instanceof Error ? error.message : String(error)}`,
                     timestamp: new Date(),
                 },
             ]);
@@ -682,8 +858,20 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
         const atIndex = input.value.lastIndexOf('@');
         if (atIndex >= 0) {
             const before = input.value.slice(0, atIndex + 1);
-            const uriParts = resource.uri.split('/');
-            const reference = resource.name || uriParts[uriParts.length - 1] || resource.uri;
+            const uriParts = resource.uri.split(/[\\/]/);
+            let reference = resource.name || uriParts[uriParts.length - 1] || resource.uri;
+            // If it's an absolute path, use relative path as reference to be more descriptive and less bulky
+            const rawUri = resource.uri.replace(/^(fs|file):\/\//, ''); // Stripped prefix
+            if (path.isAbsolute(rawUri)) {
+                try {
+                    const relativePath = path.relative(process.cwd(), rawUri);
+                    // Prioritize relative path for local files to avoid ambiguity
+                    reference = relativePath;
+                }
+                catch {
+                    // Keep fallback if relative fails
+                }
+            }
             const newValue = `${before}${reference} `;
             buffer.setText(newValue);
             setInput((prev) => ({ ...prev, value: newValue }));
@@ -763,6 +951,8 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
             activeOverlay: 'none',
             selectedMcpServer: null,
             mcpWizardServerType: null,
+            isProcessing: true,
+            isCancelling: false,
         }));
         buffer.setText('');
         setInput((prev) => ({ ...prev, historyIndex: -1 }));
@@ -795,6 +985,12 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                                 timestamp: new Date(),
                             },
                         ]);
+                        setUi((prev) => ({
+                            ...prev,
+                            isProcessing: false,
+                            isCancelling: false,
+                            isThinking: false,
+                        }));
                         return;
                     }
                 }
@@ -832,7 +1028,41 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                     {
                         id: generateMessageId('error'),
                         role: 'system',
-                        content: `❌ Failed to ${action.type} server: ${errorMessage}`,
+                        content: `Failed to ${action.type} server: ${errorMessage}`,
+                        timestamp: new Date(),
+                    },
+                ]);
+            }
+        }
+        else if (action.type === 'authenticate') {
+            setMessages((prev) => [
+                ...prev,
+                {
+                    id: generateMessageId('system'),
+                    role: 'system',
+                    content: `🔐 Authenticating ${server.name}...`,
+                    timestamp: new Date(),
+                },
+            ]);
+            try {
+                await agent.restartMcpServer(server.name);
+                setMessages((prev) => [
+                    ...prev,
+                    {
+                        id: generateMessageId('system'),
+                        role: 'system',
+                        content: `✅ Authenticated ${server.name}`,
+                        timestamp: new Date(),
+                    },
+                ]);
+            }
+            catch (error) {
+                setMessages((prev) => [
+                    ...prev,
+                    {
+                        id: generateMessageId('error'),
+                        role: 'system',
+                        content: `Failed to authenticate server: ${error instanceof Error ? error.message : String(error)}`,
                         timestamp: new Date(),
                     },
                 ]);
@@ -876,12 +1106,18 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                     {
                         id: generateMessageId('error'),
                         role: 'system',
-                        content: `❌ Failed to delete server: ${error instanceof Error ? error.message : String(error)}`,
+                        content: `Failed to delete server: ${error instanceof Error ? error.message : String(error)}`,
                         timestamp: new Date(),
                     },
                 ]);
             }
         }
+        setUi((prev) => ({
+            ...prev,
+            isProcessing: false,
+            isCancelling: false,
+            isThinking: false,
+        }));
     }, [setUi, setInput, setMessages, agent, buffer]);
     // Handle MCP add choice (registry/custom/back)
     const handleMcpAddChoice = useCallback((choice) => {
@@ -947,7 +1183,7 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                 {
                     id: generateMessageId('system'),
                     role: 'system',
-                    content: `❌ Failed to connect: ${error instanceof Error ? error.message : String(error)}`,
+                    content: `Failed to connect: ${error instanceof Error ? error.message : String(error)}`,
                     timestamp: new Date(),
                 },
             ]);
@@ -1028,7 +1264,7 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                 {
                     id: generateMessageId('system'),
                     role: 'system',
-                    content: `❌ Failed to connect: ${error instanceof Error ? error.message : String(error)}`,
+                    content: `Failed to connect: ${error instanceof Error ? error.message : String(error)}`,
                     timestamp: new Date(),
                 },
             ]);
@@ -1040,6 +1276,120 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
             isThinking: false,
         }));
     }, [setUi, setInput, setMessages, agent, buffer]);
+    // Handle plugin manager actions
+    const handlePluginManagerAction = useCallback((action) => {
+        if (action === 'list') {
+            setUi((prev) => ({
+                ...prev,
+                activeOverlay: 'plugin-list',
+            }));
+        }
+        else if (action === 'marketplace') {
+            setUi((prev) => ({
+                ...prev,
+                activeOverlay: 'marketplace-browser',
+            }));
+        }
+    }, [setUi]);
+    // Handle plugin selection from plugin list
+    const handlePluginSelect = useCallback((plugin) => {
+        setSelectedPlugin(plugin);
+        setUi((prev) => ({
+            ...prev,
+            activeOverlay: 'plugin-actions',
+        }));
+    }, [setUi]);
+    // Handle plugin actions (uninstall, back)
+    const handlePluginAction = useCallback(async (action) => {
+        if (action.type === 'back') {
+            setSelectedPlugin(null);
+            setUi((prev) => ({
+                ...prev,
+                activeOverlay: 'plugin-list',
+            }));
+            return;
+        }
+        if (action.type === 'uninstall') {
+            setUi((prev) => ({ ...prev, activeOverlay: 'none', isProcessing: true }));
+            try {
+                const { uninstallPlugin, reloadAgentConfigFromFile, enrichAgentConfig } = await import('@dexto/agent-management');
+                await uninstallPlugin(action.plugin.name);
+                setMessages((prev) => [
+                    ...prev,
+                    {
+                        id: generateMessageId('system'),
+                        role: 'system',
+                        content: `Plugin '${action.plugin.name}' has been uninstalled.`,
+                        timestamp: new Date(),
+                    },
+                ]);
+                // Refresh prompts to remove uninstalled plugin skills
+                try {
+                    const newConfig = await reloadAgentConfigFromFile(agent.getAgentFilePath());
+                    const enrichedConfig = enrichAgentConfig(newConfig, agent.getAgentFilePath());
+                    await agent.refreshPrompts(enrichedConfig.prompts);
+                }
+                catch {
+                    // Non-critical: prompts will refresh on next agent restart
+                }
+            }
+            catch (error) {
+                setMessages((prev) => [
+                    ...prev,
+                    {
+                        id: generateMessageId('error'),
+                        role: 'system',
+                        content: `Failed to uninstall plugin: ${error instanceof Error ? error.message : String(error)}`,
+                        timestamp: new Date(),
+                    },
+                ]);
+            }
+            setSelectedPlugin(null);
+            setUi((prev) => ({ ...prev, isProcessing: false }));
+        }
+    }, [setUi, setMessages, agent]);
+    // Handle marketplace browser actions
+    const handleMarketplaceBrowserAction = useCallback(async (action) => {
+        if (action.type === 'add-marketplace') {
+            setUi((prev) => ({ ...prev, activeOverlay: 'marketplace-add' }));
+        }
+        else if (action.type === 'plugin-installed') {
+            setUi((prev) => ({ ...prev, activeOverlay: 'none' }));
+            setMessages((prev) => [
+                ...prev,
+                {
+                    id: generateMessageId('system'),
+                    role: 'system',
+                    content: `✅ Plugin '${action.pluginName}' installed from ${action.marketplace}`,
+                    timestamp: new Date(),
+                },
+            ]);
+            // Refresh prompts to include new plugin skills
+            try {
+                const { reloadAgentConfigFromFile, enrichAgentConfig } = await import('@dexto/agent-management');
+                const newConfig = await reloadAgentConfigFromFile(agent.getAgentFilePath());
+                const enrichedConfig = enrichAgentConfig(newConfig, agent.getAgentFilePath());
+                await agent.refreshPrompts(enrichedConfig.prompts);
+            }
+            catch (error) {
+                // Non-critical: prompts will refresh on next agent restart
+                // Log but don't show error to user
+            }
+        }
+    }, [setUi, setMessages, agent]);
+    // Handle marketplace add completion
+    const handleMarketplaceAddComplete = useCallback((name, pluginCount) => {
+        setUi((prev) => ({ ...prev, activeOverlay: 'marketplace-browser' }));
+        setMessages((prev) => [
+            ...prev,
+            {
+                id: generateMessageId('system'),
+                role: 'system',
+                content: `✅ Marketplace '${name}' added (${pluginCount} plugins found)`,
+                timestamp: new Date(),
+            },
+        ]);
+    }, [setUi, setMessages]);
     // Handle session subcommand selection
     const handleSessionSubcommandSelect = useCallback(async (action) => {
         if (action === 'switch') {
@@ -1094,7 +1444,7 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                 {
                     id: generateMessageId('error'),
                     role: 'system',
-                    content: `❌ ${error instanceof Error ? error.message : String(error)}`,
+                    content: `${error instanceof Error ? error.message : String(error)}`,
                     timestamp: new Date(),
                 },
             ]);
@@ -1279,7 +1629,7 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                 {
                     id: generateMessageId('error'),
                     role: 'system',
-                    content: `❌ Failed to create prompt: ${error instanceof Error ? error.message : String(error)}`,
+                    content: `Failed to create prompt: ${error instanceof Error ? error.message : String(error)}`,
                     timestamp: new Date(),
                 },
             ]);
@@ -1338,7 +1688,7 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                 {
                     id: generateMessageId('error'),
                     role: 'system',
-                    content: `❌ Failed to delete prompt: ${error instanceof Error ? error.message : String(error)}`,
+                    content: `Failed to delete prompt: ${error instanceof Error ? error.message : String(error)}`,
                     timestamp: new Date(),
                 },
             ]);
@@ -1406,7 +1756,7 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                 {
                     id: generateMessageId('error'),
                     role: 'system',
-                    content: `❌ Failed to rename session: ${error instanceof Error ? error.message : String(error)}`,
+                    content: `Failed to rename session: ${error instanceof Error ? error.message : String(error)}`,
                     timestamp: new Date(),
                 },
             ]);
@@ -1416,8 +1766,14 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
     const handleSessionRenameClose = useCallback(() => {
         setUi((prev) => ({ ...prev, activeOverlay: 'none' }));
     }, [setUi]);
-    return (_jsxs(_Fragment, { children: [approval && (_jsx(ApprovalPrompt, { ref: approvalRef, approval: approval, onApprove: handleApprove, onDeny: handleDeny, onCancel: handleCancelApproval })), ui.activeOverlay === 'slash-autocomplete' && (_jsx(Box, { marginTop: 1, children: _jsx(SlashCommandAutocomplete, { ref: slashAutocompleteRef, isVisible: true, searchQuery: input.value, onSelectPrompt: handlePromptSelect, onSelectSystemCommand: handleSystemCommandSelect, onLoadIntoInput: handleLoadIntoInput, onSubmitRaw: onSubmitPromptCommand, onClose: handleClose, agent: agent }) })), ui.activeOverlay === 'resource-autocomplete' && (_jsx(Box, { marginTop: 1, children: _jsx(ResourceAutocomplete, { ref: resourceAutocompleteRef, isVisible: true, searchQuery: input.value, onSelectResource: handleResourceSelect, onLoadIntoInput: handleLoadIntoInput, onClose: handleClose, agent: agent }) })), ui.activeOverlay === 'model-selector' && (_jsx(Box, { marginTop: 1, children: _jsx(ModelSelectorRefactored, { ref: modelSelectorRef, isVisible: true, onSelectModel: handleModelSelect, onClose: handleClose, onAddCustomModel: handleAddCustomModel, onEditCustomModel: handleEditCustomModel, agent: agent }) })), ui.activeOverlay === 'session-selector' && (_jsx(Box, { marginTop: 1, children: _jsx(SessionSelectorRefactored, { ref: sessionSelectorRef, isVisible: true, onSelectSession: handleSessionSelect, onClose: handleClose, agent: agent, currentSessionId: session.id || undefined }) })), ui.activeOverlay === 'log-level-selector' && (_jsx(Box, { marginTop: 1, children: _jsx(LogLevelSelector, { ref: logLevelSelectorRef, isVisible: true, onSelect: handleLogLevelSelect, onClose: handleClose, agent: agent }) })), ui.activeOverlay === 'stream-selector' && (_jsx(Box, { marginTop: 1, children: _jsx(StreamSelector, { ref: streamSelectorRef, isVisible: true, onSelect: handleStreamSelect, onClose: handleClose }) })), ui.activeOverlay === 'tool-browser' && (_jsx(Box, { marginTop: 1, children: _jsx(ToolBrowser, { ref: toolBrowserRef, isVisible: true, onClose: handleClose, agent: agent }) })), ui.activeOverlay === 'mcp-server-list' && (_jsx(Box, { marginTop: 1, children: _jsx(McpServerList, { ref: mcpServerListRef, isVisible: true, onAction: handleMcpServerListAction, onClose: handleClose, agent: agent }) })), ui.activeOverlay === 'mcp-server-actions' && ui.selectedMcpServer && (_jsx(Box, { marginTop: 1, children: _jsx(McpServerActions, { ref: mcpServerActionsRef, isVisible: true, server: ui.selectedMcpServer, onAction: handleMcpServerAction, onClose: handleClose }) })), ui.activeOverlay === 'mcp-add-choice' && (_jsx(Box, { marginTop: 1, children: _jsx(McpAddChoice, { ref: mcpAddChoiceRef, isVisible: true, onSelect: handleMcpAddChoice, onClose: handleClose }) })), ui.activeOverlay === 'mcp-add-selector' && (_jsx(Box, { marginTop: 1, children: _jsx(McpAddSelector, { ref: mcpAddSelectorRef, isVisible: true, onSelect: handleMcpAddSelect, onClose: handleClose }) })), ui.activeOverlay === 'mcp-custom-type-selector' && (_jsx(Box, { marginTop: 1, children: _jsx(McpCustomTypeSelector, { ref: mcpCustomTypeSelectorRef, isVisible: true, onSelect: handleMcpCustomTypeSelect, onClose: handleClose }) })), ui.activeOverlay === 'mcp-custom-wizard' && ui.mcpWizardServerType && (_jsx(McpCustomWizard, { ref: mcpCustomWizardRef, isVisible: true, serverType: ui.mcpWizardServerType, onComplete: handleMcpCustomWizardComplete, onClose: handleClose })), ui.activeOverlay === 'custom-model-wizard' && (_jsx(CustomModelWizard, { ref: customModelWizardRef, isVisible: true, onComplete: handleCustomModelComplete, onClose: () => {
+    return (_jsxs(_Fragment, { children: [approval && (_jsx(ApprovalPrompt, { ref: approvalRef, approval: approval, onApprove: handleApprove, onDeny: handleDeny, onCancel: handleCancelApproval })), ui.activeOverlay === 'slash-autocomplete' && (_jsx(Box, { marginTop: 1, children: _jsx(SlashCommandAutocomplete, { ref: slashAutocompleteRef, isVisible: true, searchQuery: input.value, onSelectPrompt: handlePromptSelect, onSelectSystemCommand: handleSystemCommandSelect, onLoadIntoInput: handleLoadIntoInput, onSubmitRaw: onSubmitPromptCommand, onClose: handleClose, agent: agent }) })), ui.activeOverlay === 'resource-autocomplete' && (_jsx(Box, { marginTop: 1, children: _jsx(ResourceAutocomplete, { ref: resourceAutocompleteRef, isVisible: true, searchQuery: input.value, onSelectResource: handleResourceSelect, onLoadIntoInput: handleLoadIntoInput, onClose: handleClose, agent: agent }) })), ui.activeOverlay === 'model-selector' && (_jsx(Box, { marginTop: 1, children: _jsx(ModelSelectorRefactored, { ref: modelSelectorRef, isVisible: true, onSelectModel: handleModelSelect, onSetDefaultModel: handleSetDefaultModel, onClose: handleClose, onAddCustomModel: handleAddCustomModel, onEditCustomModel: handleEditCustomModel, agent: agent }) })), ui.activeOverlay === 'session-selector' && (_jsx(Box, { marginTop: 1, children: _jsx(SessionSelectorRefactored, { ref: sessionSelectorRef, isVisible: true, onSelectSession: handleSessionSelect, onClose: handleClose, agent: agent, currentSessionId: session.id || undefined }) })), ui.activeOverlay === 'log-level-selector' && (_jsx(Box, { marginTop: 1, children: _jsx(LogLevelSelector, { ref: logLevelSelectorRef, isVisible: true, onSelect: handleLogLevelSelect, onClose: handleClose, agent: agent, sessionId: session.id }) })), ui.activeOverlay === 'stream-selector' && (_jsx(Box, { marginTop: 1, children: _jsx(StreamSelector, { ref: streamSelectorRef, isVisible: true, onSelect: handleStreamSelect, onClose: handleClose }) })), ui.activeOverlay === 'tool-browser' && (_jsx(Box, { marginTop: 1, children: _jsx(ToolBrowser, { ref: toolBrowserRef, isVisible: true, onClose: handleClose, agent: agent, sessionId: session.id }) })), ui.activeOverlay === 'mcp-server-list' && (_jsx(Box, { marginTop: 1, children: _jsx(McpServerList, { ref: mcpServerListRef, isVisible: true, onAction: handleMcpServerListAction, onClose: handleClose, agent: agent }) })), ui.activeOverlay === 'mcp-server-actions' && ui.selectedMcpServer && (_jsx(Box, { marginTop: 1, children: _jsx(McpServerActions, { ref: mcpServerActionsRef, isVisible: true, server: ui.selectedMcpServer, onAction: handleMcpServerAction, onClose: handleClose }) })), ui.activeOverlay === 'mcp-add-choice' && (_jsx(Box, { marginTop: 1, children: _jsx(McpAddChoice, { ref: mcpAddChoiceRef, isVisible: true, onSelect: handleMcpAddChoice, onClose: handleClose }) })), ui.activeOverlay === 'mcp-add-selector' && (_jsx(Box, { marginTop: 1, children: _jsx(McpAddSelector, { ref: mcpAddSelectorRef, isVisible: true, onSelect: handleMcpAddSelect, onClose: handleClose }) })), ui.activeOverlay === 'mcp-custom-type-selector' && (_jsx(Box, { marginTop: 1, children: _jsx(McpCustomTypeSelector, { ref: mcpCustomTypeSelectorRef, isVisible: true, onSelect: handleMcpCustomTypeSelect, onClose: handleClose }) })), ui.activeOverlay === 'mcp-custom-wizard' && ui.mcpWizardServerType && (_jsx(McpCustomWizard, { ref: mcpCustomWizardRef, isVisible: true, serverType: ui.mcpWizardServerType, onComplete: handleMcpCustomWizardComplete, onClose: handleClose })), ui.activeOverlay === 'custom-model-wizard' && (_jsx(CustomModelWizard, { ref: customModelWizardRef, isVisible: true, onComplete: handleCustomModelComplete, onClose: () => {
                     setEditingModel(null);
                     handleClose();
-                }, initialModel: editingModel })), ui.activeOverlay === 'session-subcommand-selector' && (_jsx(Box, { marginTop: 1, children: _jsx(SessionSubcommandSelector, { ref: sessionSubcommandSelectorRef, isVisible: true, onSelect: handleSessionSubcommandSelect, onClose: handleClose }) })), ui.activeOverlay === 'api-key-input' && ui.pendingModelSwitch && (_jsx(ApiKeyInput, { ref: apiKeyInputRef, isVisible: true, provider: ui.pendingModelSwitch.provider, onSaved: handleApiKeySaved, onClose: handleApiKeyClose })), ui.activeOverlay === 'search' && (_jsx(SearchOverlay, { ref: searchOverlayRef, isVisible: true, agent: agent, onClose: handleClose, onSelectResult: handleSearchResultSelect })), ui.activeOverlay === 'prompt-list' && (_jsx(Box, { marginTop: 1, children: _jsx(PromptList, { ref: promptListRef, isVisible: true, onAction: handlePromptListAction, onLoadIntoInput: handlePromptLoadIntoInput, onClose: handleClose, agent: agent }) })), ui.activeOverlay === 'prompt-add-choice' && (_jsx(Box, { marginTop: 1, children: _jsx(PromptAddChoice, { ref: promptAddChoiceRef, isVisible: true, onSelect: handlePromptAddChoice, onClose: handlePromptAddChoiceClose }) })), ui.activeOverlay === 'prompt-add-wizard' && ui.promptAddWizard && (_jsx(PromptAddWizard, { ref: promptAddWizardRef, isVisible: true, scope: ui.promptAddWizard.scope, onComplete: handlePromptAddComplete, onClose: handlePromptAddWizardClose })), ui.activeOverlay === 'prompt-delete-selector' && (_jsx(Box, { marginTop: 1, children: _jsx(PromptDeleteSelector, { ref: promptDeleteSelectorRef, isVisible: true, onDelete: handlePromptDelete, onClose: handlePromptDeleteClose, agent: agent }) })), ui.activeOverlay === 'session-rename' && (_jsx(SessionRenameOverlay, { ref: sessionRenameRef, isVisible: true, currentTitle: currentSessionTitle, onRename: handleSessionRename, onClose: handleSessionRenameClose })), ui.activeOverlay === 'context-stats' && session.id && (_jsx(Box, { marginTop: 1, children: _jsx(ContextStatsOverlay, { ref: contextStatsRef, isVisible: true, onClose: handleClose, agent: agent, sessionId: session.id }) })), ui.activeOverlay === 'export-wizard' && (_jsx(ExportWizard, { ref: exportWizardRef, isVisible: true, agent: agent, sessionId: session.id, onClose: handleClose }))] }));
+                }, initialModel: editingModel })), ui.activeOverlay === 'plugin-manager' && (_jsx(Box, { marginTop: 1, children: _jsx(PluginManager, { ref: pluginManagerRef, isVisible: true, onAction: handlePluginManagerAction, onClose: handleClose }) })), ui.activeOverlay === 'plugin-list' && (_jsx(Box, { marginTop: 1, children: _jsx(PluginList, { ref: pluginListRef, isVisible: true, onPluginSelect: handlePluginSelect, onClose: handleClose }) })), ui.activeOverlay === 'plugin-actions' && (_jsx(Box, { marginTop: 1, children: _jsx(PluginActions, { ref: pluginActionsRef, isVisible: true, plugin: selectedPlugin, onAction: handlePluginAction, onClose: () => {
+                        setSelectedPlugin(null);
+                        setUi((prev) => ({
+                            ...prev,
+                            activeOverlay: 'plugin-list',
+                        }));
+                    } }) })), ui.activeOverlay === 'marketplace-browser' && (_jsx(Box, { marginTop: 1, children: _jsx(MarketplaceBrowser, { ref: marketplaceBrowserRef, isVisible: true, onAction: handleMarketplaceBrowserAction, onClose: handleClose }) })), ui.activeOverlay === 'marketplace-add' && (_jsx(Box, { marginTop: 1, children: _jsx(MarketplaceAddPrompt, { ref: marketplaceAddPromptRef, isVisible: true, onComplete: handleMarketplaceAddComplete, onClose: () => setUi((prev) => ({ ...prev, activeOverlay: 'marketplace-browser' })) }) })), ui.activeOverlay === 'session-subcommand-selector' && (_jsx(Box, { marginTop: 1, children: _jsx(SessionSubcommandSelector, { ref: sessionSubcommandSelectorRef, isVisible: true, onSelect: handleSessionSubcommandSelect, onClose: handleClose }) })), ui.activeOverlay === 'api-key-input' && ui.pendingModelSwitch && (_jsx(ApiKeyInput, { ref: apiKeyInputRef, isVisible: true, provider: ui.pendingModelSwitch.provider, onSaved: handleApiKeySaved, onClose: handleApiKeyClose })), ui.activeOverlay === 'search' && (_jsx(SearchOverlay, { ref: searchOverlayRef, isVisible: true, agent: agent, onClose: handleClose, onSelectResult: handleSearchResultSelect })), ui.activeOverlay === 'prompt-list' && (_jsx(Box, { marginTop: 1, children: _jsx(PromptList, { ref: promptListRef, isVisible: true, onAction: handlePromptListAction, onLoadIntoInput: handlePromptLoadIntoInput, onClose: handleClose, agent: agent }) })), ui.activeOverlay === 'prompt-add-choice' && (_jsx(Box, { marginTop: 1, children: _jsx(PromptAddChoice, { ref: promptAddChoiceRef, isVisible: true, onSelect: handlePromptAddChoice, onClose: handlePromptAddChoiceClose }) })), ui.activeOverlay === 'prompt-add-wizard' && ui.promptAddWizard && (_jsx(PromptAddWizard, { ref: promptAddWizardRef, isVisible: true, scope: ui.promptAddWizard.scope, onComplete: handlePromptAddComplete, onClose: handlePromptAddWizardClose })), ui.activeOverlay === 'prompt-delete-selector' && (_jsx(Box, { marginTop: 1, children: _jsx(PromptDeleteSelector, { ref: promptDeleteSelectorRef, isVisible: true, onDelete: handlePromptDelete, onClose: handlePromptDeleteClose, agent: agent }) })), ui.activeOverlay === 'session-rename' && (_jsx(SessionRenameOverlay, { ref: sessionRenameRef, isVisible: true, currentTitle: currentSessionTitle, onRename: handleSessionRename, onClose: handleSessionRenameClose })), ui.activeOverlay === 'context-stats' && session.id && (_jsx(Box, { marginTop: 1, children: _jsx(ContextStatsOverlay, { ref: contextStatsRef, isVisible: true, onClose: handleClose, agent: agent, sessionId: session.id ?? '' }) })), ui.activeOverlay === 'export-wizard' && (_jsx(ExportWizard, { ref: exportWizardRef, isVisible: true, agent: agent, sessionId: session.id, onClose: handleClose }))] }));
 });

package/dist/cli/ink-cli/hooks/index.d.ts

@@ -6,6 +6,7 @@ export { useKeyboardShortcuts } from './useKeyboardShortcuts.js';
 export { useInputOrchestrator, createApprovalInputHandler, createSelectorInputHandler, createAutocompleteInputHandler, createMainInputHandler, type InputHandler, type InputHandlers, type UseInputOrchestratorProps, type ApprovalHandlerProps, type SelectorHandlerProps, type AutocompleteHandlerProps, type MainInputHandlerProps, } from './useInputOrchestrator.js';
 export { useKeypress } from './useKeypress.js';
 export { useTerminalSize, type TerminalSize } from './useTerminalSize.js';
+export { useGitBranch } from './useGitBranch.js';
 export { useCLIState, type UseCLIStateProps, type CLIStateReturn, type UIState, type InputState, type SessionState, } from './useCLIState.js';
 export type { Key } from './useInputOrchestrator.js';
 //# sourceMappingURL=index.d.ts.map