Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active
TypeScript aianthropicartifactsawsazurechatgptchatgpt-cloneclaudeclonedeepseekgeminigooglegpt-5librechatmcpo1openairesponses-apivisionwebui
🏁 fix: Invalidate Message Cache on Stream 404 Instead of Showing Error (#12411)
Danny Aviladf82f2e9b221
diff --git a/client/src/hooks/SSE/__tests__/useResumableSSE.spec.ts b/client/src/hooks/SSE/__tests__/useResumableSSE.spec.tsindex 9100f39858..1717d27c22 100644--- a/client/src/hooks/SSE/__tests__/useResumableSSE.spec.ts+++ b/client/src/hooks/SSE/__tests__/useResumableSSE.spec.ts@@ -1,5 +1,5 @@import { renderHook, act } from '@testing-library/react';-import { Constants, ErrorTypes, LocalStorageKeys } from 'librechat-data-provider';+import { Constants, LocalStorageKeys } from 'librechat-data-provider';import type { TSubmission } from 'librechat-data-provider';type SSEEventListener = (e: Partial<MessageEvent> & { responseCode?: number }) => void;@@ -34,7 +34,13 @@ jest.mock('sse.js', () => ({}));const mockSetQueryData = jest.fn();-const mockQueryClient = { setQueryData: mockSetQueryData };+const mockInvalidateQueries = jest.fn();+const mockRemoveQueries = jest.fn();+const mockQueryClient = {+ setQueryData: mockSetQueryData,+ invalidateQueries: mockInvalidateQueries,+ removeQueries: mockRemoveQueries,+};jest.mock('@tanstack/react-query', () => ({...jest.requireActual('@tanstack/react-query'),@@ -63,6 +69,7 @@ jest.mock('~/data-provider', () => ({useGetStartupConfig: () => ({ data: { balance: { enabled: false } } }),useGetUserBalance: () => ({ refetch: jest.fn() }),queueTitleGeneration: jest.fn(),+ streamStatusQueryKey: (conversationId: string) => ['streamStatus', conversationId],}));const mockErrorHandler = jest.fn();@@ -162,6 +169,11 @@ describe('useResumableSSE - 404 error path', () => {beforeEach(() => {mockSSEInstances.length = 0;localStorage.clear();+ mockErrorHandler.mockClear();+ mockClearStepMaps.mockClear();+ mockSetIsSubmitting.mockClear();+ mockInvalidateQueries.mockClear();+ mockRemoveQueries.mockClear();});const seedDraft = (conversationId: string) => {@@ -200,19 +212,18 @@ describe('useResumableSSE - 404 error path', () => {unmount();});- it('calls errorHandler with STREAM_EXPIRED error type on 404', async () => {+ it('invalidates message cache and clears stream status on 404 instead of showing error', async () => {const { unmount } = await render404Scenario(CONV_ID);- expect(mockErrorHandler).toHaveBeenCalledTimes(1);- const call = mockErrorHandler.mock.calls[0][0];- expect(call.data).toBeDefined();- const parsed = JSON.parse(call.data.text);- expect(parsed.type).toBe(ErrorTypes.STREAM_EXPIRED);- expect(call.submission).toEqual(- expect.objectContaining({- conversation: expect.objectContaining({ conversationId: CONV_ID }),- }),- );+ expect(mockErrorHandler).not.toHaveBeenCalled();+ expect(mockInvalidateQueries).toHaveBeenCalledWith({+ queryKey: ['messages', CONV_ID],+ });+ expect(mockRemoveQueries).toHaveBeenCalledWith({+ queryKey: ['streamStatus', CONV_ID],+ });+ expect(mockClearStepMaps).toHaveBeenCalled();+ expect(mockSetIsSubmitting).toHaveBeenCalledWith(false);unmount();});diff --git a/client/src/hooks/SSE/useResumableSSE.ts b/client/src/hooks/SSE/useResumableSSE.tsindex 32820f8392..39dc610dae 100644--- a/client/src/hooks/SSE/useResumableSSE.ts+++ b/client/src/hooks/SSE/useResumableSSE.ts@@ -16,7 +16,12 @@ import {} from 'librechat-data-provider';import type { TMessage, TPayload, TSubmission, EventSubmission } from 'librechat-data-provider';import type { EventHandlerParams } from './useEventHandlers';-import { useGetStartupConfig, useGetUserBalance, queueTitleGeneration } from '~/data-provider';+import {+ useGetUserBalance,+ useGetStartupConfig,+ queueTitleGeneration,+ streamStatusQueryKey,+} from '~/data-provider';import type { ActiveJobsResponse } from '~/data-provider';import { useAuthContext } from '~/hooks/AuthContext';import useEventHandlers from './useEventHandlers';@@ -343,18 +348,20 @@ export default function useResumableSSE(/* @ts-ignore - sse.js types don't expose responseCode */const responseCode = e.responseCode;- // 404 means job doesn't exist (completed/deleted) - don't retry+ // 404 → job completed & was cleaned up; messages are persisted in DB.+ // Invalidate cache once so react-query refetches instead of showing an error.if (responseCode === 404) {- console.log('[ResumableSSE] Stream not found (404) - job completed or expired');+ const convoId = currentSubmission.conversation?.conversationId;+ console.log('[ResumableSSE] Stream 404, invalidating messages for:', convoId);sse.close();removeActiveJob(currentStreamId);- clearAllDrafts(currentSubmission.conversation?.conversationId);- errorHandler({- data: {- text: JSON.stringify({ type: ErrorTypes.STREAM_EXPIRED }),- } as unknown as Parameters<typeof errorHandler>[0]['data'],- submission: currentSubmission as EventSubmission,- });+ clearAllDrafts(convoId);+ clearStepMaps();+ if (convoId) {+ queryClient.invalidateQueries({ queryKey: [QueryKeys.messages, convoId] });+ queryClient.removeQueries({ queryKey: streamStatusQueryKey(convoId) });+ }+ setIsSubmitting(false);setShowStopButton(false);setStreamId(null);reconnectAttemptRef.current = 0;@@ -544,6 +551,7 @@ export default function useResumableSSE(startupConfig?.balance?.enabled,balanceQuery,removeActiveJob,+ queryClient,],);diff --git a/client/src/hooks/SSE/useResumeOnLoad.ts b/client/src/hooks/SSE/useResumeOnLoad.tsindex f09751db0e..5f0f691787 100644--- a/client/src/hooks/SSE/useResumeOnLoad.ts+++ b/client/src/hooks/SSE/useResumeOnLoad.ts@@ -125,7 +125,11 @@ export default function useResumeOnLoad(conversationId !== Constants.NEW_CONVO &&processedConvoRef.current !== conversationId; // Don't re-check processed convos- const { data: streamStatus, isSuccess } = useStreamStatus(conversationId, shouldCheck);+ const {+ data: streamStatus,+ isSuccess,+ isFetching,+ } = useStreamStatus(conversationId, shouldCheck);useEffect(() => {console.log('[ResumeOnLoad] Effect check', {@@ -135,6 +139,7 @@ export default function useResumeOnLoad(hasCurrentSubmission: !!currentSubmission,currentSubmissionConvoId: currentSubmission?.conversation?.conversationId,isSuccess,+ isFetching,streamStatusActive: streamStatus?.active,streamStatusStreamId: streamStatus?.streamId,processedConvoRef: processedConvoRef.current,@@ -171,8 +176,9 @@ export default function useResumeOnLoad();}- // Wait for stream status query to complete- if (!isSuccess || !streamStatus) {+ // Wait for stream status query to complete (including background refetches+ // that may replace a stale cached result with fresh data)+ if (!isSuccess || !streamStatus || isFetching) {console.log('[ResumeOnLoad] Waiting for stream status query');return;}@@ -183,15 +189,12 @@ export default function useResumeOnLoad(return;}- // Check if there's an active job to resume- // DON'T mark as processed here - only mark when we actually create a submission- // This prevents stale cache data from blocking subsequent resume attemptsif (!streamStatus.active || !streamStatus.streamId) {console.log('[ResumeOnLoad] No active job to resume for:', conversationId);+ processedConvoRef.current = conversationId;return;}- // Mark as processed NOW - we verified there's an active job and will create submissionprocessedConvoRef.current = conversationId;console.log('[ResumeOnLoad] Found active job, creating submission...', {@@ -241,6 +244,7 @@ export default function useResumeOnLoad(submissionConvoId,currentSubmission,isSuccess,+ isFetching,streamStatus,getMessages,setSubmission,