mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-06-25 17:06:24 +00:00
Code-execution outputs land on `messages.attachments` (set by `processCodeOutput`), while user uploads land on `messages.files`. The threadFileIds switch (#13004) walked only `files`, so on a single linear thread: Turn 1: assistant produces sample.xlsx → attachment with codeEnvRef Turn 2: user says "add 2 rows" → primeCodeFiles: file_ids=0 resourceFiles=0 → /exec sent files=[] → sandbox: FileNotFoundError: 'sample.xlsx' The `getThreadData` walk found zero file_ids because the assistant's codeEnvRef was on `attachments`, not `files`. Compounded by the DB select string `'messageId parentMessageId files'` which didn't pull `attachments` into memory in the first place — so even fixing the walk in isolation wouldn't have surfaced them. Both layers fixed: - `ThreadMessage` type adds `attachments?: Array<{ file_id?: string }>` - `getThreadData` walks both arrays, dedups via the same Set - `initialize.ts` selects `'messageId parentMessageId files attachments'` ## Test plan `packages/api/src/utils/message.spec.ts` (+6 cases): - collects file_ids from `attachments` - walks both `files` and `attachments` on the same message - regression: linear thread with code-output attachments across user→assistant→user→assistant produces the right file_ids - dedupes shared ids that appear in both arrays - skips attachments without file_id (mirrors `files` behavior) - empty `attachments` array `packages/api/src/agents/__tests__/initialize.test.ts` (+1 case): - locks the DB select string includes `attachments` alongside `files` / `messageId` / `parentMessageId` - [x] `npx jest src/utils/message.spec.ts` — 39/39 pass - [x] `npx jest src/agents/__tests__/initialize.test.ts` — 33/33 pass - [x] lint clean on all four touched files
582 lines
18 KiB
TypeScript
582 lines
18 KiB
TypeScript
import { Constants } from 'librechat-data-provider';
|
|
import {
|
|
sanitizeMessageForTransmit,
|
|
sanitizeFileForTransmit,
|
|
buildMessageFiles,
|
|
getThreadData,
|
|
} from './message';
|
|
|
|
/** Cast to string for type compatibility with ThreadMessage */
|
|
const NO_PARENT = Constants.NO_PARENT as string;
|
|
|
|
describe('sanitizeFileForTransmit', () => {
|
|
it('should remove text field from file', () => {
|
|
const file = {
|
|
file_id: 'test-123',
|
|
filename: 'test.txt',
|
|
text: 'This is a very long text content that should be stripped',
|
|
bytes: 1000,
|
|
};
|
|
|
|
const result = sanitizeFileForTransmit(file);
|
|
|
|
expect(result.file_id).toBe('test-123');
|
|
expect(result.filename).toBe('test.txt');
|
|
expect(result.bytes).toBe(1000);
|
|
expect(result).not.toHaveProperty('text');
|
|
});
|
|
|
|
it('should remove _id and __v fields', () => {
|
|
const file = {
|
|
file_id: 'test-123',
|
|
_id: 'mongo-id',
|
|
__v: 0,
|
|
filename: 'test.txt',
|
|
};
|
|
|
|
const result = sanitizeFileForTransmit(file);
|
|
|
|
expect(result.file_id).toBe('test-123');
|
|
expect(result).not.toHaveProperty('_id');
|
|
expect(result).not.toHaveProperty('__v');
|
|
});
|
|
|
|
it('should not modify original file object', () => {
|
|
const file = {
|
|
file_id: 'test-123',
|
|
text: 'original text',
|
|
};
|
|
|
|
sanitizeFileForTransmit(file);
|
|
|
|
expect(file.text).toBe('original text');
|
|
});
|
|
});
|
|
|
|
describe('sanitizeMessageForTransmit', () => {
|
|
it('should remove fileContext from message', () => {
|
|
const message = {
|
|
messageId: 'msg-123',
|
|
text: 'Hello world',
|
|
fileContext: 'This is a very long context that should be stripped',
|
|
};
|
|
|
|
const result = sanitizeMessageForTransmit(message);
|
|
|
|
expect(result.messageId).toBe('msg-123');
|
|
expect(result.text).toBe('Hello world');
|
|
expect(result).not.toHaveProperty('fileContext');
|
|
});
|
|
|
|
it('should sanitize files array', () => {
|
|
const message = {
|
|
messageId: 'msg-123',
|
|
files: [
|
|
{ file_id: 'file-1', text: 'long text 1', filename: 'a.txt' },
|
|
{ file_id: 'file-2', text: 'long text 2', filename: 'b.txt' },
|
|
],
|
|
};
|
|
|
|
const result = sanitizeMessageForTransmit(message);
|
|
|
|
expect(result.files).toHaveLength(2);
|
|
expect(result.files?.[0].file_id).toBe('file-1');
|
|
expect(result.files?.[0].filename).toBe('a.txt');
|
|
expect(result.files?.[0]).not.toHaveProperty('text');
|
|
expect(result.files?.[1]).not.toHaveProperty('text');
|
|
});
|
|
|
|
it('should handle null/undefined message', () => {
|
|
expect(sanitizeMessageForTransmit(null as unknown as object)).toBeNull();
|
|
expect(sanitizeMessageForTransmit(undefined as unknown as object)).toBeUndefined();
|
|
});
|
|
|
|
it('should handle message without files', () => {
|
|
const message = {
|
|
messageId: 'msg-123',
|
|
text: 'Hello',
|
|
};
|
|
|
|
const result = sanitizeMessageForTransmit(message);
|
|
|
|
expect(result.messageId).toBe('msg-123');
|
|
expect(result.text).toBe('Hello');
|
|
});
|
|
|
|
it('should create new array reference for empty files array (immutability)', () => {
|
|
const message = {
|
|
messageId: 'msg-123',
|
|
files: [] as { file_id: string }[],
|
|
};
|
|
|
|
const result = sanitizeMessageForTransmit(message);
|
|
|
|
expect(result.files).toEqual([]);
|
|
// New array reference ensures full immutability even for empty arrays
|
|
expect(result.files).not.toBe(message.files);
|
|
});
|
|
|
|
it('should not modify original message object', () => {
|
|
const message = {
|
|
messageId: 'msg-123',
|
|
fileContext: 'original context',
|
|
files: [{ file_id: 'file-1', text: 'original text' }],
|
|
};
|
|
|
|
sanitizeMessageForTransmit(message);
|
|
|
|
expect(message.fileContext).toBe('original context');
|
|
expect(message.files[0].text).toBe('original text');
|
|
});
|
|
});
|
|
|
|
describe('buildMessageFiles', () => {
|
|
const baseAttachment = {
|
|
file_id: 'file-1',
|
|
filename: 'test.png',
|
|
filepath: '/uploads/test.png',
|
|
type: 'image/png',
|
|
bytes: 512,
|
|
object: 'file' as const,
|
|
user: 'user-1',
|
|
embedded: false,
|
|
usage: 0,
|
|
text: 'big ocr text',
|
|
_id: 'mongo-id',
|
|
};
|
|
|
|
it('returns sanitized files matching request file IDs', () => {
|
|
const result = buildMessageFiles([{ file_id: 'file-1' }], [baseAttachment]);
|
|
expect(result).toHaveLength(1);
|
|
expect(result?.[0].file_id).toBe('file-1');
|
|
expect(result?.[0]).not.toHaveProperty('text');
|
|
expect(result?.[0]).not.toHaveProperty('_id');
|
|
});
|
|
|
|
it('returns undefined when no attachments match request IDs', () => {
|
|
const result = buildMessageFiles([{ file_id: 'file-nomatch' }], [baseAttachment]);
|
|
expect(result).toEqual([]);
|
|
});
|
|
|
|
it('returns undefined for empty attachments array', () => {
|
|
const result = buildMessageFiles([{ file_id: 'file-1' }], []);
|
|
expect(result).toEqual([]);
|
|
});
|
|
|
|
it('returns undefined for empty request files array', () => {
|
|
const result = buildMessageFiles([], [baseAttachment]);
|
|
expect(result).toEqual([]);
|
|
});
|
|
|
|
it('filters out undefined file_id entries in request files (no set poisoning)', () => {
|
|
const undefinedAttachment = { ...baseAttachment, file_id: undefined as unknown as string };
|
|
const result = buildMessageFiles(
|
|
[{ file_id: undefined }, { file_id: 'file-1' }],
|
|
[undefinedAttachment, baseAttachment],
|
|
);
|
|
expect(result).toHaveLength(1);
|
|
expect(result?.[0].file_id).toBe('file-1');
|
|
});
|
|
|
|
it('returns only attachments whose file_id is in the request set', () => {
|
|
const attachment2 = { ...baseAttachment, file_id: 'file-2', filename: 'b.png' };
|
|
const result = buildMessageFiles([{ file_id: 'file-1' }], [baseAttachment, attachment2]);
|
|
expect(result).toHaveLength(1);
|
|
expect(result?.[0].file_id).toBe('file-1');
|
|
});
|
|
|
|
it('does not mutate original attachment objects', () => {
|
|
buildMessageFiles([{ file_id: 'file-1' }], [baseAttachment]);
|
|
expect(baseAttachment.text).toBe('big ocr text');
|
|
expect(baseAttachment._id).toBe('mongo-id');
|
|
});
|
|
});
|
|
|
|
describe('getThreadData', () => {
|
|
it('should return empty result for empty messages array', () => {
|
|
const result = getThreadData([], 'parent-123');
|
|
|
|
expect(result.messageIds).toEqual([]);
|
|
expect(result.fileIds).toEqual([]);
|
|
});
|
|
|
|
it('should return empty result for null parentMessageId', () => {
|
|
const messages = [
|
|
{ messageId: 'msg-1', parentMessageId: null },
|
|
{ messageId: 'msg-2', parentMessageId: 'msg-1' },
|
|
];
|
|
|
|
const result = getThreadData(messages, null);
|
|
|
|
expect(result.messageIds).toEqual([]);
|
|
expect(result.fileIds).toEqual([]);
|
|
});
|
|
|
|
it('should return empty result for undefined parentMessageId', () => {
|
|
const messages = [{ messageId: 'msg-1', parentMessageId: null }];
|
|
|
|
const result = getThreadData(messages, undefined);
|
|
|
|
expect(result.messageIds).toEqual([]);
|
|
expect(result.fileIds).toEqual([]);
|
|
});
|
|
|
|
it('should return empty result when parentMessageId not found in messages', () => {
|
|
const messages = [
|
|
{ messageId: 'msg-1', parentMessageId: null },
|
|
{ messageId: 'msg-2', parentMessageId: 'msg-1' },
|
|
];
|
|
|
|
const result = getThreadData(messages, 'non-existent');
|
|
|
|
expect(result.messageIds).toEqual([]);
|
|
expect(result.fileIds).toEqual([]);
|
|
});
|
|
|
|
describe('thread traversal', () => {
|
|
it('should traverse a simple linear thread', () => {
|
|
const messages = [
|
|
{ messageId: 'msg-1', parentMessageId: NO_PARENT },
|
|
{ messageId: 'msg-2', parentMessageId: 'msg-1' },
|
|
{ messageId: 'msg-3', parentMessageId: 'msg-2' },
|
|
];
|
|
|
|
const result = getThreadData(messages, 'msg-3');
|
|
|
|
expect(result.messageIds).toEqual(['msg-3', 'msg-2', 'msg-1']);
|
|
expect(result.fileIds).toEqual([]);
|
|
});
|
|
|
|
it('should stop at NO_PARENT constant', () => {
|
|
const messages = [
|
|
{ messageId: 'msg-1', parentMessageId: NO_PARENT },
|
|
{ messageId: 'msg-2', parentMessageId: 'msg-1' },
|
|
];
|
|
|
|
const result = getThreadData(messages, 'msg-2');
|
|
|
|
expect(result.messageIds).toEqual(['msg-2', 'msg-1']);
|
|
});
|
|
|
|
it('should collect only messages in the thread branch', () => {
|
|
// Branched conversation: msg-1 -> msg-2 -> msg-3 (branch A)
|
|
// msg-1 -> msg-4 -> msg-5 (branch B)
|
|
const messages = [
|
|
{ messageId: 'msg-1', parentMessageId: NO_PARENT },
|
|
{ messageId: 'msg-2', parentMessageId: 'msg-1' },
|
|
{ messageId: 'msg-3', parentMessageId: 'msg-2' },
|
|
{ messageId: 'msg-4', parentMessageId: 'msg-1' },
|
|
{ messageId: 'msg-5', parentMessageId: 'msg-4' },
|
|
];
|
|
|
|
const resultBranchA = getThreadData(messages, 'msg-3');
|
|
expect(resultBranchA.messageIds).toEqual(['msg-3', 'msg-2', 'msg-1']);
|
|
|
|
const resultBranchB = getThreadData(messages, 'msg-5');
|
|
expect(resultBranchB.messageIds).toEqual(['msg-5', 'msg-4', 'msg-1']);
|
|
});
|
|
|
|
it('should handle single message thread', () => {
|
|
const messages = [{ messageId: 'msg-1', parentMessageId: NO_PARENT }];
|
|
|
|
const result = getThreadData(messages, 'msg-1');
|
|
|
|
expect(result.messageIds).toEqual(['msg-1']);
|
|
expect(result.fileIds).toEqual([]);
|
|
});
|
|
});
|
|
|
|
describe('circular reference protection', () => {
|
|
it('should handle circular references without infinite loop', () => {
|
|
// Malformed data: msg-2 points to msg-3 which points back to msg-2
|
|
const messages = [
|
|
{ messageId: 'msg-1', parentMessageId: NO_PARENT },
|
|
{ messageId: 'msg-2', parentMessageId: 'msg-3' },
|
|
{ messageId: 'msg-3', parentMessageId: 'msg-2' },
|
|
];
|
|
|
|
const result = getThreadData(messages, 'msg-2');
|
|
|
|
// Should stop when encountering a visited ID
|
|
expect(result.messageIds).toEqual(['msg-2', 'msg-3']);
|
|
expect(result.fileIds).toEqual([]);
|
|
});
|
|
|
|
it('should handle self-referencing message', () => {
|
|
const messages = [{ messageId: 'msg-1', parentMessageId: 'msg-1' }];
|
|
|
|
const result = getThreadData(messages, 'msg-1');
|
|
|
|
expect(result.messageIds).toEqual(['msg-1']);
|
|
});
|
|
});
|
|
|
|
describe('file ID collection', () => {
|
|
it('should collect file IDs from messages with files', () => {
|
|
const messages = [
|
|
{
|
|
messageId: 'msg-1',
|
|
parentMessageId: NO_PARENT,
|
|
files: [{ file_id: 'file-1' }, { file_id: 'file-2' }],
|
|
},
|
|
{
|
|
messageId: 'msg-2',
|
|
parentMessageId: 'msg-1',
|
|
files: [{ file_id: 'file-3' }],
|
|
},
|
|
];
|
|
|
|
const result = getThreadData(messages, 'msg-2');
|
|
|
|
expect(result.messageIds).toEqual(['msg-2', 'msg-1']);
|
|
expect(result.fileIds).toContain('file-1');
|
|
expect(result.fileIds).toContain('file-2');
|
|
expect(result.fileIds).toContain('file-3');
|
|
expect(result.fileIds).toHaveLength(3);
|
|
});
|
|
|
|
it('should deduplicate file IDs across messages', () => {
|
|
const messages = [
|
|
{
|
|
messageId: 'msg-1',
|
|
parentMessageId: NO_PARENT,
|
|
files: [{ file_id: 'file-shared' }, { file_id: 'file-1' }],
|
|
},
|
|
{
|
|
messageId: 'msg-2',
|
|
parentMessageId: 'msg-1',
|
|
files: [{ file_id: 'file-shared' }, { file_id: 'file-2' }],
|
|
},
|
|
];
|
|
|
|
const result = getThreadData(messages, 'msg-2');
|
|
|
|
expect(result.fileIds).toContain('file-shared');
|
|
expect(result.fileIds).toContain('file-1');
|
|
expect(result.fileIds).toContain('file-2');
|
|
expect(result.fileIds).toHaveLength(3);
|
|
});
|
|
|
|
it('should skip files without file_id', () => {
|
|
const messages = [
|
|
{
|
|
messageId: 'msg-1',
|
|
parentMessageId: NO_PARENT,
|
|
files: [{ file_id: 'file-1' }, { file_id: undefined }, { file_id: '' }],
|
|
},
|
|
];
|
|
|
|
const result = getThreadData(messages, 'msg-1');
|
|
|
|
expect(result.fileIds).toEqual(['file-1']);
|
|
});
|
|
|
|
it('should handle messages with empty files array', () => {
|
|
const messages = [
|
|
{
|
|
messageId: 'msg-1',
|
|
parentMessageId: NO_PARENT,
|
|
files: [],
|
|
},
|
|
{
|
|
messageId: 'msg-2',
|
|
parentMessageId: 'msg-1',
|
|
files: [{ file_id: 'file-1' }],
|
|
},
|
|
];
|
|
|
|
const result = getThreadData(messages, 'msg-2');
|
|
|
|
expect(result.messageIds).toEqual(['msg-2', 'msg-1']);
|
|
expect(result.fileIds).toEqual(['file-1']);
|
|
});
|
|
|
|
it('should handle messages without files property', () => {
|
|
const messages = [
|
|
{ messageId: 'msg-1', parentMessageId: NO_PARENT },
|
|
{
|
|
messageId: 'msg-2',
|
|
parentMessageId: 'msg-1',
|
|
files: [{ file_id: 'file-1' }],
|
|
},
|
|
];
|
|
|
|
const result = getThreadData(messages, 'msg-2');
|
|
|
|
expect(result.messageIds).toEqual(['msg-2', 'msg-1']);
|
|
expect(result.fileIds).toEqual(['file-1']);
|
|
});
|
|
|
|
it('should only collect files from messages in the thread', () => {
|
|
// msg-3 is not in the thread from msg-2
|
|
const messages = [
|
|
{
|
|
messageId: 'msg-1',
|
|
parentMessageId: NO_PARENT,
|
|
files: [{ file_id: 'file-1' }],
|
|
},
|
|
{
|
|
messageId: 'msg-2',
|
|
parentMessageId: 'msg-1',
|
|
files: [{ file_id: 'file-2' }],
|
|
},
|
|
{
|
|
messageId: 'msg-3',
|
|
parentMessageId: 'msg-1',
|
|
files: [{ file_id: 'file-3' }],
|
|
},
|
|
];
|
|
|
|
const result = getThreadData(messages, 'msg-2');
|
|
|
|
expect(result.fileIds).toContain('file-1');
|
|
expect(result.fileIds).toContain('file-2');
|
|
expect(result.fileIds).not.toContain('file-3');
|
|
});
|
|
});
|
|
|
|
describe('attachment ID collection (code-execution outputs)', () => {
|
|
/* Code-execution outputs land on `messages.attachments`, not
|
|
* `messages.files` — `processCodeOutput` writes the artifact
|
|
* there. Walking only `files` silently dropped every code-output
|
|
* file_id, so the next turn's `tool_resources.execute_code.file_ids`
|
|
* came up empty and the sandbox saw `_injected_files: []`. The
|
|
* user-visible symptom: "the previous file isn't persisted
|
|
* between executions" on a single linear thread (no branching
|
|
* needed). Lock the contract that both fields are walked. */
|
|
it('collects file_ids from message.attachments (code-execution outputs)', () => {
|
|
const messages = [
|
|
{ messageId: 'msg-user', parentMessageId: NO_PARENT },
|
|
{
|
|
messageId: 'msg-assistant',
|
|
parentMessageId: 'msg-user',
|
|
attachments: [{ file_id: 'attach-1' }, { file_id: 'attach-2' }],
|
|
},
|
|
];
|
|
|
|
const result = getThreadData(messages, 'msg-assistant');
|
|
|
|
expect(result.fileIds).toContain('attach-1');
|
|
expect(result.fileIds).toContain('attach-2');
|
|
expect(result.fileIds).toHaveLength(2);
|
|
});
|
|
|
|
it('walks both files (user uploads) and attachments (code outputs) on the same message', () => {
|
|
/* In practice they land on different roles by convention, but
|
|
* the walk shouldn't depend on that — it should be honest about
|
|
* collecting from both arrays regardless of where they appear. */
|
|
const messages = [
|
|
{
|
|
messageId: 'msg-1',
|
|
parentMessageId: NO_PARENT,
|
|
files: [{ file_id: 'user-uploaded' }],
|
|
attachments: [{ file_id: 'code-generated' }],
|
|
},
|
|
];
|
|
|
|
const result = getThreadData(messages, 'msg-1');
|
|
|
|
expect(result.fileIds).toContain('user-uploaded');
|
|
expect(result.fileIds).toContain('code-generated');
|
|
expect(result.fileIds).toHaveLength(2);
|
|
});
|
|
|
|
it('regression: collects code-output across user→assistant→user→assistant chain', () => {
|
|
/* Mirrors the exact failure mode from the field report — two
|
|
* sequential turns producing the same xlsx, both attachments
|
|
* on assistant messages. With only `files` walked, turn 2's
|
|
* priming ran with `file_ids=0` and the sandbox FileNotFound'd. */
|
|
const messages = [
|
|
{ messageId: 'user-1', parentMessageId: NO_PARENT },
|
|
{
|
|
messageId: 'asst-1',
|
|
parentMessageId: 'user-1',
|
|
attachments: [{ file_id: 'sample-xlsx-v1' }],
|
|
},
|
|
{ messageId: 'user-2', parentMessageId: 'asst-1' },
|
|
{
|
|
messageId: 'asst-2',
|
|
parentMessageId: 'user-2',
|
|
attachments: [{ file_id: 'sample-xlsx-v2' }],
|
|
},
|
|
];
|
|
|
|
/* From parentMessageId = 'asst-2', walking back through the
|
|
* full chain. Both attachment file_ids must surface so
|
|
* primeFiles can resolve them via getCodeGeneratedFiles. */
|
|
const result = getThreadData(messages, 'asst-2');
|
|
|
|
expect(result.fileIds).toContain('sample-xlsx-v1');
|
|
expect(result.fileIds).toContain('sample-xlsx-v2');
|
|
expect(result.fileIds).toHaveLength(2);
|
|
});
|
|
|
|
it('dedupes file_ids that appear in both files and attachments arrays', () => {
|
|
const messages = [
|
|
{
|
|
messageId: 'msg-1',
|
|
parentMessageId: NO_PARENT,
|
|
files: [{ file_id: 'shared-id' }],
|
|
attachments: [{ file_id: 'shared-id' }, { file_id: 'attach-only' }],
|
|
},
|
|
];
|
|
|
|
const result = getThreadData(messages, 'msg-1');
|
|
|
|
expect(result.fileIds).toContain('shared-id');
|
|
expect(result.fileIds).toContain('attach-only');
|
|
expect(result.fileIds).toHaveLength(2);
|
|
});
|
|
|
|
it('skips attachments without file_id (mirrors files behavior)', () => {
|
|
const messages = [
|
|
{
|
|
messageId: 'msg-1',
|
|
parentMessageId: NO_PARENT,
|
|
attachments: [{ file_id: 'attach-1' }, { file_id: undefined }, { file_id: '' }],
|
|
},
|
|
];
|
|
|
|
const result = getThreadData(messages, 'msg-1');
|
|
|
|
expect(result.fileIds).toEqual(['attach-1']);
|
|
});
|
|
|
|
it('handles messages with empty attachments array', () => {
|
|
const messages = [
|
|
{
|
|
messageId: 'msg-1',
|
|
parentMessageId: NO_PARENT,
|
|
attachments: [],
|
|
},
|
|
];
|
|
|
|
const result = getThreadData(messages, 'msg-1');
|
|
|
|
expect(result.fileIds).toEqual([]);
|
|
});
|
|
});
|
|
|
|
describe('performance - O(1) lookups', () => {
|
|
it('should handle large message arrays efficiently', () => {
|
|
// Create a linear thread of 1000 messages
|
|
const messages = [];
|
|
for (let i = 0; i < 1000; i++) {
|
|
messages.push({
|
|
messageId: `msg-${i}`,
|
|
parentMessageId: i === 0 ? NO_PARENT : `msg-${i - 1}`,
|
|
files: [{ file_id: `file-${i}` }],
|
|
});
|
|
}
|
|
|
|
const startTime = performance.now();
|
|
const result = getThreadData(messages, 'msg-999');
|
|
const endTime = performance.now();
|
|
|
|
expect(result.messageIds).toHaveLength(1000);
|
|
expect(result.fileIds).toHaveLength(1000);
|
|
// Should complete in reasonable time (< 100ms for 1000 messages)
|
|
expect(endTime - startTime).toBeLessThan(100);
|
|
});
|
|
});
|
|
});
|