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: Bound Remaining Outbound Calls With Timeout Budgets (#17468)
Marco Beretta5b8bb3c31f58
diff --git a/api/app/clients/tools/structured/GoogleSearch.js b/api/app/clients/tools/structured/GoogleSearch.jsindex a6ad5fd4d7..b1e0c0b778 100644--- a/api/app/clients/tools/structured/GoogleSearch.js+++ b/api/app/clients/tools/structured/GoogleSearch.js@@ -1,3 +1,4 @@+const { toolRequestBudget } = require('@librechat/api');const { Tool } = require('@librechat/agents/langchain/tools');const { getEnvironmentVariable } = require('@librechat/agents/langchain/utils/env');@@ -34,6 +35,7 @@ class GoogleSearchResults extends Tool {this.envVarApiKey = 'GOOGLE_SEARCH_API_KEY';this.envVarSearchEngineId = 'GOOGLE_CSE_ID';this.override = fields.override ?? false;+ this.timeouts = fields.timeouts;this.apiKey = fields[this.envVarApiKey] ?? getEnvironmentVariable(this.envVarApiKey);this.searchEngineId =fields[this.envVarSearchEngineId] ?? getEnvironmentVariable(this.envVarSearchEngineId);@@ -64,6 +66,7 @@ class GoogleSearchResults extends Tool {headers: {'Content-Type': 'application/json',},+ signal: toolRequestBudget(this.timeouts).signal,},);diff --git a/api/app/clients/tools/structured/OpenWeather.js b/api/app/clients/tools/structured/OpenWeather.jsindex eec6beecdc..33469ec4d6 100644--- a/api/app/clients/tools/structured/OpenWeather.js+++ b/api/app/clients/tools/structured/OpenWeather.js@@ -1,5 +1,10 @@const fetch = require('node-fetch');-const { ToolInputError, formatToolError, formatToolHttpError } = require('@librechat/api');+const {+ ToolInputError,+ formatToolError,+ formatToolHttpError,+ toolRequestBudget,+} = require('@librechat/api');const { Tool } = require('@librechat/agents/langchain/tools');const { getEnvironmentVariable } = require('@librechat/agents/langchain/utils/env');@@ -122,6 +127,7 @@ class OpenWeather extends Tool {this.envVar = 'OPENWEATHER_API_KEY';this.override = fields.override ?? false;this.apiKey = fields[this.envVar] ?? this.getApiKey();+ this.timeouts = fields.timeouts;}getApiKey() {@@ -136,7 +142,7 @@ class OpenWeather extends Tool {const geocodeUrl = `https://api.openweathermap.org/geo/1.0/direct?q=${encodeURIComponent(city,)}&limit=1&appid=${this.apiKey}`;- const res = await fetch(geocodeUrl);+ const res = await fetch(geocodeUrl, { signal: toolRequestBudget(this.timeouts).signal });const data = await res.json();if (!res.ok || !Array.isArray(data) || data.length === 0) {throw new ToolInputError(`Could not find coordinates for city: ${city}`);@@ -337,7 +343,7 @@ class OpenWeather extends Tool {}const url = `${baseUrl}${endpoint}?${params.toString()}`;- const response = await fetch(url);+ const response = await fetch(url, { signal: toolRequestBudget(this.timeouts).signal });if (!response.ok) {return formatToolHttpError('OpenWeather', response.status);}diff --git a/api/app/clients/tools/structured/StableDiffusion.js b/api/app/clients/tools/structured/StableDiffusion.jsindex ac58bf6987..adc2acae30 100644--- a/api/app/clients/tools/structured/StableDiffusion.js+++ b/api/app/clients/tools/structured/StableDiffusion.js@@ -7,7 +7,11 @@ const { v4: uuidv4 } = require('uuid');const { logger } = require('@librechat/data-schemas');const { Tool } = require('@librechat/agents/langchain/tools');const { FileContext, ContentTypes } = require('librechat-data-provider');-const { applySSRFSafeAgentIfDirect, getBasePath } = require('@librechat/api');+const {+ getBasePath,+ configuredRequestBudget,+ applySSRFSafeAgentIfDirect,+} = require('@librechat/api');const paths = require('~/config/paths');const stableDiffusionJsonSchema = {@@ -118,9 +122,10 @@ class StableDiffusionAPI extends Tool {let generationResponse;try {const requestUrl = `${url}/sdapi/v1/txt2img`;- const requestConfig = this.isUserProvidedEndpoint- ? applySSRFSafeAgentIfDirect({}, requestUrl)- : undefined;+ const requestConfig = {+ ...(this.isUserProvidedEndpoint ? applySSRFSafeAgentIfDirect({}, requestUrl) : {}),+ ...configuredRequestBudget(this.req?.config, 'imageGenerationMs'),+ };generationResponse = await axios.post(requestUrl, payload, requestConfig);} catch (error) {logger.error('[StableDiffusion] Error while generating image:', error);diff --git a/api/app/clients/tools/structured/TavilySearchResults.js b/api/app/clients/tools/structured/TavilySearchResults.jsindex b7d259e5d5..3e2850f657 100644--- a/api/app/clients/tools/structured/TavilySearchResults.js+++ b/api/app/clients/tools/structured/TavilySearchResults.js@@ -1,7 +1,7 @@const { fetch } = require('undici');const { Tool } = require('@librechat/agents/langchain/tools');const { getEnvironmentVariable } = require('@librechat/agents/langchain/utils/env');-const { getEnvProxyDispatcher } = require('@librechat/api');+const { getEnvProxyDispatcher, toolRequestBudget } = require('@librechat/api');const tavilySearchJsonSchema = {type: 'object',@@ -81,6 +81,7 @@ class TavilySearchResults extends Tool {this.envVar = 'TAVILY_API_KEY';/* Used to initialize the Tool without necessary variables. */this.override = fields.override ?? false;+ this.timeouts = fields.timeouts;this.apiKey = fields[this.envVar] ?? this.getApiKey();this.kwargs = fields?.kwargs ?? {};@@ -120,6 +121,7 @@ class TavilySearchResults extends Tool {'X-Client-Name': 'librechat',},body: JSON.stringify(requestBody),+ signal: toolRequestBudget(this.timeouts).signal,};const dispatcher = getEnvProxyDispatcher();diff --git a/api/app/clients/tools/structured/TraversaalSearch.js b/api/app/clients/tools/structured/TraversaalSearch.jsindex 9902756e8e..9dca64c728 100644--- a/api/app/clients/tools/structured/TraversaalSearch.js+++ b/api/app/clients/tools/structured/TraversaalSearch.js@@ -1,4 +1,5 @@const { logger } = require('@librechat/data-schemas');+const { toolRequestBudget } = require('@librechat/api');const { Tool } = require('@librechat/agents/langchain/tools');const { getEnvironmentVariable } = require('@librechat/agents/langchain/utils/env');@@ -23,6 +24,7 @@ class TraversaalSearch extends Tool {}constructor(fields) {super(fields);+ this.timeouts = fields.timeouts;this.name = 'traversaal_search';this.description = `An AI search engine optimized for comprehensive, accurate, and trusted results.Useful for when you need to answer questions about current events. Input should be a search query.`;@@ -59,6 +61,7 @@ class TraversaalSearch extends Tool {'x-api-key': this.apiKey,},body: JSON.stringify({ ...body }),+ signal: toolRequestBudget(this.timeouts).signal,});const json = await response.json();if (!response.ok) {diff --git a/api/app/clients/tools/structured/Wolfram.js b/api/app/clients/tools/structured/Wolfram.jsindex 3285d08663..2afe87bbc8 100644--- a/api/app/clients/tools/structured/Wolfram.js+++ b/api/app/clients/tools/structured/Wolfram.js@@ -1,6 +1,6 @@/* eslint-disable no-useless-escape */const axios = require('axios');-const { formatToolError, WOLFRAM_STATUS_TEXT } = require('@librechat/api');+const { formatToolError, toolRequestBudget, WOLFRAM_STATUS_TEXT } = require('@librechat/api');const { Tool } = require('@librechat/agents/langchain/tools');const wolframJsonSchema = {@@ -19,6 +19,7 @@ class WolframAlphaAPI extends Tool {super();/* Used to initialize the Tool without necessary variables. */this.override = fields.override ?? false;+ this.timeouts = fields.timeouts;this.name = 'wolfram';this.apiKey = fields.WOLFRAM_APP_ID || this.getAppId();@@ -59,7 +60,10 @@ class WolframAlphaAPI extends Tool {}async fetchRawText(url) {- const response = await axios.get(url, { responseType: 'text' });+ const response = await axios.get(url, {+ responseType: 'text',+ ...toolRequestBudget(this.timeouts),+ });return response.data;}diff --git a/api/app/clients/tools/structured/specs/TavilySearchResults.spec.js b/api/app/clients/tools/structured/specs/TavilySearchResults.spec.jsindex 7184e08204..15f70bade9 100644--- a/api/app/clients/tools/structured/specs/TavilySearchResults.spec.js+++ b/api/app/clients/tools/structured/specs/TavilySearchResults.spec.js@@ -5,6 +5,7 @@ const { getEnvProxyDispatcher } = require('@librechat/api');jest.mock('undici');jest.mock('@librechat/api', () => ({getEnvProxyDispatcher: jest.fn(),+ toolRequestBudget: jest.requireActual('@librechat/api').toolRequestBudget,}));describe('TavilySearchResults', () => {diff --git a/api/app/clients/tools/util/handleTools.js b/api/app/clients/tools/util/handleTools.jsindex adc76642e3..27af41b89c 100644--- a/api/app/clients/tools/util/handleTools.js+++ b/api/app/clients/tools/util/handleTools.js@@ -230,7 +230,14 @@ const loadTools = async ({uploadImageBuffer: options.uploadImageBuffer,};+ const timeoutOptions = { timeouts: options.req?.config?.timeouts };+const toolOptions = {+ google: timeoutOptions,+ wolfram: timeoutOptions,+ open_weather: timeoutOptions,+ traversaal_search: timeoutOptions,+ tavily_search_results_json: timeoutOptions,flux: imageGenOptions,'stable-diffusion': imageGenOptions,gemini_image_gen: imageGenOptions,diff --git a/api/server/services/Files/Audio/STTService.js b/api/server/services/Files/Audio/STTService.jsindex 1b0f6f5942..5c86bc1cf1 100644--- a/api/server/services/Files/Audio/STTService.js+++ b/api/server/services/Files/Audio/STTService.js@@ -9,6 +9,7 @@ const {hasActiveFileFieldPolicy,genAzureEndpoint,getSafeErrorMetadata,+ configuredRequestBudget,applyAxiosProxyConfig,resolveConfigSecret,applySSRFSafeAgentIfDirect,@@ -293,10 +294,17 @@ class STTService {* @param {Object} requestData.audioFile - The audio file object containing originalname, mimetype, and size.* @param {string} requestData.language - The language code for the transcription.* @param {string[]} [allowedAddresses] - Section-level SSRF exemption list of host:port pairs.+ * @param {import('axios').AxiosRequestConfig} [requestOptions] - Timeout and abort options for the request.* @returns {Promise<string>} A promise that resolves to the transcribed text.* @throws {Error} If the provider is invalid, the response status is not 200, or the response data is missing.*/- async sttRequest(provider, sttSchema, { audioBuffer, audioFile, language }, allowedAddresses) {+ async sttRequest(+ provider,+ sttSchema,+ { audioBuffer, audioFile, language },+ allowedAddresses,+ requestOptions,+ ) {const strategy = this.providerStrategies[provider];if (!strategy) {throw new Error('Invalid provider');@@ -315,7 +323,7 @@ class STTService {language,);- const options = { headers };+ const options = { headers, ...requestOptions };applyAxiosProxyConfig(options, url);applySSRFSafeAgentIfDirect(options, url, allowedAddresses);@@ -383,6 +391,7 @@ class STTService {sttSchema,{ audioBuffer, audioFile, language },allowedAddresses,+ configuredRequestBudget(req.config, 'speechMs'),);} catch (error) {const uninspectableField = getBlockedUninspectableFileField(req.config?.filters, [diff --git a/api/server/services/Files/Audio/STTService.spec.js b/api/server/services/Files/Audio/STTService.spec.jsindex d1a37c4327..4c8eb715fd 100644--- a/api/server/services/Files/Audio/STTService.spec.js+++ b/api/server/services/Files/Audio/STTService.spec.js@@ -44,6 +44,7 @@ jest.mock('@librechat/api', () => ({field: finding.field,})),getBlockedUninspectableFileField: jest.fn(),+ configuredRequestBudget: jest.fn(() => ({ timeout: 1000 })),contentFilterUninspectableResponse: jest.fn((field) => ({error: 'content_filter_uninspectable',source: 'file',diff --git a/api/server/services/Files/Audio/TTSService.js b/api/server/services/Files/Audio/TTSService.jsindex 8f73e002a6..6ca38aa106 100644--- a/api/server/services/Files/Audio/TTSService.js+++ b/api/server/services/Files/Audio/TTSService.js@@ -7,8 +7,10 @@ const {resolveConfigSecret,applySSRFSafeAgentIfDirect,pipeSegment,+ abortOnClose,pipeToResponse,capSpeechInput,+ createSpeechBudget,} = require('@librechat/api');const {TTSProviders,@@ -262,10 +264,17 @@ class TTSService {* @param {string} options.voice - The voice to use.* @param {boolean} [options.stream=true] - Whether to use streaming.* @param {string[]} [allowedAddresses] - Section-level SSRF exemption list of host:port pairs.+ * @param {import('axios').AxiosRequestConfig} [requestOptions] - Timeout and abort options for the request.* @returns {Promise<Object>} The axios response object.* @throws {Error} If the provider is invalid or the request fails.*/- async ttsRequest(provider, ttsSchema, { input, voice, stream = true }, allowedAddresses) {+ async ttsRequest(+ provider,+ ttsSchema,+ { input, voice, stream = true },+ allowedAddresses,+ requestOptions,+ ) {const strategy = this.providerStrategies[provider];if (!strategy) {throw new Error('Invalid provider');@@ -275,7 +284,7 @@ class TTSService {[data, headers].forEach(this.removeUndefined.bind(this));- const options = { headers, responseType: stream ? 'stream' : 'arraybuffer' };+ const options = { headers, responseType: stream ? 'stream' : 'arraybuffer', ...requestOptions };applyAxiosProxyConfig(options, url);applySSRFSafeAgentIfDirect(options, url, allowedAddresses);@@ -315,6 +324,7 @@ class TTSService {const ttsSchema = appConfig?.speech?.tts?.[provider];const allowedAddresses = appConfig?.speech?.tts?.allowedAddresses;const voice = await this.getVoice(ttsSchema, requestVoice);+ const nextBudget = createSpeechBudget(appConfig, abortOnClose(res));if (text.length < 4096) {const response = await this.ttsRequest(@@ -322,6 +332,7 @@ class TTSService {ttsSchema,{ input: text, voice },allowedAddresses,+ nextBudget(),);pipeToResponse(response.data, res, (error) =>logAxiosError({ message: '[TTS] Audio stream failed:', error }),@@ -342,6 +353,7 @@ class TTSService {stream: true,},allowedAddresses,+ nextBudget(),);logger.debug(`[textToSpeech] user: ${req?.user?.id} | writing audio stream`);@@ -358,6 +370,7 @@ class TTSService {if (!res.headersSent) {return res.status(500).end();}+ res.destroy();return;}}@@ -393,6 +406,7 @@ class TTSService {const ttsSchema = appConfig?.speech?.tts?.[provider];const allowedAddresses = appConfig?.speech?.tts?.allowedAddresses;const voice = await this.getVoice(ttsSchema, req.body.voice);+ const nextBudget = createSpeechBudget(appConfig, abortOnClose(res));let shouldContinue = true;@@ -431,6 +445,7 @@ class TTSService {stream: true,},allowedAddresses,+ nextBudget(),);if (!shouldContinue) {diff --git a/api/server/services/Files/Audio/TTSService.spec.js b/api/server/services/Files/Audio/TTSService.spec.jsindex efe0d84591..87730faec2 100644--- a/api/server/services/Files/Audio/TTSService.spec.js+++ b/api/server/services/Files/Audio/TTSService.spec.js@@ -1,5 +1,7 @@jest.mock('axios');-jest.mock('@librechat/data-schemas', () => ({ logger: { warn: jest.fn(), error: jest.fn() } }));+jest.mock('@librechat/data-schemas', () => ({+ logger: { warn: jest.fn(), error: jest.fn(), debug: jest.fn() },+}));jest.mock('@librechat/api', () => ({genAzureEndpoint: jest.fn(),logAxiosError: jest.fn(),@@ -8,6 +10,8 @@ jest.mock('@librechat/api', () => ({capSpeechInput: jest.requireActual('@librechat/api').capSpeechInput,pipeSegment: jest.fn(),pipeToResponse: jest.fn(),+ abortOnClose: jest.requireActual('@librechat/api').abortOnClose,+ createSpeechBudget: jest.requireActual('@librechat/api').createSpeechBudget,}));jest.mock('librechat-data-provider', () => ({/** Real constants: `validateTTSInput` comes from the built `@librechat/api`, which reads them. */@@ -116,7 +120,12 @@ describe('TTSService input cap', () => {const service = new TTSService();jest.spyOn(service, 'getVoice').mockResolvedValue('alloy');const ttsRequest = jest.spyOn(service, 'ttsRequest').mockResolvedValue({ data: {} });- const res = { status: jest.fn().mockReturnThis(), send: jest.fn(), setHeader: jest.fn() };+ const res = {+ status: jest.fn().mockReturnThis(),+ send: jest.fn(),+ setHeader: jest.fn(),+ once: jest.fn(),+ };await service.processTextToSpeech({@@ -136,7 +145,12 @@ describe('TTSService input cap', () => {it('refuses a non-text body before calling any provider', async () => {const service = new TTSService();const ttsRequest = jest.spyOn(service, 'ttsRequest');- const res = { status: jest.fn().mockReturnThis(), send: jest.fn(), setHeader: jest.fn() };+ const res = {+ status: jest.fn().mockReturnThis(),+ send: jest.fn(),+ setHeader: jest.fn(),+ once: jest.fn(),+ };await service.processTextToSpeech({@@ -151,3 +165,43 @@ describe('TTSService input cap', () => {expect(ttsRequest).not.toHaveBeenCalled();});});++describe('TTSService chunked speech deadlines', () => {+ it('gives each chunk its own deadline and destroys a started response when a later chunk fails', async () => {+ const { pipeSegment } = require('@librechat/api');+ const { splitTextIntoChunks } = require('./streamAudio');+ const service = new TTSService();+ jest.spyOn(service, 'getVoice').mockResolvedValue('alloy');+ splitTextIntoChunks.mockReturnValue([+ { text: 'first', isFinished: false },+ { text: 'second', isFinished: true },+ ]);+ const ttsRequest = jest+ .spyOn(service, 'ttsRequest')+ .mockResolvedValueOnce({ data: {} })+ .mockRejectedValueOnce(new Error('Exceeded timeouts.speechMs'));+ pipeSegment.mockResolvedValue(undefined);+ const res = {+ headersSent: true,+ status: jest.fn().mockReturnThis(),+ send: jest.fn(),+ setHeader: jest.fn(),+ once: jest.fn(),+ destroy: jest.fn(),+ };++ await service.processTextToSpeech(+ {+ body: { input: 'a'.repeat(5000) },+ config: {+ speech: { tts: { maxInputChars: 6000, openai: { apiKey: 'sk', model: 'tts-1' } } },+ },+ },+ res,+ );++ expect(ttsRequest).toHaveBeenCalledTimes(2);+ expect(ttsRequest.mock.calls[0][4].signal).not.toBe(ttsRequest.mock.calls[1][4].signal);+ expect(res.destroy).toHaveBeenCalledTimes(1);+ });+});diff --git a/api/server/services/Files/Audio/speechSSRF.spec.js b/api/server/services/Files/Audio/speechSSRF.spec.jsindex 3279dc69bf..4945c5b1a5 100644--- a/api/server/services/Files/Audio/speechSSRF.spec.js+++ b/api/server/services/Files/Audio/speechSSRF.spec.js@@ -65,6 +65,7 @@ describe('TTS textToSpeech SSRF guard (real agent)', () => {headersSent: false,status: jest.fn(() => ({ end: jest.fn(), send: jest.fn() })),end: jest.fn(),+ once: jest.fn(),};return { req, res };}diff --git a/api/server/services/Files/Firebase/crud.js b/api/server/services/Files/Firebase/crud.jsindex 997f871f88..3153e66727 100644--- a/api/server/services/Files/Firebase/crud.js+++ b/api/server/services/Files/Firebase/crud.js@@ -10,6 +10,7 @@ const {getFirebaseStorage,assertRemoteFileURL,getSafeErrorMetadata,+ getOutboundTimeoutMs,getRemoteFileFetchMaxBytes,getRemoteFileFetchTimeoutMs,assertRemoteFileContentLength,@@ -218,11 +219,11 @@ async function uploadFileToFirebase({ req, file, file_id }) {/*** Retrieves a readable stream for a file from Firebase storage.*- * @param {ServerRequest} _req+ * @param {ServerRequest} req* @param {string} filepath - The filepath.* @returns {Promise<ReadableStream>} A readable stream of the file.*/-async function getFirebaseFileStream(_req, filepath, { signal } = {}) {+async function getFirebaseFileStream(req, filepath, { signal } = {}) {try {const storage = getFirebaseStorage();if (!storage) {@@ -233,6 +234,8 @@ async function getFirebaseFileStream(_req, filepath, { signal } = {}) {method: 'get',url: filepath,responseType: 'stream',+ /** Idle socket time only: a long download that keeps flowing is not cut off. */+ timeout: getOutboundTimeoutMs(req?.config, 'imageFetchMs'),signal,});diff --git a/api/server/utils/__tests__/sendEmail.spec.js b/api/server/utils/__tests__/sendEmail.spec.jsindex ce29d427c4..d9d37fa433 100644--- a/api/server/utils/__tests__/sendEmail.spec.js+++ b/api/server/utils/__tests__/sendEmail.spec.js@@ -9,6 +9,7 @@ jest.mock('@librechat/api', () => ({logAxiosError: jest.fn(),isEnabled: jest.fn((val) => val === 'true' || val === true),readFileAsString: jest.fn(),+ serviceRequestBudget: jest.fn(() => ({ timeout: 10000 })),}));const savedEnv = { ...process.env };@@ -52,6 +53,7 @@ function loadSendEmail() {logAxiosError: jest.fn(),isEnabled: jest.fn((val) => val === 'true' || val === true),readFileAsString: jest.fn().mockResolvedValue({ content: '<p>{{name}}</p>' }),+ serviceRequestBudget: jest.fn(() => ({ timeout: 10000 })),}));return require('../sendEmail');}diff --git a/api/server/utils/sendEmail.js b/api/server/utils/sendEmail.jsindex 33ba97fe80..6feb1d117c 100644--- a/api/server/utils/sendEmail.js+++ b/api/server/utils/sendEmail.js@@ -4,7 +4,12 @@ const FormData = require('form-data');const nodemailer = require('nodemailer');const handlebars = require('handlebars');const { logger } = require('@librechat/data-schemas');-const { logAxiosError, isEnabled, readFileAsString } = require('@librechat/api');+const {+ isEnabled,+ logAxiosError,+ readFileAsString,+ serviceRequestBudget,+} = require('@librechat/api');/*** Sends an email using Mailgun API.@@ -36,6 +41,7 @@ const sendEmailViaMailgun = async ({ to, from, subject, html }) => {try {const response = await axios.post(`${mailgunHost}/v3/${mailgunDomain}/messages`, formData, {+ ...serviceRequestBudget(),headers: {...formData.getHeaders(),Authorization: `Basic ${Buffer.from(`api:${mailgunApiKey}`).toString('base64')}`,diff --git a/e2e/setup/fake-rag-server.js b/e2e/setup/fake-rag-server.jsindex 8fdaf5a94f..47af262056 100644--- a/e2e/setup/fake-rag-server.js+++ b/e2e/setup/fake-rag-server.js@@ -22,7 +22,7 @@* checks persist like real vectors until `DELETE /documents` removes them.** `POST /__debug/stall` with `{ stall: true }` records file_search queries but never- * answers them, standing in for a hung RAG API; reset or `{ stall: false }` clears it.+ * answers them or `DELETE /documents`, standing in for a hung RAG API; reset or `{ stall: false }` clears it.*/const http = require('http');@@ -140,6 +140,9 @@ async function handleQuery(req, res) {async function handleDeleteDocuments(req, res) {const body = await readJson(req);+ if (stallQueries) {+ return;+ }if (Array.isArray(body)) {const ids = body.map(String);deleted.push(...ids);diff --git a/e2e/specs/mock/scenarios/rag-timeout.spec.ts b/e2e/specs/mock/scenarios/rag-timeout.spec.tsindex 02513edf34..0e12683a0a 100644--- a/e2e/specs/mock/scenarios/rag-timeout.spec.ts+++ b/e2e/specs/mock/scenarios/rag-timeout.spec.ts@@ -5,10 +5,14 @@ import {NEW_CHAT_PATH,RAG_API_BASE,uniqueName,+ requestJson,+ getAccessToken,getRagQueries,+ getRagEmbedded,enableFileSearch,resetProvisioning,selectMockEndpoint,+ uploadViaLegacyOption,uploadViaUnifiedButton,sendMessageAndWaitForCompletion,} from '../helpers';@@ -52,3 +56,65 @@ test.describe('outbound timeouts', () => {expect(Date.now() - startedAt).toBeLessThan(60_000);});});++test.describe('outbound timeouts on file deletion', () => {+ test.afterEach(async ({ request }) => {+ await request.post(`${RAG_API_BASE}/__debug/stall`, { data: { stall: false } });+ });++ /* The e2e config sets timeouts.ragMs to 3s; a RAG API that never answers the vector delete+ used to hold the delete request open, and now the delete fails once the budget runs out+ while the file stays in place. */+ test('deleting a file against a stalled RAG API fails within the budget @scenario:stalled-rag-delete-fails-fast', async ({+ page,+ request,+ }) => {+ test.setTimeout(120_000);+ await page.goto(NEW_CHAT_PATH, { timeout: 10_000 });+ await selectMockEndpoint(page, MOCK_ENDPOINTS[1]);+ await resetProvisioning(page);+ await enableFileSearch(page);++ const fileName = `${uniqueName('stalled-delete')}.csv`;+ const upload = await uploadViaLegacyOption(page, 'Upload for File Search', {+ name: fileName,+ mimeType: 'text/csv',+ content: 'k,v\nfoo,bar\n',+ });+ expect(upload.ok()).toBeTruthy();+ const uploaded = (await upload.json()) as UploadedFile & { filepath?: string };+ const fileId = uploaded.file_id ?? '';+ await expect+ .poll(async () => (await getRagEmbedded(page)).some((entry) => entry.file_id === fileId), {+ timeout: 15_000,+ })+ .toBe(true);++ const stall = await request.post(`${RAG_API_BASE}/__debug/stall`, { data: { stall: true } });+ expect(stall.ok()).toBeTruthy();++ const token = await getAccessToken(page);+ const startedAt = Date.now();+ await page.evaluate(+ async ({ accessToken, file }) => {+ await fetch('/api/files', {+ method: 'DELETE',+ credentials: 'include',+ headers: { Authorization: `Bearer ${accessToken}`, 'Content-Type': 'application/json' },+ body: JSON.stringify({ files: [file] }),+ });+ },+ {+ accessToken: token,+ file: { file_id: fileId, filepath: uploaded.filepath, embedded: true },+ },+ );+ expect(Date.now() - startedAt).toBeLessThan(30_000);++ const listed = await requestJson<Array<{ file_id: string }>>(page, {+ path: '/api/files',+ token,+ });+ expect(listed.some((file) => file.file_id === fileId)).toBe(true);+ });+});diff --git a/librechat.example.yaml b/librechat.example.yamlindex c0bab9b61f..d77eea84f9 100644--- a/librechat.example.yaml+++ b/librechat.example.yaml@@ -569,6 +569,9 @@ registration:# actionsMs: 300000 # each action (OpenAPI tool) HTTP call# moderationMs: 10000 # the OpenAI moderation check before a chat turn# imageFetchMs: 30000 # fetching a stored image to encode it for a provider+# toolsMs: 60000 # each call a built-in tool makes to its API (weather, Wolfram, web search)+# speechMs: 300000 # each text-to-speech or speech-to-text provider request+# imageGenerationMs: 300000 # each Stable Diffusion image generation request# Newest violations kept per user in the general violation log.# violationLog:diff --git a/packages/api/src/app/checks.ts b/packages/api/src/app/checks.tsindex 97eff08639..9a4d50a8fa 100644--- a/packages/api/src/app/checks.ts+++ b/packages/api/src/app/checks.ts@@ -18,6 +18,7 @@ import {getCredentialRuntimeState,getLegacyCredentialNames,} from '~/credentials';+import { SERVICE_REQUEST_TIMEOUT_MS } from '~/utils/timeouts';import { isEnabled, checkEmailConfig } from '~/utils';import { configureHashPool } from '~/auth/hashing';import { handleRateLimits } from './limits';@@ -269,7 +270,9 @@ export async function checkCredentialDatabase(): Promise<void> {*/export async function checkHealth(): Promise<void> {try {- const response = await fetch(`${process.env.RAG_API_URL}/health`);+ const response = await fetch(`${process.env.RAG_API_URL}/health`, {+ signal: AbortSignal.timeout(SERVICE_REQUEST_TIMEOUT_MS),+ });if (response?.ok && response?.status === 200) {logger.info(`RAG API is running and reachable at ${process.env.RAG_API_URL}.`);}diff --git a/packages/api/src/app/loader.spec.ts b/packages/api/src/app/loader.spec.tsindex 216fc257ac..b6dff512dc 100644--- a/packages/api/src/app/loader.spec.ts+++ b/packages/api/src/app/loader.spec.ts@@ -238,3 +238,43 @@ describe('createCustomConfigLoader policy links', () => {expect(warn).not.toHaveBeenCalled();});});++describe('createCustomConfigLoader remote fetch failures', () => {+ const originalConfigPath = process.env.CONFIG_PATH;++ beforeEach(() => {+ process.env.CONFIG_PATH = 'https://config.example/librechat.yaml';+ jest.spyOn(logger, 'error').mockImplementation(() => logger);+ });++ afterEach(() => {+ jest.restoreAllMocks();+ if (originalConfigPath === undefined) {+ delete process.env.CONFIG_PATH;+ } else {+ process.env.CONFIG_PATH = originalConfigPath;+ }+ });++ const loaderFor = (error: unknown) =>+ createCustomConfigLoader({+ loadLocal: loadYaml,+ defaultConfigPath: fixture('valid'),+ redactConfig: (config: TCustomConfig) => config,+ fetchRemote: async () => {+ throw error;+ },+ });++ it('fails startup when the remote config fetch times out', async () => {+ const timeout = Object.assign(new Error('timeout of 10000ms exceeded'), {+ code: 'ECONNABORTED',+ });+ await expect(loaderFor(timeout)()).rejects.toThrow(/Timed out fetching the remote config/);+ });++ it('keeps returning null for other remote fetch failures', async () => {+ const refused = Object.assign(new Error('connect ECONNREFUSED'), { code: 'ECONNREFUSED' });+ await expect(loaderFor(refused)()).resolves.toBeNull();+ });+});diff --git a/packages/api/src/app/loader.ts b/packages/api/src/app/loader.tsindex b3fd1885d1..58b6ca0779 100644--- a/packages/api/src/app/loader.ts+++ b/packages/api/src/app/loader.ts@@ -11,6 +11,7 @@ import {import type { TCustomConfig, TEndpoint } from 'librechat-data-provider';import type { ConfigOverrideIssue } from '@librechat/data-schemas';import type { ZodIssue } from 'zod';+import { serviceRequestBudget } from '~/utils/timeouts';import { checkConfigPolicyLinks } from './interface';import { expandCustomEndpoint } from './params';import { checkConfigTheme } from './theme';@@ -118,12 +119,28 @@ function reportThemeCheck(configPath: string, errors: string[], warnings: string}}+/** Whether `error` is the service request budget running out, not a refused or failed fetch. */+function isFetchTimeout(error: unknown): boolean {+ const { code, name, config } = (error ?? {}) as {+ code?: unknown;+ name?: unknown;+ config?: { signal?: { reason?: { name?: unknown } } };+ };+ return (+ code === 'ECONNABORTED' ||+ code === 'ETIMEDOUT' ||+ name === 'TimeoutError' ||+ config?.signal?.reason?.name === 'TimeoutError'+ );+}+/** Creates one process-local custom-config reader. */export function createCustomConfigLoader({defaultConfigPath,loadLocal,redactConfig,- fetchRemote = async (configPath: string): Promise<unknown> => (await axios.get(configPath)).data,+ fetchRemote = async (configPath: string): Promise<unknown> =>+ (await axios.get(configPath, serviceRequestBudget())).data,}: CustomConfigLoaderOptions): (printConfig?: boolean,options?: CustomConfigLoadOptions,@@ -171,6 +188,12 @@ export function createCustomConfigLoader({try {loadedConfig = await fetchRemote(configPath);} catch (error) {+ if (isFetchTimeout(error)) {+ /** Booting on defaults would drop policy such as `registration.allowedDomains`. */+ throw new Error(`Timed out fetching the remote config file from ${configPath}`, {+ cause: error,+ });+ }return failSourceLoad(`Failed to fetch the remote config file from ${configPath}`, error);}} else {diff --git a/packages/api/src/auth/googleRefresh.ts b/packages/api/src/auth/googleRefresh.tsindex d2ea438bfb..6fce945d63 100644--- a/packages/api/src/auth/googleRefresh.ts+++ b/packages/api/src/auth/googleRefresh.ts@@ -1,10 +1,9 @@import { Types } from 'mongoose';import { logger } from '@librechat/data-schemas';-import type { IUser } from '@librechat/data-schemas';import type { FilterQuery } from 'mongoose';import type { AdminExchangeResponse } from '~/auth/exchange';-+import { SERVICE_REQUEST_TIMEOUT_MS } from '~/utils/timeouts';import { serializeUserForExchange } from '~/auth/exchange';import { AdminRefreshError } from '~/auth/refresh';@@ -69,6 +68,7 @@ async function resolveSubFromUserinfo(accessToken: string): Promise<string | undtry {const response = await fetch(GOOGLE_USERINFO_ENDPOINT, {headers: { Authorization: `Bearer ${accessToken}` },+ signal: AbortSignal.timeout(SERVICE_REQUEST_TIMEOUT_MS),});if (!response.ok) {logger.warn('[admin/oauth/refresh] userinfo fallback returned non-OK', {@@ -100,6 +100,7 @@ async function fetchGoogleTokenset(try {response = await fetch(GOOGLE_TOKEN_ENDPOINT, {method: 'POST',+ signal: AbortSignal.timeout(SERVICE_REQUEST_TIMEOUT_MS),headers: { 'Content-Type': 'application/x-www-form-urlencoded' },body: new URLSearchParams({client_id: options.clientId,diff --git a/packages/api/src/files/rag.spec.ts b/packages/api/src/files/rag.spec.tsindex 329391869a..6204ed2408 100644--- a/packages/api/src/files/rag.spec.ts+++ b/packages/api/src/files/rag.spec.ts@@ -45,6 +45,47 @@ describe('deleteRagFile', () => {});describe('when file is embedded and RAG_API_URL is configured', () => {+ it('bounds the request by the default RAG budget', async () => {+ mockedAxios.delete.mockResolvedValueOnce({ status: 200 });++ await deleteRagFile({+ fileConfig: { vectorOwnershipTrackingStart: '2026-10-19T00:00:00.000Z' },+ userId: 'user123',+ file: {+ file_id: 'file-123',+ embedded: true,+ embeddingOwnersComplete: true,+ embeddingOwnersTrackedAt: '2026-10-20T00:00:00.000Z',+ },+ });++ expect(mockedAxios.delete).toHaveBeenCalledWith(+ 'http://localhost:8000/documents',+ expect.objectContaining({ timeout: 30_000, signal: expect.any(AbortSignal) }),+ );+ });++ it('honors the configured RAG budget', async () => {+ mockedAxios.delete.mockResolvedValueOnce({ status: 200 });++ await deleteRagFile({+ fileConfig: { vectorOwnershipTrackingStart: '2026-10-19T00:00:00.000Z' },+ timeouts: { ragMs: 1_234 },+ userId: 'user123',+ file: {+ file_id: 'file-123',+ embedded: true,+ embeddingOwnersComplete: true,+ embeddingOwnersTrackedAt: '2026-10-20T00:00:00.000Z',+ },+ });++ expect(mockedAxios.delete).toHaveBeenCalledWith(+ 'http://localhost:8000/documents',+ expect.objectContaining({ timeout: 1_234 }),+ );+ });+it('should delete the document from RAG API successfully', async () => {const file = {file_id: 'file-123',@@ -69,6 +110,9 @@ describe('deleteRagFile', () => {accept: 'application/json',},data: ['file-123'],+ timeout: 30_000,+ timeoutErrorMessage: expect.stringContaining('timeouts.ragMs'),+ signal: expect.any(AbortSignal),});});@@ -319,6 +363,15 @@ describe('createVectorFileDeleter receipts', () => {);});+ it('bounds the delete by the configured RAG budget', async () => {+ mockedAxios.delete.mockResolvedValueOnce({ status: 200 });+ await setup()({ ...req, config: { timeouts: { ragMs: 1_234 } } }, file);+ expect(mockedAxios.delete).toHaveBeenCalledWith(+ 'https://rag.example/documents',+ expect.objectContaining({ timeout: 1_234, signal: expect.any(AbortSignal) }),+ );+ });+it('confirms an already absent vector copy through inventory', async () => {mockedAxios.delete.mockRejectedValueOnce({code: 'ERR_BAD_REQUEST',diff --git a/packages/api/src/files/rag.ts b/packages/api/src/files/rag.tsindex 33690b4520..2a5ff71b98 100644--- a/packages/api/src/files/rag.ts+++ b/packages/api/src/files/rag.ts@@ -1,7 +1,9 @@import axios from 'axios';import { logger } from '@librechat/data-schemas';import type { TFileConfig } from 'librechat-data-provider';+import type { AppConfig } from '@librechat/data-schemas';import type { AxiosInstance } from 'axios';+import { outboundRequestBudget, getOutboundTimeoutMs } from '~/utils/timeouts';import { createConcurrencyLimiter } from '~/utils/promise';import { generateShortLivedToken } from '~/crypto/jwt';import { getSafeErrorMetadata } from '~/utils/errors';@@ -9,6 +11,8 @@ import { getSafeErrorMetadata } from '~/utils/errors';interface DeleteRagFileParams {/** The user ID. Required for authentication. If not provided, the function returns false and logs an error. */userId: string;+ /** The `timeouts` block of the app config; the default RAG budget applies when absent. */+ timeouts?: AppConfig['timeouts'];fileConfig?: Pick<TFileConfig, 'vectorOwnershipTrackingStart' | 'vectorDeletionConcurrency'>;/** The file object. Must have `embedded` and `file_id` properties. */file: {@@ -30,6 +34,7 @@ interface DeleteRagFileParams {** @param params - The parameters object.* @param params.userId - The user ID for authentication.+ * @param params.timeouts - Configured outbound budgets; defaults apply when omitted.* @param params.file - The file object. Must have `embedded` and `file_id` properties.* @returns Returns true if deletion was successful or skipped, false if there was an error.*/@@ -37,6 +42,7 @@ export async function deleteRagFile({userId,file,fileConfig,+ timeouts,}: DeleteRagFileParams): Promise<boolean> {if (!file.embedded) return true;if (!userId) {@@ -50,7 +56,7 @@ export async function deleteRagFile({generateToken: generateShortLivedToken,ownershipTrackingStart: fileConfig?.vectorOwnershipTrackingStart,namespaceConcurrency: fileConfig?.vectorDeletionConcurrency,- })({ user: { id: userId } }, file);+ })({ user: { id: userId }, config: { timeouts } }, file);return deleted?.deleted === true;} catch (error) {logger.error('[deleteRagFile] Vector deletion was not confirmed', getSafeErrorMetadata(error));@@ -122,7 +128,7 @@ export function createVectorFileDeleter({namespaceConcurrency?: number;ownershipTrackingStart?: string;}): (- req: { user: { id: string } },+ req: { user: { id: string }; config?: Pick<AppConfig, 'timeouts'> },file: DeleteRagFileParams['file'],) => Promise<{ deleted: true } | undefined> {const limit = createConcurrencyLimiter(namespaceConcurrency);@@ -173,6 +179,7 @@ export function createVectorFileDeleter({...config,headers: headers(),data: [file.file_id],+ ...outboundRequestBudget(getOutboundTimeoutMs(req.config, 'ragMs'), 'ragMs'),});} catch (error) {// A 404 can mean a wrong scope. Only a successful inventory can establish absence,@@ -181,6 +188,7 @@ export function createVectorFileDeleter({const { data } = await httpClient.get<string[]>(`${baseUrl}/ids`, {...config,headers: headers(),+ ...outboundRequestBudget(getOutboundTimeoutMs(req.config, 'ragMs'), 'ragMs'),});if (!Array.isArray(data) ||diff --git a/packages/api/src/storage/local.ts b/packages/api/src/storage/local.tsindex 48a4775683..b34cc25901 100644--- a/packages/api/src/storage/local.ts+++ b/packages/api/src/storage/local.ts@@ -3,6 +3,7 @@ import crypto from 'node:crypto';import { EModelEndpoint } from 'librechat-data-provider';import { mkdir, copyFile, rename, unlink, writeFile } from 'fs/promises';import type { TFileConfig } from 'librechat-data-provider';+import type { AppConfig } from '@librechat/data-schemas';import { stripCacheBust } from './path';export interface LocalStoragePaths {@@ -18,7 +19,7 @@ interface LocalFile {interface LocalDeleteRequest {user: { id: string };- config: { paths: LocalStoragePaths; fileConfig?: TFileConfig };+ config: { paths: LocalStoragePaths; fileConfig?: TFileConfig; timeouts?: AppConfig['timeouts'] };}interface LocalFileDeleteDependencies {@@ -26,6 +27,7 @@ interface LocalFileDeleteDependencies {userId: string;file: LocalFile;fileConfig?: TFileConfig;+ timeouts?: AppConfig['timeouts'];}) => Promise<unknown>;logger: { warn: (...args: unknown[]) => void; error: (...args: unknown[]) => void };}@@ -52,6 +54,7 @@ export function createLocalFileDeleter({ deleteRagFile, logger }: LocalFileDeletuserId: ownerId,file,...(req.config.fileConfig ? { fileConfig: req.config.fileConfig } : {}),+ ...(req.config.timeouts ? { timeouts: req.config.timeouts } : {}),};if (!ownerId) throw new Error('Invalid file owner');const cleanFilepath = stripCacheBust(file.filepath);diff --git a/packages/api/src/storage/ownedBlobDelete.ts b/packages/api/src/storage/ownedBlobDelete.tsindex 455653f7c3..7a8944a300 100644--- a/packages/api/src/storage/ownedBlobDelete.ts+++ b/packages/api/src/storage/ownedBlobDelete.ts@@ -1,4 +1,5 @@import type { TFileConfig } from 'librechat-data-provider';+import type { AppConfig } from '@librechat/data-schemas';interface StoredBlobFile {filepath: string;@@ -13,6 +14,7 @@ interface OwnedBlobDeleteDependencies {userId: string;file: StoredBlobFile;fileConfig?: TFileConfig;+ timeouts?: AppConfig['timeouts'];}) => Promise<unknown>;}@@ -24,7 +26,10 @@ export function createOwnedBlobFileDeleter({deleteRagFile,}: OwnedBlobDeleteDependencies) {return async (- req: { user: { id: string }; config?: { fileConfig?: TFileConfig } },+ req: {+ user: { id: string };+ config?: { fileConfig?: TFileConfig; timeouts?: AppConfig['timeouts'] };+ },file: StoredBlobFile,): Promise<void> => {const ownerId = req.user.id;@@ -46,6 +51,7 @@ export function createOwnedBlobFileDeleter({userId: ownerId,file,...(req.config?.fileConfig ? { fileConfig: req.config.fileConfig } : {}),+ ...(req.config?.timeouts ? { timeouts: req.config.timeouts } : {}),})) === false) {throw new Error('Vector deletion was not confirmed');diff --git a/packages/api/src/storage/s3/crud.ts b/packages/api/src/storage/s3/crud.tsindex 099a46c68d..977447883d 100644--- a/packages/api/src/storage/s3/crud.ts+++ b/packages/api/src/storage/s3/crud.ts@@ -761,6 +761,7 @@ export async function deleteFileFromS3(userId: ownerId,file,...(req.config?.fileConfig ? { fileConfig: req.config.fileConfig } : {}),+ ...(req.config?.timeouts ? { timeouts: req.config.timeouts } : {}),};try {diff --git a/packages/api/src/utils/key.test.ts b/packages/api/src/utils/key.test.tsindex d5c061688e..08d5ed453c 100644--- a/packages/api/src/utils/key.test.ts+++ b/packages/api/src/utils/key.test.ts@@ -69,7 +69,10 @@ describe('loadServiceKey', () => {(axios.get as jest.Mock).mockResolvedValue({ data: mockServiceKey });const result = await loadServiceKey(url);- expect(axios.get).toHaveBeenCalledWith(url);+ expect(axios.get).toHaveBeenCalledWith(+ url,+ expect.objectContaining({ timeout: 10_000, signal: expect.any(AbortSignal) }),+ );expect(result).toEqual(mockServiceKey);});diff --git a/packages/api/src/utils/key.ts b/packages/api/src/utils/key.tsindex 2dcf9e6cc1..a0cae609bb 100644--- a/packages/api/src/utils/key.ts+++ b/packages/api/src/utils/key.ts@@ -2,6 +2,7 @@ import path from 'path';import axios from 'axios';import { logger } from '@librechat/data-schemas';import { ErrorTypes } from 'librechat-data-provider';+import { SERVICE_REQUEST_TIMEOUT_MS } from './timeouts';import { readFileAsString } from './files';export interface GoogleServiceKey {@@ -54,7 +55,10 @@ export async function loadServiceKey(keyPath: string): Promise<GoogleServiceKey// Check if it's a URLelse if (!serviceKey && /^https?:\/\//.test(keyPath)) {try {- const response = await axios.get(keyPath);+ const response = await axios.get(keyPath, {+ timeout: SERVICE_REQUEST_TIMEOUT_MS,+ signal: AbortSignal.timeout(SERVICE_REQUEST_TIMEOUT_MS),+ });serviceKey = response.data;} catch (error) {logger.error(`Failed to fetch the service key from URL: ${keyPath}`, error);diff --git a/packages/api/src/utils/streams.spec.ts b/packages/api/src/utils/streams.spec.tsindex a729a6a7e4..bba63f9424 100644--- a/packages/api/src/utils/streams.spec.ts+++ b/packages/api/src/utils/streams.spec.ts@@ -1,6 +1,6 @@import { logger } from '@librechat/data-schemas';import { PassThrough, Readable } from 'node:stream';-import { pipeSegment, pipeToResponse, isClientDisconnect } from './streams';+import { pipeSegment, abortOnClose, pipeToResponse, isClientDisconnect } from './streams';import { isAbortError } from './errors';import { logAxiosError } from './axios';@@ -165,3 +165,20 @@ describe('pipeSegment', () => {expect(res.destroyed).toBe(false);});});++describe('abortOnClose', () => {+ it('aborts with a client disconnect once the response closes', () => {+ const res = new PassThrough();+ const signal = abortOnClose(res);+ expect(signal.aborted).toBe(false);++ res.destroy();+ return new Promise<void>((resolve) =>+ res.once('close', () => {+ expect(signal.aborted).toBe(true);+ expect(isClientDisconnect(signal.reason)).toBe(true);+ resolve();+ }),+ );+ });+});diff --git a/packages/api/src/utils/streams.ts b/packages/api/src/utils/streams.tsindex 28c0da8667..6e6afb90c0 100644--- a/packages/api/src/utils/streams.ts+++ b/packages/api/src/utils/streams.ts@@ -113,3 +113,13 @@ export function pipeSegment(source.pipe(res, { end });});}++/**+ * A signal that aborts when the response closes, so an upstream request made for it stops once+ * the client is gone. A response that already finished is unaffected: nothing is left to cancel.+ */+export function abortOnClose(res: Pick<Writable, 'once'>): AbortSignal {+ const controller = new AbortController();+ res.once('close', () => controller.abort(new ClientDisconnectedError()));+ return controller.signal;+}diff --git a/packages/api/src/utils/timeouts.spec.ts b/packages/api/src/utils/timeouts.spec.tsindex c4c8143831..da18180567 100644--- a/packages/api/src/utils/timeouts.spec.ts+++ b/packages/api/src/utils/timeouts.spec.ts@@ -3,6 +3,10 @@ import {outboundTimeoutMessage,getOutboundTimeout,getOutboundTimeoutMs,+ toolRequestBudget,+ createSpeechBudget,+ serviceRequestBudget,+ SERVICE_REQUEST_TIMEOUT_MS,outboundRequestBudget,DEFAULT_OUTBOUND_TIMEOUTS_MS,} from './timeouts';@@ -127,3 +131,35 @@ describe('logAxiosError on a budget overrun', () => {error.mockRestore();});});++describe('toolRequestBudget', () => {+ it('defaults to the tools budget and honors the configured one', () => {+ expect(toolRequestBudget().timeout).toBe(DEFAULT_OUTBOUND_TIMEOUTS_MS.toolsMs);+ const budget = toolRequestBudget({ toolsMs: 2_000 });+ expect(budget.timeout).toBe(2_000);+ expect(budget.timeoutErrorMessage).toBe(outboundTimeoutMessage('toolsMs', 2_000));+ });+});++describe('createSpeechBudget', () => {+ it('starts a fresh deadline per request and shares the disconnect signal', () => {+ const close = new AbortController();+ const next = createSpeechBudget({ timeouts: { speechMs: 2_000 } }, close.signal);+ const first = next();+ const second = next();+ expect(first.timeout).toBe(2_000);+ expect(first.signal).not.toBe(second.signal);+ close.abort();+ expect(first.signal.aborted).toBe(true);+ expect(second.signal.aborted).toBe(true);+ expect(next().signal.aborted).toBe(true);+ });+});++describe('serviceRequestBudget', () => {+ it('bounds a request by the fixed service timeout with a fresh deadline', () => {+ const first = serviceRequestBudget();+ expect(first.timeout).toBe(SERVICE_REQUEST_TIMEOUT_MS);+ expect(first.signal).not.toBe(serviceRequestBudget().signal);+ });+});diff --git a/packages/api/src/utils/timeouts.ts b/packages/api/src/utils/timeouts.tsindex 990185853d..82242b3429 100644--- a/packages/api/src/utils/timeouts.ts+++ b/packages/api/src/utils/timeouts.ts@@ -7,8 +7,17 @@ export const DEFAULT_OUTBOUND_TIMEOUTS_MS = {actionsMs: 300_000,moderationMs: 10_000,imageFetchMs: 30_000,+ toolsMs: 60_000,+ speechMs: 300_000,+ imageGenerationMs: 300_000,} as const;+/**+ * Budget for calls made where no app config is in scope (startup, the config loader, auth+ * refresh, email delivery), so `timeouts` cannot reach them.+ */+export const SERVICE_REQUEST_TIMEOUT_MS = 10_000;+export type OutboundTimeout = keyof typeof DEFAULT_OUTBOUND_TIMEOUTS_MS;/** The `librechat.yaml` `timeouts` value for `key`, else its default. */@@ -67,3 +76,41 @@ export function getOutboundTimeout(error: unknown): Error | undefined {}return undefined;}++/** Budget for one call a built-in tool makes to its API, per `timeouts.toolsMs`. */+export function toolRequestBudget(+ timeouts?: AppConfig['timeouts'],+ signal?: AbortSignal,+): ReturnType<typeof outboundRequestBudget> {+ return outboundRequestBudget(getOutboundTimeoutMs({ timeouts }, 'toolsMs'), 'toolsMs', signal);+}++/**+ * Budget factory for speech providers, per `timeouts.speechMs`. Each call starts a fresh+ * deadline, so every provider request gets the full budget while `signal` (a client+ * disconnect) stays shared across them.+ */+export function createSpeechBudget(+ appConfig: Pick<AppConfig, 'timeouts'> | null | undefined,+ signal?: AbortSignal,+): () => ReturnType<typeof outboundRequestBudget> {+ const timeoutMs = getOutboundTimeoutMs(appConfig, 'speechMs');+ return () => outboundRequestBudget(timeoutMs, 'speechMs', signal);+}++/** Budget for one request under the configured (or default) `key` timeout. */+export function configuredRequestBudget(+ appConfig: Pick<AppConfig, 'timeouts'> | null | undefined,+ key: OutboundTimeout,+ signal?: AbortSignal,+): ReturnType<typeof outboundRequestBudget> {+ return outboundRequestBudget(getOutboundTimeoutMs(appConfig, key), key, signal);+}++/** Fixed budget for startup and auth requests made before app config exists. */+export function serviceRequestBudget(): { timeout: number; signal: AbortSignal } {+ return {+ timeout: SERVICE_REQUEST_TIMEOUT_MS,+ signal: AbortSignal.timeout(SERVICE_REQUEST_TIMEOUT_MS),+ };+}diff --git a/packages/data-provider/src/config.ts b/packages/data-provider/src/config.tsindex 81829127d6..4be333ce10 100644--- a/packages/data-provider/src/config.ts+++ b/packages/data-provider/src/config.ts@@ -2715,6 +2715,12 @@ export const outboundTimeoutsSchema = z.object({moderationMs: outboundTimeoutMs,/** Fetching a stored image by URL to encode it for a provider. */imageFetchMs: outboundTimeoutMs,+ /** Each call a built-in tool makes to its API (weather, Wolfram, web search). */+ toolsMs: outboundTimeoutMs,+ /** Each text-to-speech or speech-to-text provider request. */+ speechMs: outboundTimeoutMs,+ /** Each Stable Diffusion image generation request. */+ imageGenerationMs: outboundTimeoutMs,});/** Retention for the write-only GENERAL violation log kept per user. */