Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 30 additions & 8 deletions frontend/src/components/chat/MessageBubble.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,28 @@ const markdownComponents: Components = {
},
};

/**
* Extracts a valid Date from a message.
*
* History messages from the DB have real UUIDs as IDs β€”
* splitting on "-" and parsing as a number gives NaN.
* We use `created_at` (returned by the history API) when
* available, and fall back to the synthetic ID-based
* timestamp only for streamed messages (format: role-timestamp).
*/
const getMessageDate = (message: ChatMsg): Date | null => {
if (message.created_at) {
const d = new Date(message.created_at);
if (!isNaN(d.getTime())) return d;
}
const parts = message.id.split("-");
if (parts.length >= 2) {
const ts = Number(parts[1]);
if (!isNaN(ts) && ts > 0) return new Date(ts);
}
return null;
};

export default function MessageBubble({ message }: Props) {
const isUser = message.role === "user";
const [copied, setCopied] = useState(false);
Expand Down Expand Up @@ -109,6 +131,8 @@ export default function MessageBubble({ message }: Props) {
large: "text-base",
}[activeFontSize];

const messageDate = getMessageDate(message);

const handleCopy = async () => {
if (!message.content) return;
try {
Expand Down Expand Up @@ -177,7 +201,6 @@ export default function MessageBubble({ message }: Props) {

const handleBranch = () => {
setCurrentBranchId(message.id);

console.log("Branch created from:", message.id);
};

Expand Down Expand Up @@ -355,20 +378,19 @@ export default function MessageBubble({ message }: Props) {
isUser ? "justify-end" : "justify-start"
}`}
>
<div
title={new Date(Number(message.id.split("-")[1])).toLocaleString()}
>
{formatDistanceToNow(new Date(Number(message.id.split("-")[1])), {
addSuffix: true,
})}
</div>
{messageDate && (
<div title={messageDate.toLocaleString()}>
{formatDistanceToNow(messageDate, { addSuffix: true })}
</div>
)}
{!isUser && message.response_time_ms && (
<span className="text-[10px] ml-auto">
⚑ {(message.response_time_ms / 1000).toFixed(1)}s
</span>
)}
</div>
</div>

{isUser && (
<div className="w-8 h-8 rounded-lg bg-primary/20 flex items-center justify-center shrink-0 mt-0.5">
<User className="w-4 h-4 text-primary-foreground" />
Expand Down
5 changes: 4 additions & 1 deletion frontend/src/store/chat-store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export interface ChatMsg {
feedback?: "up" | "down" | null;
isStreaming?: boolean;
response_time_ms?: number;
created_at?: string;
}

export interface ChatSession {
Expand Down Expand Up @@ -93,7 +94,9 @@ export const useChatStore = create<ChatStore>((set, get) => ({
},

setIsTyping(value) {
set((state) => ({ isTyping: resolveValue(value, state.isTyping) }));
set((state) => ({
isTyping: resolveValue(value, state.isTyping),
}));
},

setHistoryLoading(value) {
Expand Down
Loading