Skip to content

Commit 9c8173e

Browse files
t3dotggclaude
andcommitted
perf(client-runtime): keep turn and checkpoint refs stable while streaming
Every streaming assistant delta rebuilt latestTurn and mapped checkpoints to new references with unchanged contents, so selectors keyed on them recomputed for nothing. The reducer now returns the previous latestTurn when the recomputed record matches field for field, and returns the input checkpoints array when no entry needs rebinding. Co-Authored-By: Claude Fable 5.1 <[email protected]>
1 parent 98725df commit 9c8173e

2 files changed

Lines changed: 183 additions & 9 deletions

File tree

‎packages/client-runtime/src/state/threadReducer.test.ts‎

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -497,6 +497,139 @@ describe("applyThreadDetailEvent", () => {
497497
expect(result.thread.latestTurn?.completedAt).toBeNull();
498498
}
499499
});
500+
501+
it("keeps latestTurn and checkpoints references across a streaming delta", () => {
502+
const streamingThread: OrchestrationThread = {
503+
...baseThread,
504+
session: {
505+
threadId: ThreadId.make("thread-1"),
506+
status: "running",
507+
providerName: "claude",
508+
runtimeMode: "full-access",
509+
activeTurnId: TurnId.make("turn-1"),
510+
lastError: null,
511+
updatedAt: "2026-04-01T06:59:00.000Z",
512+
},
513+
latestTurn: {
514+
turnId: TurnId.make("turn-1"),
515+
state: "running",
516+
requestedAt: "2026-04-01T06:59:00.000Z",
517+
startedAt: "2026-04-01T06:59:00.000Z",
518+
completedAt: null,
519+
assistantMessageId: MessageId.make("msg-2"),
520+
},
521+
messages: [
522+
{
523+
id: MessageId.make("msg-2"),
524+
role: "assistant",
525+
text: "Hello",
526+
turnId: TurnId.make("turn-1"),
527+
streaming: true,
528+
createdAt: "2026-04-01T06:00:00.000Z",
529+
updatedAt: "2026-04-01T06:00:00.000Z",
530+
},
531+
],
532+
checkpoints: [
533+
{
534+
turnId: TurnId.make("turn-1"),
535+
checkpointTurnCount: 1,
536+
checkpointRef: CheckpointRef.make("ref-1"),
537+
status: "ready",
538+
files: [],
539+
assistantMessageId: MessageId.make("msg-2"),
540+
completedAt: "2026-04-01T06:00:30.000Z",
541+
},
542+
],
543+
};
544+
545+
const result = applyThreadDetailEvent(streamingThread, {
546+
...baseEventFields,
547+
sequence: 9,
548+
occurredAt: "2026-04-01T07:00:00.000Z",
549+
aggregateKind: "thread",
550+
aggregateId: ThreadId.make("thread-1"),
551+
type: "thread.message-sent",
552+
payload: {
553+
threadId: ThreadId.make("thread-1"),
554+
messageId: MessageId.make("msg-2"),
555+
role: "assistant",
556+
text: ", world",
557+
turnId: TurnId.make("turn-1"),
558+
streaming: true,
559+
createdAt: "2026-04-01T06:00:00.000Z",
560+
updatedAt: "2026-04-01T07:00:00.000Z",
561+
},
562+
});
563+
564+
expect(result.kind).toBe("updated");
565+
if (result.kind === "updated") {
566+
expect(result.thread.messages).not.toBe(streamingThread.messages);
567+
expect(result.thread.messages[0]?.text).toBe("Hello, world");
568+
expect(result.thread.latestTurn).toBe(streamingThread.latestTurn);
569+
expect(result.thread.checkpoints).toBe(streamingThread.checkpoints);
570+
}
571+
});
572+
573+
it("replaces latestTurn and checkpoints when the first assistant message binds the turn", () => {
574+
const unboundThread: OrchestrationThread = {
575+
...baseThread,
576+
session: {
577+
threadId: ThreadId.make("thread-1"),
578+
status: "running",
579+
providerName: "claude",
580+
runtimeMode: "full-access",
581+
activeTurnId: TurnId.make("turn-1"),
582+
lastError: null,
583+
updatedAt: "2026-04-01T06:59:00.000Z",
584+
},
585+
latestTurn: {
586+
turnId: TurnId.make("turn-1"),
587+
state: "running",
588+
requestedAt: "2026-04-01T06:59:00.000Z",
589+
startedAt: "2026-04-01T06:59:00.000Z",
590+
completedAt: null,
591+
assistantMessageId: null,
592+
},
593+
checkpoints: [
594+
{
595+
turnId: TurnId.make("turn-1"),
596+
checkpointTurnCount: 1,
597+
checkpointRef: CheckpointRef.make("ref-1"),
598+
status: "ready",
599+
files: [],
600+
assistantMessageId: null,
601+
completedAt: "2026-04-01T06:59:30.000Z",
602+
},
603+
],
604+
};
605+
606+
const result = applyThreadDetailEvent(unboundThread, {
607+
...baseEventFields,
608+
sequence: 9,
609+
occurredAt: "2026-04-01T07:00:00.000Z",
610+
aggregateKind: "thread",
611+
aggregateId: ThreadId.make("thread-1"),
612+
type: "thread.message-sent",
613+
payload: {
614+
threadId: ThreadId.make("thread-1"),
615+
messageId: MessageId.make("msg-2"),
616+
role: "assistant",
617+
text: "Hello",
618+
turnId: TurnId.make("turn-1"),
619+
streaming: true,
620+
createdAt: "2026-04-01T07:00:00.000Z",
621+
updatedAt: "2026-04-01T07:00:00.000Z",
622+
},
623+
});
624+
625+
expect(result.kind).toBe("updated");
626+
if (result.kind === "updated") {
627+
expect(result.thread.latestTurn).not.toBe(unboundThread.latestTurn);
628+
expect(result.thread.latestTurn?.assistantMessageId).toBe("msg-2");
629+
expect(result.thread.checkpoints).not.toBe(unboundThread.checkpoints);
630+
expect(result.thread.checkpoints[0]?.assistantMessageId).toBe("msg-2");
631+
}
632+
});
500633
});
501634

