wave-code 0.12.2 → 0.12.4

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,EAiD5C,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,46 +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, wasLastDetailsTooTall, sessionId } = useChat();
-    const [remountKey, setRemountKey] = useState(String(isExpanded) + rewindId + wasLastDetailsTooTall);
-    const prevSessionId = useRef(sessionId);
-    const isRemountScheduled = useRef(false);
-    useEffect(() => {
-        const newKey = String(isExpanded) +
-            rewindId +
-            wasLastDetailsTooTall +
-            (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,
-        wasLastDetailsTooTall,
-        sessionId,
-        remountKey,
-        stdout,
-    ]);
-    return _jsx(ChatInterface, {}, 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.map

@@ -1 +1 @@
-{"version":3,"file":"ChatInterface.d.ts","sourceRoot":"","sources":["../../src/components/ChatInterface.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyD,MAAM,OAAO,CAAC;AAc9E,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAsJjC,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,EAmIjC,CAAC"}

package/dist/components/ChatInterface.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import { useState, useCallback, useLayoutEffect, useRef } from "react";
-import { Box, useStdout, measureElement } 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";
@@ -11,59 +11,33 @@ import { ConfirmationDetails } from "./ConfirmationDetails.js";
 import { ConfirmationSelector } from "./ConfirmationSelector.js";
 import { useChat } from "../contexts/useChat.js";
 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 [isConfirmationTooTall, setIsConfirmationTooTall] = useState(false);
-    const { messages, isLoading, isCommandRunning, isCompressing, sendMessage, abortMessage, mcpServers, connectMcpServer, disconnectMcpServer, isExpanded, sessionId, latestTotalTokens, slashCommands, hasSlashCommand, isConfirmationVisible, confirmingTool, handleConfirmationDecision, handleConfirmationCancel: originalHandleConfirmationCancel, setWasLastDetailsTooTall, version, workdir, btwState, } = useChat();
-    const interfaceRef = useRef(null);
-    useLayoutEffect(() => {
-        if (!isConfirmationVisible) {
-            setIsConfirmationTooTall(false);
-            return;
-        }
-        if (isConfirmationTooTall) {
-            return;
-        }
-        if (interfaceRef.current) {
-            const { height } = measureElement(interfaceRef.current);
-            const terminalHeight = stdout?.rows || 24;
-            if (height > terminalHeight - 3) {
-                setIsConfirmationTooTall(true);
+    const terminalHeight = stdout?.rows ?? 24;
+    const chatInterfaceRef = useRef(null);
+    const prevForceStatic = useRef(forceStatic);
+    useEffect(() => {
+        if (isConfirmationVisible && chatInterfaceRef.current) {
+            const { height } = measureElement(chatInterfaceRef.current);
+            if (height > terminalHeight) {
+                setForceStatic(true);
             }
         }
-    }, [
-        messages,
-        isLoading,
-        isCommandRunning,
-        isCompressing,
-        isExpanded,
-        isConfirmationVisible,
-        isConfirmationTooTall,
-        stdout?.rows,
-    ]);
-    const displayMessages = messages;
-    const handleConfirmationCancel = useCallback(() => {
-        if (isConfirmationTooTall) {
-            setWasLastDetailsTooTall((prev) => prev + 1);
-            setIsConfirmationTooTall(false);
+        else {
+            setForceStatic(false);
         }
-        originalHandleConfirmationCancel();
-    }, [
-        isConfirmationTooTall,
-        originalHandleConfirmationCancel,
-        setWasLastDetailsTooTall,
-    ]);
-    const wrappedHandleConfirmationDecision = useCallback((decision) => {
-        if (isConfirmationTooTall) {
-            setWasLastDetailsTooTall((prev) => prev + 1);
-            setIsConfirmationTooTall(false);
+    }, [isConfirmationVisible, terminalHeight]);
+    // Handle forceStatic transition - request remount when transitioning from true to false
+    // AND there are no more pending confirmations in the queue
+    useEffect(() => {
+        if (prevForceStatic.current && !forceStatic && !hasPendingConfirmations) {
+            requestRemount();
         }
-        handleConfirmationDecision(decision);
-    }, [
-        isConfirmationTooTall,
-        handleConfirmationDecision,
-        setWasLastDetailsTooTall,
-    ]);
+        prevForceStatic.current = forceStatic;
+    }, [forceStatic, hasPendingConfirmations, requestRemount]);
     if (!sessionId)
         return null;
-    return (_jsxs(Box, { ref: interfaceRef, flexDirection: "column", children: [_jsx(MessageList, { messages: displayMessages, isExpanded: isExpanded, forceStatic: isConfirmationVisible && isConfirmationTooTall, version: version, workdir: workdir }), !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, isStatic: isConfirmationTooTall }), _jsx(ConfirmationSelector, { toolName: confirmingTool.name, toolInput: confirmingTool.input, suggestedPrefix: confirmingTool.suggestedPrefix, hidePersistentOption: confirmingTool.hidePersistentOption, isExpanded: isExpanded, onDecision: wrappedHandleConfirmationDecision, 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/ConfirmationDetails.d.ts

@@ -4,7 +4,6 @@ export interface ConfirmationDetailsProps {
     toolInput?: Record<string, unknown>;
     planContent?: string;
     isExpanded?: boolean;
-    isStatic?: boolean;
 }
 export declare const ConfirmationDetails: React.FC<ConfirmationDetailsProps>;
 //# sourceMappingURL=ConfirmationDetails.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ConfirmationDetails.d.ts","sourceRoot":"","sources":["../../src/components/ConfirmationDetails.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAsC1B,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,wBAAwB,CA6DlE,CAAC"}
+{"version":3,"file":"ConfirmationDetails.d.ts","sourceRoot":"","sources":["../../src/components/ConfirmationDetails.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAsC1B,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,wBAAwB,CAoDlE,CAAC"}

package/dist/components/ConfirmationDetails.js

@@ -1,6 +1,5 @@
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-import React from "react";
-import { Box, Text, Static } from "ink";
+import { Box, Text } from "ink";
 import { BASH_TOOL_NAME, EDIT_TOOL_NAME, WRITE_TOOL_NAME, EXIT_PLAN_MODE_TOOL_NAME, ASK_USER_QUESTION_TOOL_NAME, } from "wave-agent-sdk";
 import { DiffDisplay } from "./DiffDisplay.js";
 import { PlanDisplay } from "./PlanDisplay.js";
@@ -25,7 +24,7 @@ const getActionDescription = (toolName, toolInput) => {
             return "Execute operation";
     }
 };
-export const ConfirmationDetails = ({ toolName, toolInput, planContent, isExpanded = false, isStatic = false, }) => {
+export const ConfirmationDetails = ({ toolName, toolInput, planContent, isExpanded = false, }) => {
     const startLineNumber = toolInput?.startLineNumber ??
         (toolName === WRITE_TOOL_NAME ? 1 : undefined);
     const content = (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: "yellow", borderBottom: false, borderLeft: false, borderRight: false, children: [_jsxs(Text, { color: "yellow", bold: true, children: ["Tool: ", toolName] }), _jsx(Text, { color: "yellow", children: getActionDescription(toolName, toolInput) }), _jsx(DiffDisplay, { toolName: toolName, parameters: JSON.stringify(toolInput), startLineNumber: startLineNumber }), toolName !== WRITE_TOOL_NAME &&
@@ -36,9 +35,6 @@ export const ConfirmationDetails = ({ toolName, toolInput, planContent, isExpand
                 !!toolInput && (_jsx(Box, { paddingLeft: 2, borderLeft: true, borderColor: "cyan", children: _jsx(Text, { children: highlightToAnsi(JSON.stringify(toolInput, null, 2), "json") }) })), toolName !== ASK_USER_QUESTION_TOOL_NAME &&
                 toolName === EXIT_PLAN_MODE_TOOL_NAME &&
                 !!planContent && (_jsx(PlanDisplay, { plan: planContent, isExpanded: isExpanded }))] }));
-    if (isStatic) {
-        return (_jsx(Static, { items: [1], children: (item) => _jsx(React.Fragment, { children: content }, item) }));
-    }
     return content;
 };
 ConfirmationDetails.displayName = "ConfirmationDetails";

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,14 +60,13 @@ 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[];
         sessionIds: string[];
     }>;
-    wasLastDetailsTooTall: number;
-    setWasLastDetailsTooTall: React.Dispatch<React.SetStateAction<number>>;
     getGatewayConfig: () => import("wave-agent-sdk").GatewayConfig;
     getModelConfig: () => import("wave-agent-sdk").ModelConfig;
     workingDirectory: string;

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,31 @@ 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 prevRemountKey = useRef(remountKey);
+    const prevSessionId = useRef(null);
+    // Track sessionId changes to trigger remount
+    useEffect(() => {
+        if (prevSessionId.current &&
+            sessionId &&
+            prevSessionId.current !== sessionId) {
+            setRemountKey((prev) => prev + 1);
+        }
+        if (sessionId) {
+            prevSessionId.current = sessionId;
+        }
+    }, [sessionId]);
+    // Clear terminal when remountKey changes
+    useEffect(() => {
+        if (remountKey !== prevRemountKey.current && prevRemountKey.current !== 0) {
+            stdout?.write("\u001b[2J\u001b[3J\u001b[0;0H");
+        }
+        prevRemountKey.current = remountKey;
+    }, [remountKey, stdout]);
+    const requestRemount = useCallback(() => {
+        setRemountKey((prev) => prev + 1);
+    }, []);
     // Status metadata state
     const [workingDirectory, setWorkingDirectory] = useState("");
     // /btw state
@@ -81,8 +105,6 @@ export const ChatProvider = ({ children, bypassPermissions, permissionMode: init
             return newState;
         });
     }, []);
-    // Confirmation too tall state
-    const [wasLastDetailsTooTall, setWasLastDetailsTooTall] = useState(0);
     const allowBypassInCycle = !!bypassPermissions || initialPermissionMode === "bypassPermissions";
     const agentRef = useRef(null);
     // Permission confirmation methods with queue support
@@ -372,8 +394,7 @@ 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);
+                setRemountKey((prev) => prev + 1);
             }
             catch (error) {
                 logger.error("Failed to rewind:", error);
@@ -488,17 +509,17 @@ 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,
-        wasLastDetailsTooTall,
-        setWasLastDetailsTooTall,
         getGatewayConfig,
         getModelConfig,
         workingDirectory,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wave-code",
-  "version": "0.12.2",
+  "version": "0.12.4",
   "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.2"
+    "wave-agent-sdk": "0.12.4"
   },
   "devDependencies": {
     "@types/react": "^19.1.8",

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,62 +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, wasLastDetailsTooTall, sessionId } = useChat();
-
-  const [remountKey, setRemountKey] = useState(
-    String(isExpanded) + rewindId + wasLastDetailsTooTall,
-  );
-
-  const prevSessionId = useRef(sessionId);
-  const isRemountScheduled = useRef(false);
-
-  useEffect(() => {
-    const newKey =
-      String(isExpanded) +
-      rewindId +
-      wasLastDetailsTooTall +
-      (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,
-    wasLastDetailsTooTall,
-    sessionId,
-    remountKey,
-    stdout,
-  ]);
-
-  return <ChatInterface key={remountKey} />;
-};
-
 export const App: React.FC<AppProps> = ({
   restoreSessionId,
   continueLastSession,

package/src/components/ChatInterface.tsx

@@ -1,5 +1,6 @@
-import React, { useState, useCallback, useLayoutEffect, useRef } from "react";
-import { Box, useStdout, measureElement } 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";
@@ -10,12 +11,8 @@ import { ConfirmationDetails } from "./ConfirmationDetails.js";
 import { ConfirmationSelector } from "./ConfirmationSelector.js";
 
 import { useChat } from "../contexts/useChat.js";
-import type { PermissionDecision } from "wave-agent-sdk";
 
 export const ChatInterface: React.FC = () => {
-  const { stdout } = useStdout();
-  const [isConfirmationTooTall, setIsConfirmationTooTall] = useState(false);
-
   const {
     messages,
     isLoading,
@@ -32,84 +29,56 @@ export const ChatInterface: React.FC = () => {
     slashCommands,
     hasSlashCommand,
     isConfirmationVisible,
+    hasPendingConfirmations,
     confirmingTool,
     handleConfirmationDecision,
-    handleConfirmationCancel: originalHandleConfirmationCancel,
-    setWasLastDetailsTooTall,
+    handleConfirmationCancel,
     version,
     workdir,
     btwState,
+    remountKey,
+    requestRemount,
   } = useChat();
 
-  const interfaceRef = useRef(null);
-
-  useLayoutEffect(() => {
-    if (!isConfirmationVisible) {
-      setIsConfirmationTooTall(false);
-      return;
-    }
+  const displayMessages = messages;
 
-    if (isConfirmationTooTall) {
-      return;
-    }
+  const [forceStatic, setForceStatic] = useState(false);
+  const { stdout } = useStdout();
+  const terminalHeight = stdout?.rows ?? 24;
+  const chatInterfaceRef = useRef<DOMElement>(null);
+  const prevForceStatic = useRef(forceStatic);
 
-    if (interfaceRef.current) {
-      const { height } = measureElement(interfaceRef.current);
-      const terminalHeight = stdout?.rows || 24;
-      if (height > terminalHeight - 3) {
-        setIsConfirmationTooTall(true);
+  useEffect(() => {
+    if (isConfirmationVisible && chatInterfaceRef.current) {
+      const { height } = measureElement(chatInterfaceRef.current);
+      if (height > terminalHeight) {
+        setForceStatic(true);
       }
+    } else {
+      setForceStatic(false);
     }
-  }, [
-    messages,
-    isLoading,
-    isCommandRunning,
-    isCompressing,
-    isExpanded,
-    isConfirmationVisible,
-    isConfirmationTooTall,
-    stdout?.rows,
-  ]);
-
-  const displayMessages = messages;
+  }, [isConfirmationVisible, terminalHeight]);
 
-  const handleConfirmationCancel = useCallback(() => {
-    if (isConfirmationTooTall) {
-      setWasLastDetailsTooTall((prev) => prev + 1);
-      setIsConfirmationTooTall(false);
+  // Handle forceStatic transition - request remount when transitioning from true to false
+  // AND there are no more pending confirmations in the queue
+  useEffect(() => {
+    if (prevForceStatic.current && !forceStatic && !hasPendingConfirmations) {
+      requestRemount();
     }
-    originalHandleConfirmationCancel();
-  }, [
-    isConfirmationTooTall,
-    originalHandleConfirmationCancel,
-    setWasLastDetailsTooTall,
-  ]);
-
-  const wrappedHandleConfirmationDecision = useCallback(
-    (decision: PermissionDecision) => {
-      if (isConfirmationTooTall) {
-        setWasLastDetailsTooTall((prev) => prev + 1);
-        setIsConfirmationTooTall(false);
-      }
-      handleConfirmationDecision(decision);
-    },
-    [
-      isConfirmationTooTall,
-      handleConfirmationDecision,
-      setWasLastDetailsTooTall,
-    ],
-  );
+    prevForceStatic.current = forceStatic;
+  }, [forceStatic, hasPendingConfirmations, requestRemount]);
 
   if (!sessionId) return null;
 
   return (
-    <Box ref={interfaceRef} flexDirection="column">
+    <Box ref={chatInterfaceRef} flexDirection="column">
       <MessageList
+        key={remountKey}
         messages={displayMessages}
         isExpanded={isExpanded}
-        forceStatic={isConfirmationVisible && isConfirmationTooTall}
         version={version}
         workdir={workdir}
+        forceStatic={forceStatic}
       />
 
       {!isConfirmationVisible && !isExpanded && (
@@ -141,20 +110,32 @@ export const ChatInterface: React.FC = () => {
 
       {isConfirmationVisible && (
         <>
-          <ConfirmationDetails
-            toolName={confirmingTool!.name}
-            toolInput={confirmingTool!.input}
-            planContent={confirmingTool!.planContent}
-            isExpanded={isExpanded}
-            isStatic={isConfirmationTooTall}
-          />
+          {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}
             suggestedPrefix={confirmingTool!.suggestedPrefix}
             hidePersistentOption={confirmingTool!.hidePersistentOption}
             isExpanded={isExpanded}
-            onDecision={wrappedHandleConfirmationDecision}
+            onDecision={handleConfirmationDecision}
             onCancel={handleConfirmationCancel}
             onAbort={abortMessage}
           />

package/src/components/ConfirmationDetails.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { Box, Text, Static } from "ink";
+import { Box, Text } from "ink";
 import {
   BASH_TOOL_NAME,
   EDIT_TOOL_NAME,
@@ -41,7 +41,6 @@ export interface ConfirmationDetailsProps {
   toolInput?: Record<string, unknown>;
   planContent?: string;
   isExpanded?: boolean;
-  isStatic?: boolean;
 }
 
 export const ConfirmationDetails: React.FC<ConfirmationDetailsProps> = ({
@@ -49,7 +48,6 @@ export const ConfirmationDetails: React.FC<ConfirmationDetailsProps> = ({
   toolInput,
   planContent,
   isExpanded = false,
-  isStatic = false,
 }) => {
   const startLineNumber =
     (toolInput?.startLineNumber as number | undefined) ??
@@ -96,14 +94,6 @@ export const ConfirmationDetails: React.FC<ConfirmationDetailsProps> = ({
     </Box>
   );
 
-  if (isStatic) {
-    return (
-      <Static items={[1]}>
-        {(item) => <React.Fragment key={item}>{content}</React.Fragment>}
-      </Static>
-    );
-  }
-
   return content;
 };
 

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,15 +106,15 @@ 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[];
     sessionIds: string[];
   }>;
-  wasLastDetailsTooTall: number;
-  setWasLastDetailsTooTall: React.Dispatch<React.SetStateAction<number>>;
   // Status metadata
   getGatewayConfig: () => import("wave-agent-sdk").GatewayConfig;
   getModelConfig: () => import("wave-agent-sdk").ModelConfig;
@@ -154,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);
@@ -252,8 +254,36 @@ 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 prevRemountKey = useRef(remountKey);
+  const prevSessionId = useRef<string | null>(null);
+
+  // Track sessionId changes to trigger remount
+  useEffect(() => {
+    if (
+      prevSessionId.current &&
+      sessionId &&
+      prevSessionId.current !== sessionId
+    ) {
+      setRemountKey((prev) => prev + 1);
+    }
+    if (sessionId) {
+      prevSessionId.current = sessionId;
+    }
+  }, [sessionId]);
+
+  // Clear terminal when remountKey changes
+  useEffect(() => {
+    if (remountKey !== prevRemountKey.current && prevRemountKey.current !== 0) {
+      stdout?.write("\u001b[2J\u001b[3J\u001b[0;0H");
+    }
+    prevRemountKey.current = remountKey;
+  }, [remountKey, stdout]);
+
+  const requestRemount = useCallback(() => {
+    setRemountKey((prev) => prev + 1);
+  }, []);
 
   // Status metadata state
   const [workingDirectory, setWorkingDirectory] = useState("");
@@ -280,8 +310,6 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
     [],
   );
 
-  // Confirmation too tall state
-  const [wasLastDetailsTooTall, setWasLastDetailsTooTall] = useState(0);
   const allowBypassInCycle =
     !!bypassPermissions || initialPermissionMode === "bypassPermissions";
 
@@ -631,9 +659,7 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
     if (agentRef.current) {
       try {
         await agentRef.current.truncateHistory(index);
-
-        // Clear terminal screen after rewind
-        setRewindId((prev) => prev + 1);
+        setRemountKey((prev) => prev + 1);
       } catch (error) {
         logger.error("Failed to rewind:", error);
       }
@@ -753,17 +779,18 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
     setPermissionMode,
     allowBypassInCycle,
     isConfirmationVisible,
+    hasPendingConfirmations: confirmationQueue.length > 0,
     confirmingTool,
     showConfirmation,
     hideConfirmation,
     handleConfirmationDecision,
     handleConfirmationCancel,
     backgroundCurrentTask,
-    rewindId,
+    remountKey,
+    requestRemount,
     handleRewindSelect,
     getFullMessageThread,
-    wasLastDetailsTooTall,
-    setWasLastDetailsTooTall,
+
     getGatewayConfig,
     getModelConfig,
     workingDirectory,