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: Handle Pre-Session 406 for Optional SSE MCP Stream (#13202)

Peter Nancarrow2418f854df41
diff --git a/packages/api/src/mcp/__tests__/MCPConnectionAgentLifecycle.test.ts b/packages/api/src/mcp/__tests__/MCPConnectionAgentLifecycle.test.ts
index c7b6b273ba..99cfa2363a 100644
--- a/packages/api/src/mcp/__tests__/MCPConnectionAgentLifecycle.test.ts
+++ b/packages/api/src/mcp/__tests__/MCPConnectionAgentLifecycle.test.ts
@@ -538,11 +538,15 @@ describe('MCPConnection SSE 404 handling – session-aware', () => {
});
}
- function fire404(conn: MCPConnection, transport: ReturnType<typeof makeTransportStub>) {
+ function fireSSEError(
+ conn: MCPConnection,
+ transport: ReturnType<typeof makeTransportStub>,
+ code = 404,
+ ) {
(
conn as unknown as { setupTransportErrorHandlers: (t: unknown) => void }
).setupTransportErrorHandlers(transport);
- const sseError = Object.assign(new Error('Failed to open SSE stream'), { code: 404 });
+ const sseError = Object.assign(new Error('Failed to open SSE stream'), { code });
transport.onerror?.(sseError);
}
@@ -556,7 +560,7 @@ describe('MCPConnection SSE 404 handling – session-aware', () => {
const transport = makeTransportStub();
const emitSpy = jest.spyOn(conn, 'emit');
- fire404(conn, transport);
+ fireSSEError(conn, transport);
expect(mockLogger.warn).toHaveBeenCalledWith(expect.stringContaining('no session'));
expect(emitSpy).not.toHaveBeenCalledWith('connectionChange', 'error');
@@ -567,7 +571,7 @@ describe('MCPConnection SSE 404 handling – session-aware', () => {
const transport = makeTransportStub('existing-session-id');
const emitSpy = jest.spyOn(conn, 'emit');
- fire404(conn, transport);
+ fireSSEError(conn, transport);
expect(mockLogger.warn).toHaveBeenCalledWith(expect.stringContaining('session lost'));
expect(emitSpy).toHaveBeenCalledWith('connectionChange', 'error');
@@ -578,10 +582,32 @@ describe('MCPConnection SSE 404 handling – session-aware', () => {
const transport = makeTransportStub('');
const emitSpy = jest.spyOn(conn, 'emit');
- fire404(conn, transport);
+ fireSSEError(conn, transport);
expect(emitSpy).not.toHaveBeenCalledWith('connectionChange', 'error');
});
+
+ it('treats a 406 before session establishment as an unsupported optional SSE stream', () => {
+ const conn = makeConn();
+ const transport = makeTransportStub();
+ const emitSpy = jest.spyOn(conn, 'emit');
+
+ fireSSEError(conn, transport, 406);
+
+ expect(mockLogger.warn).toHaveBeenCalledWith(expect.stringContaining('no session'));
+ expect(emitSpy).not.toHaveBeenCalledWith('connectionChange', 'error');
+ });
+
+ it('falls through on a 406 when a session already exists', () => {
+ const conn = makeConn();
+ const transport = makeTransportStub('existing-session-id');
+ const emitSpy = jest.spyOn(conn, 'emit');
+
+ fireSSEError(conn, transport, 406);
+
+ expect(mockLogger.warn).toHaveBeenCalledWith(expect.stringContaining('session lost'));
+ expect(emitSpy).toHaveBeenCalledWith('connectionChange', 'error');
+ });
});
describe('MCPConnection SSE stream disconnect handling', () => {
diff --git a/packages/api/src/mcp/connection.ts b/packages/api/src/mcp/connection.ts
index 9f779d7e87..fb9481b8b1 100644
--- a/packages/api/src/mcp/connection.ts
+++ b/packages/api/src/mcp/connection.ts
@@ -1283,7 +1283,7 @@ export class MCPConnection extends EventEmitter {
isTransient,
} = extractSSEErrorMessage(error);
- if (errorCode === 400 || errorCode === 404 || errorCode === 405) {
+ if (errorCode === 400 || errorCode === 404 || errorCode === 405 || errorCode === 406) {
const hasSession =
'sessionId' in transport &&
(transport as { sessionId?: string }).sessionId != null &&