dexto 1.5.1 → 1.5.2

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

@@ -1 +1 @@
-{"version":3,"file":"ResourceAutocomplete.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/components/ResourceAutocomplete.tsx"],"names":[],"mappings":"AAAA,OAAO,KAQN,MAAM,OAAO,CAAC;AAEf,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kCAAkC,CAAC;AAC5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,WAAW,0BAA0B;IACvC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAED,UAAU,yBAAyB;IAC/B,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,CAAC,QAAQ,EAAE,gBAAgB,KAAK,IAAI,CAAC;IACvD,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,KAAK,EAAE,UAAU,CAAC;CACrB;AA6ED;;GAEG;AACH,QAAA,MAAM,yBAAyB,8GAgR9B,CAAC;AAEF;;;GAGG;AACH,QAAA,MAAM,oBAAoB,EAErB,OAAO,yBAAyB,CAAC;AAEtC,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"ResourceAutocomplete.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/components/ResourceAutocomplete.tsx"],"names":[],"mappings":"AAAA,OAAO,KAQN,MAAM,OAAO,CAAC;AAEf,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kCAAkC,CAAC;AAC5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,WAAW,0BAA0B;IACvC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAED,UAAU,yBAAyB;IAC/B,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,CAAC,QAAQ,EAAE,gBAAgB,KAAK,IAAI,CAAC;IACvD,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,KAAK,EAAE,UAAU,CAAC;CACrB;AA6ED;;GAEG;AACH,QAAA,MAAM,yBAAyB,8GAoQ9B,CAAC;AAEF;;;GAGG;AACH,QAAA,MAAM,oBAAoB,EAErB,OAAO,yBAAyB,CAAC;AAEtC,eAAe,oBAAoB,CAAC"}

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

