From cc143b67f39b37604d313f454aedb87ea5e5d11e Mon Sep 17 00:00:00 2001 From: Aron Gates Date: Fri, 3 Apr 2026 12:13:03 +0100 Subject: [PATCH] feat: extend data retention to files, tool calls, and shared links Add expiredAt field and TTL indexes to file, toolCall, and share schemas. Set expiredAt on tool calls, shared links, and file uploads when retentionMode is "all" or chat is temporary. (cherry picked from commit 48973752d353fcef5c68dee9d17344afd54aee9c) Co-Authored-By: Claude Opus 4.6 (1M context) --- api/server/controllers/tools.js | 12 +++++++- api/server/routes/share.js | 28 +++++++++++++++++-- api/server/services/Files/Code/process.js | 3 ++ api/server/services/Files/process.js | 28 +++++++++++++++++++ .../components/Chat/Menus/BookmarkMenu.tsx | 6 ++-- packages/data-schemas/src/methods/message.ts | 5 +--- packages/data-schemas/src/methods/share.ts | 9 +++++- packages/data-schemas/src/schema/file.ts | 4 +++ packages/data-schemas/src/schema/share.ts | 5 ++++ packages/data-schemas/src/schema/toolCall.ts | 5 ++++ packages/data-schemas/src/types/file.ts | 1 + packages/data-schemas/src/types/share.ts | 1 + 12 files changed, 95 insertions(+), 12 deletions(-) diff --git a/api/server/controllers/tools.js b/api/server/controllers/tools.js index 07be1210c1..dfc5c03f42 100644 --- a/api/server/controllers/tools.js +++ b/api/server/controllers/tools.js @@ -1,11 +1,12 @@ const { nanoid } = require('nanoid'); const { logger } = require('@librechat/data-schemas'); -const { checkAccess, loadWebSearchAuth } = require('@librechat/api'); +const { checkAccess, loadWebSearchAuth, createTempChatExpirationDate } = require('@librechat/api'); const { Tools, AuthType, Permissions, ToolCallTypes, + RetentionMode, PermissionTypes, } = require('librechat-data-provider'); const { getRoleByName, createToolCall, getToolCallsByConvo, getMessage } = require('~/models'); @@ -169,6 +170,15 @@ const callTool = async (req, res) => { user: req.user.id, }; + if (req?.body?.isTemporary || appConfig?.interfaceConfig?.retentionMode === RetentionMode.ALL) { + try { + toolCallData.expiredAt = createTempChatExpirationDate(appConfig?.interfaceConfig); + } catch (err) { + logger.error('Error creating tool call expiration date:', err); + toolCallData.expiredAt = null; + } + } + if (!artifact || !artifact.files || toolId !== Tools.execute_code) { createToolCall(toolCallData).catch((error) => { logger.error(`Error creating tool call: ${error.message}`); diff --git a/api/server/routes/share.js b/api/server/routes/share.js index 296644afde..d2c992b27b 100644 --- a/api/server/routes/share.js +++ b/api/server/routes/share.js @@ -1,6 +1,7 @@ const express = require('express'); -const { isEnabled } = require('@librechat/api'); +const { isEnabled, createTempChatExpirationDate } = require('@librechat/api'); const { logger } = require('@librechat/data-schemas'); +const { RetentionMode } = require('librechat-data-provider'); const { getSharedMessages, createSharedLink, @@ -98,7 +99,20 @@ router.get('/link/:conversationId', requireJwtAuth, async (req, res) => { router.post('/:conversationId', requireJwtAuth, async (req, res) => { try { const { targetMessageId } = req.body; - const created = await createSharedLink(req.user.id, req.params.conversationId, targetMessageId); + let expiredAt; + if (req?.config?.interfaceConfig?.retentionMode === RetentionMode.ALL) { + try { + expiredAt = createTempChatExpirationDate(req.config?.interfaceConfig); + } catch (err) { + logger.error('Error creating shared link expiration date:', err); + } + } + const created = await createSharedLink( + req.user.id, + req.params.conversationId, + targetMessageId, + expiredAt, + ); if (created) { res.status(200).json(created); } else { @@ -112,7 +126,15 @@ router.post('/:conversationId', requireJwtAuth, async (req, res) => { router.patch('/:shareId', requireJwtAuth, async (req, res) => { try { - const updatedShare = await updateSharedLink(req.user.id, req.params.shareId); + let expiredAt; + if (req?.config?.interfaceConfig?.retentionMode === RetentionMode.ALL) { + try { + expiredAt = createTempChatExpirationDate(req.config?.interfaceConfig); + } catch (err) { + logger.error('Error creating shared link expiration date:', err); + } + } + const updatedShare = await updateSharedLink(req.user.id, req.params.shareId, expiredAt); if (updatedShare) { res.status(200).json(updatedShare); } else { diff --git a/api/server/services/Files/Code/process.js b/api/server/services/Files/Code/process.js index adda87b201..da5583d293 100644 --- a/api/server/services/Files/Code/process.js +++ b/api/server/services/Files/Code/process.js @@ -36,6 +36,7 @@ const { filterFilesByAgentAccess } = require('~/server/services/Files/permission const { createFile, getFiles, updateFile, claimCodeFile } = require('~/models'); const { getStrategyFunctions } = require('~/server/services/Files/strategies'); const { convertImage } = require('~/server/services/Files/images/convert'); +const { getRetentionExpiry } = require('~/server/services/Files/process'); const { determineFileType } = require('~/server/utils'); const axios = createAxiosInstance(); @@ -463,6 +464,7 @@ const processCodeOutput = async ({ source: appConfig.fileStrategy, context: FileContext.execute_code, metadata: { codeEnvRef }, + ...getRetentionExpiry(req), }; await createFile(file, true); return { file: Object.assign(file, { messageId, toolCallId }) }; @@ -565,6 +567,7 @@ const processCodeOutput = async ({ context: FileContext.execute_code, usage: isUpdate ? (claimed.usage ?? 0) + 1 : 1, createdAt: isUpdate ? claimed.createdAt : formattedDate, + ...getRetentionExpiry(req), }; if (expectsPreview) { diff --git a/api/server/services/Files/process.js b/api/server/services/Files/process.js index ea8ee14840..fc811df496 100644 --- a/api/server/services/Files/process.js +++ b/api/server/services/Files/process.js @@ -8,6 +8,7 @@ const { FileContext, FileSources, imageExtRegex, + RetentionMode, EModelEndpoint, EToolResources, mergeFileConfig, @@ -23,6 +24,7 @@ const { sanitizeFilename, parseText, processAudioFile, + createTempChatExpirationDate, getStorageMetadata, } = require('@librechat/api'); const { @@ -41,6 +43,23 @@ const { determineFileType } = require('~/server/utils'); const { STTService } = require('./Audio/STTService'); const db = require('~/models'); +/** + * Returns `{ expiredAt }` when the request indicates data retention applies, otherwise `{}`. + * Spread into file data objects before calling createFile. + * @param {ServerRequest} req + * @returns {{ expiredAt?: Date }} + */ +function getRetentionExpiry(req) { + if (req?.body?.isTemporary || req?.config?.interfaceConfig?.retentionMode === RetentionMode.ALL) { + try { + return { expiredAt: createTempChatExpirationDate(req.config?.interfaceConfig) }; + } catch (_err) { + return {}; + } + } + return {}; +} + /** * Creates a modular file upload wrapper that ensures filename sanitization * across all storage strategies. This prevents storage-specific implementations @@ -355,6 +374,7 @@ const processImageFile = async ({ req, res, metadata, returnFile = false }) => { context: FileContext.message_attachment, source, type: `image/${appConfig.imageOutputType}`, + ...getRetentionExpiry(req), width, height, tenantId: req.user.tenantId, @@ -415,6 +435,7 @@ const uploadImageBuffer = async ({ req, context, metadata = {}, resize = true }) source, type, width, + ...getRetentionExpiry(req), height, tenantId: req.user.tenantId, }, @@ -517,6 +538,7 @@ const processFileUpload = async ({ req, res, metadata }) => { context: isAssistantUpload ? FileContext.assistants : FileContext.message_attachment, model: isAssistantUpload ? req.body.model : undefined, type: file.mimetype, + ...getRetentionExpiry(req), embedded, source, height, @@ -643,6 +665,7 @@ const processAgentFileUpload = async ({ req, res, metadata }) => { filename: file.originalname, model: messageAttachment ? undefined : req.body.model, context: messageAttachment ? FileContext.message_attachment : FileContext.agents, + ...getRetentionExpiry(req), tenantId: req.user.tenantId, }); @@ -841,6 +864,7 @@ const processAgentFileUpload = async ({ req, res, metadata }) => { source, height, width, + ...getRetentionExpiry(req), tenantId: req.user.tenantId, }); @@ -887,6 +911,7 @@ const processOpenAIFile = async ({ source, model: openai.req.body.model, filename: originalName ?? file_id, + ...getRetentionExpiry(openai.req), tenantId: openai.req?.user?.tenantId, }; @@ -931,6 +956,7 @@ const processOpenAIImageOutput = async ({ req, buffer, file_id, filename, fileEx context: FileContext.assistants_output, file_id, filename, + ...getRetentionExpiry(req), tenantId: req.user.tenantId, }; db.createFile(file, true); @@ -1091,6 +1117,7 @@ async function saveBase64Image( user: req.user.id, bytes: image.bytes, width: image.width, + ...getRetentionExpiry(req), height: image.height, tenantId: req.user.tenantId, }, @@ -1178,6 +1205,7 @@ function filterFile({ req, image, isAvatar }) { module.exports = { filterFile, + getRetentionExpiry, processFileURL, saveBase64Image, processImageFile, diff --git a/client/src/components/Chat/Menus/BookmarkMenu.tsx b/client/src/components/Chat/Menus/BookmarkMenu.tsx index 7fc106e57b..d7567b2019 100644 --- a/client/src/components/Chat/Menus/BookmarkMenu.tsx +++ b/client/src/components/Chat/Menus/BookmarkMenu.tsx @@ -61,9 +61,9 @@ const BookmarkMenu: FC = () => { const isActiveConvo = Boolean( conversation && - conversationId && - conversationId !== Constants.NEW_CONVO && - conversationId !== 'search', + conversationId && + conversationId !== Constants.NEW_CONVO && + conversationId !== 'search', ); const handleSubmit = useCallback( diff --git a/packages/data-schemas/src/methods/message.ts b/packages/data-schemas/src/methods/message.ts index 4c78c48c29..ebbc7d187b 100644 --- a/packages/data-schemas/src/methods/message.ts +++ b/packages/data-schemas/src/methods/message.ts @@ -92,10 +92,7 @@ export function createMessageMethods(mongoose: typeof import('mongoose')): Messa messageId: params.newMessageId || params.messageId, }; - if ( - isTemporary || - interfaceConfig?.retentionMode === RetentionMode.ALL - ) { + if (isTemporary || interfaceConfig?.retentionMode === RetentionMode.ALL) { try { update.expiredAt = createTempChatExpirationDate(interfaceConfig); } catch (err) { diff --git a/packages/data-schemas/src/methods/share.ts b/packages/data-schemas/src/methods/share.ts index 2a0d2bc3bd..fe3a0c8607 100644 --- a/packages/data-schemas/src/methods/share.ts +++ b/packages/data-schemas/src/methods/share.ts @@ -345,6 +345,7 @@ export function createShareMethods(mongoose: typeof import('mongoose')) { user: string, conversationId: string, targetMessageId?: string, + expiredAt?: Date, ): Promise { if (!user || !conversationId) { throw new ShareServiceError('Missing required parameters', 'INVALID_PARAMS'); @@ -408,6 +409,7 @@ export function createShareMethods(mongoose: typeof import('mongoose')) { title, user, ...(targetMessageId && { targetMessageId }), + ...(expiredAt && { expiredAt }), }); return { shareId, conversationId }; @@ -460,7 +462,11 @@ export function createShareMethods(mongoose: typeof import('mongoose')) { /** * Update a shared link with new messages */ - async function updateSharedLink(user: string, shareId: string): Promise { + async function updateSharedLink( + user: string, + shareId: string, + expiredAt?: Date, + ): Promise { if (!user || !shareId) { throw new ShareServiceError('Missing required parameters', 'INVALID_PARAMS'); } @@ -485,6 +491,7 @@ export function createShareMethods(mongoose: typeof import('mongoose')) { messages: updatedMessages, user, shareId: newShareId, + ...(expiredAt && { expiredAt }), }; const updatedShare = (await SharedLink.findOneAndUpdate({ shareId, user }, update, { diff --git a/packages/data-schemas/src/schema/file.ts b/packages/data-schemas/src/schema/file.ts index c8e7c72f52..502dcc4873 100644 --- a/packages/data-schemas/src/schema/file.ts +++ b/packages/data-schemas/src/schema/file.ts @@ -144,12 +144,16 @@ const file: Schema = new Schema( type: String, index: true, }, + expiredAt: { + type: Date, + }, }, { timestamps: true, }, ); +file.index({ expiredAt: 1 }, { expireAfterSeconds: 0 }); file.index({ createdAt: 1, updatedAt: 1 }); file.index( { filename: 1, conversationId: 1, context: 1, tenantId: 1 }, diff --git a/packages/data-schemas/src/schema/share.ts b/packages/data-schemas/src/schema/share.ts index 3238084889..616536fe52 100644 --- a/packages/data-schemas/src/schema/share.ts +++ b/packages/data-schemas/src/schema/share.ts @@ -8,6 +8,7 @@ export interface ISharedLink extends Document { shareId?: string; targetMessageId?: string; isPublic: boolean; + expiredAt?: Date; createdAt?: Date; updatedAt?: Date; tenantId?: string; @@ -45,10 +46,14 @@ const shareSchema: Schema = new Schema( type: String, index: true, }, + expiredAt: { + type: Date, + }, }, { timestamps: true }, ); +shareSchema.index({ expiredAt: 1 }, { expireAfterSeconds: 0 }); shareSchema.index({ conversationId: 1, user: 1, targetMessageId: 1, tenantId: 1 }); export default shareSchema; diff --git a/packages/data-schemas/src/schema/toolCall.ts b/packages/data-schemas/src/schema/toolCall.ts index d36d6b758a..cde2163ca3 100644 --- a/packages/data-schemas/src/schema/toolCall.ts +++ b/packages/data-schemas/src/schema/toolCall.ts @@ -10,6 +10,7 @@ export interface IToolCallData extends Document { attachments?: TAttachment[]; blockIndex?: number; partIndex?: number; + expiredAt?: Date; createdAt?: Date; updatedAt?: Date; tenantId?: string; @@ -50,10 +51,14 @@ const toolCallSchema: Schema = new Schema( type: String, index: true, }, + expiredAt: { + type: Date, + }, }, { timestamps: true }, ); +toolCallSchema.index({ expiredAt: 1 }, { expireAfterSeconds: 0 }); toolCallSchema.index({ messageId: 1, user: 1, tenantId: 1 }); toolCallSchema.index({ conversationId: 1, user: 1, tenantId: 1 }); diff --git a/packages/data-schemas/src/types/file.ts b/packages/data-schemas/src/types/file.ts index b47a18abb6..c7cf4e77bc 100644 --- a/packages/data-schemas/src/types/file.ts +++ b/packages/data-schemas/src/types/file.ts @@ -72,6 +72,7 @@ export interface IMongoFile extends Omit { codeEnvRef?: CodeEnvRef; }; expiresAt?: Date; + expiredAt?: Date; createdAt?: Date; updatedAt?: Date; tenantId?: string; diff --git a/packages/data-schemas/src/types/share.ts b/packages/data-schemas/src/types/share.ts index 8b54990cf4..dc0203cb93 100644 --- a/packages/data-schemas/src/types/share.ts +++ b/packages/data-schemas/src/types/share.ts @@ -10,6 +10,7 @@ export interface ISharedLink { shareId?: string; targetMessageId?: string; isPublic: boolean; + expiredAt?: Date; createdAt?: Date; updatedAt?: Date; }