wave-code 0.12.3 → 0.12.5

package/dist/acp/agent.js

@@ -249,7 +249,7 @@ export class WaveAcpAgent {
                 });
             }
         }
-        const textContent = textBlocks.join("");
+        const textContent = textBlocks.join("\n");
         try {
             await agent.sendMessage(textContent, images.length > 0 ? images : undefined);
             logger.info(`Message sent successfully for session ${sessionId}`);

package/dist/components/App.d.ts

@@ -5,7 +5,6 @@ interface AppProps extends BaseAppProps {
     continueLastSession?: boolean;
     onExit: (shouldRemove: boolean) => void;
 }
-export declare const ChatInterfaceWithRemount: React.FC;
 export declare const App: React.FC<AppProps>;
 export {};
 //# sourceMappingURL=App.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../src/components/App.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmD,MAAM,OAAO,CAAC;AAWxE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,UAAU,QAAS,SAAQ,YAAY;IACrC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,MAAM,EAAE,CAAC,YAAY,EAAE,OAAO,KAAK,IAAI,CAAC;CACzC;AAiGD,eAAO,MAAM,wBAAwB,EAAE,KAAK,CAAC,EAuC5C,CAAC;AAEF,eAAO,MAAM,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC,QAAQ,CAmClC,CAAC"}
+{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../src/components/App.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2C,MAAM,OAAO,CAAC;AAWhE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,UAAU,QAAS,SAAQ,YAAY;IACrC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,MAAM,EAAE,CAAC,YAAY,EAAE,OAAO,KAAK,IAAI,CAAC;CACzC;AAiGD,eAAO,MAAM,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC,QAAQ,CAmClC,CAAC"}

package/dist/components/App.js

@@ -1,8 +1,8 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useState, useEffect, useRef, useCallback } from "react";
-import { useStdout, useInput } from "ink";
+import { useState, useEffect, useCallback } from "react";
+import { useInput } from "ink";
 import { ChatInterface } from "./ChatInterface.js";
-import { ChatProvider, useChat } from "../contexts/useChat.js";
+import { ChatProvider } from "../contexts/useChat.js";
 import { AppProvider } from "../contexts/useAppConfig.js";
 import { WorktreeExitPrompt } from "./WorktreeExitPrompt.js";
 import { hasUncommittedChanges, hasNewCommits, getDefaultRemoteBranch, } from "wave-agent-sdk";
@@ -48,38 +48,7 @@ const AppWithProviders = ({ bypassPermissions, permissionMode, pluginDirs, tools
     if (isExiting && worktreeSession && worktreeStatus) {
         return (_jsx(WorktreeExitPrompt, { name: worktreeSession.name, path: worktreeSession.path, hasUncommittedChanges: worktreeStatus.hasUncommittedChanges, hasNewCommits: worktreeStatus.hasNewCommits, onKeep: () => onExit(false), onRemove: () => onExit(true), onCancel: () => setIsExiting(false) }));
     }
-    return (_jsx(ChatProvider, { bypassPermissions: bypassPermissions, permissionMode: permissionMode, pluginDirs: pluginDirs, tools: tools, allowedTools: allowedTools, disallowedTools: disallowedTools, workdir: workdir, worktreeSession: worktreeSession, version: version, model: model, children: _jsx(ChatInterfaceWithRemount, {}) }));
-};
-export const ChatInterfaceWithRemount = () => {
-    const { stdout } = useStdout();
-    const { isExpanded, rewindId, sessionId } = useChat();
-    const [remountKey, setRemountKey] = useState(String(isExpanded) + rewindId);
-    const prevSessionId = useRef(sessionId);
-    const isRemountScheduled = useRef(false);
-    useEffect(() => {
-        const newKey = String(isExpanded) +
-            rewindId +
-            (prevSessionId.current && sessionId && prevSessionId.current !== sessionId
-                ? sessionId
-                : "");
-        if (newKey !== remountKey && !isRemountScheduled.current) {
-            isRemountScheduled.current = true;
-            const timeout = setTimeout(() => {
-                stdout?.write("\u001b[2J\u001b[3J\u001b[0;0H", (err) => {
-                    if (err) {
-                        console.error("Failed to clear terminal:", err);
-                    }
-                    setRemountKey(newKey);
-                    isRemountScheduled.current = false;
-                });
-            }, 100);
-            return () => clearTimeout(timeout);
-        }
-        if (sessionId) {
-            prevSessionId.current = sessionId;
-        }
-    }, [isExpanded, rewindId, sessionId, remountKey, stdout]);
-    return _jsx(ChatInterface, { remountKey: remountKey });
+    return (_jsx(ChatProvider, { bypassPermissions: bypassPermissions, permissionMode: permissionMode, pluginDirs: pluginDirs, tools: tools, allowedTools: allowedTools, disallowedTools: disallowedTools, workdir: workdir, worktreeSession: worktreeSession, version: version, model: model, children: _jsx(ChatInterface, {}) }));
 };
 export const App = ({ restoreSessionId, continueLastSession, bypassPermissions, permissionMode, pluginDirs, tools, allowedTools, disallowedTools, worktreeSession, workdir, version, model, onExit, }) => {
     return (_jsx(AppProvider, { restoreSessionId: restoreSessionId, continueLastSession: continueLastSession, children: _jsx(AppWithProviders, { bypassPermissions: bypassPermissions, permissionMode: permissionMode, pluginDirs: pluginDirs, tools: tools, allowedTools: allowedTools, disallowedTools: disallowedTools, worktreeSession: worktreeSession, workdir: workdir, version: version, model: model, onExit: onExit }) }));

package/dist/components/ChatInterface.d.ts

@@ -1,5 +1,3 @@
 import React from "react";
-export declare const ChatInterface: React.FC<{
-    remountKey: string;
-}>;
+export declare const ChatInterface: React.FC;
 //# sourceMappingURL=ChatInterface.d.ts.map

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,KAAK,MAAM,OAAO,CAAC;AAa1B,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,CA0F1D,CAAC"}
+{"version":3,"file":"ChatInterface.d.ts","sourceRoot":"","sources":["../../src/components/ChatInterface.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAc3D,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAiIjC,CAAC"}

package/dist/components/ChatInterface.js

@@ -1,5 +1,6 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import { Box } from "ink";
+import { useState, useRef, useEffect } from "react";
+import { Box, useStdout, measureElement, Static } from "ink";
 import { MessageList } from "./MessageList.js";
 import { BtwDisplay } from "./BtwDisplay.js";
 import { InputBox } from "./InputBox.js";
@@ -9,10 +10,33 @@ import { QueuedMessageList } from "./QueuedMessageList.js";
 import { ConfirmationDetails } from "./ConfirmationDetails.js";
 import { ConfirmationSelector } from "./ConfirmationSelector.js";
 import { useChat } from "../contexts/useChat.js";
-export const ChatInterface = ({ remountKey, }) => {
-    const { messages, isLoading, isCommandRunning, isCompressing, sendMessage, abortMessage, mcpServers, connectMcpServer, disconnectMcpServer, isExpanded, sessionId, latestTotalTokens, slashCommands, hasSlashCommand, isConfirmationVisible, confirmingTool, handleConfirmationDecision, handleConfirmationCancel, version, workdir, btwState, } = useChat();
+export const ChatInterface = () => {
+    const { messages, isLoading, isCommandRunning, isCompressing, sendMessage, abortMessage, mcpServers, connectMcpServer, disconnectMcpServer, isExpanded, sessionId, latestTotalTokens, slashCommands, hasSlashCommand, isConfirmationVisible, hasPendingConfirmations, confirmingTool, handleConfirmationDecision, handleConfirmationCancel, version, workdir, btwState, remountKey, requestRemount, } = useChat();
     const displayMessages = messages;
+    const [forceStatic, setForceStatic] = useState(false);
+    const { stdout } = useStdout();
+    const terminalHeight = stdout?.rows ?? 24;
+    const chatInterfaceRef = useRef(null);
+    // Handle forceStatic mode for overflow and request remount when exiting
+    useEffect(() => {
+        if (isConfirmationVisible && chatInterfaceRef.current) {
+            const { height } = measureElement(chatInterfaceRef.current);
+            if (height > terminalHeight) {
+                setForceStatic(true);
+            }
+        }
+        else if (forceStatic && !hasPendingConfirmations) {
+            setForceStatic(false);
+            requestRemount();
+        }
+    }, [
+        isConfirmationVisible,
+        terminalHeight,
+        forceStatic,
+        hasPendingConfirmations,
+        requestRemount,
+    ]);
     if (!sessionId)
         return null;
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(MessageList, { messages: displayMessages, isExpanded: isExpanded, version: version, workdir: workdir }, remountKey), !isConfirmationVisible && !isExpanded && (_jsxs(_Fragment, { children: [_jsx(BtwDisplay, { btwState: btwState }), (isLoading || isCommandRunning || isCompressing) && (_jsx(LoadingIndicator, { isLoading: isLoading, isCommandRunning: isCommandRunning, isCompressing: isCompressing, latestTotalTokens: latestTotalTokens })), _jsx(TaskList, {}), _jsx(QueuedMessageList, {}), _jsx(InputBox, { isLoading: isLoading, isCommandRunning: isCommandRunning, sendMessage: sendMessage, abortMessage: abortMessage, mcpServers: mcpServers, connectMcpServer: connectMcpServer, disconnectMcpServer: disconnectMcpServer, slashCommands: slashCommands, hasSlashCommand: hasSlashCommand })] })), isConfirmationVisible && (_jsxs(_Fragment, { children: [_jsx(ConfirmationDetails, { toolName: confirmingTool.name, toolInput: confirmingTool.input, planContent: confirmingTool.planContent, isExpanded: isExpanded }), _jsx(ConfirmationSelector, { toolName: confirmingTool.name, toolInput: confirmingTool.input, suggestedPrefix: confirmingTool.suggestedPrefix, hidePersistentOption: confirmingTool.hidePersistentOption, isExpanded: isExpanded, onDecision: handleConfirmationDecision, onCancel: handleConfirmationCancel, onAbort: abortMessage })] }))] }));
+    return (_jsxs(Box, { ref: chatInterfaceRef, flexDirection: "column", children: [_jsx(MessageList, { messages: displayMessages, isExpanded: isExpanded, version: version, workdir: workdir, forceStatic: forceStatic }, remountKey), !isConfirmationVisible && !isExpanded && (_jsxs(_Fragment, { children: [_jsx(BtwDisplay, { btwState: btwState }), (isLoading || isCommandRunning || isCompressing) && (_jsx(LoadingIndicator, { isLoading: isLoading, isCommandRunning: isCommandRunning, isCompressing: isCompressing, latestTotalTokens: latestTotalTokens })), _jsx(TaskList, {}), _jsx(QueuedMessageList, {}), _jsx(InputBox, { isLoading: isLoading, isCommandRunning: isCommandRunning, sendMessage: sendMessage, abortMessage: abortMessage, mcpServers: mcpServers, connectMcpServer: connectMcpServer, disconnectMcpServer: disconnectMcpServer, slashCommands: slashCommands, hasSlashCommand: hasSlashCommand })] })), isConfirmationVisible && (_jsxs(_Fragment, { children: [forceStatic ? (_jsx(Static, { items: [{ key: "confirmation-details" }], children: () => (_jsx(ConfirmationDetails, { toolName: confirmingTool.name, toolInput: confirmingTool.input, planContent: confirmingTool.planContent, isExpanded: isExpanded })) })) : (_jsx(ConfirmationDetails, { toolName: confirmingTool.name, toolInput: confirmingTool.input, planContent: confirmingTool.planContent, isExpanded: isExpanded })), _jsx(ConfirmationSelector, { toolName: confirmingTool.name, toolInput: confirmingTool.input, suggestedPrefix: confirmingTool.suggestedPrefix, hidePersistentOption: confirmingTool.hidePersistentOption, isExpanded: isExpanded, onDecision: handleConfirmationDecision, onCancel: handleConfirmationCancel, onAbort: abortMessage })] }))] }));
 };

package/dist/components/MessageList.d.ts

@@ -7,5 +7,5 @@ export interface MessageListProps {
     version?: string;
     workdir?: string;
 }
-export declare const MessageList: React.MemoExoticComponent<({ messages, isExpanded, version, workdir }: MessageListProps) => import("react/jsx-runtime").JSX.Element>;
+export declare const MessageList: React.MemoExoticComponent<({ messages, isExpanded, forceStatic, version, workdir, }: 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,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,KAAK,EAAE,OAAO,EAAgB,MAAM,gBAAgB,CAAC;AAG5D,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,WAAW,yEAC+B,gBAAgB,6CAgHtE,CAAC"}
+{"version":3,"file":"MessageList.d.ts","sourceRoot":"","sources":["../../src/components/MessageList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,KAAK,EAAE,OAAO,EAAgB,MAAM,gBAAgB,CAAC;AAG5D,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,WAAW,uFAOnB,gBAAgB,6CAiHpB,CAAC"}

package/dist/components/MessageList.js

@@ -3,7 +3,7 @@ import React from "react";
 import os from "os";
 import { Box, Text, Static } from "ink";
 import { MessageBlockItem } from "./MessageBlockItem.js";
-export const MessageList = React.memo(({ messages, isExpanded = false, version, workdir }) => {
+export const MessageList = React.memo(({ messages, isExpanded = false, forceStatic = false, version, workdir, }) => {
     const welcomeMessage = (_jsxs(Box, { flexDirection: "column", paddingTop: 1, children: [_jsxs(Text, { color: "gray", children: ["WAVE", version ? ` v${version}` : ""] }), workdir && (_jsx(Text, { color: "gray", wrap: "truncate-middle", children: workdir.replace(os.homedir(), "~") }))] }));
     // Limit messages to prevent long rendering times
     const maxMessages = 10;
@@ -29,7 +29,8 @@ export const MessageList = React.memo(({ messages, isExpanded = false, version,
     // Determine which blocks are static vs dynamic
     const blocksWithStatus = allBlocks.map((item) => {
         const { block } = item;
-        const isDynamic = messagesWithRunningBlocks.has(item.messageIndex) || isRunning(block);
+        const isDynamic = !forceStatic &&
+            (messagesWithRunningBlocks.has(item.messageIndex) || isRunning(block));
         return { ...item, isDynamic };
     });
     const staticBlocks = blocksWithStatus.filter((b) => !b.isDynamic);

package/dist/contexts/useChat.d.ts

@@ -47,6 +47,7 @@ export interface ChatContextType {
     setPermissionMode: (mode: PermissionMode) => void;
     allowBypassInCycle: boolean;
     isConfirmationVisible: boolean;
+    hasPendingConfirmations: boolean;
     confirmingTool?: {
         name: string;
         input?: Record<string, unknown>;
@@ -59,7 +60,8 @@ export interface ChatContextType {
     handleConfirmationDecision: (decision: PermissionDecision) => void;
     handleConfirmationCancel: () => void;
     backgroundCurrentTask: () => void;
-    rewindId: number;
+    remountKey: number;
+    requestRemount: () => void;
     handleRewindSelect: (index: number) => Promise<void>;
     getFullMessageThread: () => Promise<{
         messages: Message[];

package/dist/contexts/useChat.d.ts.map

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

package/dist/contexts/useChat.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { createContext, useContext, useCallback, useRef, useEffect, useState, useMemo, } from "react";
-import { useInput } from "ink";
+import { useInput, useStdout } from "ink";
 import { useAppConfig } from "./useAppConfig.js";
 import { Agent, OPERATION_CANCELLED_BY_USER, cloneMessage, } from "wave-agent-sdk";
 import { logger } from "../utils/logger.js";
@@ -17,6 +17,7 @@ export const useChat = () => {
 };
 export const ChatProvider = ({ children, bypassPermissions, permissionMode: initialPermissionMode, pluginDirs, tools, allowedTools, disallowedTools, workdir, worktreeSession, version, model, }) => {
     const { restoreSessionId, continueLastSession } = useAppConfig();
+    const { stdout } = useStdout();
     // Message Display State
     const [isExpanded, setIsExpanded] = useState(false);
     const isExpandedRef = useRef(isExpanded);
@@ -62,8 +63,26 @@ export const ChatProvider = ({ children, bypassPermissions, permissionMode: init
     const [confirmingTool, setConfirmingTool] = useState();
     const [confirmationQueue, setConfirmationQueue] = useState([]);
     const [currentConfirmation, setCurrentConfirmation] = useState(null);
-    // Rewind state
-    const [rewindId, setRewindId] = useState(0);
+    // Remount state
+    const [remountKey, setRemountKey] = useState(0);
+    const prevSessionId = useRef(null);
+    const requestRemount = useCallback(() => {
+        logger.info("requesting remount");
+        stdout?.write("\u001b[2J\u001b[3J\u001b[0;0H", () => {
+            setRemountKey((prev) => prev + 1);
+        });
+    }, [stdout]);
+    // Track sessionId changes to trigger remount
+    useEffect(() => {
+        if (prevSessionId.current &&
+            sessionId &&
+            prevSessionId.current !== sessionId) {
+            requestRemount();
+        }
+        if (sessionId) {
+            prevSessionId.current = sessionId;
+        }
+    }, [sessionId, requestRemount]);
     // Status metadata state
     const [workingDirectory, setWorkingDirectory] = useState("");
     // /btw state
@@ -370,14 +389,13 @@ export const ChatProvider = ({ children, bypassPermissions, permissionMode: init
         if (agentRef.current) {
             try {
                 await agentRef.current.truncateHistory(index);
-                // Clear terminal screen after rewind
-                setRewindId((prev) => prev + 1);
+                requestRemount();
             }
             catch (error) {
                 logger.error("Failed to rewind:", error);
             }
         }
-    }, []);
+    }, [requestRemount]);
     const getFullMessageThread = useCallback(async () => {
         if (agentRef.current) {
             return await agentRef.current.getFullMessageThread();
@@ -486,13 +504,15 @@ export const ChatProvider = ({ children, bypassPermissions, permissionMode: init
         setPermissionMode,
         allowBypassInCycle,
         isConfirmationVisible,
+        hasPendingConfirmations: confirmationQueue.length > 0,
         confirmingTool,
         showConfirmation,
         hideConfirmation,
         handleConfirmationDecision,
         handleConfirmationCancel,
         backgroundCurrentTask,
-        rewindId,
+        remountKey,
+        requestRemount,
         handleRewindSelect,
         getFullMessageThread,
         getGatewayConfig,

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAgBA,wBAAsB,IAAI,kBAgYzB;AAGD,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAGpC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAG3C,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EACjB,KAAK,oBAAoB,GAC1B,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAeA,wBAAsB,IAAI,kBAoXzB;AAGD,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAGpC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAG3C,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EACjB,KAAK,oBAAoB,GAC1B,MAAM,sBAAsB,CAAC"}

package/dist/index.js

@@ -1,7 +1,6 @@
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 import { startCli } from "./cli.js";
-import { logger } from "./utils/logger.js";
 import { generateRandomName } from "wave-agent-sdk";
 import { createWorktree } from "./utils/worktree.js";
 import path from "path";
@@ -13,15 +12,6 @@ const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
 const version = packageJson.version;
 // Export main function for external use
 export async function main() {
-    // Start memory monitoring in debug mode
-    if (process.env.LOG_LEVEL === "DEBUG") {
-        setInterval(() => {
-            const usage = process.memoryUsage();
-            logger.debug(`[Memory] RSS: ${Math.round(usage.rss / 1024 / 1024)}MB, ` +
-                `Heap: ${Math.round(usage.heapUsed / 1024 / 1024)}/${Math.round(usage.heapTotal / 1024 / 1024)}MB, ` +
-                `External: ${Math.round(usage.external / 1024 / 1024)}MB`);
-        }, 10000).unref();
-    }
     try {
         const originalCwd = process.cwd();
         const argv = await yargs(hideBin(process.argv))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wave-code",
-  "version": "0.12.3",
+  "version": "0.12.5",
   "description": "CLI-based code assistant powered by AI, built with React and Ink",
   "repository": {
     "type": "git",
@@ -42,7 +42,7 @@
     "semver": "^7.7.4",
     "yargs": "^17.7.2",
     "zod": "^3.23.8",
-    "wave-agent-sdk": "0.12.3"
+    "wave-agent-sdk": "0.12.5"
   },
   "devDependencies": {
     "@types/react": "^19.1.8",

package/src/acp/agent.ts

@@ -360,7 +360,7 @@ export class WaveAcpAgent implements AcpAgent {
       }
     }
 
-    const textContent = textBlocks.join("");
+    const textContent = textBlocks.join("\n");
 
     try {
       await agent.sendMessage(

package/src/components/App.tsx

@@ -1,7 +1,7 @@
-import React, { useState, useEffect, useRef, useCallback } from "react";
-import { useStdout, useInput } from "ink";
+import React, { useState, useEffect, useCallback } from "react";
+import { useInput } from "ink";
 import { ChatInterface } from "./ChatInterface.js";
-import { ChatProvider, useChat } from "../contexts/useChat.js";
+import { ChatProvider } from "../contexts/useChat.js";
 import { AppProvider } from "../contexts/useAppConfig.js";
 import { WorktreeExitPrompt } from "./WorktreeExitPrompt.js";
 import {
@@ -107,52 +107,11 @@ const AppWithProviders: React.FC<AppWithProvidersProps> = ({
       version={version}
       model={model}
     >
-      <ChatInterfaceWithRemount />
+      <ChatInterface />
     </ChatProvider>
   );
 };
 
-export const ChatInterfaceWithRemount: React.FC = () => {
-  const { stdout } = useStdout();
-  const { isExpanded, rewindId, sessionId } = useChat();
-
-  const [remountKey, setRemountKey] = useState(String(isExpanded) + rewindId);
-
-  const prevSessionId = useRef(sessionId);
-  const isRemountScheduled = useRef(false);
-
-  useEffect(() => {
-    const newKey =
-      String(isExpanded) +
-      rewindId +
-      (prevSessionId.current && sessionId && prevSessionId.current !== sessionId
-        ? sessionId
-        : "");
-
-    if (newKey !== remountKey && !isRemountScheduled.current) {
-      isRemountScheduled.current = true;
-
-      const timeout = setTimeout(() => {
-        stdout?.write("\u001b[2J\u001b[3J\u001b[0;0H", (err?: Error | null) => {
-          if (err) {
-            console.error("Failed to clear terminal:", err);
-          }
-          setRemountKey(newKey);
-          isRemountScheduled.current = false;
-        });
-      }, 100);
-
-      return () => clearTimeout(timeout);
-    }
-
-    if (sessionId) {
-      prevSessionId.current = sessionId;
-    }
-  }, [isExpanded, rewindId, sessionId, remountKey, stdout]);
-
-  return <ChatInterface remountKey={remountKey} />;
-};
-
 export const App: React.FC<AppProps> = ({
   restoreSessionId,
   continueLastSession,

package/src/components/ChatInterface.tsx

@@ -1,5 +1,6 @@
-import React from "react";
-import { Box } from "ink";
+import React, { useState, useRef, useEffect } from "react";
+import { Box, useStdout, measureElement, Static } from "ink";
+import type { DOMElement } from "ink";
 import { MessageList } from "./MessageList.js";
 import { BtwDisplay } from "./BtwDisplay.js";
 import { InputBox } from "./InputBox.js";
@@ -11,9 +12,7 @@ import { ConfirmationSelector } from "./ConfirmationSelector.js";
 
 import { useChat } from "../contexts/useChat.js";
 
-export const ChatInterface: React.FC<{ remountKey: string }> = ({
-  remountKey,
-}) => {
+export const ChatInterface: React.FC = () => {
   const {
     messages,
     isLoading,
@@ -30,26 +29,54 @@ export const ChatInterface: React.FC<{ remountKey: string }> = ({
     slashCommands,
     hasSlashCommand,
     isConfirmationVisible,
+    hasPendingConfirmations,
     confirmingTool,
     handleConfirmationDecision,
     handleConfirmationCancel,
     version,
     workdir,
     btwState,
+    remountKey,
+    requestRemount,
   } = useChat();
 
   const displayMessages = messages;
 
+  const [forceStatic, setForceStatic] = useState(false);
+  const { stdout } = useStdout();
+  const terminalHeight = stdout?.rows ?? 24;
+  const chatInterfaceRef = useRef<DOMElement>(null);
+
+  // Handle forceStatic mode for overflow and request remount when exiting
+  useEffect(() => {
+    if (isConfirmationVisible && chatInterfaceRef.current) {
+      const { height } = measureElement(chatInterfaceRef.current);
+      if (height > terminalHeight) {
+        setForceStatic(true);
+      }
+    } else if (forceStatic && !hasPendingConfirmations) {
+      setForceStatic(false);
+      requestRemount();
+    }
+  }, [
+    isConfirmationVisible,
+    terminalHeight,
+    forceStatic,
+    hasPendingConfirmations,
+    requestRemount,
+  ]);
+
   if (!sessionId) return null;
 
   return (
-    <Box flexDirection="column">
+    <Box ref={chatInterfaceRef} flexDirection="column">
       <MessageList
         key={remountKey}
         messages={displayMessages}
         isExpanded={isExpanded}
         version={version}
         workdir={workdir}
+        forceStatic={forceStatic}
       />
 
       {!isConfirmationVisible && !isExpanded && (
@@ -81,12 +108,25 @@ export const ChatInterface: React.FC<{ remountKey: string }> = ({
 
       {isConfirmationVisible && (
         <>
-          <ConfirmationDetails
-            toolName={confirmingTool!.name}
-            toolInput={confirmingTool!.input}
-            planContent={confirmingTool!.planContent}
-            isExpanded={isExpanded}
-          />
+          {forceStatic ? (
+            <Static items={[{ key: "confirmation-details" }]}>
+              {() => (
+                <ConfirmationDetails
+                  toolName={confirmingTool!.name}
+                  toolInput={confirmingTool!.input}
+                  planContent={confirmingTool!.planContent}
+                  isExpanded={isExpanded}
+                />
+              )}
+            </Static>
+          ) : (
+            <ConfirmationDetails
+              toolName={confirmingTool!.name}
+              toolInput={confirmingTool!.input}
+              planContent={confirmingTool!.planContent}
+              isExpanded={isExpanded}
+            />
+          )}
           <ConfirmationSelector
             toolName={confirmingTool!.name}
             toolInput={confirmingTool!.input}

package/src/components/MessageList.tsx

@@ -13,7 +13,13 @@ export interface MessageListProps {
 }
 
 export const MessageList = React.memo(
-  ({ messages, isExpanded = false, version, workdir }: MessageListProps) => {
+  ({
+    messages,
+    isExpanded = false,
+    forceStatic = false,
+    version,
+    workdir,
+  }: MessageListProps) => {
     const welcomeMessage = (
       <Box flexDirection="column" paddingTop={1}>
         <Text color="gray">WAVE{version ? ` v${version}` : ""}</Text>
@@ -58,7 +64,8 @@ export const MessageList = React.memo(
     const blocksWithStatus = allBlocks.map((item) => {
       const { block } = item;
       const isDynamic =
-        messagesWithRunningBlocks.has(item.messageIndex) || isRunning(block);
+        !forceStatic &&
+        (messagesWithRunningBlocks.has(item.messageIndex) || isRunning(block));
       return { ...item, isDynamic };
     });
 

package/src/contexts/useChat.tsx

@@ -7,7 +7,7 @@ import React, {
   useState,
   useMemo,
 } from "react";
-import { useInput } from "ink";
+import { useInput, useStdout } from "ink";
 import { useAppConfig } from "./useAppConfig.js";
 import type {
   Message,
@@ -86,6 +86,7 @@ export interface ChatContextType {
   allowBypassInCycle: boolean;
   // Permission confirmation state
   isConfirmationVisible: boolean;
+  hasPendingConfirmations: boolean;
   confirmingTool?: {
     name: string;
     input?: Record<string, unknown>;
@@ -105,8 +106,10 @@ export interface ChatContextType {
   handleConfirmationCancel: () => void;
   // Background current task
   backgroundCurrentTask: () => void;
+  // Remount functionality
+  remountKey: number;
+  requestRemount: () => void;
   // Rewind functionality
-  rewindId: number;
   handleRewindSelect: (index: number) => Promise<void>;
   getFullMessageThread: () => Promise<{
     messages: Message[];
@@ -152,6 +155,7 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
   model,
 }) => {
   const { restoreSessionId, continueLastSession } = useAppConfig();
+  const { stdout } = useStdout();
 
   // Message Display State
   const [isExpanded, setIsExpanded] = useState(false);
@@ -250,8 +254,30 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
     reject: () => void;
   } | null>(null);
 
-  // Rewind state
-  const [rewindId, setRewindId] = useState(0);
+  // Remount state
+  const [remountKey, setRemountKey] = useState(0);
+  const prevSessionId = useRef<string | null>(null);
+
+  const requestRemount = useCallback(() => {
+    logger.info("requesting remount");
+    stdout?.write("\u001b[2J\u001b[3J\u001b[0;0H", () => {
+      setRemountKey((prev) => prev + 1);
+    });
+  }, [stdout]);
+
+  // Track sessionId changes to trigger remount
+  useEffect(() => {
+    if (
+      prevSessionId.current &&
+      sessionId &&
+      prevSessionId.current !== sessionId
+    ) {
+      requestRemount();
+    }
+    if (sessionId) {
+      prevSessionId.current = sessionId;
+    }
+  }, [sessionId, requestRemount]);
 
   // Status metadata state
   const [workingDirectory, setWorkingDirectory] = useState("");
@@ -623,18 +649,19 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
     agentRef.current?.backgroundCurrentTask();
   }, []);
 
-  const handleRewindSelect = useCallback(async (index: number) => {
-    if (agentRef.current) {
-      try {
-        await agentRef.current.truncateHistory(index);
-
-        // Clear terminal screen after rewind
-        setRewindId((prev) => prev + 1);
-      } catch (error) {
-        logger.error("Failed to rewind:", error);
+  const handleRewindSelect = useCallback(
+    async (index: number) => {
+      if (agentRef.current) {
+        try {
+          await agentRef.current.truncateHistory(index);
+          requestRemount();
+        } catch (error) {
+          logger.error("Failed to rewind:", error);
+        }
       }
-    }
-  }, []);
+    },
+    [requestRemount],
+  );
 
   const getFullMessageThread = useCallback(async () => {
     if (agentRef.current) {
@@ -749,13 +776,15 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
     setPermissionMode,
     allowBypassInCycle,
     isConfirmationVisible,
+    hasPendingConfirmations: confirmationQueue.length > 0,
     confirmingTool,
     showConfirmation,
     hideConfirmation,
     handleConfirmationDecision,
     handleConfirmationCancel,
     backgroundCurrentTask,
-    rewindId,
+    remountKey,
+    requestRemount,
     handleRewindSelect,
     getFullMessageThread,
 

package/src/index.ts

@@ -1,7 +1,6 @@
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 import { startCli } from "./cli.js";
-import { logger } from "./utils/logger.js";
 import { Scope, generateRandomName, type PermissionMode } from "wave-agent-sdk";
 import { createWorktree, type WorktreeSession } from "./utils/worktree.js";
 import path from "path";
@@ -15,18 +14,6 @@ const version = packageJson.version;
 
 // Export main function for external use
 export async function main() {
-  // Start memory monitoring in debug mode
-  if (process.env.LOG_LEVEL === "DEBUG") {
-    setInterval(() => {
-      const usage = process.memoryUsage();
-      logger.debug(
-        `[Memory] RSS: ${Math.round(usage.rss / 1024 / 1024)}MB, ` +
-          `Heap: ${Math.round(usage.heapUsed / 1024 / 1024)}/${Math.round(usage.heapTotal / 1024 / 1024)}MB, ` +
-          `External: ${Math.round(usage.external / 1024 / 1024)}MB`,
-      );
-    }, 10000).unref();
-  }
-
   try {
     const originalCwd = process.cwd();
     const argv = await yargs(hideBin(process.argv))