The open source coding agent.
TypeScript
fix(ui): eliminate N+1 reactive subscriptions in SessionTurn (#18924)
Burak Yigit Kayac9c93eac00bd
diff --git a/packages/app/src/pages/session/message-timeline.tsx b/packages/app/src/pages/session/message-timeline.tsxindex fe61f16854c..5fef41a5505 100644--- a/packages/app/src/pages/session/message-timeline.tsx+++ b/packages/app/src/pages/session/message-timeline.tsx@@ -923,7 +923,15 @@ export function MessageTimeline(props: {{(messageID) => {const active = createMemo(() => activeMessageID() === messageID)const comments = createMemo(() => messageComments(sync.data.part[messageID] ?? []), [], {- equals: (a, b) => JSON.stringify(a) === JSON.stringify(b),+ equals: (a, b) =>+ a.length === b.length &&+ a.every(+ (c, i) =>+ c.path === b[i].path &&+ c.comment === b[i].comment &&+ c.selection?.startLine === b[i].selection?.startLine &&+ c.selection?.endLine === b[i].selection?.endLine,+ ),})const commentCount = createMemo(() => comments().length)return (@@ -979,6 +987,7 @@ export function MessageTimeline(props: {<SessionTurnsessionID={sessionID() ?? ""}messageID={messageID}+ messages={sessionMessages()}actions={props.actions}active={active()}status={active() ? sessionStatus() : undefined}diff --git a/packages/ui/src/components/session-turn.tsx b/packages/ui/src/components/session-turn.tsxindex 8c9c1ffe403..f7ba20af579 100644--- a/packages/ui/src/components/session-turn.tsx+++ b/packages/ui/src/components/session-turn.tsx@@ -142,6 +142,7 @@ export function SessionTurn(props: ParentProps<{sessionID: stringmessageID: string+ messages?: MessageType[]actions?: UserActionsshowReasoningSummaries?: booleanshellToolDefaultOpen?: boolean@@ -166,7 +167,7 @@ export function SessionTurn(const emptyDiffs: FileDiff[] = []const idle = { type: "idle" as const }- const allMessages = createMemo(() => list(data.store.message?.[props.sessionID], emptyMessages))+ const allMessages = createMemo(() => props.messages ?? list(data.store.message?.[props.sessionID], emptyMessages))const messageIndex = createMemo(() => {const messages = allMessages() ?? emptyMessages@@ -340,30 +341,28 @@ export function SessionTurn(if (end < start) return undefinedreturn end - start})- const assistantVisible = createMemo(() =>- assistantMessages().reduce((count, message) => {- const parts = list(data.store.part?.[message.id], emptyParts)- return count + parts.filter((part) => partState(part, showReasoningSummaries()) === "visible").length- }, 0),- )- const assistantTailVisible = createMemo(() =>- assistantMessages()- .flatMap((message) => list(data.store.part?.[message.id], emptyParts))- .flatMap((part) => {- if (partState(part, showReasoningSummaries()) !== "visible") return []- if (part.type === "text") return ["text" as const]- return ["other" as const]- })- .at(-1),- )- const reasoningHeading = createMemo(() =>- assistantMessages()- .flatMap((message) => list(data.store.part?.[message.id], emptyParts))- .filter((part): part is PartType & { type: "reasoning"; text: string } => part.type === "reasoning")- .map((part) => heading(part.text))- .filter((text): text is string => !!text)- .at(-1),- )+ const assistantDerived = createMemo(() => {+ let visible = 0+ let tail: "text" | "other" | undefined+ let reason: string | undefined+ const show = showReasoningSummaries()+ for (const message of assistantMessages()) {+ for (const part of list(data.store.part?.[message.id], emptyParts)) {+ if (partState(part, show) === "visible") {+ visible+++ tail = part.type === "text" ? "text" : "other"+ }+ if (part.type === "reasoning" && part.text) {+ const h = heading(part.text)+ if (h) reason = h+ }+ }+ }+ return { visible, tail, reason }+ })+ const assistantVisible = createMemo(() => assistantDerived().visible)+ const assistantTailVisible = createMemo(() => assistantDerived().tail)+ const reasoningHeading = createMemo(() => assistantDerived().reason)const showThinking = createMemo(() => {if (!working() || !!error()) return falseif (status().type === "retry") return false