From c488d08483d73bde05e97ae9170f88d9159e43d8 Mon Sep 17 00:00:00 2001
From: Harshith Mullapudi <harshithmullapudi@gmail.com>
Date: Sun, 24 Aug 2025 15:14:48 +0530
Subject: [PATCH] Fix: mcp server stream is failing in mid flight

---
 apps/webapp/app/services/mcp.server.ts | 8 ++++++--
 apps/webapp/server.ts                  | 9 +++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/apps/webapp/app/services/mcp.server.ts b/apps/webapp/app/services/mcp.server.ts
index ae51763..3e6dccf 100644
--- a/apps/webapp/app/services/mcp.server.ts
+++ b/apps/webapp/app/services/mcp.server.ts
@@ -229,13 +229,17 @@ export const handleMCPRequest = async (
 export const handleSessionRequest = async (
   req: Request,
   res: Response,
-  workspaceId: string,
+  userId: string,
 ) => {
   const sessionId = req.headers["mcp-session-id"] as string | undefined;
+  const workspace = await getWorkspaceByUser(userId);
 
   if (
     sessionId &&
-    (await MCPSessionManager.isSessionActive(sessionId, workspaceId))
+    (await MCPSessionManager.isSessionActive(
+      sessionId,
+      workspace?.id as string,
+    ))
   ) {
     const sessionData = TransportManager.getSessionInfo(sessionId);
 
diff --git a/apps/webapp/server.ts b/apps/webapp/server.ts
index 85303a4..e82f87b 100644
--- a/apps/webapp/server.ts
+++ b/apps/webapp/server.ts
@@ -3,10 +3,7 @@ import compression from "compression";
 import express from "express";
 import morgan from "morgan";
 
-// import {
-//   handleMCPRequest,
-//   handleSessionRequest,
-// } from "~/services/mcp.server";
+// import { handleMCPRequest, handleSessionRequest } from "~/services/mcp.server";
 // import { authenticateHybridRequest } from "~/services/routeBuilders/apiBuilder.server";
 
 let viteDevServer: any;
@@ -65,7 +62,7 @@ async function init() {
       return;
     }
 
-    await module.handleSessionRequest(req, res);
+    await module.handleSessionRequest(req, res, authenticationResult.userId);
   });
 
   app.post("/api/v1/mcp", async (req, res) => {
@@ -116,7 +113,7 @@ async function init() {
       return;
     }
 
-    await module.handleSessionRequest(req, res);
+    await module.handleSessionRequest(req, res, authenticationResult.userId);
   });
 
   app.options("/api/v1/mcp", (_, res) => {