dexto 1.5.8 → 1.6.1

package/dist/cli/ink-cli/InkCLIRefactored.js

@@ -25,10 +25,17 @@ import { getStartupInfo } from './utils/messageFormatting.js';
 // Toggle this to switch between modes for testing
 //const USE_ALTERNATE_BUFFER = true;
 const USE_ALTERNATE_BUFFER = false;
+function formatCost(c) {
+    if (c < 0.01)
+        return `$${c.toFixed(4)}`;
+    if (c < 1)
+        return `$${c.toFixed(3)}`;
+    return `$${c.toFixed(2)}`;
+}
 /**
  * Inner component that wraps the mode-specific component with providers
  */
-function InkCLIInner({ agent, initialSessionId, startupInfo, soundService }) {
+function InkCLIInner({ agent, initialSessionId, initialPrompt, startupInfo, soundService, configFilePath, }) {
     // Selection hint callback for alternate buffer mode
     const [, setSelectionHintShown] = useState(false);
     // Streaming mode - can be toggled via /stream command
@@ -37,10 +44,10 @@ function InkCLIInner({ agent, initialSessionId, startupInfo, soundService }) {
         setSelectionHintShown(true);
     }, []);
     if (USE_ALTERNATE_BUFFER) {
-        return (_jsx(SoundProvider, { soundService: soundService, children: _jsx(ScrollProvider, { onSelectionAttempt: handleSelectionAttempt, children: _jsx(AlternateBufferCLI, { agent: agent, initialSessionId: initialSessionId, startupInfo: startupInfo, onSelectionAttempt: handleSelectionAttempt, useStreaming: streaming }) }) }));
+        return (_jsx(SoundProvider, { soundService: soundService, children: _jsx(ScrollProvider, { onSelectionAttempt: handleSelectionAttempt, children: _jsx(AlternateBufferCLI, { agent: agent, initialSessionId: initialSessionId, initialPrompt: initialPrompt, startupInfo: startupInfo, onSelectionAttempt: handleSelectionAttempt, useStreaming: streaming, configFilePath: configFilePath }) }) }));
     }
     // Static mode - no ScrollProvider needed
-    return (_jsx(SoundProvider, { soundService: soundService, children: _jsx(StaticCLI, { agent: agent, initialSessionId: initialSessionId, startupInfo: startupInfo, useStreaming: streaming }) }));
+    return (_jsx(SoundProvider, { soundService: soundService, children: _jsx(StaticCLI, { agent: agent, initialSessionId: initialSessionId, initialPrompt: initialPrompt, startupInfo: startupInfo, useStreaming: streaming, configFilePath: configFilePath }) }));
 }
 /**
  * Modern CLI interface using React Ink
@@ -50,8 +57,8 @@ function InkCLIInner({ agent, initialSessionId, startupInfo, soundService }) {
  * - KeypressProvider for unified keyboard input
  * - MouseProvider (only in alternate buffer mode)
  */
