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
🧷 refactor: Require a Mounted Steer Host Instead of a Module Default (#17164)
Marco Beretta02b4a41cc192
diff --git a/client/src/Providers/SteerHostContext.tsx b/client/src/Providers/SteerHostContext.tsxindex 3b95322a6e..bbec8d83f1 100644--- a/client/src/Providers/SteerHostContext.tsx+++ b/client/src/Providers/SteerHostContext.tsx@@ -1,6 +1,5 @@import { useCallback } from 'react';import { useToastContext } from '@librechat/client';-import { setDefaultSteerHost } from '@librechat/chat/react';import type {SteerHost,SteerSettings,@@ -86,6 +85,4 @@ export const appSteerHost: SteerHost = {useSettings,};-setDefaultSteerHost(appSteerHost);-export { SteerHostProvider, useSteerHost } from '@librechat/chat/react';diff --git a/client/src/components/Chat/Input/__tests__/ChatForm.approvalMode.spec.tsx b/client/src/components/Chat/Input/__tests__/ChatForm.approvalMode.spec.tsxindex d713f99d0d..c46c8fba6e 100644--- a/client/src/components/Chat/Input/__tests__/ChatForm.approvalMode.spec.tsx+++ b/client/src/components/Chat/Input/__tests__/ChatForm.approvalMode.spec.tsx@@ -14,8 +14,8 @@ import type { TFile, TConversation } from 'librechat-data-provider';import type { ChatFormValues } from '~/common';import { ChatContext, ChatFormProvider } from '~/Providers';import { AuthContextProvider } from '~/hooks/AuthContext';+import { SteerHostTestProvider } from 'test/steerHost';import ChatForm from '../ChatForm';-import '~/Providers/SteerHostContext';jest.mock('~/hooks/Agents/useCodeApprovalMode', () => ({__esModule: true,@@ -91,13 +91,15 @@ function renderComposer({ submitting }: { submitting: boolean }) {return render(<QueryClientProvider client={queryClient}><RecoilRoot initializeState={() => getDefaultStore().set(isSubmittingFamily(0), submitting)}>- <Router>- <AuthContextProvider authConfig={{ loginRedirect: '', test: true }}>- <DndProvider backend={HTML5Backend}>- <Harness />- </DndProvider>- </AuthContextProvider>- </Router>+ <SteerHostTestProvider>+ <Router>+ <AuthContextProvider authConfig={{ loginRedirect: '', test: true }}>+ <DndProvider backend={HTML5Backend}>+ <Harness />+ </DndProvider>+ </AuthContextProvider>+ </Router>+ </SteerHostTestProvider></RecoilRoot></QueryClientProvider>,);diff --git a/client/src/components/Chat/Input/__tests__/ChatForm.attachments.spec.tsx b/client/src/components/Chat/Input/__tests__/ChatForm.attachments.spec.tsxindex b9b9d1d85a..4cb40b37c6 100644--- a/client/src/components/Chat/Input/__tests__/ChatForm.attachments.spec.tsx+++ b/client/src/components/Chat/Input/__tests__/ChatForm.attachments.spec.tsx@@ -8,6 +8,7 @@ import { RecoilRoot, useRecoilState } from 'recoil';import userEvent from '@testing-library/user-event';import { HTML5Backend } from 'react-dnd-html5-backend';import { BrowserRouter as Router } from 'react-router-dom';+import { pendingQuotesByConvoId } from '@librechat/chat/react';import { QueryClient, QueryClientProvider } from '@tanstack/react-query';import { QueryKeys, FileSources, EModelEndpoint } from 'librechat-data-provider';import { render, screen, within, waitFor, fireEvent } from '@testing-library/react';@@ -18,10 +19,9 @@ import { getDraft, getPendingDraftId, setDraft } from '~/utils';import { ChatContext, ChatFormProvider } from '~/Providers';import { AuthContextProvider } from '~/hooks/AuthContext';import * as FileContainer from '../Files/FileContainer';+import { SteerHostTestProvider } from 'test/steerHost';import ChatForm from '../ChatForm';import store from '~/store';-import '~/Providers/SteerHostContext';-import { pendingQuotesByConvoId } from '@librechat/chat/react';const mockUpload = jest.fn();const mockAsk = jest.fn();@@ -180,15 +180,17 @@ function renderComposer({set(store.speechSettingsInitialized, speechSettingsInitialized);}}>- <Router>- <AuthContextProvider authConfig={{ loginRedirect: '', test: true }}>- <DndProvider backend={HTML5Backend}>- <main>- <Harness />- </main>- </DndProvider>- </AuthContextProvider>- </Router>+ <SteerHostTestProvider>+ <Router>+ <AuthContextProvider authConfig={{ loginRedirect: '', test: true }}>+ <DndProvider backend={HTML5Backend}>+ <main>+ <Harness />+ </main>+ </DndProvider>+ </AuthContextProvider>+ </Router>+ </SteerHostTestProvider></RecoilRoot></QueryClientProvider>,);diff --git a/client/src/components/Chat/Input/__tests__/ChatForm.enterToSend.spec.tsx b/client/src/components/Chat/Input/__tests__/ChatForm.enterToSend.spec.tsxindex b3343480b9..ff2981bd99 100644--- a/client/src/components/Chat/Input/__tests__/ChatForm.enterToSend.spec.tsx+++ b/client/src/components/Chat/Input/__tests__/ChatForm.enterToSend.spec.tsx@@ -15,8 +15,8 @@ import type { TFile, TConversation } from 'librechat-data-provider';import type { ChatFormValues } from '~/common';import { ChatContext, ChatFormProvider } from '~/Providers';import { AuthContextProvider } from '~/hooks/AuthContext';+import { SteerHostTestProvider } from 'test/steerHost';import ChatForm from '../ChatForm';-import '~/Providers/SteerHostContext';const conversation = {conversationId: 'new',@@ -93,13 +93,15 @@ function renderComposer({ enterToSend }: { enterToSend: boolean }) {return render(<QueryClientProvider client={queryClient}><RecoilRoot>- <Router>- <AuthContextProvider authConfig={{ loginRedirect: '', test: true }}>- <DndProvider backend={HTML5Backend}>- <Harness enterToSend={enterToSend} />- </DndProvider>- </AuthContextProvider>- </Router>+ <SteerHostTestProvider>+ <Router>+ <AuthContextProvider authConfig={{ loginRedirect: '', test: true }}>+ <DndProvider backend={HTML5Backend}>+ <Harness enterToSend={enterToSend} />+ </DndProvider>+ </AuthContextProvider>+ </Router>+ </SteerHostTestProvider></RecoilRoot></QueryClientProvider>,);diff --git a/client/src/components/Chat/Input/__tests__/ChatForm.pasteUpload.spec.tsx b/client/src/components/Chat/Input/__tests__/ChatForm.pasteUpload.spec.tsxindex c1cf175f8d..ad51177bb6 100644--- a/client/src/components/Chat/Input/__tests__/ChatForm.pasteUpload.spec.tsx+++ b/client/src/components/Chat/Input/__tests__/ChatForm.pasteUpload.spec.tsx@@ -16,8 +16,8 @@ import type { ChatFormValues } from '~/common';import { ChatContext, ChatFormProvider } from '~/Providers';import { AuthContextProvider } from '~/hooks/AuthContext';import DragDropWrapper from '../Files/DragDropWrapper';+import { SteerHostTestProvider } from 'test/steerHost';import ChatForm from '../ChatForm';-import '~/Providers/SteerHostContext';const mockUpload = jest.fn();const mockAsk = jest.fn();@@ -134,13 +134,15 @@ function renderComposer({ legacyUploadUX = false }: { legacyUploadUX?: boolean }return render(<QueryClientProvider client={queryClient}><RecoilRoot>- <Router>- <AuthContextProvider authConfig={{ loginRedirect: '', test: true }}>- <DndProvider backend={HTML5Backend}>- <Harness />- </DndProvider>- </AuthContextProvider>- </Router>+ <SteerHostTestProvider>+ <Router>+ <AuthContextProvider authConfig={{ loginRedirect: '', test: true }}>+ <DndProvider backend={HTML5Backend}>+ <Harness />+ </DndProvider>+ </AuthContextProvider>+ </Router>+ </SteerHostTestProvider></RecoilRoot></QueryClientProvider>,);diff --git a/client/src/components/Chat/Input/__tests__/ChatForm.queryParams.spec.tsx b/client/src/components/Chat/Input/__tests__/ChatForm.queryParams.spec.tsxindex 7e6d397979..c99187df1b 100644--- a/client/src/components/Chat/Input/__tests__/ChatForm.queryParams.spec.tsx+++ b/client/src/components/Chat/Input/__tests__/ChatForm.queryParams.spec.tsx@@ -21,10 +21,10 @@ import { ChatTransportContext, defaultChatTransport } from '~/Providers/ChatTranimport { getNewConversationDraftId, getDraft, setDraft } from '~/utils/drafts';import { ChatContext, ChatFormProvider } from '~/Providers';import { AuthContextProvider } from '~/hooks/AuthContext';+import { SteerHostTestProvider } from 'test/steerHost';import { startupConfigKey } from '~/data-provider';import ChatForm from '../ChatForm';import store from '~/store';-import '~/Providers/SteerHostContext';const initialConversation = {conversationId: 'new',@@ -188,14 +188,16 @@ function mountComposer(}}}>- <MemoryRouter initialEntries={[`${pathname}?${query}`]}>- <NavigationBridge />- <AuthContextProvider authConfig={{ loginRedirect: '', test: true }}>- <ChatTransportContext.Provider value={transport}>- <DndProvider backend={HTML5Backend}>{children}</DndProvider>- </ChatTransportContext.Provider>- </AuthContextProvider>- </MemoryRouter>+ <SteerHostTestProvider>+ <MemoryRouter initialEntries={[`${pathname}?${query}`]}>+ <NavigationBridge />+ <AuthContextProvider authConfig={{ loginRedirect: '', test: true }}>+ <ChatTransportContext.Provider value={transport}>+ <DndProvider backend={HTML5Backend}>{children}</DndProvider>+ </ChatTransportContext.Provider>+ </AuthContextProvider>+ </MemoryRouter>+ </SteerHostTestProvider></RecoilRoot></JotaiProvider></QueryClientProvider>diff --git a/client/src/hooks/Chat/__tests__/transport.spec.tsx b/client/src/hooks/Chat/__tests__/transport.spec.tsxindex 84a9eaa279..fe17a6b41a 100644--- a/client/src/hooks/Chat/__tests__/transport.spec.tsx+++ b/client/src/hooks/Chat/__tests__/transport.spec.tsx@@ -37,10 +37,10 @@ import useResumableSSE from '~/hooks/SSE/useResumableSSE';import useResumeOnLoad from '~/hooks/SSE/useResumeOnLoad';import useChatHelpers from '~/hooks/Chat/useChatHelpers';import { resumeRequestsAtom } from '~/hooks/Chat/resume';+import { SteerHostTestProvider } from 'test/steerHost';import { useChat } from '~/hooks/Chat/facade';import useSSE from '~/hooks/SSE/useSSE';import store from '~/store';-import '~/Providers/SteerHostContext';jest.mock('~/hooks/AuthContext', () => {const { createContext } = jest.requireActual('react');@@ -110,9 +110,11 @@ function createWrapper(seed?.(state);}}>- <ChatTransportContext.Provider value={transport}>- {children}- </ChatTransportContext.Provider>+ <SteerHostTestProvider>+ <ChatTransportContext.Provider value={transport}>+ {children}+ </ChatTransportContext.Provider>+ </SteerHostTestProvider></RecoilRoot></QueryClientProvider></MemoryRouter>diff --git a/client/src/hooks/Chat/__tests__/useQueueDrain.spec.tsx b/client/src/hooks/Chat/__tests__/useQueueDrain.spec.tsxindex 9025130273..0b1963014a 100644--- a/client/src/hooks/Chat/__tests__/useQueueDrain.spec.tsx+++ b/client/src/hooks/Chat/__tests__/useQueueDrain.spec.tsx@@ -12,8 +12,6 @@ import {acquireQueueSendLock,releaseQueueSendLock,} from '@librechat/chat';-import useQueueDrain from '../useQueueDrain';-import '~/Providers/SteerHostContext';import {settledQueuedTurnReceiptsByConvoId,queuedMessagesByConvoId,@@ -29,6 +27,8 @@ import type {QueuedMessage,SettledQueuedTurnReceipt,} from '@librechat/chat';+import { SteerHostTestProvider } from 'test/steerHost';+import useQueueDrain from '../useQueueDrain';const mockMarkFilesUsage = jest.fn();jest.mock('~/data-provider', () => ({@@ -85,8 +85,10 @@ function setup(const wrapper = ({ children }: { children: React.ReactNode }) => (<QueryClientProvider client={queryClient}><RecoilRoot initializeState={initialize}>- <Harness />- {children}+ <SteerHostTestProvider>+ <Harness />+ {children}+ </SteerHostTestProvider></RecoilRoot></QueryClientProvider>);@@ -1008,7 +1010,7 @@ describe('useQueueDrain', () => {});}}>- {children}+ <SteerHostTestProvider>{children}</SteerHostTestProvider></RecoilRoot></QueryClientProvider>);@@ -1190,8 +1192,10 @@ describe('useQueueDrain', () => {const wrapper = ({ children }: { children: React.ReactNode }) => (<QueryClientProvider client={queryClient}><RecoilRoot initializeState={initialize}>- <Harness />- {children}+ <SteerHostTestProvider>+ <Harness />+ {children}+ </SteerHostTestProvider></RecoilRoot></QueryClientProvider>);diff --git a/client/src/hooks/Chat/__tests__/useSteerCancel.spec.tsx b/client/src/hooks/Chat/__tests__/useSteerCancel.spec.tsxindex b3ad973fb3..ce83dcd1de 100644--- a/client/src/hooks/Chat/__tests__/useSteerCancel.spec.tsx+++ b/client/src/hooks/Chat/__tests__/useSteerCancel.spec.tsx@@ -3,17 +3,17 @@ import { RecoilRoot } from 'recoil';import { useAtomValue, getDefaultStore } from 'jotai';import { act, renderHook } from '@testing-library/react';import { ReasoningEffort } from 'librechat-data-provider';+import { useSteerCancel, useSteerMoveToQueue } from '@librechat/chat/react';+import { queuedMessagesByConvoId, resetQueueFamilies } from '@librechat/chat/react';+import { ComposerRestoreProvider, useComposerRestoreHost } from '@librechat/chat/react';import {activeGenerationCreatedAtByConvoId,pendingSteersByConvoId,resetSteerFamilies,} from '@librechat/chat/react';-import '~/Providers/SteerHostContext';-import { useSteerCancel, useSteerMoveToQueue } from '@librechat/chat/react';-import { queuedMessagesByConvoId, resetQueueFamilies } from '@librechat/chat/react';-import { ComposerRestoreProvider, useComposerRestoreHost } from '@librechat/chat/react';import type { RestoreToComposer } from '@librechat/chat/react';import type { PendingSteer } from '@librechat/chat';+import { SteerHostTestProvider } from 'test/steerHost';const mockCancelAsync = jest.fn();@@ -46,7 +46,7 @@ function setup(steer: PendingSteer) {getDefaultStore().set(pendingSteersByConvoId(CONVO_ID), [steer]);}}>- {children}+ <SteerHostTestProvider>{children}</SteerHostTestProvider></RecoilRoot>);return renderHook(@@ -125,9 +125,11 @@ describe('useSteerMoveToQueue', () => {getDefaultStore().set(pendingSteersByConvoId(CONVO_ID), [steer]);}}>- <ComposerRestoreProvider>- <RewakePublisher rewake={rewake}>{children}</RewakePublisher>- </ComposerRestoreProvider>+ <SteerHostTestProvider>+ <ComposerRestoreProvider>+ <RewakePublisher rewake={rewake}>{children}</RewakePublisher>+ </ComposerRestoreProvider>+ </SteerHostTestProvider></RecoilRoot>);const { result } = renderHook(@@ -207,11 +209,13 @@ function setupCancel(getDefaultStore().set(pendingSteersByConvoId(CONVO_ID), [steer]);}}>- <ComposerRestoreProvider>- <RewakePublisher rewake={rewake}>- <Publisher restore={restore}>{children}</Publisher>- </RewakePublisher>- </ComposerRestoreProvider>+ <SteerHostTestProvider>+ <ComposerRestoreProvider>+ <RewakePublisher rewake={rewake}>+ <Publisher restore={restore}>{children}</Publisher>+ </RewakePublisher>+ </ComposerRestoreProvider>+ </SteerHostTestProvider></RecoilRoot>);return renderHook(diff --git a/client/src/hooks/Chat/__tests__/useSteerConvert.spec.tsx b/client/src/hooks/Chat/__tests__/useSteerConvert.spec.tsxindex 227ffa997c..d49216f6e4 100644--- a/client/src/hooks/Chat/__tests__/useSteerConvert.spec.tsx+++ b/client/src/hooks/Chat/__tests__/useSteerConvert.spec.tsx@@ -1,20 +1,20 @@import React from 'react';+import { useSteerConvert } from '@librechat/chat/react';import { act, renderHook } from '@testing-library/react';import { RecoilRoot, type MutableSnapshot } from 'recoil';import { getDefaultStore, useAtomValue, useSetAtom } from 'jotai';+import {+ recoveryDispositionsFamily,+ queuedMessagesByConvoId,+ resetQueueFamilies,+} from '@librechat/chat/react';import {activeGenerationProtocolVersionByConvoId,appliedSteerIdsByConvoId,pendingSteersByConvoId,resetSteerFamilies,} from '@librechat/chat/react';-import '~/Providers/SteerHostContext';-import { useSteerConvert } from '@librechat/chat/react';-import {- recoveryDispositionsFamily,- queuedMessagesByConvoId,- resetQueueFamilies,-} from '@librechat/chat/react';+import { SteerHostTestProvider } from 'test/steerHost';const mockFetchStreamStatus = jest.fn();let mockFileMap: Record<string, { llmDeliveryPath: 'text' }> = {};@@ -39,7 +39,7 @@ function setup(initialize?: (snapshot: MutableSnapshot) => void) {initialize?.(snapshot);}}>- {children}+ <SteerHostTestProvider>{children}</SteerHostTestProvider></RecoilRoot>);return renderHook(diff --git a/client/src/hooks/Chat/__tests__/useSteerEscalate.spec.tsx b/client/src/hooks/Chat/__tests__/useSteerEscalate.spec.tsxindex bc890aa4ec..ea8cf059b5 100644--- a/client/src/hooks/Chat/__tests__/useSteerEscalate.spec.tsx+++ b/client/src/hooks/Chat/__tests__/useSteerEscalate.spec.tsx@@ -1,6 +1,7 @@import React from 'react';import { RecoilRoot } from 'recoil';import { getDefaultStore, useAtomValue } from 'jotai';+import { useSteerEscalate } from '@librechat/chat/react';import { act, renderHook, waitFor } from '@testing-library/react';import {escalatingSteerFamily,@@ -9,10 +10,9 @@ import {pendingSteersByConvoId,resetSteerFamilies,} from '@librechat/chat/react';-import { ChatSettingsContext, defaultChatSettings } from '~/Providers/ChatSettingsContext';-import '~/Providers/SteerHostContext';-import { useSteerEscalate } from '@librechat/chat/react';import type { PendingSteer } from '@librechat/chat';+import { ChatSettingsContext, defaultChatSettings } from '~/Providers/ChatSettingsContext';+import { SteerHostTestProvider } from 'test/steerHost';const mockArmMutateAsync = jest.fn();const mockShowToast = jest.fn();@@ -68,14 +68,16 @@ function setup({);const wrapper = ({ children }: { children: React.ReactNode }) => (<RecoilRoot>- <ChatSettingsContext.Provider- value={{- ...defaultChatSettings,- config: { ...defaultChatSettings.config, steerArmConfirmationTimeoutMs },- }}- >- {children}- </ChatSettingsContext.Provider>+ <SteerHostTestProvider>+ <ChatSettingsContext.Provider+ value={{+ ...defaultChatSettings,+ config: { ...defaultChatSettings.config, steerArmConfirmationTimeoutMs },+ }}+ >+ {children}+ </ChatSettingsContext.Provider>+ </SteerHostTestProvider></RecoilRoot>);diff --git a/client/src/hooks/Chat/__tests__/useSteerRecovery.spec.tsx b/client/src/hooks/Chat/__tests__/useSteerRecovery.spec.tsxindex 75bd70ea5e..c798d2ade5 100644--- a/client/src/hooks/Chat/__tests__/useSteerRecovery.spec.tsx+++ b/client/src/hooks/Chat/__tests__/useSteerRecovery.spec.tsx@@ -3,6 +3,8 @@ import { act, render, renderHook } from '@testing-library/react';import { getDefaultStore, useAtomValue, useSetAtom } from 'jotai';import { isSubmittingFamily, resetSubmitting } from '@librechat/chat/react';import { RecoilRoot, useSetRecoilState, type MutableSnapshot } from 'recoil';+import { queuedMessagesByConvoId, resetQueueFamilies } from '@librechat/chat/react';+import { ComposerRestoreProvider, useComposerRestoreHost } from '@librechat/chat/react';import {pendingSteerCancelClientIdsFamily,acceptedSteerClientIdsByConvoId,@@ -11,14 +13,12 @@ import {pendingSteersByConvoId,resetSteerFamilies,} from '@librechat/chat/react';+import type { RewakeDrain } from '@librechat/chat/react';import { ChatSettingsContext, defaultChatSettings } from '~/Providers/ChatSettingsContext';import { usePaneConversations } from '~/routes/ChatSettings';+import { SteerHostTestProvider } from 'test/steerHost';import useSteerRecovery from '../useSteerRecovery';import store from '~/store';-import '~/Providers/SteerHostContext';-import { queuedMessagesByConvoId, resetQueueFamilies } from '@librechat/chat/react';-import { ComposerRestoreProvider, useComposerRestoreHost } from '@librechat/chat/react';-import type { RewakeDrain } from '@librechat/chat/react';const mockMutateAsync = jest.fn();const mockCancelSteer = jest.fn();@@ -72,11 +72,13 @@ function setup(initialize?: (snapshot: MutableSnapshot) => void, rewake?: Rewakeinitialize?.(snapshot);}}>- <PaneSettings>- <ComposerRestoreProvider>- {rewake ? <RewakePublisher rewake={rewake}>{children}</RewakePublisher> : children}- </ComposerRestoreProvider>- </PaneSettings>+ <SteerHostTestProvider>+ <PaneSettings>+ <ComposerRestoreProvider>+ {rewake ? <RewakePublisher rewake={rewake}>{children}</RewakePublisher> : children}+ </ComposerRestoreProvider>+ </PaneSettings>+ </SteerHostTestProvider></RecoilRoot>);return renderHook(@@ -296,11 +298,13 @@ describe('useSteerRecovery', () => {]);}}>- <PaneSettings>- <RewakePublisher rewake={rewake}>- <Tree />- </RewakePublisher>- </PaneSettings>+ <SteerHostTestProvider>+ <PaneSettings>+ <RewakePublisher rewake={rewake}>+ <Tree />+ </RewakePublisher>+ </PaneSettings>+ </SteerHostTestProvider></RecoilRoot></ComposerRestoreProvider>,);@@ -400,9 +404,11 @@ describe('useSteerRecovery', () => {]);}}>- <PaneSettings>- <Tree />- </PaneSettings>+ <SteerHostTestProvider>+ <PaneSettings>+ <Tree />+ </PaneSettings>+ </SteerHostTestProvider></RecoilRoot></ComposerRestoreProvider>,);@@ -561,10 +567,12 @@ describe('useSteerRecovery', () => {]);}}>- <PaneSettings>- <Observer />- {live && <Recovery />}- </PaneSettings>+ <SteerHostTestProvider>+ <PaneSettings>+ <Observer />+ {live && <Recovery />}+ </PaneSettings>+ </SteerHostTestProvider></RecoilRoot>);@@ -630,9 +638,11 @@ describe('useSteerRecovery', () => {]);}}>- <PaneSettings>- <Tree />- </PaneSettings>+ <SteerHostTestProvider>+ <PaneSettings>+ <Tree />+ </PaneSettings>+ </SteerHostTestProvider></RecoilRoot>,);diff --git a/client/src/hooks/Chat/__tests__/useSteering.spec.tsx b/client/src/hooks/Chat/__tests__/useSteering.spec.tsxindex b87b04be5e..bb74a090e3 100644--- a/client/src/hooks/Chat/__tests__/useSteering.spec.tsx+++ b/client/src/hooks/Chat/__tests__/useSteering.spec.tsx@@ -1,4 +1,5 @@import React from 'react';+import { useSteering } from '@librechat/chat/react';import { RecoilRoot, type MutableSnapshot } from 'recoil';import { claimQueuedIntent, releaseQueuedIntent } from '@librechat/chat';import { act, render, renderHook, waitFor } from '@testing-library/react';@@ -10,6 +11,10 @@ import {useAtomValue,useSetAtom,} from 'jotai';+import {+ hasLiveRunPause,+ hydrateFileDeliveryMetadata as mergeQueuedTurnFileMetadata,+} from '@librechat/chat';import {Constants,ContentTypes,@@ -17,6 +22,22 @@ import {LocalStorageKeys,ReasoningEffort,} from 'librechat-data-provider';+import {+ getReasoningStateKey,+ pendingQuotesByConvoId,+ pendingManualSkillsByConvoId,+ pendingReasoningOverrideFamily,+} from '@librechat/chat/react';+import {+ pendingQueuedTurnEnqueueIdsByConvoId,+ settledQueuedTurnReceiptsByConvoId,+ queuedMessagesByConvoId,+ pendingRunEndByConvoId,+ drainAfterAbortByIndex,+ runEndByIndex,+ resetQueueFamilies,+ recoveryDispositionsFamily,+} from '@librechat/chat/react';import {revealedQueuedTurnFamily,pendingSteerCancelClientIdsFamily,@@ -28,37 +49,16 @@ import {resetSteerFamilies,} from '@librechat/chat/react';import type { CodeApprovalMode, TConversation, TFile, TMessage } from 'librechat-data-provider';+import type { QueuedMessage } from '@librechat/chat';import type { ExtendedFile } from '~/common';import { clearAllDrafts, getPendingDraftId, getNewConversationDraftId } from '~/utils';import useUpdateFiles from '~/hooks/Files/useUpdateFiles';import ChatSettingsProvider from '~/routes/ChatSettings';import { duringRunActionAtom } from '~/store/duringRun';+import { SteerHostTestProvider } from 'test/steerHost';import { applyPendingAction } from '~/utils/approval';import English from '~/locales/en/translation.json';import useQueueDrain from '../useQueueDrain';-import '~/Providers/SteerHostContext';-import { useSteering } from '@librechat/chat/react';-import {- hasLiveRunPause,- hydrateFileDeliveryMetadata as mergeQueuedTurnFileMetadata,-} from '@librechat/chat';-import {- getReasoningStateKey,- pendingQuotesByConvoId,- pendingManualSkillsByConvoId,- pendingReasoningOverrideFamily,-} from '@librechat/chat/react';-import {- pendingQueuedTurnEnqueueIdsByConvoId,- settledQueuedTurnReceiptsByConvoId,- queuedMessagesByConvoId,- pendingRunEndByConvoId,- drainAfterAbortByIndex,- runEndByIndex,- resetQueueFamilies,- recoveryDispositionsFamily,-} from '@librechat/chat/react';-import type { QueuedMessage } from '@librechat/chat';const CONVO_ID = 'convo-steer-ui';const UUID_V4_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;@@ -175,8 +175,10 @@ function setup(params: HookParams = {}, initialize?: (snapshot: MutableSnapshot)<RecoilRootinitializeState={withActiveGeneration(initialize, params.conversationId ?? CONVO_ID)}>- <GenerationProbe />- <ChatSettingsProvider>{children}</ChatSettingsProvider>+ <SteerHostTestProvider>+ <GenerationProbe />+ <ChatSettingsProvider>{children}</ChatSettingsProvider>+ </SteerHostTestProvider></RecoilRoot>);const rendered = renderHook(@@ -319,7 +321,7 @@ describe('useSteering', () => {getDefaultStore().set(isSubmittingFamily(0), false);})}>- {children}+ <SteerHostTestProvider>{children}</SteerHostTestProvider></RecoilRoot>);const { result } = renderHook(@@ -410,7 +412,7 @@ describe('useSteering', () => {getDefaultStore().set(isSubmittingFamily(0), false);})}>- {children}+ <SteerHostTestProvider>{children}</SteerHostTestProvider></RecoilRoot>);const { result } = renderHook(@@ -696,7 +698,9 @@ describe('useSteering', () => {) {const sendNow = jest.fn();const wrapper = ({ children }: { children: React.ReactNode }) => (- <RecoilRoot initializeState={initializer}>{children}</RecoilRoot>+ <RecoilRoot initializeState={initializer}>+ <SteerHostTestProvider>{children}</SteerHostTestProvider>+ </RecoilRoot>);const rendered = renderHook(() => ({@@ -1642,7 +1646,7 @@ describe('useSteering', () => {]);})}>- {children}+ <SteerHostTestProvider>{children}</SteerHostTestProvider></RecoilRoot>);const { result } = renderHook(@@ -1848,7 +1852,9 @@ describe('useSteering', () => {const sendNow = jest.fn();const stopGenerating = jest.fn();const wrapper = ({ children }: { children: React.ReactNode }) => (- <RecoilRoot initializeState={withActiveGeneration(initialize)}>{children}</RecoilRoot>+ <RecoilRoot initializeState={withActiveGeneration(initialize)}>+ <SteerHostTestProvider>{children}</SteerHostTestProvider>+ </RecoilRoot>);const rendered = renderHook(() => ({@@ -2028,7 +2034,9 @@ describe('useSteering', () => {) {const sendNow = jest.fn();const wrapper = ({ children }: { children: React.ReactNode }) => (- <RecoilRoot initializeState={withActiveGeneration(initialize)}>{children}</RecoilRoot>+ <RecoilRoot initializeState={withActiveGeneration(initialize)}>+ <SteerHostTestProvider>{children}</SteerHostTestProvider>+ </RecoilRoot>);const rendered = renderHook(({ convoId, isSubmitting }: { convoId: string; isSubmitting: boolean }) => ({@@ -2606,7 +2614,7 @@ describe('useSteering', () => {getDefaultStore().set(activeGenerationProtocolVersionByConvoId(otherConversationId), 2);}}>- {children}+ <SteerHostTestProvider>{children}</SteerHostTestProvider></RecoilRoot>);const { result, rerender } = renderHook(@@ -2668,7 +2676,9 @@ describe('useSteering', () => {const sendNow = jest.fn();const stopGenerating = jest.fn();const wrapper = ({ children }: { children: React.ReactNode }) => (- <RecoilRoot initializeState={withActiveGeneration(initialize)}>{children}</RecoilRoot>+ <RecoilRoot initializeState={withActiveGeneration(initialize)}>+ <SteerHostTestProvider>{children}</SteerHostTestProvider>+ </RecoilRoot>);const rendered = renderHook(() => ({@@ -3799,7 +3809,7 @@ describe('useSteering', () => {}}>- {children}+ <SteerHostTestProvider>{children}</SteerHostTestProvider></RecoilRoot>);const rendered = renderHook(@@ -3898,7 +3908,9 @@ describe('useSteering', () => {render(<RecoilRoot initializeState={withActiveGeneration()}>- <Composer />+ <SteerHostTestProvider>+ <Composer />+ </SteerHostTestProvider></RecoilRoot>,);return {@@ -4230,7 +4242,7 @@ describe('useSteering', () => {reasoningStore,)}>- {children}+ <SteerHostTestProvider>{children}</SteerHostTestProvider></RecoilRoot></JotaiProvider>);diff --git a/client/src/hooks/SSE/__tests__/useResumeOnLoad.spec.tsx b/client/src/hooks/SSE/__tests__/useResumeOnLoad.spec.tsxindex 05b48d6b19..e9c8be66e2 100644--- a/client/src/hooks/SSE/__tests__/useResumeOnLoad.spec.tsx+++ b/client/src/hooks/SSE/__tests__/useResumeOnLoad.spec.tsx@@ -16,15 +16,6 @@ import {activeGenerationCreatedAtByConvoId,submissionStartFamily,} from '@librechat/chat/react';-import type { Agents, TMessage, TConversation, TSubmission } from 'librechat-data-provider';-import type { MutableSnapshot } from 'recoil';-import type { ReactNode } from 'react';-import { siblingIdxFamily, siblingKey } from '~/components/Chat/Messages/Thread/state';-import { pendingApprovalActionFamily } from '~/components/Chat/approval/state';-import { agentQueuedTurnsQueryKey } from '~/data-provider/SSE/queuedTurns';-import useResumeOnLoad from '../useResumeOnLoad';-import store from '~/store';-import '~/Providers/SteerHostContext';import {settledQueuedTurnReceiptsByConvoId,queuedMessagesByConvoId,@@ -33,7 +24,16 @@ import {detachedRunByConvoId,resetQueueFamilies,} from '@librechat/chat/react';+import type { Agents, TMessage, TConversation, TSubmission } from 'librechat-data-provider';import type { QueuedMessage, PendingSteer, DetachedRun } from '@librechat/chat';+import type { MutableSnapshot } from 'recoil';+import type { ReactNode } from 'react';+import { siblingIdxFamily, siblingKey } from '~/components/Chat/Messages/Thread/state';+import { pendingApprovalActionFamily } from '~/components/Chat/approval/state';+import { agentQueuedTurnsQueryKey } from '~/data-provider/SSE/queuedTurns';+import { SteerHostTestProvider } from 'test/steerHost';+import useResumeOnLoad from '../useResumeOnLoad';+import store from '~/store';const mockUseStreamStatus = jest.fn();const mockUseActiveJobs = jest.fn();@@ -210,12 +210,14 @@ function renderUseResumeOnLoad({<QueryClientProvider client={queryClient}><JotaiProvider store={jotaiStore}><RecoilRoot initializeState={initializeState}>- <SubmissionProbe />- <SubmissionStartProbe />- <SiblingIndexProbe />- <PendingSteersProbe />- <QueuedMessagesProbe />- {children}+ <SteerHostTestProvider>+ <SubmissionProbe />+ <SubmissionStartProbe />+ <SiblingIndexProbe />+ <PendingSteersProbe />+ <QueuedMessagesProbe />+ {children}+ </SteerHostTestProvider></RecoilRoot></JotaiProvider></QueryClientProvider>diff --git a/client/test/steerHost.tsx b/client/test/steerHost.tsxnew file mode 100644index 0000000000..825091bacd--- /dev/null+++ b/client/test/steerHost.tsx@@ -0,0 +1,9 @@+import React from 'react';+import { SteerHostProvider } from '@librechat/chat/react';+import { appSteerHost } from '~/Providers/SteerHostContext';++/** Mounts the app's steer host the way `routes/Root.tsx` does, for specs that render the steer+ * hooks outside the app shell. Import it after the spec's module mocks so the host uses them. */+export function SteerHostTestProvider({ children }: { children?: React.ReactNode }) {+ return <SteerHostProvider host={appSteerHost}>{children}</SteerHostProvider>;+}diff --git a/packages/chat/src/react.ts b/packages/chat/src/react.tsindex aed5eb9858..296e0f347f 100644--- a/packages/chat/src/react.ts+++ b/packages/chat/src/react.ts@@ -66,7 +66,7 @@ export {showStopButtonByIndex,abortScrollFamily,} from './react/generation';-export { SteerHostProvider, setDefaultSteerHost, useSteerHost } from './react/steer/host';+export { SteerHostProvider, useSteerHost } from './react/steer/host';export type {SteerHost,SteerSettings,diff --git a/packages/chat/src/react/steer/__tests__/host.spec.tsx b/packages/chat/src/react/steer/__tests__/host.spec.tsxindex 595abe235f..d759a55fa8 100644--- a/packages/chat/src/react/steer/__tests__/host.spec.tsx+++ b/packages/chat/src/react/steer/__tests__/host.spec.tsx@@ -4,7 +4,7 @@import { renderHook } from '@testing-library/react';import type { ReactNode } from 'react';import type { SteerHost } from '../host';-import { SteerHostProvider, setDefaultSteerHost, useSteerHost } from '../host';+import { SteerHostProvider, useSteerHost } from '../host';const createHost = (label: string): SteerHost => ({useSteerMessage: () => () => undefined,@@ -29,18 +29,21 @@ const createHost = (label: string): SteerHost => ({const translate = (host: SteerHost) => host.useLocalize()('com_ui_steer_cancel_failed');describe('useSteerHost', () => {- it('reads the host a provider supplies over the registered default', () => {- setDefaultSteerHost(createHost('default'));+ it('reads the host the nearest provider supplies', () => {const wrapper = ({ children }: { children: ReactNode }) => (- <SteerHostProvider host={createHost('provided')}>{children}</SteerHostProvider>+ <SteerHostProvider host={createHost('outer')}>+ <SteerHostProvider host={createHost('provided')}>{children}</SteerHostProvider>+ </SteerHostProvider>);const { result } = renderHook(() => translate(useSteerHost()), { wrapper });expect(result.current).toBe('provided:com_ui_steer_cancel_failed');});- it('falls back to the registered default outside a provider', () => {- setDefaultSteerHost(createHost('default'));- const { result } = renderHook(() => translate(useSteerHost()));- expect(result.current).toBe('default:com_ui_steer_cancel_failed');+ it('throws a named error when no provider is mounted', () => {+ const consoleError = jest.spyOn(console, 'error').mockImplementation(() => undefined);+ expect(() => renderHook(() => useSteerHost())).toThrow(+ 'The steer hooks need a SteerHostProvider above them.',+ );+ consoleError.mockRestore();});});diff --git a/packages/chat/src/react/steer/host.tsx b/packages/chat/src/react/steer/host.tsxindex 125ca957b2..316b9b04db 100644--- a/packages/chat/src/react/steer/host.tsx+++ b/packages/chat/src/react/steer/host.tsx@@ -106,13 +106,6 @@ export interface SteerHost {useSettings(): SteerSettings;}-let defaultSteerHost: SteerHost | null = null;--/** Registers the host used outside any `SteerHostProvider`, once at the app's entry. */-export function setDefaultSteerHost(host: SteerHost): void {- defaultSteerHost = host;-}-const SteerHostContext = createContext<SteerHost | null>(null);export function SteerHostProvider({@@ -126,9 +119,9 @@ export function SteerHostProvider({}export function useSteerHost(): SteerHost {- const host = useContext(SteerHostContext) ?? defaultSteerHost;+ const host = useContext(SteerHostContext);if (host == null) {- throw new Error('The steer hooks need a SteerHostProvider or a default steer host.');+ throw new Error('The steer hooks need a SteerHostProvider above them.');}return host;}