502635
describe("thread.session-set", () => {

‎packages/client-runtime/src/state/threadReducer.ts‎

Lines changed: 50 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -331,16 +331,18 @@ export function applyThreadDetailEvent(
331331
// assistant message only settles the turn once the session is no longer
332332
// running it — providers may emit several assistant messages per turn
333333
// (commentary between tool calls), and the turn must stay unsettled
334-
// until the provider reports turn end.
334+
// until the provider reports turn end. Streaming deltas recompute the
335+
// same record, so the previous reference is kept when nothing changed.
335336
const turnStillRunning =
336337
event.payload.turnId !== null &&
337338
thread.session?.status === "running" &&
338339
thread.session.activeTurnId === event.payload.turnId;
339340
const settlesTurn = !event.payload.streaming && !turnStillRunning;
340-
const latestTurn: OrchestrationThread["latestTurn"] =
341+
const latestTurn = reuseLatestTurn(
342+
thread.latestTurn,
341343
event.payload.role === "assistant" &&
342-
event.payload.turnId !== null &&
343-
(thread.latestTurn === null || thread.latestTurn.turnId === event.payload.turnId)
344+
event.payload.turnId !== null &&
345+
(thread.latestTurn === null || thread.latestTurn.turnId === event.payload.turnId)
344346
? {
345347
turnId: event.payload.turnId,
346348
state: settlesTurn
@@ -365,9 +367,11 @@ export function applyThreadDetailEvent(
365367
: null,
366368
assistantMessageId: event.payload.messageId,
367369
}
368-
: thread.latestTurn;
370+
: thread.latestTurn,
371+
);
369372

370-
// Rebind checkpoint assistant message IDs for assistant messages.
373+
// Rebind checkpoint assistant message IDs for assistant messages. The
374+
// helper hands back the same array when the entry is already bound.
371375
const checkpoints =
372376
event.payload.role === "assistant" && event.payload.turnId !== null
373377
? rebindCheckpointAssistantMessage(
@@ -394,7 +398,8 @@ export function applyThreadDetailEvent(
394398
// Leaving the "running" session status is the turn-end signal: settle a
395399
// still-running latest turn so its duration reflects the whole turn.
396400
const settledTurnState = settledTurnStateForSessionStatus(event.payload.session.status);
397-
const latestTurn: OrchestrationLatestTurn | null =
401+
const latestTurn = reuseLatestTurn(
402+
thread.latestTurn,
398403
event.payload.session.status === "running" && event.payload.session.activeTurnId !== null
399404
? {
400405
turnId: event.payload.session.activeTurnId,
@@ -424,7 +429,8 @@ export function applyThreadDetailEvent(
424429
// "running" is the authoritative turn end.
425430
completedAt: event.payload.session.updatedAt,
426431
}
427-
: thread.latestTurn;
432+
: thread.latestTurn,
433+
);
428434

429435
return {
430436
kind: "updated",
@@ -652,11 +658,46 @@ function checkpointStatusToTurnState(
652658
}
653659
}
654660

661+
/**
662+
* Returns `previous` when `next` matches it field for field, otherwise `next`.
663+
* Streaming cases recompute the latest turn on every delta, and keeping the
664+
* old reference lets selectors and memos keyed on `latestTurn` skip work.
665+
*/
666+
function reuseLatestTurn(
667+
previous: OrchestrationLatestTurn | null,
668+
next: OrchestrationLatestTurn | null,
669+
): OrchestrationLatestTurn | null {
670+
if (previous === null || next === null) {
671+
return next;
672+
}
673+
return previous.turnId === next.turnId &&
674+
previous.state === next.state &&
675+
previous.requestedAt === next.requestedAt &&
676+
previous.startedAt === next.startedAt &&
677+
previous.completedAt === next.completedAt &&
678+
previous.assistantMessageId === next.assistantMessageId &&
679+
previous.sourceProposedPlan?.threadId === next.sourceProposedPlan?.threadId &&
680+
previous.sourceProposedPlan?.planId === next.sourceProposedPlan?.planId
681+
? previous
682+
: next;
683+
}
684+
685+
/**
686+
* Points the checkpoint for `turnId` at `messageId`. Returns the input array
687+
* untouched when no checkpoint needs rebinding, so streaming deltas for an
688+
* already-bound message do not allocate a new `checkpoints` reference.
689+
*/
655690
function rebindCheckpointAssistantMessage(
656691
checkpoints: ReadonlyArray<OrchestrationCheckpointSummary>,
657692
turnId: TurnId,
658693
messageId: MessageId,
659-
): OrchestrationCheckpointSummary[] {
694+
): ReadonlyArray<OrchestrationCheckpointSummary> {
695+
const needsRebind = checkpoints.some(
696+
(entry) => entry.turnId === turnId && entry.assistantMessageId !== messageId,
697+
);
698+
if (!needsRebind) {
699+
return checkpoints;
700+
}
660701
return Arr.map(checkpoints, (entry) =>
661702
entry.turnId === turnId ? { ...entry, assistantMessageId: messageId } : entry,
662703
);

0 commit comments

Comments
 (0)