@@ -69,6 +69,7 @@ import {
6969 computeStableMessagesTimelineRows ,
7070 deriveMessagesTimelineRows ,
7171 normalizeCompactToolLabel ,
72+ resolveOlderHistoryAutoLoad ,
7273 resolveAssistantMessageCopyState ,
7374 resolveTimelineIsAtEnd ,
7475 resolveTimelineMinimapHasPersistentGutter ,
@@ -329,6 +330,17 @@ export const MessagesTimeline = memo(function MessagesTimeline({
329330 null ,
330331 ) ;
331332 const [ minimapHasPersistentGutter , setMinimapHasPersistentGutter ] = useState ( false ) ;
333+ const olderHistoryAutoLoadArmedRef = useRef ( true ) ;
334+ const requestOlderHistory = useCallback ( ( ) => {
335+ // Disarm before both automatic and explicit requests. If a request fails,
336+ // prop changes while the viewport remains at the start must not trigger an
337+ // immediate retry loop; the header button still permits a deliberate retry.
338+ olderHistoryAutoLoadArmedRef . current = false ;
339+ onLoadOlder ?.( ) ;
340+ } , [ onLoadOlder ] ) ;
341+ useEffect ( ( ) => {
342+ olderHistoryAutoLoadArmedRef . current = true ;
343+ } , [ routeThreadKey ] ) ;
332344 const handleAnchorReady = useCallback (
333345 ( info : { anchorIndex : number | undefined } ) => {
334346 if ( anchorMessageId !== null && info . anchorIndex !== undefined ) {
@@ -362,8 +374,15 @@ export const MessagesTimeline = memo(function MessagesTimeline({
362374 }
363375 // Reaching the top lazy-loads older history; maintainVisibleContentPosition
364376 // (set on the list) keeps the viewport anchored when rows prepend.
365- if ( state ?. isAtStart && hasMoreOlder && ! loadingOlder ) {
366- onLoadOlder ?.( ) ;
377+ const olderHistoryDecision = resolveOlderHistoryAutoLoad ( {
378+ armed : olderHistoryAutoLoadArmedRef . current ,
379+ hasMore : hasMoreOlder ,
380+ isAtStart : state ?. isAtStart ?? false ,
381+ loading : loadingOlder ,
382+ } ) ;
383+ olderHistoryAutoLoadArmedRef . current = olderHistoryDecision . armed ;
384+ if ( olderHistoryDecision . shouldLoad ) {
385+ requestOlderHistory ( ) ;
367386 }
368387 if ( ! state || minimapItems . length === 0 ) {
369388 return ;
@@ -394,7 +413,7 @@ export const MessagesTimeline = memo(function MessagesTimeline({
394413 onIsAtEndChange ,
395414 hasMoreOlder ,
396415 loadingOlder ,
397- onLoadOlder ,
416+ requestOlderHistory ,
398417 ] ) ;
399418
400419 useEffect ( ( ) => {
@@ -438,15 +457,15 @@ export const MessagesTimeline = memo(function MessagesTimeline({
438457 return (
439458 < button
440459 type = "button"
441- onClick = { onLoadOlder }
460+ onClick = { requestOlderHistory }
442461 className = "flex w-full cursor-pointer items-center justify-center py-2 text-xs text-muted-foreground transition-colors hover:text-foreground"
443462 >
444463 Load older history
445464 </ button >
446465 ) ;
447466 }
448467 return TIMELINE_LIST_HEADER ;
449- } , [ loadingOlder , hasMoreOlder , onLoadOlder ] ) ;
468+ } , [ loadingOlder , hasMoreOlder , requestOlderHistory ] ) ;
450469
451470 const sharedState = useMemo < TimelineRowSharedState > (
452471 ( ) => ( {
0 commit comments