Skip to content

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

🛂 fix: Preserve Legacy Assistant Attribution (#15118)

Danny Avila8f9fae0a6e10
diff --git a/api/server/controllers/agents/client.test.js b/api/server/controllers/agents/client.test.js
index 2f7a08a047..e803f699ea 100644
--- a/api/server/controllers/agents/client.test.js
+++ b/api/server/controllers/agents/client.test.js
@@ -3211,6 +3211,52 @@ describe('AgentClient - titleConvo', () => {
).toThrow(expect.objectContaining({ code: 'content_filter_block' }));
});
+ it('preserves persisted assistant attribution at the final agent provider boundary', async () => {
+ const marker = 'E2E-PERSISTED-UNATTRIBUTED-ASSISTANT';
+ mockReq.config.filters = {
+ messages: {
+ pii: {
+ fields: ['text'],
+ starterPatterns: [],
+ customPatterns: [
+ {
+ id: 'persisted-unattributed-assistant',
+ label: 'persisted unattributed assistant content',
+ regex: `^${marker}$`,
+ },
+ ],
+ },
+ unattributedAssistantContent: 'inspect',
+ },
+ };
+ const storedMessage = {
+ messageId: 'legacy-assistant',
+ parentMessageId: null,
+ sender: 'Assistant',
+ text: marker,
+ isCreatedByUser: false,
+ };
+ client.setModelBoundStoredMessages([storedMessage]);
+
+ const result = await client.buildMessages([storedMessage], 'legacy-assistant', {}, {});
+ const { messages: providerMessages } = jest
+ .requireActual('@librechat/agents')
+ .formatAgentMessages(result.prompt);
+
+ expect(() =>
+ client
+ .createModelBoundChatModelCallback()
+ .handleChatModelStart(undefined, [providerMessages]),
+ ).toThrow(expect.objectContaining({ code: 'content_filter_block' }));
+
+ client.setModelBoundStoredMessages([{ ...storedMessage, isUserSubmitted: false }]);
+ expect(() =>
+ client
+ .createModelBoundChatModelCallback()
+ .handleChatModelStart(undefined, [providerMessages]),
+ ).not.toThrow();
+ });
+
it('ignores historical file refs when this agent does not replay files', async () => {
mockReq.config.filters = {
files: {
diff --git a/packages/api/src/middleware/modelBoundContent.ts b/packages/api/src/middleware/modelBoundContent.ts
index ec5477ac59..cce2094a03 100644
--- a/packages/api/src/middleware/modelBoundContent.ts
+++ b/packages/api/src/middleware/modelBoundContent.ts
@@ -1986,7 +1986,9 @@ function projectStoredMessageForProvider(
role: message.role,
isCreatedByUser: message.isCreatedByUser,
isUserSubmitted: message.isUserSubmitted,
- ...(selectedContentPartIndices == null && messageContentCandidate == null && storedText != null
+ ...(messageContentCandidate == null &&
+ storedText != null &&
+ (selectedContentPartIndices == null || selectedContentPartIndices.has(0))
? { text: storedText }
: {}),
...(attribution === 'user' && {