From 1bbfa8d603ccbe2f233dea95752d5143b4e81f22 Mon Sep 17 00:00:00 2001
From: Nevo David <me@nevos.io>
Date: Fri, 3 Apr 2026 22:25:24 +0700
Subject: [PATCH] feat: fix header for all agents

---
 libraries/nestjs-libraries/src/chat/start.mcp.ts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/libraries/nestjs-libraries/src/chat/start.mcp.ts b/libraries/nestjs-libraries/src/chat/start.mcp.ts
index 7eff14a5..6f8afd0f 100644
--- a/libraries/nestjs-libraries/src/chat/start.mcp.ts
+++ b/libraries/nestjs-libraries/src/chat/start.mcp.ts
@@ -7,6 +7,17 @@ import { OrganizationService } from '@gitroom/nestjs-libraries/database/prisma/o
 import { OAuthService } from '@gitroom/nestjs-libraries/database/prisma/oauth/oauth.service';
 import { runWithContext } from './async.storage';
 import { createOAuthMiddleware } from './oauth-middleware';
+const fixAcceptHeader = (req: Request) => {
+  const value = 'application/json, text/event-stream';
+  req.headers.accept = value;
+  const idx = req.rawHeaders.findIndex((h) => h.toLowerCase() === 'accept');
+  if (idx !== -1) {
+    req.rawHeaders[idx + 1] = value;
+  } else {
+    req.rawHeaders.push('Accept', value);
+  }
+};
+
 export const startMcp = async (app: INestApplication) => {
   const mastraService = app.get(MastraService, { strict: false });
   const organizationService = app.get(OrganizationService, { strict: false });
@@ -95,6 +106,7 @@ export const startMcp = async (app: INestApplication) => {
       return;
     }
 
+    fixAcceptHeader(req);
     await runWithContext({ requestId: token!, auth }, async () => {
       await server.startHTTP({
         url: url,
@@ -144,6 +156,7 @@ export const startMcp = async (app: INestApplication) => {
 
     const url = new URL('/mcp', process.env.NEXT_PUBLIC_BACKEND_URL);
 
+    fixAcceptHeader(req);
     // @ts-ignore
     await runWithContext({ requestId: token, auth: req.auth }, async () => {
       await server.startHTTP({
@@ -186,6 +199,7 @@ export const startMcp = async (app: INestApplication) => {
       process.env.NEXT_PUBLIC_BACKEND_URL
     );
 
+    fixAcceptHeader(req);
     await runWithContext(
       // @ts-ignore
       { requestId: req.params.id, auth: req.auth },