Skip to content

Commit 3a29162

Browse files
refactor(web): turn diff summaries keep their caching without "use memo"
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent af39520 commit 3a29162

8 files changed

Lines changed: 97 additions & 46 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,6 @@ import { isCommandPaletteOpen } from "../commandPaletteBus";
212212
import { settleAndAdvance } from "../settleAndAdvance";
213213
import { subscribeSnapShotComposerFocus } from "../lib/desktopSnapShot";
214214
import { useMediaQuery } from "../hooks/useMediaQuery";
215-
import { useTurnDiffSummaries } from "../hooks/useTurnDiffSummaries";
216215
import { FileMetadataThreadProvider } from "../hooks/FileMetadataThreadProvider";
217216
import { usePreviewPanelInlineSize } from "../hooks/usePreviewPanelInlineSize";
218217
import {
@@ -379,6 +378,7 @@ import {
379378
useChildThreadInputs,
380379
useThreadRefs,
381380
useThreadVisibleTurnItems,
381+
useThreadCheckpointSummaries,
382382
waitForThreadShell,
383383
} from "../state/entities";
384384
import { environmentShell } from "../state/shell";
@@ -2964,7 +2964,7 @@ export default function ChatView(props: ChatViewProps) {
29642964
panelAnimationsActive,
29652965
panelAnimationDurationMs,
29662966
);
2967-
const { turnDiffSummaries } = useTurnDiffSummaries(serverProjection);
2967+
const turnDiffSummaries = useThreadCheckpointSummaries(routeThreadDetailRef);
29682968

29692969
/**
29702970
* File tools are explicit; completed commands are included because a shell

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

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,8 @@ import {
4545
} from "../lib/diffRendering";
4646
import { PREFERRED_HIGHLIGHTER } from "../lib/syntaxHighlighting";
4747
import { areAllDiffFilesCollapsed, toggleAllDiffFiles } from "../lib/diffCollapse";
48-
import { useTurnDiffSummaries } from "../hooks/useTurnDiffSummaries";
4948
import { useWorkspaceMutationRefresh } from "../hooks/useWorkspaceMutationRefresh";
50-
import { useProject, useThreadProjection, useThreadShell } from "../state/entities";
49+
import { useProject, useThreadCheckpointSummaries, useThreadShell } from "../state/entities";
5150
import { resolveThreadRouteRef } from "../threadRoutes";
5251
import { useClientSettings, useUpdateClientSettings } from "../hooks/useSettings";
5352
import { formatShortTimestamp } from "../timestampFormat";
@@ -222,7 +221,6 @@ export default function DiffPanel({
222221
});
223222
const activeThreadId = routeThreadRef?.threadId ?? null;
224223
const activeThread = useThreadShell(routeThreadRef);
225-
const activeThreadProjection = useThreadProjection(routeThreadRef)?.projection ?? null;
226224
const fileAccess = useFilesystemReadAccess(activeThread?.environmentId ?? null);
227225
const { canReadFiles } = fileAccess;
228226
const activeProjectId = activeThread?.projectId ?? null;
@@ -259,15 +257,10 @@ export default function DiffPanel({
259257
selectThreadDiffPanelSelection(state.byThreadKey, routeThreadRef),
260258
);
261259
const isGitRepo = gitStatusQuery.data?.isRepo ?? true;
262-
const { turnDiffSummaries, inferredCheckpointTurnCountByRunId } =
263-
useTurnDiffSummaries(activeThreadProjection);
264-
const orderedTurnDiffSummaries = [...turnDiffSummaries].toSorted((left, right) => {
265-
const leftTurnCount =
266-
left.checkpointTurnCount ?? inferredCheckpointTurnCountByRunId[left.runId] ?? 0;
267-
const rightTurnCount =
268-
right.checkpointTurnCount ?? inferredCheckpointTurnCountByRunId[right.runId] ?? 0;
269-
if (leftTurnCount !== rightTurnCount) {
270-
return rightTurnCount - leftTurnCount;
260+
const turnDiffSummaries = useThreadCheckpointSummaries(routeThreadRef);
261+
const orderedTurnDiffSummaries = turnDiffSummaries.toSorted((left, right) => {
262+
if (left.checkpointTurnCount !== right.checkpointTurnCount) {
263+
return right.checkpointTurnCount - left.checkpointTurnCount;
271264
}
272265
return right.completedAt.localeCompare(left.completedAt);
273266
});
@@ -291,9 +284,7 @@ export default function DiffPanel({
291284
? undefined
292285
: (orderedTurnDiffSummaries.find((summary) => summary.runId === selectedRunId) ??
293286
orderedTurnDiffSummaries[0]);
294-
const selectedCheckpointTurnCount =
295-
selectedTurn &&
296-
(selectedTurn.checkpointTurnCount ?? inferredCheckpointTurnCountByRunId[selectedTurn.runId]);
287+
const selectedCheckpointTurnCount = selectedTurn?.checkpointTurnCount;
297288
const latestTurn = orderedTurnDiffSummaries[0];
298289
const selectedScopeLabel =
299290
selectedRunId === null
@@ -691,10 +682,7 @@ export default function DiffPanel({
691682
<DropdownMenuSubContent>
692683
<DropdownMenuRadioGroup value={selectedTurnValue} onValueChange={selectScopeValue}>
693684
{orderedTurnDiffSummaries.map((summary) => {
694-
const turnCount =
695-
summary.checkpointTurnCount ??
696-
inferredCheckpointTurnCountByRunId[summary.runId] ??
697-
"?";
685+
const turnCount = summary.checkpointTurnCount;
698686
return (
699687
<DropdownMenuRadioItem
700688
key={summary.runId}

‎apps/web/src/hooks/useTurnDiffSummaries.ts‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎apps/web/src/session-logic.ts‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,16 +1011,6 @@ export function deriveTimelineEntriesFromVisibleTurnItemsWithState(
10111011
};
10121012
}
10131013

1014-
export function inferCheckpointTurnCountByRunId(
1015-
summaries: ReadonlyArray<ThreadCheckpointSummary>,
1016-
): Record<string, number> {
1017-
return Object.fromEntries(
1018-
summaries.flatMap((summary) =>
1019-
summary.runId === null ? [] : [[summary.runId, summary.checkpointTurnCount] as const],
1020-
),
1021-
);
1022-
}
1023-
10241014
export function deriveRevertTurnCountByUserMessageId(input: {
10251015
readonly timelineEntries: ReadonlyArray<TimelineEntry>;
10261016
readonly checkpoints: ReadonlyArray<ThreadCheckpointSummary>;

‎apps/web/src/state/entities.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {
1111
} from "@t3tools/client-runtime/state/threads";
1212
import type { ScopedProjectRef, ScopedThreadRef, ServerConfig } from "@t3tools/contracts";
1313
import type { EnvironmentId, OrchestrationV2ProjectedTurnItem } from "@t3tools/contracts";
14+
import type { ThreadCheckpointSummary } from "@t3tools/client-runtime/state/thread-checkpoints";
1415
import { Atom } from "effect/reactivity";
1516
import { appAtomRegistry } from "../rpc/atomRegistry";
1617
import { environmentProjects } from "./projects";
@@ -46,6 +47,9 @@ const EMPTY_THREAD_STATUS_ATOM = Atom.make<EnvironmentThreadStatus>("empty").pip
4647
const EMPTY_VISIBLE_TURN_ITEMS_ATOM = Atom.make(EMPTY_VISIBLE_TURN_ITEMS).pipe(
4748
Atom.withLabel("web-thread-visible-turn-items:empty"),
4849
);
50+
const EMPTY_CHECKPOINT_SUMMARIES_ATOM = Atom.make<ReadonlyArray<ThreadCheckpointSummary>>(
51+
Object.freeze([]),
52+
).pipe(Atom.withLabel("web-thread-checkpoint-summaries:empty"));
4953
const EMPTY_THREAD_HISTORY_ATOM = Atom.make<ThreadHistoryMeta>(EMPTY_THREAD_HISTORY_META).pipe(
5054
Atom.withLabel("web-thread-history:empty"),
5155
);
@@ -159,6 +163,16 @@ export function useThreadVisibleTurnItems(
159163
);
160164
}
161165

166+
export function useThreadCheckpointSummaries(
167+
ref: ScopedThreadRef | null,
168+
): ReadonlyArray<ThreadCheckpointSummary> {
169+
return useAtomValue(
170+
ref === null
171+
? EMPTY_CHECKPOINT_SUMMARIES_ATOM
172+
: environmentThreadDetails.checkpointSummariesAtom(ref),
173+
);
174+
}
175+
162176
export function readProject(ref: ScopedProjectRef): EnvironmentProject | null {
163177
return appAtomRegistry.get(environmentProjects.projectAtom(ref));
164178
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export interface ThreadCheckpointSummary {
2626
}
2727

2828
export function deriveThreadCheckpointSummaries(
29-
projection: OrchestrationV2ThreadProjection,
29+
projection: Pick<OrchestrationV2ThreadProjection, "checkpoints" | "messages">,
3030
): ReadonlyArray<ThreadCheckpointSummary> {
3131
return projection.checkpoints.flatMap((checkpoint) => {
3232
if (checkpoint.appRunOrdinal === null || checkpoint.runId === null) return [];

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

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
import {
2+
CheckpointId,
3+
CheckpointRef,
4+
CheckpointScopeId,
25
EnvironmentId,
36
NodeId,
47
ProviderDriverKind,
@@ -326,3 +329,46 @@ it("keeps worktree and pending requests stable during output updates, then refle
326329
dispose();
327330
registry.dispose();
328331
});
332+
333+
it("rebuilds checkpoint summaries only when checkpoints or messages change", () => {
334+
const checkpoint: OrchestrationV2ThreadProjection["checkpoints"][number] = {
335+
id: CheckpointId.make("checkpoint-1"),
336+
threadId: v2Projection.thread.id,
337+
scopeId: CheckpointScopeId.make("scope-1"),
338+
runId: RunId.make("run-1"),
339+
nodeId: NodeId.make("node-1"),
340+
parentCheckpointId: null,
341+
ordinalWithinScope: 1,
342+
appRunOrdinal: 1,
343+
ref: CheckpointRef.make("ref-1"),
344+
status: "ready",
345+
files: [],
346+
capturedAt: v2Now,
347+
};
348+
const projection: OrchestrationV2ThreadProjection = {
349+
...v2Projection,
350+
checkpoints: [checkpoint],
351+
};
352+
const live = (data: OrchestrationV2ThreadProjection | null) =>
353+
AsyncResult.success(
354+
threadState({ data: Option.fromNullishOr(data), status: "live", error: Option.none() }),
355+
);
356+
const sourceAtom = Atom.make(live(projection));
357+
const details = createEnvironmentThreadDetailAtoms(() => sourceAtom);
358+
const registry = AtomRegistry.make();
359+
const dispose = registry.mount(details.checkpointSummariesAtom(ref));
360+
361+
const summaries = registry.get(details.checkpointSummariesAtom(ref));
362+
expect(summaries.map((summary) => summary.runId)).toEqual(["run-1"]);
363+
364+
registry.set(sourceAtom, live({ ...projection, runs: [] }));
365+
expect(registry.get(details.checkpointSummariesAtom(ref))).toBe(summaries);
366+
367+
registry.set(sourceAtom, live({ ...projection, checkpoints: [] }));
368+
expect(registry.get(details.checkpointSummariesAtom(ref))).toEqual([]);
369+
370+
registry.set(sourceAtom, live(null));
371+
expect(registry.get(details.checkpointSummariesAtom(ref))).toEqual([]);
372+
dispose();
373+
registry.dispose();
374+
});

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ import {
88
type ThreadQueueWorkflowState,
99
} from "./threadWorkflows.ts";
1010
import { deriveThreadTurnSubagents, type ThreadTurnSubagents } from "./threadSubagents.ts";
11+
import {
12+
deriveThreadCheckpointSummaries,
13+
type ThreadCheckpointSummary,
14+
} from "./threadCheckpoints.ts";
1115
import type { EnvironmentThread } from "./models.ts";
1216
import { EMPTY_ENVIRONMENT_THREAD_STATE, type EnvironmentThreadState } from "./threadState.ts";
1317
import {
@@ -20,6 +24,7 @@ import { arrayElementsEqual, parseThreadKey, threadKey } from "./entities.ts";
2024
const EMPTY_VISIBLE_TURN_ITEMS: OrchestrationV2ThreadProjection["visibleTurnItems"] = Object.freeze(
2125
[],
2226
);
27+
const EMPTY_CHECKPOINT_SUMMARIES: ReadonlyArray<ThreadCheckpointSummary> = Object.freeze([]);
2328

2429
export function createEnvironmentThreadDetailAtoms<E>(
2530
threadStateAtom: (
@@ -123,6 +128,26 @@ export function createEnvironmentThreadDetailAtoms<E>(
123128
}).pipe(Atom.setIdleTTL(0), Atom.withLabel(`environment-thread-turn-subagents:${key}`));
124129
});
125130

131+
const checkpointSummariesAtomFamily = Atom.family((key: string) => {
132+
let previous: Pick<OrchestrationV2ThreadProjection, "checkpoints" | "messages"> | null = null;
133+
let value = EMPTY_CHECKPOINT_SUMMARIES;
134+
return Atom.make((get) => {
135+
const projection = Option.getOrNull(get(threadStateValueAtomFamily(key)).data);
136+
if (projection === null) {
137+
previous = null;
138+
value = EMPTY_CHECKPOINT_SUMMARIES;
139+
} else if (
140+
projection.checkpoints !== previous?.checkpoints ||
141+
projection.messages !== previous?.messages
142+
) {
143+
const { checkpoints, messages } = projection;
144+
previous = { checkpoints, messages };
145+
value = deriveThreadCheckpointSummaries(previous);
146+
}
147+
return value;
148+
}).pipe(Atom.setIdleTTL(0), Atom.withLabel(`environment-thread-checkpoint-summaries:${key}`));
149+
});
150+
126151
const worktreePathAtomFamily = Atom.family((key: string) =>
127152
Atom.make(
128153
(get) =>
@@ -189,6 +214,8 @@ export function createEnvironmentThreadDetailAtoms<E>(
189214
queueWorkflowAtom: (ref: ScopedThreadRef) => queueWorkflowAtomFamily(threadKey(ref)),
190215
queuedCountAtom: (ref: ScopedThreadRef) => queuedCountAtomFamily(threadKey(ref)),
191216
turnSubagentsAtom: (ref: ScopedThreadRef) => turnSubagentsAtomFamily(threadKey(ref)),
217+
checkpointSummariesAtom: (ref: ScopedThreadRef) =>
218+
checkpointSummariesAtomFamily(threadKey(ref)),
192219
stateAtom: (ref: ScopedThreadRef) => threadStateValueAtomFamily(threadKey(ref)),
193220
threadAtom: (ref: ScopedThreadRef) => threadAtomFamily(threadKey(ref)),
194221
visibleTurnItemsAtom: (ref: ScopedThreadRef) => visibleTurnItemsAtomFamily(threadKey(ref)),

0 commit comments

Comments
 (0)