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: Separate Temporary and General Chat Retention (#15734)
Danny Avilaab6cde0c7923
diff --git a/api/app/clients/BaseClient.js b/api/app/clients/BaseClient.jsindex 0054f5b436..72b716a9b4 100644--- a/api/app/clients/BaseClient.js+++ b/api/app/clients/BaseClient.js@@ -1304,12 +1304,25 @@ class BaseClient {}const hasAddedConvo = options?.req?.body?.addedConvo != null;+ const req = options?.req;+ if (+ req?.config?.interfaceConfig?.retentionMode === 'all' &&+ req?.config?.interfaceConfig?.generalChatRetention !== undefined &&+ !Object.prototype.hasOwnProperty.call(req, 'resolvedConversation')+ ) {+ req.resolvedConversation = await db.getConvo(req.user.id, message.conversationId);+ }+ const hasResolvedConversation =+ req != null && Object.prototype.hasOwnProperty.call(req, 'resolvedConversation');+ const resolvedRetention = hasResolvedConversation ? req.resolvedConversation : null;const reqCtx = {- userId: options?.req?.user?.id,+ userId: req?.user?.id,isTemporary:- options?.req?._agentEventBindingRetention?.isTemporary ?? options?.req?.body?.isTemporary,- expiredAt: options?.req?._agentEventBindingRetention?.expiredAt,- interfaceConfig: options?.req?.config?.interfaceConfig,+ req?._agentEventBindingRetention?.isTemporary ??+ resolvedRetention?.isTemporary ??+ req?.body?.isTemporary,+ expiredAt: req?._agentEventBindingRetention?.expiredAt ?? resolvedRetention?.expiredAt,+ interfaceConfig: req?.config?.interfaceConfig,};const savedMessage = await db.saveMessage(reqCtx,@@ -1341,19 +1354,15 @@ class BaseClient {? createdAtOnInsert: undefined;- const req = options?.req;const skippedExistingConvoLookup = this.fetchedConvo === true;- const hasResolvedConversation =- req != null && Object.prototype.hasOwnProperty.call(req, 'resolvedConversation');let existingConvo = null;if (!skippedExistingConvoLookup && hasResolvedConversation) {existingConvo = req.resolvedConversation;} else if (!skippedExistingConvoLookup) {existingConvo = await db.getConvo(req?.user?.id, message.conversationId);}- if (hasResolvedConversation) {- delete req.resolvedConversation;- }+ // Keep the authenticated conversation available for response, abort, and retry saves.+ // fetchedConvo already prevents repeating the conversation initialization work.const shouldSetCreatedAtOnInsert = !skippedExistingConvoLookup && existingConvo == null;const unsetFields = {};@@ -1390,6 +1399,10 @@ class BaseClient {...(savedMessage?._id != null ? { appendMessageIds: [savedMessage._id] } : {}),});+ if (req != null && conversation != null) {+ req.resolvedConversation = conversation;+ }+return { message: savedMessage, conversation };}diff --git a/api/app/clients/specs/BaseClient.test.js b/api/app/clients/specs/BaseClient.test.jsindex 2197e0e54d..9caa0a06b0 100644--- a/api/app/clients/specs/BaseClient.test.js+++ b/api/app/clients/specs/BaseClient.test.js@@ -2017,9 +2017,11 @@ describe('BaseClient', () => {endpoint: 'openai',endpointType: 'openai',temperature: 0.7,+ isTemporary: true,+ expiredAt: new Date('2030-01-01T00:00:00.000Z'),};const user = { id: 'user-id' };- const req = { user, resolvedConversation: existingConvo };+ const req = { user, body: { isTemporary: false }, resolvedConversation: existingConvo };getConvo.mockClear();saveMessage.mockResolvedValue({ messageId: 'msg-1' });@@ -2039,7 +2041,15 @@ describe('BaseClient', () => {);expect(getConvo).not.toHaveBeenCalled();- expect(req).not.toHaveProperty('resolvedConversation');+ expect(saveMessage).toHaveBeenCalledWith(+ expect.objectContaining({+ isTemporary: true,+ expiredAt: existingConvo.expiredAt,+ }),+ expect.any(Object),+ expect.any(Object),+ );+ expect(req.resolvedConversation).toBe(existingConvo);expect(TestClient.fetchedConvo).toBe(true);expect(saveConvo).toHaveBeenCalledWith(expect.any(Object),@@ -2048,6 +2058,19 @@ describe('BaseClient', () => {unsetFields: expect.objectContaining({ temperature: 1 }),}),);+ await TestClient.saveMessageToDatabase(+ { messageId: 'response-1', conversationId: existingConvo.conversationId, text: 'reply' },+ { endpoint: 'openai' },+ user,+ );+ for (const save of [saveMessage, saveConvo]) {+ expect(save).toHaveBeenLastCalledWith(+ expect.objectContaining({ isTemporary: true, expiredAt: existingConvo.expiredAt }),+ expect.any(Object),+ expect.any(Object),+ );+ }+ expect(getConvo).not.toHaveBeenCalled();});test('userMessagePromise is awaited before saving response message', async () => {diff --git a/api/server/controllers/__tests__/tools.callTool.contentFilter.spec.js b/api/server/controllers/__tests__/tools.callTool.contentFilter.spec.jsindex 6eb4cac8f5..77f1205645 100644--- a/api/server/controllers/__tests__/tools.callTool.contentFilter.spec.js+++ b/api/server/controllers/__tests__/tools.callTool.contentFilter.spec.js@@ -25,7 +25,7 @@ jest.mock('~/models', () => ({createToolCall: mockCreateToolCall,getRoleByName: jest.fn(),getToolCallsByConvo: jest.fn(),- getMessage: jest.fn(async () => ({ messageId: 'message-id' })),+ getMessage: jest.fn(async () => ({ messageId: 'message-id', conversationId: 'conversation-id' })),}));jest.mock('~/server/services/Files/process', () => ({@@ -112,6 +112,65 @@ describe('callTool generated-content protection', () => {});});+ it('starts retention before tool invocation using the authenticated message conversation', async () => {+ const { getRetentionExpiry } = require('~/server/services/Files/retention');+ const { getMessage } = require('~/models');+ let resolveRetention;+ const expiredAt = new Date('2030-01-01T00:00:00.000Z');+ getMessage.mockResolvedValueOnce({+ messageId: 'message-id',+ conversationId: 'conversation-id',+ isTemporary: true,+ expiredAt,+ });+ getRetentionExpiry.mockImplementationOnce(+ () =>+ new Promise((resolve) => {+ resolveRetention = resolve;+ }),+ );+ mockInvoke.mockImplementationOnce(async () => {+ expect(getRetentionExpiry).toHaveBeenCalledTimes(1);+ resolveRetention({ expiredAt });+ return { content: 'safe output' };+ });+ const req = createRequest(undefined);+ req.body.conversationId = 'forged-conversation';+ const res = createResponse();+ await callTool(req, res);+ expect(req.body.conversationId).toBe('conversation-id');+ expect(req.fileRetentionSource).toEqual({ isTemporary: true, expiredAt });+ expect(mockCreateToolCall).toHaveBeenCalledWith(+ expect.objectContaining({+ conversationId: 'conversation-id',+ expiredAt,+ }),+ );+ expect(res.status).toHaveBeenCalledWith(200);+ });++ it('rejects an expired source message before loading or invoking a tool', async () => {+ const { getMessage } = require('~/models');+ const { loadTools } = require('~/app/clients/tools/util');+ const { getRetentionExpiry } = require('~/server/services/Files/retention');+ getMessage.mockResolvedValueOnce({+ messageId: 'message-id',+ conversationId: 'conversation-id',+ isTemporary: true,+ expiredAt: new Date(Date.now() - 1000),+ });+ const req = createRequest(undefined);+ req.body.isTemporary = false;+ const res = createResponse();+ await callTool(req, res);+ expect(res.status).toHaveBeenCalledWith(404);+ expect(loadTools).not.toHaveBeenCalled();+ expect(mockInvoke).not.toHaveBeenCalled();+ expect(getRetentionExpiry).not.toHaveBeenCalled();+ expect(mockCreateToolCall).not.toHaveBeenCalled();+ expect(mockProcessCodeOutput).not.toHaveBeenCalled();+ });+it('blocks a configured tool output before tool-call persistence', async () => {mockInvoke.mockResolvedValue({ content: 'BLOCK-OUTPUT' });const res = createResponse();diff --git a/api/server/controllers/agents/__tests__/request.resumeMetadata.spec.js b/api/server/controllers/agents/__tests__/request.resumeMetadata.spec.jsindex a264ea36df..1fc795a5cd 100644--- a/api/server/controllers/agents/__tests__/request.resumeMetadata.spec.js+++ b/api/server/controllers/agents/__tests__/request.resumeMetadata.spec.js@@ -4299,6 +4299,7 @@ describe('ResumableAgentController resume metadata', () => {userMessage: expect.objectContaining({ messageId: 'req-event:user' }),agentEventDeliveryKey: 'req-event',agentEventBindingId: 'binding-1',+ retentionExpiresAt: expiredAt.toISOString(),agentEventExpectedAction: {toolName: 'submit_move',argumentSubset: { gameId: 'game-1', expectedPly: 7 },diff --git a/api/server/controllers/agents/__tests__/resume.spec.js b/api/server/controllers/agents/__tests__/resume.spec.jsindex fdfe54ab97..014ea3fb84 100644--- a/api/server/controllers/agents/__tests__/resume.spec.js+++ b/api/server/controllers/agents/__tests__/resume.spec.js@@ -2961,6 +2961,33 @@ describe('ResumeAgentController (POST /agents/chat/resume)', () => {expect(capturedInit.files).toEqual([{ file_id: 'f1' }]);});+ it.each([false, true])('preserves the job deadline when re-pause=%s', async (rePause) => {+ const expiredAt = new Date('2030-01-01T00:00:00.000Z');+ mockGenerationJobManager.getJob.mockResolvedValue(+ makeToolApprovalJob({+ metadata: { isTemporary: true, retentionExpiresAt: expiredAt.toISOString() },+ }),+ );+ if (rePause) {+ mockInitializeClient.mockResolvedValue({+ client: makeClient({+ pendingApproval: { actionId: NEXT_ACTION_ID },+ contentParts: [{ type: 'text', text: 'partial' }],+ }),+ userMCPAuthMap: {},+ });+ }+ const res = await post(approveBody({ isTemporary: false }));+ expect(res.status).toBe(200);+ await settled;+ await flush();+ expect(mockSaveMessage).toHaveBeenCalledWith(+ expect.objectContaining({ isTemporary: true, expiredAt }),+ expect.anything(),+ expect.anything(),+ );+ });+it.each([{ stored: true, supplied: false, expected: true },{ stored: false, supplied: true, expected: false },diff --git a/api/server/controllers/agents/request.js b/api/server/controllers/agents/request.jsindex 274d5bed74..38cff1a1aa 100644--- a/api/server/controllers/agents/request.js+++ b/api/server/controllers/agents/request.js@@ -1,4 +1,4 @@-const { logger, tenantStorage } = require('@librechat/data-schemas');+const { logger, tenantStorage, createChatExpirationDate } = require('@librechat/data-schemas');const { v5: uuidv5 } = require('uuid');const {Constants,@@ -432,8 +432,12 @@ async function saveErrorTurn(const reqCtx = {userId,- isTemporary: req?._agentEventBindingRetention?.isTemporary ?? req?.body?.isTemporary,- expiredAt: req?._agentEventBindingRetention?.expiredAt,+ isTemporary:+ req?._agentEventBindingRetention?.isTemporary ??+ req?.resolvedConversation?.isTemporary ??+ req?.body?.isTemporary,+ expiredAt:+ req?._agentEventBindingRetention?.expiredAt ?? req?.resolvedConversation?.expiredAt,interfaceConfig: req?.config?.interfaceConfig,};const context = 'api/server/controllers/agents/request.js - failed turn';@@ -1583,7 +1587,24 @@ const ResumableAgentController = async (req, res, next, initializeClient, addTitagent_id: endpointOption.agent_id ?? req.body?.agent_id,// Persist temporary-chat state so a HITL resume keeps the resumed response// non-persisted instead of trusting the resume request to re-send the flag.- isTemporary: req._agentEventBindingRetention?.isTemporary ?? req.body?.isTemporary,+ isTemporary:+ req._agentEventBindingRetention?.isTemporary ??+ req.resolvedConversation?.isTemporary ??+ req.body?.isTemporary,+ ...((req._agentEventBindingRetention?.expiredAt ?? req.resolvedConversation?.expiredAt) !=+ null && {+ retentionExpiresAt: new Date(+ req._agentEventBindingRetention?.expiredAt ?? req.resolvedConversation.expiredAt,+ ).toISOString(),+ }),+ ...((req._agentEventBindingRetention?.expiredAt ?? req.resolvedConversation?.expiredAt) ==+ null &&+ req.config?.interfaceConfig?.retentionMode === 'all' && {+ retentionExpiresAt: createChatExpirationDate(+ req.config.interfaceConfig,+ req.resolvedConversation?.isTemporary ?? req.body?.isTemporary,+ ).toISOString(),+ }),...(agentEventDelivery != null && {agentEventDeliveryKey: agentEventDelivery.deliveryKey,...(internalDetachedCompletion == null@@ -1845,8 +1866,12 @@ const ResumableAgentController = async (req, res, next, initializeClient, addTitsaveMessage({userId,- isTemporary: req?._agentEventBindingRetention?.isTemporary ?? req?.body?.isTemporary,- expiredAt: req?._agentEventBindingRetention?.expiredAt,+ isTemporary:+ req?._agentEventBindingRetention?.isTemporary ??+ req?.resolvedConversation?.isTemporary ??+ req?.body?.isTemporary,+ expiredAt:+ req?._agentEventBindingRetention?.expiredAt ?? req?.resolvedConversation?.expiredAt,interfaceConfig: req?.config?.interfaceConfig,},partialMessage,@@ -2629,8 +2654,12 @@ const ResumableAgentController = async (req, res, next, initializeClient, addTit{userId,isTemporary:- req?._agentEventBindingRetention?.isTemporary ?? req?.body?.isTemporary,- expiredAt: req?._agentEventBindingRetention?.expiredAt,+ req?._agentEventBindingRetention?.isTemporary ??+ req?.resolvedConversation?.isTemporary ??+ req?.body?.isTemporary,+ expiredAt:+ req?._agentEventBindingRetention?.expiredAt ??+ req?.resolvedConversation?.expiredAt,interfaceConfig: req?.config?.interfaceConfig,},userMessage,@@ -2651,8 +2680,12 @@ const ResumableAgentController = async (req, res, next, initializeClient, addTit{userId,isTemporary:- req?._agentEventBindingRetention?.isTemporary ?? req?.body?.isTemporary,- expiredAt: req?._agentEventBindingRetention?.expiredAt,+ req?._agentEventBindingRetention?.isTemporary ??+ req?.resolvedConversation?.isTemporary ??+ req?.body?.isTemporary,+ expiredAt:+ req?._agentEventBindingRetention?.expiredAt ??+ req?.resolvedConversation?.expiredAt,interfaceConfig: req?.config?.interfaceConfig,},{@@ -2830,8 +2863,12 @@ const ResumableAgentController = async (req, res, next, initializeClient, addTit// where client refetch happens before database is updatedconst reqCtx = {userId: req?.user?.id,- isTemporary: req?._agentEventBindingRetention?.isTemporary ?? req?.body?.isTemporary,- expiredAt: req?._agentEventBindingRetention?.expiredAt,+ isTemporary:+ req?._agentEventBindingRetention?.isTemporary ??+ req?.resolvedConversation?.isTemporary ??+ req?.body?.isTemporary,+ expiredAt:+ req?._agentEventBindingRetention?.expiredAt ?? req?.resolvedConversation?.expiredAt,interfaceConfig: req?.config?.interfaceConfig,};const terminalMemoryContext = {diff --git a/api/server/controllers/agents/responses.js b/api/server/controllers/agents/responses.jsindex 58bc81925e..7b8ff642f6 100644--- a/api/server/controllers/agents/responses.js+++ b/api/server/controllers/agents/responses.js@@ -449,7 +449,8 @@ async function saveConversation(req, conversationId, agentId, agent) {await db.saveConvo({userId: req?.user?.id,- isTemporary: req?.body?.isTemporary,+ isTemporary: req?.resolvedConversation?.isTemporary ?? req?.body?.isTemporary,+ expiredAt: req?.resolvedConversation?.expiredAt,interfaceConfig: req?.config?.interfaceConfig,},{diff --git a/api/server/controllers/agents/resume.js b/api/server/controllers/agents/resume.jsindex 44101537da..dbdf2d24a1 100644--- a/api/server/controllers/agents/resume.js+++ b/api/server/controllers/agents/resume.js@@ -312,7 +312,9 @@ async function persistRePauseProgress({ req, client, job, streamId, conversation{userId,isTemporary: meta.isTemporary ?? req.body?.isTemporary,- expiredAt: req._agentEventBindingRetention?.expiredAt,+ expiredAt:+ req._agentEventBindingRetention?.expiredAt ??+ (meta.retentionExpiresAt ? new Date(meta.retentionExpiresAt) : undefined),interfaceConfig: req?.config?.interfaceConfig,},{@@ -535,7 +537,9 @@ async function finalizeResumedTurn({{userId,isTemporary,- expiredAt: req._agentEventBindingRetention?.expiredAt,+ expiredAt:+ req._agentEventBindingRetention?.expiredAt ??+ (meta.retentionExpiresAt ? new Date(meta.retentionExpiresAt) : undefined),interfaceConfig: req?.config?.interfaceConfig,},responseMessage,diff --git a/api/server/controllers/tools.js b/api/server/controllers/tools.jsindex ac59da27e4..9efa44f41d 100644--- a/api/server/controllers/tools.js+++ b/api/server/controllers/tools.js@@ -5,6 +5,8 @@ const {assertDirectToolOutputAllowed,loadWebSearchAuth,isContentFilterError,+ isActiveExpirationDate,+ getConversationExpirationDate,} = require('@librechat/api');const {Tools,@@ -115,7 +117,7 @@ const callTool = async (req, res) => {return;}- const { partIndex, blockIndex, messageId, conversationId, ...args } = req.body;+ const { partIndex, blockIndex, messageId, conversationId: _conversationId, ...args } = req.body;if (!messageId) {logger.warn(`[${toolId}/call] User ${req.user.id} attempted call without message ID`);res.status(400).json({ message: 'Message ID required' });@@ -123,11 +125,19 @@ const callTool = async (req, res) => {}const message = await getMessage({ user: req.user.id, messageId });- if (!message) {+ const sourceExpiration = getConversationExpirationDate(message);+ if (!message || (sourceExpiration != null && !isActiveExpirationDate(sourceExpiration))) {logger.debug(`[${toolId}/call] User ${req.user.id} attempted call with invalid message ID`);res.status(404).json({ message: 'Message not found' });return;}+ const conversationId = message.conversationId;+ req.body.conversationId = conversationId;+ req.fileRetentionSource = {+ isTemporary: message.isTemporary,+ expiredAt: message.expiredAt,+ };+ const retentionExpiryPromise = getRetentionExpiry(req);logger.debug(`[${toolId}/call] User: ${req.user.id}`);let hasAccess = true;if (toolAccessPermType[toolId]) {@@ -186,7 +196,7 @@ const callTool = async (req, res) => {conversationId,result: content,user: req.user.id,- ...(await getRetentionExpiry(req)),+ ...(await retentionExpiryPromise),};if (!hasGeneratedArtifacts) {diff --git a/api/server/middleware/abortMiddleware.js b/api/server/middleware/abortMiddleware.jsindex 1f78c5eb54..76c9cb1f07 100644--- a/api/server/middleware/abortMiddleware.js+++ b/api/server/middleware/abortMiddleware.js@@ -152,7 +152,8 @@ async function abortMessage(req, res) {await db.saveMessage({userId: req?.user?.id,- isTemporary: req?.body?.isTemporary,+ isTemporary: req?.resolvedConversation?.isTemporary ?? req?.body?.isTemporary,+ expiredAt: req?.resolvedConversation?.expiredAt,interfaceConfig: req?.config?.interfaceConfig,},{ ...responseMessage, user: userId },diff --git a/api/server/middleware/denyRequest.js b/api/server/middleware/denyRequest.jsindex 86054d0a23..521603a6d9 100644--- a/api/server/middleware/denyRequest.js+++ b/api/server/middleware/denyRequest.js@@ -45,7 +45,8 @@ const denyRequest = async (req, res, errorMessage) => {await saveMessage({userId: req?.user?.id,- isTemporary: req?.body?.isTemporary,+ isTemporary: req?.resolvedConversation?.isTemporary ?? req?.body?.isTemporary,+ expiredAt: req?.resolvedConversation?.expiredAt,interfaceConfig: req?.config?.interfaceConfig,},{ ...userMessage, user: req.user.id },diff --git a/api/server/middleware/error.js b/api/server/middleware/error.jsindex 5fa3562c30..ceb7c90b74 100644--- a/api/server/middleware/error.js+++ b/api/server/middleware/error.js@@ -50,7 +50,8 @@ const sendError = async (req, res, options, callback) => {await saveMessage({userId: req?.user?.id,- isTemporary: req?.body?.isTemporary,+ isTemporary: req?.resolvedConversation?.isTemporary ?? req?.body?.isTemporary,+ expiredAt: req?.resolvedConversation?.expiredAt,interfaceConfig: req?.config?.interfaceConfig,},{ ...errorMessage, user },diff --git a/api/server/middleware/validate/convoAccess.js b/api/server/middleware/validate/convoAccess.jsindex 929b43dc1e..3cb81dcadf 100644--- a/api/server/middleware/validate/convoAccess.js+++ b/api/server/middleware/validate/convoAccess.js@@ -37,6 +37,7 @@ const validateConvoAccess = async (req, res, next) => {const conversationId = getConversationId(req.body);if (!conversationId || conversationId === Constants.NEW_CONVO) {+ req.resolvedConversation = null;return next();}@@ -47,7 +48,12 @@ const validateConvoAccess = async (req, res, next) => {try {if (cache) {const cachedAccess = await cache.get(key);- if (cachedAccess === 'authorized') {+ // An access marker contains no retention policy. Resolve it once at admission+ // when independent deadlines are active, then reuse the document downstream.+ const needsRetention =+ req.config?.interfaceConfig?.retentionMode === 'all' &&+ req.config.interfaceConfig.generalChatRetention !== undefined;+ if (cachedAccess === 'authorized' && !needsRetention) {return next();}}diff --git a/api/server/middleware/validate/convoAccess.spec.js b/api/server/middleware/validate/convoAccess.spec.jsindex 49a751e7eb..e9616edae1 100644--- a/api/server/middleware/validate/convoAccess.spec.js+++ b/api/server/middleware/validate/convoAccess.spec.js@@ -43,6 +43,8 @@ describe('validateConvoAccess', () => {endpoint: 'agents',title: 'Owned conversation',files: ['file-1', 'file-2'],+ isTemporary: true,+ expiredAt: new Date('2030-01-01T00:00:00.000Z'),messages: Array.from({ length: 50 }, () => new mongoose.Types.ObjectId()),});});@@ -123,4 +125,34 @@ describe('validateConvoAccess', () => {expect(require('~/cache').getLogStores).toHaveBeenCalledWith(ViolationTypes.CONVO_ACCESS);findOne.mockRestore();});++ it('resolves stored retention on an authorization cache hit despite a forged flag', async () => {+ mockCache.get.mockResolvedValue('authorized');+ const findOne = jest.spyOn(Conversation, 'findOne');+ const req = createRequest(OWNER_ID, CONVERSATION_ID);+ req.body.isTemporary = false;+ req.config = { interfaceConfig: { retentionMode: 'all', generalChatRetention: 2160 } };+ await validateConvoAccess(req, res, next);+ expect(next).toHaveBeenCalledTimes(1);+ expect(req.resolvedConversation).toMatchObject({+ isTemporary: true,+ expiredAt: new Date('2030-01-01T00:00:00.000Z'),+ });+ expect(findOne).toHaveBeenCalledTimes(1);+ findOne.mockRestore();+ });++ it.each([undefined, 'new'])(+ 'marks a known-new conversation %s resolved without reading',+ async (conversationId) => {+ const findOne = jest.spyOn(Conversation, 'findOne');+ const req = createRequest(OWNER_ID, conversationId);+ req.config = { interfaceConfig: { retentionMode: 'all', generalChatRetention: 2160 } };+ await validateConvoAccess(req, res, next);+ expect(req.resolvedConversation).toBeNull();+ expect(next).toHaveBeenCalledTimes(1);+ expect(findOne).not.toHaveBeenCalled();+ findOne.mockRestore();+ },+ );});diff --git a/api/server/routes/__tests__/messages-get.spec.js b/api/server/routes/__tests__/messages-get.spec.jsindex d1b397d6b9..d25357bd12 100644--- a/api/server/routes/__tests__/messages-get.spec.js+++ b/api/server/routes/__tests__/messages-get.spec.js@@ -135,6 +135,7 @@ jest.mock('librechat-data-provider', () => ({}));jest.mock('~/models', () => ({+ getConvo: jest.fn(),saveConvo: jest.fn(),getMessage: jest.fn(),saveMessage: jest.fn(),@@ -318,6 +319,61 @@ describe('message route conversation ownership filters', () => {]);});+ it('inherits the source message retention when branching', async () => {+ const expiredAt = new Date('2030-01-01T00:00:00.000Z');+ getMessage.mockResolvedValue({+ messageId: 'source-message',+ conversationId: 'convo-1',+ parentMessageId: 'parent-1',+ isCreatedByUser: false,+ isTemporary: true,+ expiredAt,+ content: [{ type: 'text', text: 'Assistant content', agentId: 'agent-1' }],+ });+ saveMessage.mockImplementation(async (_ctx, message) => message);++ const response = await request(app).post('/api/messages/branch').send({+ messageId: 'source-message',+ agentId: 'agent-1',+ });++ expect(response.status).toBe(201);+ expect(saveMessage).toHaveBeenCalledWith(+ expect.objectContaining({ isTemporary: true, expiredAt }),+ expect.any(Object),+ { context: 'POST /api/messages/branch' },+ );+ });++ it('uses the guard-loaded retention for both writes when a message spoofs the chat type', async () => {+ const expiredAt = new Date('2030-01-01T00:00:00.000Z');+ const db = require('~/models');+ db.getConvo.mockResolvedValue({ conversationId: 'convo-1', isTemporary: true, expiredAt });+ require('@librechat/api').isSubagentThreadWriteBlocked.mockImplementationOnce(+ async ({ getConvo }, { userId, conversationId }) => {+ await getConvo(userId, conversationId);+ return false;+ },+ );+ saveMessage.mockImplementation(async (_ctx, message) => message);++ const response = await request(app).post('/api/messages/convo-1').send({+ messageId: 'message-1',+ text: 'hello',+ isTemporary: false,+ });++ expect(response.status).toBe(201);+ for (const save of [saveMessage, saveConvo]) {+ expect(save).toHaveBeenLastCalledWith(+ expect.objectContaining({ isTemporary: true, expiredAt }),+ expect.any(Object),+ expect.any(Object),+ );+ }+ expect(db.getConvo).toHaveBeenCalledTimes(1);+ });+it.each([{name: 'carries server-private context meta onto the branch',diff --git a/api/server/routes/__tests__/messages-subagent-thread.spec.js b/api/server/routes/__tests__/messages-subagent-thread.spec.jsindex c0d68ccb10..bb71adf098 100644--- a/api/server/routes/__tests__/messages-subagent-thread.spec.js+++ b/api/server/routes/__tests__/messages-subagent-thread.spec.js@@ -127,7 +127,7 @@ describe('message mutation policy for durable subagent threads', () => {}expect(mockIsSubagentThreadWriteBlocked).toHaveBeenCalledTimes(5);expect(mockIsSubagentThreadWriteBlocked).toHaveBeenCalledWith(- expect.objectContaining({ getConvo: db.getConvo }),+ expect.objectContaining({ getConvo: expect.any(Function) }),{userId: 'owner-user',conversationId: 'child-conversation',diff --git a/api/server/routes/__tests__/share.spec.js b/api/server/routes/__tests__/share.spec.jsindex 47d8f7b753..4084649e40 100644--- a/api/server/routes/__tests__/share.spec.js+++ b/api/server/routes/__tests__/share.spec.js@@ -118,7 +118,7 @@ jest.mock('@librechat/api', () => ({jest.mock('@librechat/data-schemas', () => ({logger: { error: jest.fn(), warn: jest.fn() },- createTempChatExpirationDate: jest.fn(() => new Date('2030-01-01T00:00:00.000Z')),+ createChatExpirationDate: jest.fn(() => new Date('2030-01-01T00:00:00.000Z')),runAsSystem: jest.fn((fn) => fn()),tenantStorage: {getStore: jest.fn(() => ({ requestId: 'request-123' })),@@ -224,7 +224,7 @@ jest.mock('~/server/utils/import/importBatchBuilder', () => ({const { Readable } = require('stream');const { RetentionMode } = require('librechat-data-provider');-const { createTempChatExpirationDate, logger } = require('@librechat/data-schemas');+const { createChatExpirationDate, logger } = require('@librechat/data-schemas');const {deleteSharedLinkWithCleanup,isFileSnapshotEnabled,@@ -790,7 +790,7 @@ describe('share routes', () => {}),expect.objectContaining({getConvo: expect.any(Function),- createExpirationDate: createTempChatExpirationDate,+ createExpirationDate: createChatExpirationDate,logger,}),);@@ -1176,7 +1176,7 @@ describe('share routes', () => {}),expect.objectContaining({getConvo: expect.any(Function),- createExpirationDate: createTempChatExpirationDate,+ createExpirationDate: createChatExpirationDate,logger,}),);diff --git a/api/server/routes/agents/__tests__/abort.spec.js b/api/server/routes/agents/__tests__/abort.spec.jsindex 82a42dd098..e31bdc95c7 100644--- a/api/server/routes/agents/__tests__/abort.spec.js+++ b/api/server/routes/agents/__tests__/abort.spec.js@@ -496,6 +496,7 @@ describe('Agent Abort Endpoint', () => {it('saves the aborted partial as temporary from job metadata, not the request body', async () => {const jobStreamId = 'test-stream-123';+ const expiredAt = new Date('2030-01-01T00:00:00.000Z');mockGenerationJobManager.getJob.mockResolvedValue({metadata: { userId: 'test-user-123' },@@ -509,6 +510,7 @@ describe('Agent Abort Endpoint', () => {responseMessageId: 'response-msg-456',conversationId: jobStreamId,isTemporary: true,+ retentionExpiresAt: expiredAt.toISOString(),},content: [{ type: 'text', text: 'Partial...' }],text: 'Partial...',@@ -524,7 +526,7 @@ describe('Agent Abort Endpoint', () => {expect(response.status).toBe(200);expect(mockSaveMessage).toHaveBeenCalledWith(- expect.objectContaining({ isTemporary: true }),+ expect.objectContaining({ isTemporary: true, expiredAt }),expect.anything(),expect.anything(),);diff --git a/api/server/routes/agents/index.js b/api/server/routes/agents/index.jsindex 21e119362e..5440541473 100644--- a/api/server/routes/agents/index.js+++ b/api/server/routes/agents/index.js@@ -773,6 +773,9 @@ router.post('/chat/abort', configMiddleware, async (req, res, next) => {// Source from the job: the stop request does not carry the// original temporary-chat flag.isTemporary: jobData?.isTemporary ?? req?.body?.isTemporary,+ expiredAt: jobData?.retentionExpiresAt+ ? new Date(jobData.retentionExpiresAt)+ : undefined,interfaceConfig: req?.config?.interfaceConfig,};const requestMessage = {diff --git a/api/server/routes/convos.js b/api/server/routes/convos.jsindex 3183e26e3c..bdc00fb5f8 100644--- a/api/server/routes/convos.js+++ b/api/server/routes/convos.js@@ -601,7 +601,8 @@ router.post('/archive', validateConvoAccess, async (req, res) => {const dbResponse = await db.saveConvo({userId: req?.user?.id,- isTemporary: req?.body?.isTemporary,+ isTemporary: req?.resolvedConversation?.isTemporary,+ expiredAt: req?.resolvedConversation?.expiredAt,interfaceConfig: req?.config?.interfaceConfig,},{ conversationId, isArchived },@@ -702,7 +703,8 @@ router.post('/update', validateConvoAccess, configMiddleware, async (req, res) =const dbResponse = await db.saveConvo({userId: req?.user?.id,- isTemporary: req?.body?.isTemporary,+ isTemporary: req?.resolvedConversation?.isTemporary,+ expiredAt: req?.resolvedConversation?.expiredAt,interfaceConfig: req?.config?.interfaceConfig,},{ conversationId, title: sanitizedTitle },diff --git a/api/server/routes/messages.js b/api/server/routes/messages.jsindex 306cdd2621..24704ba769 100644--- a/api/server/routes/messages.js+++ b/api/server/routes/messages.js@@ -61,7 +61,14 @@ router.use(requireJwtAuth);async function rejectSubagentThreadWrite(req, res, conversationId) {const blocked = await isSubagentThreadWriteBlocked(- { getConvo: db.getConvo, store: subagentThreadTaskStore },+ {+ getConvo: async (...args) => {+ const conversation = await db.getConvo(...args);+ req.resolvedConversation = conversation;+ return conversation;+ },+ store: subagentThreadTaskStore,+ },{userId: req.user.id,conversationId,@@ -350,7 +357,8 @@ router.post('/branch', configMiddleware, async (req, res) => {const savedMessage = await db.saveMessage({userId: req?.user?.id,- isTemporary: req?.body?.isTemporary,+ isTemporary: sourceMessage.isTemporary,+ expiredAt: sourceMessage.expiredAt,interfaceConfig: req?.config?.interfaceConfig,},newMessage,@@ -440,7 +448,8 @@ router.post('/artifact/:messageId', configMiddleware, async (req, res) => {const savedMessage = await db.saveMessage({userId: req?.user?.id,- isTemporary: req?.body?.isTemporary,+ isTemporary: message.isTemporary,+ expiredAt: message.expiredAt,interfaceConfig: req?.config?.interfaceConfig,},{@@ -518,7 +527,8 @@ router.post('/:conversationId', storedMessageMutationMiddleware, async (req, resdelete message.contextMeta;const reqCtx = {userId: req?.user?.id,- isTemporary: req?.body?.isTemporary,+ isTemporary: req.resolvedConversation?.isTemporary ?? req?.body?.isTemporary,+ expiredAt: req.resolvedConversation?.expiredAt,interfaceConfig: req?.config?.interfaceConfig,};const savedMessage = await db.saveMessage(diff --git a/api/server/routes/share.js b/api/server/routes/share.jsindex 040ce5a8ad..2aad568c24 100644--- a/api/server/routes/share.js+++ b/api/server/routes/share.js@@ -30,7 +30,7 @@ const {logger,runAsSystem,tenantStorage,- createTempChatExpirationDate,+ createChatExpirationDate,} = require('@librechat/data-schemas');const { FileSources, PermissionTypes, Permissions } = require('librechat-data-provider');const {@@ -118,7 +118,7 @@ const resolveSharedLinkExpiration = (req, conversationId) =>'isTemporary expiredAt',).lean();},- createExpirationDate: createTempChatExpirationDate,+ createExpirationDate: createChatExpirationDate,logger,},);diff --git a/api/server/services/Endpoints/agents/title.js b/api/server/services/Endpoints/agents/title.jsindex 60fc9ca00b..896718b71e 100644--- a/api/server/services/Endpoints/agents/title.js+++ b/api/server/services/Endpoints/agents/title.js@@ -161,7 +161,8 @@ const addTitle = async (await saveConvo({userId: req?.user?.id,- isTemporary: req?.body?.isTemporary,+ isTemporary: req?.resolvedConversation?.isTemporary ?? req?.body?.isTemporary,+ expiredAt: req?.resolvedConversation?.expiredAt,interfaceConfig: req?.config?.interfaceConfig,},{diff --git a/api/server/services/Endpoints/assistants/title.js b/api/server/services/Endpoints/assistants/title.jsindex 4746c038be..98b4d76e84 100644--- a/api/server/services/Endpoints/assistants/title.js+++ b/api/server/services/Endpoints/assistants/title.js@@ -70,7 +70,8 @@ const addTitle = async (req, { text, responseText, conversationId }) => {const reqCtx = {userId: req?.user?.id,- isTemporary: req?.body?.isTemporary,+ isTemporary: req?.resolvedConversation?.isTemporary ?? req?.body?.isTemporary,+ expiredAt: req?.resolvedConversation?.expiredAt,interfaceConfig: req?.config?.interfaceConfig,};await saveConvo(@@ -103,7 +104,8 @@ const addTitle = async (req, { text, responseText, conversationId }) => {await saveConvo({userId: req?.user?.id,- isTemporary: req?.body?.isTemporary,+ isTemporary: req?.resolvedConversation?.isTemporary ?? req?.body?.isTemporary,+ expiredAt: req?.resolvedConversation?.expiredAt,interfaceConfig: req?.config?.interfaceConfig,},{diff --git a/api/server/services/Files/Code/process.js b/api/server/services/Files/Code/process.jsindex 9de8f27e25..ab76eaf3aa 100644--- a/api/server/services/Files/Code/process.js+++ b/api/server/services/Files/Code/process.js@@ -712,6 +712,7 @@ const processCodeOutput = async ({}),};}+ const retentionExpiryPromise = getRetentionExpiry(req);const buffer =preparedBuffer ??(await downloadCodeOutputBuffer({@@ -905,7 +906,7 @@ const processCodeOutput = async ({source: appConfig.fileStrategy,context: FileContext.execute_code,metadata: codeEnvMetadata,- ...(await getRetentionExpiry(req)),+ ...(await retentionExpiryPromise),};if (!(await commitCodeFile(file))) {return null;@@ -1013,7 +1014,7 @@ const processCodeOutput = async ({context: FileContext.execute_code,usage: isUpdate ? (claimed.usage ?? 0) + 1 : 1,createdAt: isUpdate ? claimed.createdAt : formattedDate,- ...(await getRetentionExpiry(req)),+ ...(await retentionExpiryPromise),};if (expectsPreview) {diff --git a/api/server/services/Files/process.js b/api/server/services/Files/process.jsindex 7d8b1e078b..517d90c466 100644--- a/api/server/services/Files/process.js+++ b/api/server/services/Files/process.js@@ -396,6 +396,7 @@ const processFileURL = async ({tenantId,req,}) => {+ const retentionExpiryPromise = getRetentionExpiry(req);const { saveURL, getFileURL } = getStrategyFunctions(fileStrategy);try {const savedFile = await saveURL({ userId, URL, fileName, basePath, tenantId });@@ -438,7 +439,7 @@ const processFileURL = async ({source: fileStrategy,type,context,- ...(await getRetentionExpiry(req)),+ ...(await retentionExpiryPromise),tenantId,width: dimensions.width,height: dimensions.height,@@ -464,6 +465,7 @@ const processFileURL = async ({* @returns {Promise<void>}*/const processImageFile = async ({ req, res, metadata, returnFile = false, sseStream }) => {+ const retentionExpiryPromise = getRetentionExpiry(req);const { file } = req;const appConfig = req.config;const source = getFileStrategy(appConfig, { isImage: true });@@ -490,7 +492,7 @@ const processImageFile = async ({ req, res, metadata, returnFile = false, sseStrcontext: FileContext.message_attachment,source,type: `image/${appConfig.imageOutputType}`,- ...(await getRetentionExpiry(req)),+ ...(await retentionExpiryPromise),width,height,tenantId: req.user.tenantId,@@ -516,6 +518,7 @@ const processImageFile = async ({ req, res, metadata, returnFile = false, sseStr* @returns {Promise<{ filepath: string, filename: string, source: string, type: string}>}*/const uploadImageBuffer = async ({ req, context, metadata = {}, resize = true }) => {+ const retentionExpiryPromise = getRetentionExpiry(req);const appConfig = req.config;const source = getFileStrategy(appConfig, { isImage: true });const { saveBuffer } = getStrategyFunctions(source);@@ -551,7 +554,7 @@ const uploadImageBuffer = async ({ req, context, metadata = {}, resize = true })source,type,width,- ...(await getRetentionExpiry(req)),+ ...(await retentionExpiryPromise),height,tenantId: req.user.tenantId,},@@ -577,6 +580,7 @@ const uploadImageBuffer = async ({ req, context, metadata = {}, resize = true })* constructing it re-reads the user's key.*/const processFileUpload = async ({ req, res, metadata, sseStream, openai: providedOpenAI }) => {+ const retentionExpiryPromise = getRetentionExpiry(req);const appConfig = req.config;const isAssistantUpload = isAssistantsEndpoint(metadata.endpoint);const assistantSource =@@ -662,7 +666,7 @@ const processFileUpload = async ({ req, res, metadata, sseStream, openai: providcontext: isAssistantUpload ? FileContext.assistants : FileContext.message_attachment,model: isAssistantUpload ? req.body.model : undefined,type: file.mimetype,- ...(await getRetentionExpiry(req)),+ ...(await retentionExpiryPromise),embedded,source,height,@@ -705,6 +709,12 @@ const processAgentFileUpload = async ({ req, res, metadata, sseStream }) => {throw new Error('No agent ID provided for agent file upload');}+ const retentionExpiryPromise = getAgentFileRetentionExpiry({+ req,+ messageAttachment,+ tool_resource,+ });+const isImage = file.mimetype.startsWith('image');let fileInfoMetadata;const entity_id = messageAttachment === true ? undefined : agent_id;@@ -829,11 +839,7 @@ const processAgentFileUpload = async ({ req, res, metadata, sseStream }) => {return;}}- const retentionExpiry = await getAgentFileRetentionExpiry({- req,- messageAttachment,- tool_resource,- });+ const retentionExpiry = await retentionExpiryPromise;const fileInfo = {...removeNullishValues({text,@@ -1079,11 +1085,7 @@ const processAgentFileUpload = async ({ req, res, metadata, sseStream }) => {});}- const retentionExpiry = await getAgentFileRetentionExpiry({- req,- messageAttachment,- tool_resource,- });+ const retentionExpiry = await retentionExpiryPromise;const fileInfo = {...removeNullishValues({user: req.user.id,@@ -1128,6 +1130,7 @@ const processOpenAIFile = async ({saveFile = false,updateUsage = false,}) => {+ const retentionExpiryPromise = saveFile ? getRetentionExpiry(openai.req) : null;const _file = await openai.files.retrieve(file_id);const originalName = filename ?? (_file.filename ? path.basename(_file.filename) : undefined);const filepath = `${openai.baseURL}/files/${userId}/${file_id}${@@ -1149,7 +1152,7 @@ const processOpenAIFile = async ({source,model: openai.req.body.model,filename: originalName ?? file_id,- ...(await getRetentionExpiry(openai.req)),+ ...(await retentionExpiryPromise),tenantId: openai.req?.user?.tenantId,};@@ -1181,6 +1184,7 @@ const processOpenAIFile = async ({* @returns {Promise<MongoFile>} The file metadata.*/const processOpenAIImageOutput = async ({ req, buffer, file_id, filename, fileExt }) => {+ const retentionExpiryPromise = getRetentionExpiry(req);const currentDate = new Date();const formattedDate = currentDate.toISOString();const appConfig = req.config;@@ -1198,7 +1202,7 @@ const processOpenAIImageOutput = async ({ req, buffer, file_id, filename, fileExcontext: FileContext.assistants_output,file_id,filename,- ...(await getRetentionExpiry(req)),+ ...(await retentionExpiryPromise),tenantId: req.user.tenantId,};try {@@ -1245,6 +1249,12 @@ async function retrieveAndProcessFile({return processOpenAIFile({ ...processArgs, updateUsage: true });}+ // Prime both consumers before downloading content; each reuses its request's cached lookup.+ void getRetentionExpiry(client.req);+ if (openai.req !== client.req) {+ void getRetentionExpiry(openai.req);+ }+/*** @returns {Promise<Buffer>} The file data buffer.*/@@ -1327,6 +1337,7 @@ async function saveBase64Image(url,{ req, file_id: _file_id, filename: _filename, endpoint, context, resolution },) {+ const retentionExpiryPromise = getRetentionExpiry(req);const appConfig = req.config;const effectiveResolution = resolution ?? appConfig.fileConfig?.imageGeneration ?? 'high';const file_id = _file_id ?? v4();@@ -1368,7 +1379,7 @@ async function saveBase64Image(user: req.user.id,bytes: image.bytes,width: image.width,- ...(await getRetentionExpiry(req)),+ ...(await retentionExpiryPromise),height: image.height,tenantId: req.user.tenantId,},diff --git a/api/server/services/Files/process.spec.js b/api/server/services/Files/process.spec.jsindex a69c756e29..9a54b3a3d3 100644--- a/api/server/services/Files/process.spec.js+++ b/api/server/services/Files/process.spec.js@@ -3,7 +3,7 @@ jest.mock('uuid', () => ({ v4: jest.fn(() => 'mock-uuid') }));jest.mock('@librechat/data-schemas', () => ({logger: { warn: jest.fn(), debug: jest.fn(), error: jest.fn(), info: jest.fn() },runAsSystem: jest.fn((fn) => fn()),- createTempChatExpirationDate: jest.fn(() => new Date('2030-01-01T00:00:00.000Z')),+ createChatExpirationDate: jest.fn(() => new Date('2030-01-01T00:00:00.000Z')),}));jest.mock('@librechat/agents', () => ({@@ -237,7 +237,10 @@ const db = require('~/models');const {processAgentFileUpload,processDeleteRequest,+ processFileUpload,processFileURL,+ processImageFile,+ retrieveAndProcessFile,sweepExpiredFiles,startExpiredFileSweep,} = require('./process');@@ -329,6 +332,90 @@ const setupStoredFileUpload = (result = {}) => {return handleFileUpload;};+describe('upload retention scheduling', () => {+ beforeEach(() => {+ jest.clearAllMocks();+ mockRes.status.mockReturnThis();+ mockRes.json.mockReturnValue({});+ });++ it.each([false, true])(+ 'resolves assistant file retention only for new records (existing=%s)',+ async (existing) => {+ const req = makeReq({ body: { endpoint: 'assistants' } });+ let resolveProvider;+ const retrieve = jest.fn(+ () =>+ new Promise((resolve) => {+ resolveProvider = resolve;+ }),+ );+ const openai = { req, baseURL: 'https://example.com', files: { retrieve } };+ const pending = retrieveAndProcessFile({+ openai,+ client: { req, attachedFileIds: new Set(existing ? ['file-1'] : []) },+ file_id: 'file-1',+ basename: 'output.txt',+ });+ expect(retrieve).toHaveBeenCalledTimes(1);+ if (existing) {+ expect(getRetentionExpiry).not.toHaveBeenCalled();+ } else {+ expect(getRetentionExpiry).toHaveBeenCalled();+ }+ resolveProvider({ filename: 'output.txt' });+ await pending;+ if (existing) {+ expect(getRetentionExpiry).not.toHaveBeenCalled();+ }+ },+ );++ it.each([+ ['image', processImageFile, 'handleImageUpload'],+ ['file', processFileUpload, 'handleFileUpload'],+ ])(+ 'overlaps the retention lookup with %s storage',+ async (_label, processUpload, strategyKey) => {+ let resolveRetention;+ let resolveStorage;+ getRetentionExpiry.mockReturnValueOnce(+ new Promise((resolve) => {+ resolveRetention = resolve;+ }),+ );+ const storage = jest.fn(+ () =>+ new Promise((resolve) => {+ resolveStorage = resolve;+ }),+ );+ getStrategyFunctions.mockReturnValue({ [strategyKey]: storage });+ const req = makeReq({ body: { endpoint: 'openAI' } });+ req.config.imageOutputType = 'webp';++ const pending = processUpload({+ req,+ res: mockRes,+ metadata: { endpoint: 'openAI', file_id: 'file-uuid-123' },+ });+ await Promise.resolve();++ expect(getRetentionExpiry).toHaveBeenCalledWith(req, expect.any(Object));+ expect(storage).toHaveBeenCalledTimes(1);+ resolveStorage({+ bytes: 42,+ filename: 'upload.bin',+ filepath: '/uploads/upload.bin',+ width: 10,+ height: 10,+ });+ resolveRetention({ expiredAt: new Date('2030-01-01T00:00:00.000Z') });+ await pending;+ },+ );+});+describe('processAgentFileUpload', () => {beforeEach(() => {jest.clearAllMocks();diff --git a/api/server/services/Files/retention.js b/api/server/services/Files/retention.jsindex a5fe2054d5..6532b05371 100644--- a/api/server/services/Files/retention.js+++ b/api/server/services/Files/retention.js@@ -2,12 +2,12 @@ const {getRetentionExpiry: getRetentionExpiryWithDeps,getAgentFileRetentionExpiry: getAgentFileRetentionExpiryWithDeps,} = require('@librechat/api');-const { logger, createTempChatExpirationDate } = require('@librechat/data-schemas');+const { logger, createChatExpirationDate } = require('@librechat/data-schemas');const db = require('~/models');const getRetentionDependencies = () => ({getConvo: db.getConvoRetention ?? db.getConvo,- createExpirationDate: createTempChatExpirationDate,+ createExpirationDate: createChatExpirationDate,logger,});diff --git a/api/server/services/Files/retention.spec.js b/api/server/services/Files/retention.spec.jsindex e9a365d530..ea22c03a84 100644--- a/api/server/services/Files/retention.spec.js+++ b/api/server/services/Files/retention.spec.js@@ -7,7 +7,7 @@ jest.mock('@librechat/api', () => ({}));jest.mock('@librechat/data-schemas', () => ({logger: {},- createTempChatExpirationDate: jest.fn(),+ createChatExpirationDate: jest.fn(),}));jest.mock('~/models', () => ({ getConvo: jest.fn() }));diff --git a/api/server/services/Threads/manage.js b/api/server/services/Threads/manage.jsindex 4e390c3986..ac5e2f12ba 100644--- a/api/server/services/Threads/manage.js+++ b/api/server/services/Threads/manage.js@@ -8,7 +8,7 @@ const {AnnotationTypes,defaultOrderQuery,} = require('librechat-data-provider');-const { recordMessage, getMessages, spendTokens, saveConvo } = require('~/models');+const { saveMessage, getMessages, spendTokens, saveConvo } = require('~/models');const { retrieveAndProcessFile } = require('~/server/services/Files/process');/**@@ -90,16 +90,21 @@ async function saveUserMessage(req, params) {convo.file_ids = params.file_ids;}- const message = await recordMessage(userMessage);- await saveConvo(- {- userId: req?.user?.id,- isTemporary: req?.body?.isTemporary,- interfaceConfig: req?.config?.interfaceConfig,- },+ const ctx = {+ userId: req?.user?.id,+ isTemporary: req?.resolvedConversation?.isTemporary ?? req?.body?.isTemporary,+ expiredAt: req?.resolvedConversation?.expiredAt,+ interfaceConfig: req?.config?.interfaceConfig,+ };+ const message = await saveMessage(ctx, userMessage);+ const savedConvo = await saveConvo(+ { ...ctx, expiredAt: message?.expiredAt ?? ctx.expiredAt },convo,{ context: 'api/server/services/Threads/manage.js #saveUserMessage' },);+ if (savedConvo != null) {+ req.resolvedConversation = savedConvo;+ }return message;}@@ -128,7 +133,13 @@ async function saveUserMessage(req, params) {async function saveAssistantMessage(req, params) {// const tokenCount = // TODO: need to count each content part- const message = await recordMessage({+ const ctx = {+ userId: req?.user?.id,+ isTemporary: req?.resolvedConversation?.isTemporary ?? req?.body?.isTemporary,+ expiredAt: req?.resolvedConversation?.expiredAt,+ interfaceConfig: req?.config?.interfaceConfig,+ };+ const message = await saveMessage(ctx, {user: params.user,endpoint: params.endpoint,messageId: params.messageId,@@ -147,12 +158,8 @@ async function saveAssistantMessage(req, params) {spec: params.spec,});- await saveConvo(- {- userId: req?.user?.id,- isTemporary: req?.body?.isTemporary,- interfaceConfig: req?.config?.interfaceConfig,- },+ const savedConvo = await saveConvo(+ { ...ctx, expiredAt: message?.expiredAt ?? ctx.expiredAt },{endpoint: params.endpoint,conversationId: params.conversationId,@@ -166,6 +173,10 @@ async function saveAssistantMessage(req, params) {{ context: 'api/server/services/Threads/manage.js #saveAssistantMessage' },);+ if (savedConvo != null) {+ req.resolvedConversation = savedConvo;+ }+return message;}@@ -226,6 +237,12 @@ async function syncMessages({const modifyPromises = [];const recordPromises = [];+ const ctx = {+ userId: openai.req?.user?.id,+ isTemporary: openai.req?.resolvedConversation?.isTemporary ?? openai.req?.body?.isTemporary,+ expiredAt: openai.req?.resolvedConversation?.expiredAt,+ interfaceConfig: openai.req?.config?.interfaceConfig,+ };/***@@ -236,7 +253,7 @@ async function syncMessages({* @param {dbMessage} params.apiMessage*/const processNewMessage = async ({ dbMessage, apiMessage }) => {- recordPromises.push(recordMessage({ ...dbMessage, user: openai.req.user.id }));+ recordPromises.push(saveMessage(ctx, { ...dbMessage, user: openai.req.user.id }));if (!apiMessage.id.includes('msg_')) {return;@@ -343,18 +360,17 @@ async function syncMessages({await Promise.all(modifyPromises);await Promise.all(recordPromises);- await saveConvo(- {- userId: openai.req?.user?.id,- isTemporary: openai.req?.body?.isTemporary,- interfaceConfig: openai.req?.config?.interfaceConfig,- },+ const savedConvo = await saveConvo(+ ctx,{conversationId,file_ids: attached_file_ids,},{ context: 'api/server/services/Threads/manage.js #syncMessages' },);+ if (savedConvo != null) {+ openai.req.resolvedConversation = savedConvo;+ }return result;}diff --git a/api/server/services/Threads/manage.retention.spec.js b/api/server/services/Threads/manage.retention.spec.jsnew file mode 100644index 0000000000..7fae744288--- /dev/null+++ b/api/server/services/Threads/manage.retention.spec.js@@ -0,0 +1,99 @@+const mongoose = require('mongoose');+const { v4 } = require('uuid');+const { MongoMemoryServer } = require('mongodb-memory-server');++jest.mock('@librechat/api', () => ({+ ...jest.requireActual('@librechat/api'),+ countTokens: jest.fn().mockResolvedValue(1),+}));++jest.mock('~/server/services/Files/process', () => ({ retrieveAndProcessFile: jest.fn() }));++const { Message, Conversation } = require('~/db/models');+const { saveUserMessage, saveAssistantMessage, checkMessageGaps } = require('./manage');++describe('Assistants message retention', () => {+ let mongoServer;++ beforeAll(async () => {+ mongoServer = await MongoMemoryServer.create();+ await mongoose.connect(mongoServer.getUri());+ });++ afterAll(async () => {+ await mongoose.disconnect();+ await mongoServer.stop();+ });++ it.each([false, true])(+ 'retains the full turn and gap sync with isTemporary=%s',+ async (isTemporary) => {+ const user = new mongoose.Types.ObjectId().toString();+ const conversationId = v4();+ const req = {+ user: { id: user },+ body: { conversationId, isTemporary },+ resolvedConversation: null,+ config: {+ interfaceConfig: {+ retentionMode: 'all',+ generalChatRetention: 24,+ temporaryChatRetention: 1,+ },+ },+ };+ const params = {+ user,+ conversationId,+ endpoint: 'assistants',+ assistant_id: 'asst_test',+ thread_id: 'thread_test',+ text: 'hello',+ };+ const startedAt = Date.now();+ const userMessage = await saveUserMessage(req, { ...params, messageId: v4() });+ expect(userMessage.expiredAt.getTime()).toBeGreaterThanOrEqual(+ startedAt + (isTemporary ? 1 : 24) * 3600000,+ );+ expect(userMessage.expiredAt.getTime()).toBeLessThan(+ startedAt + (isTemporary ? 1 : 24) * 3600000 + 5000,+ );+ // A response must retain the admission policy even if request fields change.+ req.body.isTemporary = !isTemporary;+ await saveAssistantMessage(req, {+ ...params,+ messageId: v4(),+ parentMessageId: userMessage.messageId,+ content: [],+ });+ await checkMessageGaps({+ openai: {+ req,+ beta: {+ threads: {+ messages: {+ update: jest.fn().mockResolvedValue({}),+ list: jest.fn().mockResolvedValue({+ data: [{ id: 'msg_user', role: 'user', content: [], created_at: 1 }],+ }),+ },+ runs: { steps: { list: jest.fn().mockResolvedValue({ data: [] }) } },+ },+ },+ },+ endpoint: 'assistants',+ thread_id: 'thread_test',+ conversationId,+ latestMessageId: v4(),+ run_id: 'run_test',+ });+ const rows = await Message.find({ user, conversationId }).lean();+ const convo = await Conversation.findOne({ user, conversationId }).lean();+ expect(rows).toHaveLength(4);+ for (const row of [...rows, convo]) {+ expect(row.isTemporary).toBe(isTemporary);+ expect(row.expiredAt).toEqual(userMessage.expiredAt);+ }+ },+ );+});diff --git a/api/server/services/Threads/manage.spec.js b/api/server/services/Threads/manage.spec.jsindex 305a78ee34..2d36ce3624 100644--- a/api/server/services/Threads/manage.spec.js+++ b/api/server/services/Threads/manage.spec.js@@ -17,7 +17,7 @@ jest.mock('@librechat/data-schemas', () => ({}));jest.mock('~/models', () => ({- recordMessage: jest.fn(),+ saveMessage: jest.fn(),getMessages: jest.fn(),saveConvo: jest.fn(),spendTokens: (...args) => mockSpendTokens(...args),diff --git a/api/server/utils/import/importBatchBuilder.js b/api/server/utils/import/importBatchBuilder.jsindex dc46b991d9..ac8da31cfa 100644--- a/api/server/utils/import/importBatchBuilder.js+++ b/api/server/utils/import/importBatchBuilder.js@@ -9,7 +9,7 @@ const {getTenantId,logger,createFallbackRetentionDate,- createTempChatExpirationDate,+ createChatExpirationDate,} = require('@librechat/data-schemas');const {EModelEndpoint,@@ -94,7 +94,7 @@ class ImportBatchBuilder {try {this.retentionFields = {isTemporary: false,- expiredAt: createTempChatExpirationDate(this.interfaceConfig),+ expiredAt: createChatExpirationDate(this.interfaceConfig),};} catch (error) {logger.error('[ImportBatchBuilder] Error creating import expiration date:', error);diff --git a/api/server/utils/import/importers.spec.js b/api/server/utils/import/importers.spec.jsindex 0554c4a0c8..fcc96162fe 100644--- a/api/server/utils/import/importers.spec.js+++ b/api/server/utils/import/importers.spec.js@@ -1325,22 +1325,30 @@ describe('importLibreChatConvo', () => {expect(result.conversation.model).toBe(openAISettings.model.default);});- it('applies all-data retention to imported conversations and messages', () => {- const requestUserId = 'user-123';- const builder = new ImportBatchBuilder(requestUserId, {- retentionMode: RetentionMode.ALL,- temporaryChatRetention: 24,- });- builder.startConversation(EModelEndpoint.openAI);- const message = builder.addUserMessage('Retained import');- const result = builder.finishConversation('Imported retained chat');-- expect(message.isTemporary).toBe(false);- expect(message.expiredAt).toBeInstanceOf(Date);- expect(result.conversation.isTemporary).toBe(false);- expect(result.conversation.expiredAt).toBeInstanceOf(Date);- expect(result.conversation.expiredAt).toBe(message.expiredAt);- });+ it.each([undefined, 2160])(+ 'applies all-data retention to imports with general retention %s',+ (generalChatRetention) => {+ const requestUserId = 'user-123';+ const builder = new ImportBatchBuilder(requestUserId, {+ retentionMode: RetentionMode.ALL,+ temporaryChatRetention: 24,+ generalChatRetention,+ });+ const now = Date.now();+ builder.startConversation(EModelEndpoint.openAI);+ const message = builder.addUserMessage('Retained import');+ const result = builder.finishConversation('Imported retained chat');++ expect(message.isTemporary).toBe(false);+ expect(message.expiredAt).toBeInstanceOf(Date);+ expect(result.conversation.isTemporary).toBe(false);+ expect(result.conversation.expiredAt).toBeInstanceOf(Date);+ expect(result.conversation.expiredAt).toBe(message.expiredAt);+ const hours = generalChatRetention ?? 24;+ expect(message.expiredAt.getTime()).toBeGreaterThanOrEqual(now + hours * 3600000);+ expect(message.expiredAt.getTime()).toBeLessThan(now + hours * 3600000 + 1000);+ },+ );});});diff --git a/librechat.example.yaml b/librechat.example.yamlindex 1eabf22b74..48492895e9 100644--- a/librechat.example.yaml+++ b/librechat.example.yaml@@ -286,6 +286,10 @@ interface:# Temporary chat retention period in hours (default: 720, min: 1, max: 8760)# temporaryChatRetention: 1+ # Regular chat retention in hours under retentionMode: "all" (min: 1, max: 8760).+ # Defaults to the temporary chat retention policy when omitted.+ # generalChatRetention: 2160 # 90 days, independently of temporary chats+ # Existing stored deadlines are not migrated when these settings change.# Retention mode: "all" applies expiry to all data types, "temporary" (default) only to temporary chats# Before switching from "all" back to "temporary", remove retention deadlines from non-temporary data# that should stop expiring:diff --git a/packages/api/src/agents/subagentThreads.spec.ts b/packages/api/src/agents/subagentThreads.spec.tsindex cd78101cd3..8a618d7dcd 100644--- a/packages/api/src/agents/subagentThreads.spec.ts+++ b/packages/api/src/agents/subagentThreads.spec.ts@@ -351,6 +351,40 @@ describe('SubagentThreadTaskStore', () => {});});+ it('inherits the parent retention deadline across the child transcript lifecycle', async () => {+ const userId = 'retained-subagent-user';+ const parentConversationId = randomUUID();+ const expiredAt = new Date('2030-01-01T00:00:00.000Z');+ await methods.saveConvo(+ { userId, isTemporary: true, expiredAt },+ {+ conversationId: parentConversationId,+ endpoint: EModelEndpoint.agents,+ title: 'Retained parent thread',+ agent_id: 'parent-agent',+ },+ );+ const store = new SubagentThreadTaskStore(methods);+ const config = buildSubagentThreadTaskConfig(store, { userId, parentConversationId });++ const started = store.start(taskRequest(config.scopeId));+ await waitForSettled(store, config.scopeId, started);+ const threadId = requireThreadId(started);+ const [conversation, messages] = await Promise.all([+ methods.getConvo(userId, threadId),+ methods.getMessages({ user: userId, conversationId: threadId }),+ ]);++ expect(conversation).toMatchObject({ isTemporary: true, expiredAt });+ expect(messages).toHaveLength(2);+ expect(messages).toEqual(+ expect.arrayContaining([+ expect.objectContaining({ isTemporary: true, expiredAt }),+ expect.objectContaining({ isTemporary: true, expiredAt }),+ ]),+ );+ });+it('registers a host-safe wakeup before child provider work begins', async () => {const userId = 'wakeup-user';const parentConversationId = randomUUID();diff --git a/packages/api/src/agents/subagentThreads.ts b/packages/api/src/agents/subagentThreads.tsindex 6dddd883d3..355ff40a0d 100644--- a/packages/api/src/agents/subagentThreads.ts+++ b/packages/api/src/agents/subagentThreads.ts@@ -451,14 +451,23 @@ function serializeTranscript(};}-function retentionFields(conversation: IConversation): {+function retentionContext(conversation: IConversation): {isTemporary?: boolean;expiredAt?: Date;- tenantId?: string;} {return {...(conversation.isTemporary == null ? {} : { isTemporary: conversation.isTemporary }),...(conversation.expiredAt == null ? {} : { expiredAt: conversation.expiredAt }),+ };+}++function retentionFields(conversation: IConversation): {+ isTemporary?: boolean;+ expiredAt?: Date;+ tenantId?: string;+} {+ return {+ ...retentionContext(conversation),...(conversation.tenantId == null ? {} : { tenantId: conversation.tenantId }),};}@@ -2909,7 +2918,7 @@ export class SubagentThreadTaskStore extends InMemorySubagentTaskStore {const abandonedMessage ='Subagent task failed: The prior execution ended before its result could be persisted.';const savedAbandoned = await this.methods.saveMessage(- { userId: scope.userId },+ { userId: scope.userId, ...retentionContext(conversation) },{messageId: `${taskId}:assistant`,conversationId: threadId,@@ -2926,7 +2935,7 @@ export class SubagentThreadTaskStore extends InMemorySubagentTaskStore {...(requestFingerprint == null ? {} : { requestFingerprint }),status: 'error',},- ...retentionFields(conversation),+ ...(conversation.tenantId == null ? {} : { tenantId: conversation.tenantId }),},{ context: 'SubagentThreadTaskStore.prepareThread.abandonedAttempt' },);@@ -2970,7 +2979,7 @@ export class SubagentThreadTaskStore extends InMemorySubagentTaskStore {});const savedUserMessage = await observeSlowPreparation(this.methods.saveMessage(- { userId: scope.userId },+ { userId: scope.userId, ...retentionContext(conversation) },{messageId: userMessageId,conversationId: threadId,@@ -2985,7 +2994,7 @@ export class SubagentThreadTaskStore extends InMemorySubagentTaskStore {...(requestFingerprint == null ? {} : { requestFingerprint }),status: 'running',},- ...retentionFields(conversation),+ ...(conversation.tenantId == null ? {} : { tenantId: conversation.tenantId }),},{ context: 'SubagentThreadTaskStore.prepareThread' },),@@ -3095,7 +3104,7 @@ export class SubagentThreadTaskStore extends InMemorySubagentTaskStore {);const usage = this.aggregateDetachedUsage(detachedUsage);const savedAssistantMessage = await this.methods.saveMessage(- { userId: scope.userId },+ { userId: scope.userId, ...retentionContext(conversation) },{messageId: `${taskId}:assistant`,conversationId: conversation.conversationId,@@ -3116,7 +3125,7 @@ export class SubagentThreadTaskStore extends InMemorySubagentTaskStore {status: 'completed',},...(usage == null ? {} : { metadata: { usage } }),- ...retentionFields(conversation),+ ...(conversation.tenantId == null ? {} : { tenantId: conversation.tenantId }),},{ context: 'SubagentThreadTaskStore.persistResult' },);@@ -3141,7 +3150,7 @@ export class SubagentThreadTaskStore extends InMemorySubagentTaskStore {}const usage = this.aggregateDetachedUsage(detachedUsage);const savedFailure = await this.methods.saveMessage(- { userId: scope.userId },+ { userId: scope.userId, ...retentionContext(conversation) },{messageId: `${taskId}:assistant`,conversationId: threadId,@@ -3161,7 +3170,7 @@ export class SubagentThreadTaskStore extends InMemorySubagentTaskStore {status: 'error',},...(usage == null ? {} : { metadata: { usage } }),- ...retentionFields(conversation),+ ...(conversation.tenantId == null ? {} : { tenantId: conversation.tenantId }),},{ context: 'SubagentThreadTaskStore.persistFailure' },);@@ -3210,7 +3219,7 @@ export class SubagentThreadTaskStore extends InMemorySubagentTaskStore {}const usage = this.aggregateDetachedUsage(detachedUsage);const savedCancellation = await this.methods.saveMessage(- { userId: scope.userId },+ { userId: scope.userId, ...retentionContext(conversation) },{messageId: `${taskId}:assistant`,conversationId: threadId,@@ -3229,7 +3238,7 @@ export class SubagentThreadTaskStore extends InMemorySubagentTaskStore {status: 'cancelled',},...(usage == null ? {} : { metadata: { usage } }),- ...retentionFields(conversation),+ ...(conversation.tenantId == null ? {} : { tenantId: conversation.tenantId }),},{ context: 'SubagentThreadTaskStore.persistCancellation' },);diff --git a/packages/api/src/files/retention.spec.ts b/packages/api/src/files/retention.spec.tsindex 4722710a0c..272a0d3e5c 100644--- a/packages/api/src/files/retention.spec.ts+++ b/packages/api/src/files/retention.spec.ts@@ -1,4 +1,5 @@import { RetentionMode } from 'librechat-data-provider';+import { createChatExpirationDate } from '@librechat/data-schemas';import {createMinimalRetentionRequest,getAgentFileRetentionExpiry,@@ -52,6 +53,110 @@ describe('retention helpers', () => {expect(dependencies.getConvo).not.toHaveBeenCalled();});+ it('preserves a loaded message deadline across file request reconstruction without a read', async () => {+ const req = request({+ body: { isTemporary: false },+ config: { interfaceConfig: { retentionMode: RetentionMode.ALL } },+ });+ req.fileRetentionSource = { isTemporary: true, expiredAt: expirationDate };+ const result = await getRetentionExpiry(createMinimalRetentionRequest(req), dependencies);+ expect(result).toEqual({ expiredAt: expirationDate });+ expect(dependencies.getConvo).not.toHaveBeenCalled();+ expect(dependencies.createExpirationDate).not.toHaveBeenCalled();+ });++ it('uses loaded message type when a legacy row lacks a deadline', async () => {+ const req = request({+ body: { isTemporary: false },+ config: { interfaceConfig: { retentionMode: RetentionMode.ALL } },+ });+ req.fileRetentionSource = { isTemporary: true };+ await getRetentionExpiry(req, dependencies);+ expect(dependencies.getConvo).not.toHaveBeenCalled();+ expect(dependencies.createExpirationDate).toHaveBeenCalledWith(+ req.config?.interfaceConfig,+ true,+ );+ });++ describe('independent retention periods', () => {+ const interfaceConfig = {+ retentionMode: RetentionMode.ALL,+ temporaryChatRetention: 1,+ generalChatRetention: 2160,+ };++ beforeEach(() => {+ dependencies.createExpirationDate.mockImplementation(createChatExpirationDate);+ });++ it.each([true, 'true', false, 'false'])(+ 'uses explicit temporary intent %s when the conversation does not exist yet',+ async (isTemporary) => {+ dependencies.getConvo.mockResolvedValue(null);+ const now = Date.now();+ const result = await getRetentionExpiry(+ request({ body: { isTemporary }, config: { interfaceConfig } }),+ dependencies,+ );+ const hours = isTemporary === true || isTemporary === 'true' ? 1 : 2160;+ expect(result.expiredAt?.getTime()).toBeGreaterThanOrEqual(now + hours * 3600000);+ expect(result.expiredAt?.getTime()).toBeLessThan(now + hours * 3600000 + 1000);+ expect(dependencies.getConvo).toHaveBeenCalledWith('user-1', 'convo-1');+ },+ );++ it.each([+ { supplied: false, stored: true, hours: 1 },+ { supplied: true, stored: false, hours: 2160 },+ { supplied: true, stored: false, hours: 2160, expiredAt: null },+ ])(+ 'uses stored chat type $stored instead of caller-supplied type $supplied',+ async ({ supplied, stored, hours, expiredAt }) => {+ dependencies.getConvo.mockResolvedValue({+ isTemporary: stored,+ expiredAt: expiredAt === null ? null : expirationDate,+ });+ const now = Date.now();+ const result = await getRetentionExpiry(+ request({ body: { isTemporary: supplied }, config: { interfaceConfig } }),+ dependencies,+ );++ expect(result.expiredAt?.getTime()).toBeGreaterThanOrEqual(now + hours * 3600000);+ expect(result.expiredAt?.getTime()).toBeLessThan(now + hours * 3600000 + 1000);+ expect(dependencies.getConvo).toHaveBeenCalledWith('user-1', 'convo-1');+ },+ );++ it.each([true, false])(+ 'uses the stored chat type %s when omitted and caches the lookup',+ async (isTemporary) => {+ dependencies.getConvo.mockResolvedValue({ isTemporary, expiredAt: expirationDate });+ const req = request({ config: { interfaceConfig } });+ const now = Date.now();+ const result = await getRetentionExpiry(req, dependencies);+ const hours = isTemporary ? 1 : 2160;+ expect(result.expiredAt?.getTime()).toBeGreaterThanOrEqual(now + hours * 3600000);+ expect(result.expiredAt?.getTime()).toBeLessThan(now + hours * 3600000 + 1000);+ expect(await getRetentionExpiry(req, dependencies)).toBe(result);+ expect(dependencies.getConvo).toHaveBeenCalledTimes(1);+ },+ );++ it.each([true, false])('uses the source chat type %s for shared links', async (isTemporary) => {+ dependencies.getConvo.mockResolvedValue({ isTemporary, expiredAt: expirationDate });+ const now = Date.now();+ const result = await getSharedLinkExpiration(+ { req: request({ config: { interfaceConfig } }), conversationId: 'convo-1' },+ dependencies,+ );+ const hours = isTemporary ? 1 : 2160;+ expect(result?.getTime()).toBeGreaterThanOrEqual(now + hours * 3600000);+ expect(result?.getTime()).toBeLessThan(now + hours * 3600000 + 1000);+ });+ });+it('returns a fresh expiry when the conversation has an active expiration', async () => {dependencies.getConvo.mockResolvedValue({expiredAt: new Date(Date.now() + 60 * 60 * 1000),@@ -100,6 +205,48 @@ describe('retention helpers', () => {expect(result).toEqual({});});+ it('uses temporary retention when an all-data lookup cannot determine the chat type', async () => {+ dependencies.getConvo.mockRejectedValue(new Error('offline'));++ await getRetentionExpiry(+ request({+ config: {+ interfaceConfig: {+ retentionMode: RetentionMode.ALL,+ temporaryChatRetention: 1,+ generalChatRetention: 2160,+ },+ },+ }),+ dependencies,+ );++ expect(dependencies.createExpirationDate).toHaveBeenCalledWith(expect.any(Object), true);+ expect(dependencies.createExpirationDate).toHaveBeenCalledWith(expect.any(Object), false);+ });++ it('uses the shorter configured period when an all-data lookup fails', async () => {+ dependencies.getConvo.mockRejectedValue(new Error('offline'));+ dependencies.createExpirationDate.mockImplementation(createChatExpirationDate);+ const now = Date.now();++ const result = await getRetentionExpiry(+ request({+ config: {+ interfaceConfig: {+ retentionMode: RetentionMode.ALL,+ temporaryChatRetention: 8760,+ generalChatRetention: 1,+ },+ },+ }),+ dependencies,+ );++ expect(result.expiredAt?.getTime()).toBeGreaterThanOrEqual(now + 3600000);+ expect(result.expiredAt?.getTime()).toBeLessThan(now + 3601000);+ });+it('returns expiry when isTemporary is true', async () => {dependencies.getConvo.mockResolvedValue(null);diff --git a/packages/api/src/files/retention.ts b/packages/api/src/files/retention.tsindex 884f56fb2e..e3be4c1fc2 100644--- a/packages/api/src/files/retention.ts+++ b/packages/api/src/files/retention.ts@@ -13,10 +13,13 @@ const retentionExpiryCache = new WeakMap<>();export type RetentionConversation = {+ isTemporary?: boolean | null;expiredAt?: Date | string | number | null;};export type RetentionRequest = {+ /** Owner-authenticated source row for operations attached to an existing message. */+ fileRetentionSource?: RetentionConversation;user?: {id?: string;tenantId?: string;@@ -49,7 +52,7 @@ export type RetentionDependencies = {userId: string,conversationId: string,) => Promise<RetentionConversation | null | undefined>;- createExpirationDate: (interfaceConfig?: InterfaceConfig) => Date;+ createExpirationDate: (interfaceConfig?: InterfaceConfig, isTemporary?: boolean) => Date;logger?: RetentionLogger;};@@ -58,7 +61,7 @@ export type SharedLinkRetentionDependencies = {userId: string,conversationId: string,) => Promise<RetentionConversation | null | undefined>;- createExpirationDate: (interfaceConfig?: InterfaceConfig) => Date;+ createExpirationDate: (interfaceConfig?: InterfaceConfig, isTemporary?: boolean) => Date;logger?: RetentionLogger;};@@ -82,9 +85,10 @@ export const isActiveExpirationDate = (expiredAt: Date, now: Date = new Date()):const createRetentionExpiry = (req: RetentionRequest | null | undefined,{ createExpirationDate, logger }: RetentionDependencies,+ isTemporary = isBooleanOrStringTrue(req?.body?.isTemporary),): RetentionExpiry => {try {- return { expiredAt: createExpirationDate(req?.config?.interfaceConfig) };+ return { expiredAt: createExpirationDate(req?.config?.interfaceConfig, isTemporary) };} catch (err) {logger?.error('[getRetentionExpiry] Error creating file expiration date:', err);return { expiredAt: createFallbackRetentionDate() };@@ -94,21 +98,41 @@ const createRetentionExpiry = (const getRetentionCacheKey = (req: RetentionRequest): string =>[req.config?.interfaceConfig?.retentionMode ?? '',+ req.config?.interfaceConfig?.temporaryChatRetention ?? '',+ req.config?.interfaceConfig?.generalChatRetention ?? '',req.user?.id ?? '',req.body?.conversationId ?? '',String(req.body?.isTemporary ?? ''),+ String(req.fileRetentionSource?.expiredAt ?? ''),+ String(req.fileRetentionSource?.isTemporary ?? ''),+ String(req.fileRetentionSource != null),].join('|');async function computeRetentionExpiry(req: RetentionRequest | null | undefined,dependencies: RetentionDependencies,): Promise<RetentionExpiry> {- if (req?.config?.interfaceConfig?.retentionMode === RetentionMode.ALL) {- return createRetentionExpiry(req, dependencies);- }-+ const interfaceConfig = req?.config?.interfaceConfig;+ const isRetentionAll = interfaceConfig?.retentionMode === RetentionMode.ALL;const conversationId = req?.body?.conversationId;const userId = req?.user?.id;+ if (req?.fileRetentionSource != null) {+ const source = req.fileRetentionSource;+ const expiredAt = getConversationExpirationDate(source);+ if (expiredAt != null) {+ return { expiredAt };+ }+ return isRetentionAll || source.isTemporary === true+ ? createRetentionExpiry(req, dependencies, source.isTemporary === true)+ : {};+ }+ if (+ isRetentionAll &&+ (interfaceConfig.generalChatRetention === undefined ||+ (req?.body?.isTemporary != null && !(conversationId && userId)))+ ) {+ return createRetentionExpiry(req, dependencies);+ }if (conversationId && userId) {try {@@ -116,8 +140,8 @@ async function computeRetentionExpiry(if (convo) {const expiredAt = getConversationExpirationDate(convo);if (expiredAt == null) {- if (isBooleanOrStringTrue(req?.body?.isTemporary)) {- return createRetentionExpiry(req, dependencies);+ if (isRetentionAll || isBooleanOrStringTrue(req?.body?.isTemporary)) {+ return createRetentionExpiry(req, dependencies, convo.isTemporary === true);}return {};}@@ -126,21 +150,29 @@ async function computeRetentionExpiry(return { expiredAt };}- return createRetentionExpiry(req, dependencies);+ return createRetentionExpiry(req, dependencies, convo.isTemporary !== false);}} catch (err) {dependencies.logger?.error('[getRetentionExpiry] Error checking conversation retention:',err,);+ if (isRetentionAll) {+ const temporaryExpiry = createRetentionExpiry(req, dependencies, true).expiredAt;+ const generalExpiry = createRetentionExpiry(req, dependencies, false).expiredAt;+ if (temporaryExpiry && generalExpiry) {+ return { expiredAt: temporaryExpiry < generalExpiry ? temporaryExpiry : generalExpiry };+ }+ return { expiredAt: temporaryExpiry ?? generalExpiry };+ }if (isBooleanOrStringTrue(req?.body?.isTemporary)) {- return createRetentionExpiry(req, dependencies);+ return createRetentionExpiry(req, dependencies, true);}return {};}}- if (!isBooleanOrStringTrue(req?.body?.isTemporary)) {+ if (!isRetentionAll && !isBooleanOrStringTrue(req?.body?.isTemporary)) {return {};}@@ -234,7 +266,10 @@ export async function getSharedLinkExpiration(}try {- return dependencies.createExpirationDate(req?.config?.interfaceConfig);+ return dependencies.createExpirationDate(+ req?.config?.interfaceConfig,+ convo.isTemporary === true || (convo.isTemporary == null && conversationExpiredAt != null),+ );} catch (err) {dependencies.logger?.error('[getSharedLinkExpiration] Error creating expiration date:', err);return null;@@ -249,6 +284,7 @@ export const createMinimalRetentionRequest = (}return {+ fileRetentionSource: req.fileRetentionSource,user: req.user? {id: req.user.id,diff --git a/packages/api/src/stream/GenerationJobManager.ts b/packages/api/src/stream/GenerationJobManager.tsindex 2b3eb57bd6..65873fd734 100644--- a/packages/api/src/stream/GenerationJobManager.ts+++ b/packages/api/src/stream/GenerationJobManager.ts@@ -2904,6 +2904,7 @@ class GenerationJobManagerClass {agent_id: jobData.agent_id,// Surface whether the turn was temporary so a resume keeps it non-persisted.isTemporary: jobData.isTemporary,+ retentionExpiresAt: jobData.retentionExpiresAt,agentEventDeliveryKey: jobData.agentEventDeliveryKey,agentEventInvocationKey: jobData.agentEventInvocationKey,agentEventInvocationGenerationCreatedAt: jobData.agentEventInvocationGenerationCreatedAt,diff --git a/packages/api/src/stream/__tests__/RedisJobStore.spec.ts b/packages/api/src/stream/__tests__/RedisJobStore.spec.tsindex 316e9bf222..72b873051c 100644--- a/packages/api/src/stream/__tests__/RedisJobStore.spec.ts+++ b/packages/api/src/stream/__tests__/RedisJobStore.spec.ts@@ -336,6 +336,7 @@ describe('RedisJobStore', () => {model: 'test-model',agent_id: 'agent-1',isTemporary: false,+ retentionExpiresAt: '2030-01-01T00:00:00.000Z',agentEventDeliveryKey: 'completion-delivery-1',agentEventInvocationKey: 'original-delivery-1',agentEventInvocationGenerationCreatedAt: 987654,@@ -433,6 +434,7 @@ describe('RedisJobStore', () => {model: 'test-model',agent_id: 'agent-1',isTemporary: false,+ retentionExpiresAt: '2030-01-01T00:00:00.000Z',scheduleId: 'schedule-1',scheduledFor: '2026-08-17T12:00:00.000Z',scheduleConfigRevision: 4,@@ -483,6 +485,7 @@ describe('RedisJobStore', () => {}),agent_id: 'agent-1',isTemporary: '0',+ retentionExpiresAt: '2030-01-01T00:00:00.000Z',scheduleId: 'schedule-1',scheduledFor: '2026-08-17T12:00:00.000Z',scheduleConfigRevision: '4',diff --git a/packages/api/src/stream/__tests__/startup.spec.ts b/packages/api/src/stream/__tests__/startup.spec.tsindex 407ca4d9d3..f85cb84d53 100644--- a/packages/api/src/stream/__tests__/startup.spec.ts+++ b/packages/api/src/stream/__tests__/startup.spec.ts@@ -113,6 +113,7 @@ describe('GenerationJobManager startup telemetry', () => {model: 'test-model',agent_id: 'agent-1',isTemporary: false,+ retentionExpiresAt: '2030-01-01T00:00:00.000Z',promptTokens: 0,discoveredTools: [],pendingAction: {@@ -149,6 +150,7 @@ describe('GenerationJobManager startup telemetry', () => {model: 'test-model',agent_id: 'agent-1',isTemporary: false,+ retentionExpiresAt: '2030-01-01T00:00:00.000Z',promptTokens: 0,discoveredTools: [],providerExecutionId: expect.any(String),diff --git a/packages/api/src/stream/implementations/RedisJobStore.ts b/packages/api/src/stream/implementations/RedisJobStore.tsindex 1659f045f6..982462f857 100644--- a/packages/api/src/stream/implementations/RedisJobStore.ts+++ b/packages/api/src/stream/implementations/RedisJobStore.ts@@ -5322,6 +5322,7 @@ export class RedisJobStore implements IJobStoreV2 {promptTokens: data.promptTokens ? parseInt(data.promptTokens, 10) : undefined,agent_id: data.agent_id || undefined,isTemporary: data.isTemporary != null ? data.isTemporary === '1' : undefined,+ retentionExpiresAt: data.retentionExpiresAt || undefined,agentEventDeliveryKey: data.agentEventDeliveryKey || undefined,agentEventInvocationKey: data.agentEventInvocationKey || undefined,agentEventInvocationGenerationCreatedAt: data.agentEventInvocationGenerationCreatedAtdiff --git a/packages/api/src/stream/interfaces/IJobStore.ts b/packages/api/src/stream/interfaces/IJobStore.tsindex 361ddccc28..4507661aeb 100644--- a/packages/api/src/stream/interfaces/IJobStore.ts+++ b/packages/api/src/stream/interfaces/IJobStore.ts@@ -320,6 +320,8 @@ export interface SerializableJobData {* resume request can't be trusted to re-send the flag.*/isTemporary?: boolean;+ /** Original server-authenticated retention deadline, serialized across replicas. */+ retentionExpiresAt?: string;agentEventDeliveryKey?: string;/** Original actor invocation when an internal completion delivery owns this generation. */agentEventInvocationKey?: string;@@ -453,6 +455,7 @@ export type JobMetadataPatch = Partial<| 'model'| 'agent_id'| 'isTemporary'+ | 'retentionExpiresAt'| 'agentEventDeliveryKey'| 'agentEventInvocationKey'| 'agentEventInvocationGenerationCreatedAt'diff --git a/packages/api/src/stream/metadata.ts b/packages/api/src/stream/metadata.tsindex 4720788c1f..a3bdbcbf04 100644--- a/packages/api/src/stream/metadata.ts+++ b/packages/api/src/stream/metadata.ts@@ -36,6 +36,9 @@ export function sanitizeJobMetadata(metadata: Partial<GenerationJobMetadata>): Jif (metadata.isTemporary !== undefined) {patch.isTemporary = metadata.isTemporary;}+ if (metadata.retentionExpiresAt !== undefined) {+ patch.retentionExpiresAt = metadata.retentionExpiresAt;+ }if (metadata.agentEventDeliveryKey) {patch.agentEventDeliveryKey = metadata.agentEventDeliveryKey;}diff --git a/packages/api/src/types/stream.ts b/packages/api/src/types/stream.tsindex cac50e8fb5..d3096cb1c8 100644--- a/packages/api/src/types/stream.ts+++ b/packages/api/src/types/stream.ts@@ -52,6 +52,8 @@ export interface GenerationJobMetadata {agent_id?: string;/** Whether the originating turn was a temporary chat; a HITL resume keeps it so. */isTemporary?: boolean;+ /** Original server-authenticated retention deadline, serialized across replicas. */+ retentionExpiresAt?: string;/** Exact durable delivery whose accepted continuation created this generation. */agentEventDeliveryKey?: string;/** Original actor invocation when the current mailbox delivery is an internal completion. */diff --git a/packages/data-provider/specs/config-schemas.spec.ts b/packages/data-provider/specs/config-schemas.spec.tsindex 7d6f4cf14e..0671696509 100644--- a/packages/data-provider/specs/config-schemas.spec.ts+++ b/packages/data-provider/specs/config-schemas.spec.ts@@ -1398,6 +1398,27 @@ describe('configSchema skillSync', () => {});describe('interfaceSchema', () => {+ it('accepts independent retention periods', () => {+ expect(+ interfaceSchema.parse({+ retentionMode: RetentionMode.ALL,+ temporaryChatRetention: 1,+ generalChatRetention: 2160,+ }),+ ).toMatchObject({+ temporaryChatRetention: 1,+ generalChatRetention: 2160,+ });+ expect(interfaceSchema.parse({})).not.toHaveProperty('generalChatRetention');+ });++ it.each([0, 8761, '2160', null])(+ 'rejects invalid general retention: %s',+ (generalChatRetention) => {+ expect(interfaceSchema.safeParse({ generalChatRetention }).success).toBe(false);+ },+ );+it('silently strips removed legacy fields', () => {const result = interfaceSchema.parse({endpointsMenu: true,diff --git a/packages/data-provider/src/config.ts b/packages/data-provider/src/config.tsindex 997f391016..90f31d15bd 100644--- a/packages/data-provider/src/config.ts+++ b/packages/data-provider/src/config.ts@@ -1827,6 +1827,7 @@ export const interfaceSchema = z.optional(),temporaryChat: z.boolean().optional(),temporaryChatRetention: z.number().min(1).max(8760).optional(),+ generalChatRetention: z.number().min(1).max(8760).optional(),autoSubmitFromUrl: z.boolean().optional(),retentionMode: z.nativeEnum(RetentionMode).default(RetentionMode.TEMPORARY),retainAgentFiles: z.boolean().optional(),diff --git a/packages/data-schemas/src/app/interface.spec.ts b/packages/data-schemas/src/app/interface.spec.tsindex 1242534871..ec46835078 100644--- a/packages/data-schemas/src/app/interface.spec.ts+++ b/packages/data-schemas/src/app/interface.spec.ts@@ -168,10 +168,11 @@ describe('loadDefaultInterface', () => {expect(interfaceConfig?.autoSubmitFromUrl).toBe(true);});- it('preserves the configured temporary chat retention period', async () => {+ it('preserves the configured chat retention periods', async () => {const config: Partial<TCustomConfig> = {interface: {temporaryChatRetention: 24,+ generalChatRetention: 2160,},};@@ -181,6 +182,7 @@ describe('loadDefaultInterface', () => {});expect(interfaceConfig?.temporaryChatRetention).toBe(24);+ expect(interfaceConfig?.generalChatRetention).toBe(2160);});it('omits temporary chat retention when it is not explicitly configured', async () => {@@ -190,6 +192,7 @@ describe('loadDefaultInterface', () => {});expect(interfaceConfig).not.toHaveProperty('temporaryChatRetention');+ expect(interfaceConfig).not.toHaveProperty('generalChatRetention');});it('preserves the configured agent file retention exemption', async () => {diff --git a/packages/data-schemas/src/app/interface.ts b/packages/data-schemas/src/app/interface.tsindex 6fb9967d9b..d396393be9 100644--- a/packages/data-schemas/src/app/interface.ts+++ b/packages/data-schemas/src/app/interface.ts@@ -53,6 +53,7 @@ export async function loadDefaultInterface({agents: interfaceConfig?.agents,temporaryChat: interfaceConfig?.temporaryChat,temporaryChatRetention: interfaceConfig?.temporaryChatRetention,+ generalChatRetention: interfaceConfig?.generalChatRetention,retentionMode: interfaceConfig?.retentionMode,retainAgentFiles: interfaceConfig?.retainAgentFiles,runCode: interfaceConfig?.runCode,diff --git a/packages/data-schemas/src/methods/conversation.spec.ts b/packages/data-schemas/src/methods/conversation.spec.tsindex 1997406cda..273c32e14c 100644--- a/packages/data-schemas/src/methods/conversation.spec.ts+++ b/packages/data-schemas/src/methods/conversation.spec.ts@@ -14,6 +14,7 @@ import type {IAgentEventActorSuspensionEvidence,IChatProject,IConversation,+ AppConfig,} from '../types';import { ConversationMethods, createConversationMethods } from './conversation';import { tenantStorage, runAsSystem } from '~/config/tenantContext';@@ -122,7 +123,7 @@ describe('Conversation Operations', () => {userId: string;isTemporary?: boolean;expiredAt?: Date;- interfaceConfig?: { temporaryChatRetention?: number; retentionMode?: RetentionMode };+ interfaceConfig?: AppConfig['interfaceConfig'];};let mockConversationData: {conversationId: string;@@ -1376,6 +1377,73 @@ describe('Conversation Operations', () => {expect(secondSave?.expiredAt).toBeNull();});+ it.each([true, false, undefined])(+ 'uses the independent retention period for isTemporary=%s',+ async (isTemporary) => {+ mockCtx.isTemporary = isTemporary;+ mockCtx.interfaceConfig = {+ temporaryChatRetention: 1,+ generalChatRetention: 2160,+ retentionMode: RetentionMode.ALL,+ };+ const now = Date.now();+ const result = await saveConvo(mockCtx, mockConversationData);+ const expectedHours = isTemporary === true ? 1 : 2160;++ expect(result?.isTemporary).toBe(isTemporary === true);+ expect(result?.expiredAt?.getTime()).toBeGreaterThanOrEqual(now + expectedHours * 3600000);+ expect(result?.expiredAt?.getTime()).toBeLessThan(now + expectedHours * 3600000 + 5000);+ },+ );++ it('ignores caller-supplied retention fields', async () => {+ mockCtx.isTemporary = undefined;+ mockCtx.interfaceConfig = {+ temporaryChatRetention: 1,+ generalChatRetention: 2160,+ retentionMode: RetentionMode.ALL,+ };+ const suppliedExpiration = new Date('2099-01-01T00:00:00.000Z');++ const result = await saveConvo(mockCtx, {+ ...mockConversationData,+ isTemporary: true,+ expiredAt: suppliedExpiration,+ });++ expect(result?.isTemporary).toBe(false);+ expect(result?.expiredAt).not.toEqual(suppliedExpiration);+ });++ it.each([true, false])(+ 'preserves the stored deadline when chat type %s is omitted',+ async (isTemporary) => {+ mockCtx.isTemporary = isTemporary;+ mockCtx.interfaceConfig = {+ temporaryChatRetention: 1,+ generalChatRetention: 2160,+ retentionMode: RetentionMode.ALL,+ };+ const first = await saveConvo(mockCtx, mockConversationData);+ mockCtx.isTemporary = undefined;+ const second = await saveConvo(mockCtx, { ...mockConversationData });+ expect(second?.isTemporary).toBe(isTemporary);+ expect(second?.expiredAt).toEqual(first?.expiredAt);+ },+ );++ it('preserves an explicitly inherited deadline with separate retention periods', async () => {+ mockCtx.isTemporary = false;+ mockCtx.expiredAt = new Date(Date.now() + 60000);+ mockCtx.interfaceConfig = {+ temporaryChatRetention: 1,+ generalChatRetention: 2160,+ retentionMode: RetentionMode.ALL,+ };+ const result = await saveConvo(mockCtx, mockConversationData);+ expect(result?.expiredAt).toEqual(mockCtx.expiredAt);+ });+it('should set expiredAt for non-temporary conversation when retentionMode is ALL', async () => {mockCtx.isTemporary = false;mockCtx.interfaceConfig = {diff --git a/packages/data-schemas/src/methods/conversation.ts b/packages/data-schemas/src/methods/conversation.tsindex 5c526a2039..e449535240 100644--- a/packages/data-schemas/src/methods/conversation.ts+++ b/packages/data-schemas/src/methods/conversation.ts@@ -42,9 +42,9 @@ import {refreshChatProjectStatsForUser,updateChatProjectLastConversationForUser,} from './chatProject';+import { createChatExpirationDate, createTempChatExpirationDate } from '~/utils/tempChatRetention';import { isAgentFadingTier, isAgentFadingTierEntries } from '~/utils/fading';import { isCompactionSemanticIndexProjection } from '~/types/compaction';-import { createTempChatExpirationDate } from '~/utils/tempChatRetention';import { tenantSafeBulkWrite } from '~/utils/tenantBulkWrite';import { isValidObjectIdString } from '~/utils/objectId';import { decrementTagCounts } from './conversationTag';@@ -486,7 +486,7 @@ export interface ConversationMethods {getConvoRetention(user: string,conversationId: string,- ): Promise<Pick<IConversation, 'expiredAt'> | null>;+ ): Promise<Pick<IConversation, 'expiredAt' | 'isTemporary'> | null>;getConvoTitle(user: string, conversationId: string): Promise<string | null>;deleteConvos(user: string,@@ -2069,11 +2069,11 @@ export function createConversationMethods(async function getConvoRetention(user: string,conversationId: string,- ): Promise<Pick<IConversation, 'expiredAt'> | null> {+ ): Promise<Pick<IConversation, 'expiredAt' | 'isTemporary'> | null> {try {const Conversation = mongoose.models.Conversation as Model<IConversation>;- return await Conversation.findOne({ user, conversationId }, 'expiredAt').lean<- Pick<IConversation, 'expiredAt'>+ return await Conversation.findOne({ user, conversationId }, 'expiredAt isTemporary').lean<+ Pick<IConversation, 'expiredAt' | 'isTemporary'>>();} catch (error) {logger.error('[getConvoRetention] Error getting conversation retention fields', error);@@ -2172,6 +2172,8 @@ export function createConversationMethods(const appendMessageIds = metadata?.appendMessageIds;const update: Record<string, unknown> = { ...convo, user: userId };+ delete update.isTemporary;+ delete update.expiredAt;delete update.initial_agent_id;stripActorCheckpointFields(update);if (appendMessageIds == null) {@@ -2218,6 +2220,7 @@ export function createConversationMethods(update.conversationId = newConversationId;}+ let retentionOnInsert: { expiredAt: Date; isTemporary: false } | undefined;if (expiredAt instanceof Date && !Number.isNaN(expiredAt.getTime())) {if (typeof isTemporary === 'boolean') {update.isTemporary = isTemporary;@@ -2227,12 +2230,31 @@ export function createConversationMethods(if (typeof isTemporary === 'boolean') {update.isTemporary = isTemporary;}- try {- update.expiredAt = createTempChatExpirationDate(interfaceConfig);- } catch (err) {- logger.error('Error creating temporary chat expiration date:', err);- logger.info(`---\`saveConvo\` context: ${metadata?.context}`);- update.expiredAt = createFallbackRetentionDate();+ if (+ typeof isTemporary === 'boolean' ||+ interfaceConfig.generalChatRetention === undefined+ ) {+ try {+ update.expiredAt = createChatExpirationDate(interfaceConfig, isTemporary);+ } catch (err) {+ logger.error('Error creating chat expiration date:', err);+ logger.info(`---\`saveConvo\` context: ${metadata?.context}`);+ update.expiredAt = createFallbackRetentionDate();+ }+ } else {+ try {+ retentionOnInsert = {+ expiredAt: createChatExpirationDate(interfaceConfig, false),+ isTemporary: false,+ };+ } catch (err) {+ logger.error('Error creating chat expiration date:', err);+ logger.info(`---\`saveConvo\` context: ${metadata?.context}`);+ retentionOnInsert = {+ expiredAt: createFallbackRetentionDate(),+ isTemporary: false,+ };+ }}} else if (isTemporary === true) {update.isTemporary = true;@@ -2290,6 +2312,7 @@ export function createConversationMethods(: createdAtOnInsert;operation.$setOnInsert = {initial_agent_id: initialAgentId,+ ...retentionOnInsert,...(createdAtForInsert ? { createdAt: createdAtForInsert } : {}),};return operation;@@ -2376,6 +2399,31 @@ export function createConversationMethods(return null;}+ /** Reuse the saved row's chat type when callers omit it, preserving existing deadlines. */+ if (+ interfaceConfig?.retentionMode === RetentionMode.ALL &&+ interfaceConfig.generalChatRetention !== undefined &&+ typeof isTemporary !== 'boolean' &&+ conversation.expiredAt == null+ ) {+ const deadline = createChatExpirationDate(+ interfaceConfig,+ conversation.isTemporary === true,+ );+ const result = await Conversation.updateOne(+ {+ _id: conversation._id,+ expiredAt: null,+ isTemporary: conversation.isTemporary === true ? true : { $ne: true },+ },+ { $set: { expiredAt: deadline } },+ { timestamps: false },+ );+ if (result.modifiedCount > 0) {+ conversation.expiredAt = deadline;+ }+ }+if (interfaceConfig?.retentionMode === RetentionMode.ALL &&typeof isTemporary !== 'boolean' &&diff --git a/packages/data-schemas/src/methods/message.spec.ts b/packages/data-schemas/src/methods/message.spec.tsindex f9b3350087..32b8978cce 100644--- a/packages/data-schemas/src/methods/message.spec.ts+++ b/packages/data-schemas/src/methods/message.spec.ts@@ -2,7 +2,7 @@ import mongoose from 'mongoose';import { v4 as uuidv4 } from 'uuid';import { MongoMemoryServer } from 'mongodb-memory-server';import { Constants, RetentionMode } from 'librechat-data-provider';-import type { IMessage } from '..';+import type { AppConfig, IMessage } from '..';import {createMessageMethods,CLIENT_MESSAGE_SELECT,@@ -112,7 +112,7 @@ describe('Message Operations', () => {userId: string;isTemporary?: boolean;expiredAt?: Date;- interfaceConfig?: { temporaryChatRetention?: number; retentionMode?: RetentionMode };+ interfaceConfig?: AppConfig['interfaceConfig'];};let mockMessageData: Partial<IMessage> = {messageId: 'msg123',@@ -2879,6 +2879,91 @@ describe('Message Operations', () => {);});+ it.each([true, false, undefined])(+ 'uses the independent retention period for isTemporary=%s',+ async (isTemporary) => {+ mockCtx.isTemporary = isTemporary;+ mockCtx.interfaceConfig = {+ temporaryChatRetention: 1,+ generalChatRetention: 2160,+ retentionMode: RetentionMode.ALL,+ };+ const now = Date.now();+ const result = await saveMessage(mockCtx, mockMessageData);+ const expectedHours = isTemporary === true ? 1 : 2160;++ expect(result?.isTemporary).toBe(isTemporary === true);+ expect(result?.expiredAt?.getTime()).toBeGreaterThanOrEqual(now + expectedHours * 3600000);+ expect(result?.expiredAt?.getTime()).toBeLessThan(now + expectedHours * 3600000 + 5000);+ },+ );++ it('atomically assigns general retention when inserting without a chat type', async () => {+ mockCtx.isTemporary = undefined;+ mockCtx.interfaceConfig = {+ temporaryChatRetention: 1,+ generalChatRetention: 2160,+ retentionMode: RetentionMode.ALL,+ };+ const followupWrite = jest+ .spyOn(Message, 'updateOne')+ .mockRejectedValue(new Error('offline'));++ const result = await saveMessage(mockCtx, mockMessageData);++ expect(result?.isTemporary).toBe(false);+ expect(result?.expiredAt).toBeInstanceOf(Date);+ expect(followupWrite).not.toHaveBeenCalled();+ });++ it('ignores caller-supplied retention fields', async () => {+ mockCtx.isTemporary = undefined;+ mockCtx.interfaceConfig = {+ temporaryChatRetention: 1,+ generalChatRetention: 2160,+ retentionMode: RetentionMode.ALL,+ };+ const suppliedExpiration = new Date('2099-01-01T00:00:00.000Z');++ const result = await saveMessage(mockCtx, {+ ...mockMessageData,+ isTemporary: true,+ expiredAt: suppliedExpiration,+ });++ expect(result?.isTemporary).toBe(false);+ expect(result?.expiredAt).not.toEqual(suppliedExpiration);+ });++ it.each([true, false])(+ 'preserves the stored deadline when chat type %s is omitted',+ async (isTemporary) => {+ mockCtx.isTemporary = isTemporary;+ mockCtx.interfaceConfig = {+ temporaryChatRetention: 1,+ generalChatRetention: 2160,+ retentionMode: RetentionMode.ALL,+ };+ const first = await saveMessage(mockCtx, mockMessageData);+ mockCtx.isTemporary = undefined;+ const second = await saveMessage(mockCtx, { ...mockMessageData });+ expect(second?.isTemporary).toBe(isTemporary);+ expect(second?.expiredAt).toEqual(first?.expiredAt);+ },+ );++ it('preserves an explicitly inherited deadline with separate retention periods', async () => {+ mockCtx.isTemporary = false;+ mockCtx.expiredAt = new Date(Date.now() + 60000);+ mockCtx.interfaceConfig = {+ temporaryChatRetention: 1,+ generalChatRetention: 2160,+ retentionMode: RetentionMode.ALL,+ };+ const result = await saveMessage(mockCtx, mockMessageData);+ expect(result?.expiredAt).toEqual(mockCtx.expiredAt);+ });+it('should set expiredAt for non-temporary message when retentionMode is ALL', async () => {mockCtx.isTemporary = false;mockCtx.interfaceConfig = {diff --git a/packages/data-schemas/src/methods/message.ts b/packages/data-schemas/src/methods/message.tsindex 5cba4f4a50..b59de98abe 100644--- a/packages/data-schemas/src/methods/message.ts+++ b/packages/data-schemas/src/methods/message.ts@@ -4,8 +4,8 @@ import type { UserSubmittedMessageFieldPath } from 'librechat-data-provider';import type { SearchParams } from 'meilisearch';import type { SchemaWithMeiliMethods } from '~/models/plugins/mongoMeili';import type { AppConfig, IConversation, IMessage } from '~/types';+import { createChatExpirationDate, createTempChatExpirationDate } from '~/utils/tempChatRetention';import { activeExpirationFilter, createFallbackRetentionDate } from '~/utils/retention';-import { createTempChatExpirationDate } from '~/utils/tempChatRetention';import { tenantSafeBulkWrite } from '~/utils/tenantBulkWrite';import logger from '~/config/winston';@@ -272,14 +272,27 @@ function getSteerUserSubmittedPaths(content: unknown): string[] {*/function buildMessageSaveUpdate(update: Record<string, unknown>,- options: { stampModelOutputOnInsert: boolean; unsetContextMeta: boolean },+ options: {+ stampModelOutputOnInsert: boolean;+ unsetContextMeta: boolean;+ retentionOnInsert?: { expiredAt: Date; isTemporary: false };+ },): UpdateQuery<IMessage> {- if (!options.stampModelOutputOnInsert && !options.unsetContextMeta) {+ if (+ !options.stampModelOutputOnInsert &&+ !options.unsetContextMeta &&+ options.retentionOnInsert == null+ ) {return update;}return {$set: update,- ...(options.stampModelOutputOnInsert && { $setOnInsert: { isUserSubmitted: false } }),+ ...((options.stampModelOutputOnInsert || options.retentionOnInsert != null) && {+ $setOnInsert: {+ ...(options.stampModelOutputOnInsert && { isUserSubmitted: false }),+ ...options.retentionOnInsert,+ },+ }),...(options.unsetContextMeta && { $unset: { contextMeta: 1 } }),};}@@ -290,7 +303,12 @@ async function findOneAndMergeMessageProvenance(update: Record<string, unknown>,userSubmittedPaths: readonly string[],userSubmittedMessageFieldPaths: readonly UserSubmittedMessageFieldPath[],- options: { upsert: boolean; stampModelOutputOnInsert?: boolean; unsetContextMeta?: boolean },+ options: {+ upsert: boolean;+ stampModelOutputOnInsert?: boolean;+ unsetContextMeta?: boolean;+ retentionOnInsert?: { expiredAt: Date; isTemporary: false };+ },) {const safeUpdate = { ...update };delete safeUpdate._id;@@ -332,6 +350,8 @@ async function findOneAndMergeMessageProvenance(filter,{$set: { ...safeUpdate, ...provenance },+ ...(current == null &&+ options.retentionOnInsert != null && { $setOnInsert: options.retentionOnInsert }),...(options.unsetContextMeta && { $unset: { contextMeta: 1 } }),},{ upsert: options.upsert && current == null, new: true },@@ -768,6 +788,9 @@ export function createMessageMethods(mongoose: typeof import('mongoose')): Messauser: userId,messageId: params.newMessageId || params.messageId,};+ delete update.isTemporary;+ delete update.expiredAt;+ let retentionOnInsert: { expiredAt: Date; isTemporary: false } | undefined;if (expiredAt instanceof Date && !Number.isNaN(expiredAt.getTime())) {if (typeof isTemporary === 'boolean') {@@ -778,12 +801,31 @@ export function createMessageMethods(mongoose: typeof import('mongoose')): Messaif (typeof isTemporary === 'boolean') {update.isTemporary = isTemporary;}- try {- update.expiredAt = createTempChatExpirationDate(interfaceConfig);- } catch (err) {- logger.error('Error creating temporary chat expiration date:', err);- logger.info(`---\`saveMessage\` context: ${metadata?.context}`);- update.expiredAt = createFallbackRetentionDate();+ if (+ typeof isTemporary === 'boolean' ||+ interfaceConfig.generalChatRetention === undefined+ ) {+ try {+ update.expiredAt = createChatExpirationDate(interfaceConfig, isTemporary);+ } catch (err) {+ logger.error('Error creating chat expiration date:', err);+ logger.info(`---\`saveMessage\` context: ${metadata?.context}`);+ update.expiredAt = createFallbackRetentionDate();+ }+ } else {+ try {+ retentionOnInsert = {+ expiredAt: createChatExpirationDate(interfaceConfig, false),+ isTemporary: false,+ };+ } catch (err) {+ logger.error('Error creating chat expiration date:', err);+ logger.info(`---\`saveMessage\` context: ${metadata?.context}`);+ retentionOnInsert = {+ expiredAt: createFallbackRetentionDate(),+ isTemporary: false,+ };+ }}} else if (isTemporary === true) {update.isTemporary = true;@@ -834,11 +876,15 @@ export function createMessageMethods(mongoose: typeof import('mongoose')): Messaupdate,userSubmittedPaths,userSubmittedMessageFieldPaths,- { upsert: true, stampModelOutputOnInsert, unsetContextMeta },+ { upsert: true, stampModelOutputOnInsert, unsetContextMeta, retentionOnInsert },): await Message.findOneAndUpdate({ messageId: params.messageId, user: userId },- buildMessageSaveUpdate(update, { stampModelOutputOnInsert, unsetContextMeta }),+ buildMessageSaveUpdate(update, {+ stampModelOutputOnInsert,+ unsetContextMeta,+ retentionOnInsert,+ }),{ upsert: true, new: true },);@@ -846,6 +892,28 @@ export function createMessageMethods(mongoose: typeof import('mongoose')): Messareturn message;}+ /** Reuse the saved row's chat type when callers omit it, preserving existing deadlines. */+ if (+ interfaceConfig?.retentionMode === RetentionMode.ALL &&+ interfaceConfig.generalChatRetention !== undefined &&+ typeof isTemporary !== 'boolean' &&+ message.expiredAt == null+ ) {+ const deadline = createChatExpirationDate(interfaceConfig, message.isTemporary === true);+ const result = await Message.updateOne(+ {+ _id: message._id,+ expiredAt: null,+ isTemporary: message.isTemporary === true ? true : { $ne: true },+ },+ { $set: { expiredAt: deadline } },+ { timestamps: false },+ );+ if (result.modifiedCount > 0) {+ message.expiredAt = deadline;+ }+ }+if (interfaceConfig?.retentionMode === RetentionMode.ALL &&typeof isTemporary !== 'boolean' &&diff --git a/packages/data-schemas/src/utils/tempChatRetention.spec.ts b/packages/data-schemas/src/utils/tempChatRetention.spec.tsindex 847088ab7c..c8b1ff72b5 100644--- a/packages/data-schemas/src/utils/tempChatRetention.spec.ts+++ b/packages/data-schemas/src/utils/tempChatRetention.spec.ts@@ -1,6 +1,8 @@+import { RetentionMode } from 'librechat-data-provider';import type { AppConfig } from '~/types';import {createTempChatExpirationDate,+ createChatExpirationDate,getTempChatRetentionHours,DEFAULT_RETENTION_HOURS,MIN_RETENTION_HOURS,@@ -90,6 +92,46 @@ describe('tempChatRetention', () => {});});+ describe('createChatExpirationDate', () => {+ it.each([+ [RetentionMode.ALL, true, 1],+ [RetentionMode.ALL, false, 2160],+ [RetentionMode.TEMPORARY, true, 1],+ [RetentionMode.TEMPORARY, false, 1],+ ])('selects the policy for mode=%s, temporary=%s', (retentionMode, isTemporary, hours) => {+ const now = Date.now();+ jest.spyOn(Date, 'now').mockReturnValue(now);+ expect(+ createChatExpirationDate(+ {+ retentionMode,+ temporaryChatRetention: 1,+ generalChatRetention: 2160,+ },+ isTemporary,+ ),+ ).toEqual(new Date(now + hours * 3600000));+ });++ it('keeps the existing environment fallback when general retention is omitted', () => {+ process.env.TEMP_CHAT_RETENTION_HOURS = '48';+ const now = Date.now();+ jest.spyOn(Date, 'now').mockReturnValue(now);+ expect(createChatExpirationDate({ retentionMode: RetentionMode.ALL })).toEqual(+ new Date(now + 48 * 3600000),+ );+ });++ it('uses general retention ahead of the temporary environment setting', () => {+ process.env.TEMP_CHAT_RETENTION_HOURS = '1';+ const now = Date.now();+ jest.spyOn(Date, 'now').mockReturnValue(now);+ expect(+ createChatExpirationDate({ retentionMode: RetentionMode.ALL, generalChatRetention: 2160 }),+ ).toEqual(new Date(now + 2160 * 3600000));+ });+ });+describe('createTempChatExpirationDate', () => {it('should create expiration date with default retention period', () => {const beforeCall = Date.now();diff --git a/packages/data-schemas/src/utils/tempChatRetention.ts b/packages/data-schemas/src/utils/tempChatRetention.tsindex 0012254625..45354439c8 100644--- a/packages/data-schemas/src/utils/tempChatRetention.ts+++ b/packages/data-schemas/src/utils/tempChatRetention.ts@@ -1,3 +1,4 @@+import { RetentionMode } from 'librechat-data-provider';import type { AppConfig } from '~/types';import logger from '~/config/winston';@@ -75,3 +76,22 @@ export function createTempChatExpirationDate(interfaceConfig?: AppConfig['interfconst retentionHours = getTempChatRetentionHours(interfaceConfig);return new Date(Date.now() + retentionHours * 60 * 60 * 1000);}++/** Regular chats fall back to the temporary retention policy for existing configurations. */+export function createChatExpirationDate(+ interfaceConfig?: AppConfig['interfaceConfig'],+ isTemporary: boolean = false,+): Date {+ if (+ isTemporary ||+ interfaceConfig?.retentionMode !== RetentionMode.ALL ||+ interfaceConfig.generalChatRetention === undefined+ ) {+ return createTempChatExpirationDate(interfaceConfig);+ }++ return createTempChatExpirationDate({+ ...interfaceConfig,+ temporaryChatRetention: interfaceConfig.generalChatRetention,+ });+}