wave-code 0.0.2 → 0.0.3

package/dist/components/FileSelector.js

@@ -43,6 +43,6 @@ export const FileSelector = ({ files, searchQuery, onSelect, onCancel, }) => {
                 const actualIndex = startIndex + displayIndex;
                 const isSelected = actualIndex === selectedIndex;
                 const icon = fileItem.type === "directory" ? "📁" : "📄";
-                return (_jsx(Box, { children: _jsxs(Text, { color: isSelected ? "black" : "white", backgroundColor: isSelected ? "cyan" : undefined, children: [isSelected ? "▶ " : "  ", icon, " ", fileItem.path] }) }, fileItem.path));
+                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] })] })] }));
 };

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;AAkG9C,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,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"}

package/dist/components/MessageList.js

@@ -6,11 +6,12 @@ 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", marginTop: 1, 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}` })] }))] }, blockIndex))) })] }, `message-${originalIndex}`));
+    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
@@ -28,9 +29,9 @@ export const MessageList = ({ messages, isLoading = false, isCommandRunning = fa
     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", children: [_jsx(Box, { flexDirection: "column", children: currentMessagesWithIndex.map(({ message, originalIndex }) => {
+    return (_jsxs(Box, { flexDirection: "column", gap: 1, marginTop: 1, children: [_jsx(Box, { flexDirection: "column", gap: 1, children: currentMessagesWithIndex.map(({ message, originalIndex }) => {
                     // Get previous message
                     const previousMessage = originalIndex > 0 ? messages[originalIndex - 1] : undefined;
                     return renderMessageItem(message, originalIndex, isExpanded, previousMessage);
-                }) }), !isExpanded && (isLoading || isCommandRunning || isCompressing) && (_jsxs(Box, { marginTop: 1, 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, { marginTop: 1, 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"] })] }) }))] }));
+                }) }), !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"] })] }) }))] }));
 };

package/dist/components/SubagentBlock.d.ts

@@ -0,0 +1,9 @@
+import React from "react";
+import type { SubagentBlock as SubagentBlockType } from "wave-agent-sdk/src/types.js";
+interface SubagentBlockProps {
+    block: SubagentBlockType;
+    isExpanded?: boolean;
+}
+export declare const SubagentBlock: React.FC<SubagentBlockProps>;
+export {};
+//# sourceMappingURL=SubagentBlock.d.ts.map

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

@@ -0,0 +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"}

package/dist/components/SubagentBlock.js

@@ -0,0 +1,38 @@
+import { jsx as _jsx, jsxs as _jsxs } 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, }) => {
+    // Status indicator mapping
+    const getStatusIndicator = (status) => {
+        switch (status) {
+            case "active":
+                return { icon: "🔄", color: "yellow" };
+            case "completed":
+                return { icon: "✅", color: "green" };
+            case "error":
+                return { icon: "❌", color: "red" };
+            case "aborted":
+                return { icon: "⏹️", color: "gray" };
+            default:
+                return { icon: "⏳", color: "gray" };
+        }
+    };
+    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)"] }) }))] }));
+};

package/dist/plain-cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plain-cli.d.ts","sourceRoot":"","sources":["../src/plain-cli.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,eAAe;IAC9B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAwD3E"}
+{"version":3,"file":"plain-cli.d.ts","sourceRoot":"","sources":["../src/plain-cli.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,eAAe;IAC9B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAkD3E"}

package/dist/plain-cli.js

@@ -9,13 +9,12 @@ export async function startPlainCli(options) {
         process.exit(1);
     }
     let agent;
-    let lastAssistantMessage;
     // Setup callbacks for agent
     const callbacks = {
         onAssistantMessageAdded: (content) => {
-            // Store the content instead of immediately printing it
+            // Only output the content field, not tool calls
             if (content) {
-                lastAssistantMessage = content;
+                console.log(content);
             }
         },
     };
@@ -31,10 +30,6 @@ export async function startPlainCli(options) {
         if (message && message.trim() !== "") {
             await agent.sendMessage(message);
         }
-        // Output only the last assistant message
-        if (lastAssistantMessage) {
-            console.log(lastAssistantMessage);
-        }
         // Destroy agent and exit after sendMessage completes
         agent.destroy();
         process.exit(0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wave-code",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "CLI-based code assistant powered by AI, built with React and Ink",
   "keywords": [
     "ai",
@@ -29,7 +29,7 @@
     "yargs": "^17.7.2",
     "diff": "^8.0.2",
     "glob": "^11.0.3",
-    "wave-agent-sdk": "0.0.2"
+    "wave-agent-sdk": "0.0.3"
   },
   "devDependencies": {
     "@types/react": "^19.1.8",

package/src/components/FileSelector.tsx

@@ -112,7 +112,7 @@ export const FileSelector: React.FC<FileSelectorProps> = ({
               color={isSelected ? "black" : "white"}
               backgroundColor={isSelected ? "cyan" : undefined}
             >
-              {isSelected ? "▶ " : "  "}
+              {"  "}
               {icon} {fileItem.path}
             </Text>
           </Box>

package/src/components/MessageList.tsx

@@ -6,6 +6,7 @@ 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
@@ -18,7 +19,7 @@ const renderMessageItem = (
   const shouldShowHeader = previousMessage?.role !== message.role;
 
   return (
-    <Box key={`message-${originalIndex}`} flexDirection="column" marginTop={1}>
+    <Box key={`message-${originalIndex}`} flexDirection="column">
       {shouldShowHeader && (
         <Box>
           <Text color={message.role === "user" ? "cyan" : "green"} bold>
@@ -91,6 +92,10 @@ const renderMessageItem = (
                 <Text>{block.originalInput || `/${block.commandName}`}</Text>
               </Box>
             )}
+
+            {block.type === "subagent" && (
+              <SubagentBlock block={block} isExpanded={isExpanded} />
+            )}
           </Box>
         ))}
       </Box>
@@ -138,9 +143,9 @@ export const MessageList: React.FC<MessageListProps> = ({
   }
 
   return (
-    <Box flexDirection="column">
+    <Box flexDirection="column" gap={1} marginTop={1}>
       {/* Message list */}
-      <Box flexDirection="column">
+      <Box flexDirection="column" gap={1}>
         {currentMessagesWithIndex.map(({ message, originalIndex }) => {
           // Get previous message
           const previousMessage =
@@ -156,7 +161,7 @@ export const MessageList: React.FC<MessageListProps> = ({
 
       {/* Loading state display - only show in non-expanded state */}
       {!isExpanded && (isLoading || isCommandRunning || isCompressing) && (
-        <Box marginTop={1} flexDirection="column" gap={1}>
+        <Box flexDirection="column" gap={1}>
           {isLoading && (
             <Box>
               <Text color="yellow">💭 AI is thinking... </Text>
@@ -191,7 +196,7 @@ export const MessageList: React.FC<MessageListProps> = ({
 
       {/* Bottom info and shortcut key hints */}
       {messages.length > 0 && (
-        <Box marginTop={1}>
+        <Box>
           <Box justifyContent="space-between" width="100%">
             <Box>
               <Text color="gray">

package/src/components/SubagentBlock.tsx

@@ -0,0 +1,127 @@
+import React from "react";
+import { Box, Text } from "ink";
+import type {
+  SubagentBlock as SubagentBlockType,
+  Message,
+  MessageBlock,
+} from "wave-agent-sdk/src/types.js";
+import { ToolResultDisplay } from "./ToolResultDisplay.js";
+
+// Component to render individual message blocks
+interface MessageBlockRendererProps {
+  block: MessageBlock;
+  isExpanded: boolean;
+}
+
+const MessageBlockRenderer: React.FC<MessageBlockRendererProps> = ({
+  block,
+  isExpanded,
+}) => {
+  switch (block.type) {
+    case "text":
+      return <Text>{block.content}</Text>;
+
+    case "error":
+      return <Text color="red">❌ Error: {block.content}</Text>;
+
+    case "tool":
+      return <ToolResultDisplay block={block} isExpanded={isExpanded} />;
+
+    default:
+      return null;
+  }
+};
+
+interface SubagentBlockProps {
+  block: SubagentBlockType;
+  isExpanded?: boolean;
+}
+
+export const SubagentBlock: React.FC<SubagentBlockProps> = ({
+  block,
+  isExpanded = false,
+}) => {
+  // Status indicator mapping
+  const getStatusIndicator = (status: SubagentBlockType["status"]) => {
+    switch (status) {
+      case "active":
+        return { icon: "🔄", color: "yellow" as const };
+      case "completed":
+        return { icon: "✅", color: "green" as const };
+      case "error":
+        return { icon: "❌", color: "red" as const };
+      case "aborted":
+        return { icon: "⏹️", color: "gray" as const };
+      default:
+        return { icon: "⏳", color: "gray" as const };
+    }
+  };
+
+  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 (
+    <Box
+      borderStyle="round"
+      borderColor="magenta"
+      paddingX={1}
+      paddingY={0}
+      flexDirection="column"
+      marginBottom={1}
+    >
+      {/* Header Section */}
+      <Box
+        flexDirection="row"
+        justifyContent="space-between"
+        alignItems="center"
+      >
+        <Box flexDirection="row" alignItems="center">
+          <Text color="cyan">🤖 {block.subagentName}</Text>
+          <Text color={statusInfo.color} dimColor={false}>
+            {" "}
+            {statusInfo.icon}
+          </Text>
+        </Box>
+
+        {!isExpanded && (
+          <Text color="gray" dimColor>
+            {block.messages.length} messages
+          </Text>
+        )}
+      </Box>
+
+      {/* Messages Section */}
+      {messagesToShow.length > 0 && (
+        <Box flexDirection="column" marginTop={1} gap={1}>
+          {messagesToShow.map((message: Message, index: number) => (
+            <Box key={index} flexDirection="column" marginBottom={0} gap={1}>
+              {message.blocks.map(
+                (messageBlock: MessageBlock, blockIndex: number) => (
+                  <Box key={blockIndex} flexDirection="column">
+                    <MessageBlockRenderer
+                      block={messageBlock}
+                      isExpanded={isExpanded}
+                    />
+                  </Box>
+                ),
+              )}
+            </Box>
+          ))}
+        </Box>
+      )}
+
+      {/* Show truncation indicator if there are more messages */}
+      {!isExpanded && block.messages.length > 2 && (
+        <Box marginTop={1}>
+          <Text color="gray" dimColor>
+            ... and {block.messages.length - 2} more messages (Ctrl+O to expand)
+          </Text>
+        </Box>
+      )}
+    </Box>
+  );
+};

package/src/plain-cli.ts

@@ -22,14 +22,13 @@ export async function startPlainCli(options: PlainCliOptions): Promise<void> {
   }
 
   let agent: Agent;
-  let lastAssistantMessage: string | undefined;
 
   // Setup callbacks for agent
   const callbacks: AgentCallbacks = {
     onAssistantMessageAdded: (content?: string) => {
-      // Store the content instead of immediately printing it
+      // Only output the content field, not tool calls
       if (content) {
-        lastAssistantMessage = content;
+        console.log(content);
       }
     },
   };
@@ -48,11 +47,6 @@ export async function startPlainCli(options: PlainCliOptions): Promise<void> {
       await agent.sendMessage(message);
     }
 
-    // Output only the last assistant message
-    if (lastAssistantMessage) {
-      console.log(lastAssistantMessage);
-    }
-
     // Destroy agent and exit after sendMessage completes
     agent.destroy();
     process.exit(0);