@@ -1,10 +1,12 @@
1-import { useState, useEffect, useCallback } from "react";
1+import { useState, useEffect, useCallback, useRef } from "react";
22 import type { Message } from "@/src/lib/db/schema";
33
44 export function useMessages(threadId: number | null) {
55 const [messages, setMessages] = useState<Message[]>([]);
66 const [isLoading, setIsLoading] = useState<boolean>(false);
77 const [isLoadingMessages, setIsLoadingMessages] = useState<boolean>(false);
8+ const [streamingMessageId, setStreamingMessageId] = useState<number | null>(null);
9+ const sendingToThreadIdRef = useRef<number | null>(null);
810
911 const loadMessages = useCallback(async (id: number) => {
1012 setIsLoadingMessages(true);
@@ -22,7 +24,10 @@ export function useMessages(threadId: number | null) {
2224
2325 useEffect(() => {
2426 if (threadId !== null) {
25- loadMessages(threadId);
27+ // Don't reload messages if we're currently sending a message to this thread (to preserve optimistic updates)
28+ if (sendingToThreadIdRef.current !== threadId) {
29+ loadMessages(threadId);
30+ }
2631 } else {
2732 setMessages([]);
2833 setIsLoadingMessages(false);
@@ -48,7 +53,11 @@ export function useMessages(threadId: number | null) {
4853 setIsLoading(false);
4954 return;
5055 }
56+ // Mark that we're sending to this thread before selecting it
57+ sendingToThreadIdRef.current = targetThreadId;
5158 onThreadSelect(targetThreadId);
59+ } else {
60+ sendingToThreadIdRef.current = targetThreadId;
5261 }
5362
5463 const userMsg: Message = {
@@ -74,6 +83,7 @@ export function useMessages(threadId: number | null) {
7483 toolCalls: null,
7584 };
7685 setMessages((prev) => [...prev, botMsg]);
86+ setStreamingMessageId(assistantMsgId);
7787
7888 try {
7989 const res = await fetch("/api/chat", {
@@ -126,6 +136,7 @@ export function useMessages(threadId: number | null) {
126136 : msg
127137 )
128138 );
139+ setStreamingMessageId(null);
129140 } else if (data.type === "error") {
130141 throw new Error(data.error || "Unknown error");
131142 }
@@ -142,8 +153,10 @@ export function useMessages(threadId: number | null) {
142153 console.error("Failed to send message", error);
143154 // Remove the assistant message on error
144155 setMessages((prev) => prev.filter((msg) => msg.id !== assistantMsgId));
156+ setStreamingMessageId(null);
145157 } finally {
146158 setIsLoading(false);
159+ sendingToThreadIdRef.current = null;
147160 }
148161 };
149162
@@ -155,6 +168,7 @@ export function useMessages(threadId: number | null) {
155168 messages,
156169 isLoading,
157170 isLoadingMessages,
171+ streamingMessageId,
158172 sendMessage,
159173 clearMessages,
160174 };