@@ -74,7 +74,7 @@ const ResourceAutocompleteInner = forwardRef(function ResourceAutocomplete({ isV
     // Combined state to guarantee single render on navigation
     const [selection, setSelection] = useState({ index: 0, offset: 0 });
     const selectedIndexRef = useRef(0);
-    const MAX_VISIBLE_ITEMS = 8;
+    const MAX_VISIBLE_ITEMS = 5;
     // Update selection AND scroll offset in a single state update
     // This guarantees exactly one render per navigation action
     const updateSelection = useCallback((indexUpdater) => {
@@ -122,6 +122,10 @@ const ResourceAutocompleteInner = forwardRef(function ResourceAutocomplete({ isV
             cancelled = true;
         };
     }, [isVisible, agent]);
+    // NOTE: Auto-close logic is handled synchronously in TextBufferInput.tsx
+    // (on backspace deleting @ and on space after @). We don't use useEffect here
+    // because React batches state updates, causing race conditions where isVisible
+    // and searchQuery update at different times.
     // Extract query from @mention (everything after @)
     const mentionQuery = useMemo(() => {
         // Find the last @ that's at start or after space
@@ -250,7 +254,9 @@ const ResourceAutocompleteInner = forwardRef(function ResourceAutocomplete({ isV
                 const uriParts = resource.uri.split('/');
                 const displayName = resource.name || uriParts[uriParts.length - 1] || resource.uri;
                 const isImage = (resource.mimeType || '').startsWith('image/');
-                return (_jsx(Box, { paddingX: 0, paddingY: 0, children: _jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [isImage && (_jsx(Text, { color: isSelected ? 'cyan' : 'gray', children: "\uD83D\uDDBC\uFE0F " })), _jsx(Text, { color: isSelected ? 'cyan' : 'gray', bold: isSelected, children: displayName }), resource.serverName && (_jsx(Box, { marginLeft: 1, children: _jsxs(Text, { color: isSelected ? 'white' : 'gray', children: ["[", resource.serverName, "]"] }) }))] }), _jsx(Box, { marginLeft: isImage ? 3 : 0, children: _jsx(Text, { color: isSelected ? 'white' : 'gray', children: resource.uri }) }), resource.description && (_jsx(Box, { marginLeft: isImage ? 3 : 0, children: _jsx(Text, { color: isSelected ? 'white' : 'gray', children: resource.description }) }))] }) }, resource.uri));
+                // Truncate URI for display (show last 40 chars with ellipsis)
+                const truncatedUri = resource.uri.length > 50 ? '…' + resource.uri.slice(-49) : resource.uri;
+                return (_jsxs(Box, { children: [isImage && _jsx(Text, { color: isSelected ? 'cyan' : 'gray', children: "\uD83D\uDDBC\uFE0F " }), _jsx(Text, { color: isSelected ? 'cyan' : 'white', bold: isSelected, children: displayName }), resource.serverName && (_jsxs(Text, { color: "gray", children: [" [", resource.serverName, "]"] })), _jsxs(Text, { color: "gray", children: [" ", truncatedUri] })] }, resource.uri));
             })] }));
 });
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"TextBufferInput.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/components/TextBufferInput.tsx"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGnE,+DAA+D;AAC/D,MAAM,MAAM,cAAc,GAAG,oBAAoB,GAAG,uBAAuB,GAAG,OAAO,CAAC;AActF,UAAU,oBAAoB;IAC1B,oCAAoC;IACpC,MAAM,EAAE,UAAU,CAAC;IACnB,+CAA+C;IAC/C,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,kCAAkC;IAClC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,mEAAmE;IACnE,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,4DAA4D;IAC5D,iBAAiB,CAAC,EAAE,CAAC,CAAC,SAAS,EAAE,IAAI,GAAG,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACrE,0DAA0D;IAC1D,gBAAgB,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACnE,wCAAwC;IACxC,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,kDAAkD;IAClD,QAAQ,EAAE,OAAO,CAAC;IAClB,2EAA2E;IAC3E,gBAAgB,CAAC,EAAE,CAAC,CAAC,SAAS,EAAE,IAAI,GAAG,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACpE,oEAAoE;IACpE,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,iDAAiD;IACjD,YAAY,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IAC3D,iEAAiE;IACjE,MAAM,CAAC,EAAE,YAAY,EAAE,GAAG,SAAS,CAAC;IACpC,4DAA4D;IAC5D,aAAa,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACxD,wDAAwD;IACxD,YAAY,CAAC,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC;IACzC,oEAAoE;IACpE,YAAY,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IAC1D,8DAA8D;IAC9D,kBAAkB,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IAC5F,iEAAiE;IACjE,kBAAkB,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IAC7D,4DAA4D;IAC5D,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACvC;AAuCD,wBAAgB,eAAe,CAAC,EAC5B,MAAM,EACN,QAAQ,EACR,WAAW,EACX,UAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAChB,gBAAqB,EACrB,QAAQ,EACR,gBAAgB,EAChB,UAAc,EACd,YAAY,EACZ,MAAW,EACX,aAAa,EACb,YAAiB,EACjB,YAAY,EACZ,kBAAkB,EAClB,kBAAkB,EAClB,cAAc,GACjB,EAAE,oBAAoB,2CA2gBtB"}
+{"version":3,"file":"TextBufferInput.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/components/TextBufferInput.tsx"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGnE,+DAA+D;AAC/D,MAAM,MAAM,cAAc,GAAG,oBAAoB,GAAG,uBAAuB,GAAG,OAAO,CAAC;AActF,UAAU,oBAAoB;IAC1B,oCAAoC;IACpC,MAAM,EAAE,UAAU,CAAC;IACnB,+CAA+C;IAC/C,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,kCAAkC;IAClC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,mEAAmE;IACnE,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,4DAA4D;IAC5D,iBAAiB,CAAC,EAAE,CAAC,CAAC,SAAS,EAAE,IAAI,GAAG,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACrE,0DAA0D;IAC1D,gBAAgB,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACnE,wCAAwC;IACxC,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,kDAAkD;IAClD,QAAQ,EAAE,OAAO,CAAC;IAClB,2EAA2E;IAC3E,gBAAgB,CAAC,EAAE,CAAC,CAAC,SAAS,EAAE,IAAI,GAAG,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACpE,oEAAoE;IACpE,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,iDAAiD;IACjD,YAAY,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IAC3D,iEAAiE;IACjE,MAAM,CAAC,EAAE,YAAY,EAAE,GAAG,SAAS,CAAC;IACpC,4DAA4D;IAC5D,aAAa,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACxD,wDAAwD;IACxD,YAAY,CAAC,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC;IACzC,oEAAoE;IACpE,YAAY,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IAC1D,8DAA8D;IAC9D,kBAAkB,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IAC5F,iEAAiE;IACjE,kBAAkB,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IAC7D,4DAA4D;IAC5D,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACvC;AAuCD,wBAAgB,eAAe,CAAC,EAC5B,MAAM,EACN,QAAQ,EACR,WAAW,EACX,UAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAChB,gBAAqB,EACrB,QAAQ,EACR,gBAAgB,EAChB,UAAc,EACd,YAAY,EACZ,MAAW,EACX,aAAa,EACb,YAAiB,EACjB,YAAY,EACZ,kBAAkB,EAClB,kBAAkB,EAClB,cAAc,GACjB,EAAE,oBAAoB,2CA0hBtB"}

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

@@ -250,14 +250,23 @@ export function TextBufferInput({ buffer, onSubmit, placeholder, isDisabled = fa
             buffer.backspace();
             checkRemovedImages();
             checkRemovedPasteBlocks();
+            // Check if we should close overlay after backspace
+            // NOTE: buffer.text is memoized and won't update until next render,
+            // so we calculate the expected new text ourselves
             if (onTriggerOverlay && cursorPos > 0) {
                 const deletedChar = prevText[cursorPos - 1];
-                const newText = buffer.text;
+                // Calculate what the text will be after backspace
+                const expectedNewText = prevText.slice(0, cursorPos - 1) + prevText.slice(cursorPos);
                 if (deletedChar === '/' && cursorPos === 1) {
                     onTriggerOverlay('close');
                 }
-                else if (deletedChar === '@' && !newText.includes('@')) {
-                    onTriggerOverlay('close');
+                else if (deletedChar === '@') {
+                    // Close if no valid @ mention remains
+                    // A valid @ is at start of text or after whitespace
+                    const hasValidAt = /(^|[\s])@/.test(expectedNewText);
+                    if (!hasValidAt) {
+                        onTriggerOverlay('close');
+                    }
                 }
             }
             return;
@@ -388,6 +397,11 @@ export function TextBufferInput({ buffer, onSubmit, placeholder, isDisabled = fa
                 else if (key.sequence === '@') {
                     onTriggerOverlay('resource-autocomplete');
                 }
+                else if (/\s/.test(key.sequence)) {
+                    // Close resource autocomplete when user types whitespace
+                    // Whitespace means user is done with the mention (either selected or abandoned)
+                    onTriggerOverlay('close');
+                }
             }
         }
     }, [

package/dist/cli/ink-cli/components/chat/MessageItem.d.ts

@@ -6,6 +6,8 @@
 import type { Message } from '../../state/types.js';
 interface MessageItemProps {
     message: Message;
+    /** Terminal width for proper text wrapping calculations */
+    terminalWidth?: number;
 }
 /**
  * Pure presentational component for a single message
@@ -14,6 +16,6 @@ interface MessageItemProps {
  * Memoization with custom comparator prevents re-renders when message array changes
  * but individual message content hasn't changed.
  */
-export declare const MessageItem: import("react").MemoExoticComponent<({ message }: MessageItemProps) => import("react/jsx-runtime").JSX.Element>;
+export declare const MessageItem: import("react").MemoExoticComponent<({ message, terminalWidth }: MessageItemProps) => import("react/jsx-runtime").JSX.Element>;
 export {};
 //# sourceMappingURL=MessageItem.d.ts.map

package/dist/cli/ink-cli/components/chat/MessageItem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MessageItem.d.ts","sourceRoot":"","sources":["../../../../../src/cli/ink-cli/components/chat/MessageItem.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EACR,OAAO,EAUV,MAAM,sBAAsB,CAAC;AAuC9B,UAAU,gBAAgB;IACtB,OAAO,EAAE,OAAO,CAAC;CACpB;AAED;;;;;;GAMG;AACH,eAAO,MAAM,WAAW,oDACN,gBAAgB,6CA2JjC,CAAC"}
+{"version":3,"file":"MessageItem.d.ts","sourceRoot":"","sources":["../../../../../src/cli/ink-cli/components/chat/MessageItem.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,KAAK,EACR,OAAO,EAUV,MAAM,sBAAsB,CAAC;AAuC9B,UAAU,gBAAgB;IACtB,OAAO,EAAE,OAAO,CAAC;IACjB,2DAA2D;IAC3D,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED;;;;;;GAMG;AACH,eAAO,MAAM,WAAW,mEACc,gBAAgB,6CA+LrD,CAAC"}

package/dist/cli/ink-cli/components/chat/MessageItem.js

@@ -1,4 +1,4 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 /**
  * MessageItem Component
  * Displays a single message with visual hierarchy
@@ -6,6 +6,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  */
 import { memo } from 'react';
 import { Box, Text } from 'ink';
+import wrapAnsi from 'wrap-ansi';
 import { ConfigBox, StatsBox, HelpBox, SessionListBox, SessionHistoryBox, LogConfigBox, ShortcutsBox, SyspromptBox, } from './styled-boxes/index.js';
 import { ToolResultRenderer } from '../renderers/index.js';
 import { MarkdownText } from '../shared/MarkdownText.js';
@@ -36,7 +37,7 @@ function formatDuration(ms) {
  * Memoization with custom comparator prevents re-renders when message array changes
  * but individual message content hasn't changed.
  */
-export const MessageItem = memo(({ message }) => {
+export const MessageItem = memo(({ message, terminalWidth = 80 }) => {
     // Check for styled message first
     if (message.styledType && message.styledData) {
         switch (message.styledType) {
@@ -59,7 +60,7 @@ export const MessageItem = memo(({ message }) => {
                 const tokensStr = data.totalTokens >= 1000
                     ? `, Used ${(data.totalTokens / 1000).toFixed(1)}K tokens`
                     : '';
-                return (_jsx(Box, { marginTop: 1, marginBottom: 1, width: "100%", children: _jsxs(Text, { color: "gray", children: ["\u2500 Worked for ", durationStr, tokensStr, " \u2500"] }) }));
+                return (_jsx(Box, { marginTop: 1, marginBottom: 1, width: terminalWidth, children: _jsxs(Text, { color: "gray", children: ["\u2500 Worked for ", durationStr, tokensStr, " \u2500"] }) }));
             }
             case 'shortcuts':
                 return _jsx(ShortcutsBox, { data: message.styledData });
@@ -68,8 +69,18 @@ export const MessageItem = memo(({ message }) => {
         }
     }
     // User message: '>' prefix with gray background
+    // Properly wrap text accounting for prefix "> " (2 chars) and paddingX={1} (2 chars total)
     if (message.role === 'user') {
-        return (_jsx(Box, { flexDirection: "column", marginTop: 2, marginBottom: 1, width: "100%", children: _jsxs(Box, { flexDirection: "row", paddingX: 1, backgroundColor: "gray", children: [_jsx(Text, { color: "green", children: '> ' }), _jsx(Text, { color: "white", wrap: "wrap", children: message.content })] }) }));
+        const prefix = '> ';
+        const paddingChars = 2; // paddingX={1} = 1 char on each side
+        const availableWidth = Math.max(20, terminalWidth - prefix.length - paddingChars);
+        const wrappedContent = wrapAnsi(message.content, availableWidth, {
+            hard: true,
+            wordWrap: true,
+            trim: false,
+        });
+        const lines = wrappedContent.split('\n');
+        return (_jsx(Box, { flexDirection: "column", marginTop: 2, marginBottom: 1, width: terminalWidth, children: _jsx(Box, { flexDirection: "column", paddingX: 1, backgroundColor: "gray", children: lines.map((line, i) => (_jsxs(Box, { flexDirection: "row", children: [_jsx(Text, { color: "green", children: i === 0 ? prefix : '  ' }), _jsx(Text, { color: "white", children: line })] }, i))) }) }));
     }
     // Assistant message: Gray circle indicator (unless continuation)
     // IMPORTANT: width="100%" is required to prevent Ink layout failures on large content.
@@ -78,12 +89,12 @@ export const MessageItem = memo(({ message }) => {
     if (message.role === 'assistant') {
         // Continuation messages: no indicator, just content
         if (message.isContinuation) {
-            return (_jsx(Box, { flexDirection: "column", width: "100%", children: _jsx(MarkdownText, { children: message.content || '' }) }));
+            return (_jsx(Box, { flexDirection: "column", width: terminalWidth, children: _jsx(MarkdownText, { children: message.content || '' }) }));
         }
         // Regular assistant message: bullet prefix inline with first line
         // Text wraps at terminal width - wrapped lines may start at column 0
         // This is simpler and avoids mid-word splitting issues with Ink's wrap
-        return (_jsx(Box, { flexDirection: "column", marginTop: 1, width: "100%", children: _jsx(MarkdownText, { bulletPrefix: "\u23FA ", children: message.content || '' }) }));
+        return (_jsx(Box, { flexDirection: "column", marginTop: 1, width: terminalWidth, children: _jsx(MarkdownText, { bulletPrefix: "\u23FA ", children: message.content || '' }) }));
     }
     // Tool message: Animated icon based on status
     // - Running: green spinner + "Running..."
@@ -98,10 +109,22 @@ export const MessageItem = memo(({ message }) => {
         const parenIndex = message.content.indexOf('(');
         const toolName = parenIndex > 0 ? message.content.slice(0, parenIndex) : message.content;
         const toolArgs = parenIndex > 0 ? message.content.slice(parenIndex) : '';
-        return (_jsxs(Box, { flexDirection: "column", marginTop: 1, width: "100%", children: [_jsxs(Box, { flexDirection: "row", children: [_jsx(ToolIcon, { status: message.toolStatus || 'finished', isError: message.isError ?? false }), _jsx(Box, { flexGrow: 1, flexShrink: 1, children: _jsxs(Text, { wrap: "wrap", children: [_jsx(Text, { bold: true, children: toolName }), _jsx(Text, { children: toolArgs }), isRunning && _jsx(Text, { color: "green", children: " Running..." }), isPending && _jsx(Text, { color: "yellowBright", children: " Waiting..." })] }) })] }), hasStructuredDisplay ? (_jsx(ToolResultRenderer, { display: message.toolDisplayData, content: message.toolContent })) : (message.toolResult && (_jsx(Box, { flexDirection: "column", children: _jsxs(Text, { color: "gray", children: [" \u23BF ", message.toolResult] }) })))] }));
+        // Build the full tool header text for wrapping
+        const statusSuffix = isRunning ? ' Running...' : isPending ? ' Waiting...' : '';
+        const fullToolText = `${toolName}${toolArgs}${statusSuffix}`;
+        // ToolIcon takes 2 chars ("● "), so available width is terminalWidth - 2
+        const iconWidth = 2;
+        const availableWidth = Math.max(20, terminalWidth - iconWidth);
+        const wrappedToolText = wrapAnsi(fullToolText, availableWidth, {
+            hard: true,
+            wordWrap: true,
+            trim: false,
+        });
+        const toolLines = wrappedToolText.split('\n');
+        return (_jsxs(Box, { flexDirection: "column", marginTop: 1, width: terminalWidth, children: [toolLines.map((line, i) => (_jsxs(Box, { flexDirection: "row", children: [i === 0 ? (_jsx(ToolIcon, { status: message.toolStatus || 'finished', isError: message.isError ?? false })) : (_jsx(Text, { children: '  ' })), _jsx(Text, { children: i === 0 ? (_jsxs(_Fragment, { children: [_jsx(Text, { bold: true, children: line.slice(0, toolName.length) }), _jsx(Text, { children: line.slice(toolName.length) })] })) : (line) })] }, i))), hasStructuredDisplay ? (_jsx(ToolResultRenderer, { display: message.toolDisplayData, content: message.toolContent })) : (message.toolResult && (_jsx(Box, { flexDirection: "column", children: _jsxs(Text, { color: "gray", children: [" \u23BF ", message.toolResult] }) })))] }));
     }
     // System message: Compact gray text
-    return (_jsx(Box, { flexDirection: "column", marginBottom: 1, width: "100%", children: _jsx(Text, { color: "gray", children: message.content }) }));
+    return (_jsx(Box, { flexDirection: "column", marginBottom: 1, width: terminalWidth, children: _jsx(Text, { color: "gray", children: message.content }) }));
 }, 
 // Custom comparator: only re-render if message content actually changed
 (prev, next) => {
@@ -116,6 +139,7 @@ export const MessageItem = memo(({ message }) => {
         prev.message.isContinuation === next.message.isContinuation &&
         prev.message.isError === next.message.isError &&
         prev.message.toolDisplayData === next.message.toolDisplayData &&
-        prev.message.toolContent === next.message.toolContent);
+        prev.message.toolContent === next.message.toolContent &&
+        prev.terminalWidth === next.terminalWidth);
 });
 MessageItem.displayName = 'MessageItem';

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

@@ -94,7 +94,7 @@ export function AlternateBufferCLI({ agent, initialSessionId, startupInfo, onSel
         return () => clearTimeout(timer);
     }, [selectionHintVisible]);
     // Get terminal dimensions - updates on resize
-    const { rows: terminalHeight } = useTerminalSize();
+    const { rows: terminalHeight, columns: terminalWidth } = useTerminalSize();
     // 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)
@@ -119,8 +119,8 @@ export function AlternateBufferCLI({ agent, initialSessionId, startupInfo, onSel
         if (item.type === 'header') {
             return (_jsx(Header, { modelName: session.modelName, sessionId: session.id || undefined, hasActiveSession: session.hasActiveSession, startupInfo: startupInfo }));
         }
-        return _jsx(MessageItem, { message: item.message });
-    }, [session.modelName, session.id, session.hasActiveSession, startupInfo]);
+        return _jsx(MessageItem, { message: item.message, terminalWidth: terminalWidth });
+    }, [session.modelName, session.id, session.hasActiveSession, startupInfo, terminalWidth]);
     // Smart height estimation based on item type and content
     const estimateItemHeight = useCallback((index) => {
         const item = listData[index];

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;AAkBxD,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,2CA2MhB"}
+{"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;AAkBxD,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,2CAoNhB"}

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

@@ -87,9 +87,16 @@ export function StaticCLI({ agent, initialSessionId, startupInfo, useStreaming =
     const staticItems = useMemo(() => {
         const items = [
             _jsx(Header, { modelName: session.modelName, sessionId: session.id || undefined, hasActiveSession: session.hasActiveSession, startupInfo: startupInfo }, "header"),
-            ...visibleMessages.map((msg) => _jsx(MessageItem, { message: msg }, msg.id)),
+            ...visibleMessages.map((msg) => (_jsx(MessageItem, { message: msg, terminalWidth: terminalWidth }, msg.id))),
         ];
         return items;
-    }, [visibleMessages, session.modelName, session.id, session.hasActiveSession, startupInfo]);
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Static, { items: staticItems, children: (item) => item }, staticRemountKey), pendingMessages.map((message) => (_jsx(MessageItem, { message: message }, message.id))), dequeuedBuffer.map((message) => (_jsx(MessageItem, { message: message }, message.id))), _jsxs(Box, { flexDirection: "column", flexShrink: 0, children: [_jsx(StatusBar, { agent: agent, isProcessing: ui.isProcessing, isThinking: ui.isThinking, 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, 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, { modelName: session.modelName, cwd: process.cwd(), autoApproveEdits: ui.autoApproveEdits }), ui.historySearch.isActive && (_jsx(HistorySearchBar, { query: ui.historySearch.query, hasMatch: historySearchHasMatch }))] })] }));
+    }, [
+        visibleMessages,
+        session.modelName,
+        session.id,
+        session.hasActiveSession,
+        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(StatusBar, { agent: agent, isProcessing: ui.isProcessing, isThinking: ui.isThinking, 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, 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, { modelName: session.modelName, cwd: process.cwd(), autoApproveEdits: ui.autoApproveEdits }), ui.historySearch.isActive && (_jsx(HistorySearchBar, { query: ui.historySearch.query, hasMatch: historySearchHasMatch }))] })] }));
 }

package/dist/cli/ink-cli/components/renderers/GenericRenderer.js

@@ -22,5 +22,5 @@ export function GenericRenderer({ content, maxLines = 15 }) {
         const line = lines[0];
         return (_jsxs(Text, { color: "gray", children: ['  ⎿ ', line.slice(0, 80), line.length > 80 ? '...' : ''] }));
     }
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: "gray", children: ['  ⎿ ', displayLines.length, " lines"] }), displayLines.map((line, i) => (_jsxs(Text, { color: "gray", wrap: "truncate", children: ['    ', line] }, i))), truncated && (_jsxs(Text, { color: "gray", children: ['    ', "... ", lines.length - maxLines, " more lines"] }))] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: "gray", children: ['  ⎿ ', displayLines.length, " lines"] }), displayLines.map((line, i) => (_jsxs(Text, { color: "gray", wrap: "truncate", children: ['  ⎿ ', line] }, i))), truncated && (_jsxs(Text, { color: "gray", children: ['  ⎿ ', "... ", lines.length - maxLines, " more lines"] }))] }));
 }

