From e16e7676e28b23a532dc61add61a1e1230238230 Mon Sep 17 00:00:00 2001 From: Renfei Zhou Date: Wed, 2 Sep 2026 22:26:36 +0000 Subject: [PATCH] fix(web): expand each side of a steer's fold on its own A steer splits the agent's turn into a fold above the user message and a fold below it. Clicking either one opened and closed both, because the timeline kept the set of expanded folds by turn id and both halves of a steered turn share one turn id. Each fold now carries its own expand key: normally the id of the first entry it hides, so the two halves of a steered turn expand on their own. Only the fold that an interrupt cut short keys by its turn id, because on Stop the timeline expands that fold knowing only which turn was stopped. Written by Claude Fable 5.1 running in Claude Code, driven from T3 Code. --- .../chat/MessagesTimeline.logic.test.ts | 49 ++++++++++++++----- .../components/chat/MessagesTimeline.logic.ts | 23 +++++---- .../src/components/chat/MessagesTimeline.tsx | 24 ++++----- 3 files changed, 62 insertions(+), 34 deletions(-) diff --git a/apps/web/src/components/chat/MessagesTimeline.logic.test.ts b/apps/web/src/components/chat/MessagesTimeline.logic.test.ts index 5776ae80e22fa..8442d20ea086d 100644 --- a/apps/web/src/components/chat/MessagesTimeline.logic.test.ts +++ b/apps/web/src/components/chat/MessagesTimeline.logic.test.ts @@ -6,6 +6,7 @@ import { deriveMessagesTimelineRows, normalizeCompactToolLabel, resolveAssistantMessageCopyState, + type TimelineLatestTurn, shouldPreserveAssistantLineBreaks, } from "./MessagesTimeline.logic"; @@ -337,7 +338,7 @@ describe("deriveMessagesTimelineRows", () => { }, }, ], - expandedTurnIds: new Set(["turn-1" as never]), + expandedFoldKeys: new Set(["assistant-thought-entry"]), isWorking: false, activeTurnStartedAt: null, turnDiffSummaryByAssistantMessageId: new Map(), @@ -540,7 +541,7 @@ describe("deriveMessagesTimelineRows", () => { (row): row is Extract<(typeof collapsedRows)[number], { kind: "turn-fold" }> => row.kind === "turn-fold", ); - expect(foldRow?.turnId).toBe("turn-1"); + expect(foldRow?.expandKey).toBe("assistant-first-entry"); expect(foldRow?.expanded).toBe(false); // User message boundary (00:00:00) → terminal message updatedAt (00:00:22). expect(foldRow?.label).toBe("Worked for 22s"); @@ -552,7 +553,7 @@ describe("deriveMessagesTimelineRows", () => { const expandedRows = deriveMessagesTimelineRows({ timelineEntries, - expandedTurnIds: new Set(["turn-1" as never]), + expandedFoldKeys: new Set(["assistant-first-entry"]), isWorking: false, activeTurnStartedAt: null, turnDiffSummaryByAssistantMessageId: new Map(), @@ -724,7 +725,7 @@ describe("deriveMessagesTimelineRows", () => { row.kind === "turn-fold", ); // User message (00:00:00) → trailing work entry (00:00:12). - expect(foldRow?.turnId).toBe("turn-1"); + expect(foldRow?.expandKey).toBe("assistant-commentary-entry"); expect(foldRow?.label).toBe("Worked for 12s"); }); @@ -759,7 +760,7 @@ describe("deriveMessagesTimelineRows", () => { expect(rows).toEqual([ expect.objectContaining({ kind: "turn-fold", - turnId: "turn-1", + expandKey: "turn-1", label: "You stopped after 47s", expanded: false, }), @@ -1309,8 +1310,8 @@ describe("deriveMessagesTimelineRows", () => { revertTurnCountByUserMessageId: new Map(), }); - expect(rows.filter((row) => row.kind === "turn-fold").map((row) => row.turnId)).toEqual([ - "turn-1", + expect(rows.filter((row) => row.kind === "turn-fold").map((row) => row.expandKey)).toEqual([ + "previous-work-entry", ]); expect(rows.map((row) => row.id)).toContain("live-activity-row"); }); @@ -1477,6 +1478,28 @@ describe("deriveMessagesTimelineRows", () => { row.kind === "message" && row.showsTurnFoldSeparator ? [row.id] : [], ), ).toEqual(["assistant-final-entry"]); + + // Each side of the steer expands on its own. + const expandedSide = (keys: ReadonlyArray, latestTurn?: TimelineLatestTurn) => + deriveMessagesTimelineRows({ + ...baseFoldInput, + timelineEntries, + ...(latestTurn ? { latestTurn } : {}), + expandedFoldKeys: new Set(keys), + }) + .filter((row) => row.kind === "turn-fold") + .map((row) => row.kind === "turn-fold" && row.expanded); + expect(expandedSide(["work-1-entry"])).toEqual([true, false]); + expect(expandedSide(["work-2-entry"])).toEqual([false, true]); + // An interrupt knows only the turn id; that expands the side it cut short. + expect( + expandedSide(["turn-1"], { + turnId: "turn-1" as never, + state: "interrupted", + startedAt: "2026-01-01T00:00:00Z", + completedAt: "2026-01-01T00:00:30Z", + }), + ).toEqual([false, true]); }); it("keys the fold after a user message by the new turn even when old-turn residue lands first", () => { @@ -1510,9 +1533,9 @@ describe("deriveMessagesTimelineRows", () => { "turn-fold:work-late-entry", "assistant-two-entry", ]); - expect(rows.filter((row) => row.kind === "turn-fold").map((row) => row.turnId)).toEqual([ - "turn-1", - "turn-2", + expect(rows.filter((row) => row.kind === "turn-fold").map((row) => row.expandKey)).toEqual([ + "work-1-entry", + "work-late-entry", ]); }); @@ -1606,7 +1629,7 @@ describe("deriveMessagesTimelineRows", () => { ...baseFoldInput, timelineEntries, latestTurn, - expandedTurnIds: new Set(["turn-2" as never]), + expandedFoldKeys: new Set(["work-1-entry"]), }); expect(expandedRows.map((row) => row.id)).toContain("work-toggle:work-1-entry"); expect(expandedRows.map((row) => row.id)).toContain("spawn-1-entry"); @@ -1670,7 +1693,7 @@ describe("deriveMessagesTimelineRows", () => { // The segment's own entries end at 00:00:10, but this segment holds the // latest turn's entries, so the end is latestTurn.completedAt (00:00:47). expect(rows.filter((row) => row.kind === "turn-fold")).toEqual([ - expect.objectContaining({ turnId: "turn-2", label: "You stopped after 47s" }), + expect.objectContaining({ expandKey: "turn-2", label: "You stopped after 47s" }), ]); }); @@ -1754,7 +1777,7 @@ describe("deriveMessagesTimelineRows", () => { }, }, ], - expandedTurnIds: new Set(["turn-1" as never]), + expandedFoldKeys: new Set(["assistant-thought-entry"]), isWorking: false, activeTurnStartedAt: null, turnDiffSummaryByAssistantMessageId: new Map(), diff --git a/apps/web/src/components/chat/MessagesTimeline.logic.ts b/apps/web/src/components/chat/MessagesTimeline.logic.ts index 2bf36f9c2823b..63449e7096460 100644 --- a/apps/web/src/components/chat/MessagesTimeline.logic.ts +++ b/apps/web/src/components/chat/MessagesTimeline.logic.ts @@ -225,7 +225,7 @@ export type MessagesTimelineRow = kind: "turn-fold"; id: string; createdAt: string; - turnId: TurnId; + expandKey: string; label: string; expanded: boolean; } @@ -338,7 +338,12 @@ function deriveTerminalAssistantMessageIds(timelineEntries: ReadonlyArray; @@ -407,7 +412,7 @@ function deriveTurnFolds(input: { unsettledTurnId: TurnId | null; }): ReadonlyMap { interface Segment { - /** Last turn id in the segment; folds expand per turn id. */ + /** Last turn id in the segment. */ turnId: TurnId | null; entries: Array; /** @@ -491,7 +496,7 @@ function deriveTurnFolds(input: { : "Worked"; foldsByAnchorEntryId.set(firstHiddenEntry.id, { - turnId, + expandKey: turn?.state === "interrupted" ? turnId : firstHiddenEntry.id, anchorEntryId: firstHiddenEntry.id, createdAt: firstHiddenEntry.createdAt, hiddenEntryIds, @@ -506,7 +511,7 @@ export function deriveMessagesTimelineRows(input: { timelineEntries: ReadonlyArray; latestTurn?: TimelineLatestTurn | null; runningTurnId?: TurnId | null; - expandedTurnIds?: ReadonlySet; + expandedFoldKeys?: ReadonlySet; expandedWorkGroupIds?: ReadonlySet; isWorking: boolean; activeTurnStartedAt: string | null; @@ -533,7 +538,7 @@ export function deriveMessagesTimelineRows(input: { if (fold.terminalEntryId !== null) { foldTerminalEntryIds.add(fold.terminalEntryId); } - if (!input.expandedTurnIds?.has(fold.turnId)) { + if (!input.expandedFoldKeys?.has(fold.expandKey)) { for (const entryId of fold.hiddenEntryIds) { collapsedEntryIds.add(entryId); } @@ -655,9 +660,9 @@ export function deriveMessagesTimelineRows(input: { kind: "turn-fold", id: `turn-fold:${anchoredTurnFold.anchorEntryId}`, createdAt: anchoredTurnFold.createdAt, - turnId: anchoredTurnFold.turnId, + expandKey: anchoredTurnFold.expandKey, label: anchoredTurnFold.label, - expanded: input.expandedTurnIds?.has(anchoredTurnFold.turnId) ?? false, + expanded: input.expandedFoldKeys?.has(anchoredTurnFold.expandKey) ?? false, }); } @@ -868,7 +873,7 @@ function isRowUnchanged(a: MessagesTimelineRow, b: MessagesTimelineRow): boolean case "turn-fold": { const bf = b as typeof a; return ( - a.turnId === bf.turnId && + a.expandKey === bf.expandKey && a.createdAt === bf.createdAt && a.label === bf.label && a.expanded === bf.expanded diff --git a/apps/web/src/components/chat/MessagesTimeline.tsx b/apps/web/src/components/chat/MessagesTimeline.tsx index e98b6a8aae068..4d9c71fee5930 100644 --- a/apps/web/src/components/chat/MessagesTimeline.tsx +++ b/apps/web/src/components/chat/MessagesTimeline.tsx @@ -169,7 +169,7 @@ interface TimelineRowSharedState { onFileOpen: (attachment: ChatFileAttachment) => void; openingVideoAttachmentId: string | null; onOpenTurnDiff: (turnId: TurnId, filePath?: string) => void; - onToggleTurnFold: (turnId: TurnId, anchorKey: string) => void; + onToggleTurnFold: (foldKey: string, anchorKey: string) => void; onToggleWorkGroup: (groupId: string, anchorKey: string) => void; agentPanelModel: AgentPanelModel; onOpenAgents: () => void; @@ -314,7 +314,7 @@ export const MessagesTimeline = memo(function MessagesTimeline({ topFadeEnabled = false, loadEarlier = null, }: MessagesTimelineProps) { - const [expandedTurnIds, setExpandedTurnIds] = useState>(new Set()); + const [expandedFoldKeys, setExpandedFoldKeys] = useState>(new Set()); const [expandedWorkGroupIds, setExpandedWorkGroupIds] = useState>(new Set()); const [disclosureToggleSettling, setDisclosureToggleSettling] = useState(false); const [minimapStripMap] = useState(() => new Map()); @@ -378,14 +378,14 @@ export const MessagesTimeline = memo(function MessagesTimeline({ ); const onToggleTurnFold = useCallback( - (turnId: TurnId, anchorKey: string) => { + (foldKey: string, anchorKey: string) => { suspendEndScrollMaintenanceForDisclosure(anchorKey); - setExpandedTurnIds((existing) => { + setExpandedFoldKeys((existing) => { const next = new Set(existing); - if (next.has(turnId)) { - next.delete(turnId); + if (next.has(foldKey)) { + next.delete(foldKey); } else { - next.add(turnId); + next.add(foldKey); } return next; }); @@ -419,7 +419,7 @@ export const MessagesTimeline = memo(function MessagesTimeline({ } if (latestTurn.turnId === previous.turnId) { if (previous.state === "running" && latestTurn.state === "interrupted") { - setExpandedTurnIds((existing) => { + setExpandedFoldKeys((existing) => { const next = new Set(existing); next.add(latestTurn.turnId); return next; @@ -427,7 +427,7 @@ export const MessagesTimeline = memo(function MessagesTimeline({ } return; } - setExpandedTurnIds((existing) => { + setExpandedFoldKeys((existing) => { if (!existing.has(previous.turnId)) { return existing; } @@ -443,7 +443,7 @@ export const MessagesTimeline = memo(function MessagesTimeline({ timelineEntries, latestTurn, runningTurnId, - expandedTurnIds, + expandedFoldKeys, expandedWorkGroupIds, isWorking, activeTurnStartedAt, @@ -454,7 +454,7 @@ export const MessagesTimeline = memo(function MessagesTimeline({ timelineEntries, latestTurn, runningTurnId, - expandedTurnIds, + expandedFoldKeys, expandedWorkGroupIds, isWorking, activeTurnStartedAt, @@ -1249,7 +1249,7 @@ function TurnFoldTimelineRow({ row }: { row: Extract ctx.onToggleTurnFold(row.turnId, row.id)} + onClick={() => ctx.onToggleTurnFold(row.expandKey, row.id)} className="flex cursor-pointer select-none items-center gap-1 rounded-md px-1 text-sm leading-relaxed text-muted-foreground tabular-nums transition-colors hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring/70" > {row.label}