From 92d16084db9df1ebe6acaa0d495587ba7b577cf1 Mon Sep 17 00:00:00 2001
From: Shantur Rathore <i@shantur.com>
Date: Mon, 8 Dec 2025 09:52:22 +0000
Subject: [PATCH] fix: render full message preview for tool calls

---
 .../ui/src/components/message-preview.tsx     | 34 +++++++++++++------
 .../ui/src/components/message-timeline.tsx    |  7 ++--
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/packages/ui/src/components/message-preview.tsx b/packages/ui/src/components/message-preview.tsx
index b8e153fb..2a2c0da7 100644
--- a/packages/ui/src/components/message-preview.tsx
+++ b/packages/ui/src/components/message-preview.tsx
@@ -1,24 +1,36 @@
-import type { Component } from "solid-js"
-import MessageItem from "./message-item"
-import type { MessageRecord } from "../stores/message-v2/types"
-import type { MessageInfo } from "../types/message"
+import { createMemo, type Component } from "solid-js"
+import MessageBlock from "./message-block"
+import type { InstanceMessageStore } from "../stores/message-v2/instance-store"
 
 interface MessagePreviewProps {
-  record: MessageRecord
-  messageInfo?: MessageInfo
   instanceId: string
   sessionId: string
+  messageId: string
+  store: () => InstanceMessageStore
 }
 
 const MessagePreview: Component<MessagePreviewProps> = (props) => {
+  const indexMap = createMemo(() => new Map([[props.messageId, 0]]))
+  const lastAssistantIndex = createMemo(() => {
+    const record = props.store().getMessage(props.messageId)
+    if (record?.role === "assistant") {
+      return 0
+    }
+    return -1
+  })
+
   return (
-    <div class="message-preview">
-      <MessageItem
-        record={props.record}
-        messageInfo={props.messageInfo}
+    <div class="message-preview message-stream">
+      <MessageBlock
+        messageId={props.messageId}
         instanceId={props.instanceId}
         sessionId={props.sessionId}
-        parts={props.record.partIds.map((id) => props.record.parts[id]?.data).filter((part): part is NonNullable<typeof part> => Boolean(part))}
+        store={props.store}
+        messageIndexMap={indexMap}
+        lastAssistantIndex={lastAssistantIndex}
+        showThinking={() => false}
+        thinkingDefaultExpanded={() => false}
+        showUsageMetrics={() => false}
       />
     </div>
   )
diff --git a/packages/ui/src/components/message-timeline.tsx b/packages/ui/src/components/message-timeline.tsx
index 79d4eae7..7d7b5b0a 100644
--- a/packages/ui/src/components/message-timeline.tsx
+++ b/packages/ui/src/components/message-timeline.tsx
@@ -273,8 +273,7 @@ const MessageTimeline: Component<MessageTimelineProps> = (props) => {
     if (!segment) return null
     const record = store().getMessage(segment.messageId)
     if (!record) return null
-    const info = store().getMessageInfo(segment.messageId)
-    return { record, info }
+    return { messageId: segment.messageId }
   })
  
   return (
@@ -303,10 +302,10 @@ const MessageTimeline: Component<MessageTimelineProps> = (props) => {
         {(data) => (
           <div class="message-timeline-tooltip" style={{ top: `${tooltipCoords().top}px`, left: `${tooltipCoords().left}px` }}>
             <MessagePreview
-              record={data().record}
-              messageInfo={data().info}
+              messageId={data().messageId}
               instanceId={props.instanceId}
               sessionId={props.sessionId}
+              store={store}
             />
           </div>
         )}