-export function InkCLIRefactored({ agent, initialSessionId, startupInfo, soundService, }) {
-    return (_jsx(ErrorBoundary, { children: _jsx(KeypressProvider, { children: _jsx(MouseProvider, { mouseEventsEnabled: USE_ALTERNATE_BUFFER, children: _jsx(InkCLIInner, { agent: agent, initialSessionId: initialSessionId, startupInfo: startupInfo, soundService: soundService }) }) }) }));
+export function InkCLIRefactored({ agent, initialSessionId, initialPrompt, startupInfo, soundService, configFilePath, }) {
+    return (_jsx(ErrorBoundary, { children: _jsx(KeypressProvider, { children: _jsx(MouseProvider, { mouseEventsEnabled: USE_ALTERNATE_BUFFER, children: _jsx(InkCLIInner, { agent: agent, initialSessionId: initialSessionId, initialPrompt: initialPrompt, startupInfo: startupInfo, soundService: soundService, configFilePath: configFilePath }) }) }) }));
 }
 /**
  * Start the modern Ink-based CLI
@@ -68,53 +75,157 @@ export async function startInkCliRefactored(agent, initialSessionId, options = {
         updateInfo: options.updateInfo,
         needsAgentSync: options.needsAgentSync,
     };
-    // Initialize sound service from preferences
-    const { SoundNotificationService } = await import('./utils/soundNotification.js');
-    const { globalPreferencesExist, loadGlobalPreferences, agentPreferencesExist, loadAgentPreferences, } = await import('@dexto/agent-management');
+    // Load preferences helpers (non-fatal if unavailable)
+    let globalPreferencesExistFn = () => false;
+    let loadGlobalPreferencesFn = null;
+    let agentPreferencesExistFn = () => false;
+    let loadAgentPreferencesFn = null;
+    try {
+        const agentManagement = await import('@dexto/agent-management');
+        globalPreferencesExistFn = agentManagement.globalPreferencesExist;
+        loadGlobalPreferencesFn = agentManagement.loadGlobalPreferences;
+        agentPreferencesExistFn = agentManagement.agentPreferencesExist;
+        loadAgentPreferencesFn = agentManagement.loadAgentPreferences;
+    }
+    catch (error) {
+        agent.logger.debug(`Preferences module could not be loaded: ${error instanceof Error ? error.message : String(error)}`);
+    }
     let soundService = null;
     // Initialize sound config with defaults (enabled by default even without preferences file)
     let soundConfig = {
         enabled: true,
+        onStartup: false,
+        startupSoundFile: undefined,
         onApprovalRequired: true,
+        approvalSoundFile: undefined,
         onTaskComplete: true,
+        completeSoundFile: undefined,
     };
-    // Override with user preferences if they exist
-    if (globalPreferencesExist()) {
-        try {
-            const preferences = await loadGlobalPreferences();
-            soundConfig = {
-                enabled: preferences.sounds?.enabled ?? soundConfig.enabled,
-                onApprovalRequired: preferences.sounds?.onApprovalRequired ?? soundConfig.onApprovalRequired,
-                onTaskComplete: preferences.sounds?.onTaskComplete ?? soundConfig.onTaskComplete,
-            };
-        }
-        catch (error) {
-            // Log at debug level to help troubleshoot sound configuration issues
-            // Continue with default sounds - this is non-critical functionality
-            agent.logger.debug(`Sound preferences could not be loaded: ${error instanceof Error ? error.message : String(error)}`);
+    // Initialize sound service from preferences (non-fatal)
+    try {
+        const { SoundNotificationService: SoundNotificationServiceImpl } = await import('./utils/soundNotification.js');
+        // Override with user preferences if they exist
+        if (globalPreferencesExistFn() && loadGlobalPreferencesFn) {
+            try {
+                const preferences = await loadGlobalPreferencesFn();
+                soundConfig = {
+                    enabled: preferences.sounds?.enabled ?? soundConfig.enabled,
+                    onStartup: preferences.sounds?.onStartup ?? soundConfig.onStartup,
+                    startupSoundFile: preferences.sounds?.startupSoundFile ?? soundConfig.startupSoundFile,
+                    onApprovalRequired: preferences.sounds?.onApprovalRequired ?? soundConfig.onApprovalRequired,
+                    approvalSoundFile: preferences.sounds?.approvalSoundFile ?? soundConfig.approvalSoundFile,
+                    onTaskComplete: preferences.sounds?.onTaskComplete ?? soundConfig.onTaskComplete,
+                    completeSoundFile: preferences.sounds?.completeSoundFile ?? soundConfig.completeSoundFile,
+                };
+            }
+            catch (error) {
+                // Continue with default sounds - this is non-critical functionality
+                agent.logger.debug(`Sound preferences could not be loaded: ${error instanceof Error ? error.message : String(error)}`);
+            }
         }
+        // Always create the service so sound settings can be toggled at runtime (service gates playback by config)
+        soundService = new SoundNotificationServiceImpl(soundConfig);
+        soundService.playStartupSound();
     }
-    if (soundConfig.enabled) {
-        soundService = new SoundNotificationService(soundConfig);
+    catch (error) {
+        agent.logger.debug(`Sound initialization failed: ${error instanceof Error ? error.message : String(error)}`);
+        soundService = null;
     }
     // Initialize tool preferences (per-agent)
-    if (agentPreferencesExist(agent.config.agentId)) {
+    if (agentPreferencesExistFn(agent.config.agentId) && loadAgentPreferencesFn) {
         try {
-            const preferences = await loadAgentPreferences(agent.config.agentId);
+            const preferences = await loadAgentPreferencesFn(agent.config.agentId);
             agent.setGlobalDisabledTools(preferences.tools?.disabled ?? []);
         }
         catch (error) {
             agent.logger.debug(`Agent tool preferences could not be loaded: ${error instanceof Error ? error.message : String(error)}`);
         }
     }
-    const inkApp = render(_jsx(InkCLIRefactored, { agent: agent, initialSessionId: initialSessionId, startupInfo: startupInfo, soundService: soundService }), {
+    // Import exit handler before render to avoid race condition
+    const { registerExitHandler } = await import('../commands/interactive-commands/exit-handler.js');
+    const inkApp = render(_jsx(InkCLIRefactored, { agent: agent, initialSessionId: initialSessionId, initialPrompt: options.initialPrompt, startupInfo: startupInfo, soundService: soundService, configFilePath: options.configFilePath ?? null }), {
         exitOnCtrlC: false,
         alternateBuffer: USE_ALTERNATE_BUFFER,
         // Incremental rendering works better with VirtualizedList
         // Static pattern doesn't need it (and may work better without)
         incrementalRendering: USE_ALTERNATE_BUFFER,
     });
+    // Register exit handler immediately after render (synchronous, before any await)
+    registerExitHandler(() => inkApp.unmount());
     await inkApp.waitUntilExit();
     // Disable bracketed paste mode to restore normal terminal behavior
     disableBracketedPaste();
+    // Display session stats if available (after Ink has unmounted)
+    const chalk = (await import('chalk')).default;
+    const { getExitStats, clearExitStats } = await import('../commands/interactive-commands/exit-stats.js');
+    const exitStats = getExitStats();
+    if (exitStats) {
+        // Add visual separation - clear space like Gemini CLI does
+        // This creates a clean slate showing only the exit command and summary
+        process.stdout.write('\n'.repeat(1));
+        process.stdout.write(chalk.bold.cyan('📊 Session Summary') + '\n');
+        process.stdout.write(chalk.dim('─'.repeat(50)) + '\n');
+        // Session ID
+        if (exitStats.sessionId) {
+            process.stdout.write(chalk.gray(`  Session ID:  ${exitStats.sessionId}`) + '\n');
+        }
+        // Duration
+        if (exitStats.duration) {
+            process.stdout.write(chalk.gray(`  Duration:    ${exitStats.duration}`) + '\n');
+        }
+        // Message count
+        if (exitStats.messageCount.total > 0) {
+            process.stdout.write(chalk.gray(`  Messages:    ${exitStats.messageCount.total} total (${exitStats.messageCount.user} user, ${exitStats.messageCount.assistant} assistant)`) + '\n');
+        }
+        // Multi-model breakdown (if multiple models were used)
+        if (exitStats.modelStats && exitStats.modelStats.length > 1) {
+            process.stdout.write(chalk.gray('\n  Models Used:') + '\n');
+            for (const modelStat of exitStats.modelStats) {
+                const modelLabel = `${modelStat.model} (${modelStat.messageCount} msgs)`;
+                process.stdout.write(chalk.gray(`    • ${modelLabel}`) + '\n');
+                // Detailed token breakdown per model
+                const tokens = modelStat.tokenUsage;
+                process.stdout.write(chalk.gray(`      Input tokens:       ${tokens.inputTokens.toLocaleString()}`) +
+                    '\n');
+                process.stdout.write(chalk.gray(`      Output tokens:      ${tokens.outputTokens.toLocaleString()}`) + '\n');
+                process.stdout.write(chalk.gray(`      Reasoning tokens:   ${tokens.reasoningTokens.toLocaleString()}`) + '\n');
+                process.stdout.write(chalk.gray(`      Cache read tokens:  ${tokens.cacheReadTokens.toLocaleString()}`) + '\n');
+                process.stdout.write(chalk.gray(`      Cache write tokens: ${tokens.cacheWriteTokens.toLocaleString()}`) + '\n');
+                process.stdout.write(chalk.gray(`      Total tokens:       ${tokens.totalTokens.toLocaleString()}`) +
+                    '\n');
+                if (modelStat.estimatedCost !== undefined) {
+                    process.stdout.write(chalk.gray(`      Cost:               ${formatCost(modelStat.estimatedCost)}`) + '\n');
+                }
+            }
+        }
+        // Token usage - label depends on whether multi-model was shown
+        if (exitStats.tokenUsage) {
+            const { inputTokens, outputTokens, reasoningTokens, cacheReadTokens, cacheWriteTokens, totalTokens, } = exitStats.tokenUsage;
+            // Calculate cache savings percentage
+            const totalInputWithCache = inputTokens + cacheReadTokens;
+            const cacheSavingsPercent = totalInputWithCache > 0
+                ? ((cacheReadTokens / totalInputWithCache) * 100).toFixed(1)
+                : '0.0';
+            const tokenSectionLabel = exitStats.modelStats && exitStats.modelStats.length > 1
+                ? '\n  Total Token Usage:'
+                : '\n  Token Usage:';
+            process.stdout.write(chalk.gray(tokenSectionLabel) + '\n');
+            process.stdout.write(chalk.gray(`    Input tokens:       ${inputTokens.toLocaleString()}`) + '\n');
+            process.stdout.write(chalk.gray(`    Output tokens:      ${outputTokens.toLocaleString()}`) + '\n');
+            process.stdout.write(chalk.gray(`    Reasoning tokens:   ${reasoningTokens.toLocaleString()}`) + '\n');
+            const cacheReadLabel = cacheReadTokens > 0
+                ? `${cacheReadTokens.toLocaleString()} (💰 ${cacheSavingsPercent}% savings)`
+                : cacheReadTokens.toLocaleString();
+            process.stdout.write(chalk.gray(`    Cache read tokens:  ${cacheReadLabel}`) + '\n');
+            process.stdout.write(chalk.gray(`    Cache write tokens: ${cacheWriteTokens.toLocaleString()}`) + '\n');
+            process.stdout.write(chalk.gray(`    Total tokens:       ${totalTokens.toLocaleString()}`) + '\n');
+        }
+        // Estimated cost
+        if (exitStats.estimatedCost !== undefined) {
+            process.stdout.write(chalk.green(`\n  Estimated Cost: ${formatCost(exitStats.estimatedCost)}`) + '\n');
+        }
+        clearExitStats();
+    }
+    process.stdout.write(chalk.dim('─'.repeat(50)) + '\n');
+    process.stdout.write('\n' + chalk.rgb(255, 165, 0)('Exiting Dexto CLI. Goodbye!') + '\n');
 }

package/dist/cli/ink-cli/components/ApprovalPrompt.d.ts

@@ -17,7 +17,7 @@ export interface ApprovalPromptHandle {
 export interface ApprovalOptions {
     /** Remember this tool for the entire session (approves ALL uses) */
     rememberChoice?: boolean;
-    /** Remember a specific command pattern for bash (e.g., "git *") */
+    /** Remember an approval pattern (e.g., "git *") */
     rememberPattern?: string;
     /** Form data for elicitation requests */
     formData?: Record<string, unknown>;
@@ -36,7 +36,7 @@ interface ApprovalPromptProps {
  * Compact approval prompt component that displays above the input area
  * Shows options based on approval type:
  * - Tool confirmation: Yes, Yes (Session), No
- * - Bash with patterns: Yes (once), pattern options, Yes (all bash), No
+ * - Tool with patterns: Yes (once), pattern options, Yes (session), No
  * - Elicitation: Form with input fields
  */
 export declare const ApprovalPrompt: React.ForwardRefExoticComponent<ApprovalPromptProps & React.RefAttributes<ApprovalPromptHandle>>;

package/dist/cli/ink-cli/components/ApprovalPrompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ApprovalPrompt.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/components/ApprovalPrompt.tsx"],"names":[],"mappings":"AAAA,OAAO,KAON,MAAM,OAAO,CAAC;AAGf,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kCAAkC,CAAC;AAM5D,MAAM,WAAW,eAAe;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,IAAI,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrC;AAED,MAAM,WAAW,oBAAoB;IACjC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC5B,oEAAoE;IACpE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,mEAAmE;IACnE,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yCAAyC;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,gFAAgF;IAChF,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,gDAAgD;IAChD,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,UAAU,mBAAmB;IACzB,QAAQ,EAAE,eAAe,CAAC;IAC1B,SAAS,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,CAAC;IAC9C,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,QAAQ,EAAE,MAAM,IAAI,CAAC;CACxB;AAgBD;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,kGAkY1B,CAAC"}
+{"version":3,"file":"ApprovalPrompt.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/components/ApprovalPrompt.tsx"],"names":[],"mappings":"AAAA,OAAO,KAON,MAAM,OAAO,CAAC;AAGf,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kCAAkC,CAAC;AAM5D,MAAM,WAAW,eAAe;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,IAAI,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrC;AAED,MAAM,WAAW,oBAAoB;IACjC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC5B,oEAAoE;IACpE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,mDAAmD;IACnD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yCAAyC;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,gFAAgF;IAChF,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,gDAAgD;IAChD,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,UAAU,mBAAmB;IACzB,QAAQ,EAAE,eAAe,CAAC;IAC1B,SAAS,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,CAAC;IAC9C,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,QAAQ,EAAE,MAAM,IAAI,CAAC;CACxB;AAiBD;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,kGAwe1B,CAAC"}

package/dist/cli/ink-cli/components/ApprovalPrompt.js

@@ -4,36 +4,71 @@ import { Box, Text } from 'ink';
 import { ElicitationForm } from './ElicitationForm.js';
 import { DiffPreview, CreateFilePreview } from './renderers/index.js';
 import { isEditWriteTool } from '../utils/toolUtils.js';
-import { formatToolHeader } from '../utils/messageFormatting.js';
+import { formatPathForDisplay, formatToolHeader } from '../utils/messageFormatting.js';
 /**
  * Compact approval prompt component that displays above the input area
  * Shows options based on approval type:
  * - Tool confirmation: Yes, Yes (Session), No
- * - Bash with patterns: Yes (once), pattern options, Yes (all bash), No
+ * - Tool with patterns: Yes (once), pattern options, Yes (session), No
  * - Elicitation: Form with input fields
  */
 export const ApprovalPrompt = forwardRef(({ approval, onApprove, onDeny, onCancel }, ref) => {
     const isCommandConfirmation = approval.type === 'command_confirmation';
     const isElicitation = approval.type === 'elicitation';
     const isDirectoryAccess = approval.type === 'directory_access';
+    const directoryAccess = approval.metadata.directoryAccess;
+    const hasToolDirectoryAccess = approval.type === 'tool_confirmation' &&
+        directoryAccess !== undefined &&
+        typeof directoryAccess === 'object' &&
+        directoryAccess !== null;
+    const directoryAccessParentDir = hasToolDirectoryAccess && typeof directoryAccess.parentDir === 'string'
+        ? directoryAccess.parentDir
+        : null;
     // Extract tool metadata
     const toolName = approval.metadata.toolName;
     const toolArgs = approval.metadata.args || {};
+    const callDescriptionRaw = typeof approval.metadata.description === 'string'
+        ? approval.metadata.description
+        : undefined;
+    const callDescription = useMemo(() => {
+        if (!callDescriptionRaw)
+            return null;
+        const singleLine = callDescriptionRaw.replace(/\s+/g, ' ').trim();
+        if (!singleLine)
+            return null;
+        const maxLength = 120;
+        if (singleLine.length <= maxLength)
+            return singleLine;
+        return `${singleLine.slice(0, Math.max(0, maxLength - 1))}…`;
+    }, [callDescriptionRaw]);
     // Check if this is a plan_review tool (shows custom approval options)
-    const isPlanReview = toolName === 'custom--plan_review' ||
-        toolName === 'internal--plan_review' ||
-        toolName === 'plan_review';
-    // Extract suggested patterns for bash tools
+    const isPlanReview = toolName === 'plan_review';
+    // Extract suggested patterns for tools that support pattern-based approvals
     const suggestedPatterns = approval.metadata.suggestedPatterns ?? [];
-    const hasBashPatterns = suggestedPatterns.length > 0;
+    const hasSuggestedPatterns = suggestedPatterns.length > 0;
     // Check if this is an edit/write file tool
     const isEditOrWriteTool = isEditWriteTool(toolName);
     // Format tool header using shared utility (same format as tool messages)
+    const presentationSnapshot = useMemo(() => {
+        const raw = approval.metadata
+            .presentationSnapshot;
+        if (typeof raw !== 'object' || raw === null) {
+            return undefined;
+        }
+        if (raw.version !== 1) {
+            return undefined;
+        }
+        return raw;
+    }, [approval.metadata]);
     const formattedTool = useMemo(() => {
         if (!toolName)
             return null;
-        return formatToolHeader(toolName, toolArgs);
-    }, [toolName, toolArgs]);
+        return formatToolHeader({
+            toolName,
+            args: toolArgs,
+            ...(presentationSnapshot !== undefined && { presentationSnapshot }),
+        });
+    }, [toolName, toolArgs, presentationSnapshot]);
     const [selectedIndex, setSelectedIndex] = useState(0);
     // State for plan review feedback input
     const [showFeedbackInput, setShowFeedbackInput] = useState(false);
@@ -50,8 +85,17 @@ export const ApprovalPrompt = forwardRef(({ approval, onApprove, onDeny, onCance
         options.push({ id: 'plan-approve-accept-edits', label: 'Approve + Accept All Edits' });
         // Third "option" is the feedback input (handled specially in render)
     }
-    else if (hasBashPatterns) {
-        // Bash tool with pattern suggestions
+    else if (hasToolDirectoryAccess) {
+        // Tool approval that includes directory access - offer session-scoped dir allow
+        const dirLabel = directoryAccessParentDir
+            ? ` ${formatPathForDisplay(directoryAccessParentDir)}`
+            : '';
+        options.push({ id: 'yes', label: 'Yes (once)' });
+        options.push({ id: 'yes-directory-session', label: `Yes, allow${dirLabel} (session)` });
+        options.push({ id: 'no', label: 'No' });
+    }
+    else if (hasSuggestedPatterns) {
+        // Tool with pattern suggestions
         options.push({ id: 'yes', label: 'Yes (once)' });
         suggestedPatterns.forEach((pattern, i) => {
             options.push({
@@ -59,7 +103,7 @@ export const ApprovalPrompt = forwardRef(({ approval, onApprove, onDeny, onCance
                 label: `Yes, allow "${pattern}"`,
             });
         });
-        options.push({ id: 'yes-session', label: 'Yes, allow all bash' });
+        options.push({ id: 'yes-session', label: 'Yes, allow this tool (session)' });
         options.push({ id: 'no', label: 'No' });
     }
     else if (isCommandConfirmation) {
@@ -70,7 +114,7 @@ export const ApprovalPrompt = forwardRef(({ approval, onApprove, onDeny, onCance
     else if (isDirectoryAccess) {
         // Directory access - offer session-scoped access
         const parentDir = approval.metadata.parentDir;
-        const dirLabel = parentDir ? ` "${parentDir}"` : '';
+        const dirLabel = parentDir ? ` ${formatPathForDisplay(parentDir)}` : '';
         options.push({ id: 'yes', label: 'Yes (once)' });
         options.push({ id: 'yes-session', label: `Yes, allow${dirLabel} (session)` });
         options.push({ id: 'no', label: 'No' });
@@ -166,6 +210,9 @@ export const ApprovalPrompt = forwardRef(({ approval, onApprove, onDeny, onCance
                         onApprove({ rememberChoice: true });
                     }
                 }
+                else if (option.id === 'yes-directory-session') {
+                    onApprove({ rememberDirectory: true });
+                }
                 else if (option.id === 'yes-accept-edits') {
                     // Approve and enable "accept all edits" mode
                     onApprove({ enableAcceptEditsMode: true });
@@ -201,6 +248,7 @@ export const ApprovalPrompt = forwardRef(({ approval, onApprove, onDeny, onCance
         isElicitation,
         isEditOrWriteTool,
         isDirectoryAccess,
+        hasToolDirectoryAccess,
         isPlanReview,
         options,
         suggestedPatterns,
@@ -222,26 +270,16 @@ export const ApprovalPrompt = forwardRef(({ approval, onApprove, onDeny, onCance
         if (!displayPreview)
             return null;
         switch (displayPreview.type) {
-            case 'diff': {
-                const isOverwrite = toolName === 'custom--write_file' ||
-                    toolName === 'internal--write_file' ||
-                    toolName === 'write_file';
-                return (_jsx(DiffPreview, { data: displayPreview, headerType: isOverwrite ? 'overwrite' : 'edit' }));
-            }
+            case 'diff':
+                return _jsx(DiffPreview, { data: displayPreview });
             case 'shell':
-                // For shell preview, just show the command (no output yet)
-                return (_jsxs(Box, { marginBottom: 1, flexDirection: "row", children: [_jsx(Text, { color: "gray", children: "$ " }), _jsx(Text, { color: "yellowBright", children: displayPreview.command }), displayPreview.isBackground && _jsx(Text, { color: "gray", children: " (background)" })] }));
+                // For shell preview, show the command + optional description (no output yet)
+                return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsx(Box, { marginBottom: 0, children: _jsx(Text, { color: "cyan", bold: true, children: displayPreview.title ?? 'Bash' }) }), _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "gray", paddingX: 1, children: [displayPreview.command.split('\n').map((line, i) => (_jsxs(Text, { color: "yellowBright", wrap: "wrap", children: [i === 0 ? '$ ' : '  ', line] }, i))), displayPreview.isBackground && (_jsx(Text, { color: "gray", children: "(background)" }))] }), callDescription && (_jsx(Box, { marginTop: 0, children: _jsx(Text, { color: "gray", children: callDescription }) }))] }));
             case 'file':
-                // Use enhanced file preview with full content for file creation
-                if (displayPreview.operation === 'create' && displayPreview.content) {
+                // If content is provided, show the full content (create/review flows)
+                if (displayPreview.content) {
                     return _jsx(CreateFilePreview, { data: displayPreview });
                 }
-                // For plan_review (read operation with content), show full content for review
-                if (displayPreview.operation === 'read' &&
-                    displayPreview.content &&
-                    isPlanReview) {
-                    return _jsx(CreateFilePreview, { data: displayPreview, header: "Review plan" });
-                }
                 // Fallback for other file operations
                 return (_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { color: "gray", children: [displayPreview.operation === 'read' &&
                                 `Read ${displayPreview.lineCount ?? 'file'} lines`, displayPreview.operation === 'write' &&
@@ -255,7 +293,24 @@ export const ApprovalPrompt = forwardRef(({ approval, onApprove, onDeny, onCance
     const directoryPath = approval.metadata.path;
     const parentDir = approval.metadata.parentDir;
     const operation = approval.metadata.operation;
-    return (_jsxs(Box, { paddingX: 0, paddingY: 0, flexDirection: "column", children: [_jsx(Box, { flexDirection: "column", marginBottom: 0, children: isDirectoryAccess ? (_jsxs(_Fragment, { children: [_jsxs(Box, { flexDirection: "row", children: [_jsxs(Text, { color: "yellowBright", bold: true, children: ["\uD83D\uDD10 Directory Access:", ' '] }), _jsx(Text, { color: "cyan", children: parentDir || directoryPath })] }), _jsxs(Box, { flexDirection: "row", marginTop: 0, children: [_jsx(Text, { color: "gray", children: '  ' }), _jsxs(Text, { color: "gray", children: [formattedTool ? `"${formattedTool.displayName}"` : 'Tool', ' ', "wants to ", operation || 'access', " files outside working directory"] })] })] })) : (_jsxs(_Fragment, { children: [_jsxs(Box, { flexDirection: "row", children: [_jsxs(Text, { color: "yellowBright", bold: true, children: ["\uD83D\uDD10 Approval:", ' '] }), formattedTool && _jsx(Text, { color: "cyan", children: formattedTool.header })] }), isCommandConfirmation && command && (_jsxs(Box, { flexDirection: "row", marginTop: 0, children: [_jsx(Text, { color: "gray", children: '  Command: ' }), _jsx(Text, { color: "red", children: command })] }))] })) }), renderPreview(), _jsxs(Box, { flexDirection: "column", marginTop: 0, children: [options.map((option, index) => {
+    const directoryAccessTitle = !isDirectoryAccess
+        ? null
+        : operation === 'read'
+            ? 'Read file'
+            : operation === 'write'
+                ? 'Write file'
+                : operation === 'edit'
+                    ? 'Edit file'
+                    : 'Directory access';
+    const directoryAccessToolHeader = !isDirectoryAccess || !toolName
+        ? null
+        : formatToolHeader({
+            toolName,
+            args: (directoryPath ?? parentDir) ? { path: directoryPath ?? parentDir } : {},
+            ...(presentationSnapshot !== undefined && { presentationSnapshot }),
+        }).header;
+    const showHeaderBlock = isDirectoryAccess || isCommandConfirmation || !displayPreview;
+    return (_jsxs(Box, { paddingX: 0, paddingY: 0, flexDirection: "column", children: [showHeaderBlock && (_jsx(Box, { flexDirection: "column", marginBottom: 0, children: isDirectoryAccess ? (_jsxs(_Fragment, { children: [_jsx(Box, { marginBottom: 0, children: _jsx(Text, { color: "cyan", bold: true, children: directoryAccessTitle ?? 'Directory access' }) }), directoryAccessToolHeader && (_jsx(Box, { marginBottom: 0, children: _jsx(Text, { wrap: "wrap", children: directoryAccessToolHeader }) }))] })) : isCommandConfirmation ? (_jsxs(_Fragment, { children: [_jsx(Box, { flexDirection: "row", children: _jsxs(Text, { color: "yellowBright", bold: true, children: ["Confirm command:", ' '] }) }), command && (_jsx(Box, { flexDirection: "column", marginTop: 0, children: _jsx(Box, { flexDirection: "column", borderStyle: "round", borderColor: "gray", paddingX: 1, children: command.split('\n').map((line, i) => (_jsx(Text, { color: "red", wrap: "wrap", children: line }, i))) }) }))] })) : (_jsxs(_Fragment, { children: [_jsxs(Box, { flexDirection: "row", children: [_jsxs(Text, { color: "yellowBright", bold: true, children: ["Confirm:", ' '] }), formattedTool && (_jsx(Text, { color: "cyan", children: formattedTool.header }))] }), callDescription && (_jsxs(Box, { flexDirection: "row", marginTop: 0, children: [_jsx(Text, { color: "gray", children: '  ' }), _jsx(Text, { color: "gray", children: callDescription })] }))] })) })), renderPreview(), _jsxs(Box, { flexDirection: "column", marginTop: 0, children: [options.map((option, index) => {
                         const isSelected = index === selectedIndex;
                         const isNo = option.id === 'no';
                         return (_jsx(Box, { children: isSelected ? (_jsxs(Text, { color: isNo ? 'red' : 'green', bold: true, children: ['  ▶ ', option.label] })) : (_jsxs(Text, { color: "gray", children: ['    ', option.label] })) }, option.id));

package/dist/cli/ink-cli/components/BackgroundTasksPanel.js

@@ -40,7 +40,7 @@ export function BackgroundTasksPanel({ tasks, isExpanded, isProcessing = false,
     const statusWidth = 10;
     const idWidth = 14;
     const descWidth = 48;
-    return (_jsxs(Box, { flexDirection: "column", borderStyle: isProcessing ? undefined : 'round', borderColor: "gray", paddingX: 1, marginX: 1, marginBottom: 1, children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, color: "cyan", children: headerText }), _jsxs(Text, { color: "gray", dimColor: true, children: [' ', "\u00B7 ctrl+b to hide tasks"] })] }), _jsx(Box, { children: _jsxs(Text, { color: "gray", children: [padText('status', statusWidth), padText('task id', idWidth), padText('description', descWidth)] }) }), sortedTasks.map((task) => {
+    return (_jsxs(Box, { flexDirection: "column", borderStyle: isProcessing ? undefined : 'round', borderColor: "gray", paddingX: 1, marginX: 1, marginBottom: 1, children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, color: "cyan", children: headerText }), _jsxs(Text, { color: "gray", dimColor: true, children: [' ', "\u00B7 ctrl+b to hide bg tasks"] })] }), _jsx(Box, { children: _jsxs(Text, { color: "gray", children: [padText('status', statusWidth), padText('task id', idWidth), padText('description', descWidth)] }) }), sortedTasks.map((task) => {
                 const status = formatStatus(task.status);
                 const desc = task.description ?? '';
                 return (_jsx(Box, { children: _jsxs(Text, { color: task.status === 'running' ? 'yellow' : 'gray', children: [padText(status, statusWidth), padText(task.taskId, idWidth), padText(desc, descWidth)] }) }, task.taskId));

package/dist/cli/ink-cli/components/ElicitationForm.d.ts

@@ -1,11 +1,13 @@
 /**
  * ElicitationForm Component
- * Renders a form for ask_user/elicitation requests in the CLI
- * Supports string, number, boolean, and enum field types
+ * Renders a form for ask_user/elicitation requests in the CLI.
+ *
+ * Uses a wizard flow (one question at a time) to avoid huge modals and improve
+ * usability on small terminals.
  */
 import React from 'react';
-import type { Key } from '../hooks/useInputOrchestrator.js';
 import type { ElicitationMetadata } from '@dexto/core';
+import type { Key } from '../hooks/useInputOrchestrator.js';
 export interface ElicitationFormHandle {
     handleInput: (input: string, key: Key) => boolean;
 }

package/dist/cli/ink-cli/components/ElicitationForm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ElicitationForm.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/components/ElicitationForm.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAA0E,MAAM,OAAO,CAAC;AAE/F,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kCAAkC,CAAC;AAC5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAEvD,MAAM,WAAW,qBAAqB;IAClC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAED,UAAU,oBAAoB;IAC1B,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IACtD,QAAQ,EAAE,MAAM,IAAI,CAAC;CACxB;AAWD;;GAEG;AACH,eAAO,MAAM,eAAe,oGAygB3B,CAAC"}
+{"version":3,"file":"ElicitationForm.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/components/ElicitationForm.tsx"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAA0E,MAAM,OAAO,CAAC;AAG/F,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kCAAkC,CAAC;AAI5D,MAAM,WAAW,qBAAqB;IAClC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAED,UAAU,oBAAoB;IAC1B,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IACtD,QAAQ,EAAE,MAAM,IAAI,CAAC;CACxB;AAkBD;;GAEG;AACH,eAAO,MAAM,eAAe,oGA6uB3B,CAAC"}