Merge branch 'main' into add_root_notification

Author: gspencergoog

.github/workflows/shared.yml

@@ -38,9 +38,9 @@ jobs:
         python-version: ["3.10", "3.11", "3.12", "3.13"]
         dep-resolution:
           - name: lowest-direct
-            install-flags: "--resolution lowest-direct"
+            install-flags: "--upgrade --resolution lowest-direct"
           - name: highest
-            install-flags: "--frozen"
+            install-flags: "--upgrade --resolution highest"
         os: [ubuntu-latest, windows-latest]
 
     steps:
@@ -57,11 +57,9 @@ jobs:
 
       - name: Run pytest with coverage
         run: |
-          uv run ${{ matrix.dep-resolution.install-flags }} --no-sync coverage run -m pytest
-          uv run ${{ matrix.dep-resolution.install-flags }} --no-sync coverage combine
-          uv run ${{ matrix.dep-resolution.install-flags }} --no-sync coverage report
-        env:
-          UV_RESOLUTION: ${{ matrix.dep-resolution.name == 'lowest-direct' && 'lowest-direct' || 'highest' }}
+          uv run --frozen --no-sync coverage run -m pytest
+          uv run --frozen --no-sync coverage combine
+          uv run --frozen --no-sync coverage report
 
   readme-snippets:
     runs-on: ubuntu-latest

pyproject.toml

@@ -34,6 +34,8 @@ dependencies = [
     "jsonschema>=4.20.0",
     "pywin32>=310; sys_platform == 'win32'",
     "pyjwt[crypto]>=2.10.1",
+    "typing-extensions>=4.9.0",
+    "typing-inspection>=0.4.1",
 ]
 
 [project.optional-dependencies]

src/mcp/client/auth/__init__.py

@@ -4,11 +4,9 @@
 Implements authorization code flow with PKCE and automatic token refresh.
 """
 
+from mcp.client.auth.exceptions import OAuthFlowError, OAuthRegistrationError, OAuthTokenError
 from mcp.client.auth.oauth2 import (
     OAuthClientProvider,
-    OAuthFlowError,
-    OAuthRegistrationError,
-    OAuthTokenError,
     PKCEParameters,
     TokenStorage,
 )

src/mcp/client/auth/exceptions.py

@@ -0,0 +1,10 @@
+class OAuthFlowError(Exception):
+    """Base exception for OAuth flow errors."""
+
+
+class OAuthTokenError(OAuthFlowError):
+    """Raised when token operations fail."""
+
+
+class OAuthRegistrationError(OAuthFlowError):
+    """Raised when client registration fails."""