dexto 1.5.5 → 1.5.7

package/dist/cli/ink-cli/components/modes/AlternateBufferCLI.js

@@ -15,6 +15,7 @@ import { Box, Text } from 'ink';
 // Hooks
 import { useTerminalSize } from '../../hooks/index.js';
 import { useCLIState } from '../../hooks/useCLIState.js';
+import { useGitBranch } from '../../hooks/useGitBranch.js';
 import { useScrollable } from '../../contexts/index.js';
 // Components
 import { Header } from '../chat/Header.js';
@@ -48,6 +49,8 @@ export function AlternateBufferCLI({ agent, initialSessionId, startupInfo, onSel
         startupInfo,
         onKeyboardScroll: handleKeyboardScroll,
     });
+    // Get current git branch name
+    const branchName = useGitBranch();
     // Register the VirtualizedList as scrollable so ScrollProvider can handle mouse scroll
     const getScrollState = useCallback(() => {
         const scrollState = listRef.current?.getScrollState();
@@ -99,19 +102,28 @@ export function AlternateBufferCLI({ agent, initialSessionId, startupInfo, onSel
     // Build list data: header as first item, then finalized + pending + dequeued buffer
     // In alternate buffer mode, everything is re-rendered anyway, so we combine all
     // Order: finalized messages → pending/streaming → dequeued user messages (guarantees order)
+    // IMPORTANT: Deduplicate by ID to prevent race condition where a message appears in both
+    // finalized (messages) and pending during the brief window between setState calls
     const listData = useMemo(() => {
         const items = [{ type: 'header' }];
+        const seenIds = new Set();
         for (const msg of visibleMessages) {
             items.push({ type: 'message', message: msg });
+            seenIds.add(msg.id);
         }
-        // Add pending/streaming messages
+        // Add pending/streaming messages (skip if already in finalized - race condition guard)
         for (const msg of pendingMessages) {
-            items.push({ type: 'message', message: msg });
+            if (!seenIds.has(msg.id)) {
+                items.push({ type: 'message', message: msg });
+                seenIds.add(msg.id);
+            }
         }
         // Add dequeued buffer (user messages waiting to be flushed to finalized)
         // These render AFTER pending to guarantee correct visual order
         for (const msg of dequeuedBuffer) {
-            items.push({ type: 'message', message: msg });
+            if (!seenIds.has(msg.id)) {
+                items.push({ type: 'message', message: msg });
+            }
         }
         return items;
     }, [visibleMessages, pendingMessages, dequeuedBuffer]);
@@ -163,5 +175,5 @@ export function AlternateBufferCLI({ agent, initialSessionId, startupInfo, onSel
             return 'header';
         return item.message.id;
     }, []);
-    return (_jsxs(Box, { flexDirection: "column", height: terminalHeight, children: [_jsx(Box, { ref: listContainerRef, flexGrow: 1, flexShrink: 1, minHeight: 0, children: _jsx(VirtualizedList, { ref: listRef, data: listData, renderItem: renderListItem, estimatedItemHeight: estimateItemHeight, keyExtractor: getItemKey, initialScrollIndex: SCROLL_TO_ITEM_END, initialScrollOffsetInIndex: SCROLL_TO_ITEM_END }) }), _jsxs(Box, { flexDirection: "column", flexShrink: 0, children: [_jsx(TodoPanel, { todos: todos }), _jsx(StatusBar, { agent: agent, isProcessing: ui.isProcessing, isThinking: ui.isThinking, isCompacting: ui.isCompacting, approvalQueueCount: approvalQueue.length, copyModeEnabled: ui.copyModeEnabled, isAwaitingApproval: approval !== null }), selectionHintVisible && (_jsx(Box, { paddingX: 1, children: _jsx(Text, { color: "yellowBright", children: "\uD83D\uDCA1 Tip: Hold Option (\u2325) and click to select text, or press Ctrl+S to toggle copy mode" }) })), _jsx(QueuedMessagesDisplay, { messages: queuedMessages }), _jsx(InputContainer, { ref: inputContainerRef, buffer: buffer, input: input, ui: ui, session: session, approval: approval, queuedMessages: queuedMessages, setInput: setInput, setUi: setUi, setSession: setSession, setMessages: setMessages, setPendingMessages: setPendingMessages, setDequeuedBuffer: setDequeuedBuffer, setQueuedMessages: setQueuedMessages, setApproval: setApproval, setApprovalQueue: setApprovalQueue, setTodos: setTodos, agent: agent, inputService: inputService, onKeyboardScroll: handleKeyboardScroll, useStreaming: useStreaming }), _jsx(OverlayContainer, { ref: overlayContainerRef, ui: ui, input: input, session: session, approval: approval, setInput: setInput, setUi: setUi, setSession: setSession, setMessages: setMessages, setApproval: setApproval, setApprovalQueue: setApprovalQueue, agent: agent, inputService: inputService, buffer: buffer, onSubmitPromptCommand: handleSubmitPromptCommand }), ui.exitWarningShown && (_jsxs(Box, { paddingX: 1, children: [_jsx(Text, { color: "yellowBright", bold: true, children: "\u26A0 Press Ctrl+C again to exit" }), _jsx(Text, { color: "gray", children: " (or press any key to cancel)" })] })), _jsx(Footer, { agent: agent, sessionId: session.id, modelName: session.modelName, cwd: process.cwd(), autoApproveEdits: ui.autoApproveEdits, isShellMode: buffer.text.startsWith('!') }), ui.historySearch.isActive && (_jsx(HistorySearchBar, { query: ui.historySearch.query, hasMatch: historySearchHasMatch }))] })] }));
+    return (_jsxs(Box, { flexDirection: "column", height: terminalHeight, children: [_jsx(Box, { ref: listContainerRef, flexGrow: 1, flexShrink: 1, minHeight: 0, children: _jsx(VirtualizedList, { ref: listRef, data: listData, renderItem: renderListItem, estimatedItemHeight: estimateItemHeight, keyExtractor: getItemKey, initialScrollIndex: SCROLL_TO_ITEM_END, initialScrollOffsetInIndex: SCROLL_TO_ITEM_END }) }), _jsxs(Box, { flexDirection: "column", flexShrink: 0, children: [_jsx(StatusBar, { agent: agent, isProcessing: ui.isProcessing, isThinking: ui.isThinking, isCompacting: ui.isCompacting, approvalQueueCount: approvalQueue.length, copyModeEnabled: ui.copyModeEnabled, isAwaitingApproval: approval !== null, todoExpanded: ui.todoExpanded, hasTodos: todos.some((t) => t.status !== 'completed'), planModeActive: ui.planModeActive, autoApproveEdits: ui.autoApproveEdits }), _jsx(TodoPanel, { todos: todos, isExpanded: ui.todoExpanded, isProcessing: ui.isProcessing }), selectionHintVisible && (_jsx(Box, { paddingX: 1, children: _jsx(Text, { color: "yellowBright", children: "\uD83D\uDCA1 Tip: Hold Option (\u2325) and click to select text, or press Ctrl+S to toggle copy mode" }) })), _jsx(QueuedMessagesDisplay, { messages: queuedMessages }), _jsx(InputContainer, { ref: inputContainerRef, buffer: buffer, input: input, ui: ui, session: session, approval: approval, queuedMessages: queuedMessages, setInput: setInput, setUi: setUi, setSession: setSession, setMessages: setMessages, setPendingMessages: setPendingMessages, setDequeuedBuffer: setDequeuedBuffer, setQueuedMessages: setQueuedMessages, setApproval: setApproval, setApprovalQueue: setApprovalQueue, setTodos: setTodos, agent: agent, inputService: inputService, onKeyboardScroll: handleKeyboardScroll, useStreaming: useStreaming }), _jsx(OverlayContainer, { ref: overlayContainerRef, ui: ui, input: input, session: session, approval: approval, setInput: setInput, setUi: setUi, setSession: setSession, setMessages: setMessages, setApproval: setApproval, setApprovalQueue: setApprovalQueue, agent: agent, inputService: inputService, buffer: buffer, onSubmitPromptCommand: handleSubmitPromptCommand }), ui.exitWarningShown && (_jsxs(Box, { paddingX: 1, children: [_jsx(Text, { color: "yellowBright", bold: true, children: "\u26A0 Press Ctrl+C again to exit" }), _jsx(Text, { color: "gray", children: " (or press any key to cancel)" })] })), _jsx(Footer, { agent: agent, sessionId: session.id, modelName: session.modelName, cwd: process.cwd(), ...(branchName ? { branchName } : {}), autoApproveEdits: ui.autoApproveEdits, planModeActive: ui.planModeActive, isShellMode: buffer.text.startsWith('!') }), ui.historySearch.isActive && (_jsx(HistorySearchBar, { query: ui.historySearch.query, hasMatch: historySearchHasMatch }))] })] }));
 }

package/dist/cli/ink-cli/components/modes/StaticCLI.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StaticCLI.d.ts","sourceRoot":"","sources":["../../../../../src/cli/ink-cli/components/modes/StaticCLI.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAM9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAmBxD,UAAU,cAAc;IACpB,KAAK,EAAE,UAAU,CAAC;IAClB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,WAAW,EAAE,WAAW,CAAC;IACzB,6DAA6D;IAC7D,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,wBAAgB,SAAS,CAAC,EACtB,KAAK,EACL,gBAAgB,EAChB,WAAW,EACX,YAAmB,GACtB,EAAE,cAAc,2CA8NhB"}
+{"version":3,"file":"StaticCLI.d.ts","sourceRoot":"","sources":["../../../../../src/cli/ink-cli/components/modes/StaticCLI.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAM9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAoBxD,UAAU,cAAc;IACpB,KAAK,EAAE,UAAU,CAAC;IAClB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,WAAW,EAAE,WAAW,CAAC;IACzB,6DAA6D;IAC7D,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,wBAAgB,SAAS,CAAC,EACtB,KAAK,EACL,gBAAgB,EAChB,WAAW,EACX,YAAmB,GACtB,EAAE,cAAc,2CA2OhB"}

package/dist/cli/ink-cli/components/modes/StaticCLI.js

@@ -21,6 +21,7 @@ const CLEAR_TERMINAL = '\x1B[2J\x1B[3J\x1B[H';
 // Hooks
 import { useCLIState } from '../../hooks/useCLIState.js';
 import { useTerminalSize } from '../../hooks/useTerminalSize.js';
+import { useGitBranch } from '../../hooks/useGitBranch.js';
 // Components
 import { Header } from '../chat/Header.js';
 import { MessageItem } from '../chat/MessageItem.js';
@@ -40,6 +41,8 @@ export function StaticCLI({ agent, initialSessionId, startupInfo, useStreaming =
         startupInfo,
         // No keyboard scroll handler - let terminal handle scrollback
     });
+    // Get current git branch name
+    const branchName = useGitBranch();
     // Terminal resize handling - clear and re-render Static content
     const { write: stdoutWrite } = useStdout();
     const { columns: terminalWidth } = useTerminalSize();
@@ -99,5 +102,5 @@ export function StaticCLI({ agent, initialSessionId, startupInfo, useStreaming =
         startupInfo,
         terminalWidth,
     ]);
-    return (_jsxs(Box, { flexDirection: "column", width: terminalWidth, children: [_jsx(Static, { items: staticItems, children: (item) => item }, staticRemountKey), pendingMessages.map((message) => (_jsx(MessageItem, { message: message, terminalWidth: terminalWidth }, message.id))), dequeuedBuffer.map((message) => (_jsx(MessageItem, { message: message, terminalWidth: terminalWidth }, message.id))), _jsxs(Box, { flexDirection: "column", flexShrink: 0, children: [_jsx(TodoPanel, { todos: todos }), _jsx(StatusBar, { agent: agent, isProcessing: ui.isProcessing, isThinking: ui.isThinking, isCompacting: ui.isCompacting, approvalQueueCount: approvalQueue.length, copyModeEnabled: ui.copyModeEnabled, isAwaitingApproval: approval !== null }), _jsx(QueuedMessagesDisplay, { messages: queuedMessages }), _jsx(InputContainer, { ref: inputContainerRef, buffer: buffer, input: input, ui: ui, session: session, approval: approval, queuedMessages: queuedMessages, setInput: setInput, setUi: setUi, setSession: setSession, setMessages: setMessages, setPendingMessages: setPendingMessages, setDequeuedBuffer: setDequeuedBuffer, setQueuedMessages: setQueuedMessages, setApproval: setApproval, setApprovalQueue: setApprovalQueue, setTodos: setTodos, agent: agent, inputService: inputService, useStreaming: useStreaming }), _jsx(OverlayContainer, { ref: overlayContainerRef, ui: ui, input: input, session: session, approval: approval, setInput: setInput, setUi: setUi, setSession: setSession, setMessages: setMessages, setApproval: setApproval, setApprovalQueue: setApprovalQueue, agent: agent, inputService: inputService, buffer: buffer, refreshStatic: refreshStatic, onSubmitPromptCommand: handleSubmitPromptCommand }), ui.exitWarningShown && (_jsxs(Box, { paddingX: 1, children: [_jsx(Text, { color: "yellowBright", bold: true, children: "\u26A0 Press Ctrl+C again to exit" }), _jsx(Text, { color: "gray", children: " (or press any key to cancel)" })] })), _jsx(Footer, { agent: agent, sessionId: session.id, modelName: session.modelName, cwd: process.cwd(), autoApproveEdits: ui.autoApproveEdits, isShellMode: buffer.text.startsWith('!') }), ui.historySearch.isActive && (_jsx(HistorySearchBar, { query: ui.historySearch.query, hasMatch: historySearchHasMatch }))] })] }));
+    return (_jsxs(Box, { flexDirection: "column", width: terminalWidth, children: [_jsx(Static, { items: staticItems, children: (item) => item }, staticRemountKey), pendingMessages.map((message) => (_jsx(MessageItem, { message: message, terminalWidth: terminalWidth }, message.id))), dequeuedBuffer.map((message) => (_jsx(MessageItem, { message: message, terminalWidth: terminalWidth }, message.id))), _jsxs(Box, { flexDirection: "column", flexShrink: 0, children: [_jsx(StatusBar, { agent: agent, isProcessing: ui.isProcessing, isThinking: ui.isThinking, isCompacting: ui.isCompacting, approvalQueueCount: approvalQueue.length, copyModeEnabled: ui.copyModeEnabled, isAwaitingApproval: approval !== null, todoExpanded: ui.todoExpanded, hasTodos: todos.some((t) => t.status !== 'completed'), planModeActive: ui.planModeActive, autoApproveEdits: ui.autoApproveEdits }), _jsx(TodoPanel, { todos: todos, isExpanded: ui.todoExpanded, isProcessing: ui.isProcessing }), _jsx(QueuedMessagesDisplay, { messages: queuedMessages }), _jsx(InputContainer, { ref: inputContainerRef, buffer: buffer, input: input, ui: ui, session: session, approval: approval, queuedMessages: queuedMessages, setInput: setInput, setUi: setUi, setSession: setSession, setMessages: setMessages, setPendingMessages: setPendingMessages, setDequeuedBuffer: setDequeuedBuffer, setQueuedMessages: setQueuedMessages, setApproval: setApproval, setApprovalQueue: setApprovalQueue, setTodos: setTodos, agent: agent, inputService: inputService, useStreaming: useStreaming }), _jsx(OverlayContainer, { ref: overlayContainerRef, ui: ui, input: input, session: session, approval: approval, setInput: setInput, setUi: setUi, setSession: setSession, setMessages: setMessages, setApproval: setApproval, setApprovalQueue: setApprovalQueue, agent: agent, inputService: inputService, buffer: buffer, refreshStatic: refreshStatic, onSubmitPromptCommand: handleSubmitPromptCommand }), ui.exitWarningShown && (_jsxs(Box, { paddingX: 1, children: [_jsx(Text, { color: "yellowBright", bold: true, children: "\u26A0 Press Ctrl+C again to exit" }), _jsx(Text, { color: "gray", children: " (or press any key to cancel)" })] })), _jsx(Footer, { agent: agent, sessionId: session.id, modelName: session.modelName, cwd: process.cwd(), ...(branchName ? { branchName } : {}), autoApproveEdits: ui.autoApproveEdits, planModeActive: ui.planModeActive, isShellMode: buffer.text.startsWith('!') }), ui.historySearch.isActive && (_jsx(HistorySearchBar, { query: ui.historySearch.query, hasMatch: historySearchHasMatch }))] })] }));
 }

package/dist/cli/ink-cli/components/overlays/ExportWizard.d.ts

@@ -0,0 +1,22 @@
+/**
+ * ExportWizard Component
+ * Interactive wizard for exporting conversation to markdown or JSON
+ */
+import React from 'react';
+import type { Key } from '../../hooks/useInputOrchestrator.js';
+import type { DextoAgent } from '@dexto/core';
+interface ExportWizardProps {
+    isVisible: boolean;
+    agent: DextoAgent;
+    sessionId: string | null;
+    onClose: () => void;
+}
+export interface ExportWizardHandle {
+    handleInput: (input: string, key: Key) => boolean;
+}
+/**
+ * Interactive wizard for exporting conversation
+ */
+declare const ExportWizard: React.ForwardRefExoticComponent<ExportWizardProps & React.RefAttributes<ExportWizardHandle>>;
+export default ExportWizard;
+//# sourceMappingURL=ExportWizard.d.ts.map

package/dist/cli/ink-cli/components/overlays/ExportWizard.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExportWizard.d.ts","sourceRoot":"","sources":["../../../../../src/cli/ink-cli/components/overlays/ExportWizard.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAA4E,MAAM,OAAO,CAAC;AAIjG,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qCAAqC,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAY9C,UAAU,iBAAiB;IACvB,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,OAAO,EAAE,MAAM,IAAI,CAAC;CACvB;AAED,MAAM,WAAW,kBAAkB;IAC/B,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AA4JD;;GAEG;AACH,QAAA,MAAM,YAAY,8FA+UhB,CAAC;AAEH,eAAe,YAAY,CAAC"}

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

@@ -0,0 +1,308 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+/**
+ * ExportWizard Component
+ * Interactive wizard for exporting conversation to markdown or JSON
+ */
+import { useState, useEffect, forwardRef, useImperativeHandle, useCallback } from 'react';
+import { Box, Text } from 'ink';
+import fs from 'fs/promises';
+import path from 'path';
+/**
+ * Generate default filename based on date and session ID
+ */
+function generateDefaultFilename(sessionId, format) {
+    const date = new Date().toISOString().split('T')[0]; // YYYY-MM-DD
+    const shortId = sessionId ? sessionId.slice(0, 6) : 'unknown';
+    const ext = format === 'markdown' ? 'md' : 'json';
+    return `conversation-${date}-${shortId}.${ext}`;
+}
+/**
+ * Format conversation history as Markdown
+ */
+function formatAsMarkdown(messages, metadata, includeToolCalls) {
+    const lines = [];
+    // Header
+    lines.push('# Conversation Export');
+    lines.push('');
+    lines.push(`- **Session**: ${metadata.sessionId}`);
+    if (metadata.title) {
+        lines.push(`- **Title**: ${metadata.title}`);
+    }
+    if (metadata.createdAt) {
+        lines.push(`- **Created**: ${metadata.createdAt}`);
+    }
+    lines.push(`- **Exported**: ${new Date().toISOString()}`);
+    lines.push('');
+    lines.push('---');
+    lines.push('');
+    // Messages
+    for (const msg of messages) {
+        const role = msg.role.charAt(0).toUpperCase() + msg.role.slice(1);
+        // Skip tool messages if not including tool calls
+        if (!includeToolCalls && msg.role === 'tool') {
+            continue;
+        }
+        lines.push(`## ${role}`);
+        if (msg.timestamp) {
+            lines.push(`*${msg.timestamp}*`);
+        }
+        lines.push('');
+        // Handle different content types
+        if (typeof msg.content === 'string') {
+            lines.push(msg.content);
+        }
+        else if (Array.isArray(msg.content)) {
+            // Handle content parts (text, tool calls, tool results)
+            for (const part of msg.content) {
+                if (typeof part === 'string') {
+                    lines.push(part);
+                }
+                else if (part && typeof part === 'object') {
+                    if ('text' in part) {
+                        lines.push(String(part.text));
+                    }
+                    else if ('type' in part && part.type === 'tool-call' && includeToolCalls) {
+                        const toolCall = part;
+                        lines.push('');
+                        lines.push(`### Tool: ${toolCall.toolName || 'unknown'}`);
+                        lines.push('```json');
+                        lines.push(JSON.stringify(toolCall.args || {}, null, 2));
+                        lines.push('```');
+                    }
+                    else if ('type' in part && part.type === 'tool-result' && includeToolCalls) {
+                        const toolResult = part;
+                        lines.push('');
+                        lines.push('<details>');
+                        lines.push(`<summary>Result: ${toolResult.toolName || 'unknown'}</summary>`);
+                        lines.push('');
+                        lines.push('```');
+                        const resultStr = typeof toolResult.result === 'string'
+                            ? toolResult.result
+                            : JSON.stringify(toolResult.result, null, 2);
+                        // Truncate very long results
+                        if (resultStr.length > 2000) {
+                            lines.push(resultStr.slice(0, 2000) + '\n... (truncated)');
+                        }
+                        else {
+                            lines.push(resultStr);
+                        }
+                        lines.push('```');
+                        lines.push('</details>');
+                    }
+                }
+            }
+        }
+        else if (msg.content && typeof msg.content === 'object') {
+            lines.push('```json');
+            lines.push(JSON.stringify(msg.content, null, 2));
+            lines.push('```');
+        }
+        lines.push('');
+        lines.push('---');
+        lines.push('');
+    }
+    return lines.join('\n');
+}
+/**
+ * Format conversation history as JSON
+ */
+function formatAsJson(messages, metadata, includeToolCalls) {
+    const filteredMessages = includeToolCalls
+        ? messages
+        : messages
+            .filter((m) => m.role !== 'tool')
+            .map((m) => ({
+            ...m,
+            content: Array.isArray(m.content)
+                ? m.content.filter((part) => {
+                    if (!part || typeof part !== 'object')
+                        return true;
+                    return !('type' in part &&
+                        (part.type === 'tool-call' || part.type === 'tool-result'));
+                })
+                : m.content,
+        }));
+    return JSON.stringify({
+        exportedAt: new Date().toISOString(),
+        session: metadata,
+        messages: filteredMessages,
+    }, null, 2);
+}
+/**
+ * Interactive wizard for exporting conversation
+ */
+const ExportWizard = forwardRef(function ExportWizard({ isVisible, agent, sessionId, onClose }, ref) {
+    const [step, setStep] = useState('format');
+    const [options, setOptions] = useState({
+        format: 'markdown',
+        includeToolCalls: true,
+        filename: '',
+    });
+    const [selectedIndex, setSelectedIndex] = useState(0);
+    const [filenameInput, setFilenameInput] = useState('');
+    const [exportResult, setExportResult] = useState(null);
+    // Reset when becoming visible
+    useEffect(() => {
+        if (isVisible) {
+            setStep('format');
+            setOptions({
+                format: 'markdown',
+                includeToolCalls: true,
+                filename: '',
+            });
+            setSelectedIndex(0);
+            setFilenameInput('');
+            setExportResult(null);
+        }
+    }, [isVisible]);
+    // Update default filename when format changes
+    useEffect(() => {
+        if (step === 'filename' && !filenameInput) {
+            setFilenameInput(generateDefaultFilename(sessionId, options.format));
+        }
+    }, [step, sessionId, options.format, filenameInput]);
+    const doExport = useCallback(async () => {
+        if (!sessionId) {
+            setExportResult({ success: false, error: 'No active session' });
+            setStep('error');
+            return;
+        }
+        setStep('exporting');
+        try {
+            // Get session history and metadata
+            const history = await agent.getSessionHistory(sessionId);
+            const metadata = await agent.getSessionMetadata(sessionId);
+            const exportMetadata = {
+                sessionId,
+                title: metadata?.title,
+                createdAt: metadata?.createdAt
+                    ? new Date(metadata.createdAt).toISOString()
+                    : undefined,
+            };
+            // Format content - cast history to expected type
+            const formattedHistory = history.map((msg) => ({
+                role: msg.role,
+                content: msg.content,
+                timestamp: 'timestamp' in msg && typeof msg.timestamp === 'number'
+                    ? new Date(msg.timestamp).toISOString()
+                    : undefined,
+            }));
+            const content = options.format === 'markdown'
+                ? formatAsMarkdown(formattedHistory, exportMetadata, options.includeToolCalls)
+                : formatAsJson(formattedHistory, exportMetadata, options.includeToolCalls);
+            // Write file - use path.basename to prevent path traversal attacks
+            const rawFilename = options.filename || filenameInput;
+            const safeFilename = path.basename(rawFilename);
+            const outputPath = path.resolve(process.cwd(), safeFilename);
+            await fs.writeFile(outputPath, content, 'utf-8');
+            setExportResult({ success: true, path: outputPath });
+            setStep('done');
+        }
+        catch (error) {
+            setExportResult({
+                success: false,
+                error: error instanceof Error ? error.message : String(error),
+            });
+            setStep('error');
+        }
+    }, [agent, sessionId, options, filenameInput]);
+    // Handle keyboard input
+    useImperativeHandle(ref, () => ({
+        handleInput: (input, key) => {
+            if (!isVisible)
+                return false;
+            // Escape to close
+            if (key.escape) {
+                onClose();
+                return true;
+            }
+            // Done/error state - Enter/Esc closes, consume all other input
+            if (step === 'done' || step === 'error') {
+                if (key.return || key.escape) {
+                    onClose();
+                }
+                return true; // Consume all input in terminal states
+            }
+            // Format selection step
+            if (step === 'format') {
+                if (key.upArrow || key.downArrow) {
+                    setSelectedIndex((prev) => (prev === 0 ? 1 : 0));
+                    return true;
+                }
+                if (key.return) {
+                    setOptions((prev) => ({
+                        ...prev,
+                        format: selectedIndex === 0 ? 'markdown' : 'json',
+                    }));
+                    setSelectedIndex(0);
+                    setStep('toolCalls');
+                    return true;
+                }
+                return false;
+            }
+            // Tool calls selection step
+            if (step === 'toolCalls') {
+                if (key.upArrow || key.downArrow) {
+                    setSelectedIndex((prev) => (prev === 0 ? 1 : 0));
+                    return true;
+                }
+                if (key.return) {
+                    setOptions((prev) => ({
+                        ...prev,
+                        includeToolCalls: selectedIndex === 0,
+                    }));
+                    setFilenameInput(generateDefaultFilename(sessionId, options.format));
+                    setStep('filename');
+                    return true;
+                }
+                return false;
+            }
+            // Filename input step
+            if (step === 'filename') {
+                if (key.return) {
+                    const finalFilename = filenameInput.trim();
+                    if (!finalFilename) {
+                        // Don't proceed with empty filename
+                        return true;
+                    }
+                    setOptions((prev) => ({ ...prev, filename: finalFilename }));
+                    setSelectedIndex(0); // Reset to "Export" option
+                    setStep('confirm');
+                    return true;
+                }
+                if (key.backspace || key.delete) {
+                    setFilenameInput((prev) => prev.slice(0, -1));
+                    return true;
+                }
+                if (input && !key.ctrl && !key.meta) {
+                    setFilenameInput((prev) => prev + input);
+                    return true;
+                }
+                return false;
+            }
+            // Confirm step
+            if (step === 'confirm') {
+                if (key.upArrow || key.downArrow) {
+                    setSelectedIndex((prev) => (prev === 0 ? 1 : 0));
+                    return true;
+                }
+                if (key.return) {
+                    if (selectedIndex === 0) {
+                        doExport();
+                    }
+                    else {
+                        onClose();
+                    }
+                    return true;
+                }
+                return false;
+            }
+            return false;
+        },
+    }), [isVisible, step, selectedIndex, options, filenameInput, onClose, doExport, sessionId]);
+    if (!isVisible)
+        return null;
+    // Render based on current step
+    return (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 1, marginTop: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "cyan", children: "\uD83D\uDCE4 Export Conversation" }) }), step === 'format' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: "Select export format:" }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsxs(Text, { ...(selectedIndex === 0 ? { color: 'cyan' } : {}), children: [selectedIndex === 0 ? '❯ ' : '  ', "Markdown (.md) - Human readable"] }), _jsxs(Text, { ...(selectedIndex === 1 ? { color: 'cyan' } : {}), children: [selectedIndex === 1 ? '❯ ' : '  ', "JSON (.json) - Structured data"] })] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "gray", children: "\u2191\u2193 to select \u2022 Enter to continue \u2022 Esc to cancel" }) })] })), step === 'toolCalls' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: "Include tool calls and results?" }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsxs(Text, { ...(selectedIndex === 0 ? { color: 'cyan' } : {}), children: [selectedIndex === 0 ? '❯ ' : '  ', "Yes - Include all tool interactions"] }), _jsxs(Text, { ...(selectedIndex === 1 ? { color: 'cyan' } : {}), children: [selectedIndex === 1 ? '❯ ' : '  ', "No - Only user and assistant messages"] })] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "gray", children: "\u2191\u2193 to select \u2022 Enter to continue \u2022 Esc to cancel" }) })] })), step === 'filename' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: "Filename:" }), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: "cyan", children: "> " }), _jsx(Text, { children: filenameInput }), _jsx(Text, { color: "cyan", children: "_" })] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "gray", children: "Enter to continue \u2022 Esc to cancel" }) })] })), step === 'confirm' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: "Export with these settings?" }), _jsxs(Box, { marginTop: 1, flexDirection: "column", marginLeft: 2, children: [_jsxs(Text, { color: "gray", children: ["Format:", ' ', _jsx(Text, { color: "white", children: options.format === 'markdown' ? 'Markdown' : 'JSON' })] }), _jsxs(Text, { color: "gray", children: ["Tool calls:", ' ', _jsx(Text, { color: "white", children: options.includeToolCalls ? 'Yes' : 'No' })] }), _jsxs(Text, { color: "gray", children: ["File: ", _jsx(Text, { color: "white", children: filenameInput })] })] }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsxs(Text, { ...(selectedIndex === 0 ? { color: 'green' } : {}), children: [selectedIndex === 0 ? '❯ ' : '  ', "Export"] }), _jsxs(Text, { ...(selectedIndex === 1 ? { color: 'red' } : {}), children: [selectedIndex === 1 ? '❯ ' : '  ', "Cancel"] })] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "gray", children: "\u2191\u2193 to select \u2022 Enter to confirm" }) })] })), step === 'exporting' && (_jsx(Box, { flexDirection: "column", children: _jsx(Text, { color: "yellow", children: "Exporting..." }) })), step === 'done' && exportResult?.success && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: "green", children: "\u2713 Exported successfully!" }), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: "gray", children: "Saved to: " }), _jsx(Text, { children: exportResult.path })] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "gray", children: "Press Enter or Esc to close" }) })] })), step === 'error' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: "red", children: "\u2717 Export failed" }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "red", children: exportResult?.error }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "gray", children: "Press Enter or Esc to close" }) })] }))] }));
+});
+export default ExportWizard;

