dexto 1.5.7 → 1.6.0

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';
@@ -44,8 +46,7 @@ import { capture } from '../../../analytics/index.js';
  * Smart container for managing overlays
  * Handles all modal interactions (selectors, autocomplete, approval)
  */
-export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input, session, approval, setInput, setUi, setSession, setMessages, setApproval, setApprovalQueue, agent, inputService, buffer, refreshStatic, onSubmitPromptCommand, }, ref) {
-    const eventBus = agent.agentEventBus;
+export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input, session, approval, setInput, setUi, setSession, setMessages, setApproval, setApprovalQueue, agent, inputService, buffer, configFilePath, refreshStatic, onSubmitPromptCommand, }, ref) {
     // Refs to overlay components for input handling
     const approvalRef = useRef(null);
     const slashAutocompleteRef = useRef(null);
@@ -79,6 +80,21 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
     // State for selected plugin (for plugin-actions overlay)
     const [selectedPlugin, setSelectedPlugin] = useState(null);
     const marketplaceAddPromptRef = useRef(null);
+    const getConfigFilePathOrWarn = useCallback((action) => {
+        if (configFilePath) {
+            return configFilePath;
+        }
+        setMessages((prev) => [
+            ...prev,
+            {
+                id: generateMessageId('system'),
+                role: 'system',
+                content: `⚠️ Cannot ${action}: this agent is not file-backed (no config path).`,
+                timestamp: new Date(),
+            },
+        ]);
+        return null;
+    }, [configFilePath, setMessages]);
     // Expose handleInput method via ref - routes to appropriate overlay
     useImperativeHandle(ref, () => ({
         handleInput: (inputStr, key) => {
@@ -176,7 +192,7 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
     }, [setApproval, setApprovalQueue, setUi]);
     // Handle approval responses
     const handleApprove = useCallback((options) => {
-        if (!approval || !eventBus)
+        if (!approval)
             return;
         // Enable "accept all edits" mode if requested
         if (options.enableAcceptEditsMode) {
@@ -185,18 +201,14 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
         // 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) {
+        if (toolName === 'plan_create' || toolName === 'plan_review') {
             setUi((prev) => ({
                 ...prev,
                 planModeActive: false,
                 planModeInitialized: false,
             }));
         }
-        eventBus.emit('approval:response', {
+        agent.emit('approval:response', {
             approvalId: approval.approvalId,
             status: ApprovalStatus.APPROVED,
             sessionId: approval.sessionId,
@@ -208,15 +220,15 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
             },
         });
         completeApproval();
-    }, [approval, eventBus, completeApproval, setUi]);
+    }, [approval, agent, completeApproval, setUi]);
     const handleDeny = useCallback((feedback) => {
-        if (!approval || !eventBus)
+        if (!approval)
             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', {
+        agent.emit('approval:response', {
             approvalId: approval.approvalId,
             status: ApprovalStatus.DENIED,
             sessionId: approval.sessionId,
@@ -224,11 +236,11 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
             message,
         });
         completeApproval();
-    }, [approval, eventBus, completeApproval]);
+    }, [approval, agent, completeApproval]);
     const handleCancelApproval = useCallback(() => {
-        if (!approval || !eventBus)
+        if (!approval)
             return;
-        eventBus.emit('approval:response', {
+        agent.emit('approval:response', {
             approvalId: approval.approvalId,
             status: ApprovalStatus.CANCELLED,
             sessionId: approval.sessionId,
@@ -236,7 +248,7 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
             message: 'User cancelled the approval request',
         });
         completeApproval();
-    }, [approval, eventBus, completeApproval]);
+    }, [approval, agent, completeApproval]);
     // Helper: Check if error is due to missing API key
     const isApiKeyMissingError = (error) => {
         if (error instanceof DextoValidationError) {
@@ -251,11 +263,12 @@ 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) => {
-        // Pre-check: Dexto provider requires OAuth login AND API key
+        // 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') {
+        if (provider === 'dexto-nova') {
             try {
                 const { canUseDextoProvider } = await import('../../utils/dexto-setup.js');
                 const canUse = await canUseDextoProvider();
@@ -265,7 +278,7 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                         {
                             id: generateMessageId('system'),
                             role: 'system',
-                            content: '❌ Cannot switch to Dexto model - authentication required. Run /login to authenticate.',
+                            content: 'Cannot switch to Dexto Nova model - authentication required. Run /login to authenticate.',
                             timestamp: new Date(),
                         },
                     ]);
@@ -279,7 +292,7 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                     {
                         id: generateMessageId('error'),
                         role: 'system',
-                        content: `❌ Failed to verify Dexto auth: ${error instanceof Error ? error.message : String(error)}`,
+                        content: `Failed to verify Dexto Nova auth: ${error instanceof Error ? error.message : String(error)}`,
                         timestamp: new Date(),
                     },
                 ]);
@@ -326,6 +339,8 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                         provider: missingProvider,
                         model,
                         ...(displayName && { displayName }),
+                        ...(baseURL && { baseURL }),
+                        ...(reasoningEffort && { reasoningEffort }),
                     },
                 }));
                 setMessages((prev) => [
@@ -344,12 +359,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
@@ -434,7 +536,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) => [
@@ -453,7 +562,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(),
                 },
             ]);
