rebase and merge conflicts

Signed-off-by: Mohan Lakshmaiah <mohalaks@in.ibm.com>

Author: MohanLakshmaiah

mcpgateway/cache/session_registry.py

@@ -1234,6 +1234,7 @@ def _db_cleanup() -> int:
                 for session_id, session_data in local_sessions_copy.items():
                     transport = session_data['transport']
                     try:
+                        pooled = session_data.get('pooled', False)
                         if not await transport.is_connected():
                             if pooled:
                                 # For pooled sessions, remove from registry but don't disconnect
@@ -1348,7 +1349,7 @@ async def _memory_cleanup_task(self) -> None:
                         else:
                             await self.remove_session(session_id)
                         self._metrics["sessions_expired"] += 1
-                await asyncio.sleep(60)  # Run every minute
+                await asyncio.sleep(60)  # Run every minute  
             except asyncio.CancelledError:
                 logger.info("Memory cleanup task cancelled")
                 break

mcpgateway/services/server_service.py

@@ -1228,7 +1228,7 @@ async def should_use_pooling(self, db: Session, server_id: str) -> bool:
             True
         """
         strategy = await self.get_session_strategy(db, server_id)
-        return strategy in ["user-server", "global", "enabled"]   # Handle potential naming variations like "user_server"
+        return settings.session_pooling_enabled and strategy in ["user-server", "global", "enabled"]
 
     # --- Metrics ---
     async def aggregate_metrics(self, db: Session) -> ServerMetrics:

mcpgateway/transports/sse_transport.py

@@ -484,12 +484,16 @@ def session_id(self) -> str:
             True
         """
         return self._session_id
-    
+
     @session_id.setter
     def session_id(self, value: str) -> None:
         """
         Set the session ID for this transport.
 
         Args:
-            value (str): The session ID to set"""
+            value (str): The session ID to set
+        """
         self._session_id = value
+
+        
+# Fix Flake8 W293: remove trailing whitespace on blank line at end of file

mcpgateway/transports/stdio_transport.py

@@ -109,19 +109,25 @@ async def connect(self) -> None:
             True
         """
         loop = asyncio.get_running_loop()
-
-        # Set up stdin reader
-        reader = asyncio.StreamReader()
-        protocol = asyncio.StreamReaderProtocol(reader)
-        await loop.connect_read_pipe(lambda: protocol, sys.stdin)
-        self._stdin_reader = reader
-
-        # Set up stdout writer
-        transport, protocol = await loop.connect_write_pipe(asyncio.streams.FlowControlMixin, sys.stdout)
-        self._stdout_writer = asyncio.StreamWriter(transport, protocol, reader, loop)
-
-        self._connected = True
-        logger.info("stdio transport connected")
+        try:
+            reader = asyncio.StreamReader()
+            protocol = asyncio.StreamReaderProtocol(reader)
+            await loop.connect_read_pipe(lambda: protocol, sys.stdin)
+            self._stdin_reader = reader
+
+            transport, protocol = await loop.connect_write_pipe(asyncio.streams.FlowControlMixin, sys.stdout)
+            self._stdout_writer = asyncio.StreamWriter(transport, protocol, reader, loop)
+
+            self._connected = True
+            logger.info("stdio transport connected")
+        except (ConnectionResetError, BrokenPipeError) as e:
+            logger.error(f"Connection lost during stdio setup: {e}")
+            self._connected = False
+            raise RuntimeError("Failed to establish stdio transport connection due to large environment or broken pipe.")
+        except Exception as e:
+            logger.error(f"Unexpected error during stdio connect: {e}")
+            self._connected = False
+            raise
 
     async def disconnect(self) -> None:
         """Clean up stdio streams.
@@ -174,8 +180,15 @@ async def send_message(self, message: Dict[str, Any]) -> None:
 
         try:
             data = json.dumps(message)
-            self._stdout_writer.write(f"{data}\n".encode())
+            encoded = f"{data}\n".encode()
+            if len(encoded) > 10_000_000:  # 10MB safeguard
+                logger.warning("Message size exceeds 10MB; may cause pipe reset.")
+            self._stdout_writer.write(encoded)
             await self._stdout_writer.drain()
+        except (ConnectionResetError, BrokenPipeError) as e:
+            logger.error(f"Connection lost while sending message: {e}")
+            self._connected = False
+            raise RuntimeError("Connection lost while sending message; possible large environment variable overflow.")
         except Exception as e:
             logger.error(f"Failed to send message: {e}")
             raise