fix: remove unnecessary pragmas from src/ (batch 2) and restore needed ones

- Remove ~80 unnecessary '# pragma: no cover' from src/ files where
  lines are confirmed covered by CI
- Restore pragmas with correct type (no cover vs no branch) for lines
  with missing coverage or branch coverage in batch 1 files

Author: maxisbey

src/mcp/cli/claude.py

@@ -72,7 +72,7 @@ def update_claude_config(
         )
 
     config_file = config_dir / "claude_desktop_config.json"
-    if not config_file.exists():
+    if not config_file.exists():  # pragma: no cover
         try:
             config_file.write_text("{}")
         except Exception:

src/mcp/cli/cli.py

@@ -77,7 +77,7 @@ def _build_uv_command(
 
     if with_packages:
         for pkg in with_packages:
-            if pkg:
+            if pkg:  # pragma: no branch
                 cmd.extend(["--with", pkg])
 
     # Add mcp run command

src/mcp/client/auth/oauth2.py

@@ -534,7 +534,7 @@ async def async_auth_flow(self, request: httpx.Request) -> AsyncGenerator[httpx.
                     )
 
                     # Step 2: Discover OAuth Authorization Server Metadata (OASM) (with fallback for legacy servers)
-                    for url in asm_discovery_urls:
+                    for url in asm_discovery_urls:  # pragma: no branch
                         oauth_metadata_request = create_oauth_metadata_request(url)
                         oauth_metadata_response = yield oauth_metadata_request
 

src/mcp/client/session_group.py

@@ -223,22 +223,22 @@ async def disconnect_from_server(self, session: mcp.ClientSession) -> None:
                 )
             )
 
-        if session_known_for_components:
+        if session_known_for_components:  # pragma: no branch
             component_names = self._sessions.pop(session)  # Pop from _sessions tracking
 
             # Remove prompts associated with the session.
             for name in component_names.prompts:
-                if name in self._prompts:
+                if name in self._prompts:  # pragma: no branch
                     del self._prompts[name]
             # Remove resources associated with the session.
             for name in component_names.resources:
-                if name in self._resources:
+                if name in self._resources:  # pragma: no branch
                     del self._resources[name]
             # Remove tools associated with the session.
             for name in component_names.tools:
-                if name in self._tools:
+                if name in self._tools:  # pragma: no branch
                     del self._tools[name]
-                if name in self._tool_to_session:
+                if name in self._tool_to_session:  # pragma: no branch
                     del self._tool_to_session[name]
 
         # Clean up the session's resources via its dedicated exit stack

src/mcp/client/sse.py

@@ -119,10 +119,10 @@ async def sse_reader(task_status: TaskStatus[str] = anyio.TASK_STATUS_IGNORED):
                                         await read_stream_writer.send(session_message)
                                     case _:  # pragma: no cover
                                         logger.warning(f"Unknown SSE event: {sse.event}")  # pragma: no cover
-                        except SSEError as sse_exc:
+                        except SSEError as sse_exc:  # pragma: no cover
                             logger.exception("Encountered SSE exception")
                             raise sse_exc
-                        except Exception as exc:
+                        except Exception as exc:  # pragma: no cover
                             logger.exception("Error in sse_reader")
                             await read_stream_writer.send(exc)
                         finally:
@@ -143,7 +143,7 @@ async def post_writer(endpoint_url: str):
                                     )
                                     response.raise_for_status()
                                     logger.debug(f"Client message sent successfully: {response.status_code}")
-                        except Exception:
+                        except Exception:  # pragma: no cover
                             logger.exception("Error in post_writer")
                         finally:
                             await write_stream.aclose()

src/mcp/client/stdio/__init__.py

@@ -57,7 +57,7 @@ def get_default_environment() -> dict[str, str]:
     for key in DEFAULT_INHERITED_ENV_VARS:
         value = os.environ.get(key)
         if value is None:
-            continue  # pragma: no cover
+            continue
 
         if value.startswith("()"):  # pragma: no cover
             # Skip functions, which are a security risk
@@ -158,7 +158,7 @@ async def stdout_reader():
 
                         session_message = SessionMessage(message)
                         await read_stream_writer.send(session_message)
-        except anyio.ClosedResourceError:  # pragma: no cover
+        except anyio.ClosedResourceError:
             await anyio.lowlevel.checkpoint()
 
     async def stdin_writer():
@@ -226,7 +226,7 @@ def _get_executable_command(command: str) -> str:
     if sys.platform == "win32":  # pragma: no cover
         return get_windows_executable_command(command)
     else:
-        return command  # pragma: no cover
+        return command
 
 
 async def _create_platform_compatible_process(
@@ -250,7 +250,7 @@ async def _create_platform_compatible_process(
             stderr=errlog,
             cwd=cwd,
             start_new_session=True,
-        )  # pragma: no cover
+        )
 
     return process
 