package/dist/cli/ink-cli/components/renderers/SearchRenderer.js

@@ -8,5 +8,5 @@ export function SearchRenderer({ data, maxMatches = 5 }) {
     const { pattern, matches, totalMatches, truncated: dataTruncated } = data;
     const displayMatches = matches.slice(0, maxMatches);
     const truncated = dataTruncated || matches.length > maxMatches;
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: "gray", children: ['  ⎿ ', totalMatches, " match", totalMatches !== 1 ? 'es' : '', " for \"", pattern, "\"", truncated && ' (truncated)'] }), displayMatches.map((match, i) => (_jsxs(Text, { color: "gray", children: ['    ', match.file, match.line > 0 && `:${match.line}`] }, i))), matches.length > maxMatches && (_jsxs(Text, { color: "gray", children: ['    ', "... ", matches.length - maxMatches, " more"] }))] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: "gray", children: ['  ⎿ ', totalMatches, " match", totalMatches !== 1 ? 'es' : '', " for \"", pattern, "\"", truncated && ' (truncated)'] }), displayMatches.map((match, i) => (_jsxs(Text, { color: "gray", wrap: "truncate", children: ['  ⎿ ', match.file, match.line > 0 && `:${match.line}`] }, i))), matches.length > maxMatches && (_jsxs(Text, { color: "gray", children: ['  ⎿ ', "... ", matches.length - maxMatches, " more"] }))] }));
 }

package/dist/cli/ink-cli/components/shared/MarkdownText.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MarkdownText.d.ts","sourceRoot":"","sources":["../../../../../src/cli/ink-cli/components/shared/MarkdownText.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAwB,MAAM,OAAO,CAAC;AAU7C,UAAU,aAAa;IACnB,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,QAAQ,GAAG,eAAe,GAAG,MAAM,GAAG,KAAK,CAAC;IAC7E,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,iBAAS,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,EAAE,CAuE1D;AA0ID,UAAU,iBAAiB;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iEAAiE;IACjE,IAAI,CAAC,EAAE,OAAO,CAAC;CAClB;AAkED,QAAA,MAAM,YAAY,+CAA6B,CAAC;AAMhD,UAAU,iBAAiB;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,yBAAyB;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,yEAAyE;IACzE,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB;AA4RD,eAAO,MAAM,YAAY,+CAA6B,CAAC;AAGvD,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,CAAC"}
+{"version":3,"file":"MarkdownText.d.ts","sourceRoot":"","sources":["../../../../../src/cli/ink-cli/components/shared/MarkdownText.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAwB,MAAM,OAAO,CAAC;AAU7C,UAAU,aAAa;IACnB,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,QAAQ,GAAG,eAAe,GAAG,MAAM,GAAG,KAAK,CAAC;IAC7E,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,iBAAS,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,EAAE,CAuE1D;AAyID,UAAU,iBAAiB;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iEAAiE;IACjE,IAAI,CAAC,EAAE,OAAO,CAAC;CAClB;AAkED,QAAA,MAAM,YAAY,+CAA6B,CAAC;AAMhD,UAAU,iBAAiB;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,yBAAyB;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,yEAAyE;IACzE,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB;AA4RD,eAAO,MAAM,YAAY,+CAA6B,CAAC;AAGvD,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,CAAC"}

package/dist/cli/ink-cli/components/shared/MarkdownText.js

@@ -168,12 +168,12 @@ const WrappedParagraphInternal = ({ text, defaultColor, bulletPrefix, isFirstPar
         return wrapped.split('\n');
     }, [text, defaultColor, bulletPrefix, isFirstParagraph, terminalWidth]);
     // Calculate indent for continuation lines (spaces to align with first line content)
-    const continuationIndent = bulletPrefix && isFirstParagraph ? ' '.repeat(stringWidth(bulletPrefix)) : '';
+    // All lines get indentation when bulletPrefix is provided, for consistent left margin
+    const indentSpaces = bulletPrefix ? ' '.repeat(stringWidth(bulletPrefix)) : '';
     return (_jsx(_Fragment, { children: wrappedLines.map((line, i) => {
             const isFirstLine = i === 0;
-            const prefix = isFirstLine && bulletPrefix && isFirstParagraph
-                ? bulletPrefix
-                : continuationIndent;
+            // First line of first paragraph gets bullet, all other lines get space indent
+            const prefix = isFirstLine && isFirstParagraph && bulletPrefix ? bulletPrefix : indentSpaces;
             return (_jsx(Box, { children: _jsxs(Text, { children: [prefix, line] }) }, i));
         }) }));
 };

package/dist/cli/ink-cli/constants/processingPhrases.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"processingPhrases.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/constants/processingPhrases.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,eAAO,MAAM,iBAAiB,EAAE,MAAM,EAsDrC,CAAC;AAEF;;GAEG;AACH,wBAAgB,eAAe,IAAI,MAAM,CAGxC"}
+{"version":3,"file":"processingPhrases.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/constants/processingPhrases.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,eAAO,MAAM,iBAAiB,EAAE,MAAM,EAiErC,CAAC;AAEF;;GAEG;AACH,wBAAgB,eAAe,IAAI,MAAM,CAGxC"}

package/dist/cli/ink-cli/constants/processingPhrases.js

@@ -4,61 +4,71 @@
  */
 export const processingPhrases = [
     // pop culture
-    'I want to be the very best...',
-    'I will be the next hokage...',
-    'Shinzou Sasageyo...',
-    'My soldiers! Rage!...',
-    'May the force be with you...',
-    'Why so serious?...',
-    "That's what she said ...",
-    'Winter is coming...',
-    "It's over 9000!...",
-    "I'm Batman...",
-    "You can't handle the truth...",
-    'We were on a break!...',
-    'Bazinga!...',
-    "How you doin'?...",
-    "There's always money in the banana stand...",
-    'I am the one who knocks...',
-    'Yabba dabba doo!...',
-    'The tribe has spoken...',
-    'This is the Way...',
-    'Plata o plomo...',
-    'Yeah, science!...',
-    "They're minerals, Marie!...",
-    'The North remembers...',
-    'Life is like a box of chocolates...',
+    'I want to be the very best…',
+    'I will be the next hokage…',
+    'Shinzou Sasageyo…',
+    'My soldiers! Rage!…',
+    'May the force be with you…',
+    'Why so serious?…',
+    "That's what she said …",
+    'Winter is coming…',
+    "It's over 9000!…",
+    "I'm Batman…",
+    "You can't handle the truth…",
+    'We were on a break!…',
+    'Bazinga!…',
+    "How you doin'?…",
+    "There's always money in the banana stand…",
+    'I am the one who knocks…',
+    'Yabba dabba doo!…',
+    'The tribe has spoken…',
+    'This is the Way…',
+    'Plata o plomo…',
+    'Yeah, science!…',
+    "They're minerals, Marie!…",
+    'The North remembers…',
+    'Life is like a box of chocolates…',
     'Avengers, assemble!',
-    'I can do this all day...',
-    'Elementary, my dear Watson...',
-    'Identity theft is not a joke, Jim! ...',
-    "I'm not superstitious, but I am a little stitious...",
+    'I can do this all day…',
+    'Elementary, my dear Watson…',
+    'Identity theft is not a joke, Jim! …',
+    "I'm not superstitious, but I am a little stitious…",
     // Playful
-    'Let me cook...',
-    'Manifesting greatness..',
-    'Rizzing the huzz...',
-    'Memeing...',
-    'Outperforming other AI agents...',
-    'Rolling with the squad...',
-    'Incanting secret scripts...',
-    'Making no mistakes...',
-    'Making you rich...',
-    'Farming easy points...',
-    'Using 200+ IQ...',
-    'Turning into Jarvis...',
-    'Dextomaxxing...',
-    'Zapping...',
-    'Braining...',
-    'Using all 3 brain cells...',
-    //'Installing malware (just kidding)...',
+    'Let me cook…',
+    'Manifesting greatness…',
+    'Rizzing the huzz…',
+    'Memeing…',
+    'Outperforming other AI agents…',
+    'Rolling with the squad…',
+    'Incanting secret scripts…',
+    'Making no mistakes…',
+    'Making you rich…',
+    'Farming easy points…',
+    'Using 200+ IQ…',
+    'Turning into Jarvis…',
+    'Dextomaxxing…',
+    'Zapping…',
+    'Braining…',
+    'Using all 3 brain cells…',
+    //'Installing malware (just kidding)…',
+    // Vines
+    'Look at all those chickens…',
+    'What are those!!?…',
+    'He needs some milk…',
+    'Something came in the mail today…',
+    'Road work ahead? Sure hope it does…',
+    'Merry Chrysler…',
+    "I'm in me mum's car. Broom broom…",
+    'I could have dropped my croissant…',
+    'That was legitness…',
     // Nerdy
-    'Attention is all I need...',
-    'Transformer powers activate...',
+    'Attention is all I need…',
+    'Transformer powers activate…',
 ];
 /**
  * Get a random phrase from the list
  */
 export function getRandomPhrase() {
     const index = Math.floor(Math.random() * processingPhrases.length);
-    return processingPhrases[index] ?? 'Processing...';
+    return processingPhrases[index] ?? 'Processing…';
 }

package/dist/cli/ink-cli/constants/tips.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tips.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/constants/tips.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,eAAO,MAAM,IAAI,EAAE,MAAM,EAuCxB,CAAC;AAEF;;GAEG;AACH,wBAAgB,YAAY,IAAI,MAAM,CAGrC"}
+{"version":3,"file":"tips.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/constants/tips.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,eAAO,MAAM,IAAI,EAAE,MAAM,EAwCxB,CAAC;AAEF;;GAEG;AACH,wBAAgB,YAAY,IAAI,MAAM,CAGrC"}

package/dist/cli/ink-cli/constants/tips.js

