Drop stale sent-history loads from startNewSession

Share a generation counter between the hydrate effect and
startNewSession so a late loadSentMessages cannot overwrite
browse after a newer session load has already started.

Author: TheGreatAxios

src/tui/hooks/use-message-pipeline.ts

@@ -114,6 +114,10 @@ export function useMessagePipeline({
   const sendCounterRef = useRef(0);
   const lastSentMessageRef = useRef<string>("");
   const quotaAutoRetryFiredRef = useRef(false);
+  // Bumped on every sent-history load (and on effect cleanup) so only the latest
+  // loadSentMessages result can write browse state — startNewSession and the
+  // hydrate effect share this so neither path can apply a stale session's history.
+  const sentHistoryLoadGenRef = useRef(0);
 
   sendMessageRef.current = (message: OutboundUserMessage) => {
     lastSentMessageRef.current = message.text;
@@ -208,6 +212,17 @@ export function useMessagePipeline({
 
   requestStopRef.current = requestStop;
 
+  // Start a sent-history load; only the newest generation may apply. Shared by
+  // startNewSession and the hydrate effect so rapid /clear or session switches
+  // cannot write browse from a prior id after a newer load has begun.
+  const loadSentHistoryBrowse = (sessionId: string) => {
+    const gen = ++sentHistoryLoadGenRef.current;
+    void loadSentMessages(cwd, sessionId).then((sent) => {
+      if (gen !== sentHistoryLoadGenRef.current) return;
+      setSentHistoryBrowse(createSentHistoryBrowse(sent));
+    });
+  };
+
   const startNewSessionRef = useRef<() => void>(() => undefined);
   startNewSessionRef.current = () => {
     sendAbortRef.current?.abort();
@@ -230,10 +245,10 @@ export function useMessagePipeline({
     subAgentSessions?.clear();
     onNewSession?.();
     if (getSessionId !== undefined) {
-      void loadSentMessages(cwd, getSessionId()).then((sent) => {
-        setSentHistoryBrowse(createSentHistoryBrowse(sent));
-      });
+      loadSentHistoryBrowse(getSessionId());
     } else {
+      // Invalidate any in-flight load before clearing browse for a no-session path.
+      sentHistoryLoadGenRef.current++;
       setSentHistoryBrowse(createSentHistoryBrowse([]));
     }
     scroll.scrollToBottom();
@@ -245,14 +260,13 @@ export function useMessagePipeline({
   // session switch or unmount cannot write history from a prior session id.
   useEffect(() => {
     if (getSessionId === undefined) return;
-    let cancelled = false;
-    void loadSentMessages(cwd, getSessionId()).then((sent) => {
-      if (cancelled) return;
-      setSentHistoryBrowse(createSentHistoryBrowse(sent));
-    });
+    loadSentHistoryBrowse(getSessionId());
     return () => {
-      cancelled = true;
+      sentHistoryLoadGenRef.current++;
     };
+    // loadSentHistoryBrowse closes over cwd/setSentHistoryBrowse; re-run when the
+    // session identity source or cwd changes.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [cwd, getSessionId]);
 
   useEffect(() => {