wave-code 0.7.0 → 0.7.2

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,KAAgC,MAAM,OAAO,CAAC;AAYrD,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAyHjC,CAAC"}
+{"version":3,"file":"ChatInterface.d.ts","sourceRoot":"","sources":["../../src/components/ChatInterface.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiD,MAAM,OAAO,CAAC;AAYtE,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAqIjC,CAAC"}

package/dist/components/ChatInterface.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import { useState, useCallback } from "react";
+import { useState, useCallback, useLayoutEffect } from "react";
 import { Box, useStdout } from "ink";
 import { MessageList } from "./MessageList.js";
 import { InputBox } from "./InputBox.js";
@@ -10,38 +10,51 @@ import { ConfirmationSelector } from "./ConfirmationSelector.js";
 import { useChat } from "../contexts/useChat.js";
 export const ChatInterface = () => {
     const { stdout } = useStdout();
-    const [isDetailsTooTall, setIsDetailsTooTall] = useState(false);
+    const [detailsHeight, setDetailsHeight] = useState(0);
+    const [selectorHeight, setSelectorHeight] = useState(0);
+    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, } = useChat();
-    const handleHeightMeasured = useCallback((height) => {
+    const handleDetailsHeightMeasured = useCallback((height) => {
+        setDetailsHeight(height);
+    }, []);
+    const handleSelectorHeightMeasured = useCallback((height) => {
+        setSelectorHeight(height);
+    }, []);
+    useLayoutEffect(() => {
         const terminalHeight = stdout?.rows || 24;
-        if (height > terminalHeight - 10) {
-            setIsDetailsTooTall(true);
+        const totalHeight = detailsHeight + selectorHeight;
+        if (totalHeight > terminalHeight) {
+            setIsConfirmationTooTall(true);
         }
         else {
-            setIsDetailsTooTall(false);
+            setIsConfirmationTooTall(false);
         }
-    }, [stdout?.rows]);
+    }, [detailsHeight, selectorHeight, stdout?.rows]);
     const handleConfirmationCancel = useCallback(() => {
-        if (isDetailsTooTall) {
+        if (isConfirmationTooTall) {
             setWasLastDetailsTooTall((prev) => prev + 1);
-            setIsDetailsTooTall(false);
+            setIsConfirmationTooTall(false);
         }
         originalHandleConfirmationCancel();
     }, [
-        isDetailsTooTall,
+        isConfirmationTooTall,
         originalHandleConfirmationCancel,
         setWasLastDetailsTooTall,
     ]);
     const wrappedHandleConfirmationDecision = useCallback((decision) => {
-        if (isDetailsTooTall) {
+        if (isConfirmationTooTall) {
             setWasLastDetailsTooTall((prev) => prev + 1);
-            setIsDetailsTooTall(false);
+            setIsConfirmationTooTall(false);
         }
         handleConfirmationDecision(decision);
-    }, [isDetailsTooTall, handleConfirmationDecision, setWasLastDetailsTooTall]);
+    }, [
+        isConfirmationTooTall,
+        handleConfirmationDecision,
+        setWasLastDetailsTooTall,
+    ]);
     if (!sessionId)
         return null;
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(MessageList, { messages: messages, isLoading: isLoading, isCommandRunning: isCommandRunning, isExpanded: isExpanded, forceStaticLastMessage: isDetailsTooTall }), (isLoading || isCommandRunning || isCompressing) &&
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(MessageList, { messages: messages, isExpanded: isExpanded, hideDynamicBlocks: isConfirmationVisible }), (isLoading || isCommandRunning || isCompressing) &&
                 !isConfirmationVisible &&
-                !isExpanded && (_jsx(LoadingIndicator, { isLoading: isLoading, isCommandRunning: isCommandRunning, isCompressing: isCompressing, latestTotalTokens: latestTotalTokens })), !isConfirmationVisible && !isExpanded && _jsx(TaskList, {}), isConfirmationVisible && (_jsxs(_Fragment, { children: [_jsx(ConfirmationDetails, { toolName: confirmingTool.name, toolInput: confirmingTool.input, isExpanded: isExpanded, onHeightMeasured: handleHeightMeasured }), _jsx(ConfirmationSelector, { toolName: confirmingTool.name, toolInput: confirmingTool.input, suggestedPrefix: confirmingTool.suggestedPrefix, hidePersistentOption: confirmingTool.hidePersistentOption, isExpanded: isExpanded, onDecision: wrappedHandleConfirmationDecision, onCancel: handleConfirmationCancel, onAbort: abortMessage })] })), !isConfirmationVisible && !isExpanded && (_jsx(InputBox, { isLoading: isLoading, isCommandRunning: isCommandRunning, sendMessage: sendMessage, abortMessage: abortMessage, mcpServers: mcpServers, connectMcpServer: connectMcpServer, disconnectMcpServer: disconnectMcpServer, slashCommands: slashCommands, hasSlashCommand: hasSlashCommand }))] }));
+                !isExpanded && (_jsx(LoadingIndicator, { isLoading: isLoading, isCommandRunning: isCommandRunning, isCompressing: isCompressing, latestTotalTokens: latestTotalTokens })), !isConfirmationVisible && !isExpanded && _jsx(TaskList, {}), isConfirmationVisible && (_jsxs(_Fragment, { children: [_jsx(ConfirmationDetails, { toolName: confirmingTool.name, toolInput: confirmingTool.input, isExpanded: isExpanded, onHeightMeasured: handleDetailsHeightMeasured, isStatic: isConfirmationTooTall }), _jsx(ConfirmationSelector, { toolName: confirmingTool.name, toolInput: confirmingTool.input, suggestedPrefix: confirmingTool.suggestedPrefix, hidePersistentOption: confirmingTool.hidePersistentOption, isExpanded: isExpanded, onDecision: wrappedHandleConfirmationDecision, onCancel: handleConfirmationCancel, onAbort: abortMessage, onHeightMeasured: handleSelectorHeightMeasured })] })), !isConfirmationVisible && !isExpanded && (_jsx(InputBox, { isLoading: isLoading, isCommandRunning: isCommandRunning, sendMessage: sendMessage, abortMessage: abortMessage, mcpServers: mcpServers, connectMcpServer: connectMcpServer, disconnectMcpServer: disconnectMcpServer, slashCommands: slashCommands, hasSlashCommand: hasSlashCommand }))] }));
 };

