wave-code 0.0.4 → 0.0.6

package/README.md

@@ -51,8 +51,8 @@ export LOG_FILE="/path/to/your/logfile.log"
 # Maximum log file size (optional, defaults to 10MB)
 export LOG_MAX_FILE_SIZE="10485760"
 
-# Token limit (optional, defaults to 64000)
-export TOKEN_LIMIT="64000"
+# Token limit (optional, defaults to 96000)
+export TOKEN_LIMIT="96000"
 
 ```
 

package/dist/components/ChatInterface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ChatInterface.d.ts","sourceRoot":"","sources":["../../src/components/ChatInterface.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAC;AAOjD,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAgFjC,CAAC"}
+{"version":3,"file":"ChatInterface.d.ts","sourceRoot":"","sources":["../../src/components/ChatInterface.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAM1B,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAmDjC,CAAC"}

package/dist/components/ChatInterface.js

@@ -1,31 +1,11 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useRef, useEffect } from "react";
 import { Box } from "ink";
 import { MessageList } from "./MessageList.js";
 import { InputBox } from "./InputBox.js";
 import { useChat } from "../contexts/useChat.js";
 export const ChatInterface = () => {
-    const { messages, isLoading, isCommandRunning, userInputHistory, isCompressing, sendMessage, abortMessage, saveMemory, mcpServers, connectMcpServer, disconnectMcpServer, isExpanded, latestTotalTokens, slashCommands, hasSlashCommand, } = useChat();
-    // Create a ref to store messages in expanded mode
-    const expandedMessagesRef = useRef([]);
-    useEffect(() => {
-        // Only sync when collapsed
-        if (!isExpanded) {
-            expandedMessagesRef.current = messages.map((message, index) => {
-                // If it's the last message, deep copy its blocks
-                if (index === messages.length - 1) {
-                    return {
-                        ...message,
-                        blocks: message.blocks.map((block) => ({ ...block })),
-                    };
-                }
-                return message;
-            });
-        }
-    }, [isExpanded, messages]);
-    return (_jsxs(Box, { flexDirection: "column", height: "100%", children: [_jsx(Box, { flexGrow: 1, flexDirection: "column", paddingX: 1, children: isExpanded ? (
-                // Expanded mode uses messages from ref, loading and tokens are hardcoded to false and 0
-                _jsx(MessageList, { messages: expandedMessagesRef.current, isLoading: false, isCommandRunning: false, latestTotalTokens: 0, isExpanded: true })) : (
-                // Normal mode uses real-time state
-                _jsx(MessageList, { messages: messages, isLoading: isLoading, isCommandRunning: isCommandRunning, isCompressing: isCompressing, latestTotalTokens: latestTotalTokens, isExpanded: false })) }), !isExpanded && (_jsx(InputBox, { isLoading: isLoading, isCommandRunning: isCommandRunning, userInputHistory: userInputHistory, sendMessage: sendMessage, abortMessage: abortMessage, saveMemory: saveMemory, mcpServers: mcpServers, connectMcpServer: connectMcpServer, disconnectMcpServer: disconnectMcpServer, slashCommands: slashCommands, hasSlashCommand: hasSlashCommand }))] }));
+    const { messages, isLoading, isCommandRunning, userInputHistory, isCompressing, sendMessage, abortMessage, saveMemory, mcpServers, connectMcpServer, disconnectMcpServer, isExpanded, sessionId, latestTotalTokens, slashCommands, hasSlashCommand, } = useChat();
+    if (!sessionId)
+        return null;
+    return (_jsxs(Box, { flexDirection: "column", height: "100%", paddingY: 1, children: [_jsx(MessageList, { messages: messages, isLoading: isLoading, isCommandRunning: isCommandRunning, isCompressing: isCompressing, latestTotalTokens: latestTotalTokens, isExpanded: isExpanded }, String(isExpanded) + sessionId), !isExpanded && (_jsx(InputBox, { isLoading: isLoading, isCommandRunning: isCommandRunning, userInputHistory: userInputHistory, sendMessage: sendMessage, abortMessage: abortMessage, saveMemory: saveMemory, mcpServers: mcpServers, connectMcpServer: connectMcpServer, disconnectMcpServer: disconnectMcpServer, slashCommands: slashCommands, hasSlashCommand: hasSlashCommand }))] }));
 };

package/dist/components/CommandSelector.js

@@ -22,12 +22,12 @@ export const CommandSelector = ({ searchQuery, onSelect, onInsert, onCancel, com
     const allCommands = [...commands, ...AVAILABLE_COMMANDS];
     // Filter command list
     const filteredCommands = allCommands.filter((command) => !searchQuery ||
-        command.name.toLowerCase().includes(searchQuery.toLowerCase()));
+        command.id.toLowerCase().includes(searchQuery.toLowerCase()));
     useInput((input, key) => {
         if (key.return) {
             if (filteredCommands.length > 0 &&
                 selectedIndex < filteredCommands.length) {
-                const selectedCommand = filteredCommands[selectedIndex].name;
+                const selectedCommand = filteredCommands[selectedIndex].id;
                 onSelect(selectedCommand);
             }
             return;
@@ -35,7 +35,7 @@ export const CommandSelector = ({ searchQuery, onSelect, onInsert, onCancel, com
         if (key.tab && onInsert) {
             if (filteredCommands.length > 0 &&
                 selectedIndex < filteredCommands.length) {
-                const selectedCommand = filteredCommands[selectedIndex].name;
+                const selectedCommand = filteredCommands[selectedIndex].id;
                 onInsert(selectedCommand);
             }
             return;
@@ -56,5 +56,5 @@ export const CommandSelector = ({ searchQuery, onSelect, onInsert, onCancel, com
     if (filteredCommands.length === 0) {
         return (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: "yellow", padding: 1, marginBottom: 1, children: [_jsxs(Text, { color: "yellow", children: ["No commands found for \"", searchQuery, "\""] }), _jsx(Text, { dimColor: true, children: "Press Escape to cancel" })] }));
     }
-    return (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: "magenta", padding: 1, gap: 1, marginBottom: 1, children: [_jsx(Box, { children: _jsxs(Text, { color: "magenta", bold: true, children: ["Command Selector ", searchQuery && `(filtering: "${searchQuery}")`] }) }), filteredCommands.map((command, index) => (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: index === selectedIndex ? "black" : "white", backgroundColor: index === selectedIndex ? "magenta" : undefined, children: [index === selectedIndex ? "▶ " : "  ", "/", command.name] }), index === selectedIndex && (_jsx(Box, { marginLeft: 4, children: _jsx(Text, { color: "gray", dimColor: true, children: command.description }) }))] }, command.name))), _jsx(Box, { children: _jsxs(Text, { dimColor: true, children: ["\u2191\u2193 navigate \u2022 Enter execute \u2022 ", onInsert ? "Tab insert • " : "", "Esc cancel"] }) })] }));
+    return (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: "magenta", padding: 1, gap: 1, marginBottom: 1, children: [_jsx(Box, { children: _jsxs(Text, { color: "magenta", bold: true, children: ["Command Selector ", searchQuery && `(filtering: "${searchQuery}")`] }) }), filteredCommands.map((command, index) => (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: index === selectedIndex ? "black" : "white", backgroundColor: index === selectedIndex ? "magenta" : undefined, children: [index === selectedIndex ? "▶ " : "  ", "/", command.id] }), index === selectedIndex && (_jsx(Box, { marginLeft: 4, children: _jsx(Text, { color: "gray", dimColor: true, children: command.description }) }))] }, command.id))), _jsx(Box, { children: _jsxs(Text, { dimColor: true, children: ["\u2191\u2193 navigate \u2022 Enter execute \u2022 ", onInsert ? "Tab insert • " : "", "Esc cancel"] }) })] }));
 };

package/dist/components/DiffViewer.d.ts

@@ -2,7 +2,7 @@ import React from "react";
 import type { DiffBlock } from "wave-agent-sdk";
 interface DiffViewerProps {
     block: DiffBlock;
-    isExpanded?: boolean;
+    isStatic?: boolean;
 }
 export declare const DiffViewer: React.FC<DiffViewerProps>;
 export {};

package/dist/components/DiffViewer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DiffViewer.d.ts","sourceRoot":"","sources":["../../src/components/DiffViewer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAC;AAGvC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,UAAU,eAAe;IACvB,KAAK,EAAE,SAAS,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAwCD,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAgRhD,CAAC"}
+{"version":3,"file":"DiffViewer.d.ts","sourceRoot":"","sources":["../../src/components/DiffViewer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAC;AAGvC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,UAAU,eAAe;IACvB,KAAK,EAAE,SAAS,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAwCD,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAkRhD,CAAC"}

package/dist/components/DiffViewer.js

@@ -22,7 +22,7 @@ const renderWordLevelDiff = (removedLine, addedLine) => {
     });
     return { removedParts, addedParts };
 };
-export const DiffViewer = ({ block, isExpanded = false, }) => {
+export const DiffViewer = ({ block, isStatic = true, }) => {
     const { diffResult } = block;
     const diffLines = useMemo(() => {
         if (!diffResult)
@@ -183,24 +183,24 @@ export const DiffViewer = ({ block, isExpanded = false, }) => {
         });
         // Handle remaining deleted lines at the end
         flushPendingLines();
-        // Only limit displayed lines in collapsed state
-        if (!isExpanded) {
-            const MAX_DISPLAY_LINES = 50;
-            if (lines.length > MAX_DISPLAY_LINES) {
-                const truncatedLines = lines.slice(0, MAX_DISPLAY_LINES);
-                truncatedLines.push({
-                    content: `... (${lines.length - MAX_DISPLAY_LINES} more lines truncated, press Ctrl+O to expand)`,
-                    type: "separator",
-                });
-                return truncatedLines;
-            }
-        }
         return lines;
-    }, [diffResult, isExpanded]);
+    }, [diffResult]);
+    // Truncate to last 10 lines for non-static items
+    const displayLines = useMemo(() => {
+        if (isStatic) {
+            return diffLines;
+        }
+        const MAX_LINES = 10;
+        if (diffLines.length <= MAX_LINES) {
+            return diffLines;
+        }
+        return diffLines.slice(-MAX_LINES);
+    }, [diffLines, isStatic]);
     if (!diffResult || diffResult.length === 0) {
         return (_jsx(Box, { flexDirection: "column", children: _jsx(Text, { color: "gray", children: "No changes detected" }) }));
     }
-    return (_jsx(Box, { flexDirection: "column", children: _jsx(Box, { flexDirection: "column", children: _jsx(Box, { flexDirection: "column", children: diffLines.map((line, index) => {
+    // Show traditional diff view
+    return (_jsx(Box, { flexDirection: "column", children: _jsx(Box, { flexDirection: "column", children: _jsx(Box, { flexDirection: "column", children: displayLines.map((line, index) => {
                     // If has word-level diff, render special effects
                     if (line.wordDiff) {
                         const prefix = line.type === "removed" ? "- " : "+ ";

package/dist/components/FileSelector.js

@@ -4,7 +4,7 @@ import { Box, Text, useInput } from "ink";
 export const FileSelector = ({ files, searchQuery, onSelect, onCancel, }) => {
     const [selectedIndex, setSelectedIndex] = useState(0);
     useInput((input, key) => {
-        if (key.return) {
+        if (key.return || key.tab) {
             if (files.length > 0 && selectedIndex < files.length) {
                 onSelect(files[selectedIndex].path);
             }
@@ -44,5 +44,5 @@ export const FileSelector = ({ files, searchQuery, onSelect, onCancel, }) => {
                 const isSelected = actualIndex === selectedIndex;
                 const icon = fileItem.type === "directory" ? "📁" : "📄";
                 return (_jsx(Box, { children: _jsxs(Text, { color: isSelected ? "black" : "white", backgroundColor: isSelected ? "cyan" : undefined, children: ["  ", icon, " ", fileItem.path] }) }, fileItem.path));
-            }), endIndex < files.length && (_jsxs(Text, { dimColor: true, children: ["... ", files.length - endIndex, " more files below"] })), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { dimColor: true, children: "Use \u2191\u2193 to navigate, Enter to select, Escape to cancel" }), _jsxs(Text, { dimColor: true, children: ["File ", selectedIndex + 1, " of ", files.length] })] })] }));
+            }), endIndex < files.length && (_jsxs(Text, { dimColor: true, children: ["... ", files.length - endIndex, " more files below"] })), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { dimColor: true, children: "Use \u2191\u2193 to navigate, Enter/Tab to select, Escape to cancel" }), _jsxs(Text, { dimColor: true, children: ["File ", selectedIndex + 1, " of ", files.length] })] })] }));
 };

package/dist/components/InputBox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InputBox.d.ts","sourceRoot":"","sources":["../../src/components/InputBox.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAgC,MAAM,OAAO,CAAC;AAgBrD,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEpE,eAAO,MAAM,sBAAsB,yGACqE,CAAC;AAEzG,eAAO,MAAM,6BAA6B,QAGzC,CAAC;AAEF,MAAM,WAAW,aAAa;IAC5B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,WAAW,CAAC,EAAE,CACZ,OAAO,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,KAC/C,IAAI,CAAC;IACV,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAC1B,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1E,UAAU,CAAC,EAAE,eAAe,EAAE,CAAC;IAC/B,gBAAgB,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5D,mBAAmB,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAE/D,aAAa,CAAC,EAAE,YAAY,EAAE,CAAC;IAC/B,eAAe,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC;CAClD;AAED,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,aAAa,CAuQ5C,CAAC"}
+{"version":3,"file":"InputBox.d.ts","sourceRoot":"","sources":["../../src/components/InputBox.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6B,MAAM,OAAO,CAAC;AAWlD,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEpE,eAAO,MAAM,sBAAsB,yGACqE,CAAC;AAEzG,eAAO,MAAM,6BAA6B,QAGzC,CAAC;AAEF,MAAM,WAAW,aAAa;IAC5B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,WAAW,CAAC,EAAE,CACZ,OAAO,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,KAC/C,IAAI,CAAC;IACV,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAC1B,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1E,UAAU,CAAC,EAAE,eAAe,EAAE,CAAC;IAC/B,gBAAgB,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5D,mBAAmB,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAE/D,aAAa,CAAC,EAAE,YAAY,EAAE,CAAC;IAC/B,eAAe,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC;CAClD;AAED,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,aAAa,CAiL5C,CAAC"}

package/dist/components/InputBox.js

@@ -1,118 +1,59 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import { useState, useCallback } from "react";
+import { useEffect, useMemo } from "react";
 import { Box, Text } from "ink";
+import { useInput } from "ink";
 import { FileSelector } from "./FileSelector.js";
 import { CommandSelector } from "./CommandSelector.js";
 import { BashHistorySelector } from "./BashHistorySelector.js";
 import { MemoryTypeSelector } from "./MemoryTypeSelector.js";
 import { BashShellManager } from "./BashShellManager.js";
 import { McpManager } from "./McpManager.js";
-import { useInputState } from "../hooks/useInputState.js";
-import { useFileSelector } from "../hooks/useFileSelector.js";
-import { useCommandSelector } from "../hooks/useCommandSelector.js";
-import { useBashHistorySelector } from "../hooks/useBashHistorySelector.js";
-import { useMemoryTypeSelector } from "../hooks/useMemoryTypeSelector.js";
-import { useInputHistory } from "../hooks/useInputHistory.js";
-import { useInputKeyboardHandler } from "../hooks/useInputKeyboardHandler.js";
-import { useImageManager } from "../hooks/useImageManager.js";
+import { useInputManager } from "../hooks/useInputManager.js";
 export const INPUT_PLACEHOLDER_TEXT = "Type your message (use @ to reference files, / for commands, ! for bash history, # to add memory)...";
 export const INPUT_PLACEHOLDER_TEXT_PREFIX = INPUT_PLACEHOLDER_TEXT.substring(0, 10);
 export const InputBox = ({ isLoading = false, isCommandRunning = false, workdir, userInputHistory = [], sendMessage = () => { }, abortMessage = () => { }, saveMemory = async () => { }, mcpServers = [], connectMcpServer = async () => false, disconnectMcpServer = async () => false, slashCommands = [], hasSlashCommand = () => false, }) => {
-    // Get current working directory
-    const currentWorkdir = workdir || process.cwd();
-    // Bash shell manager state
-    const [showBashManager, setShowBashManager] = useState(false);
-    // MCP manager state
-    const [showMcpManager, setShowMcpManager] = useState(false);
-    // Basic input state
-    const { inputText, setInputText, cursorPosition, setCursorPosition, insertTextAtCursor, deleteCharAtCursor, clearInput, moveCursorLeft, moveCursorRight, moveCursorToStart, moveCursorToEnd, } = useInputState();
-    // File selector functionality
-    const { showFileSelector, filteredFiles, searchQuery, activateFileSelector, handleFileSelect: handleFileSelectorSelect, handleCancelFileSelect, updateSearchQuery, checkForAtDeletion, atPosition, } = useFileSelector();
-    // Command selector functionality
-    const { showCommandSelector, commandSearchQuery, activateCommandSelector, handleCommandSelect: handleCommandSelectorSelect, handleCommandInsert: handleCommandSelectorInsert, handleCancelCommandSelect, updateCommandSearchQuery, checkForSlashDeletion, slashPosition, } = useCommandSelector({
-        onShowBashManager: () => setShowBashManager(true),
-        onShowMcpManager: () => setShowMcpManager(true),
-        sendMessage: async (content) => {
-            await sendMessage(content);
-        },
-        hasSlashCommand,
+    // Get current working directory - memoized to avoid repeated process.cwd() calls
+    const currentWorkdir = useMemo(() => workdir || process.cwd(), [workdir]);
+    // Input manager with all input state and functionality (including images)
+    const { inputText, cursorPosition, 
+    // Image management
+    attachedImages, clearImages, 
+    // File selector
+    showFileSelector, filteredFiles, fileSearchQuery: searchQuery, handleFileSelect, handleCancelFileSelect, 
+    // Command selector
+    showCommandSelector, commandSearchQuery, handleCommandSelect, handleCommandInsert, handleCancelCommandSelect, 
+    // Bash history selector
+    showBashHistorySelector, bashHistorySearchQuery, handleBashHistorySelect, handleCancelBashHistorySelect, 
+    // Memory type selector
+    showMemoryTypeSelector, memoryMessage, handleMemoryTypeSelect, handleCancelMemoryTypeSelect, 
+    // Bash/MCP Manager
+    showBashManager, showMcpManager, setShowBashManager, setShowMcpManager, 
+    // Input history
+    setUserInputHistory, 
+    // Complex handlers combining multiple operations
+    handleBashHistoryExecuteAndSend, 
+    // Main handler
+    handleInput, 
+    // Manager ready state
+    isManagerReady, } = useInputManager({
+        onSendMessage: sendMessage,
+        onHasSlashCommand: hasSlashCommand,
+        onSaveMemory: saveMemory,
+        onAbortMessage: abortMessage,
     });
-    // Bash history selector functionality
-    const { showBashHistorySelector, bashHistorySearchQuery, activateBashHistorySelector, handleBashHistorySelect: handleBashHistorySelectorSelect, handleBashHistoryExecute, handleCancelBashHistorySelect, updateBashHistorySearchQuery, checkForExclamationDeletion, exclamationPosition, } = useBashHistorySelector();
-    // Memory type selector functionality
-    const { showMemoryTypeSelector, memoryMessage, activateMemoryTypeSelector, handleMemoryTypeSelect: handleMemoryTypeSelectorSelect, handleCancelMemoryTypeSelect, } = useMemoryTypeSelector();
-    // Input history functionality
-    const { resetHistoryNavigation, navigateHistory } = useInputHistory({
-        userInputHistory,
-    });
-    // Image management functionality (includes clipboard paste)
-    const { attachedImages, clearImages, handlePasteImage } = useImageManager(insertTextAtCursor);
-    // Keyboard handling
-    const { handleFileSelect, handleCommandSelect, handleBashHistorySelect, handleBashHistoryExecute: keyboardHandleBashHistoryExecute, handleMemoryTypeSelect, } = useInputKeyboardHandler({
-        inputText,
-        setInputText,
-        cursorPosition,
-        setCursorPosition,
-        moveCursorLeft,
-        moveCursorRight,
-        moveCursorToStart,
-        moveCursorToEnd,
-        deleteCharAtCursor,
-        insertTextAtCursor,
-        clearInput,
-        resetHistoryNavigation,
-        navigateHistory,
-        handlePasteImage,
-        attachedImages,
-        clearImages,
-        showFileSelector,
-        activateFileSelector,
-        handleFileSelect: handleFileSelectorSelect,
-        handleCancelFileSelect,
-        updateSearchQuery,
-        checkForAtDeletion,
-        atPosition,
-        showCommandSelector,
-        activateCommandSelector,
-        handleCommandSelect: handleCommandSelectorSelect,
-        handleCommandInsert: handleCommandSelectorInsert,
-        handleCancelCommandSelect,
-        updateCommandSearchQuery,
-        checkForSlashDeletion,
-        slashPosition,
-        showBashHistorySelector,
-        activateBashHistorySelector,
-        handleBashHistorySelect: handleBashHistorySelectorSelect,
-        handleBashHistoryExecute,
-        handleCancelBashHistorySelect,
-        updateBashHistorySearchQuery,
-        checkForExclamationDeletion,
-        exclamationPosition,
-        showMemoryTypeSelector,
-        activateMemoryTypeSelector,
-        handleMemoryTypeSelect: handleMemoryTypeSelectorSelect,
-        showBashManager,
-        showMcpManager,
-        isCommandRunning,
-        isLoading,
-        sendMessage,
-        abortMessage,
-        saveMemory,
+    // Set user input history when it changes
+    useEffect(() => {
+        setUserInputHistory(userInputHistory);
+    }, [userInputHistory, setUserInputHistory]);
+    // Use the InputManager's unified input handler
+    useInput(async (input, key) => {
+        await handleInput(input, key, attachedImages, isLoading, isCommandRunning, clearImages);
     });
+    // These methods are already memoized in useInputManager, no need to wrap again
+    // These methods are already memoized in useInputManager and combine multiple operations
     const isPlaceholder = !inputText;
     const placeholderText = INPUT_PLACEHOLDER_TEXT;
-    // Create adapter function for CommandSelector
-    const handleCommandInsert = useCallback((command) => {
-        const result = handleCommandSelectorInsert(command, inputText, cursorPosition);
-        setInputText(result.newInput);
-        setCursorPosition(result.newCursorPosition);
-    }, [
-        handleCommandSelectorInsert,
-        inputText,
-        cursorPosition,
-        setInputText,
-        setCursorPosition,
-    ]);
+    // handleCommandSelectorInsert is already memoized in useInputManager, no need to wrap again
     // Split text into three parts: before cursor, cursor position, after cursor
     const displayText = isPlaceholder ? placeholderText : inputText;
     const beforeCursor = displayText.substring(0, cursorPosition);
@@ -120,5 +61,9 @@ export const InputBox = ({ isLoading = false, isCommandRunning = false, workdir,
     const afterCursor = displayText.substring(cursorPosition + 1);
     // Always show cursor, allow user to continue input during loading
     const shouldShowCursor = true;
-    return (_jsxs(Box, { flexDirection: "column", width: "100%", children: [showFileSelector && (_jsx(FileSelector, { files: filteredFiles, searchQuery: searchQuery, onSelect: handleFileSelect, onCancel: handleCancelFileSelect })), showCommandSelector && (_jsx(CommandSelector, { searchQuery: commandSearchQuery, onSelect: handleCommandSelect, onInsert: handleCommandInsert, onCancel: handleCancelCommandSelect, commands: slashCommands })), showBashHistorySelector && (_jsx(BashHistorySelector, { searchQuery: bashHistorySearchQuery, workdir: currentWorkdir, onSelect: handleBashHistorySelect, onExecute: keyboardHandleBashHistoryExecute, onCancel: handleCancelBashHistorySelect })), showMemoryTypeSelector && (_jsx(MemoryTypeSelector, { message: memoryMessage, onSelect: handleMemoryTypeSelect, onCancel: handleCancelMemoryTypeSelect })), showBashManager && (_jsx(BashShellManager, { onCancel: () => setShowBashManager(false) })), showMcpManager && (_jsx(McpManager, { onCancel: () => setShowMcpManager(false), servers: mcpServers, onConnectServer: connectMcpServer, onDisconnectServer: disconnectMcpServer })), showBashManager || showMcpManager || (_jsx(Box, { borderStyle: "single", borderColor: "gray", paddingX: 1, children: _jsx(Box, { width: "100%", flexDirection: "row", justifyContent: "space-between", children: _jsx(Text, { color: isPlaceholder ? "gray" : "white", children: shouldShowCursor ? (_jsxs(_Fragment, { children: [beforeCursor, _jsx(Text, { backgroundColor: "white", color: "black", children: atCursor }), afterCursor] })) : (displayText) }) }) }))] }));
+    // Only show the Box after InputManager is created on first mount
+    if (!isManagerReady) {
+        return null;
+    }
+    return (_jsxs(Box, { flexDirection: "column", children: [showFileSelector && (_jsx(FileSelector, { files: filteredFiles, searchQuery: searchQuery, onSelect: handleFileSelect, onCancel: handleCancelFileSelect })), showCommandSelector && (_jsx(CommandSelector, { searchQuery: commandSearchQuery, onSelect: handleCommandSelect, onInsert: handleCommandInsert, onCancel: handleCancelCommandSelect, commands: slashCommands })), showBashHistorySelector && (_jsx(BashHistorySelector, { searchQuery: bashHistorySearchQuery, workdir: currentWorkdir, onSelect: handleBashHistorySelect, onExecute: handleBashHistoryExecuteAndSend, onCancel: handleCancelBashHistorySelect })), showMemoryTypeSelector && (_jsx(MemoryTypeSelector, { message: memoryMessage, onSelect: handleMemoryTypeSelect, onCancel: handleCancelMemoryTypeSelect })), showBashManager && (_jsx(BashShellManager, { onCancel: () => setShowBashManager(false) })), showMcpManager && (_jsx(McpManager, { onCancel: () => setShowMcpManager(false), servers: mcpServers, onConnectServer: connectMcpServer, onDisconnectServer: disconnectMcpServer })), showBashManager || showMcpManager || (_jsx(Box, { borderStyle: "single", borderColor: "gray", paddingX: 1, children: _jsx(Text, { color: isPlaceholder ? "gray" : "white", children: shouldShowCursor ? (_jsxs(_Fragment, { children: [beforeCursor, _jsx(Text, { backgroundColor: "white", color: "black", children: atCursor }), afterCursor] })) : (displayText) }) }))] }));
 };

package/dist/components/Markdown.d.ts

@@ -0,0 +1,6 @@
+import React from "react";
+export interface MarkdownProps {
+    children: string;
+}
+export declare const Markdown: React.MemoExoticComponent<({ children }: MarkdownProps) => import("react/jsx-runtime").JSX.Element>;
+//# sourceMappingURL=Markdown.d.ts.map

package/dist/components/Markdown.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Markdown.d.ts","sourceRoot":"","sources":["../../src/components/Markdown.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAC;AAKvC,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;CAClB;AAGD,eAAO,MAAM,QAAQ,2CAA6B,aAAa,6CAe7D,CAAC"}

package/dist/components/Markdown.js

@@ -0,0 +1,22 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import React, { useMemo } from "react";
+import { Text } from "ink";
+import { marked } from "marked";
+import TerminalRenderer from "marked-terminal";
+// Markdown component using marked-terminal with proper unescape option
+export const Markdown = React.memo(({ children }) => {
+    const result = useMemo(() => {
+        // Configure marked with TerminalRenderer using default options
+        marked.setOptions({
+            renderer: new TerminalRenderer({
+                // Use official unescape option to handle HTML entities
+                unescape: true,
+            }),
+        });
+        const output = marked(children);
+        return typeof output === "string" ? output.trim() : "";
+    }, [children]);
+    return _jsx(Text, { children: result });
+});
+// Add display name for debugging
+Markdown.displayName = "Markdown";

package/dist/components/MessageItem.d.ts

@@ -0,0 +1,9 @@
+import type { Message } from "wave-agent-sdk";
+export interface MessageItemProps {
+    message: Message;
+    isExpanded: boolean;
+    shouldShowHeader: boolean;
+    isStatic?: boolean;
+}
+export declare const MessageItem: ({ message, isExpanded, shouldShowHeader, isStatic, }: MessageItemProps) => import("react/jsx-runtime").JSX.Element | null;
+//# sourceMappingURL=MessageItem.d.ts.map

package/dist/components/MessageItem.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MessageItem.d.ts","sourceRoot":"","sources":["../../src/components/MessageItem.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAU9C,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,OAAO,CAAC;IACpB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,eAAO,MAAM,WAAW,GAAI,sDAKzB,gBAAgB,mDA+ElB,CAAC"}

package/dist/components/MessageItem.js

@@ -0,0 +1,15 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Box, Text } from "ink";
+import { MessageSource } from "wave-agent-sdk";
+import { DiffViewer } from "./DiffViewer.js";
+import { CommandOutputDisplay } from "./CommandOutputDisplay.js";
+import { ToolResultDisplay } from "./ToolResultDisplay.js";
+import { MemoryDisplay } from "./MemoryDisplay.js";
+import { CompressDisplay } from "./CompressDisplay.js";
+import { SubagentBlock } from "./SubagentBlock.js";
+import { Markdown } from "./Markdown.js";
+export const MessageItem = ({ message, isExpanded, shouldShowHeader, isStatic = true, }) => {
+    if (message.blocks.length === 0)
+        return null;
+    return (_jsxs(Box, { flexDirection: "column", gap: 1, marginTop: 1, children: [shouldShowHeader && (_jsx(Box, { children: _jsx(Text, { color: message.role === "user" ? "cyan" : "green", bold: true, children: message.role === "user" ? "👤 You" : "🤖 Assistant" }) })), _jsx(Box, { flexDirection: "column", gap: 1, children: message.blocks.map((block, blockIndex) => (_jsxs(Box, { children: [block.type === "text" && block.content.trim() && (_jsxs(Box, { children: [block.customCommandContent && (_jsxs(Text, { color: "cyan", bold: true, children: ["\u26A1", " "] })), block.source === MessageSource.HOOK && (_jsxs(Text, { color: "magenta", bold: true, children: ["\uD83D\uDD17", " "] })), isStatic ? (_jsx(Markdown, { children: block.content })) : (_jsx(Text, { children: block.content.split("\n").slice(-10).join("\n") }))] })), block.type === "error" && (_jsx(Box, { children: _jsxs(Text, { color: "red", children: ["\u274C Error: ", block.content] }) })), block.type === "diff" && (_jsx(DiffViewer, { block: block, isStatic: isStatic })), block.type === "command_output" && (_jsx(CommandOutputDisplay, { block: block, isExpanded: isExpanded })), block.type === "tool" && (_jsx(ToolResultDisplay, { block: block, isExpanded: isExpanded })), block.type === "image" && (_jsxs(Box, { children: [_jsx(Text, { color: "magenta", bold: true, children: "\uD83D\uDCF7 Image" }), block.imageUrls && block.imageUrls.length > 0 && (_jsxs(Text, { color: "gray", dimColor: true, children: [" ", "(", block.imageUrls.length, ")"] }))] })), block.type === "memory" && _jsx(MemoryDisplay, { block: block }), block.type === "compress" && (_jsx(CompressDisplay, { block: block, isExpanded: isExpanded })), block.type === "subagent" && _jsx(SubagentBlock, { block: block })] }, blockIndex))) })] }));
+};

package/dist/components/MessageList.d.ts

@@ -8,5 +8,5 @@ export interface MessageListProps {
     latestTotalTokens?: number;
     isExpanded?: boolean;
 }
-export declare const MessageList: React.FC<MessageListProps>;
+export declare const MessageList: React.MemoExoticComponent<({ messages, isLoading, isCommandRunning, isCompressing, latestTotalTokens, isExpanded, }: MessageListProps) => import("react/jsx-runtime").JSX.Element>;
 //# sourceMappingURL=MessageList.d.ts.map

package/dist/components/MessageList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MessageList.d.ts","sourceRoot":"","sources":["../../src/components/MessageList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAC;AAEvC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAuG9C,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,CAyGlD,CAAC"}
+{"version":3,"file":"MessageList.d.ts","sourceRoot":"","sources":["../../src/components/MessageList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAG9C,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,eAAO,MAAM,WAAW,uHAQnB,gBAAgB,6CA0IpB,CAAC"}

package/dist/components/MessageList.js

@@ -1,37 +1,38 @@
-import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-import { useMemo } from "react";
-import { Box, Text } from "ink";
-import { DiffViewer } from "./DiffViewer.js";
-import { CommandOutputDisplay } from "./CommandOutputDisplay.js";
-import { ToolResultDisplay } from "./ToolResultDisplay.js";
-import { MemoryDisplay } from "./MemoryDisplay.js";
-import { CompressDisplay } from "./CompressDisplay.js";
-import { SubagentBlock } from "./SubagentBlock.js";
-import { usePagination } from "../hooks/usePagination.js";
-// Function to render a single message
-const renderMessageItem = (message, originalIndex, isExpanded, previousMessage) => {
-    const shouldShowHeader = previousMessage?.role !== message.role;
-    return (_jsxs(Box, { flexDirection: "column", children: [shouldShowHeader && (_jsx(Box, { children: _jsxs(Text, { color: message.role === "user" ? "cyan" : "green", bold: true, children: [message.role === "user" ? "👤 You" : "🤖 Assistant", _jsxs(Text, { color: "gray", dimColor: true, children: [" ", "#", originalIndex + 1] })] }) })), _jsx(Box, { marginLeft: 2, flexDirection: "column", gap: 1, marginTop: shouldShowHeader ? 1 : 0, children: message.blocks.map((block, blockIndex) => (_jsxs(Box, { children: [block.type === "text" && block.content.trim() && (_jsx(Box, { children: _jsx(Text, { children: block.content }) })), block.type === "error" && (_jsx(Box, { children: _jsxs(Text, { color: "red", children: ["\u274C Error: ", block.content] }) })), block.type === "diff" && (_jsx(DiffViewer, { block: block, isExpanded: isExpanded })), block.type === "command_output" && (_jsx(CommandOutputDisplay, { block: block, isExpanded: isExpanded })), block.type === "tool" && (_jsx(ToolResultDisplay, { block: block, isExpanded: isExpanded })), block.type === "image" && (_jsxs(Box, { children: [_jsx(Text, { color: "magenta", bold: true, children: "\uD83D\uDCF7 Image" }), block.imageUrls && block.imageUrls.length > 0 && (_jsxs(Text, { color: "gray", dimColor: true, children: [" ", "(", block.imageUrls.length, ")"] }))] })), block.type === "memory" && _jsx(MemoryDisplay, { block: block }), block.type === "compress" && (_jsx(CompressDisplay, { block: block, isExpanded: isExpanded })), block.type === "custom_command" && (_jsxs(Box, { children: [_jsx(Text, { color: "cyan", bold: true, children: "\u26A1" }), _jsx(Text, { children: block.originalInput || `/${block.commandName}` })] })), block.type === "subagent" && (_jsx(SubagentBlock, { block: block, isExpanded: isExpanded }))] }, blockIndex))) })] }, `message-${originalIndex}`));
-};
-export const MessageList = ({ messages, isLoading = false, isCommandRunning = false, isCompressing = false, latestTotalTokens = 0, isExpanded = false, }) => {
-    // Use original messages for pagination calculation
-    const { displayInfo } = usePagination(messages);
-    // Get current page messages while preserving original index information
-    const currentMessagesWithIndex = useMemo(() => {
-        return messages
-            .slice(displayInfo.startIndex, displayInfo.endIndex)
-            .map((message, index) => ({
-            message,
-            originalIndex: displayInfo.startIndex + index,
-        }));
-    }, [messages, displayInfo.startIndex, displayInfo.endIndex]);
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import React from "react";
+import { Box, Text, Static } from "ink";
+import { MessageItem } from "./MessageItem.js";
+export const MessageList = React.memo(({ messages, isLoading = false, isCommandRunning = false, isCompressing = false, latestTotalTokens = 0, isExpanded = false, }) => {
     // Empty message state
     if (messages.length === 0) {
         return (_jsx(Box, { flexDirection: "column", paddingY: 1, children: _jsx(Text, { color: "gray", children: "Welcome to WAVE Code Assistant!" }) }));
     }
-    return (_jsxs(Box, { flexDirection: "column", gap: 1, marginTop: 1, children: [_jsx(Box, { flexDirection: "column", gap: 1, children: currentMessagesWithIndex.map(({ message, originalIndex }) => {
+    // Limit messages when expanded to prevent long rendering times
+    const maxExpandedMessages = 20;
+    const shouldLimitMessages = isExpanded && messages.length > maxExpandedMessages;
+    const displayMessages = shouldLimitMessages
+        ? messages.slice(-maxExpandedMessages)
+        : messages;
+    const omittedCount = shouldLimitMessages
+        ? messages.length - maxExpandedMessages
+        : 0;
+    // Compute which messages to render statically vs dynamically
+    const shouldRenderLastDynamic = isLoading || isCommandRunning;
+    const staticMessages = shouldRenderLastDynamic
+        ? displayMessages.slice(0, -1)
+        : displayMessages;
+    const dynamicMessages = shouldRenderLastDynamic && displayMessages.length > 0
+        ? [displayMessages[displayMessages.length - 1]]
+        : [];
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, gap: 1, children: [omittedCount > 0 && (_jsx(Box, { children: _jsxs(Text, { color: "gray", dimColor: true, children: ["... ", omittedCount, " earlier message", omittedCount !== 1 ? "s" : "", " ", "omitted (showing latest ", maxExpandedMessages, ")"] }) })), _jsx(Static, { items: staticMessages, children: (message, key) => {
                     // Get previous message
-                    const previousMessage = originalIndex > 0 ? messages[originalIndex - 1] : undefined;
-                    return renderMessageItem(message, originalIndex, isExpanded, previousMessage);
-                }) }), !isExpanded && (isLoading || isCommandRunning || isCompressing) && (_jsxs(Box, { flexDirection: "column", gap: 1, children: [isLoading && (_jsxs(Box, { children: [_jsx(Text, { color: "yellow", children: "\uD83D\uDCAD AI is thinking... " }), _jsxs(Text, { color: "gray", dimColor: true, children: [" ", "|", " "] }), _jsx(Text, { color: "blue", bold: true, children: latestTotalTokens.toLocaleString() }), _jsxs(Text, { color: "gray", dimColor: true, children: [" ", "tokens |", " "] }), _jsx(Text, { color: "red", bold: true, children: "Esc" }), _jsxs(Text, { color: "gray", dimColor: true, children: [" ", "to abort"] })] })), isCommandRunning && (_jsx(Text, { color: "blue", children: "\uD83D\uDE80 Command is running..." })), isCompressing && (_jsx(Text, { color: "magenta", children: "\uD83D\uDDDC\uFE0F Compressing message history..." }))] })), messages.length > 0 && (_jsx(Box, { children: _jsxs(Box, { justifyContent: "space-between", width: "100%", children: [_jsxs(Box, { children: [_jsxs(Text, { color: "gray", children: ["Messages ", messages.length, " Page ", displayInfo.currentPage, "/", displayInfo.totalPages] }), _jsxs(Text, { color: "gray", dimColor: true, children: [" ", "\u2190 ", _jsx(Text, { color: "cyan", children: "Ctrl+U/D" }), " Navigate"] })] }), _jsxs(Text, { color: "gray", dimColor: true, children: [_jsx(Text, { color: "cyan", children: "Ctrl+O" }), " Toggle", " ", isExpanded ? "Collapse" : "Expand"] })] }) }))] }));
-};
+                    const previousMessage = key > 0 ? staticMessages[key - 1] : undefined;
+                    return (_jsx(MessageItem, { message: message, shouldShowHeader: previousMessage?.role !== message.role, isExpanded: isExpanded, isStatic: true }, key));
+                } }), dynamicMessages.map((message, index) => {
+                const messageIndex = staticMessages.length + index;
+                const previousMessage = messageIndex > 0 ? displayMessages[messageIndex - 1] : undefined;
+                return (_jsx(Box, { marginTop: -1, children: _jsx(MessageItem, { message: message, shouldShowHeader: previousMessage?.role !== message.role, isExpanded: isExpanded, isStatic: false }) }, `dynamic-${index}`));
+            }), (isLoading || isCommandRunning || isCompressing) && (_jsxs(Box, { flexDirection: "column", gap: 1, children: [isLoading && (_jsxs(Box, { children: [_jsx(Text, { color: "yellow", children: "\uD83D\uDCAD AI is thinking... " }), _jsxs(Text, { color: "gray", dimColor: true, children: ["|", " "] }), _jsx(Text, { color: "red", bold: true, children: "Esc" }), _jsxs(Text, { color: "gray", dimColor: true, children: [" ", "to abort"] })] })), isCommandRunning && (_jsx(Text, { color: "blue", children: "\uD83D\uDE80 Command is running..." })), isCompressing && (_jsx(Text, { color: "magenta", children: "\uD83D\uDDDC\uFE0F Compressing message history..." }))] })), messages.length > 0 && (_jsx(Box, { children: _jsxs(Box, { justifyContent: "space-between", width: "100%", children: [_jsx(Box, { children: _jsxs(Text, { color: "gray", children: ["Messages ", messages.length, latestTotalTokens > 0 && (_jsxs(_Fragment, { children: [_jsxs(Text, { color: "gray", dimColor: true, children: [" ", "|", " "] }), _jsx(Text, { color: "blue", bold: true, children: latestTotalTokens.toLocaleString() }), _jsxs(Text, { color: "gray", dimColor: true, children: [" ", "tokens"] })] }))] }) }), _jsxs(Text, { color: "gray", dimColor: true, children: [_jsx(Text, { color: "cyan", children: "Ctrl+O" }), " Toggle", " ", isExpanded ? "Collapse" : "Expand"] })] }) }))] }));
+});
+// Add display name for debugging
+MessageList.displayName = "MessageList";

package/dist/components/SubagentBlock.d.ts

@@ -1,8 +1,7 @@
 import React from "react";
-import type { SubagentBlock as SubagentBlockType } from "wave-agent-sdk/src/types.js";
+import type { SubagentBlock as SubagentBlockType } from "wave-agent-sdk";
 interface SubagentBlockProps {
     block: SubagentBlockType;
-    isExpanded?: boolean;
 }
 export declare const SubagentBlock: React.FC<SubagentBlockProps>;
 export {};

package/dist/components/SubagentBlock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SubagentBlock.d.ts","sourceRoot":"","sources":["../../src/components/SubagentBlock.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,KAAK,EACV,aAAa,IAAI,iBAAiB,EAGnC,MAAM,6BAA6B,CAAC;AA4BrC,UAAU,kBAAkB;IAC1B,KAAK,EAAE,iBAAiB,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAuFtD,CAAC"}
+{"version":3,"file":"SubagentBlock.d.ts","sourceRoot":"","sources":["../../src/components/SubagentBlock.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,KAAK,EAAE,aAAa,IAAI,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAGzE,UAAU,kBAAkB;IAC1B,KAAK,EAAE,iBAAiB,CAAC;CAC1B;AAED,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAoGtD,CAAC"}

package/dist/components/SubagentBlock.js

@@ -1,19 +1,10 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 import { Box, Text } from "ink";
-import { ToolResultDisplay } from "./ToolResultDisplay.js";
-const MessageBlockRenderer = ({ block, isExpanded, }) => {
-    switch (block.type) {
-        case "text":
-            return _jsx(Text, { children: block.content });
-        case "error":
-            return _jsxs(Text, { color: "red", children: ["\u274C Error: ", block.content] });
-        case "tool":
-            return _jsx(ToolResultDisplay, { block: block, isExpanded: isExpanded });
-        default:
-            return null;
-    }
-};
-export const SubagentBlock = ({ block, isExpanded = false, }) => {
+import { useChat } from "../contexts/useChat.js";
+export const SubagentBlock = ({ block }) => {
+    const { subagentMessages } = useChat();
+    // Get messages for this subagent from context
+    const messages = subagentMessages[block.subagentId] || [];
     // Status indicator mapping
     const getStatusIndicator = (status) => {
         switch (status) {
@@ -30,9 +21,27 @@ export const SubagentBlock = ({ block, isExpanded = false, }) => {
         }
     };
     const statusInfo = getStatusIndicator(block.status);
-    // Determine how many messages to show
-    const messagesToShow = isExpanded
-        ? block.messages.slice(-10) // Up to 10 most recent when expanded
-        : block.messages.slice(-2); // Up to 2 most recent when collapsed
-    return (_jsxs(Box, { borderStyle: "round", borderColor: "magenta", paddingX: 1, paddingY: 0, flexDirection: "column", marginBottom: 1, children: [_jsxs(Box, { flexDirection: "row", justifyContent: "space-between", alignItems: "center", children: [_jsxs(Box, { flexDirection: "row", alignItems: "center", children: [_jsxs(Text, { color: "cyan", children: ["\uD83E\uDD16 ", block.subagentName] }), _jsxs(Text, { color: statusInfo.color, dimColor: false, children: [" ", statusInfo.icon] })] }), !isExpanded && (_jsxs(Text, { color: "gray", dimColor: true, children: [block.messages.length, " messages"] }))] }), messagesToShow.length > 0 && (_jsx(Box, { flexDirection: "column", marginTop: 1, gap: 1, children: messagesToShow.map((message, index) => (_jsx(Box, { flexDirection: "column", marginBottom: 0, gap: 1, children: message.blocks.map((messageBlock, blockIndex) => (_jsx(Box, { flexDirection: "column", children: _jsx(MessageBlockRenderer, { block: messageBlock, isExpanded: isExpanded }) }, blockIndex))) }, index))) })), !isExpanded && block.messages.length > 2 && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: "gray", dimColor: true, children: ["... and ", block.messages.length - 2, " more messages (Ctrl+O to expand)"] }) }))] }));
+    // Find the last 2 tool names and their compact params, and count total tools
+    const getLastTwoTools = () => {
+        const tools = [];
+        let totalToolCount = 0;
+        for (let i = messages.length - 1; i >= 0; i--) {
+            const message = messages[i];
+            for (let j = message.blocks.length - 1; j >= 0; j--) {
+                const messageBlock = message.blocks[j];
+                if (messageBlock.type === "tool" && messageBlock.name) {
+                    totalToolCount++;
+                    if (tools.length < 2) {
+                        tools.push({
+                            name: messageBlock.name,
+                            compactParams: messageBlock.compactParams,
+                        });
+                    }
+                }
+            }
+        }
+        return { tools: tools.reverse(), totalToolCount }; // Reverse to show oldest first, newest last
+    };
+    const { tools: lastTwoTools, totalToolCount } = getLastTwoTools();
+    return (_jsxs(Box, { borderRight: false, borderTop: false, borderBottom: false, borderStyle: "classic", borderColor: "magenta", paddingX: 1, paddingY: 0, flexDirection: "column", marginBottom: 1, children: [_jsx(Box, { flexDirection: "row", gap: 1, children: _jsxs(Box, { flexDirection: "row", alignItems: "center", children: [_jsxs(Text, { color: "cyan", children: ["\uD83E\uDD16 ", block.subagentName] }), _jsxs(Text, { color: statusInfo.color, dimColor: false, children: [" ", statusInfo.icon] }), _jsxs(Text, { color: "gray", dimColor: true, children: [" ", "(", messages.length, " messages)"] })] }) }), lastTwoTools.length > 0 && (_jsxs(Box, { flexDirection: "column", marginTop: 1, gap: 1, children: [totalToolCount > 2 && (_jsx(Text, { color: "gray", dimColor: true, children: "..." })), lastTwoTools.map((tool, index) => (_jsxs(Box, { flexDirection: "row", children: [_jsx(Text, { color: "magenta", children: "\uD83D\uDD27 " }), _jsx(Text, { color: "white", children: tool.name }), tool.compactParams && (_jsxs(Text, { color: "gray", children: [" ", tool.compactParams] }))] }, index)))] }))] }));
 };