The best way to control Claude Code, Codex and more from any computer or phone
perf(web): long-thread timeline rebuilds 45 → 9 ms, tool updates 12 → 0.3 ms (#26727)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Julius Marminge committed
Oct 28, 2026 at 17:20 UTC
29f33af7d7e81ced8d0c3098ea0fe0ff1895d6a7
5 files changed
+121
-15
apps/web/src/components/chat/MessagesTimeline.logic.ts
+8
-7
@@ -1436,6 +1436,7 @@ export function deriveMessagesTimelineRows(input: {
1436
liveSubagentEntryIds,
1437
completeSupersededReplyEntryIds: completeSupersededReplyIds,
1438
});
1439
+ const timelineEntryById = new Map(timelineEntries.map((entry) => [entry.id, entry]));
1440
const collapsedEntryIds = new Set<string>();
1441
const collapsedFoldMemberIds = new Set<string>();
1442
for (const fold of foldsByAnchorEntryId.values()) {
@@ -1681,14 +1682,14 @@ export function deriveMessagesTimelineRows(input: {
1682
1683
const turnFold = foldsByAnchorEntryId.get(timelineEntry.id);
1684
if (turnFold) {
1684
- const deferredWorkItemIds = timelineEntries.flatMap((entry) =>
1685
- turnFold.entryIds.has(entry.id) &&
1686
- entry.kind === "work" &&
1687
- entry.entry.projectedItem?.item.deferredWork &&
1688
- !supersededWorkItemIds.has(String(entry.entry.projectedItem.sourceItemId))
1685
+ const deferredWorkItemIds = [...turnFold.entryIds].flatMap((entryId) => {
1686
+ const entry = timelineEntryById.get(entryId);
1687
+ return entry?.kind === "work" &&
1688
+ entry.entry.projectedItem?.item.deferredWork &&
1689
+ !supersededWorkItemIds.has(String(entry.entry.projectedItem.sourceItemId))
1690
? [String(entry.entry.projectedItem.sourceItemId)]
1690
- : [],
1691
- );
1691
+ : [];
1692
+ });
1693
nextRows.push({
1694
kind: "turn-fold",
1695
id: `turn-fold:${turnFold.runId}`,
apps/web/src/components/chat/ModelPickerContent.tsx
+3
@@ -41,6 +41,7 @@ import {
41
} from "../ui/combobox";
42
import { ModelEsque } from "./providerIconUtils";
43
import { isCommandPaletteOpen } from "../../commandPaletteBus";
44
+import { registerModelPickerContent } from "../../modelPickerVisibility";
45
import { primaryServerKeybindingsAtom } from "../../state/server";
46
import {
47
modelPickerJumpCommandForIndex,
@@ -377,6 +378,8 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
378
const [searchQuery, setSearchQuery] = useState("");
379
const modelListRef = useRef<LegendListRef | null>(null);
380
const pickerContentRef = useRef<HTMLDivElement>(null);
381
+ // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- publishes this picker's mount to global keydown handlers
382
+ useLayoutEffect(() => registerModelPickerContent(), []);
383
const highlightedModelKeyRef = useRef<string | null>(null);
384
const { favorites } = useEnvironmentModelPreferences(props.environmentId);
385
const activeEntry = props.instanceEntries.find(
apps/web/src/modelPickerVisibility.ts
+10
-5
@@ -1,8 +1,13 @@
1
-const MODEL_PICKER_CONTENT_SELECTOR = "[data-model-picker-content]";
1
+// Keydown handlers read this on every key, so a mount count replaces a document query.
2
+let mountedModelPickers = 0;
3
+
4
+export function registerModelPickerContent(): () => void {
5
+ mountedModelPickers += 1;
6
+ return () => {
7
+ mountedModelPickers -= 1;
8
+ };
9
+}
10
11
export function isModelPickerOpen(): boolean {
4
- return (
5
- typeof document !== "undefined" &&
6
- document.querySelector(MODEL_PICKER_CONTENT_SELECTOR) !== null
7
- );
12
+ return mountedModelPickers > 0;
13
}
apps/web/src/session-logic.test.ts
+45
@@ -1472,6 +1472,51 @@ describe("incremental v2 timeline entries", () => {
1472
expect(next.entries[index]).toBe(entry);
1473
});
1474
1475
+ it("re-derives only the work entry whose tool item changed", () => {
1476
+ const fixture = makeStreamingTimelineFixture("Partial");
1477
+ const visibleTurnItems = fixture.visibleTurnItems.map((row) =>
1478
+ row.item.id === "live-work"
1479
+ ? { ...row, item: { ...row.item, status: "running" as const, completedAt: null } }
1480
+ : row,
1481
+ );
1482
+ const input = { visibleTurnItems, optimisticMessages: [] };
1483
+ const previous = deriveTimelineEntriesFromVisibleTurnItemsWithState(input);
1484
+ const nextInput = { ...input, visibleTurnItems: fixture.visibleTurnItems };
1485
+ const next = deriveTimelineEntriesFromVisibleTurnItemsWithState(nextInput, previous);
1486
+ expect(next.entries).toEqual(deriveTimelineEntriesFromVisibleTurnItems(nextInput));
1487
+ for (const [index, entry] of previous.entries.entries()) {
1488
+ if (entry.id === "live-work") expect(next.entries[index]).not.toBe(entry);
1489
+ else expect(next.entries[index]).toBe(entry);
1490
+ }
1491
+
1492
+ const anchoredInput = {
1493
+ ...nextInput,
1494
+ anchoredMessages: [
1495
+ {
1496
+ id: MessageId.make("feedback"),
1497
+ runId: null,
1498
+ role: "assistant" as const,
1499
+ text: "Feedback received",
1500
+ streaming: false,
1501
+ createdAt: fixture.time(6),
1502
+ updatedAt: fixture.time(6),
1503
+ },
1504
+ ],
1505
+ };
1506
+ const anchored = deriveTimelineEntriesFromVisibleTurnItemsWithState(anchoredInput);
1507
+ const movedInput = {
1508
+ ...anchoredInput,
1509
+ visibleTurnItems: anchoredInput.visibleTurnItems.map((row) =>
1510
+ row.item.id === "live-work"
1511
+ ? { ...row, item: { ...row.item, startedAt: DateTime.makeUnsafe(fixture.time(8)) } }
1512
+ : row,
1513
+ ),
1514
+ };
1515
+ expect(
1516
+ deriveTimelineEntriesFromVisibleTurnItemsWithState(movedInput, anchored).entries,
1517
+ ).toEqual(deriveTimelineEntriesFromVisibleTurnItems(movedInput));
1518
+ });
1519
+
1520
it.each(["completion", "provenance", "ordering", "attachment", "run"] as const)(
1521
"rebuilds entries for a %s change instead of retaining stale v2 metadata",
1522
(change) => {
apps/web/src/session-logic.ts
+55
-3
@@ -903,6 +903,27 @@ export function isStreamingTurnItemTextUpdate(
903
return Equal.equals(previousMetadata, nextMetadata);
904
}
905
906
+/**
907
+ * A changed tool or work item maps to exactly one entry with the item's id.
908
+ * Messages and question answers take part in cross-entry dedupe, and anchored
909
+ * messages are placed by createdAt, so those changes rebuild.
910
+ */
911
+function canRederiveInPlace(
912
+ input: TimelineEntriesInput,
913
+ previousItem: OrchestrationV2ProjectedTurnItem,
914
+ item: OrchestrationV2ProjectedTurnItem,
915
+): boolean {
916
+ return (
917
+ item.item.id === previousItem.item.id &&
918
+ item.item.type === previousItem.item.type &&
919
+ item.item.type !== "user_message" &&
920
+ item.item.type !== "assistant_message" &&
921
+ item.item.type !== "user_input_request" &&
922
+ ((input.anchoredMessages?.length ?? 0) === 0 ||
923
+ projectedItemCreatedAt(item) === projectedItemCreatedAt(previousItem))
924
+ );
925
+}
926
+
927
function reuseTimelineEntries(
928
input: TimelineEntriesInput,
929
previous: TimelineEntriesProjection,
@@ -943,15 +964,45 @@ function reuseTimelineEntries(
964
OrchestrationV2ProjectedTurnItem,
965
OrchestrationV2ProjectedTurnItem
966
>();
967
+ const changedItems: OrchestrationV2ProjectedTurnItem[] = [];
968
for (let index = 0; index < before.visibleTurnItems.length; index += 1) {
969
const previousItem = before.visibleTurnItems[index]!;
970
const item = input.visibleTurnItems[index]!;
971
if (item === previousItem) continue;
950
- if (!isStreamingTurnItemTextUpdate(previousItem, item)) return null;
951
- replacements.set(previousItem, item);
972
+ if (isStreamingTurnItemTextUpdate(previousItem, item)) {
973
+ replacements.set(previousItem, item);
974
+ continue;
975
+ }
976
+ if (!canRederiveInPlace(input, previousItem, item)) return null;
977
+ changedItems.push(item);
978
}
953
- if (replacements.size === 0 && !appended) return previous.entries;
979
+ // One batch keeps the attempt/node/plan lookups to a single build.
980
+ const rederived =
981
+ changedItems.length === 0
982
+ ? []
983
+ : deriveTimelineEntriesFromVisibleTurnItems({
984
+ ...input,
985
+ visibleTurnItems: changedItems,
986
+ optimisticMessages: [],
987
+ anchoredMessages: [],
988
+ });
989
+ if (
990
+ rederived.length !== changedItems.length ||
991
+ rederived.some((entry, index) => entry.id !== changedItems[index]!.item.id)
992
+ ) {
993
+ return null;
994
+ }
995
+ const rederivedEntries = new Map(rederived.map((entry) => [entry.id, entry]));
996
+ if (replacements.size === 0 && rederivedEntries.size === 0 && !appended) {
997
+ return previous.entries;
998
+ }
999
+ let rederivedCount = 0;
1000
const entries = previous.entries.map((entry): TimelineEntry => {
1001
+ const rederivedEntry = rederivedEntries.get(entry.id);
1002
+ if (rederivedEntry !== undefined) {
1003
+ rederivedCount += 1;
1004
+ return rederivedEntry;
1005
+ }
1006
const row =
1007
entry.kind === "message" && entry.projectedItem !== undefined
1008
? replacements.get(entry.projectedItem)
@@ -967,6 +1018,7 @@ function reuseTimelineEntries(
1018
},
1019
};
1020
});
1021
+ if (rederivedCount !== rederivedEntries.size) return null;
1022
if (appended) {
1023
entries.push(
1024
...deriveTimelineEntriesFromVisibleTurnItems({