From 7405d1520079be6d6a811b00e538d09d98441362 Mon Sep 17 00:00:00 2001
From: Hermes <hermes@chrissader.com>
Date: Thu, 9 Apr 2026 21:46:21 -0500
Subject: [PATCH] Fix session replay: fetch newest messages from tail, not
 oldest from start

---
 app/history/[id]/page.tsx | 13 ++++++++-----
 lib/api.ts                |  4 ++--
 lib/hooks.ts              |  6 +++---
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/history/[id]/page.tsx b/app/history/[id]/page.tsx
index c736358..dfe044e 100644
--- a/app/history/[id]/page.tsx
+++ b/app/history/[id]/page.tsx
@@ -26,7 +26,10 @@ export default function SessionReplayPage({ params }: { params: Promise<{ id: st
   const [titleDraft, setTitleDraft] = useState("");
   const { data: sessionData } = useSession(id);
   const [msgLimit, setMsgLimit] = useState(100);
-  const { data: messagesData, isLoading } = useMessages(id, msgLimit);
+  // Fetch from the tail: offset = max(0, total - limit)
+  const msgTotal = sessionData?.session?.message_count || 0;
+  const msgOffset = Math.max(0, msgTotal - msgLimit);
+  const { data: messagesData, isLoading } = useMessages(id, msgLimit, msgOffset);
   const [input, setInput] = useState("");
   const [sending, setSending] = useState(false);
   const [pendingMsg, setPendingMsg] = useState<string | null>(null);
@@ -41,7 +44,7 @@ export default function SessionReplayPage({ params }: { params: Promise<{ id: st
   useEffect(() => {
     if (!session || session.ended_at) return;
     const interval = setInterval(() => {
-      qc.invalidateQueries({ queryKey: ["messages", id, msgLimit] });
+      qc.invalidateQueries({ queryKey: ["messages", id] });
       qc.invalidateQueries({ queryKey: ["session", id] });
     }, 5000);
     return () => clearInterval(interval);
@@ -278,14 +281,14 @@ export default function SessionReplayPage({ params }: { params: Promise<{ id: st
             </p>
           )}
 
-          {/* Load more (at bottom = older messages since list is reversed) */}
-          {(messagesData?.total || 0) > msgLimit && (
+          {/* Load older messages */}
+          {msgOffset > 0 && (
             <button
               onClick={() => setMsgLimit((l) => l + 100)}
               className="w-full py-3 mt-2 text-[13px] font-medium rounded-xl transition-colors"
               style={{ color: "var(--accent)", background: "var(--accent-dim)" }}
             >
-              Load older messages
+              Load older messages ({msgOffset} more)
             </button>
           )}
         </div>
diff --git a/lib/api.ts b/lib/api.ts
index f53be22..212f00c 100644
--- a/lib/api.ts
+++ b/lib/api.ts
@@ -50,9 +50,9 @@ export const fetchSessions = (limit = 50, offset = 0, source?: string) =>
 export const fetchSession = (id: string) =>
   get<{ session: Session }>(`/api/sessions/${id}`);
 
-export const fetchMessages = (sessionId: string, limit = 200, offset = 0) =>
+export const fetchMessages = (sessionId: string, limit = 200, offset?: number) =>
   get<{ items: Message[]; total: number }>(
-    `/api/sessions/${sessionId}/messages?limit=${limit}&offset=${offset}`
+    `/api/sessions/${sessionId}/messages?limit=${limit}${offset != null ? `&offset=${offset}` : ""}`
   );
 
 export const searchSessions = (q: string, limit = 20) =>
diff --git a/lib/hooks.ts b/lib/hooks.ts
index e1520ea..26c0ecd 100644
--- a/lib/hooks.ts
+++ b/lib/hooks.ts
@@ -19,10 +19,10 @@ export function useSession(id: string) {
   });
 }
 
-export function useMessages(sessionId: string, limit = 200) {
+export function useMessages(sessionId: string, limit = 200, offset?: number) {
   return useQuery({
-    queryKey: ["messages", sessionId, limit],
-    queryFn: () => api.fetchMessages(sessionId, limit),
+    queryKey: ["messages", sessionId, limit, offset],
+    queryFn: () => api.fetchMessages(sessionId, limit, offset),
     enabled: !!sessionId,
   });
 }