Skip to content

Commit de8fd65

Browse files
committed
fix(web): rearm history loading after cursor progress
1 parent c9783d1 commit de8fd65

4 files changed

Lines changed: 93 additions & 12 deletions

File tree

‎apps/web/src/components/ChatView.tsx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1742,6 +1742,7 @@ function ChatViewContent(props: ChatViewProps) {
17421742
const [olderLoaded, setOlderLoaded] = useState(false);
17431743
const [olderHasMore, setOlderHasMore] = useState(false);
17441744
const [loadingOlderActivities, setLoadingOlderActivities] = useState(false);
1745+
const [olderHistoryCursorVersion, setOlderHistoryCursorVersion] = useState(0);
17451746
const loadThreadActivities = useAtomCommand(orchestrationEnvironment.loadThreadActivities, {
17461747
reportFailure: false,
17471748
});
@@ -1802,6 +1803,7 @@ function ChatViewContent(props: ChatViewProps) {
18021803
setOlderLoaded(false);
18031804
setOlderHasMore(false);
18041805
setLoadingOlderActivities(false);
1806+
setOlderHistoryCursorVersion((version) => version + 1);
18051807
}, [activeThreadActivityRequestKey, liveOldestActivityId, liveActivityCount]);
18061808

18071809
const threadActivities = useMemo(
@@ -1876,6 +1878,7 @@ function ChatViewContent(props: ChatViewProps) {
18761878
}
18771879
setOlderLoaded(true);
18781880
setOlderHasMore(page.hasMore);
1881+
setOlderHistoryCursorVersion((version) => version + 1);
18791882
})
18801883
.finally(() => {
18811884
if (olderActivitiesGenRef.current === gen) {
@@ -5243,6 +5246,7 @@ function ChatViewContent(props: ChatViewProps) {
52435246
timelineEntries={timelineEntries}
52445247
hasMoreOlder={hasMoreOlderActivities}
52455248
loadingOlder={loadingOlderActivities}
5249+
olderHistoryCursorVersion={olderHistoryCursorVersion}
52465250
onLoadOlder={loadOlderActivities}
52475251
latestTurn={activeLatestTurn}
52485252
runningTurnId={

‎apps/web/src/components/chat/MessagesTimeline.logic.test.ts‎

Lines changed: 54 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,33 +15,83 @@ describe("resolveOlderHistoryAutoLoad", () => {
1515
hasMore: true,
1616
isAtStart: true,
1717
loading: false,
18+
observedProgressVersion: 0,
19+
progressVersion: 0,
20+
});
21+
expect(first).toEqual({
22+
armed: false,
23+
observedProgressVersion: 0,
24+
shouldLoad: true,
1825
});
19-
expect(first).toEqual({ armed: false, shouldLoad: true });
2026

2127
const afterFailure = resolveOlderHistoryAutoLoad({
2228
armed: first.armed,
2329
hasMore: true,
2430
isAtStart: true,
2531
loading: false,
32+
observedProgressVersion: first.observedProgressVersion,
33+
progressVersion: 0,
34+
});
35+
expect(afterFailure).toEqual({
36+
armed: false,
37+
observedProgressVersion: 0,
38+
shouldLoad: false,
2639
});
27-
expect(afterFailure).toEqual({ armed: false, shouldLoad: false });
2840

2941
const afterLeavingStart = resolveOlderHistoryAutoLoad({
3042
armed: afterFailure.armed,
3143
hasMore: true,
3244
isAtStart: false,
3345
loading: false,
46+
observedProgressVersion: afterFailure.observedProgressVersion,
47+
progressVersion: 0,
48+
});
49+
expect(afterLeavingStart).toEqual({
50+
armed: true,
51+
observedProgressVersion: 0,
52+
shouldLoad: false,
3453
});
35-
expect(afterLeavingStart).toEqual({ armed: true, shouldLoad: false });
3654

3755
expect(
3856
resolveOlderHistoryAutoLoad({
3957
armed: afterLeavingStart.armed,
4058
hasMore: true,
4159
isAtStart: true,
4260
loading: false,
61+
observedProgressVersion: afterLeavingStart.observedProgressVersion,
62+
progressVersion: 0,
63+
}),
64+
).toEqual({
65+
armed: false,
66+
observedProgressVersion: 0,
67+
shouldLoad: true,
68+
});
69+
});
70+
71+
it("rearms at the start only after a page successfully advances the cursor", () => {
72+
const afterFirstAttempt = resolveOlderHistoryAutoLoad({
73+
armed: true,
74+
hasMore: true,
75+
isAtStart: true,
76+
loading: false,
77+
observedProgressVersion: 0,
78+
progressVersion: 0,
79+
});
80+
81+
expect(
82+
resolveOlderHistoryAutoLoad({
83+
armed: afterFirstAttempt.armed,
84+
hasMore: true,
85+
isAtStart: true,
86+
loading: false,
87+
observedProgressVersion: afterFirstAttempt.observedProgressVersion,
88+
progressVersion: 1,
4389
}),
44-
).toEqual({ armed: false, shouldLoad: true });
90+
).toEqual({
91+
armed: false,
92+
observedProgressVersion: 1,
93+
shouldLoad: true,
94+
});
4595
});
4696
});
4797

‎apps/web/src/components/chat/MessagesTimeline.logic.ts‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,29 +23,47 @@ export interface TimelineEndState {
2323

2424
export interface OlderHistoryAutoLoadDecision {
2525
readonly armed: boolean;
26+
readonly observedProgressVersion: number;
2627
readonly shouldLoad: boolean;
2728
}
2829

2930
/**
3031
* Treat reaching the start as an edge, not a continuously-true condition.
3132
* A failed request leaves the viewport at the start, so level-triggered loading
32-
* would immediately retry on every render. Leaving the start rearms one future
33-
* automatic request; the visible header control remains available for explicit
34-
* retries while the edge is disarmed.
33+
* would immediately retry on every render. Leaving the start OR observing a
34+
* successfully advanced page cursor rearms one future automatic request. The
35+
* visible header control remains available for explicit retries while the edge
36+
* is disarmed.
3537
*/
3638
export function resolveOlderHistoryAutoLoad(input: {
3739
readonly armed: boolean;
3840
readonly hasMore: boolean;
3941
readonly isAtStart: boolean;
4042
readonly loading: boolean;
43+
readonly observedProgressVersion: number;
44+
readonly progressVersion: number;
4145
}): OlderHistoryAutoLoadDecision {
46+
const progressed = input.progressVersion !== input.observedProgressVersion;
47+
const armed = input.armed || progressed;
4248
if (!input.isAtStart) {
43-
return { armed: true, shouldLoad: false };
49+
return {
50+
armed: true,
51+
observedProgressVersion: input.progressVersion,
52+
shouldLoad: false,
53+
};
4454
}
45-
if (!input.armed || !input.hasMore || input.loading) {
46-
return { armed: input.armed, shouldLoad: false };
55+
if (!armed || !input.hasMore || input.loading) {
56+
return {
57+
armed,
58+
observedProgressVersion: input.progressVersion,
59+
shouldLoad: false,
60+
};
4761
}
48-
return { armed: false, shouldLoad: true };
62+
return {
63+
armed: false,
64+
observedProgressVersion: input.progressVersion,
65+
shouldLoad: true,
66+
};
4967
}
5068

5169
export function resolveTimelineIsAtEnd(state: TimelineEndState | undefined): boolean | undefined {

‎apps/web/src/components/chat/MessagesTimeline.tsx‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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

Comments
 (0)