@@ -577,7 +686,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(),
                 },
             ]);
@@ -657,7 +766,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(),
                 },
             ]);
@@ -735,7 +844,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(),
                 },
             ]);
@@ -759,8 +868,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 }));
@@ -786,7 +907,7 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                 timestamp: new Date(),
             },
         ]);
-    }, [setUi, setInput, setMessages, agent, buffer]);
+    }, [setUi, setInput, setMessages, agent, buffer, getConfigFilePathOrWarn]);
     // Handle stream mode selection
     const handleStreamSelect = useCallback((enabled) => {
         setUi((prev) => ({ ...prev, activeOverlay: 'none', mcpWizardServerType: null }));
@@ -889,7 +1010,11 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                 // Import persistence utilities
                 const { updateMcpServerField } = await import('@dexto/agent-management');
                 // Persist to config file AFTER successful enable/disable
-                await updateMcpServerField(agent.getAgentFilePath(), server.name, 'enabled', newEnabled);
+                const agentPath = getConfigFilePathOrWarn('persist MCP server settings');
+                if (!agentPath) {
+                    return;
+                }
+                await updateMcpServerField(agentPath, server.name, 'enabled', newEnabled);
                 setMessages((prev) => [
                     ...prev,
                     {
@@ -917,7 +1042,7 @@ 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(),
                     },
                 ]);
@@ -951,7 +1076,7 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                     {
                         id: generateMessageId('error'),
                         role: 'system',
-                        content: `❌ Failed to authenticate server: ${error instanceof Error ? error.message : String(error)}`,
+                        content: `Failed to authenticate server: ${error instanceof Error ? error.message : String(error)}`,
                         timestamp: new Date(),
                     },
                 ]);
@@ -971,7 +1096,10 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                 // Import persistence utilities
                 const { removeMcpServerFromConfig } = await import('@dexto/agent-management');
                 // Persist to config file using surgical removal
-                await removeMcpServerFromConfig(agent.getAgentFilePath(), server.name);
+                const agentPath = getConfigFilePathOrWarn('persist MCP server deletion');
+                if (agentPath) {
+                    await removeMcpServerFromConfig(agentPath, server.name);
+                }
                 // Also disconnect if connected
                 try {
                     await agent.removeMcpServer(server.name);
@@ -995,7 +1123,7 @@ 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(),
                     },
                 ]);
@@ -1072,7 +1200,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(),
                 },
             ]);
@@ -1153,7 +1281,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(),
                 },
             ]);
@@ -1214,8 +1342,12 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                 ]);
                 // Refresh prompts to remove uninstalled plugin skills
                 try {
-                    const newConfig = await reloadAgentConfigFromFile(agent.getAgentFilePath());
-                    const enrichedConfig = enrichAgentConfig(newConfig, agent.getAgentFilePath());
+                    const agentPath = getConfigFilePathOrWarn('refresh prompts after plugin uninstall');
+                    if (!agentPath) {
+                        return;
+                    }
+                    const newConfig = await reloadAgentConfigFromFile(agentPath);
+                    const enrichedConfig = enrichAgentConfig(newConfig, agentPath);
                     await agent.refreshPrompts(enrichedConfig.prompts);
                 }
                 catch {
@@ -1236,7 +1368,7 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
             setSelectedPlugin(null);
             setUi((prev) => ({ ...prev, isProcessing: false }));
         }
