@@ -2,6 +2,12 @@ import { useState, useEffect, useCallback, useRef } from "react";
22 import type { Message } from "@/src/lib/db/schema";
33 import { getParseErrorMessage, handleError } from "@/src/lib/errors";
44 import { useMessageDisplaySettings } from "./useMessageDisplaySettings";
5+import {
6+ createUserMessage,
7+ createAssistantMessage,
8+ createToolMessage,
9+ createSystemMessage,
10+} from "@/src/lib/message-helpers";
511
612 /**
713 * Custom hook for managing messages within a thread.
@@ -66,63 +72,6 @@ export function useMessages(
6672 [messageDisplaySettings.showSystemMessages, messageDisplaySettings.showToolMessages]
6773 );
6874
69- const createUserMessage = (message: string, threadId: number): Message => ({
70- id: Date.now(),
71- threadId,
72- role: "user",
73- content: message,
74- createdAt: new Date(),
75- model: null,
76- maxPromptLength: null,
77- generationTimeMs: null,
78- toolCallCounts: null,
79- });
80-
81- const createAssistantMessage = (
82- id: number,
83- threadId: number,
84- content: string,
85- metadata?: {
86- model?: string | null;
87- maxPromptLength?: number | null;
88- toolCallCounts?: string | null;
89- }
90- ): Message => ({
91- id,
92- threadId,
93- role: "assistant",
94- content,
95- createdAt: new Date(),
96- model: metadata?.model ?? null,
97- maxPromptLength: metadata?.maxPromptLength ?? null,
98- generationTimeMs: null,
99- toolCallCounts: metadata?.toolCallCounts ?? null,
100- });
101-
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-
12675 const updateAssistantMessage = (
12776 messageId: number,
12877 content: string,
@@ -198,7 +147,13 @@ export function useMessages(
198147 const sendMessage = async (
199148 message: string,
200149 currentThreadId: number | null,
201- onCreateThread: (title?: string, firstMessage?: string) => Promise<{ threadId: number; systemMessage?: { id: number; content: string; createdAt: string } } | null>,
150+ onCreateThread: (
151+ title?: string,
152+ firstMessage?: string
153+ ) => Promise<{
154+ threadId: number;
155+ systemMessage?: { id: number; content: string; createdAt: string };
156+ } | null>,
202157 onThreadSelect: (id: number) => void,
203158 onThreadsReload: () => void,
204159 onError?: (error: string) => void
@@ -220,7 +175,7 @@ export function useMessages(
220175 return;
221176 }
222177 targetThreadId = threadResult.threadId;
223-
178+
224179 // Add system message to state if it was returned and setting is enabled
225180 if (threadResult.systemMessage && messageDisplaySettings.showSystemMessages) {
226181 addSystemMessage(
@@ -230,7 +185,7 @@ export function useMessages(
230185 threadResult.systemMessage.createdAt
231186 );
232187 }
233-
188+
234189 // Mark that we're sending to this thread before selecting it
235190 sendingToThreadIdRef.current = targetThreadId;
236191 onThreadSelect(targetThreadId);
@@ -291,7 +246,11 @@ export function useMessages(
291246 accumulatedContent += data.content || "";
292247 // Only add the message when we have content
293248 if (!messageAdded && accumulatedContent.trim()) {
294- const botMsg = createAssistantMessage(assistantMsgId, targetThreadId, accumulatedContent);
249+ const botMsg = createAssistantMessage(
250+ assistantMsgId,
251+ targetThreadId,
252+ accumulatedContent
253+ );
295254 setMessages((prev) => [...prev, botMsg]);
296255 messageAdded = true;
297256 } else if (messageAdded) {
@@ -299,7 +258,12 @@ export function useMessages(
299258 }
300259 } else if (data.type === "toolMessage") {
301260 // Add tool message to state in real-time
302- const toolMsg = createToolMessage(data.id, data.threadId, data.content, data.createdAt);
261+ const toolMsg = createToolMessage(
262+ data.id,
263+ data.threadId,
264+ data.content,
265+ data.createdAt
266+ );
303267 setMessages((prev) => [...prev, toolMsg]);
304268 } else if (data.type === "done") {
305269 // Final update with complete answer and metadata
@@ -311,7 +275,12 @@ export function useMessages(
311275 };
312276
313277 if (!messageAdded) {
314- const botMsg = createAssistantMessage(assistantMsgId, targetThreadId, finalContent, metadata);
278+ const botMsg = createAssistantMessage(
279+ assistantMsgId,
280+ targetThreadId,
281+ finalContent,
282+ metadata
283+ );
315284 setMessages((prev) => [...prev, botMsg]);
316285 } else {
317286 updateAssistantMessage(assistantMsgId, finalContent, metadata);
@@ -346,7 +315,11 @@ export function useMessages(
346315 if (data.error === "Generation stopped") {
347316 // If we have content but message wasn't added, add it now
348317 if (!messageAdded && accumulatedContent.trim()) {
349- const botMsg = createAssistantMessage(assistantMsgId, targetThreadId, accumulatedContent);
318+ const botMsg = createAssistantMessage(
319+ assistantMsgId,
320+ targetThreadId,
321+ accumulatedContent
322+ );
350323 setMessages((prev) => [...prev, botMsg]);
351324 }
352325 setStreamingMessageId(null);
@@ -416,7 +389,12 @@ export function useMessages(
416389 }
417390 };
418391
419- const addSystemMessage = (id: number, threadId: number, content: string, createdAt?: string | Date) => {
392+ const addSystemMessage = (
393+ id: number,
394+ threadId: number,
395+ content: string,
396+ createdAt?: string | Date
397+ ) => {
420398 const systemMsg = createSystemMessage(id, threadId, content, createdAt);
421399 setMessages((prev) => {
422400 // Check if message already exists to avoid duplicates