package/dist/cli/ink-cli/components/overlays/LogLevelSelector.d.ts

@@ -10,6 +10,7 @@ interface LogLevelSelectorProps {
     onSelect: (level: string) => void;
     onClose: () => void;
     agent: DextoAgent;
+    sessionId: string | null;
 }
 export interface LogLevelSelectorHandle {
     handleInput: (input: string, key: Key) => boolean;

package/dist/cli/ink-cli/components/overlays/LogLevelSelector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LogLevelSelector.d.ts","sourceRoot":"","sources":["../../../../../src/cli/ink-cli/components/overlays/LogLevelSelector.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAuE,MAAM,OAAO,CAAC;AAE5F,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qCAAqC,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAG9C,UAAU,qBAAqB;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,KAAK,EAAE,UAAU,CAAC;CACrB;AAED,MAAM,WAAW,sBAAsB;IACnC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAkBD;;GAEG;AACH,QAAA,MAAM,gBAAgB,sGAyFrB,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"LogLevelSelector.d.ts","sourceRoot":"","sources":["../../../../../src/cli/ink-cli/components/overlays/LogLevelSelector.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAuE,MAAM,OAAO,CAAC;AAE5F,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qCAAqC,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAG9C,UAAU,qBAAqB;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAED,MAAM,WAAW,sBAAsB;IACnC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAkBD;;GAEG;AACH,QAAA,MAAM,gBAAgB,sGAwGrB,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

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

@@ -17,7 +17,7 @@ const LOG_LEVELS = [
 /**
  * Log level selector - thin wrapper around BaseSelector
  */
-const LogLevelSelector = forwardRef(function LogLevelSelector({ isVisible, onSelect, onClose, agent }, ref) {
+const LogLevelSelector = forwardRef(function LogLevelSelector({ isVisible, onSelect, onClose, agent, sessionId }, ref) {
     const baseSelectorRef = useRef(null);
     // Forward handleInput to BaseSelector
     useImperativeHandle(ref, () => ({
@@ -30,30 +30,41 @@ const LogLevelSelector = forwardRef(function LogLevelSelector({ isVisible, onSel
     const [logFilePath, setLogFilePath] = useState(null);
     // Build levels list with current indicator
     useEffect(() => {
-        if (!isVisible) {
-            setLogFilePath(null);
-            return;
-        }
-        // Get current level from agent's logger (shared across all child loggers)
-        const currentLevel = agent.logger.getLevel();
-        const levelList = LOG_LEVELS.map((l) => ({
-            ...l,
-            isCurrent: l.level === currentLevel,
-        }));
-        setLevels(levelList);
-        setLogFilePath(agent.logger.getLogFilePath());
-        // Set initial selection to current level
-        const currentIndex = levelList.findIndex((l) => l.isCurrent);
-        if (currentIndex >= 0) {
-            setSelectedIndex(currentIndex);
-        }
-    }, [isVisible, agent]);
+        let isCancelled = false;
+        const run = async () => {
+            if (!isVisible) {
+                setLogFilePath(null);
+                return;
+            }
+            // Get current level from agent's logger (shared across all child loggers)
+            const currentLevel = agent.logger.getLevel();
+            const levelList = LOG_LEVELS.map((l) => ({
+                ...l,
+                isCurrent: l.level === currentLevel,
+            }));
+            setLevels(levelList);
+            // File logging is session-scoped; prefer the active session logger if available.
+            const session = sessionId ? await agent.getSession(sessionId) : undefined;
+            if (!isCancelled) {
+                setLogFilePath(session?.logger.getLogFilePath() ?? null);
+            }
+            // Set initial selection to current level
+            const currentIndex = levelList.findIndex((l) => l.isCurrent);
+            if (currentIndex >= 0) {
+                setSelectedIndex(currentIndex);
+            }
+        };
+        void run();
+        return () => {
+            isCancelled = true;
+        };
+    }, [isVisible, agent, sessionId]);
     // Format level item for display
     const formatItem = (option, isSelected) => (_jsxs(_Fragment, { children: [_jsxs(Text, { children: [option.icon, " "] }), _jsx(Text, { color: isSelected ? 'cyan' : 'gray', bold: isSelected, children: option.level }), _jsxs(Text, { color: isSelected ? 'white' : 'gray', children: [" - ", option.description] }), option.isCurrent && (_jsxs(Text, { color: isSelected ? 'cyan' : 'gray', bold: isSelected, children: [' ', "\u2190 Current"] }))] }));
     // Handle selection
     const handleSelect = (option) => {
         onSelect(option.level);
     };
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(BaseSelector, { ref: baseSelectorRef, items: levels, isVisible: isVisible, isLoading: false, selectedIndex: selectedIndex, onSelectIndex: setSelectedIndex, onSelect: handleSelect, onClose: onClose, formatItem: formatItem, title: "Select Log Level", borderColor: "yellowBright", emptyMessage: "No log levels available" }), logFilePath && process.env.DEXTO_PRIVACY_MODE !== 'true' && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: "gray", children: ["\uD83D\uDCC1 Log file: ", logFilePath] }) }))] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(BaseSelector, { ref: baseSelectorRef, items: levels, isVisible: isVisible, isLoading: false, selectedIndex: selectedIndex, onSelectIndex: setSelectedIndex, onSelect: handleSelect, onClose: onClose, formatItem: formatItem, title: "Select Log Level", borderColor: "yellowBright", emptyMessage: "No log levels available" }), logFilePath && process.env.DEXTO_DEV_MODE === 'true' && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: "gray", children: ["\uD83D\uDCC1 Log file: ", logFilePath] }) }))] }));
 });
 export default LogLevelSelector;

