dexto 1.3.0 → 1.4.0

package/dist/cli/commands/uninstall.js

@@ -1,6 +1,6 @@
 // packages/cli/src/cli/commands/uninstall.ts
 import { z } from 'zod';
-import { getAgentRegistry } from '@dexto/agent-management';
+import { uninstallAgent, listInstalledAgents } from '../../utils/agent-helpers.js';
 import { capture } from '../../analytics/index.js';
 // Zod schema for uninstall command validation
 const UninstallCommandSchema = z
@@ -20,8 +20,7 @@ async function validateUninstallCommand(agents, options) {
         agents,
     });
     // Business logic validation
-    const registry = getAgentRegistry();
-    const installedAgents = await registry.getInstalledAgents();
+    const installedAgents = await listInstalledAgents();
     if (installedAgents.length === 0) {
         throw new Error('No agents are currently installed.');
     }
@@ -33,8 +32,7 @@ async function validateUninstallCommand(agents, options) {
 export async function handleUninstallCommand(agents, options) {
     // Validate command with Zod
     const validated = await validateUninstallCommand(agents, options);
-    const registry = getAgentRegistry();
-    const installedAgents = await registry.getInstalledAgents();
+    const installedAgents = await listInstalledAgents();
     if (installedAgents.length === 0) {
         console.log('📋 No agents are currently installed.');
         return;
@@ -64,7 +62,7 @@ export async function handleUninstallCommand(agents, options) {
     for (const agentName of agentsToUninstall) {
         try {
             console.log(`\n🗑️  Uninstalling ${agentName}...`);
-            await registry.uninstallAgent(agentName, validated.force);
+            await uninstallAgent(agentName);
             successCount++;
             console.log(`✅ ${agentName} uninstalled successfully`);
             uninstalled.push(agentName);

package/dist/cli/commands/which.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"which.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/which.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,QAAA,MAAM,kBAAkB;;;;;;EAIX,CAAC;AAEd,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAEtE;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBzE"}
+{"version":3,"file":"which.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/which.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,QAAA,MAAM,kBAAkB;;;;;;EAIX,CAAC;AAEd,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAgBtE;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBzE"}

package/dist/cli/commands/which.js

@@ -1,21 +1,35 @@
 // packages/cli/src/cli/commands/which.ts
+import { readFileSync } from 'fs';
 import chalk from 'chalk';
 import { z } from 'zod';
-import { resolveAgentPath, getAgentRegistry } from '@dexto/agent-management';
+import { resolveAgentPath, resolveBundledScript } from '@dexto/agent-management';
 // Zod schema for which command validation
 const WhichCommandSchema = z
     .object({
     agentName: z.string().min(1, 'Agent name cannot be empty'),
 })
     .strict();
+/**
+ * Load available agent names from bundled registry
+ */
+function getAvailableAgentNames() {
+    try {
+        const registryPath = resolveBundledScript('agents/agent-registry.json');
+        const content = readFileSync(registryPath, 'utf-8');
+        const registry = JSON.parse(content);
+        return Object.keys(registry.agents || {});
+    }
+    catch (_error) {
+        return [];
+    }
+}
 /**
  * Handle the which command
  */
 export async function handleWhichCommand(agentName) {
     // Validate command with Zod
     const validated = WhichCommandSchema.parse({ agentName });
-    const registry = getAgentRegistry();
-    const availableAgents = Object.keys(registry.getAvailableAgents());
+    const availableAgents = getAvailableAgentNames();
     try {
         const resolvedPath = await resolveAgentPath(validated.agentName, false, false); // Don't auto-install, don't inject preferences
         console.log(resolvedPath);

package/dist/cli/ink-cli/InkCLIRefactored.d.ts

@@ -1,20 +1,14 @@
 /**
  * InkCLI Component (Refactored)
  *
- * Main orchestrator component - dramatically simplified from 1150 lines to ~150 lines
+ * Entry point for the Ink-based CLI. Selects between two rendering modes:
+ * - AlternateBufferCLI: VirtualizedList with mouse scroll, keyboard scroll, copy mode
+ * - StaticCLI: Static pattern with native terminal scrollback and selection
  *
- * Architecture:
- * - State managed by useReducer with typed actions
- * - Business logic in services
- * - Event handling via custom hooks
- * - UI in presentational components
- * - Smart containers orchestrate interactions
- *
- * Before: 50+ useState hooks, 15+ useEffect hooks, complex state management
- * After: 1 useReducer, 5 custom hooks, clear separation of concerns
+ * The mode is selected via USE_ALTERNATE_BUFFER constant.
  */
 import type { DextoAgent } from '@dexto/core';
-import { type StartupInfo } from './state/index.js';
+import type { StartupInfo } from './state/types.js';
 interface InkCLIProps {
     agent: DextoAgent;
     initialSessionId: string | null;
@@ -23,21 +17,14 @@ interface InkCLIProps {
 /**
  * Modern CLI interface using React Ink
  *
- * Refactored for:
- * - Clear separation of concerns
- * - Testability
- * - Maintainability
- * - Performance
- * - Type safety
- *
- * Uses explicit sessionId in state (like WebUI) instead of defaultSession pattern
+ * Wraps the CLI with:
+ * - ErrorBoundary for graceful error handling
+ * - KeypressProvider for unified keyboard input
+ * - MouseProvider (only in alternate buffer mode)
  */
 export declare function InkCLIRefactored({ agent, initialSessionId, startupInfo }: InkCLIProps): import("react/jsx-runtime").JSX.Element;
 /**
  * Start the modern Ink-based CLI
- * Entry point for the refactored CLI
- * @param agent - The DextoAgent instance
- * @param initialSessionId - The session ID to use for this CLI session
  */
 export declare function startInkCliRefactored(agent: DextoAgent, initialSessionId: string | null): Promise<void>;
 export {};

package/dist/cli/ink-cli/InkCLIRefactored.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InkCLIRefactored.d.ts","sourceRoot":"","sources":["../../../src/cli/ink-cli/InkCLIRefactored.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAI9C,OAAO,EAAkC,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAqBpF,UAAU,WAAW;IACjB,KAAK,EAAE,UAAU,CAAC;IAClB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,WAAW,EAAE,WAAW,CAAC;CAC5B;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,EAAE,WAAW,2CA2IrF;AAED;;;;;GAKG;AACH,wBAAsB,qBAAqB,CACvC,KAAK,EAAE,UAAU,EACjB,gBAAgB,EAAE,MAAM,GAAG,IAAI,GAChC,OAAO,CAAC,IAAI,CAAC,CAsBf"}
+{"version":3,"file":"InkCLIRefactored.d.ts","sourceRoot":"","sources":["../../../src/cli/ink-cli/InkCLIRefactored.tsx"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAK9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAoBpD,UAAU,WAAW;IACjB,KAAK,EAAE,UAAU,CAAC;IAClB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,WAAW,EAAE,WAAW,CAAC;CAC5B;AAyCD;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,EAAE,WAAW,2CAerF;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACvC,KAAK,EAAE,UAAU,EACjB,gBAAgB,EAAE,MAAM,GAAG,IAAI,GAChC,OAAO,CAAC,IAAI,CAAC,CA4Bf"}

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

@@ -1,158 +1,75 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * InkCLI Component (Refactored)
  *
- * Main orchestrator component - dramatically simplified from 1150 lines to ~150 lines
+ * Entry point for the Ink-based CLI. Selects between two rendering modes:
+ * - AlternateBufferCLI: VirtualizedList with mouse scroll, keyboard scroll, copy mode
+ * - StaticCLI: Static pattern with native terminal scrollback and selection
  *
- * Architecture:
- * - State managed by useReducer with typed actions
- * - Business logic in services
- * - Event handling via custom hooks
- * - UI in presentational components
- * - Smart containers orchestrate interactions
- *
- * Before: 50+ useState hooks, 15+ useEffect hooks, complex state management
- * After: 1 useReducer, 5 custom hooks, clear separation of concerns
+ * The mode is selected via USE_ALTERNATE_BUFFER constant.
  */
-import { useReducer, useMemo, useEffect } from 'react';
-import { Box, render } from 'ink';
+import { useCallback, useState } from 'react';
+import { render } from 'ink';
 import { registerGracefulShutdown } from '../../utils/graceful-shutdown.js';
-// State management
-import { cliReducer, createInitialState } from './state/index.js';
-// Custom hooks
-import { useAgentEvents, useKeyboardShortcuts } from './hooks/index.js';
-// Services
-import { InputService, MessageService } from './services/index.js';
-// Utils
-import { getStartupInfo, convertHistoryToUIMessages } from './utils/messageFormatting.js';
+import { enableBracketedPaste, disableBracketedPaste } from './utils/bracketedPaste.js';
+// Contexts (keyboard/mouse providers)
+import { KeypressProvider, MouseProvider, ScrollProvider } from './contexts/index.js';
 // Components
-import { ChatView } from './components/chat/ChatView.js';
-import { Footer } from './components/chat/Footer.js';
 import { ErrorBoundary } from './components/ErrorBoundary.js';
-import { StatusBar } from './components/StatusBar.js';
-// Containers
-import { InputContainer } from './containers/InputContainer.js';
-import { OverlayContainer } from './containers/OverlayContainer.js';
+import { AlternateBufferCLI, StaticCLI } from './components/modes/index.js';
+// Hooks
+import { useStreaming } from './hooks/useStreaming.js';
+// Utils
+import { getStartupInfo } from './utils/messageFormatting.js';
+// Rendering mode: true = alternate buffer with VirtualizedList, false = Static pattern
+// Toggle this to switch between modes for testing
+//const USE_ALTERNATE_BUFFER = true;
+const USE_ALTERNATE_BUFFER = false;
+/**
+ * Inner component that wraps the mode-specific component with providers
+ */
+function InkCLIInner({ agent, initialSessionId, startupInfo }) {
+    // Selection hint callback for alternate buffer mode
+    const [, setSelectionHintShown] = useState(false);
+    // Streaming mode - can be toggled via /stream command
+    const { streaming } = useStreaming();
+    const handleSelectionAttempt = useCallback(() => {
+        setSelectionHintShown(true);
+    }, []);
+    if (USE_ALTERNATE_BUFFER) {
+        return (_jsx(ScrollProvider, { onSelectionAttempt: handleSelectionAttempt, children: _jsx(AlternateBufferCLI, { agent: agent, initialSessionId: initialSessionId, startupInfo: startupInfo, onSelectionAttempt: handleSelectionAttempt, useStreaming: streaming }) }));
+    }
+    // Static mode - no ScrollProvider needed
+    return (_jsx(StaticCLI, { agent: agent, initialSessionId: initialSessionId, startupInfo: startupInfo, useStreaming: streaming }));
+}
 /**
  * Modern CLI interface using React Ink
  *
- * Refactored for:
- * - Clear separation of concerns
- * - Testability
- * - Maintainability
- * - Performance
- * - Type safety
- *
- * Uses explicit sessionId in state (like WebUI) instead of defaultSession pattern
+ * Wraps the CLI with:
+ * - ErrorBoundary for graceful error handling
+ * - KeypressProvider for unified keyboard input
+ * - MouseProvider (only in alternate buffer mode)
  */
 export function InkCLIRefactored({ agent, initialSessionId, startupInfo }) {
-    // Initialize state with reducer and set initial sessionId (may be null for deferred creation)
-    const [state, dispatch] = useReducer(cliReducer, undefined, () => {
-        const initialModelName = agent.getCurrentLLMConfig().model;
-        const initial = createInitialState([], initialModelName);
-        initial.session.id = initialSessionId;
-        initial.session.hasActiveSession = initialSessionId !== null;
-        return initial;
-    });
-    // Initialize services (memoized)
-    const inputService = useMemo(() => new InputService(), []);
-    const messageService = useMemo(() => new MessageService(), []);
-    // Setup event bus subscriptions
-    useAgentEvents({ agent, dispatch, isCancelling: state.ui.isCancelling });
-    // Session is now managed in state - no need for sync hook
-    // useSessionSync removed - sessionId is in state from initialization or SESSION_SET actions
-    // Input history navigation is now handled by MultiLineTextInput component
-    // Setup global keyboard shortcuts
-    useKeyboardShortcuts({ state, dispatch, agent });
-    // Hydrate conversation history when resuming a session
-    useEffect(() => {
-        if (!initialSessionId || !state.session.hasActiveSession || state.messages.length > 0) {
-            return;
-        }
-        let cancelled = false;
-        (async () => {
-            try {
-                const history = await agent.getSessionHistory(initialSessionId);
-                if (!history?.length || cancelled)
-                    return;
-                const historyMessages = convertHistoryToUIMessages(history, initialSessionId);
-                dispatch({ type: 'MESSAGE_ADD_MULTIPLE', messages: historyMessages });
-            }
-            catch (error) {
-                if (cancelled)
-                    return;
-                dispatch({
-                    type: 'ERROR',
-                    errorMessage: error instanceof Error ? error.message : String(error),
-                });
-            }
-        })();
-        return () => {
-            cancelled = true;
-        };
-    }, [agent, dispatch, initialSessionId, state.messages.length, state.session.hasActiveSession]);
-    // Detect overlays based on input (with guards to prevent infinite loop)
-    useEffect(() => {
-        // Don't detect overlays if processing or approval is active
-        if (state.ui.isProcessing || state.approval)
-            return;
-        const autocompleteType = inputService.detectAutocompleteType(state.input.value);
-        const selectorType = inputService.detectInteractiveSelector(state.input.value);
-        // Determine what overlay should be shown
-        let desiredOverlay = 'none';
-        // Priority: selector > autocomplete
-        if (selectorType === 'model') {
-            desiredOverlay = 'model-selector';
-        }
-        else if (selectorType === 'session') {
-            desiredOverlay = 'session-selector';
-        }
-        else if (autocompleteType === 'slash') {
-            desiredOverlay = 'slash-autocomplete';
-        }
-        else if (autocompleteType === 'resource') {
-            desiredOverlay = 'resource-autocomplete';
-        }
-        // Only dispatch if overlay needs to change
-        if (desiredOverlay !== state.ui.activeOverlay && state.ui.activeOverlay !== 'approval') {
-            if (desiredOverlay === 'none') {
-                dispatch({ type: 'CLOSE_OVERLAY' });
-            }
-            else {
-                dispatch({ type: 'SHOW_OVERLAY', overlay: desiredOverlay });
-            }
-        }
-    }, [
-        state.input.value,
-        state.ui.isProcessing,
-        state.approval,
-        state.ui.activeOverlay,
-        inputService,
-        dispatch,
-    ]);
-    // Get visible messages (performance optimization)
-    // Limit to last 30 messages to prevent scrolling issues
-    const visibleMessages = useMemo(() => {
-        return messageService.getVisibleMessages(state.messages, 30);
-    }, [state.messages, messageService]);
-    return (_jsx(ErrorBoundary, { children: _jsxs(Box, { flexDirection: "column", minHeight: 0, children: [_jsx(ChatView, { messages: visibleMessages, modelName: state.session.modelName, sessionId: state.session.id || undefined, hasActiveSession: state.session.hasActiveSession, startupInfo: startupInfo }), _jsx(StatusBar, { isProcessing: state.ui.isProcessing, isThinking: state.ui.isThinking, approvalQueueCount: state.approvalQueue.length, exitWarningShown: state.ui.exitWarningShown }), _jsx(OverlayContainer, { state: state, dispatch: dispatch, agent: agent, inputService: inputService }), _jsx(InputContainer, { state: state, dispatch: dispatch, agent: agent, inputService: inputService }), _jsx(Footer, {})] }) }));
+    return (_jsx(ErrorBoundary, { children: _jsx(KeypressProvider, { children: _jsx(MouseProvider, { mouseEventsEnabled: USE_ALTERNATE_BUFFER, children: _jsx(InkCLIInner, { agent: agent, initialSessionId: initialSessionId, startupInfo: startupInfo }) }) }) }));
 }
 /**
  * Start the modern Ink-based CLI
- * Entry point for the refactored CLI
- * @param agent - The DextoAgent instance
- * @param initialSessionId - The session ID to use for this CLI session
  */
 export async function startInkCliRefactored(agent, initialSessionId) {
-    // Use inkMode to let Ctrl+C be handled by the UI for exit warning
     registerGracefulShutdown(() => agent, { inkMode: true });
-    // Note: Console suppression is done in index.ts before calling this function
+    // Enable bracketed paste mode so we can detect pasted text
+    // This wraps pastes with escape sequences that our KeypressContext handles
+    enableBracketedPaste();
     const startupInfo = await getStartupInfo(agent);
     const inkApp = render(_jsx(InkCLIRefactored, { agent: agent, initialSessionId: initialSessionId, startupInfo: startupInfo }), {
-        // Disable default Ctrl+C exit to handle it ourselves with double-press warning
         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,
     });
-    // Wait for the Ink app to exit before resolving
-    // This ensures console suppression remains active until the UI is fully closed
     await inkApp.waitUntilExit();
+    // Disable bracketed paste mode to restore normal terminal behavior
+    disableBracketedPaste();
 }

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

@@ -1,3 +1,5 @@
+import React from 'react';
+import type { Key } from '../hooks/useInputOrchestrator.js';
 export interface ApprovalRequest {
     approvalId: string;
     type: string;
@@ -6,16 +8,35 @@ export interface ApprovalRequest {
     timestamp: Date;
     metadata: Record<string, unknown>;
 }
+export interface ApprovalPromptHandle {
+    handleInput: (input: string, key: Key) => boolean;
+}
+/**
+ * Options passed when approving a request
+ */
+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 *") */
+    rememberPattern?: string;
+    /** Form data for elicitation requests */
+    formData?: Record<string, unknown>;
+    /** Enable "accept all edits" mode (auto-approve future edit_file/write_file) */
+    enableAcceptEditsMode?: boolean;
+}
 interface ApprovalPromptProps {
     approval: ApprovalRequest;
-    onApprove: (rememberChoice: boolean) => void;
+    onApprove: (options: ApprovalOptions) => void;
     onDeny: () => void;
     onCancel: () => void;
 }
 /**
  * Compact approval prompt component that displays above the input area
- * Shows three options in a vertical list: Yes, Yes for Session, and No
+ * Shows options based on approval type:
+ * - Tool confirmation: Yes, Yes (Session), No
+ * - Bash with patterns: Yes (once), pattern options, Yes (all bash), No
+ * - Elicitation: Form with input fields
  */
-export declare function ApprovalPrompt({ approval, onApprove, onDeny, onCancel }: ApprovalPromptProps): import("react/jsx-runtime").JSX.Element;
+export declare const ApprovalPrompt: React.ForwardRefExoticComponent<ApprovalPromptProps & React.RefAttributes<ApprovalPromptHandle>>;
 export {};
 //# sourceMappingURL=ApprovalPrompt.d.ts.map

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":"AAGA,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,UAAU,mBAAmB;IACzB,QAAQ,EAAE,eAAe,CAAC;IAC1B,SAAS,EAAE,CAAC,cAAc,EAAE,OAAO,KAAK,IAAI,CAAC;IAC7C,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,QAAQ,EAAE,MAAM,IAAI,CAAC;CACxB;AAID;;;GAGG;AACH,wBAAgB,cAAc,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,mBAAmB,2CA6G5F"}
+{"version":3,"file":"ApprovalPrompt.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/components/ApprovalPrompt.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAuE,MAAM,OAAO,CAAC;AAG5F,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kCAAkC,CAAC;AAK5D,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;CACnC;AAED,UAAU,mBAAmB;IACzB,QAAQ,EAAE,eAAe,CAAC;IAC1B,SAAS,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,CAAC;IAC9C,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,QAAQ,EAAE,MAAM,IAAI,CAAC;CACxB;AAOD;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,kGAoP1B,CAAC"}

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

@@ -1,55 +1,170 @@
-import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-import { useState } from 'react';
-import { Box, Text, useInput } from 'ink';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { forwardRef, useState, useImperativeHandle, useRef, useEffect } from 'react';
+import { Box, Text } from 'ink';
+import { ElicitationForm } from './ElicitationForm.js';
+import { DiffPreview, CreateFilePreview } from './renderers/index.js';
+import { isEditWriteTool } from '../utils/toolUtils.js';
 /**
  * Compact approval prompt component that displays above the input area
- * Shows three options in a vertical list: Yes, Yes for Session, and No
+ * Shows options based on approval type:
+ * - Tool confirmation: Yes, Yes (Session), No
+ * - Bash with patterns: Yes (once), pattern options, Yes (all bash), No
+ * - Elicitation: Form with input fields
  */
-export function ApprovalPrompt({ approval, onApprove, onDeny, onCancel }) {
+export const ApprovalPrompt = forwardRef(({ approval, onApprove, onDeny, onCancel }, ref) => {
     const isCommandConfirmation = approval.type === 'command_confirmation';
-    const [selectedOption, setSelectedOption] = useState('yes');
-    // Handle keyboard navigation (vertical)
-    useInput((input, key) => {
-        if (key.upArrow) {
-            // Move up (skip yes-session for command confirmations)
-            setSelectedOption((current) => {
-                if (current === 'yes')
-                    return 'no';
-                if (current === 'yes-session')
-                    return 'yes';
-                // no -> yes-session (or yes for command confirmations)
-                return isCommandConfirmation ? 'yes' : 'yes-session';
-            });
-        }
-        else if (key.downArrow) {
-            // Move down (skip yes-session for command confirmations)
-            setSelectedOption((current) => {
-                if (current === 'yes')
-                    return isCommandConfirmation ? 'no' : 'yes-session';
-                if (current === 'yes-session')
-                    return 'no';
-                return 'yes'; // no -> yes (wrap)
+    const isElicitation = approval.type === 'elicitation';
+    // Extract suggested patterns for bash tools
+    const suggestedPatterns = approval.metadata.suggestedPatterns ?? [];
+    const hasBashPatterns = suggestedPatterns.length > 0;
+    // Check if this is an edit/write file tool
+    const toolName = approval.metadata.toolName;
+    const isEditOrWriteTool = isEditWriteTool(toolName);
+    const [selectedIndex, setSelectedIndex] = useState(0);
+    // Ref for elicitation form
+    const elicitationFormRef = useRef(null);
+    // Use ref to avoid stale closure issues in handleInput
+    const selectedIndexRef = useRef(0);
+    // Build the list of options based on approval type
+    const options = [];
+    if (hasBashPatterns) {
+        // Bash tool with pattern suggestions
+        options.push({ id: 'yes', label: 'Yes (once)' });
+        suggestedPatterns.forEach((pattern, i) => {
+            options.push({
+                id: `pattern-${i}`,
+                label: `Yes, allow "${pattern}"`,
             });
-        }
-        else if (key.return) {
-            // Enter key - confirm selection
-            if (selectedOption === 'yes') {
-                onApprove(false);
+        });
+        options.push({ id: 'yes-session', label: 'Yes, allow all bash' });
+        options.push({ id: 'no', label: 'No' });
+    }
+    else if (isCommandConfirmation) {
+        // Command confirmation (no session option)
+        options.push({ id: 'yes', label: 'Yes' });
+        options.push({ id: 'no', label: 'No' });
+    }
+    else if (isEditOrWriteTool) {
+        // Edit/write file tools - offer "accept all edits" mode instead of session
+        options.push({ id: 'yes', label: 'Yes' });
+        options.push({ id: 'yes-accept-edits', label: 'Yes, and accept all edits' });
+        options.push({ id: 'no', label: 'No' });
+    }
+    else {
+        // Standard tool confirmation
+        options.push({ id: 'yes', label: 'Yes' });
+        options.push({ id: 'yes-session', label: 'Yes (Session)' });
+        options.push({ id: 'no', label: 'No' });
+    }
+    // Keep ref in sync with state
+    useEffect(() => {
+        selectedIndexRef.current = selectedIndex;
+    }, [selectedIndex]);
+    // Helper to get the option at current index
+    const getCurrentOption = () => options[selectedIndexRef.current];
+    // Expose handleInput method via ref
+    useImperativeHandle(ref, () => ({
+        handleInput: (input, key) => {
+            // For elicitation, delegate to the form
+            if (isElicitation && elicitationFormRef.current) {
+                return elicitationFormRef.current.handleInput(input, key);
             }
-            else if (selectedOption === 'yes-session') {
-                onApprove(true);
+            if (key.upArrow) {
+                setSelectedIndex((current) => current === 0 ? options.length - 1 : current - 1);
+                return true;
             }
-            else {
-                onDeny();
+            else if (key.downArrow) {
+                setSelectedIndex((current) => current === options.length - 1 ? 0 : current + 1);
+                return true;
             }
-        }
-        else if (key.escape) {
-            // Escape key - cancel
-            onCancel();
-        }
-    }, { isActive: true });
+            else if (key.return) {
+                const option = getCurrentOption();
+                if (!option)
+                    return false;
+                if (option.id === 'yes') {
+                    onApprove({});
+                }
+                else if (option.id === 'yes-session') {
+                    onApprove({ rememberChoice: true });
+                }
+                else if (option.id === 'yes-accept-edits') {
+                    // Approve and enable "accept all edits" mode
+                    onApprove({ enableAcceptEditsMode: true });
+                }
+                else if (option.id === 'no') {
+                    onDeny();
+                }
+                else if (option.id.startsWith('pattern-')) {
+                    // Extract pattern index and get the pattern string
+                    const patternIndex = parseInt(option.id.replace('pattern-', ''), 10);
+                    const pattern = suggestedPatterns[patternIndex];
+                    if (pattern) {
+                        onApprove({ rememberPattern: pattern });
+                    }
+                    else {
+                        onApprove({});
+                    }
+                }
+                return true;
+            }
+            else if (key.shift && key.tab && isEditOrWriteTool) {
+                // Shift+Tab on edit/write tool: approve and enable "accept all edits" mode
+                onApprove({ enableAcceptEditsMode: true });
+                return true;
+            }
+            else if (key.escape) {
+                onCancel();
+                return true;
+            }
+            return false;
+        },
+    }), [
+        isElicitation,
+        isEditOrWriteTool,
+        options,
+        suggestedPatterns,
+        onApprove,
+        onDeny,
+        onCancel,
+    ]);
+    // For elicitation, render the form
+    if (isElicitation) {
+        const metadata = approval.metadata;
+        return (_jsx(ElicitationForm, { ref: elicitationFormRef, metadata: metadata, onSubmit: (formData) => onApprove({ formData }), onCancel: onCancel }));
+    }
     // Extract information from metadata based on approval type
-    const toolName = approval.metadata.toolName;
     const command = approval.metadata.command;
-    return (_jsxs(Box, { borderStyle: "single", borderColor: "yellow", paddingX: 1, paddingY: 0, flexDirection: "column", children: [_jsxs(Box, { flexDirection: "column", marginBottom: 0, children: [_jsxs(Box, { flexDirection: "row", children: [_jsxs(Text, { color: "yellow", bold: true, children: ["\uD83D\uDD10 Approval:", ' '] }), toolName && _jsx(Text, { color: "cyan", children: toolName })] }), isCommandConfirmation && command && (_jsxs(Box, { flexDirection: "row", marginTop: 0, children: [_jsx(Text, { color: "gray", children: '  Command: ' }), _jsx(Text, { color: "red", children: command })] }))] }), _jsxs(Box, { flexDirection: "column", marginTop: 0, children: [_jsx(Box, { children: selectedOption === 'yes' ? (_jsxs(Text, { color: "green", bold: true, children: ['  ▶ ', "Yes"] })) : (_jsxs(Text, { color: "gray", children: ['    ', "Yes"] })) }), !isCommandConfirmation && (_jsx(Box, { children: selectedOption === 'yes-session' ? (_jsxs(Text, { color: "green", bold: true, children: ['  ▶ ', "Yes (Session)"] })) : (_jsxs(Text, { color: "gray", children: ['    ', "Yes (Session)"] })) })), _jsx(Box, { children: selectedOption === 'no' ? (_jsxs(Text, { color: "red", bold: true, children: ['  ▶ ', "No"] })) : (_jsxs(Text, { color: "gray", children: ['    ', "No"] })) })] }), _jsx(Box, { marginTop: 0, children: _jsxs(Text, { color: "gray", dimColor: true, children: ['  ', "\u2191\u2193 to select \u2022 Enter to confirm \u2022 Esc to cancel"] }) })] }));
-}
+    const displayPreview = approval.metadata.displayPreview;
+    // Render preview based on display type
+    const renderPreview = () => {
+        if (!displayPreview)
+            return null;
+        switch (displayPreview.type) {
+            case 'diff': {
+                const isOverwrite = toolName === 'internal--write_file' || toolName === 'write_file';
+                return (_jsx(DiffPreview, { data: displayPreview, headerType: isOverwrite ? 'overwrite' : 'edit' }));
+            }
+            case 'shell':
+                // For shell preview, just show the command (no output yet)
+                return (_jsxs(Box, { marginBottom: 1, flexDirection: "row", children: [_jsx(Text, { dimColor: true, children: "$ " }), _jsx(Text, { color: "yellow", children: displayPreview.command }), displayPreview.isBackground && _jsx(Text, { dimColor: true, children: " (background)" })] }));
+            case 'file':
+                // Use enhanced file preview with full content for new file creation
+                if (displayPreview.operation === 'create' && displayPreview.content) {
+                    return _jsx(CreateFilePreview, { data: displayPreview });
+                }
+                // Fallback for other file operations
+                return (_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { dimColor: true, children: [displayPreview.operation === 'read' &&
+                                `Read ${displayPreview.lineCount ?? 'file'} lines`, displayPreview.operation === 'write' &&
+                                `Write to ${displayPreview.path}`, displayPreview.operation === 'delete' &&
+                                `Delete ${displayPreview.path}`] }) }));
+            default:
+                return null;
+        }
+    };
+    return (_jsxs(Box, { paddingX: 0, paddingY: 0, flexDirection: "column", children: [_jsxs(Box, { flexDirection: "column", marginBottom: 0, children: [_jsxs(Box, { flexDirection: "row", children: [_jsxs(Text, { color: "yellow", bold: true, children: ["\uD83D\uDD10 Approval:", ' '] }), toolName && _jsx(Text, { color: "cyan", children: toolName })] }), isCommandConfirmation && command && (_jsxs(Box, { flexDirection: "row", marginTop: 0, children: [_jsx(Text, { color: "gray", children: '  Command: ' }), _jsx(Text, { color: "red", children: command })] }))] }), renderPreview(), _jsx(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));
+                }) }), _jsx(Box, { marginTop: 0, children: _jsxs(Text, { color: "gray", dimColor: true, children: ['  ', "\u2191\u2193 to select \u2022 Enter to confirm \u2022 Esc to cancel"] }) })] }));
+});
+ApprovalPrompt.displayName = 'ApprovalPrompt';

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

@@ -0,0 +1,22 @@
+/**
+ * ElicitationForm Component
+ * Renders a form for ask_user/elicitation requests in the CLI
+ * Supports string, number, boolean, and enum field types
+ */
+import React from 'react';
+import type { Key } from '../hooks/useInputOrchestrator.js';
+import type { ElicitationMetadata } from '@dexto/core';
+export interface ElicitationFormHandle {
+    handleInput: (input: string, key: Key) => boolean;
+}
+interface ElicitationFormProps {
+    metadata: ElicitationMetadata;
+    onSubmit: (formData: Record<string, unknown>) => void;
+    onCancel: () => void;
+}
+/**
+ * Form component for elicitation/ask_user requests
+ */
+export declare const ElicitationForm: React.ForwardRefExoticComponent<ElicitationFormProps & React.RefAttributes<ElicitationFormHandle>>;
+export {};
+//# sourceMappingURL=ElicitationForm.d.ts.map