From 274930803ca4f5426986042002d255b7aa3151a3 Mon Sep 17 00:00:00 2001
From: Tat Dat Duong <david@duong.cz>
Date: Tue, 4 Mar 2025 13:45:02 +0100
Subject: [PATCH] Cleanup

---
 src/components/thread/index.tsx | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/components/thread/index.tsx b/src/components/thread/index.tsx
index 0280276..0b7d2f7 100644
--- a/src/components/thread/index.tsx
+++ b/src/components/thread/index.tsx
@@ -44,7 +44,7 @@ export function Thread() {
   const [input, setInput] = useState("");
   const [firstTokenReceived, setFirstTokenReceived] = useState(false);
   const stream = useStreamContext();
-  // const messages = [...dummyMessages, ...stream.messages];
+
   const messages = stream.messages;
   const isLoading = stream.isLoading;
   const prevMessageLength = useRef(0);
@@ -71,23 +71,17 @@ export function Thread() {
       content: input,
     };
 
+    const toolMessages = ensureToolCallsHaveResponses(stream.messages);
     stream.submit(
-      {
-        messages: [
-          ...ensureToolCallsHaveResponses(stream.messages),
-          newHumanMessage,
-        ],
-      },
-      {
-        streamMode: ["values"],
-      },
+      { messages: [...toolMessages, newHumanMessage] },
+      { streamMode: ["values"] }
     );
 
     setInput("");
   };
 
   const handleRegenerate = (
-    parentCheckpoint: Checkpoint | null | undefined,
+    parentCheckpoint: Checkpoint | null | undefined
   ) => {
     // Do this so the loading state is correct
     prevMessageLength.current = prevMessageLength.current - 1;
@@ -100,14 +94,14 @@ export function Thread() {
 
   const chatStarted = isLoading || messages.length > 0;
   const renderMessages = messages.filter(
-    (m) => !m.id?.startsWith(DO_NOT_RENDER_ID_PREFIX),
+    (m) => !m.id?.startsWith(DO_NOT_RENDER_ID_PREFIX)
   );
 
   return (
     <div
       className={cn(
         "flex flex-col w-full h-full",
-        chatStarted ? "relative" : "",
+        chatStarted ? "relative" : ""
       )}
     >
       <div className={cn("flex-1 px-4", chatStarted ? "pb-28" : "mt-64")}>
@@ -125,24 +119,24 @@ export function Thread() {
         <div
           className={cn(
             "flex flex-col gap-4 max-w-4xl w-full mx-auto mt-12 overflow-y-auto",
-            !chatStarted && "hidden",
+            !chatStarted && "hidden"
           )}
         >
           {renderMessages.map((message, index) =>
             message.type === "human" ? (
               <HumanMessage
                 key={"id" in message ? message.id : `${message.type}-${index}`}
-                message={message as Message}
+                message={message}
                 isLoading={isLoading}
               />
             ) : (
               <AssistantMessage
                 key={"id" in message ? message.id : `${message.type}-${index}`}
-                message={message as Message}
+                message={message}
                 isLoading={isLoading}
                 handleRegenerate={handleRegenerate}
               />
-            ),
+            )
           )}
           {isLoading && !firstTokenReceived && <AssistantMessageLoading />}
         </div>
@@ -151,7 +145,7 @@ export function Thread() {
       <div
         className={cn(
           "bg-white rounded-2xl border-[1px] border-gray-200 shadow-md p-3 mx-auto w-full max-w-5xl",
-          chatStarted ? "fixed bottom-6 left-0 right-0" : "",
+          chatStarted ? "fixed bottom-6 left-0 right-0" : ""
         )}
       >
         <form
@@ -165,6 +159,7 @@ export function Thread() {
             placeholder="Type your message..."
             className="p-5 border-[0px] shadow-none ring-0 outline-none focus:outline-none focus:ring-0"
           />
+
           <Button
             type="submit"
             className="p-5"