Fix Rust/Python tests for 1.0.65 MCP OAuth API changes

- Rust: McpOauthLoginRequest gained optional client_id, client_secret,
  grant_type and public_client fields; add them to the e2e literals.
- Python: the per-surface grant-type enums were consolidated into
  MCPGrantType; update test_rpc_mcp_config_e2e to use it.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: stephentoub

python/e2e/test_rpc_mcp_config_e2e.py

@@ -17,8 +17,8 @@
     MCPConfigEnableRequest,
     MCPConfigRemoveRequest,
     MCPConfigUpdateRequest,
+    MCPGrantType,
     MCPServerConfig,
-    MCPServerConfigHTTPOauthGrantType,
     MCPServerConfigHTTPType,
 )
 
@@ -76,7 +76,7 @@ async def test_should_round_trip_http_mcp_oauth_config_rpc(self, ctx: E2ETestCon
             headers={"Authorization": "Bearer token"},
             oauth_client_id="client-id",
             oauth_public_client=False,
-            oauth_grant_type=MCPServerConfigHTTPOauthGrantType.CLIENT_CREDENTIALS,
+            oauth_grant_type=MCPGrantType.CLIENT_CREDENTIALS,
             tools=["*"],
             timeout=3000,
         )
@@ -85,7 +85,7 @@ async def test_should_round_trip_http_mcp_oauth_config_rpc(self, ctx: E2ETestCon
             url="https://example.com/updated-mcp",
             oauth_client_id="updated-client-id",
             oauth_public_client=True,
-            oauth_grant_type=MCPServerConfigHTTPOauthGrantType.AUTHORIZATION_CODE,
+            oauth_grant_type=MCPGrantType.AUTHORIZATION_CODE,
             tools=["updated-tool"],
             timeout=4000,
         )
@@ -102,7 +102,7 @@ async def test_should_round_trip_http_mcp_oauth_config_rpc(self, ctx: E2ETestCon
             assert added.headers["Authorization"] == "Bearer token"
             assert added.oauth_client_id == "client-id"
             assert added.oauth_public_client is False
-            assert added.oauth_grant_type == MCPServerConfigHTTPOauthGrantType.CLIENT_CREDENTIALS
+            assert added.oauth_grant_type == MCPGrantType.CLIENT_CREDENTIALS
 
             await ctx.client.rpc.mcp.config.update(
                 MCPConfigUpdateRequest(name=server_name, config=updated_config)
@@ -112,7 +112,7 @@ async def test_should_round_trip_http_mcp_oauth_config_rpc(self, ctx: E2ETestCon
             assert updated.url == "https://example.com/updated-mcp"
             assert updated.oauth_client_id == "updated-client-id"
             assert updated.oauth_public_client is True
-            assert updated.oauth_grant_type == MCPServerConfigHTTPOauthGrantType.AUTHORIZATION_CODE
+            assert updated.oauth_grant_type == MCPGrantType.AUTHORIZATION_CODE
             assert updated.tools is not None and updated.tools[0] == "updated-tool"
             assert updated.timeout == 4000
         finally:

rust/tests/e2e/rpc_mcp_and_skills.rs

@@ -573,6 +573,10 @@ async fn should_report_error_when_mcp_host_is_not_initialized() {
                         callback_success_message: None,
                         client_name: None,
                         force_reauth: None,
+                        client_id: None,
+                        client_secret: None,
+                        grant_type: None,
+                        public_client: None,
                     }),
                     "MCP host is not available",
                 )
@@ -608,6 +612,10 @@ async fn should_report_error_when_mcp_oauth_server_is_not_configured() {
                         callback_success_message: None,
                         client_name: None,
                         force_reauth: None,
+                        client_id: None,
+                        client_secret: None,
+                        grant_type: None,
+                        public_client: None,
                     }),
                     "is not configured",
                 )
@@ -645,6 +653,10 @@ async fn should_report_error_when_mcp_oauth_server_is_not_remote() {
                         callback_success_message: Some("Done".to_string()),
                         client_name: Some("SDK E2E".to_string()),
                         force_reauth: Some(true),
+                        client_id: None,
+                        client_secret: None,
+                        grant_type: None,
+                        public_client: None,
                     }),
                     "not a remote server",
                 )