From b2f079b7009e88cb9757032efea5755b0ae65f01 Mon Sep 17 00:00:00 2001
From: ayn2op <ayn2op@gmail.com>
Date: Sat, 21 Mar 2026 17:38:56 -0400
Subject: [PATCH] fix(ui/chat): preserve cursor behavior when loading older
 messages (#780)

---
 internal/ui/chat/messages_list.go | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/internal/ui/chat/messages_list.go b/internal/ui/chat/messages_list.go
index a30d055..0958fe0 100644
--- a/internal/ui/chat/messages_list.go
+++ b/internal/ui/chat/messages_list.go
@@ -896,6 +896,7 @@ func (ml *messagesList) HandleEvent(event tview.Event) tview.Command {
 		if selectedChannel == nil || selectedChannel.ID != event.ChannelID {
 			return nil
 		}
+		prevCursor := ml.Cursor()
 
 		// Defensive invalidation if Discord returns overlapping windows.
 		for _, message := range event.Older {
@@ -903,7 +904,17 @@ func (ml *messagesList) HandleEvent(event tview.Event) tview.Command {
 		}
 		ml.messages = slices.Concat(event.Older, ml.messages)
 		ml.invalidateRows()
-		ml.SetCursor(len(event.Older) - 1)
+
+		switch {
+		case prevCursor == 0:
+			// Preserve "SelectUp at top" semantics: move to the next older message.
+			ml.SetCursor(len(event.Older) - 1)
+		case prevCursor > 0:
+			// Keep selection on the same message after prepend shifts indexes.
+			ml.SetCursor(prevCursor + len(event.Older))
+		default:
+			ml.SetCursor(prevCursor)
+		}
 		return nil
 	}
 	return ml.Model.HandleEvent(event)