@@ -9,45 +9,46 @@
  */
 export const tips = [
     // Command tips
-    'Type /help to see all available commands...',
-    'Use /model to switch between different AI models...',
-    'Use /resume to load a previous conversation...',
-    'Use /search to find messages across all sessions...',
-    'Use /mcp to manage MCP servers...',
-    'Use /tools to see all available tools...',
-    'Use /prompts to browse, add and delete custom prompts...',
-    'Use /log to change logging verbosity...',
-    'Use /clear to clear the screen...',
-    'Use /exit or /quit to close dexto...',
-    'Use /docs to access documentation...',
-    'Use /copy to copy the previous response...',
-    'Use /shortcuts to see all available shortcuts...',
-    'Use /sysprompt to see the current system prompt...',
+    'Type /help to see all available commands…',
+    'Use /model to switch between different AI models…',
+    'Use /resume to load a previous conversation…',
+    'Use /search to find messages across all sessions…',
+    'Use /mcp to manage MCP servers…',
+    'Use /tools to see all available tools…',
+    'Use /prompts to browse, add and delete custom prompts…',
+    'Use /log to change logging verbosity…',
+    'Use /clear to clear the screen…',
+    'Use /exit or /quit to close dexto…',
+    'Use /docs to access documentation…',
+    'Use /copy to copy the previous response…',
+    'Use /shortcuts to see all available shortcuts…',
+    'Use /sysprompt to see the current system prompt…',
     // Keyboard shortcut tips
-    'Press Escape to cancel the current request...',
-    'Press Ctrl+C twice to exit dexto...',
-    'Press Escape to close overlays and menus...',
-    'Use Up/Down arrows to navigate command history...',
-    'Press Enter to submit your message...',
-    'Press Ctrl+T to collapse/expand large pastes...',
-    'Press Ctrl+R to search previous prompts...',
+    'Press Escape to cancel the current request…',
+    'Press Ctrl+C twice to exit dexto…',
+    'Press Escape to close overlays and menus…',
+    'Use Up/Down arrows to navigate command history…',
+    'Press Enter to submit your message…',
+    'Press Ctrl+T to collapse/expand large pastes…',
+    'Press Ctrl+R to search previous prompts…',
     // Feature tips
-    'Paste copied images with Ctrl+V...',
-    'Large pastes are automatically collapsed - press Ctrl+T to toggle...',
-    'Use @ to reference files and resources...',
-    'Type / to see available slash commands...',
-    'MCP servers extend dexto with custom tools...',
-    'Sessions are automatically saved for later...',
-    'You can create custom commands with /prompts...',
-    'You can submit messages while Dexto is processing...',
-    'Use /stream to toggle streaming mode...',
+    'Start with ! to run bash commands directly…',
+    'Paste copied images with Ctrl+V…',
+    'Large pastes are automatically collapsed - press Ctrl+T to toggle…',
+    'Use @ to reference files and resources…',
+    'Type / to see available slash commands…',
+    'MCP servers extend dexto with custom tools…',
+    'Sessions are automatically saved for later…',
+    'You can create custom commands with /prompts…',
+    'You can submit messages while Dexto is processing…',
+    'Use /stream to toggle streaming mode…',
     // Platform tips
-    'On Mac, use Option+Up/Down to jump to start/end of input...',
+    'On Mac, use Option+Up/Down to jump to start/end of input…',
 ];
 /**
  * Get a random tip from the list
  */
 export function getRandomTip() {
     const index = Math.floor(Math.random() * tips.length);
-    return tips[index] ?? 'Type /help to see available commands...';
+    return tips[index] ?? 'Type /help to see available commands…';
 }

