Align MCP OAuth wrappers with rebased generated APIs

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

Author: roji

dotnet/src/Types.cs

@@ -1142,7 +1142,7 @@ public sealed class McpAuthContext
     public string ServerUrl { get; set; } = string.Empty;
 
     /// <summary>Parsed WWW-Authenticate parameters from the MCP server, if available.</summary>
-    public McpOauthRequiredWwwAuthenticateParams? WwwAuthenticateParams { get; set; }
+    public McpOauthWWWAuthenticateParams? WwwAuthenticateParams { get; set; }
 
     /// <summary>Raw RFC 9728 protected-resource metadata JSON fetched by the runtime, if available.</summary>
     public string? ResourceMetadata { get; set; }

dotnet/test/Unit/SessionEventSerializationTests.cs

@@ -158,7 +158,7 @@ public class SessionEventSerializationTests
                         GrantType = "client_credentials",
                         PublicClient = false,
                     },
-                    WwwAuthenticateParams = new McpOauthRequiredWwwAuthenticateParams
+                    WwwAuthenticateParams = new McpOauthWWWAuthenticateParams
                     {
                         ResourceMetadataUrl = "https://example.com/.well-known/oauth-protected-resource",
                     },

go/client.go

@@ -850,7 +850,7 @@ func (c *Client) CreateSession(ctx context.Context, config *SessionConfig) (*Ses
 		session = s
 		registeredSessionID = localSessionID
 		if config.OnMCPAuthRequest != nil {
-			if _, err := c.client.Request("session.eventLog.registerInterest", map[string]any{
+			if _, err := c.client.Request(ctx, "session.eventLog.registerInterest", map[string]any{
 				"sessionId": localSessionID,
 				"eventType": "mcp.oauth_required",
 			}); err != nil {
@@ -920,7 +920,7 @@ func (c *Client) CreateSession(ctx context.Context, config *SessionConfig) (*Ses
 	}
 	// Local IDs registered before create; server-assigned IDs can only register now.
 	if localSessionID == "" && config.OnMCPAuthRequest != nil {
-		if _, err := c.client.Request("session.eventLog.registerInterest", map[string]any{
+		if _, err := c.client.Request(ctx, "session.eventLog.registerInterest", map[string]any{
 			"sessionId": session.SessionID,
 			"eventType": "mcp.oauth_required",
 		}); err != nil {
@@ -1128,7 +1128,7 @@ func (c *Client) ResumeSessionWithOptions(ctx context.Context, sessionID string,
 	c.sessions[sessionID] = session
 	c.sessionsMux.Unlock()
 	if config.OnMCPAuthRequest != nil {
-		if _, err := c.client.Request("session.eventLog.registerInterest", map[string]any{
+		if _, err := c.client.Request(ctx, "session.eventLog.registerInterest", map[string]any{
 			"sessionId": sessionID,
 			"eventType": "mcp.oauth_required",
 		}); err != nil {

python/copilot/session.py

@@ -40,8 +40,8 @@
     HandlePendingToolCallRequest,
     LogRequest,
     MCPOauthHandlePendingRequest,
-    MCPOauthPendingRequestResponseCancelled,
-    MCPOauthPendingRequestResponseToken,
+    MCPOauthPendingRequestResponse,
+    MCPOauthPendingRequestResponseKind,
     ModelSwitchToRequest,
     PermissionDecision,
     PermissionDecisionApproveOnce,
@@ -1981,14 +1981,17 @@ async def _execute_mcp_auth_and_respond(
             )
 
             if result and result.get("kind", "token") == "token":
-                rpc_result = MCPOauthPendingRequestResponseToken(
+                rpc_result = MCPOauthPendingRequestResponse(
+                    kind=MCPOauthPendingRequestResponseKind.TOKEN,
                     access_token=result["accessToken"],
                     expires_in=result.get("expiresIn"),
                     refresh_token=result.get("refreshToken"),
                     token_type=result.get("tokenType"),
                 )
             else:
-                rpc_result = MCPOauthPendingRequestResponseCancelled()
+                rpc_result = MCPOauthPendingRequestResponse(
+                    kind=MCPOauthPendingRequestResponseKind.CANCELLED
+                )
             await self.rpc.mcp.oauth.handle_pending_request(
                 MCPOauthHandlePendingRequest(
                     request_id=request_id,
@@ -2000,7 +2003,9 @@ async def _execute_mcp_auth_and_respond(
                 await self.rpc.mcp.oauth.handle_pending_request(
                     MCPOauthHandlePendingRequest(
                         request_id=request_id,
-                        result=MCPOauthPendingRequestResponseCancelled(),
+                        result=MCPOauthPendingRequestResponse(
+                            kind=MCPOauthPendingRequestResponseKind.CANCELLED
+                        ),
                     )
                 )
             except (JsonRpcError, ProcessExitedError, OSError):

python/test_client.py

@@ -31,7 +31,7 @@
 from copilot.session import PermissionHandler
 from copilot.session_events import (
     McpOauthRequiredData,
-    McpOauthRequiredWwwAuthenticateParams,
+    McpOauthWWWAuthenticateParams,
     SessionEvent,
     SessionEventType,
 )
@@ -367,7 +367,7 @@ def handle_mcp_auth_request(request, invocation):
                         request_id="oauth-request",
                         server_name="oauth-server",
                         server_url="https://example.com/mcp",
-                        www_authenticate_params=McpOauthRequiredWwwAuthenticateParams(
+                        www_authenticate_params=McpOauthWWWAuthenticateParams(
                             resource_metadata_url="https://example.com/.well-known/oauth-protected-resource"
                         ),
                         resource_metadata='{"resource":"https://example.com/mcp"}',

rust/src/handler.rs

@@ -24,9 +24,7 @@ use crate::generated::api_types::{
     McpOauthPendingRequestResponseTokenKind, PermissionDecision, PermissionDecisionApproveOnce,
     PermissionDecisionReject, PermissionDecisionUserNotAvailable,
 };
-use crate::session_events::{
-    McpOauthRequiredStaticClientConfig, McpOauthRequiredWwwAuthenticateParams,
-};
+use crate::session_events::{McpOauthRequiredStaticClientConfig, McpOauthWWWAuthenticateParams};
 use crate::types::{
     ElicitationRequest, ElicitationResult, ExitPlanModeData, PermissionRequestData, RequestId,
     SessionId,
@@ -172,7 +170,7 @@ pub struct McpAuthRequest {
     /// URL of the MCP server that requires OAuth.
     pub server_url: String,
     /// Parsed WWW-Authenticate parameters from the MCP server, if available.
-    pub www_authenticate_params: Option<McpOauthRequiredWwwAuthenticateParams>,
+    pub www_authenticate_params: Option<McpOauthWWWAuthenticateParams>,
     /// Raw RFC 9728 protected-resource metadata JSON fetched by the runtime, if available.
     pub resource_metadata: Option<String>,
     /// Static OAuth client configuration, if the server specifies one.