package/dist/components/ConfirmationDetails.d.ts

@@ -4,6 +4,7 @@ export interface ConfirmationDetailsProps {
     toolInput?: Record<string, unknown>;
     isExpanded?: boolean;
     onHeightMeasured?: (height: number) => void;
+    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,KAA4C,MAAM,OAAO,CAAC;AAqCjE,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7C;AAED,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,wBAAwB,CAuDlE,CAAC"}
+{"version":3,"file":"ConfirmationDetails.d.ts","sourceRoot":"","sources":["../../src/components/ConfirmationDetails.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkC,MAAM,OAAO,CAAC;AAqCvD,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,wBAAwB,CA0DlE,CAAC"}

package/dist/components/ConfirmationDetails.js

@@ -1,5 +1,5 @@
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-import { useLayoutEffect, useRef, useState } from "react";
+import { useLayoutEffect, useRef } from "react";
 import { Box, Text, useStdout, measureElement, Static } 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";
@@ -24,21 +24,18 @@ const getActionDescription = (toolName, toolInput) => {
             return "Execute operation";
     }
 };
-export const ConfirmationDetails = ({ toolName, toolInput, isExpanded = false, onHeightMeasured, }) => {
+export const ConfirmationDetails = ({ toolName, toolInput, isExpanded = false, onHeightMeasured, isStatic = false, }) => {
     const { stdout } = useStdout();
-    const [isStatic, setIsStatic] = useState(false);
     const boxRef = useRef(null);
+    const startLineNumber = toolInput?.startLineNumber ??
+        (toolName === WRITE_TOOL_NAME ? 1 : undefined);
     useLayoutEffect(() => {
         if (boxRef.current) {
             const { height } = measureElement(boxRef.current);
-            const terminalHeight = stdout?.rows || 24;
-            if (height > terminalHeight - 10) {
-                setIsStatic(true);
-            }
             onHeightMeasured?.(height);
         }
-    }, [stdout?.rows, onHeightMeasured]);
-    const content = (_jsxs(Box, { ref: boxRef, flexDirection: "column", borderStyle: "single", borderColor: "yellow", borderBottom: false, borderLeft: false, borderRight: false, paddingTop: 1, 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) }), toolName !== ASK_USER_QUESTION_TOOL_NAME &&
+    }, [stdout?.rows, onHeightMeasured, toolInput, isExpanded]);
+    const content = (_jsxs(Box, { ref: boxRef, 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 !== ASK_USER_QUESTION_TOOL_NAME &&
                 toolName === EXIT_PLAN_MODE_TOOL_NAME &&
                 !!toolInput?.plan_content && (_jsx(PlanDisplay, { plan: toolInput.plan_content, isExpanded: isExpanded }))] }));
     if (isStatic) {

package/dist/components/ConfirmationSelector.d.ts

@@ -9,6 +9,7 @@ export interface ConfirmationSelectorProps {
     onDecision: (decision: PermissionDecision) => void;
     onCancel: () => void;
     onAbort: () => void;
+    onHeightMeasured?: (height: number) => void;
 }
 export declare const ConfirmationSelector: React.FC<ConfirmationSelectorProps>;
 //# sourceMappingURL=ConfirmationSelector.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ConfirmationSelector.d.ts","sourceRoot":"","sources":["../../src/components/ConfirmationSelector.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAExC,OAAO,KAAK,EAAE,kBAAkB,EAAwB,MAAM,gBAAgB,CAAC;AAgB/E,MAAM,WAAW,yBAAyB;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,CAAC,QAAQ,EAAE,kBAAkB,KAAK,IAAI,CAAC;IACnD,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AASD,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CAwapE,CAAC"}
+{"version":3,"file":"ConfirmationSelector.d.ts","sourceRoot":"","sources":["../../src/components/ConfirmationSelector.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4C,MAAM,OAAO,CAAC;AAEjE,OAAO,KAAK,EAAE,kBAAkB,EAAwB,MAAM,gBAAgB,CAAC;AAgB/E,MAAM,WAAW,yBAAyB;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,CAAC,QAAQ,EAAE,kBAAkB,KAAK,IAAI,CAAC;IACnD,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7C;AASD,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CAsfpE,CAAC"}

package/dist/components/ConfirmationSelector.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { useState } from "react";
-import { Box, Text, useInput } from "ink";
+import { useLayoutEffect, useRef, useState } from "react";
+import { Box, Text, useInput, useStdout, measureElement } from "ink";
 import { BASH_TOOL_NAME, EXIT_PLAN_MODE_TOOL_NAME, ASK_USER_QUESTION_TOOL_NAME, } from "wave-agent-sdk";
 const getHeaderColor = (header) => {
     const colors = ["red", "green", "blue", "magenta", "cyan"];
@@ -10,24 +10,34 @@ const getHeaderColor = (header) => {
     }
     return colors[Math.abs(hash) % colors.length];
 };
-export const ConfirmationSelector = ({ toolName, toolInput, suggestedPrefix, hidePersistentOption, isExpanded = false, onDecision, onCancel, onAbort, }) => {
+export const ConfirmationSelector = ({ toolName, toolInput, suggestedPrefix, hidePersistentOption, isExpanded = false, onDecision, onCancel, onAbort, onHeightMeasured, }) => {
+    const { stdout } = useStdout();
+    const boxRef = useRef(null);
+    useLayoutEffect(() => {
+        if (boxRef.current) {
+            const { height } = measureElement(boxRef.current);
+            onHeightMeasured?.(height);
+        }
+    }, [stdout?.rows, onHeightMeasured, toolName, toolInput, isExpanded]);
     const [state, setState] = useState({
-        selectedOption: "allow",
+        selectedOption: toolName === EXIT_PLAN_MODE_TOOL_NAME ? "clear" : "allow",
         alternativeText: "",
         alternativeCursorPosition: 0,
         hasUserInput: false,
     });
-    const [currentQuestionIndex, setCurrentQuestionIndex] = useState(0);
-    const [selectedOptionIndex, setSelectedOptionIndex] = useState(0);
-    const [selectedOptionIndices, setSelectedOptionIndices] = useState(new Set());
-    const [userAnswers, setUserAnswers] = useState({});
-    const [otherText, setOtherText] = useState("");
-    const [otherCursorPosition, setOtherCursorPosition] = useState(0);
+    const [questionState, setQuestionState] = useState({
+        currentQuestionIndex: 0,
+        selectedOptionIndex: 0,
+        selectedOptionIndices: new Set(),
+        userAnswers: {},
+        otherText: "",
+        otherCursorPosition: 0,
+    });
     const questions = toolInput?.questions || [];
-    const currentQuestion = questions[currentQuestionIndex];
+    const currentQuestion = questions[questionState.currentQuestionIndex];
     const getAutoOptionText = () => {
         if (toolName === EXIT_PLAN_MODE_TOOL_NAME) {
-            return "Yes, and auto-accept edits";
+            return "Yes, auto-accept edits";
         }
         if (toolName === BASH_TOOL_NAME) {
             if (suggestedPrefix) {
@@ -48,104 +58,140 @@ export const ConfirmationSelector = ({ toolName, toolInput, suggestedPrefix, hid
                 return;
             const options = [...currentQuestion.options, { label: "Other" }];
             const isMultiSelect = currentQuestion.multiSelect;
-            const isOtherFocused = selectedOptionIndex === options.length - 1;
             if (key.return) {
-                let answer = "";
-                if (isMultiSelect) {
-                    const selectedLabels = Array.from(selectedOptionIndices)
-                        .filter((i) => i < currentQuestion.options.length)
-                        .map((i) => currentQuestion.options[i].label);
-                    const isOtherChecked = selectedOptionIndices.has(options.length - 1);
-                    if (isOtherChecked && otherText.trim()) {
-                        selectedLabels.push(otherText.trim());
+                setQuestionState((prev) => {
+                    const isOtherFocused = prev.selectedOptionIndex === options.length - 1;
+                    let answer = "";
+                    if (isMultiSelect) {
+                        const selectedLabels = Array.from(prev.selectedOptionIndices)
+                            .filter((i) => i < currentQuestion.options.length)
+                            .map((i) => currentQuestion.options[i].label);
+                        const isOtherChecked = prev.selectedOptionIndices.has(options.length - 1);
+                        if (isOtherChecked && prev.otherText.trim()) {
+                            selectedLabels.push(prev.otherText.trim());
+                        }
+                        answer = selectedLabels.join(", ");
                     }
-                    answer = selectedLabels.join(", ");
-                }
-                else {
-                    if (isOtherFocused) {
-                        answer = otherText.trim();
+                    else {
+                        if (isOtherFocused) {
+                            answer = prev.otherText.trim();
+                        }
+                        else {
+                            answer = options[prev.selectedOptionIndex].label;
+                        }
+                    }
+                    if (!answer)
+                        return prev;
+                    const newAnswers = {
+                        ...prev.userAnswers,
+                        [currentQuestion.question]: answer,
+                    };
+                    if (prev.currentQuestionIndex < questions.length - 1) {
+                        return {
+                            ...prev,
+                            currentQuestionIndex: prev.currentQuestionIndex + 1,
+                            selectedOptionIndex: 0,
+                            selectedOptionIndices: new Set(),
+                            userAnswers: newAnswers,
+                            otherText: "",
+                            otherCursorPosition: 0,
+                        };
                     }
                     else {
-                        answer = options[selectedOptionIndex].label;
+                        onDecision({
+                            behavior: "allow",
+                            message: JSON.stringify(newAnswers),
+                        });
+                        return {
+                            ...prev,
+                            userAnswers: newAnswers,
+                        };
                     }
-                }
-                if (!answer)
-                    return;
-                const newAnswers = {
-                    ...userAnswers,
-                    [currentQuestion.question]: answer,
-                };
-                setUserAnswers(newAnswers);
-                if (currentQuestionIndex < questions.length - 1) {
-                    setCurrentQuestionIndex(currentQuestionIndex + 1);
-                    setSelectedOptionIndex(0);
-                    setSelectedOptionIndices(new Set());
-                    setOtherText("");
-                    setOtherCursorPosition(0);
-                }
-                else {
-                    onDecision({
-                        behavior: "allow",
-                        message: JSON.stringify(newAnswers),
-                    });
-                }
+                });
                 return;
             }
             if (input === " ") {
-                if (isMultiSelect &&
-                    (!isOtherFocused || !selectedOptionIndices.has(selectedOptionIndex))) {
-                    setSelectedOptionIndices((prev) => {
-                        const next = new Set(prev);
-                        if (next.has(selectedOptionIndex))
-                            next.delete(selectedOptionIndex);
+                setQuestionState((prev) => {
+                    const isOtherFocused = prev.selectedOptionIndex === options.length - 1;
+                    if (isMultiSelect &&
+                        (!isOtherFocused ||
+                            !prev.selectedOptionIndices.has(prev.selectedOptionIndex))) {
+                        const nextIndices = new Set(prev.selectedOptionIndices);
+                        if (nextIndices.has(prev.selectedOptionIndex))
+                            nextIndices.delete(prev.selectedOptionIndex);
                         else
-                            next.add(selectedOptionIndex);
-                        return next;
-                    });
-                    return;
-                }
-                if (!isOtherFocused)
-                    return;
+                            nextIndices.add(prev.selectedOptionIndex);
+                        return {
+                            ...prev,
+                            selectedOptionIndices: nextIndices,
+                        };
+                    }
+                    return prev;
+                });
+                // If it's other and focused, we don't return here, allowing the input handler below to handle it
             }
             if (key.upArrow) {
-                if (selectedOptionIndex > 0)
-                    setSelectedOptionIndex(selectedOptionIndex - 1);
+                setQuestionState((prev) => ({
+                    ...prev,
+                    selectedOptionIndex: Math.max(0, prev.selectedOptionIndex - 1),
+                }));
                 return;
             }
             if (key.downArrow) {
-                if (selectedOptionIndex < options.length - 1)
-                    setSelectedOptionIndex(selectedOptionIndex + 1);
+                setQuestionState((prev) => ({
+                    ...prev,
+                    selectedOptionIndex: Math.min(options.length - 1, prev.selectedOptionIndex + 1),
+                }));
                 return;
             }
-            if (isOtherFocused) {
-                if (key.leftArrow) {
-                    setOtherCursorPosition((prev) => Math.max(0, prev - 1));
-                    return;
-                }
-                if (key.rightArrow) {
-                    setOtherCursorPosition((prev) => Math.min(otherText.length, prev + 1));
-                    return;
-                }
-                if (key.backspace || key.delete) {
-                    if (otherCursorPosition > 0) {
-                        setOtherText((prev) => prev.slice(0, otherCursorPosition - 1) +
-                            prev.slice(otherCursorPosition));
-                        setOtherCursorPosition((prev) => prev - 1);
+            setQuestionState((prev) => {
+                const isOtherFocused = prev.selectedOptionIndex === options.length - 1;
+                if (isOtherFocused) {
+                    if (key.leftArrow) {
+                        return {
+                            ...prev,
+                            otherCursorPosition: Math.max(0, prev.otherCursorPosition - 1),
+                        };
+                    }
+                    if (key.rightArrow) {
+                        return {
+                            ...prev,
+                            otherCursorPosition: Math.min(prev.otherText.length, prev.otherCursorPosition + 1),
+                        };
+                    }
+                    if (key.backspace || key.delete) {
+                        if (prev.otherCursorPosition > 0) {
+                            return {
+                                ...prev,
+                                otherText: prev.otherText.slice(0, prev.otherCursorPosition - 1) +
+                                    prev.otherText.slice(prev.otherCursorPosition),
+                                otherCursorPosition: prev.otherCursorPosition - 1,
+                            };
+                        }
+                    }
+                    if (input && !key.ctrl && !key.meta) {
+                        return {
+                            ...prev,
+                            otherText: prev.otherText.slice(0, prev.otherCursorPosition) +
+                                input +
+                                prev.otherText.slice(prev.otherCursorPosition),
+                            otherCursorPosition: prev.otherCursorPosition + input.length,
+                        };
                     }
-                    return;
-                }
-                if (input && !key.ctrl && !key.meta) {
-                    setOtherText((prev) => prev.slice(0, otherCursorPosition) +
-                        input +
-                        prev.slice(otherCursorPosition));
-                    setOtherCursorPosition((prev) => prev + input.length);
-                    return;
                 }
-            }
+                return prev;
+            });
             return;
         }
         if (key.return) {
-            if (state.selectedOption === "allow") {
+            if (state.selectedOption === "clear") {
+                onDecision({
+                    behavior: "allow",
+                    newPermissionMode: "acceptEdits",
+                    clearContext: true,
+                });
+            }
+            else if (state.selectedOption === "allow") {
                 if (toolName === EXIT_PLAN_MODE_TOOL_NAME) {
                     onDecision({ behavior: "allow", newPermissionMode: "default" });
                 }
@@ -185,30 +231,31 @@ export const ConfirmationSelector = ({ toolName, toolInput, suggestedPrefix, hid
                 return;
             }
         }
+        const availableOptions = [];
+        if (toolName === EXIT_PLAN_MODE_TOOL_NAME)
+            availableOptions.push("clear");
+        availableOptions.push("allow");
+        if (!hidePersistentOption)
+            availableOptions.push("auto");
+        availableOptions.push("alternative");
         if (key.upArrow) {
-            setState((prev) => {
-                if (prev.selectedOption === "alternative")
-                    return {
-                        ...prev,
-                        selectedOption: hidePersistentOption ? "allow" : "auto",
-                    };
-                if (prev.selectedOption === "auto")
-                    return { ...prev, selectedOption: "allow" };
-                return prev;
-            });
+            const currentIndex = availableOptions.indexOf(state.selectedOption);
+            if (currentIndex > 0) {
+                setState((prev) => ({
+                    ...prev,
+                    selectedOption: availableOptions[currentIndex - 1],
+                }));
+            }
             return;
         }
         if (key.downArrow) {
-            setState((prev) => {
-                if (prev.selectedOption === "allow")
-                    return {
-                        ...prev,
-                        selectedOption: hidePersistentOption ? "alternative" : "auto",
-                    };
-                if (prev.selectedOption === "auto")
-                    return { ...prev, selectedOption: "alternative" };
-                return prev;
-            });
+            const currentIndex = availableOptions.indexOf(state.selectedOption);
+            if (currentIndex < availableOptions.length - 1) {
+                setState((prev) => ({
+                    ...prev,
+                    selectedOption: availableOptions[currentIndex + 1],
+                }));
+            }
             return;
         }
         if (input && !key.ctrl && !key.meta && !("alt" in key && key.alt)) {
@@ -244,23 +291,23 @@ export const ConfirmationSelector = ({ toolName, toolInput, suggestedPrefix, hid
             return;
         }
     });
-    const placeholderText = "Type here to tell Wave what to do differently";
+    const placeholderText = "Type here to tell Wave what to change";
     const showPlaceholder = state.selectedOption === "alternative" && !state.hasUserInput;
-    return (_jsxs(Box, { flexDirection: "column", children: [toolName === ASK_USER_QUESTION_TOOL_NAME &&
+    return (_jsxs(Box, { ref: boxRef, flexDirection: "column", children: [toolName === ASK_USER_QUESTION_TOOL_NAME &&
                 currentQuestion &&
                 !isExpanded && (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsxs(Box, { marginBottom: 1, children: [_jsx(Text, { color: getHeaderColor(currentQuestion.header), bold: true, children: currentQuestion.header.slice(0, 12).toUpperCase() }), _jsx(Box, { marginLeft: 1, children: _jsx(Text, { bold: true, children: currentQuestion.question }) })] }), _jsx(Box, { flexDirection: "column", children: [...currentQuestion.options, { label: "Other" }].map((option, index) => {
-                            const isSelected = selectedOptionIndex === index;
+                            const isSelected = questionState.selectedOptionIndex === index;
                             const isChecked = currentQuestion.multiSelect
-                                ? selectedOptionIndices.has(index)
+                                ? questionState.selectedOptionIndices.has(index)
                                 : isSelected;
                             const isOther = index === currentQuestion.options.length;
                             return (_jsx(Box, { children: _jsxs(Text, { color: isSelected ? "black" : "white", backgroundColor: isSelected ? "yellow" : undefined, children: [isSelected ? "> " : "  ", currentQuestion.multiSelect
                                             ? isChecked
                                                 ? "[x] "
                                                 : "[ ] "
-                                            : "", option.label, option.description ? ` - ${option.description}` : "", isOther && isSelected && (_jsxs(Text, { children: [":", " ", otherText ? (_jsxs(_Fragment, { children: [otherText.slice(0, otherCursorPosition), _jsx(Text, { backgroundColor: "white", color: "black", children: otherText[otherCursorPosition] || " " }), otherText.slice(otherCursorPosition + 1)] })) : (_jsx(Text, { color: "gray", dimColor: true, children: "[Type your answer...]" }))] }))] }) }, index));
-                        }) }), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { dimColor: true, children: ["Question ", currentQuestionIndex + 1, " of ", questions.length, " \u2022", currentQuestion.multiSelect ? " Space to toggle •" : "", " Use \u2191\u2193 to navigate \u2022 Enter to confirm"] }) })] })), toolName !== ASK_USER_QUESTION_TOOL_NAME && !isExpanded && (_jsxs(_Fragment, { children: [_jsx(Box, { marginTop: 1, children: _jsx(Text, { children: "Do you want to proceed?" }) }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Box, { children: _jsxs(Text, { color: state.selectedOption === "allow" ? "black" : "white", backgroundColor: state.selectedOption === "allow" ? "yellow" : undefined, bold: state.selectedOption === "allow", children: [state.selectedOption === "allow" ? "> " : "  ", toolName === EXIT_PLAN_MODE_TOOL_NAME
-                                            ? "Yes, proceed with default mode"
-                                            : "Yes"] }) }, "allow-option"), !hidePersistentOption && (_jsx(Box, { children: _jsxs(Text, { color: state.selectedOption === "auto" ? "black" : "white", backgroundColor: state.selectedOption === "auto" ? "yellow" : undefined, bold: state.selectedOption === "auto", children: [state.selectedOption === "auto" ? "> " : "  ", getAutoOptionText()] }) }, "auto-option")), _jsx(Box, { children: _jsxs(Text, { color: state.selectedOption === "alternative" ? "black" : "white", backgroundColor: state.selectedOption === "alternative" ? "yellow" : undefined, bold: state.selectedOption === "alternative", children: [state.selectedOption === "alternative" ? "> " : "  ", showPlaceholder ? (_jsx(Text, { color: "gray", dimColor: true, children: placeholderText })) : (_jsx(Text, { children: state.alternativeText ? (_jsxs(_Fragment, { children: [state.alternativeText.slice(0, state.alternativeCursorPosition), _jsx(Text, { backgroundColor: "white", color: "black", children: state.alternativeText[state.alternativeCursorPosition] || " " }), state.alternativeText.slice(state.alternativeCursorPosition + 1)] })) : ("Type here to tell Wave what to do differently") }))] }) }, "alternative-option")] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "Use \u2191\u2193 to navigate \u2022 ESC to cancel" }) })] }))] }));
+                                            : "", option.label, option.description ? ` - ${option.description}` : "", isOther && isSelected && (_jsxs(Text, { children: [":", " ", questionState.otherText ? (_jsxs(_Fragment, { children: [questionState.otherText.slice(0, questionState.otherCursorPosition), _jsx(Text, { backgroundColor: "white", color: "black", children: questionState.otherText[questionState.otherCursorPosition] || " " }), questionState.otherText.slice(questionState.otherCursorPosition + 1)] })) : (_jsx(Text, { color: "gray", dimColor: true, children: "[Type your answer...]" }))] }))] }) }, index));
+                        }) }), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { dimColor: true, children: ["Question ", questionState.currentQuestionIndex + 1, " of", " ", questions.length, " \u2022", currentQuestion.multiSelect ? " Space to toggle •" : "", " Use \u2191\u2193 to navigate \u2022 Enter to confirm"] }) })] })), toolName !== ASK_USER_QUESTION_TOOL_NAME && !isExpanded && (_jsxs(_Fragment, { children: [_jsx(Box, { marginTop: 1, children: _jsx(Text, { children: "Do you want to proceed?" }) }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [toolName === EXIT_PLAN_MODE_TOOL_NAME && (_jsx(Box, { children: _jsxs(Text, { color: state.selectedOption === "clear" ? "black" : "white", backgroundColor: state.selectedOption === "clear" ? "yellow" : undefined, bold: state.selectedOption === "clear", children: [state.selectedOption === "clear" ? "> " : "  ", "Yes, clear context and auto-accept edits"] }) }, "clear-option")), _jsx(Box, { children: _jsxs(Text, { color: state.selectedOption === "allow" ? "black" : "white", backgroundColor: state.selectedOption === "allow" ? "yellow" : undefined, bold: state.selectedOption === "allow", children: [state.selectedOption === "allow" ? "> " : "  ", toolName === EXIT_PLAN_MODE_TOOL_NAME
+                                            ? "Yes, manually approve edits"
+                                            : "Yes, proceed"] }) }, "allow-option"), !hidePersistentOption && (_jsx(Box, { children: _jsxs(Text, { color: state.selectedOption === "auto" ? "black" : "white", backgroundColor: state.selectedOption === "auto" ? "yellow" : undefined, bold: state.selectedOption === "auto", children: [state.selectedOption === "auto" ? "> " : "  ", getAutoOptionText()] }) }, "auto-option")), _jsx(Box, { children: _jsxs(Text, { color: state.selectedOption === "alternative" ? "black" : "white", backgroundColor: state.selectedOption === "alternative" ? "yellow" : undefined, bold: state.selectedOption === "alternative", children: [state.selectedOption === "alternative" ? "> " : "  ", showPlaceholder ? (_jsx(Text, { color: "gray", dimColor: true, children: placeholderText })) : (_jsx(Text, { children: state.alternativeText ? (_jsxs(_Fragment, { children: [state.alternativeText.slice(0, state.alternativeCursorPosition), _jsx(Text, { backgroundColor: "white", color: "black", children: state.alternativeText[state.alternativeCursorPosition] || " " }), state.alternativeText.slice(state.alternativeCursorPosition + 1)] })) : ("Type here to tell Wave what to change") }))] }) }, "alternative-option")] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "Use \u2191\u2193 to navigate \u2022 ESC to cancel" }) })] }))] }));
 };
 ConfirmationSelector.displayName = "ConfirmationSelector";

package/dist/components/DiffDisplay.d.ts

@@ -2,6 +2,7 @@ import React from "react";
 interface DiffDisplayProps {
     toolName?: string;
     parameters?: string;
+    startLineNumber?: number;
 }
 export declare const DiffDisplay: React.FC<DiffDisplayProps>;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"DiffDisplay.d.ts","sourceRoot":"","sources":["../../src/components/DiffDisplay.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAC;AAMvC,UAAU,gBAAgB;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,CAwSlD,CAAC"}
+{"version":3,"file":"DiffDisplay.d.ts","sourceRoot":"","sources":["../../src/components/DiffDisplay.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAC;AAMvC,UAAU,gBAAgB;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,CA8VlD,CAAC"}