-    }, [setUi, setMessages, agent]);
+    }, [setUi, setMessages, agent, getConfigFilePathOrWarn]);
     // Handle marketplace browser actions
     const handleMarketplaceBrowserAction = useCallback(async (action) => {
         if (action.type === 'add-marketplace') {
@@ -1256,8 +1388,12 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
             // 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());
+                const agentPath = getConfigFilePathOrWarn('refresh prompts after plugin install');
+                if (!agentPath) {
+                    return;
+                }
+                const newConfig = await reloadAgentConfigFromFile(agentPath);
+                const enrichedConfig = enrichAgentConfig(newConfig, agentPath);
                 await agent.refreshPrompts(enrichedConfig.prompts);
             }
             catch (error) {
@@ -1265,7 +1401,7 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                 // Log but don't show error to user
             }
         }
-    }, [setUi, setMessages, agent]);
+    }, [setUi, setMessages, agent, getConfigFilePathOrWarn]);
     // Handle marketplace add completion
     const handleMarketplaceAddComplete = useCallback((name, pluginCount) => {
         setUi((prev) => ({ ...prev, activeOverlay: 'marketplace-browser' }));
@@ -1333,7 +1469,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(),
                 },
             ]);
@@ -1480,26 +1616,34 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                 await writeFile(filePath, fileContent, 'utf-8');
                 // Re-discover commands and refresh with enriched prompts
                 const { reloadAgentConfigFromFile, enrichAgentConfig } = await import('@dexto/agent-management');
-                const newConfig = await reloadAgentConfigFromFile(agent.getAgentFilePath());
-                const enrichedConfig = enrichAgentConfig(newConfig, agent.getAgentFilePath());
+                const agentPath = getConfigFilePathOrWarn('refresh prompts after creating shared prompt');
+                if (!agentPath) {
+                    return;
+                }
+                const newConfig = await reloadAgentConfigFromFile(agentPath);
+                const enrichedConfig = enrichAgentConfig(newConfig, agentPath);
                 await agent.refreshPrompts(enrichedConfig.prompts);
             }
             else {
                 // Create in agent's prompts directory
-                const agentDir = dirname(agent.getAgentFilePath());
+                const agentPath = getConfigFilePathOrWarn('create prompt in agent prompts directory');
+                if (!agentPath) {
+                    return;
+                }
+                const agentDir = dirname(agentPath);
                 const promptsDir = join(agentDir, 'prompts');
                 filePath = join(promptsDir, `${data.name}.md`);
                 await mkdir(promptsDir, { recursive: true });
                 await writeFile(filePath, fileContent, 'utf-8');
                 // Add file reference to agent config using surgical helper
                 const { addPromptToAgentConfig, reloadAgentConfigFromFile, enrichAgentConfig, } = await import('@dexto/agent-management');
-                await addPromptToAgentConfig(agent.getAgentFilePath(), {
+                await addPromptToAgentConfig(agentPath, {
                     type: 'file',
                     file: `\${{dexto.agent_dir}}/prompts/${data.name}.md`,
                 });
                 // Reload config from disk, enrich to include discovered commands, then refresh
-                const newConfig = await reloadAgentConfigFromFile(agent.getAgentFilePath());
-                const enrichedConfig = enrichAgentConfig(newConfig, agent.getAgentFilePath());
+                const newConfig = await reloadAgentConfigFromFile(agentPath);
+                const enrichedConfig = enrichAgentConfig(newConfig, agentPath);
                 await agent.refreshPrompts(enrichedConfig.prompts);
             }
             setMessages((prev) => [
@@ -1518,12 +1662,20 @@ 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(),
                 },
             ]);
         }
