From 5384ff8e80999c3b8cc890069656a9b465ea805d Mon Sep 17 00:00:00 2001
From: Shantur Rathore <i@shantur.com>
Date: Mon, 1 Dec 2025 23:20:44 +0000
Subject: [PATCH] Merge message parts props

---
 packages/ui/src/components/message-item.tsx      | 14 +++++++-------
 packages/ui/src/components/message-stream-v2.tsx |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/ui/src/components/message-item.tsx b/packages/ui/src/components/message-item.tsx
index 8c26c7ca..8a4425d4 100644
--- a/packages/ui/src/components/message-item.tsx
+++ b/packages/ui/src/components/message-item.tsx
@@ -10,8 +10,7 @@ interface MessageItemProps {
   instanceId: string
   sessionId: string
   isQueued?: boolean
-  combinedParts: ClientPart[]
-  orderedParts: ClientPart[]
+  parts: ClientPart[]
   onRevert?: (messageId: string) => void
   onFork?: (messageId?: string) => void
   showAgentMeta?: boolean
@@ -36,10 +35,11 @@ interface MessageItemProps {
     filename?: string
   }
 
-  const combinedParts = () => props.combinedParts
-
+  const messageParts = () => props.parts
+ 
   const fileAttachments = () =>
-    props.orderedParts.filter((part): part is FilePart => part?.type === "file" && typeof (part as FilePart).url === "string")
+    messageParts().filter((part): part is FilePart => part?.type === "file" && typeof (part as FilePart).url === "string")
+
 
   const getAttachmentName = (part: FilePart) => {
     if (part.filename && part.filename.trim().length > 0) {
@@ -129,7 +129,7 @@ interface MessageItemProps {
       return true
     }
 
-    return combinedParts().some((part) => partHasRenderableText(part))
+    return messageParts().some((part) => partHasRenderableText(part))
   }
 
   const isGenerating = () => {
@@ -237,7 +237,7 @@ interface MessageItemProps {
           </div>
         </Show>
 
-        <For each={combinedParts()}>
+        <For each={messageParts()}>
           {(part) => (
             <MessagePart
               part={part}
diff --git a/packages/ui/src/components/message-stream-v2.tsx b/packages/ui/src/components/message-stream-v2.tsx
index f051f1b8..33849261 100644
--- a/packages/ui/src/components/message-stream-v2.tsx
+++ b/packages/ui/src/components/message-stream-v2.tsx
@@ -903,12 +903,12 @@ function MessageBlock(props: MessageBlockProps) {
                   <MessageItem
                     record={(item as ContentDisplayItem).record}
                     messageInfo={(item as ContentDisplayItem).messageInfo}
-                    combinedParts={(item as ContentDisplayItem).parts}
-                    orderedParts={(item as ContentDisplayItem).parts}
+                    parts={(item as ContentDisplayItem).parts}
                     instanceId={props.instanceId}
                     sessionId={props.sessionId}
                     isQueued={(item as ContentDisplayItem).isQueued}
                     showAgentMeta={(item as ContentDisplayItem).showAgentMeta}
+
                     onRevert={props.onRevert}
                     onFork={props.onFork}
                     onContentRendered={props.onContentRendered}