package/dist/cli/ink-cli/containers/InputContainer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InputContainer.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/containers/InputContainer.tsx"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAA0E,MAAM,OAAO,CAAC;AAC/F,OAAO,KAAK,EAAE,UAAU,EAAoC,aAAa,EAAE,MAAM,aAAa,CAAC;AAE/F,OAAO,EAAE,YAAY,EAAiB,MAAM,sBAAsB,CAAC;AACnE,OAAO,KAAK,EACR,OAAO,EACP,OAAO,EACP,UAAU,EACV,YAAY,EAGf,MAAM,mBAAmB,CAAC;AAG3B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAMtE,qDAAqD;AACrD,MAAM,WAAW,oBAAoB;IACjC,yEAAyE;IACzE,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3C;AAED,UAAU,mBAAmB;IACzB,yCAAyC;IACzC,MAAM,EAAE,UAAU,CAAC;IACnB,KAAK,EAAE,UAAU,CAAC;IAClB,EAAE,EAAE,OAAO,CAAC;IACZ,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,eAAe,GAAG,IAAI,CAAC;IACjC,8CAA8C;IAC9C,cAAc,EAAE,aAAa,EAAE,CAAC;IAChC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;IAC3D,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACrD,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/D,2DAA2D;IAC3D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC7D,mEAAmE;IACnE,kBAAkB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACpE,iFAAiF;IACjF,iBAAiB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACnE,iCAAiC;IACjC,iBAAiB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;IACzE,8EAA8E;IAC9E,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1E,yEAAyE;IACzE,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;IAC1E,KAAK,EAAE,UAAU,CAAC;IAClB,YAAY,EAAE,YAAY,CAAC;IAC3B,mEAAmE;IACnE,gBAAgB,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,GAAG,MAAM,KAAK,IAAI,CAAC;IACtD,6EAA6E;IAC7E,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,kGA8qB1B,CAAC"}
+{"version":3,"file":"InputContainer.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/containers/InputContainer.tsx"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAA0E,MAAM,OAAO,CAAC;AAC/F,OAAO,KAAK,EAAE,UAAU,EAAoC,aAAa,EAAE,MAAM,aAAa,CAAC;AAE/F,OAAO,EAAE,YAAY,EAAiB,MAAM,sBAAsB,CAAC;AACnE,OAAO,KAAK,EACR,OAAO,EACP,OAAO,EACP,UAAU,EACV,YAAY,EAGf,MAAM,mBAAmB,CAAC;AAG3B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAMtE,qDAAqD;AACrD,MAAM,WAAW,oBAAoB;IACjC,yEAAyE;IACzE,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3C;AAED,UAAU,mBAAmB;IACzB,yCAAyC;IACzC,MAAM,EAAE,UAAU,CAAC;IACnB,KAAK,EAAE,UAAU,CAAC;IAClB,EAAE,EAAE,OAAO,CAAC;IACZ,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,eAAe,GAAG,IAAI,CAAC;IACjC,8CAA8C;IAC9C,cAAc,EAAE,aAAa,EAAE,CAAC;IAChC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;IAC3D,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACrD,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/D,2DAA2D;IAC3D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC7D,mEAAmE;IACnE,kBAAkB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACpE,iFAAiF;IACjF,iBAAiB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACnE,iCAAiC;IACjC,iBAAiB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;IACzE,8EAA8E;IAC9E,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1E,yEAAyE;IACzE,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;IAC1E,KAAK,EAAE,UAAU,CAAC;IAClB,YAAY,EAAE,YAAY,CAAC;IAC3B,mEAAmE;IACnE,gBAAgB,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,GAAG,MAAM,KAAK,IAAI,CAAC;IACtD,6EAA6E;IAC7E,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,kGAqrB1B,CAAC"}

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

@@ -126,18 +126,25 @@ export const InputContainer = forwardRef(function InputContainer({ buffer, input
         ui.isProcessing,
     ]);
     // Handle overlay triggers
+    // Allow triggers while processing (for queuing), but not during approval
+    // IMPORTANT: Use functional updates to check prev.activeOverlay, not the closure value.
+    // This avoids race conditions when open/close happen in quick succession (React batching).
     const handleTriggerOverlay = useCallback((trigger) => {
-        if (ui.isProcessing || approval)
+        if (approval)
             return;
         if (trigger === 'close') {
-            if (ui.activeOverlay === 'slash-autocomplete' ||
-                ui.activeOverlay === 'resource-autocomplete') {
-                setUi((prev) => ({
-                    ...prev,
-                    activeOverlay: 'none',
-                    mcpWizardServerType: null,
-                }));
-            }
+            // Use functional update to check the ACTUAL current state, not stale closure
+            setUi((prev) => {
+                if (prev.activeOverlay === 'slash-autocomplete' ||
+                    prev.activeOverlay === 'resource-autocomplete') {
+                    return {
+                        ...prev,
+                        activeOverlay: 'none',
+                        mcpWizardServerType: null,
+                    };
+                }
+                return prev;
+            });
         }
         else if (trigger === 'slash-autocomplete') {
             setUi((prev) => ({ ...prev, activeOverlay: 'slash-autocomplete' }));
@@ -145,7 +152,7 @@ export const InputContainer = forwardRef(function InputContainer({ buffer, input
         else if (trigger === 'resource-autocomplete') {
             setUi((prev) => ({ ...prev, activeOverlay: 'resource-autocomplete' }));
         }
-    }, [setUi, ui.isProcessing, ui.activeOverlay, approval]);
+    }, [setUi, approval]);
     // Handle image paste from clipboard
     const handleImagePaste = useCallback((image) => {
         // Track image attachment analytics (only if session exists)
@@ -558,7 +565,7 @@ export const InputContainer = forwardRef(function InputContainer({ buffer, input
     // Note: slash-autocomplete handles its own Enter key (either executes command or submits raw text)
     const shouldHandleSubmit = ui.activeOverlay === 'none' || ui.activeOverlay === 'approval';
     // Allow history navigation when not blocked by approval/overlay
-    // When processing: handler allows queue editing but blocks history navigation
+    // Allow during processing so users can browse previous prompts while agent runs
     const canNavigateHistory = !approval && ui.activeOverlay === 'none';
     const placeholder = approval
         ? 'Approval required above...'

package/dist/cli/ink-cli/containers/OverlayContainer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OverlayContainer.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/containers/OverlayContainer.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAyE,MAAM,OAAO,CAAC;AAE9F,OAAO,KAAK,EAAE,UAAU,EAAmD,MAAM,aAAa,CAAC;AAC/F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kCAAkC,CAAC;AAE5D,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACpF,OAAO,EAGH,KAAK,eAAe,EACvB,MAAM,iCAAiC,CAAC;AA0EzC,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAK3D,MAAM,WAAW,sBAAsB;IACnC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAED,UAAU,qBAAqB;IAC3B,EAAE,EAAE,OAAO,CAAC;IACZ,KAAK,EAAE,UAAU,CAAC;IAClB,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,eAAe,GAAG,IAAI,CAAC;IACjC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;IAC3D,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACrD,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC7D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1E,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;IAC1E,KAAK,EAAE,UAAU,CAAC;IAClB,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,EAAE,UAAU,CAAC;IACnB,8EAA8E;IAC9E,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,4EAA4E;IAC5E,qBAAqB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAClE;AAED;;;GAGG;AACH,eAAO,MAAM,gBAAgB,sGAm1D5B,CAAC"}
+{"version":3,"file":"OverlayContainer.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/containers/OverlayContainer.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAyE,MAAM,OAAO,CAAC;AAE9F,OAAO,KAAK,EAAE,UAAU,EAAmD,MAAM,aAAa,CAAC;AAC/F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kCAAkC,CAAC;AAE5D,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACpF,OAAO,EAGH,KAAK,eAAe,EACvB,MAAM,iCAAiC,CAAC;AA0EzC,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAK3D,MAAM,WAAW,sBAAsB;IACnC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAED,UAAU,qBAAqB;IAC3B,EAAE,EAAE,OAAO,CAAC;IACZ,KAAK,EAAE,UAAU,CAAC;IAClB,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,eAAe,GAAG,IAAI,CAAC;IACjC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;IAC3D,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACrD,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC7D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1E,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;IAC1E,KAAK,EAAE,UAAU,CAAC;IAClB,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,EAAE,UAAU,CAAC;IACnB,8EAA8E;IAC9E,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,4EAA4E;IAC5E,qBAAqB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAClE;AAED;;;GAGG;AACH,eAAO,MAAM,gBAAgB,sGA+2D5B,CAAC"}

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

@@ -5,7 +5,7 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
  */
 import { useCallback, useRef, useImperativeHandle, forwardRef, useState } from 'react';
 import { Box } from 'ink';
-import { ApprovalStatus, DenialReason } from '@dexto/core';
+import { ApprovalStatus, DenialReason, isUserMessage } from '@dexto/core';
 import { ApprovalPrompt, } from '../components/ApprovalPrompt.js';
 import { SlashCommandAutocomplete, } from '../components/SlashCommandAutocomplete.js';
 import ResourceAutocomplete from '../components/ResourceAutocomplete.js';
@@ -446,6 +446,29 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
             if (history && history.length > 0) {
                 const historyMessages = convertHistoryToUIMessages(history, newSessionId);
                 setMessages(historyMessages);
+                // Extract user messages for input history (arrow up navigation)
+                const userInputHistory = history
+                    .filter(isUserMessage)
+                    .map((msg) => {
+                    // Extract text content from user message
+                    if (typeof msg.content === 'string') {
+                        return msg.content;
+                    }
+                    // Handle array content (text parts)
+                    if (Array.isArray(msg.content)) {
+                        return msg.content
+                            .filter((part) => typeof part === 'object' && part.type === 'text')
+                            .map((part) => part.text)
+                            .join('\n');
+                    }
+                    return '';
+                })
+                    .filter((text) => text.trim().length > 0);
+                setInput((prev) => ({
+                    ...prev,
+                    history: userInputHistory,
+                    historyIndex: -1,
+                }));
             }
             setMessages((prev) => [
                 ...prev,

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

@@ -1 +1 @@
-{"version":3,"file":"useCLIState.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/hooks/useCLIState.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useCLIState.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/hooks/useCLIState.ts"],"names":[],"mappings":"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"}

package/dist/cli/ink-cli/hooks/useCLIState.js

@@ -6,7 +6,7 @@
  */
 import { useState, useMemo, useEffect, useRef, useCallback } from 'react';
 import { useStdout } from 'ink';
-import { getModelDisplayName } from '@dexto/core';
+import { getModelDisplayName, isUserMessage, } from '@dexto/core';
 import { useAgentEvents } from './useAgentEvents.js';
 import { useInputOrchestrator } from './useInputOrchestrator.js';
 import { InputService, MessageService } from '../services/index.js';
@@ -140,6 +140,19 @@ export function useCLIState({ agent, initialSessionId, startupInfo, onKeyboardSc
                     return;
                 const historyMessages = convertHistoryToUIMessages(history, initialSessionId);
                 setMessages(historyMessages);
+                // Extract user messages for input history (arrow up navigation)
+                const userInputHistory = history
+                    .filter(isUserMessage)
+                    .map((msg) => msg.content
+                    .filter((part) => part.type === 'text')
+                    .map((part) => part.text)
+                    .join('\n'))
+                    .filter((text) => text.trim().length > 0);
+                setInput((prev) => ({
+                    ...prev,
+                    history: userInputHistory,
+                    historyIndex: -1,
+                }));
             }
             catch (error) {
                 if (cancelled)

package/dist/cli/ink-cli/utils/messageFormatting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messageFormatting.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/utils/messageFormatting.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,eAAe,EAAe,MAAM,aAAa,CAAC;AAE5E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAGjD;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,GAAE,MAAsB,GAAG,MAAM,CAmB1F;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAChC,YAAY,EAAE,MAAM,EACpB,QAAQ,GAAE,MAAW,EACrB,GAAG,GAAE,MAAsB,GAC5B,MAAM,CAWR;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAiC7E;AAyED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CA6B3D;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CA8BzD;AA8BD;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CA0EhG;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CACjC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,SAAS,GAAE,MAAW,GACvB,MAAM,CAeR;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAO1D;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CASvF;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAO5D;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,GAAG,OAAO,CAQjE;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAO3D;AAED;;GAEG;AACH,wBAAgB,sBAAsB,IAAI,OAAO,CAQhD;AAgBD;;GAEG;AACH,wBAAgB,0BAA0B,CACtC,OAAO,EAAE,eAAe,EAAE,EAC1B,SAAS,EAAE,MAAM,GAClB,OAAO,EAAE,CAmBX;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,KAAK,EAAE,UAAU;;;;;;;;GAiBrD"}
+{"version":3,"file":"messageFormatting.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/utils/messageFormatting.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,eAAe,EAAyB,MAAM,aAAa,CAAC;AAEtF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAGjD;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,GAAE,MAAsB,GAAG,MAAM,CAmB1F;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAChC,YAAY,EAAE,MAAM,EACpB,QAAQ,GAAE,MAAW,EACrB,GAAG,GAAE,MAAsB,GAC5B,MAAM,CAWR;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAiC7E;AAyED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CA6B3D;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CA8BzD;AA8BD;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CA0EhG;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CACjC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,SAAS,GAAE,MAAW,GACvB,MAAM,CAeR;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAO1D;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CASvF;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAO5D;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,GAAG,OAAO,CAQjE;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAO3D;AAED;;GAEG;AACH,wBAAgB,sBAAsB,IAAI,OAAO,CAQhD;AAqCD;;GAEG;AACH,wBAAgB,0BAA0B,CACtC,OAAO,EAAE,eAAe,EAAE,EAC1B,SAAS,EAAE,MAAM,GAClB,OAAO,EAAE,CAgGX;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,KAAK,EAAE,UAAU;;;;;;;;GAiBrD"}

package/dist/cli/ink-cli/utils/messageFormatting.js

@@ -4,7 +4,7 @@
  */
 import path from 'path';
 import os from 'os';
-import { isTextPart } from '@dexto/core';
+import { isTextPart, isAssistantMessage, isToolMessage } from '@dexto/core';
 import { generateMessageId } from './idGenerator.js';
 /**
  * Convert absolute path to display-friendly relative path.
@@ -245,9 +245,9 @@ export function formatToolArgsForDisplay(toolName, args) {
      */
     const formatArgValue = (argName, value) => {
         const strValue = typeof value === 'string' ? value : JSON.stringify(value);
-        // File paths: use relative path + center-truncation
+        // File paths: use relative path (no truncation)
         if (PATH_ARGS.has(argName)) {
-            return formatPathForDisplay(strValue);
+            return makeRelativePath(strValue);
         }
         // Commands: show single-line in full, truncate multi-line (heredocs) to first line
         if (argName === 'command') {
@@ -407,13 +407,100 @@ function extractTextContent(content) {
         .map((part) => part.text)
         .join('\n');
 }
+/**
+ * Generates a preview of tool result content for display
+ */
+function generateToolResultPreview(content) {
+    const textContent = extractTextContent(content);
+    if (!textContent)
+        return '';
+    const lines = textContent.split('\n');
+    const previewLines = lines.slice(0, 5);
+    let preview = previewLines.join('\n');
+    // Truncate if too long
+    if (preview.length > 400) {
+        preview = preview.slice(0, 397) + '...';
+    }
+    else if (lines.length > 5) {
+        preview += '\n...';
+    }
+    return preview;
+}
 /**
  * Converts session history messages to UI messages
  */
 export function convertHistoryToUIMessages(history, sessionId) {
     const uiMessages = [];
+    // Build a map of toolCallId -> ToolCall for looking up tool call args
+    const toolCallMap = new Map();
+    for (const msg of history) {
+        if (isAssistantMessage(msg) && msg.toolCalls) {
+            for (const toolCall of msg.toolCalls) {
+                toolCallMap.set(toolCall.id, toolCall);
+            }
+        }
+    }
     history.forEach((msg, index) => {
-        // Extract text content properly
+        const timestamp = new Date(msg.timestamp ?? Date.now() - (history.length - index) * 1000);
+        // Handle tool messages specially
+        if (isToolMessage(msg)) {
+            // Look up the original tool call to get args
+            const toolCall = toolCallMap.get(msg.toolCallId);
+            // Format tool name
+            const displayName = getToolDisplayName(msg.name);
+            // Format args if we have them
+            let toolContent = displayName;
+            if (toolCall) {
+                try {
+                    const args = JSON.parse(toolCall.function.arguments || '{}');
+                    const argsFormatted = formatToolArgsForDisplay(msg.name, args);
+                    if (argsFormatted) {
+                        toolContent = `${displayName}(${argsFormatted})`;
+                    }
+                }
+                catch {
+                    // Ignore JSON parse errors
+                }
+            }
+            // Add tool type badge
+            const badge = getToolTypeBadge(msg.name);
+            if (badge) {
+                toolContent = `${toolContent} [${badge}]`;
+            }
+            // Generate result preview
+            const resultPreview = generateToolResultPreview(msg.content);
+            uiMessages.push({
+                id: `session-${sessionId}-${index}`,
+                role: 'tool',
+                content: toolContent,
+                timestamp,
+                toolStatus: 'finished',
+                toolResult: resultPreview,
+                isError: msg.success === false,
+                // Store content parts for potential rich rendering
+                toolContent: msg.content,
+                // Restore structured display data for rich rendering (diffs, shell output, etc.)
+                ...(msg.displayData !== undefined && {
+                    toolDisplayData: msg.displayData,
+                }),
+            });
+            return;
+        }
+        // Handle assistant messages - skip those with only tool calls (no text content)
+        if (isAssistantMessage(msg)) {
+            const textContent = extractTextContent(msg.content);
+            // Skip if no text content (message was just tool calls)
+            if (!textContent)
+                return;
+            uiMessages.push({
+                id: `session-${sessionId}-${index}`,
+                role: 'assistant',
+                content: textContent,
+                timestamp,
+            });
+            return;
+        }
+        // Handle other messages (user, system)
         const textContent = extractTextContent(msg.content);
         // Skip empty messages
         if (!textContent)
@@ -422,7 +509,7 @@ export function convertHistoryToUIMessages(history, sessionId) {
             id: `session-${sessionId}-${index}`,
             role: msg.role,
             content: textContent,
-            timestamp: new Date(msg.timestamp ?? Date.now() - (history.length - index) * 1000),
+            timestamp,
         });
     });
     return uiMessages;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dexto",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "type": "module",
   "bin": {
     "dexto": "./dist/index.js"
@@ -40,12 +40,12 @@
     "ws": "^8.18.1",
     "yaml": "^2.7.1",
     "zod": "^3.25.0",
-    "@dexto/agent-management": "1.5.1",
-    "@dexto/analytics": "1.5.1",
-    "@dexto/core": "1.5.1",
-    "@dexto/image-local": "1.5.1",
-    "@dexto/registry": "1.5.1",
-    "@dexto/server": "1.5.1"
+    "@dexto/agent-management": "1.5.2",
+    "@dexto/analytics": "1.5.2",
+    "@dexto/core": "1.5.2",
+    "@dexto/image-local": "1.5.2",
+    "@dexto/registry": "1.5.2",
+    "@dexto/server": "1.5.2"
   },
   "devDependencies": {
     "@types/react": "^19.0.0",