Skip to content

Commit 674a037

Browse files
authored
fix(session): preserve live tail messages (anomalyco#1750)
Co-authored-by: src-opn <[email protected]>
1 parent deab584 commit 674a037

3 files changed

Lines changed: 22 additions & 4 deletions

File tree

‎apps/app/scripts/session-render-state.test.ts‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,26 @@ describe("deriveRenderedSessionMessages", () => {
122122
{ id: "msg_old_user", role: "user", text: "old prompt" },
123123
{ id: "msg_old_assistant", role: "assistant", text: "old answer" },
124124
]),
125-
includeLiveOnlyMessages: true,
125+
});
126+
127+
expect(messages.map((message) => message.id)).toEqual([
128+
"msg_old_user",
129+
"msg_old_assistant",
130+
"msg_current_user",
131+
"msg_current_assistant",
132+
]);
133+
});
134+
135+
it("keeps live-only tail messages after the stream flips idle before the snapshot catches up", () => {
136+
const messages = deriveRenderedSessionMessages({
137+
transcriptState: [
138+
uiMessage("msg_current_user", "user", "latest prompt"),
139+
uiMessage("msg_current_assistant", "assistant", "latest answer"),
140+
],
141+
snapshot: snapshotWithMessages([
142+
{ id: "msg_old_user", role: "user", text: "old prompt" },
143+
{ id: "msg_old_assistant", role: "assistant", text: "old answer" },
144+
]),
126145
});
127146

128147
expect(messages.map((message) => message.id)).toEqual([

‎apps/app/src/react-app/domains/session/surface/session-render-state.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ export function resolveRenderedSessionSnapshot(input: {
2424
export function deriveRenderedSessionMessages(input: {
2525
transcriptState: UIMessage[] | null | undefined;
2626
snapshot: OpenworkSessionSnapshot | null | undefined;
27-
includeLiveOnlyMessages?: boolean;
2827
}) {
2928
const liveMessages = input.transcriptState ?? [];
3029
const snapshotMessages = input.snapshot && input.snapshot.messages.length > 0
@@ -36,7 +35,7 @@ export function deriveRenderedSessionMessages(input: {
3635
if (liveMessages.length > 0 && snapshotMessages.length > 0) {
3736
if (messageListContainsAll(liveMessages, snapshotMessages)) return liveMessages;
3837
return mergeSnapshotAndLiveMessages(snapshotMessages, liveMessages, {
39-
appendLiveOnlyMessages: input.includeLiveOnlyMessages,
38+
appendLiveOnlyMessages: true,
4039
});
4140
}
4241
if (input.snapshot && input.snapshot.messages.length > 0) {

‎apps/app/src/react-app/domains/session/surface/session-surface.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ export function SessionSurface(props: SessionSurfaceProps) {
400400
const liveStatus = statusState ?? snapshot?.status ?? IDLE_STATUS;
401401
const chatStreaming = sending || liveStatus.type === "busy" || liveStatus.type === "retry";
402402
const renderedMessages = useMemo(
403-
() => deriveRenderedSessionMessages({ transcriptState, snapshot, includeLiveOnlyMessages: true }),
403+
() => deriveRenderedSessionMessages({ transcriptState, snapshot }),
404404
[snapshot, transcriptState],
405405
);
406406
const pendingSessionLoad = !snapshot && snapshotQuery.isLoading && renderedMessages.length === 0;

0 commit comments

Comments
 (0)