-    }, [ui.promptAddWizard?.scope, setUi, setInput, setMessages, buffer, agent]);
+    }, [
+        ui.promptAddWizard?.scope,
+        setUi,
+        setInput,
+        setMessages,
+        buffer,
+        agent,
+        getConfigFilePathOrWarn,
+    ]);
     // Handle prompt delete
     const handlePromptDelete = useCallback(async (deletable) => {
         const displayName = deletable.prompt.displayName || deletable.prompt.name;
@@ -1538,10 +1690,14 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
         ]);
         try {
             const { deletePromptByMetadata, reloadAgentConfigFromFile, enrichAgentConfig } = await import('@dexto/agent-management');
+            const agentPath = getConfigFilePathOrWarn('delete prompt');
+            if (!agentPath) {
+                return;
+            }
             // Use the higher-level delete function that handles file + config
             // Pass full metadata including originalId for inline prompt deletion
             const promptMetadata = deletable.prompt.metadata;
-            const result = await deletePromptByMetadata(agent.getAgentFilePath(), {
+            const result = await deletePromptByMetadata(agentPath, {
                 name: deletable.prompt.name,
                 metadata: {
                     filePath: deletable.filePath,
@@ -1552,8 +1708,8 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                 throw new Error(result.error || 'Failed to delete prompt');
             }
             // Reload config from disk, enrich to include discovered commands, then refresh
-            const newConfig = await reloadAgentConfigFromFile(agent.getAgentFilePath());
-            const enrichedConfig = enrichAgentConfig(newConfig, agent.getAgentFilePath());
+            const newConfig = await reloadAgentConfigFromFile(agentPath);
+            const enrichedConfig = enrichAgentConfig(newConfig, agentPath);
             await agent.refreshPrompts(enrichedConfig.prompts);
             setMessages((prev) => [
                 ...prev,
@@ -1577,7 +1733,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(),
                 },
             ]);
@@ -1587,7 +1743,7 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                 activeOverlay: 'prompt-list',
             }));
         }
-    }, [setUi, setMessages, agent]);
+    }, [setUi, setMessages, agent, getConfigFilePathOrWarn]);
     // Handle prompt add wizard close
     const handlePromptAddWizardClose = useCallback(() => {
         setUi((prev) => ({
@@ -1645,7 +1801,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(),
                 },
             ]);
@@ -1655,7 +1811,7 @@ 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, 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 }) })), 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 === '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: () => {

package/dist/cli/ink-cli/hooks/useAgentEvents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useAgentEvents.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/hooks/useAgentEvents.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EAEH,KAAK,UAAU,EACf,KAAK,aAAa,EAErB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAEvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAEtE,UAAU,mBAAmB;IACzB,KAAK,EAAE,UAAU,CAAC;IAClB,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC7D,kBAAkB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACpE,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACrD,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/D,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;IAC3D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1E,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;IAC1E,iBAAiB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;IACzE,8CAA8C;IAC9C,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,iFAAiF;IACjF,MAAM,EAAE,UAAU,CAAC;CACtB;AAYD;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,EAC3B,KAAK,EACL,WAAW,EACX,kBAAkB,EAClB,KAAK,EACL,UAAU,EACV,QAAQ,EACR,WAAW,EACX,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,EAChB,MAAM,GACT,EAAE,mBAAmB,GAAG,IAAI,CAuX5B"}
+{"version":3,"file":"useAgentEvents.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/hooks/useAgentEvents.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EAEH,KAAK,UAAU,EACf,KAAK,aAAa,EAErB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAEvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAEtE,UAAU,mBAAmB;IACzB,KAAK,EAAE,UAAU,CAAC;IAClB,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC7D,kBAAkB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACpE,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACrD,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/D,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;IAC3D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1E,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;IAC1E,iBAAiB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;IACzE,8CAA8C;IAC9C,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,iFAAiF;IACjF,MAAM,EAAE,UAAU,CAAC;CACtB;AAYD;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,EAC3B,KAAK,EACL,WAAW,EACX,kBAAkB,EAClB,KAAK,EACL,UAAU,EACV,QAAQ,EACR,WAAW,EACX,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,EAChB,MAAM,GACT,EAAE,mBAAmB,GAAG,IAAI,CAgd5B"}