From 9294ffe138afcbf084cb2ff4a49834f907d9ef0c Mon Sep 17 00:00:00 2001
From: Jack Kingsman <jack.kingsman@gmail.com>
Date: Mon, 9 Feb 2026 19:56:20 -0800
Subject: [PATCH] Fix logic for oldest-message detection on new message in
 focused convo and then paging

---
 frontend/src/hooks/useConversationMessages.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/frontend/src/hooks/useConversationMessages.ts b/frontend/src/hooks/useConversationMessages.ts
index f3e3f0f..aac3fbe 100644
--- a/frontend/src/hooks/useConversationMessages.ts
+++ b/frontend/src/hooks/useConversationMessages.ts
@@ -127,8 +127,13 @@ export function useConversationMessages(
     )
       return;
 
-    // Get the oldest message as cursor for the next page
-    const oldestMessage = messages[messages.length - 1];
+    // Get the true oldest message as cursor for the next page
+    const oldestMessage = messages.reduce((oldest, msg) => {
+      if (!oldest) return msg;
+      if (msg.received_at < oldest.received_at) return msg;
+      if (msg.received_at === oldest.received_at && msg.id < oldest.id) return msg;
+      return oldest;
+    }, null as Message | null);
     if (!oldestMessage) return;
 
     setLoadingOlder(true);