Skip to content

fix(chat): keep pending user message visible until its echo arrives #863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bourgois wants to merge 1 commit into from
Closed

fix(chat): keep pending user message visible until its echo arrives #863

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions src/components/chat/hooks/useChatSessionState.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,9 +256,14 @@ export function useChatSessionState({

const chatMessages = useMemo(() => {
const all = normalizedToChatMessages(storeMessages);
// Show pending user message when no session data exists yet (new session, pre-backend-response)
if (pendingUserMessage && all.length === 0) {
return [pendingUserMessage];
// Show pending user message until a user message actually appears in the store.
// This covers both the "no messages yet" case and the race condition where
// `stream_delta` (AI content) arrives in realtime before the echoed user
// message — without this check the pending message would disappear and the
// AI response would briefly appear as the first visible message.
const hasUserMessage = all.some((m) => m.type === 'user');
if (pendingUserMessage && !hasUserMessage) {
return [...all, pendingUserMessage];
}
if (viewHiddenCount > 0 && viewHiddenCount < all.length) return all.slice(0, -viewHiddenCount);
return all;
Expand Down