@@ -1,7 +1,7 @@
11 import { useState, useEffect, useCallback, useRef } from "react";
22 import type { Message } from "@/src/lib/db/schema";
33
4-export function useMessages(threadId: number | null) {
4+export function useMessages(threadId: number | null, onError?: (error: string) => void) {
55 const [messages, setMessages] = useState<Message[]>([]);
66 const [isLoading, setIsLoading] = useState<boolean>(false);
77 const [isLoadingMessages, setIsLoadingMessages] = useState<boolean>(false);
@@ -9,31 +9,39 @@ export function useMessages(threadId: number | null) {
99 const sendingToThreadIdRef = useRef<number | null>(null);
1010 const abortControllerRef = useRef<AbortController | null>(null);
1111
12- const loadMessages = useCallback(async (id: number) => {
13- setIsLoadingMessages(true);
14- try {
15- const res = await fetch(`/api/threads/${id}/messages`);
16- const data = await res.json();
17- const loadedMessages = data.messages || [];
18- setMessages(loadedMessages);
19- } catch (error) {
20- console.error("Failed to load messages", error);
21- } finally {
22- setIsLoadingMessages(false);
23- }
24- }, []);
12+ const loadMessages = useCallback(
13+ async (id: number, onError?: (error: string) => void) => {
14+ setIsLoadingMessages(true);
15+ try {
16+ const res = await fetch(`/api/threads/${id}/messages`);
17+ if (!res.ok) {
18+ throw new Error(`Failed to load messages: ${res.status}`);
19+ }
20+ const data = await res.json();
21+ const loadedMessages = data.messages || [];
22+ setMessages(loadedMessages);
23+ } catch (error) {
24+ if (onError && error instanceof Error) {
25+ onError(error.message);
26+ }
27+ } finally {
28+ setIsLoadingMessages(false);
29+ }
30+ },
31+ []
32+ );
2533
2634 useEffect(() => {
2735 if (threadId !== null) {
2836 // Don't reload messages if we're currently sending a message to this thread (to preserve optimistic updates)
2937 if (sendingToThreadIdRef.current !== threadId) {
30- loadMessages(threadId);
38+ loadMessages(threadId, onError);
3139 }
3240 } else {
3341 setMessages([]);
3442 setIsLoadingMessages(false);
3543 }
36- }, [threadId, loadMessages]);
44+ }, [threadId, loadMessages, onError]);
3745
3846 const sendMessage = async (
3947 message: string,
@@ -47,26 +55,30 @@ export function useMessages(threadId: number | null) {
4755 onThreadSelect: (id: number) => void,
4856 onThreadsReload: () => void,
4957 selectedModel: string = "gpt-oss",
50- maxPromptLength?: "none" | 1024 | 4096
58+ maxPromptLength?: "none" | 1024 | 4096,
59+ onError?: (error: string) => void
5160 ) => {
5261 if (!message.trim() || isLoading) return;
5362
5463 setIsLoading(true);
5564 let targetThreadId = currentThreadId;
5665
57- if (!targetThreadId) {
58- // Create a new thread if none exists
59- // Use the validated selectedModel instead of reading from localStorage
60- targetThreadId = await onCreateThread(
61- message.substring(0, 100),
62- message,
63- selectedModel,
64- maxPromptLength
65- );
6666 if (!targetThreadId) {
67- setIsLoading(false);
68- return;
69- }
67+ // Create a new thread if none exists
68+ // Use the validated selectedModel instead of reading from localStorage
69+ targetThreadId = await onCreateThread(
70+ message.substring(0, 100),
71+ message,
72+ selectedModel,
73+ maxPromptLength
74+ );
75+ if (!targetThreadId) {
76+ setIsLoading(false);
77+ if (onError) {
78+ onError("Failed to create thread");
79+ }
80+ return;
81+ }
7082 // Mark that we're sending to this thread before selecting it
7183 sendingToThreadIdRef.current = targetThreadId;
7284 onThreadSelect(targetThreadId);
@@ -80,6 +92,8 @@ export function useMessages(threadId: number | null) {
8092 role: "user",
8193 content: message,
8294 createdAt: new Date(),
95+ model: null,
96+ maxPromptLength: null,
8397 generationTimeMs: null,
8498 toolCalls: null,
8599 };
@@ -93,6 +107,8 @@ export function useMessages(threadId: number | null) {
93107 role: "assistant",
94108 content: "",
95109 createdAt: new Date(),
110+ model: null,
111+ maxPromptLength: null,
96112 generationTimeMs: null,
97113 toolCalls: null,
98114 };
@@ -111,7 +127,10 @@ export function useMessages(threadId: number | null) {
111127 });
112128
113129 if (!res.ok) {
114- throw new Error(`HTTP error! status: ${res.status}`);
130+ const errorData = await res.json().catch((parseError) => {
131+ throw new Error(`Failed to parse error response: ${parseError instanceof Error ? parseError.message : "Invalid JSON"}`);
132+ });
133+ throw new Error(errorData.error || `HTTP error! status: ${res.status}`);
115134 }
116135
117136 if (!res.body) {
@@ -172,10 +191,14 @@ export function useMessages(threadId: number | null) {
172191 shouldStop = true;
173192 break;
174193 }
175- throw new Error(data.error || "Unknown error");
194+ const errorMsg = data.error || "Unknown error";
195+ if (onError) onError(errorMsg);
196+ throw new Error(errorMsg);
176197 }
177198 } catch (parseError) {
178- console.error("Failed to parse SSE data", parseError);
199+ if (onError && parseError instanceof Error) {
200+ onError(parseError.message);
201+ }
179202 }
180203 }
181204 }
@@ -187,9 +210,11 @@ export function useMessages(threadId: number | null) {
187210 } catch (error) {
188211 // Don't log abort errors as they're intentional
189212 if (error instanceof Error && error.name !== "AbortError") {
190- console.error("Failed to send message", error);
191213 // Only remove the assistant message on non-abort errors
192214 setMessages((prev) => prev.filter((msg) => msg.id !== assistantMsgId));
215+ if (onError && error instanceof Error) {
216+ onError(error.message);
217+ }
193218 }
194219 // For abort errors, keep the partial content
195220 setStreamingMessageId(null);
@@ -211,18 +236,27 @@ export function useMessages(threadId: number | null) {
211236 setMessages([]);
212237 };
213238
214- const deleteMessage = async (messageId: number, threadId: number) => {
239+ const deleteMessage = async (
240+ messageId: number,
241+ threadId: number,
242+ onError?: (error: string) => void
243+ ) => {
215244 try {
216245 const res = await fetch(`/api/threads/${threadId}/messages/${messageId}`, {
217246 method: "DELETE",
218247 });
219248 if (!res.ok) {
220- throw new Error("Failed to delete message");
249+ const errorData = await res.json().catch((parseError) => {
250+ throw new Error(`Failed to parse error response: ${parseError instanceof Error ? parseError.message : "Invalid JSON"}`);
251+ });
252+ throw new Error(errorData.error || "Failed to delete message");
221253 }
222254 // Remove the message from local state
223255 setMessages((prev) => prev.filter((msg) => msg.id !== messageId));
224256 } catch (error) {
225- console.error("Failed to delete message", error);
257+ if (onError && error instanceof Error) {
258+ onError(error.message);
259+ }
226260 }
227261 };
228262