@@ -267,7 +267,7 @@ async def _terminate_process_tree(process: Process | FallbackProcess, timeout_se
     """
     if sys.platform == "win32":  # pragma: no cover
         await terminate_windows_process_tree(process, timeout_seconds)
-    else:  # pragma: no cover
+    else:
         # FallbackProcess should only be used for Windows compatibility
         assert isinstance(process, Process)
         await terminate_posix_process_tree(process, timeout_seconds)

src/mcp/client/streamable_http.py

@@ -181,7 +181,7 @@ async def handle_get_stream(self, client: httpx.AsyncClient, read_stream_writer:
 
                 headers = self._prepare_headers()
                 if last_event_id:
-                    headers[LAST_EVENT_ID] = last_event_id  # pragma: no cover
+                    headers[LAST_EVENT_ID] = last_event_id
 
                 async with aconnect_sse(client, "GET", self.url, headers=headers) as event_source:
                     event_source.response.raise_for_status()
@@ -190,17 +190,17 @@ async def handle_get_stream(self, client: httpx.AsyncClient, read_stream_writer:
                     async for sse in event_source.aiter_sse():
                         # Track last event ID for reconnection
                         if sse.id:
-                            last_event_id = sse.id  # pragma: no cover
+                            last_event_id = sse.id
                         # Track retry interval from server
                         if sse.retry is not None:
-                            retry_interval_ms = sse.retry  # pragma: no cover
+                            retry_interval_ms = sse.retry
 
                         await self._handle_sse_event(sse, read_stream_writer)
 
                     # Stream ended normally (server closed) - reset attempt counter
                     attempt = 0
 
-            except Exception as exc:  # pragma: no cover
+            except Exception as exc:
                 logger.debug(f"GET stream error: {exc}")
                 attempt += 1
 
@@ -333,7 +333,7 @@ async def _handle_sse_response(
                 if is_complete:
                     await response.aclose()
                     return  # Normal completion, no reconnect needed
-        except Exception as e:  # pragma: no cover
+        except Exception as e:
             logger.debug(f"SSE stream ended: {e}")
 
         # Stream ended without response - reconnect if we received an event with ID
@@ -472,7 +472,7 @@ async def handle_request_async():
             await read_stream_writer.aclose()
             await write_stream.aclose()
 
-    async def terminate_session(self, client: httpx.AsyncClient) -> None:  # pragma: no cover
+    async def terminate_session(self, client: httpx.AsyncClient) -> None:
         """Terminate the session by sending a DELETE request."""
         if not self.session_id:
             return

src/mcp/server/auth/handlers/token.py

@@ -178,7 +178,7 @@ async def handle(self, request: Request):
                 except TokenError as e:
                     return self.response(TokenErrorResponse(error=e.error, error_description=e.error_description))
 
-            case RefreshTokenRequest():
+            case RefreshTokenRequest():  # pragma: no branch
                 refresh_token = await self.provider.load_refresh_token(client_info, token_request.refresh_token)
                 if refresh_token is None or refresh_token.client_id != token_request.client_id:
                     # if token belongs to different client, pretend it doesn't exist

src/mcp/server/experimental/task_context.py

@@ -247,8 +247,7 @@ async def elicit(
             response_data = await resolver.wait()
             await self._store.update_task(self.task_id, status=TASK_STATUS_WORKING)
             return ElicitResult.model_validate(response_data)
-        except anyio.get_cancelled_exc_class():  # pragma: no cover
-            # Coverage can't track async exception handlers reliably.
+        except anyio.get_cancelled_exc_class():
             # This path is tested in test_elicit_restores_status_on_cancellation
             # which verifies status is restored to "working" after cancellation.
             await self._store.update_task(self.task_id, status=TASK_STATUS_WORKING)
@@ -408,8 +407,7 @@ async def create_message(
             response_data = await resolver.wait()
             await self._store.update_task(self.task_id, status=TASK_STATUS_WORKING)
             return CreateMessageResult.model_validate(response_data)
-        except anyio.get_cancelled_exc_class():  # pragma: no cover
-            # Coverage can't track async exception handlers reliably.
+        except anyio.get_cancelled_exc_class():
             # This path is tested in test_create_message_restores_status_on_cancellation
             # which verifies status is restored to "working" after cancellation.
             await self._store.update_task(self.task_id, status=TASK_STATUS_WORKING)

src/mcp/server/fastmcp/server.py

@@ -873,7 +873,7 @@ async def handle_sse(scope: Scope, receive: Receive, send: Send):  # pragma: no
                     app=RequireAuthMiddleware(sse.handle_post_message, required_scopes, resource_metadata_url),
                 )
             )
-        else:
+        else:  # pragma: no cover
             # Auth is disabled, no need for RequireAuthMiddleware
             # Since handle_sse is an ASGI app, we need to create a compatible endpoint
             async def sse_endpoint(request: Request) -> Response: