@supatest/cli 0.0.38 → 0.0.40

package/dist/index.js

@@ -5891,7 +5891,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = "0.0.38";
+    CLI_VERSION = "0.0.40";
   }
 });
 
@@ -5963,7 +5963,7 @@ var init_error_logger = __esm({
   "src/utils/error-logger.ts"() {
     "use strict";
     init_version();
-    SUPATEST_DIR = path2.join(os2.homedir(), ".supatest");
+    SUPATEST_DIR = process.platform === "win32" ? path2.join(os2.tmpdir(), ".supatest") : path2.join(os2.homedir(), ".supatest");
     LOGS_DIR = path2.join(SUPATEST_DIR, "logs");
     ERROR_LOG_FILE = path2.join(LOGS_DIR, "error.log");
     MAX_LOG_SIZE = 5 * 1024 * 1024;
@@ -7527,11 +7527,12 @@ var init_react = __esm({
 });
 
 // src/ui/contexts/SessionContext.tsx
-import React, { createContext, useCallback, useContext, useMemo, useState } from "react";
-var SessionContext, SessionProvider, useSession;
+import React, { createContext, useCallback, useContext, useMemo, useRef, useState } from "react";
+var UsageStatsContext, SessionContext, SessionProvider, useSession, useUsageStats;
 var init_SessionContext = __esm({
   "src/ui/contexts/SessionContext.tsx"() {
     "use strict";
+    UsageStatsContext = createContext(null);
     SessionContext = createContext(null);
     SessionProvider = ({
       children,
@@ -7573,12 +7574,25 @@ var init_SessionContext = __esm({
         },
         [allToolsExpanded]
       );
+      const pendingUpdateRef = useRef(null);
+      const updateScheduledRef = useRef(false);
       const updateLastMessage = useCallback((updates) => {
-        setMessages((prev) => {
-          if (prev.length === 0) return prev;
-          const last = prev[prev.length - 1];
-          return [...prev.slice(0, -1), { ...last, ...updates }];
-        });
+        pendingUpdateRef.current = pendingUpdateRef.current ? { ...pendingUpdateRef.current, ...updates } : updates;
+        if (!updateScheduledRef.current) {
+          updateScheduledRef.current = true;
+          setTimeout(() => {
+            updateScheduledRef.current = false;
+            const pending = pendingUpdateRef.current;
+            pendingUpdateRef.current = null;
+            if (pending) {
+              setMessages((prev) => {
+                if (prev.length === 0) return prev;
+                const last = prev[prev.length - 1];
+                return [...prev.slice(0, -1), { ...last, ...pending }];
+              });
+            }
+          }, 0);
+        }
       }, []);
       const updateMessageById = useCallback((id, updates) => {
         setMessages((prev) => {
@@ -7658,8 +7672,6 @@ var init_SessionContext = __esm({
         setTodos,
         stats,
         updateStats,
-        usageStats,
-        setUsageStats,
         isAgentRunning,
         setIsAgentRunning,
         shouldInterruptAgent,
@@ -7693,7 +7705,6 @@ var init_SessionContext = __esm({
         todos,
         stats,
         updateStats,
-        usageStats,
         isAgentRunning,
         shouldInterruptAgent,
         sessionId,
@@ -7705,7 +7716,11 @@ var init_SessionContext = __esm({
         staticRemountKey,
         refreshStatic
       ]);
-      return /* @__PURE__ */ React.createElement(SessionContext.Provider, { value }, children);
+      const usageStatsValue = useMemo(() => ({
+        usageStats,
+        setUsageStats
+      }), [usageStats]);
+      return /* @__PURE__ */ React.createElement(SessionContext.Provider, { value }, /* @__PURE__ */ React.createElement(UsageStatsContext.Provider, { value: usageStatsValue }, children));
     };
     useSession = () => {
       const context = useContext(SessionContext);
@@ -7714,6 +7729,13 @@ var init_SessionContext = __esm({
       }
       return context;
     };
+    useUsageStats = () => {
+      const context = useContext(UsageStatsContext);
+      if (!context) {
+        throw new Error("useUsageStats must be used within SessionProvider");
+      }
+      return context;
+    };
   }
 });
 
@@ -8248,48 +8270,36 @@ var init_ErrorMessage = __esm({
 // src/ui/components/messages/LoadingMessage.tsx
 import { Box as Box5, Text as Text5 } from "ink";
 import Spinner2 from "ink-spinner";
-import React6, { useEffect, useState as useState2 } from "react";
-var LOADING_MESSAGES, SHIMMER_INTERVAL_MS, TEXT_ROTATION_INTERVAL_MS, LoadingMessage;
+import React6, { memo, useEffect, useRef as useRef2, useState as useState2 } from "react";
+var LOADING_MESSAGES, TEXT_ROTATION_INTERVAL_MS, LoadingMessage;
 var init_LoadingMessage = __esm({
   "src/ui/components/messages/LoadingMessage.tsx"() {
     "use strict";
     init_theme();
     LOADING_MESSAGES = [
-      "Brainstorming...",
-      "Brewing coffee...",
-      "Sipping espresso...",
-      "Testing theories...",
-      "Making magic...",
-      "Multiplying matrices..."
+      "Thinking...",
+      "Working...",
+      "Processing..."
     ];
-    SHIMMER_INTERVAL_MS = 80;
-    TEXT_ROTATION_INTERVAL_MS = 2e3;
-    LoadingMessage = ({ headless = false }) => {
+    TEXT_ROTATION_INTERVAL_MS = 3e3;
+    LoadingMessage = memo(({ headless = false }) => {
       const [messageIndex, setMessageIndex] = useState2(0);
-      const [shimmerPosition, setShimmerPosition] = useState2(0);
+      const intervalRef = useRef2(null);
       const message = LOADING_MESSAGES[messageIndex];
       useEffect(() => {
-        const rotationInterval = setInterval(() => {
+        intervalRef.current = setInterval(() => {
           setMessageIndex((prev) => (prev + 1) % LOADING_MESSAGES.length);
-          setShimmerPosition(0);
         }, TEXT_ROTATION_INTERVAL_MS);
         return () => {
-          clearInterval(rotationInterval);
+          if (intervalRef.current) {
+            clearInterval(intervalRef.current);
+            intervalRef.current = null;
+          }
         };
       }, []);
-      useEffect(() => {
-        const shimmerInterval = setInterval(() => {
-          setShimmerPosition((prev) => (prev + 1) % (message.length + 1));
-        }, SHIMMER_INTERVAL_MS);
-        return () => {
-          clearInterval(shimmerInterval);
-        };
-      }, [message.length]);
-      const before = message.slice(0, shimmerPosition);
-      const current = message[shimmerPosition] || "";
-      const after = message.slice(shimmerPosition + 1);
-      return /* @__PURE__ */ React6.createElement(Box5, { flexDirection: "row", marginTop: 1 }, /* @__PURE__ */ React6.createElement(Box5, { width: 2 }, /* @__PURE__ */ React6.createElement(Text5, { color: theme.text.accent }, /* @__PURE__ */ React6.createElement(Spinner2, { type: "dots" }))), /* @__PURE__ */ React6.createElement(Box5, { flexDirection: "column", flexGrow: 1 }, /* @__PURE__ */ React6.createElement(Text5, null, /* @__PURE__ */ React6.createElement(Text5, { color: theme.text.primary }, before), /* @__PURE__ */ React6.createElement(Text5, { bold: true, color: theme.text.accent }, current), /* @__PURE__ */ React6.createElement(Text5, { color: theme.text.primary }, after), !headless && /* @__PURE__ */ React6.createElement(Text5, { color: theme.text.primary }, " (esc to interrupt)"))));
-    };
+      return /* @__PURE__ */ React6.createElement(Box5, { flexDirection: "row", marginTop: 1 }, /* @__PURE__ */ React6.createElement(Box5, { width: 2 }, /* @__PURE__ */ React6.createElement(Text5, { color: theme.text.accent }, /* @__PURE__ */ React6.createElement(Spinner2, { type: "dots" }))), /* @__PURE__ */ React6.createElement(Box5, { flexDirection: "column", flexGrow: 1 }, /* @__PURE__ */ React6.createElement(Text5, null, /* @__PURE__ */ React6.createElement(Text5, { color: theme.text.primary }, message), !headless && /* @__PURE__ */ React6.createElement(Text5, { color: theme.text.dim }, " (esc to interrupt)"))));
+    });
+    LoadingMessage.displayName = "LoadingMessage";
   }
 });
 
@@ -8620,8 +8630,8 @@ var init_QueuedMessageDisplay = __esm({
 
 // src/ui/components/MessageList.tsx
 import { Box as Box12, Static } from "ink";
-import React13, { useMemo as useMemo4, useRef } from "react";
-var MessageList;
+import React13, { memo as memo2, useCallback as useCallback2, useMemo as useMemo3 } from "react";
+var StaticHeader, MessageList;
 var init_MessageList = __esm({
   "src/ui/components/MessageList.tsx"() {
     "use strict";
@@ -8636,9 +8646,17 @@ var init_MessageList = __esm({
     init_ToolMessage();
     init_UserMessage();
     init_QueuedMessageDisplay();
-    MessageList = ({ terminalWidth, currentFolder, gitBranch, headless = false, queuedTasks = [] }) => {
+    StaticHeader = memo2(({ currentFolder, gitBranch, headless, staticRemountKey }) => {
+      const headerItems = useMemo3(() => [{ id: "header" }], []);
+      return /* @__PURE__ */ React13.createElement(Static, { items: headerItems, key: `header-${staticRemountKey}` }, () => /* @__PURE__ */ React13.createElement(Box12, { flexDirection: "column", key: "header" }, /* @__PURE__ */ React13.createElement(Header, { currentFolder, gitBranch, headless })));
+    });
+    StaticHeader.displayName = "StaticHeader";
+    MessageList = memo2(({ terminalWidth, currentFolder, gitBranch, headless = false, queuedTasks = [] }) => {
       const { messages, updateMessageById, isAgentRunning, staticRemountKey, toolGroupsExpanded, toggleToolGroups } = useSession();
-      const renderMessage = (message, isInGroup = false) => {
+      const handleToggle = useCallback2((id, currentExpanded) => {
+        updateMessageById(id, { isExpanded: !currentExpanded });
+      }, [updateMessageById]);
+      const renderMessage = useCallback2((message, isInGroup = false) => {
         switch (message.type) {
           case "user":
             return /* @__PURE__ */ React13.createElement(UserMessage, { key: message.id, text: message.content });
@@ -8662,7 +8680,7 @@ var init_MessageList = __esm({
                   input: message.toolInput,
                   isExpanded: message.isExpanded,
                   key: message.id,
-                  onToggle: (id) => updateMessageById(id, { isExpanded: !message.isExpanded }),
+                  onToggle: (id) => handleToggle(id, message.isExpanded),
                   result: message.toolResult,
                   toolName: message.toolName || "Unknown"
                 }
@@ -8676,7 +8694,7 @@ var init_MessageList = __esm({
                 input: message.toolInput,
                 isExpanded: message.isExpanded,
                 key: message.id,
-                onToggle: (id) => updateMessageById(id, { isExpanded: !message.isExpanded }),
+                onToggle: (id) => handleToggle(id, message.isExpanded),
                 result: message.toolResult,
                 toolName: message.toolName || "Unknown"
               }
@@ -8689,7 +8707,7 @@ var init_MessageList = __esm({
                 id: message.id,
                 isExpanded: message.isExpanded,
                 key: message.id,
-                onToggle: (id) => updateMessageById(id, { isExpanded: !message.isExpanded })
+                onToggle: (id) => handleToggle(id, message.isExpanded)
               }
             );
           case "error":
@@ -8706,8 +8724,8 @@ var init_MessageList = __esm({
           default:
             return null;
         }
-      };
-      const renderGroupedMessage = (group) => {
+      }, [terminalWidth, handleToggle]);
+      const renderGroupedMessage = useCallback2((group) => {
         if (group.type === "group") {
           return /* @__PURE__ */ React13.createElement(
             ToolGroup,
@@ -8718,7 +8736,7 @@ var init_MessageList = __esm({
               onToggleTool: (id) => {
                 const msg = group.messages.find((m) => m.id === id);
                 if (msg) {
-                  updateMessageById(id, { isExpanded: !msg.isExpanded });
+                  handleToggle(id, msg.isExpanded);
                 }
               },
               tools: group.messages.map((msg) => ({
@@ -8733,32 +8751,30 @@ var init_MessageList = __esm({
           );
         }
         return renderMessage(group.messages[0]);
-      };
-      const lastUserMessageIndex = useMemo4(() => {
-        for (let i = messages.length - 1; i >= 0; i--) {
-          if (messages[i].type === "user") {
-            return i;
-          }
-        }
-        return -1;
-      }, [messages]);
-      const hasPendingAssistant = useMemo4(
+      }, [toolGroupsExpanded, toggleToolGroups, handleToggle, renderMessage]);
+      const hasPendingAssistant = useMemo3(
         () => messages.some((m) => m.type === "assistant" && m.isPending),
         [messages]
       );
-      const completedBoundaryRef = useRef(-1);
-      const completedBoundaryKey = useMemo4(() => {
-        const currentBoundary = lastUserMessageIndex;
-        if (currentBoundary !== completedBoundaryRef.current) {
-          completedBoundaryRef.current = currentBoundary;
-          return `boundary-${currentBoundary}`;
-        }
-        return `boundary-${completedBoundaryRef.current}`;
-      }, [lastUserMessageIndex]);
-      const { completedGroups, currentTurnGroups } = useMemo4(() => {
+      const { completedGroups, currentTurnGroups } = useMemo3(() => {
         const completed = [];
         const currentTurn = [];
-        const processTurn = (turnMessages2, targetArray) => {
+        const isMessageComplete = (msg) => {
+          switch (msg.type) {
+            case "user":
+            case "error":
+            case "todo":
+            case "thinking":
+              return true;
+            case "tool":
+              return msg.toolResult !== void 0;
+            case "assistant":
+              return !msg.isPending;
+            default:
+              return true;
+          }
+        };
+        const processTurn = (turnMessages, targetArray) => {
           let currentToolGroup = [];
           const flushToolGroup = () => {
             if (currentToolGroup.length === 0) return;
@@ -8769,7 +8785,7 @@ var init_MessageList = __esm({
             }
             currentToolGroup = [];
           };
-          for (const msg of turnMessages2) {
+          for (const msg of turnMessages) {
             if (msg.type === "tool") {
               currentToolGroup.push(msg);
             } else {
@@ -8779,38 +8795,46 @@ var init_MessageList = __esm({
           }
           flushToolGroup();
         };
-        let turnMessages = [];
-        for (let i = 0; i < lastUserMessageIndex; i++) {
-          const msg = messages[i];
-          if (msg.type === "user") {
-            processTurn(turnMessages, completed);
-            turnMessages = [];
-            completed.push({ type: "single", messages: [msg] });
+        const completeMessages = [];
+        const inProgressMessages = [];
+        for (const msg of messages) {
+          if (isMessageComplete(msg)) {
+            completeMessages.push(msg);
           } else {
-            turnMessages.push(msg);
+            inProgressMessages.push(msg);
           }
         }
-        processTurn(turnMessages, completed);
-        if (lastUserMessageIndex >= 0) {
-          completed.push({ type: "single", messages: [messages[lastUserMessageIndex]] });
+        let splitIndex = messages.length;
+        for (let i = messages.length - 1; i >= 0; i--) {
+          if (isMessageComplete(messages[i])) {
+            splitIndex = i + 1;
+            break;
+          }
         }
-        const currentTurnMessages = lastUserMessageIndex >= 0 ? messages.slice(lastUserMessageIndex + 1) : messages;
-        processTurn(currentTurnMessages, currentTurn);
+        const finalCompleteMessages = messages.slice(0, splitIndex);
+        const finalInProgressMessages = messages.slice(splitIndex);
+        processTurn(finalCompleteMessages, completed);
+        processTurn(finalInProgressMessages, currentTurn);
         return { completedGroups: completed, currentTurnGroups: currentTurn };
-      }, [messages, lastUserMessageIndex, completedBoundaryKey]);
-      const staticItems = useMemo4(() => [
-        { id: "header", type: "header" },
-        ...completedGroups.map((group, idx) => {
+      }, [messages]);
+      const staticItems = useMemo3(
+        () => completedGroups.map((group, idx) => {
           if (group.type === "group") {
-            return { ...group, _isGroup: true, id: `group-${idx}` };
+            return { ...group, _isGroup: true, id: `group-${group.messages[0]?.id || idx}` };
           }
           return { ...group.messages[0], _isMessage: true };
-        })
-      ], [completedGroups]);
-      return /* @__PURE__ */ React13.createElement(Box12, { flexDirection: "column" }, /* @__PURE__ */ React13.createElement(Static, { items: staticItems, key: `${staticRemountKey}-${toolGroupsExpanded ? "expanded" : "collapsed"}` }, (item) => {
-        if (item.type === "header") {
-          return /* @__PURE__ */ React13.createElement(Box12, { flexDirection: "column", key: "header" }, /* @__PURE__ */ React13.createElement(Header, { currentFolder, gitBranch, headless }));
+        }),
+        [completedGroups]
+      );
+      return /* @__PURE__ */ React13.createElement(Box12, { flexDirection: "column" }, /* @__PURE__ */ React13.createElement(
+        StaticHeader,
+        {
+          currentFolder,
+          gitBranch,
+          headless,
+          staticRemountKey
         }
+      ), staticItems.length > 0 && /* @__PURE__ */ React13.createElement(Static, { items: staticItems, key: `messages-${staticRemountKey}-${toolGroupsExpanded}` }, (item) => {
         if (item._isGroup) {
           const content2 = renderGroupedMessage(item);
           if (!content2) {
@@ -8830,7 +8854,8 @@ var init_MessageList = __esm({
         }
         return /* @__PURE__ */ React13.createElement(Box12, { flexDirection: "column", key: group.type === "group" ? `current-group-${idx}` : group.messages[0].id, width: "100%" }, content);
       }), /* @__PURE__ */ React13.createElement(QueuedMessageDisplay, { messageQueue: queuedTasks }), isAgentRunning && !hasPendingAssistant && /* @__PURE__ */ React13.createElement(LoadingMessage, { headless, key: "loading" }), /* @__PURE__ */ React13.createElement(Box12, { height: 1 }));
-    };
+    });
+    MessageList.displayName = "MessageList";
   }
 });
 
@@ -10121,10 +10146,10 @@ var init_mouse = __esm({
 import { useStdin as useStdin2 } from "ink";
 import React17, {
   createContext as createContext2,
-  useCallback as useCallback2,
+  useCallback as useCallback3,
   useContext as useContext2,
   useEffect as useEffect4,
-  useRef as useRef3
+  useRef as useRef5
 } from "react";
 function charLengthAt(str, i) {
   if (str.length <= i) {
@@ -10411,16 +10436,16 @@ function KeypressProvider({
   debugKeystrokeLogging
 }) {
   const { stdin, setRawMode } = useStdin2();
-  const subscribers = useRef3(/* @__PURE__ */ new Set()).current;
-  const subscribe = useCallback2(
+  const subscribers = useRef5(/* @__PURE__ */ new Set()).current;
+  const subscribe = useCallback3(
     (handler) => subscribers.add(handler),
     [subscribers]
   );
-  const unsubscribe = useCallback2(
+  const unsubscribe = useCallback3(
     (handler) => subscribers.delete(handler),
     [subscribers]
   );
-  const broadcast = useCallback2(
+  const broadcast = useCallback3(
     (key) => subscribers.forEach((handler) => handler(key)),
     [subscribers]
   );
@@ -11037,7 +11062,8 @@ var init_TestSelector = __esm({
             // Only fetch failed tests
           });
           setTotalTests(result.total);
-          setHasMore(allTests.length + result.tests.length < result.total);
+          const loadedCount = allTests.length + result.tests.length;
+          setHasMore(result.tests.length === PAGE_SIZE2 && loadedCount < result.total);
           setAllTests((prev) => [...prev, ...result.tests]);
         } catch (err) {
           setError(err instanceof Error ? err.message : String(err));
@@ -11149,7 +11175,7 @@ var init_TestSelector = __esm({
         const indicator = isSelected ? "\u25B6 " : "  ";
         const bgColor = isSelected ? theme.text.accent : void 0;
         return /* @__PURE__ */ React21.createElement(Box18, { key: test.id, marginBottom: 0 }, /* @__PURE__ */ React21.createElement(Text16, { backgroundColor: bgColor, bold: isSelected, color: isSelected ? "black" : theme.text.primary }, indicator), /* @__PURE__ */ React21.createElement(Text16, { backgroundColor: bgColor, color: isChecked ? "green" : isSelected ? "black" : theme.text.dim }, checkbox), /* @__PURE__ */ React21.createElement(Text16, null, " "), /* @__PURE__ */ React21.createElement(Text16, { backgroundColor: bgColor, bold: isSelected, color: isSelected ? "black" : theme.text.primary }, file, line && /* @__PURE__ */ React21.createElement(Text16, { color: isSelected ? "black" : theme.text.dim }, ":", line), /* @__PURE__ */ React21.createElement(Text16, { color: isSelected ? "black" : theme.text.dim }, " - "), title));
-      })), /* @__PURE__ */ React21.createElement(Box18, { flexDirection: "column", marginTop: 1 }, allTests.length > VISIBLE_ITEMS2 && /* @__PURE__ */ React21.createElement(Box18, { marginBottom: 1 }, /* @__PURE__ */ React21.createElement(Text16, { color: "yellow" }, "Showing ", adjustedStart + 1, "-", adjustedEnd, " of ", totalTests || allTests.length, " failed tests", hasMore && !isLoading && /* @__PURE__ */ React21.createElement(Text16, { color: theme.text.dim }, " \u2022 Scroll for more"))), /* @__PURE__ */ React21.createElement(Box18, null, /* @__PURE__ */ React21.createElement(Text16, { color: theme.text.dim }, /* @__PURE__ */ React21.createElement(Text16, { bold: true }, "\u2191\u2193"), " navigate \u2022 ", /* @__PURE__ */ React21.createElement(Text16, { bold: true }, "Space"), " toggle \u2022 ", /* @__PURE__ */ React21.createElement(Text16, { bold: true }, "a"), " all \u2022 ", /* @__PURE__ */ React21.createElement(Text16, { bold: true }, "n"), " none \u2022 ", /* @__PURE__ */ React21.createElement(Text16, { bold: true }, "Enter"), " fix selected")), selectedTests.size > 0 && /* @__PURE__ */ React21.createElement(Box18, { marginTop: 1 }, /* @__PURE__ */ React21.createElement(Text16, { color: "green" }, selectedTests.size, " test", selectedTests.size !== 1 ? "s" : "", " selected")), isLoading && /* @__PURE__ */ React21.createElement(Box18, { marginTop: 1 }, /* @__PURE__ */ React21.createElement(Text16, { color: "cyan" }, "Loading more tests..."))));
+      })), /* @__PURE__ */ React21.createElement(Box18, { flexDirection: "column", marginTop: 1 }, allTests.length > VISIBLE_ITEMS2 && /* @__PURE__ */ React21.createElement(Box18, { marginBottom: 1 }, /* @__PURE__ */ React21.createElement(Text16, { color: "yellow" }, "Showing ", adjustedStart + 1, "-", adjustedEnd, " of ", allTests.length, " failed tests", hasMore && !isLoading && /* @__PURE__ */ React21.createElement(Text16, { color: theme.text.dim }, " (scroll for more)"))), /* @__PURE__ */ React21.createElement(Box18, null, /* @__PURE__ */ React21.createElement(Text16, { color: theme.text.dim }, /* @__PURE__ */ React21.createElement(Text16, { bold: true }, "\u2191\u2193"), " navigate \u2022 ", /* @__PURE__ */ React21.createElement(Text16, { bold: true }, "Space"), " toggle \u2022 ", /* @__PURE__ */ React21.createElement(Text16, { bold: true }, "a"), " all \u2022 ", /* @__PURE__ */ React21.createElement(Text16, { bold: true }, "n"), " none \u2022 ", /* @__PURE__ */ React21.createElement(Text16, { bold: true }, "Enter"), " fix selected")), selectedTests.size > 0 && /* @__PURE__ */ React21.createElement(Box18, { marginTop: 1 }, /* @__PURE__ */ React21.createElement(Text16, { color: "green" }, selectedTests.size, " test", selectedTests.size !== 1 ? "s" : "", " selected")), isLoading && /* @__PURE__ */ React21.createElement(Box18, { marginTop: 1 }, /* @__PURE__ */ React21.createElement(Text16, { color: "cyan" }, "Loading more tests..."))));
     };
   }
 });
@@ -11426,8 +11452,8 @@ var init_ModelSelector = __esm({
 import path5 from "path";
 import chalk4 from "chalk";
 import { Box as Box21, Text as Text19 } from "ink";
-import React24, { forwardRef, useEffect as useEffect9, useImperativeHandle, useState as useState10 } from "react";
-var InputPrompt;
+import React24, { forwardRef, memo as memo3, useEffect as useEffect9, useImperativeHandle, useState as useState10 } from "react";
+var InputPromptInner, InputPrompt;
 var init_InputPrompt = __esm({
   "src/ui/components/InputPrompt.tsx"() {
     "use strict";
@@ -11438,7 +11464,7 @@ var init_InputPrompt = __esm({
     init_file_completion();
     init_theme();
     init_ModelSelector();
-    InputPrompt = forwardRef(({
+    InputPromptInner = forwardRef(({
       onSubmit,
       placeholder = "Enter your task (press Enter to submit, Shift+Enter for new line)...",
       disabled = false,
@@ -11449,7 +11475,8 @@ var init_InputPrompt = __esm({
       onInputChange,
       isClaudeMax = false
     }, ref) => {
-      const { messages, agentMode, selectedModel, setSelectedModel, isAgentRunning, usageStats } = useSession();
+      const { agentMode, selectedModel, setSelectedModel, isAgentRunning } = useSession();
+      const { usageStats } = useUsageStats();
       const [value, setValue] = useState10("");
       const [cursorOffset, setCursorOffset] = useState10(0);
       const [allFiles, setAllFiles] = useState10([]);
@@ -11733,6 +11760,8 @@ var init_InputPrompt = __esm({
         })), !hasContent && disabled && /* @__PURE__ */ React24.createElement(Text19, { color: theme.text.dim, italic: true }, "Waiting for agent to complete...")))
       ), /* @__PURE__ */ React24.createElement(Box21, { justifyContent: "space-between", paddingX: 1 }, /* @__PURE__ */ React24.createElement(Box21, { gap: 2 }, /* @__PURE__ */ React24.createElement(Box21, null, /* @__PURE__ */ React24.createElement(Text19, { color: agentMode === "plan" ? theme.status.inProgress : theme.text.dim }, agentMode === "plan" ? "\u23F8 plan" : "\u25B6 build"), /* @__PURE__ */ React24.createElement(Text19, { color: theme.text.dim }, " (shift+tab)")), /* @__PURE__ */ React24.createElement(Box21, null, /* @__PURE__ */ React24.createElement(Text19, { color: theme.text.dim }, "model:"), /* @__PURE__ */ React24.createElement(Text19, { color: theme.text.info }, getModelDisplayName(selectedModel)), /* @__PURE__ */ React24.createElement(Text19, { color: theme.text.dim }, " (Cost: "), /* @__PURE__ */ React24.createElement(Text19, { color: theme.text.info }, getModelCostLabel(selectedModel)), /* @__PURE__ */ React24.createElement(Text19, { color: theme.text.dim }, ") (shift+m)"))), /* @__PURE__ */ React24.createElement(Box21, null, /* @__PURE__ */ React24.createElement(Text19, { color: usageStats && usageStats.contextPct >= 90 ? theme.text.error : usageStats && usageStats.contextPct >= 75 ? theme.text.warning : theme.text.dim }, usageStats?.contextPct ?? 0, "% context used"), /* @__PURE__ */ React24.createElement(Text19, { color: theme.text.dim }, " ", "(", usageStats ? usageStats.inputTokens >= 1e3 ? `${(usageStats.inputTokens / 1e3).toFixed(1)}K` : usageStats.inputTokens : 0, " / ", usageStats ? usageStats.contextWindow >= 1e3 ? `${(usageStats.contextWindow / 1e3).toFixed(0)}K` : usageStats.contextWindow : "200K", ")"))));
     });
+    InputPromptInner.displayName = "InputPromptInner";
+    InputPrompt = memo3(InputPromptInner);
     InputPrompt.displayName = "InputPrompt";
   }
 });
@@ -12228,18 +12257,18 @@ var init_useModeToggle = __esm({
 });
 
 // src/ui/hooks/useOverlayEscapeGuard.ts
-import { useCallback as useCallback3, useMemo as useMemo5, useRef as useRef4 } from "react";
+import { useCallback as useCallback4, useMemo as useMemo4, useRef as useRef6 } from "react";
 var useOverlayEscapeGuard;
 var init_useOverlayEscapeGuard = __esm({
   "src/ui/hooks/useOverlayEscapeGuard.ts"() {
     "use strict";
     useOverlayEscapeGuard = ({ overlays, suppressionMs = 250 }) => {
-      const suppressUntilRef = useRef4(0);
-      const markOverlayClosed = useCallback3(() => {
+      const suppressUntilRef = useRef6(0);
+      const markOverlayClosed = useCallback4(() => {
         suppressUntilRef.current = Date.now() + suppressionMs;
       }, [suppressionMs]);
-      const isCancelSuppressed = useCallback3(() => Date.now() < suppressUntilRef.current, []);
-      const isOverlayOpen = useMemo5(() => overlays.some(Boolean), [overlays]);
+      const isCancelSuppressed = useCallback4(() => Date.now() < suppressUntilRef.current, []);
+      const isOverlayOpen = useMemo4(() => overlays.some(Boolean), [overlays]);
       return { isOverlayOpen, isCancelSuppressed, markOverlayClosed };
     };
   }
@@ -12250,7 +12279,7 @@ import { execSync as execSync6 } from "child_process";
 import { homedir as homedir8 } from "os";
 import { Box as Box27, Text as Text25, useApp as useApp2, useStdout as useStdout2 } from "ink";
 import Spinner4 from "ink-spinner";
-import React30, { useEffect as useEffect13, useRef as useRef5, useState as useState16 } from "react";
+import React30, { useCallback as useCallback5, useEffect as useEffect13, useRef as useRef7, useState as useState16 } from "react";
 var getGitBranch2, getCurrentFolder2, AppContent, App;
 var init_App = __esm({
   "src/ui/App.tsx"() {
@@ -12302,15 +12331,15 @@ var init_App = __esm({
     AppContent = ({ config: config2, sessionId, webUrl, queuedTasks = [], onExit, onSubmitTask, apiClient, onResumeSession, onClearSession }) => {
       const { exit } = useApp2();
       const { stdout } = useStdout2();
-      const { addMessage, clearMessages, isAgentRunning, messages, setSessionId, setWebUrl, setShouldInterruptAgent, setIsAgentRunning, toggleAllToolOutputs, allToolsExpanded, selectedModel, setSelectedModel, refreshStatic, toggleToolGroups, llmProvider, setLlmProvider } = useSession();
+      const { addMessage, clearMessages, isAgentRunning, setSessionId, setWebUrl, setShouldInterruptAgent, setIsAgentRunning, toggleAllToolOutputs, allToolsExpanded, selectedModel, setSelectedModel, refreshStatic, toggleToolGroups, llmProvider, setLlmProvider } = useSession();
       useModeToggle();
       const [terminalWidth, setTerminalWidth] = useState16(process.stdout.columns || 80);
       const [showInput, setShowInput] = useState16(true);
       const [gitBranch] = useState16(() => getGitBranch2());
       const [currentFolder] = useState16(() => getCurrentFolder2(config2.cwd));
-      const [hasInputContent, setHasInputContent] = useState16(false);
+      const hasInputContentRef = useRef7(false);
       const [exitWarning, setExitWarning] = useState16(null);
-      const inputPromptRef = useRef5(null);
+      const inputPromptRef = useRef7(null);
       const [showSessionSelector, setShowSessionSelector] = useState16(false);
       const [showModelSelector, setShowModelSelector] = useState16(false);
       const [showProviderSelector, setShowProviderSelector] = useState16(false);
@@ -12560,7 +12589,7 @@ var init_App = __esm({
           setShowAuthDialog(true);
           return;
         }
-        setHasInputContent(false);
+        hasInputContentRef.current = false;
         setExitWarning(null);
         if (!isAgentRunning) {
           addMessage({
@@ -12573,6 +12602,9 @@ var init_App = __esm({
           onSubmitTask(task);
         }
       };
+      const handleInputChange = useCallback5((val) => {
+        hasInputContentRef.current = val.trim().length > 0;
+      }, []);
       const handleSessionSelect = async (session) => {
         setShowSessionSelector(false);
         setIsLoadingSession(true);
@@ -12790,7 +12822,7 @@ var init_App = __esm({
         markOverlayClosed();
         setShowMcpServers(true);
       };
-      const isInitialMount = useRef5(true);
+      const isInitialMount = useRef7(true);
       useEffect13(() => {
         const handleResize = () => {
           setTerminalWidth(process.stdout.columns || 80);
@@ -12839,8 +12871,9 @@ var init_App = __esm({
             } else if (exitWarning) {
               exit();
               onExit(true);
-            } else if (showInput && hasInputContent) {
+            } else if (showInput && hasInputContentRef.current) {
               inputPromptRef.current?.clear();
+              hasInputContentRef.current = false;
               setExitWarning("Press Ctrl+C again to exit");
               setTimeout(() => setExitWarning(null), 1500);
             } else {
@@ -12953,7 +12986,7 @@ var init_App = __esm({
             cwd: config2.cwd,
             gitBranch,
             isClaudeMax: !!config2.oauthToken,
-            onInputChange: (val) => setHasInputContent(val.trim().length > 0),
+            onInputChange: handleInputChange,
             onSubmit: handleSubmitTask,
             placeholder: "Enter your task...",
             ref: inputPromptRef
@@ -12998,7 +13031,7 @@ __export(interactive_exports, {
   runInteractive: () => runInteractive
 });
 import { render as render2 } from "ink";
-import React31, { useEffect as useEffect15, useRef as useRef6 } from "react";
+import React31, { useEffect as useEffect15, useRef as useRef8 } from "react";
 function getToolDescription2(toolName, input) {
   switch (toolName) {
     case "Read":
@@ -13147,9 +13180,14 @@ async function runInteractive(config2) {
         stdout: inkStdout,
         stderr: inkStderr,
         stdin: process.stdin,
+        // Keep alternateBuffer: false for native terminal scrollback and text selection
         alternateBuffer: false,
-        // Like Gemini CLI - allows terminal to handle scroll & selection
-        exitOnCtrlC: false
+        exitOnCtrlC: false,
+        // Disable incrementalRendering - it doesn't work well without alternateBuffer
+        // and can cause more flickering issues
+        incrementalRendering: false,
+        // Prevent Ink from patching console methods
+        patchConsole: false
       }
     );
     unmountFn = unmount;
@@ -13199,7 +13237,6 @@ var init_interactive = __esm({
         setIsAgentRunning,
         updateStats,
         setTodos,
-        setUsageStats,
         shouldInterruptAgent,
         setShouldInterruptAgent,
         agentMode,
@@ -13208,7 +13245,8 @@ var init_interactive = __esm({
         selectedModel,
         llmProvider
       } = useSession();
-      const agentRef = useRef6(null);
+      const { setUsageStats } = useUsageStats();
+      const agentRef = useRef8(null);
       useEffect15(() => {
         if (shouldInterruptAgent && agentRef.current) {
           agentRef.current.abort();
@@ -13320,9 +13358,9 @@ var init_interactive = __esm({
         addMessage,
         loadMessages,
         setSessionId: setContextSessionId,
-        setIsAgentRunning,
-        setUsageStats
+        setIsAgentRunning
       } = useSession();
+      const { setUsageStats } = useUsageStats();
       const [sessionId, setSessionId] = React31.useState(initialSessionId);
       const [currentTask, setCurrentTask] = React31.useState(config2.task);
       const [taskId, setTaskId] = React31.useState(0);
@@ -13531,7 +13569,7 @@ init_SessionContext();
 import { execSync as execSync2 } from "child_process";
 import { homedir as homedir4 } from "os";
 import { Box as Box13, useApp } from "ink";
-import React14, { useEffect as useEffect2, useRef as useRef2, useState as useState3 } from "react";
+import React14, { useEffect as useEffect2, useRef as useRef4, useState as useState3 } from "react";
 var getGitBranch = () => {
   try {
     return execSync2("git rev-parse --abbrev-ref HEAD", { encoding: "utf8" }).trim();
@@ -13554,10 +13592,10 @@ var HeadlessAgentRunner = ({ config: config2, sessionId, apiClient, onComplete }
     updateMessageByToolId,
     setIsAgentRunning,
     updateStats,
-    setTodos,
-    setUsageStats
+    setTodos
   } = useSession();
-  const agentRef = useRef2(null);
+  const { setUsageStats } = useUsageStats();
+  const agentRef = useRef4(null);
   useEffect2(() => {
     let isMounted = true;
     const runAgent2 = async () => {
@@ -13645,7 +13683,7 @@ var HeadlessAppContent = ({
   const [gitBranch] = useState3(() => getGitBranch());
   const [currentFolder] = useState3(() => getCurrentFolder());
   const [terminalWidth, setTerminalWidth] = useState3(process.stdout.columns || 80);
-  const hasCompletedRef = useRef2(false);
+  const hasCompletedRef = useRef4(false);
   useEffect2(() => {
     setSessionId(sessionId);
     if (webUrl) {
@@ -13813,10 +13851,22 @@ async function checkAndAutoUpdate() {
     console.log(`
 Updating Supatest CLI ${CLI_VERSION} \u2192 ${latest}...`);
     try {
-      execSync3("npm install -g @supatest/cli@latest", {
-        stdio: "inherit",
-        timeout: INSTALL_TIMEOUT
-      });
+      try {
+        const npmPrefix = execSync3("npm config get prefix", { encoding: "utf-8" }).trim();
+        execSync3(`rm -rf ${npmPrefix}/lib/node_modules/@supatest/.cli-* 2>/dev/null || true`);
+      } catch {
+      }
+      try {
+        execSync3("npm update -g @supatest/cli", {
+          stdio: "inherit",
+          timeout: INSTALL_TIMEOUT
+        });
+      } catch {
+        execSync3("npm install -g @supatest/cli@latest --force", {
+          stdio: "inherit",
+          timeout: INSTALL_TIMEOUT
+        });
+      }
       console.log("\u2713 Updated successfully\n");
       const child = spawn(process.argv[0], process.argv.slice(1), {
         stdio: "inherit",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@supatest/cli",
-  "version": "0.0.38",
+  "version": "0.0.40",
   "description": "Supatest CLI - AI-powered task automation for CI/CD",
   "type": "module",
   "bin": {