Skip to content

Commit f5f8af6

Browse files
perf(web): timeline updates and keydowns no longer stall long threads
- Turn folds look up their own entries instead of scanning the whole timeline per fold (quadratic in long threads). - A changed tool/work item re-derives only its own timeline entry instead of rebuilding every entry. - isModelPickerOpen() reads a mount count instead of querying the document on every keydown, once per shortcut scope. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent e34067e commit f5f8af6

5 files changed

Lines changed: 84 additions & 15 deletions

File tree

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,6 +1436,7 @@ export function deriveMessagesTimelineRows(input: {
14361436
liveSubagentEntryIds,
14371437
completeSupersededReplyEntryIds: completeSupersededReplyIds,
14381438
});
1439+
const timelineEntryById = new Map(timelineEntries.map((entry) => [entry.id, entry]));
14391440
const collapsedEntryIds = new Set<string>();
14401441
const collapsedFoldMemberIds = new Set<string>();
14411442
for (const fold of foldsByAnchorEntryId.values()) {
@@ -1681,14 +1682,14 @@ export function deriveMessagesTimelineRows(input: {
16811682

16821683
const turnFold = foldsByAnchorEntryId.get(timelineEntry.id);
16831684
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))
16891690
? [String(entry.entry.projectedItem.sourceItemId)]
1690-
: [],
1691-
);
1691+
: [];
1692+
});
16921693
nextRows.push({
16931694
kind: "turn-fold",
16941695
id: `turn-fold:${turnFold.runId}`,

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import {
4141
} from "../ui/combobox";
4242
import { ModelEsque } from "./providerIconUtils";
4343
import { isCommandPaletteOpen } from "../../commandPaletteBus";
44+
import { registerModelPickerContent } from "../../modelPickerVisibility";
4445
import { primaryServerKeybindingsAtom } from "../../state/server";
4546
import {
4647
modelPickerJumpCommandForIndex,
@@ -377,6 +378,8 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
377378
const [searchQuery, setSearchQuery] = useState("");
378379
const modelListRef = useRef<LegendListRef | null>(null);
379380
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(), []);
380383
const highlightedModelKeyRef = useRef<string | null>(null);
381384
const { favorites } = useEnvironmentModelPreferences(props.environmentId);
382385
const activeEntry = props.instanceEntries.find(
Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -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+
}
210

311
export function isModelPickerOpen(): boolean {
4-
return (
5-
typeof document !== "undefined" &&
6-
document.querySelector(MODEL_PICKER_CONTENT_SELECTOR) !== null
7-
);
12+
return mountedModelPickers > 0;
813
}

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1472,6 +1472,24 @@ describe("incremental v2 timeline entries", () => {
14721472
expect(next.entries[index]).toBe(entry);
14731473
});
14741474

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+
14751493
it.each(["completion", "provenance", "ordering", "attachment", "run"] as const)(
14761494
"rebuilds entries for a %s change instead of retaining stale v2 metadata",
14771495
(change) => {

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

Lines changed: 45 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -903,6 +903,33 @@ export function isStreamingTurnItemTextUpdate(
903903
return Equal.equals(previousMetadata, nextMetadata);
904904
}
905905

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, so they rebuild.
909+
*/
910+
function rederivedNonMessageEntry(
911+
input: TimelineEntriesInput,
912+
previousItem: OrchestrationV2ProjectedTurnItem,
913+
item: OrchestrationV2ProjectedTurnItem,
914+
): TimelineEntry | null {
915+
if (
916+
item.item.id !== previousItem.item.id ||
917+
item.item.type !== previousItem.item.type ||
918+
item.item.type === "user_message" ||
919+
item.item.type === "assistant_message" ||
920+
item.item.type === "user_input_request"
921+
) {
922+
return null;
923+
}
924+
const entries = deriveTimelineEntriesFromVisibleTurnItems({
925+
...input,
926+
visibleTurnItems: [item],
927+
optimisticMessages: [],
928+
anchoredMessages: [],
929+
});
930+
return entries.length === 1 && entries[0]!.id === item.item.id ? entries[0]! : null;
931+
}
932+
906933
function reuseTimelineEntries(
907934
input: TimelineEntriesInput,
908935
previous: TimelineEntriesProjection,
@@ -943,15 +970,29 @@ function reuseTimelineEntries(
943970
OrchestrationV2ProjectedTurnItem,
944971
OrchestrationV2ProjectedTurnItem
945972
>();
973+
const rederivedEntries = new Map<string, TimelineEntry>();
946974
for (let index = 0; index < before.visibleTurnItems.length; index += 1) {
947975
const previousItem = before.visibleTurnItems[index]!;
948976
const item = input.visibleTurnItems[index]!;
949977
if (item === previousItem) continue;
950-
if (!isStreamingTurnItemTextUpdate(previousItem, item)) return null;
951-
replacements.set(previousItem, item);
978+
if (isStreamingTurnItemTextUpdate(previousItem, item)) {
979+
replacements.set(previousItem, item);
980+
continue;
981+
}
982+
const entry = rederivedNonMessageEntry(input, previousItem, item);
983+
if (entry === null) return null;
984+
rederivedEntries.set(entry.id, entry);
985+
}
986+
if (replacements.size === 0 && rederivedEntries.size === 0 && !appended) {
987+
return previous.entries;
952988
}
953-
if (replacements.size === 0 && !appended) return previous.entries;
989+
let rederivedCount = 0;
954990
const entries = previous.entries.map((entry): TimelineEntry => {
991+
const rederived = rederivedEntries.get(entry.id);
992+
if (rederived !== undefined) {
993+
rederivedCount += 1;
994+
return rederived;
995+
}
955996
const row =
956997
entry.kind === "message" && entry.projectedItem !== undefined
957998
? replacements.get(entry.projectedItem)
@@ -967,6 +1008,7 @@ function reuseTimelineEntries(
9671008
},
9681009
};
9691010
});
1011+
if (rederivedCount !== rederivedEntries.size) return null;
9701012
if (appended) {
9711013
entries.push(
9721014
...deriveTimelineEntriesFromVisibleTurnItems({

0 commit comments

Comments
 (0)