@@ -183,6 +183,8 @@ interface MessagesTimelineProps {
183183 /** Older history beyond the live activity window can be lazy-loaded. */
184184 hasMoreOlder ?: boolean ;
185185 loadingOlder ?: boolean ;
186+ /** Increments after the older-history cursor advances or is reset. */
187+ olderHistoryCursorVersion ?: number ;
186188 onLoadOlder ?: ( ) => void ;
187189}
188190
@@ -219,6 +221,7 @@ export const MessagesTimeline = memo(function MessagesTimeline({
219221 onManualNavigation,
220222 hasMoreOlder = false ,
221223 loadingOlder = false ,
224+ olderHistoryCursorVersion = 0 ,
222225 onLoadOlder,
223226} : MessagesTimelineProps ) {
224227 const [ expandedTurnIds , setExpandedTurnIds ] = useState < ReadonlySet < TurnId > > ( new Set ( ) ) ;
@@ -331,6 +334,7 @@ export const MessagesTimeline = memo(function MessagesTimeline({
331334 ) ;
332335 const [ minimapHasPersistentGutter , setMinimapHasPersistentGutter ] = useState ( false ) ;
333336 const olderHistoryAutoLoadArmedRef = useRef ( true ) ;
337+ const olderHistoryObservedProgressVersionRef = useRef ( olderHistoryCursorVersion ) ;
334338 const requestOlderHistory = useCallback ( ( ) => {
335339 // Disarm before both automatic and explicit requests. If a request fails,
336340 // prop changes while the viewport remains at the start must not trigger an
@@ -340,7 +344,8 @@ export const MessagesTimeline = memo(function MessagesTimeline({
340344 } , [ onLoadOlder ] ) ;
341345 useEffect ( ( ) => {
342346 olderHistoryAutoLoadArmedRef . current = true ;
343- } , [ routeThreadKey ] ) ;
347+ olderHistoryObservedProgressVersionRef . current = olderHistoryCursorVersion ;
348+ } , [ routeThreadKey , olderHistoryCursorVersion ] ) ;
344349 const handleAnchorReady = useCallback (
345350 ( info : { anchorIndex : number | undefined } ) => {
346351 if ( anchorMessageId !== null && info . anchorIndex !== undefined ) {
@@ -379,8 +384,11 @@ export const MessagesTimeline = memo(function MessagesTimeline({
379384 hasMore : hasMoreOlder ,
380385 isAtStart : state ?. isAtStart ?? false ,
381386 loading : loadingOlder ,
387+ observedProgressVersion : olderHistoryObservedProgressVersionRef . current ,
388+ progressVersion : olderHistoryCursorVersion ,
382389 } ) ;
383390 olderHistoryAutoLoadArmedRef . current = olderHistoryDecision . armed ;
391+ olderHistoryObservedProgressVersionRef . current = olderHistoryDecision . observedProgressVersion ;
384392 if ( olderHistoryDecision . shouldLoad ) {
385393 requestOlderHistory ( ) ;
386394 }
@@ -413,6 +421,7 @@ export const MessagesTimeline = memo(function MessagesTimeline({
413421 onIsAtEndChange ,
414422 hasMoreOlder ,
415423 loadingOlder ,
424+ olderHistoryCursorVersion ,
416425 requestOlderHistory ,
417426 ] ) ;
418427
0 commit comments