Merge branch 'main' into feat/sep-985

Author: maxisbey

examples/clients/simple-auth-client/mcp_simple_auth_client/main.py

@@ -187,7 +187,7 @@ async def _default_redirect_handler(authorization_url: str) -> None:
 
             # Create OAuth authentication handler using the new interface
             oauth_auth = OAuthClientProvider(
-                server_url=self.server_url.replace("/mcp", ""),
+                server_url=self.server_url,
                 client_metadata=OAuthClientMetadata.model_validate(client_metadata_dict),
                 storage=InMemoryTokenStorage(),
                 redirect_handler=_default_redirect_handler,

src/mcp/cli/cli.py

@@ -67,7 +67,7 @@ def _build_uv_command(
     with_editable: Path | None = None,
     with_packages: list[str] | None = None,
 ) -> list[str]:
-    """Build the uv run command that runs a MCP server through mcp run."""
+    """Build the uv run command that runs an MCP server through mcp run."""
     cmd = ["uv"]
 
     cmd.extend(["run", "--with", "mcp"])
@@ -117,7 +117,7 @@ def _parse_file_path(file_spec: str) -> tuple[Path, str | None]:
 
 
 def _import_server(file: Path, server_object: str | None = None):
-    """Import a MCP server from a file.
+    """Import an MCP server from a file.
 
     Args:
         file: Path to the file
@@ -244,7 +244,7 @@ def dev(
         ),
     ] = [],
 ) -> None:
-    """Run a MCP server with the MCP Inspector."""
+    """Run an MCP server with the MCP Inspector."""
     file, server_object = _parse_file_path(file_spec)
 
     logger.debug(
@@ -317,7 +317,7 @@ def run(
         ),
     ] = None,
 ) -> None:
-    """Run a MCP server.
+    """Run an MCP server.
 
     The server can be specified in two ways:\n
     1. Module approach: server.py - runs the module directly, expecting a server.run() call.\n
@@ -412,7 +412,7 @@ def install(
         ),
     ] = None,
 ) -> None:
-    """Install a MCP server in the Claude desktop app.
+    """Install an MCP server in the Claude desktop app.
 
     Environment variables are preserved once added and only updated if new values
     are explicitly provided.

src/mcp/client/session_group.py

@@ -77,7 +77,7 @@ class ClientSessionGroup:
     Example Usage:
         name_fn = lambda name, server_info: f"{(server_info.name)}_{name}"
         async with ClientSessionGroup(component_name_hook=name_fn) as group:
-            for server_params in server_params:
+            for server_param in server_params:
                 await group.connect_to_server(server_param)
             ...