package/dist/cli/ink-cli/components/overlays/MarketplaceAddPrompt.d.ts

@@ -0,0 +1,20 @@
+/**
+ * MarketplaceAddPrompt Component
+ * Prompts user to enter a marketplace source to add
+ */
+import React from 'react';
+import type { Key } from '../../hooks/useInputOrchestrator.js';
+interface MarketplaceAddPromptProps {
+    isVisible: boolean;
+    onComplete: (name: string, pluginCount: number) => void;
+    onClose: () => void;
+}
+export interface MarketplaceAddPromptHandle {
+    handleInput: (input: string, key: Key) => boolean;
+}
+/**
+ * Marketplace add prompt - single input for source
+ */
+declare const MarketplaceAddPrompt: React.ForwardRefExoticComponent<MarketplaceAddPromptProps & React.RefAttributes<MarketplaceAddPromptHandle>>;
+export default MarketplaceAddPrompt;
+//# sourceMappingURL=MarketplaceAddPrompt.d.ts.map

package/dist/cli/ink-cli/components/overlays/MarketplaceAddPrompt.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MarketplaceAddPrompt.d.ts","sourceRoot":"","sources":["../../../../../src/cli/ink-cli/components/overlays/MarketplaceAddPrompt.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAA4E,MAAM,OAAO,CAAC;AAIjG,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qCAAqC,CAAC;AAE/D,UAAU,yBAAyB;IAC/B,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;IACxD,OAAO,EAAE,MAAM,IAAI,CAAC;CACvB;AAED,MAAM,WAAW,0BAA0B;IACvC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAED;;GAEG;AACH,QAAA,MAAM,oBAAoB,8GAsIzB,CAAC;AAEF,eAAe,oBAAoB,CAAC"}

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

