@@ -1,6 +1,7 @@
11 import { useState, useEffect, useCallback, useRef } from "react";
22 import type { Message } from "@/src/lib/db/schema";
33 import { getParseErrorMessage, handleError } from "@/src/lib/errors";
4+import { useMessageDisplaySettings } from "./useMessageDisplaySettings";
45
56 /**
67 * Custom hook for managing messages within a thread.
@@ -30,23 +31,40 @@ export function useMessages(
3031 const [streamingMessageId, setStreamingMessageId] = useState<number | null>(null);
3132 const sendingToThreadIdRef = useRef<number | null>(null);
3233 const abortControllerRef = useRef<AbortController | null>(null);
34+ const [messageDisplaySettings] = useMessageDisplaySettings();
3335
34- const loadMessages = useCallback(async (id: number, onError?: (error: string) => void) => {
35- setIsLoadingMessages(true);
36- try {
37- const res = await fetch(`/api/threads/${id}/messages`);
38- if (!res.ok) {
39- throw new Error(`Failed to load messages: ${res.status}`);
36+ const loadMessages = useCallback(
37+ async (id: number, onError?: (error: string) => void) => {
38+ setIsLoadingMessages(true);
39+ try {
40+ const optionalRoles: string[] = [];
41+ if (messageDisplaySettings.showSystemMessages) {
42+ optionalRoles.push("system");
43+ }
44+ if (messageDisplaySettings.showToolMessages) {
45+ optionalRoles.push("tool");
46+ }
47+
48+ let url = `/api/threads/${id}/messages`;
49+ if (optionalRoles.length > 0) {
50+ url += `?optional_roles=${optionalRoles.join(",")}`;
51+ }
52+
53+ const res = await fetch(url);
54+ if (!res.ok) {
55+ throw new Error(`Failed to load messages: ${res.status}`);
56+ }
57+ const data = await res.json();
58+ const loadedMessages = data.messages || [];
59+ setMessages(loadedMessages);
60+ } catch (error) {
61+ handleError(error, onError);
62+ } finally {
63+ setIsLoadingMessages(false);
4064 }
41- const data = await res.json();
42- const loadedMessages = data.messages || [];
43- setMessages(loadedMessages);
44- } catch (error) {
45- handleError(error, onError);
46- } finally {
47- setIsLoadingMessages(false);
48- }
49- }, []);
65+ },
66+ [messageDisplaySettings.showSystemMessages, messageDisplaySettings.showToolMessages]
67+ );
5068
5169 const createUserMessage = (message: string, threadId: number): Message => ({
5270 id: Date.now(),
@@ -81,6 +99,30 @@ export function useMessages(
8199 toolCallCounts: metadata?.toolCallCounts ?? null,
82100 });
83101
102+ const createToolMessage = (id: number, threadId: number, content: string, createdAt?: string | Date): Message => ({
103+ id,
104+ threadId,
105+ role: "tool",
106+ content,
107+ createdAt: createdAt ? (typeof createdAt === "string" ? new Date(createdAt) : createdAt) : new Date(),
108+ model: null,
109+ maxPromptLength: null,
110+ generationTimeMs: null,
111+ toolCallCounts: null,
112+ });
113+
114+ const createSystemMessage = (id: number, threadId: number, content: string, createdAt?: string | Date): Message => ({
115+ id,
116+ threadId,
117+ role: "system",
118+ content,
119+ createdAt: createdAt ? (typeof createdAt === "string" ? new Date(createdAt) : createdAt) : new Date(),
120+ model: null,
121+ maxPromptLength: null,
122+ generationTimeMs: null,
123+ toolCallCounts: null,
124+ });
125+
84126 const updateAssistantMessage = (
85127 messageId: number,
86128 content: string,
@@ -139,10 +181,24 @@ export function useMessages(
139181 }
140182 }, [threadId, loadMessages, onError]);
141183
184+ // Reload messages when display settings change (if we have a thread selected)
185+ // Use JSON.stringify to create a stable dependency key from the settings object
186+ const settingsKey = JSON.stringify(messageDisplaySettings);
187+ const prevSettingsKeyRef = useRef<string>(settingsKey);
188+
189+ useEffect(() => {
190+ if (settingsKey !== prevSettingsKeyRef.current) {
191+ prevSettingsKeyRef.current = settingsKey;
192+ if (threadId !== null && sendingToThreadIdRef.current !== threadId) {
193+ loadMessages(threadId, onError);
194+ }
195+ }
196+ }, [settingsKey, threadId, loadMessages, onError]);
197+
142198 const sendMessage = async (
143199 message: string,
144200 currentThreadId: number | null,
145- onCreateThread: (title?: string, firstMessage?: string) => Promise<number | null>,
201+ onCreateThread: (title?: string, firstMessage?: string) => Promise<{ threadId: number; systemMessage?: { id: number; content: string; createdAt: string } } | null>,
146202 onThreadSelect: (id: number) => void,
147203 onThreadsReload: () => void,
148204 onError?: (error: string) => void
@@ -155,14 +211,26 @@ export function useMessages(
155211 if (!targetThreadId) {
156212 // Create a new thread if none exists
157213 // The onCreateThread callback should already have model and maxPromptLength
158- targetThreadId = await onCreateThread(message.substring(0, 100), message);
159- if (!targetThreadId) {
214+ const threadResult = await onCreateThread(message.substring(0, 100), message);
215+ if (!threadResult) {
160216 setIsLoading(false);
161217 if (onError) {
162218 onError("Failed to create thread");
163219 }
164220 return;
165221 }
222+ targetThreadId = threadResult.threadId;
223+
224+ // Add system message to state if it was returned and setting is enabled
225+ if (threadResult.systemMessage && messageDisplaySettings.showSystemMessages) {
226+ addSystemMessage(
227+ threadResult.systemMessage.id,
228+ targetThreadId,
229+ threadResult.systemMessage.content,
230+ threadResult.systemMessage.createdAt
231+ );
232+ }
233+
166234 // Mark that we're sending to this thread before selecting it
167235 sendingToThreadIdRef.current = targetThreadId;
168236 onThreadSelect(targetThreadId);
@@ -229,6 +297,10 @@ export function useMessages(
229297 } else if (messageAdded) {
230298 updateAssistantMessage(assistantMsgId, accumulatedContent);
231299 }
300+ } else if (data.type === "toolMessage") {
301+ // Add tool message to state in real-time
302+ const toolMsg = createToolMessage(data.id, data.threadId, data.content, data.createdAt);
303+ setMessages((prev) => [...prev, toolMsg]);
232304 } else if (data.type === "done") {
233305 // Final update with complete answer and metadata
234306 const finalContent = data.answer || accumulatedContent;
@@ -344,6 +416,17 @@ export function useMessages(
344416 }
345417 };
346418
419+ const addSystemMessage = (id: number, threadId: number, content: string, createdAt?: string | Date) => {
420+ const systemMsg = createSystemMessage(id, threadId, content, createdAt);
421+ setMessages((prev) => {
422+ // Check if message already exists to avoid duplicates
423+ if (prev.some((msg) => msg.id === id)) {
424+ return prev;
425+ }
426+ return [...prev, systemMsg];
427+ });
428+ };
429+
347430 return {
348431 messages,
349432 isLoading,
@@ -353,5 +436,6 @@ export function useMessages(
353436 clearMessages,
354437 stopGeneration,
355438 deleteMessage,
439+ addSystemMessage,
356440 };
357441 }