xonecas.io
53129
Pa

PAT / commit d5eba93

feat: small improvements to the streaming answers

xonecas2025-12-17 d5eba931e08cb20acc57a464503881a75e3c76b1 parent bfb46b6

5 files changed

app/globals.css+19−0
@@ -79,4 +79,23 @@
7979 .animate-spin-and-color-cycle {
8080 animation: spin-and-color-cycle 3s linear infinite;
8181 }
82+
83+ @keyframes color-cycle {
84+ 0% {
85+ color: rgb(239 68 68); /* red-500 */
86+ }
87+ 33.33% {
88+ color: rgb(249 115 22); /* orange-500 */
89+ }
90+ 66.66% {
91+ color: rgb(245 158 11); /* amber-500 */
92+ }
93+ 100% {
94+ color: rgb(239 68 68); /* red-500 */
95+ }
96+ }
97+
98+ .animate-color-cycle {
99+ animation: color-cycle 3s linear infinite;
100+ }
82101 }
app/page.tsx+2−2
@@ -16,7 +16,7 @@ export default function Home() {
1616 useThreads();
1717 const { currentThreadId, selectThread, deselectThread, messagesContainerRef } =
1818 useThreadSelection();
19- const { messages, isLoading, isLoadingMessages, sendMessage, clearMessages } =
19+ const { messages, isLoading, isLoadingMessages, streamingMessageId, sendMessage, clearMessages } =
2020 useMessages(currentThreadId);
2121 const messageInputRef = useRef<MessageInputRef>(null);
2222
@@ -50,7 +50,7 @@ export default function Home() {
5050 {currentThreadId === null ? (
5151 <NoThreadSelected threadCount={totalThreadCount} />
5252 ) : (
53- <MessageList messages={messages} />
53+ <MessageList messages={messages} streamingMessageId={streamingMessageId} />
5454 )}
5555 </div>
5656 </div>
src/components/MessageList/AssistantMessage.tsx+14−4
@@ -8,9 +8,10 @@ import "../../../app/highlight-theme.css";
88
99 type AssistantMessageProps = {
1010 message: Message;
11+ isStreaming?: boolean;
1112 };
1213
13-export default function AssistantMessage({ message }: AssistantMessageProps) {
14+export default function AssistantMessage({ message, isStreaming = false }: AssistantMessageProps) {
1415 const formatTimestamp = (date: Date | string): string => {
1516 const d = typeof date === "string" ? new Date(date) : date;
1617 return d.toLocaleString();
@@ -46,11 +47,20 @@ export default function AssistantMessage({ message }: AssistantMessageProps) {
4647 }
4748 };
4849
50+ const hasContent = message.content && message.content.trim() !== "";
51+
4952 return (
5053 <div className="prose prose-neutral max-w-none dark:prose-invert">
51- <ReactMarkdown remarkPlugins={[remarkGfm]} rehypePlugins={[rehypeHighlight]}>
52- {message.content}
53- </ReactMarkdown>
54+ {hasContent && (
55+ <ReactMarkdown remarkPlugins={[remarkGfm]} rehypePlugins={[rehypeHighlight]}>
56+ {message.content}
57+ </ReactMarkdown>
58+ )}
59+ {isStreaming && (
60+ <p className={`text-sm text-neutral-600 dark:text-neutral-400 ${hasContent ? "mt-2" : ""}`}>
61+ <span className="animate-color-cycle">thinking</span>
62+ </p>
63+ )}
5464 <div className="mt-4 text-xs text-neutral-600 dark:text-neutral-400">
5565 generated on {formatTimestamp(message.createdAt)}
5666 {message.generationTimeMs && (
src/components/MessageList/index.tsx+3−2
@@ -7,9 +7,10 @@ import UserMessage from "./UserMessage";
77
88 type MessageListProps = {
99 messages: Message[];
10+ streamingMessageId: number | null;
1011 };
1112
12-export default function MessageList({ messages }: MessageListProps) {
13+export default function MessageList({ messages, streamingMessageId }: MessageListProps) {
1314 const messageRefs = useRef<Map<number, HTMLDivElement>>(new Map());
1415 const prevMessagesLengthRef = useRef<number>(0);
1516
@@ -41,7 +42,7 @@ export default function MessageList({ messages }: MessageListProps) {
4142 >
4243 <div className="p-2">
4344 {msg.role === "assistant" ? (
44- <AssistantMessage message={msg} />
45+ <AssistantMessage message={msg} isStreaming={streamingMessageId === msg.id} />
4546 ) : (
4647 <UserMessage message={msg} />
4748 )}
src/hooks/useMessages.ts+16−2
@@ -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 };