@@ -0,0 +1,81 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+/**
+ * MarketplaceAddPrompt Component
+ * Prompts user to enter a marketplace source to add
+ */
+import { useState, useEffect, forwardRef, useImperativeHandle, useCallback } from 'react';
+import { Box, Text } from 'ink';
+import { addMarketplace } from '@dexto/agent-management';
+import { logger } from '@dexto/core';
+/**
+ * Marketplace add prompt - single input for source
+ */
+const MarketplaceAddPrompt = forwardRef(function MarketplaceAddPrompt({ isVisible, onComplete, onClose }, ref) {
+    const [input, setInput] = useState('');
+    const [error, setError] = useState(null);
+    const [isAdding, setIsAdding] = useState(false);
+    // Reset when becoming visible
+    useEffect(() => {
+        if (isVisible) {
+            setInput('');
+            setError(null);
+            setIsAdding(false);
+        }
+    }, [isVisible]);
+    // Handle adding marketplace
+    const handleAdd = useCallback(async () => {
+        const source = input.trim();
+        if (!source) {
+            setError('Please enter a marketplace source');
+            return;
+        }
+        setError(null);
+        setIsAdding(true);
+        try {
+            const result = await addMarketplace(source);
+            onComplete(result.name, result.pluginCount);
+        }
+        catch (err) {
+            const errorMessage = err instanceof Error ? err.message : String(err);
+            setError(errorMessage);
+            logger.error(`MarketplaceAddPrompt.handleAdd failed: ${errorMessage}`);
+        }
+        finally {
+            setIsAdding(false);
+        }
+    }, [input, onComplete]);
+    // Handle input
+    useImperativeHandle(ref, () => ({
+        handleInput: (inputStr, key) => {
+            // Escape to close
+            if (key.escape) {
+                onClose();
+                return true;
+            }
+            // Enter to submit
+            if (key.return) {
+                if (!isAdding) {
+                    handleAdd();
+                }
+                return true;
+            }
+            // Backspace
+            if (key.backspace || key.delete) {
+                setInput((prev) => prev.slice(0, -1));
+                setError(null);
+                return true;
+            }
+            // Regular character input
+            if (inputStr && !key.ctrl && !key.meta) {
+                setInput((prev) => prev + inputStr);
+                setError(null);
+                return true;
+            }
+            return false;
+        },
+    }), [handleAdd, isAdding, onClose]);
+    if (!isVisible)
+        return null;
+    return (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "green", paddingX: 1, marginTop: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "green", children: "Add Marketplace" }) }), _jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: "gray", children: "Enter marketplace source:" }) }), _jsxs(Box, { marginBottom: 1, flexDirection: "column", children: [_jsx(Text, { color: "gray", dimColor: true, children: "- GitHub: owner/repo (e.g., anthropics/claude-plugins-official)" }), _jsx(Text, { color: "gray", dimColor: true, children: "- Git URL: https://github.com/user/repo.git" }), _jsx(Text, { color: "gray", dimColor: true, children: "- Local: /path/to/marketplace or ~/marketplace" })] }), _jsxs(Box, { children: [_jsx(Text, { color: "cyan", children: '> ' }), _jsx(Text, { children: input }), _jsx(Text, { color: "cyan", children: "_" })] }), error && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "red", children: error }) })), isAdding && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "yellow", children: "Adding marketplace..." }) })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "gray", dimColor: true, children: "Press Enter to add, Escape to cancel" }) })] }));
+});
+export default MarketplaceAddPrompt;