@devries-cameron20 / t3code Mirror · read-only / commits / f012fa210d
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 22, 12:00 UTC

fix(web): back-to-back messages from you stack as one burst with a single steer label (#27305)

maria committed Oct 30, 2026 at 16:01 UTC f012fa210dbf464a5ea68fe9071ee377682f8d66
4 files changed +118 -17
apps/web/src/components/chat/MessagesTimeline.logic.test.ts
+68
@@ -1390,6 +1390,74 @@ describe("deriveMessagesTimelineRows", () => {
1390 ]);
1391 });
1392
1393 + it("stacks back-to-back steers as one burst with a single steer label", () => {
1394 + const runId = RunId.make("double-steer-run");
1395 + const time = (second: number) => new Date(Date.UTC(2026, 0, 1, 0, 0, second)).toISOString();
1396 + const message = (
1397 + id: string,
1398 + second: number,
1399 + role: "user" | "assistant",
1400 + inputIntent?: "turn_start" | "steer",
1401 + ): TimelineEntry => ({
1402 + kind: "message",
1403 + id,
1404 + createdAt: time(second),
1405 + message: {
1406 + id: MessageId.make(id),
1407 + role,
1408 + text: id,
1409 + runId,
1410 + ...(inputIntent ? { inputIntent } : {}),
1411 + createdAt: time(second),
1412 + updatedAt: time(second),
1413 + streaming: false,
1414 + },
1415 + });
1416 + const prompt = message("prompt", 0, "user", "turn_start");
1417 + const work: TimelineEntry = {
1418 + kind: "work",
1419 + id: "work",
1420 + createdAt: time(4),
1421 + entry: { id: "work", createdAt: time(4), runId, label: "Ran command", tone: "tool" },
1422 + };
1423 + const firstSteer = message("first-steer", 10, "user", "steer");
1424 + const deriveRows = (timelineEntries: TimelineEntry[]) =>
1425 + deriveMessagesTimelineRows({
1426 + timelineEntries,
1427 + latestRun: { runId, status: "completed", startedAt: time(0), completedAt: time(30) },
1428 + isWorking: false,
1429 + expandedRunIds: new Set(),
1430 + turnDiffSummaries: [],
1431 + supportsConversationRollback: false,
1432 + });
1433 + // The second steer arrives while the first message object is reused, as live updates do.
1434 + const before = computeStableMessagesTimelineRows(deriveRows([prompt, work, firstSteer]), {
1435 + result: [],
1436 + byId: new Map(),
1437 + });
1438 + const rows = computeStableMessagesTimelineRows(
1439 + deriveRows([
1440 + prompt,
1441 + work,
1442 + firstSteer,
1443 + message("second-steer", 12, "user", "steer"),
1444 + message("final", 30, "assistant"),
1445 + ]),
1446 + before,
1447 + ).result;
1448 +
1449 + const byId = new Map(rows.map((row) => [row.id, row]));
1450 + expect(byId.get("prompt")).not.toHaveProperty("groupedWithNext");
1451 + expect(byId.get("first-steer")).toMatchObject({
1452 + groupedWithNext: true,
1453 + continuesSteer: false,
1454 + });
1455 + expect(byId.get("second-steer")).toMatchObject({
1456 + groupedWithNext: false,
1457 + continuesSteer: true,
1458 + });
1459 + });
1460 +
1461 it("keeps the previous turn folded while a newly sent message awaits its turn", () => {
1462 const rows = deriveMessagesTimelineRows({
1463 timelineEntries: [
apps/web/src/components/chat/MessagesTimeline.logic.ts
+35 -5
@@ -1,4 +1,5 @@
1 import { worktreeSetupAgentStarted } from "@t3tools/client-runtime/worktree-setup";
2 +import { resolveUserMessagePresentation } from "@t3tools/client-runtime/user-message";
3 import { isLiveSubagentTurnItem } from "@t3tools/client-runtime/state/subagentRuntime";
4 import * as DateTime from "effect/DateTime";
5 import * as Equal from "effect/Equal";
@@ -594,6 +595,10 @@ type MessagesTimelineRowContent =
595 assistantCopyStreaming: boolean;
596 assistantTurnDiffSummary?: TurnDiffSummary | undefined;
597 revertTurnCount?: number | undefined;
598 + /** Another of your messages follows directly, so the two sit closer together. */
599 + groupedWithNext?: boolean;
600 + /** Set when the message above is a steer too, so the label shows once. */
601 + continuesSteer?: boolean;
602 }
603 | {
604 kind: "assistant-meta";
@@ -2134,13 +2139,36 @@ export function deriveMessagesTimelineRows(input: {
2139 const result = attachTrailingToolGroupsToAssistant(
2140 attachCreatedThreadSummaries(nextRows, timelineEntries, collapsedFoldMemberIds),
2141 );
2137 - return result.map((row, index) =>
2138 - timelineRowIsWorkLog(row) && timelineRowIsWorkLog(result[index + 1])
2139 - ? { ...row, continuesWorkLog: true }
2140 - : row,
2142 + return result.map((row, index) => {
2143 + if (timelineRowIsWorkLog(row) && timelineRowIsWorkLog(result[index + 1])) {
2144 + return { ...row, continuesWorkLog: true };
2145 + }
2146 + if (!timelineRowIsOwnUserMessage(row)) return row;
2147 + const previous = result[index - 1];
2148 + const groupedWithNext = timelineRowIsOwnUserMessage(result[index + 1]);
2149 + const continuesSteer =
2150 + timelineRowIsOwnUserMessage(previous) &&
2151 + messageIsSteer(row.message) &&
2152 + messageIsSteer(previous.message);
2153 + if (!groupedWithNext && !continuesSteer) return row;
2154 + return { ...row, groupedWithNext, continuesSteer };
2155 + });
2156 +}
2157 +
2158 +function timelineRowIsOwnUserMessage(
2159 + row: MessagesTimelineRow | undefined,
2160 +): row is Extract<MessagesTimelineRow, { kind: "message" }> {
2161 + return (
2162 + row?.kind === "message" &&
2163 + row.message.role === "user" &&
2164 + resolveUserMessagePresentation(row.message).attribution === null
2165 );
2166 }
2167
2168 +function messageIsSteer(message: ChatMessage): boolean {
2169 + return message.inputIntent === "steer" || message.inputIntent === "promoted_queued_to_steer";
2170 +}
2171 +
2172 function timelineRowIsWorkLog(row: MessagesTimelineRow | undefined): boolean {
2173 return (
2174 row !== undefined &&
@@ -2478,7 +2506,9 @@ function isRowUnchanged(a: MessagesTimelineRow, b: MessagesTimelineRow): boolean
2506 a.showAssistantCopyButton === bm.showAssistantCopyButton &&
2507 a.assistantCopyStreaming === bm.assistantCopyStreaming &&
2508 a.assistantTurnDiffSummary === bm.assistantTurnDiffSummary &&
2481 - a.revertTurnCount === bm.revertTurnCount
2509 + a.revertTurnCount === bm.revertTurnCount &&
2510 + a.groupedWithNext === bm.groupedWithNext &&
2511 + a.continuesSteer === bm.continuesSteer
2512 );
2513 }
2514 }
apps/web/src/components/chat/MessagesTimeline.tsx
+12 -10
@@ -1441,16 +1441,18 @@ const TimelineRowContent = memo(function TimelineRowContent({ row }: { row: Time
1441 ? undefined
1442 : row.kind === "turn-fold" || row.kind === "working"
1443 ? "pb-1.5"
1444 - : (row.kind === "message" &&
1445 - row.message.role === "assistant" &&
1446 - !row.showAssistantMeta) ||
1447 - row.kind === "worktree-setup" ||
1448 - row.kind === "event" ||
1449 - row.kind === "attempt-fold" ||
1450 - row.kind === "html-render" ||
1451 - row.kind === "mcp-app"
1452 - ? "pb-2"
1453 - : "pb-4",
1444 + : row.kind === "message" && row.groupedWithNext
1445 + ? "pb-1"
1446 + : (row.kind === "message" &&
1447 + row.message.role === "assistant" &&
1448 + !row.showAssistantMeta) ||
1449 + row.kind === "worktree-setup" ||
1450 + row.kind === "event" ||
1451 + row.kind === "attempt-fold" ||
1452 + row.kind === "html-render" ||
1453 + row.kind === "mcp-app"
1454 + ? "pb-2"
1455 + : "pb-4",
1456 (row.kind === "message" && row.message.role === "assistant") ||
1457 row.kind === "assistant-meta"
1458 ? "group/assistant"
apps/web/src/components/chat/TimelineUserMessageRow.tsx
+3 -2
@@ -484,8 +484,9 @@ function UserTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "message"
484 <GuestMessageName name={userMessage.guestName} />
485 </div>
486 ) : null}
487 - {row.message.inputIntent === "steer" ||
488 - row.message.inputIntent === "promoted_queued_to_steer" ? (
487 + {(row.message.inputIntent === "steer" ||
488 + row.message.inputIntent === "promoted_queued_to_steer") &&
489 + !row.continuesSteer ? (
490 <UserMessageIntentMarker intent={row.message.inputIntent} />
491 ) : null}
492 <div