Skip to content

The agent that grows with you

fix(desktop): keep toChatMessages' callback under its complexity cap

Teknium59d31b77ab68
diff --git a/apps/desktop/src/lib/chat-messages/hydration.ts b/apps/desktop/src/lib/chat-messages/hydration.ts
index 3a538f91381..ef5006ed789 100644
--- a/apps/desktop/src/lib/chat-messages/hydration.ts
+++ b/apps/desktop/src/lib/chat-messages/hydration.ts
@@ -423,12 +423,10 @@ export function toChatMessages(messages: SessionMessage[]): ChatMessage[] {
clearPendingTools()
}
- messages.forEach((message, index) => {
- // Skipped in place, not filtered first: `index` keys tool-part and message ids by the stored row position.
- if (!isPainted(message)) {
- return
- }
+ // `index` stays the stored row position (it keys tool-part and message ids), so skipped merges shift nothing.
+ const painted = messages.flatMap((message, index) => (isPainted(message) ? [{ index, message }] : []))
+ painted.forEach(({ message, index }) => {
if (message.role === 'assistant') {
nearestAssistant = message
} else if (message.role === 'user' || message.role === 'system') {