refactor: merge ElicitationRequest + ElicitationInvocation into ElicitationContext

Combines the two-argument elicitation handler pattern into a single
ElicitationContext type across all three SDKs, matching the existing
CommandContext pattern. The context now includes SessionId alongside
the request fields (Message, RequestedSchema, Mode, etc.).

Changes per language:
- .NET: ElicitationContext class, single-arg delegate, Lazy<> cached Ui
- Go: ElicitationContext struct, single-arg handler func
- Python: ElicitationContext TypedDict, single-arg callable

All tests, READMEs, and E2E tests updated.

Author: MRayermannMSFT

dotnet/README.md

@@ -910,14 +910,15 @@ var session = await client.CreateSessionAsync(new SessionConfig
 {
     Model = "gpt-5",
     OnPermissionRequest = PermissionHandler.ApproveAll,
-    OnElicitationRequest = async (request, invocation) =>
+    OnElicitationRequest = async (context) =>
     {
-        // request.Message - Description of what information is needed
-        // request.RequestedSchema - JSON Schema describing the form fields
-        // request.Mode - "form" (structured input) or "url" (browser redirect)
-        // request.ElicitationSource - Origin of the request (e.g. MCP server name)
+        // context.SessionId - Session that triggered the request
+        // context.Message - Description of what information is needed
+        // context.RequestedSchema - JSON Schema describing the form fields
+        // context.Mode - "form" (structured input) or "url" (browser redirect)
+        // context.ElicitationSource - Origin of the request (e.g. MCP server name)
 
-        Console.WriteLine($"Elicitation from {request.ElicitationSource}: {request.Message}");
+        Console.WriteLine($"Elicitation from {context.ElicitationSource}: {context.Message}");
 
         // Present UI to the user and collect their response...
         return new ElicitationResult

dotnet/src/Session.cs

@@ -493,8 +493,9 @@ private async Task HandleBroadcastEventAsync(SessionEvent sessionEvent)
                                 : null;
 
                             await HandleElicitationRequestAsync(
-                                new ElicitationRequest
+                                new ElicitationContext
                                 {
+                                    SessionId = SessionId,
                                     Message = data.Message,
                                     RequestedSchema = schema,
                                     Mode = data.Mode,
@@ -720,14 +721,14 @@ await handler(new CommandContext
     /// Dispatches an elicitation.requested event to the registered handler and
     /// responds via the ui.handlePendingElicitation RPC. Auto-cancels on handler errors.
     /// </summary>
-    private async Task HandleElicitationRequestAsync(ElicitationRequest request, string requestId)
+    private async Task HandleElicitationRequestAsync(ElicitationContext context, string requestId)
     {
         var handler = _elicitationHandler;
         if (handler is null) return;
 
         try
         {
-            var result = await handler(request, new ElicitationInvocation { SessionId = SessionId });
+            var result = await handler(context);
             await Rpc.Ui.HandlePendingElicitationAsync(requestId, new SessionUiHandlePendingElicitationRequestResult
             {
                 Action = result.Action,

dotnet/src/Types.cs

@@ -693,10 +693,14 @@ public interface ISessionUiApi
 // ============================================================================
 
 /// <summary>
-/// An elicitation request received from the server.
+/// Context for an elicitation handler invocation, combining the request data
+/// with session context. Mirrors the single-argument pattern of <see cref="CommandContext"/>.
 /// </summary>
-public class ElicitationRequest
+public class ElicitationContext
 {
+    /// <summary>Identifier of the session that triggered the elicitation request.</summary>
+    public string SessionId { get; set; } = string.Empty;
+
     /// <summary>Message describing what information is needed from the user.</summary>
     public string Message { get; set; } = string.Empty;
 
@@ -713,21 +717,10 @@ public class ElicitationRequest
     public string? Url { get; set; }
 }
 
-/// <summary>
-/// Context for an elicitation handler invocation.
-/// </summary>
-public class ElicitationInvocation
-{
-    /// <summary>
-    /// Identifier of the session that triggered the elicitation request.
-    /// </summary>
-    public string SessionId { get; set; } = string.Empty;
-}
-
 /// <summary>
 /// Delegate for handling elicitation requests from the server.
 /// </summary>
-public delegate Task<ElicitationResult> ElicitationHandler(ElicitationRequest request, ElicitationInvocation invocation);
+public delegate Task<ElicitationResult> ElicitationHandler(ElicitationContext context);
 
 // ============================================================================
 // Session Capabilities

dotnet/test/ElicitationTests.cs

@@ -78,7 +78,7 @@ public async Task Sends_RequestElicitation_When_Handler_Provided()
         var session = await CreateSessionAsync(new SessionConfig
         {
             OnPermissionRequest = PermissionHandler.ApproveAll,
-            OnElicitationRequest = (_, _) => Task.FromResult(new ElicitationResult
+            OnElicitationRequest = _ => Task.FromResult(new ElicitationResult
             {
                 Action = SessionUiElicitationResultAction.Accept,
                 Content = new Dictionary<string, object>(),
@@ -97,7 +97,7 @@ public async Task Session_With_ElicitationHandler_Reports_Elicitation_Capability
         var session = await CreateSessionAsync(new SessionConfig
         {
             OnPermissionRequest = PermissionHandler.ApproveAll,
-            OnElicitationRequest = (_, _) => Task.FromResult(new ElicitationResult
+            OnElicitationRequest = _ => Task.FromResult(new ElicitationResult
             {
                 Action = SessionUiElicitationResultAction.Accept,
                 Content = new Dictionary<string, object>(),
@@ -231,10 +231,11 @@ public void InputOptions_Has_All_Properties()
     }
 
     [Fact]
-    public void ElicitationRequest_Has_All_Properties()
+    public void ElicitationContext_Has_All_Properties()
     {
-        var request = new ElicitationRequest
+        var context = new ElicitationContext
         {
+            SessionId = "session-42",
             Message = "Pick a color",
             RequestedSchema = new ElicitationSchema
             {
@@ -248,28 +249,18 @@ public void ElicitationRequest_Has_All_Properties()
             Url = null,
         };
 
-        Assert.Equal("Pick a color", request.Message);
-        Assert.NotNull(request.RequestedSchema);
-        Assert.Equal(ElicitationRequestedDataMode.Form, request.Mode);
-        Assert.Equal("mcp-server", request.ElicitationSource);
-        Assert.Null(request.Url);
-    }
-
-    [Fact]
-    public void ElicitationInvocation_Has_SessionId()
-    {
-        var invocation = new ElicitationInvocation
-        {
-            SessionId = "session-42"
-        };
-
-        Assert.Equal("session-42", invocation.SessionId);
+        Assert.Equal("session-42", context.SessionId);
+        Assert.Equal("Pick a color", context.Message);
+        Assert.NotNull(context.RequestedSchema);
+        Assert.Equal(ElicitationRequestedDataMode.Form, context.Mode);
+        Assert.Equal("mcp-server", context.ElicitationSource);
+        Assert.Null(context.Url);
     }
 
     [Fact]
     public async Task Session_Config_OnElicitationRequest_Is_Cloned()
     {
-        ElicitationHandler handler = (_, _) => Task.FromResult(new ElicitationResult
+        ElicitationHandler handler = _ => Task.FromResult(new ElicitationResult
         {
             Action = SessionUiElicitationResultAction.Cancel,
         });
@@ -288,7 +279,7 @@ public async Task Session_Config_OnElicitationRequest_Is_Cloned()
     [Fact]
     public void Resume_Config_OnElicitationRequest_Is_Cloned()
     {
-        ElicitationHandler handler = (_, _) => Task.FromResult(new ElicitationResult
+        ElicitationHandler handler = _ => Task.FromResult(new ElicitationResult
         {
             Action = SessionUiElicitationResultAction.Cancel,
         });
@@ -304,3 +295,4 @@ public void Resume_Config_OnElicitationRequest_Is_Cloned()
         Assert.Same(handler, clone.OnElicitationRequest);
     }
 }
+

dotnet/test/MultiClientCommandsElicitationTests.cs

@@ -173,7 +173,7 @@ public async Task Capabilities_Changed_Fires_When_Second_Client_Joins_With_Elici
         var session2 = await Client2.ResumeSessionAsync(session1.SessionId, new ResumeSessionConfig
         {
             OnPermissionRequest = PermissionHandler.ApproveAll,
-            OnElicitationRequest = (_, _) => Task.FromResult(new ElicitationResult
+            OnElicitationRequest = _ => Task.FromResult(new ElicitationResult
             {
                 Action = Rpc.SessionUiElicitationResultAction.Accept,
                 Content = new Dictionary<string, object>(),
@@ -227,7 +227,7 @@ public async Task Capabilities_Changed_Fires_When_Elicitation_Provider_Disconnec
         await _client3.ResumeSessionAsync(session1.SessionId, new ResumeSessionConfig
         {
             OnPermissionRequest = PermissionHandler.ApproveAll,
-            OnElicitationRequest = (_, _) => Task.FromResult(new ElicitationResult
+            OnElicitationRequest = _ => Task.FromResult(new ElicitationResult
             {
                 Action = Rpc.SessionUiElicitationResultAction.Accept,
                 Content = new Dictionary<string, object>(),
@@ -259,3 +259,4 @@ public async Task Capabilities_Changed_Fires_When_Elicitation_Provider_Disconnec
             "After elicitation provider disconnects, capability should be removed");
     }
 }
+

go/README.md

@@ -822,12 +822,13 @@ When the server (or an MCP tool) needs to ask the end-user a question, it sends
 ```go
 session, err := client.CreateSession(ctx, &copilot.SessionConfig{
     OnPermissionRequest: copilot.PermissionHandler.ApproveAll,
-    OnElicitationRequest: func(req copilot.ElicitationRequest, inv copilot.ElicitationInvocation) (copilot.ElicitationResult, error) {
-        // req.Message — what's being asked
-        // req.RequestedSchema — form schema (if mode is "form")
-        // req.Mode — "form" or "url"
-        // req.ElicitationSource — e.g. MCP server name
-        // req.URL — browser URL (if mode is "url")
+    OnElicitationRequest: func(ctx copilot.ElicitationContext) (copilot.ElicitationResult, error) {
+        // ctx.SessionID — session that triggered the request
+        // ctx.Message — what's being asked
+        // ctx.RequestedSchema — form schema (if mode is "form")
+        // ctx.Mode — "form" or "url"
+        // ctx.ElicitationSource — e.g. MCP server name
+        // ctx.URL — browser URL (if mode is "url")
 
         // Return the user's response
         return copilot.ElicitationResult{

go/internal/e2e/commands_and_elicitation_test.go

@@ -159,7 +159,7 @@ func TestUIElicitationCallback(t *testing.T) {
 
 		session, err := client.CreateSession(t.Context(), &copilot.SessionConfig{
 			OnPermissionRequest: copilot.PermissionHandler.ApproveAll,
-			OnElicitationRequest: func(req copilot.ElicitationRequest, inv copilot.ElicitationInvocation) (copilot.ElicitationResult, error) {
+			OnElicitationRequest: func(ctx copilot.ElicitationContext) (copilot.ElicitationResult, error) {
 				return copilot.ElicitationResult{Action: "accept", Content: map[string]any{}}, nil
 			},
 		})
@@ -250,7 +250,7 @@ func TestUIElicitationMultiClient(t *testing.T) {
 		session2, err := client2.ResumeSession(t.Context(), session1.SessionID, &copilot.ResumeSessionConfig{
 			OnPermissionRequest: copilot.PermissionHandler.ApproveAll,
 			DisableResume:       true,
-			OnElicitationRequest: func(req copilot.ElicitationRequest, inv copilot.ElicitationInvocation) (copilot.ElicitationResult, error) {
+			OnElicitationRequest: func(ctx copilot.ElicitationContext) (copilot.ElicitationResult, error) {
 				return copilot.ElicitationResult{Action: "accept", Content: map[string]any{}}, nil
 			},
 		})
@@ -311,7 +311,7 @@ func TestUIElicitationMultiClient(t *testing.T) {
 		_, err = client3.ResumeSession(t.Context(), session1.SessionID, &copilot.ResumeSessionConfig{
 			OnPermissionRequest: copilot.PermissionHandler.ApproveAll,
 			DisableResume:       true,
-			OnElicitationRequest: func(req copilot.ElicitationRequest, inv copilot.ElicitationInvocation) (copilot.ElicitationResult, error) {
+			OnElicitationRequest: func(ctx copilot.ElicitationContext) (copilot.ElicitationResult, error) {
 				return copilot.ElicitationResult{Action: "accept", Content: map[string]any{}}, nil
 			},
 		})
@@ -355,3 +355,4 @@ func TestUIElicitationMultiClient(t *testing.T) {
 		unsubDisabled()
 	})
 }
+

go/session.go

@@ -577,16 +577,15 @@ func (s *Session) getElicitationHandler() ElicitationHandler {
 
 // handleElicitationRequest dispatches an elicitation.requested event to the registered handler
 // and sends the result back via the RPC layer. Auto-cancels on error.
-func (s *Session) handleElicitationRequest(request ElicitationRequest, requestID string) {
+func (s *Session) handleElicitationRequest(elicitCtx ElicitationContext, requestID string) {
 	handler := s.getElicitationHandler()
 	if handler == nil {
 		return
 	}
 
 	ctx := context.Background()
-	invocation := ElicitationInvocation{SessionID: s.SessionID}
 
-	result, err := handler(request, invocation)
+	result, err := handler(elicitCtx)
 	if err != nil {
 		// Handler failed — attempt to cancel so the request doesn't hang.
 		s.RPC.Ui.HandlePendingElicitation(ctx, &rpc.SessionUIHandlePendingElicitationParams{
@@ -976,7 +975,8 @@ func (s *Session) handleBroadcastEvent(event SessionEvent) {
 		if event.Data.URL != nil {
 			url = *event.Data.URL
 		}
-		s.handleElicitationRequest(ElicitationRequest{
+		s.handleElicitationRequest(ElicitationContext{
+			SessionID:         s.SessionID,
 			Message:           message,
 			RequestedSchema:   requestedSchema,
 			Mode:              mode,

go/session_test.go

@@ -470,7 +470,7 @@ func TestSession_ElicitationHandler(t *testing.T) {
 			t.Error("Expected nil handler before registration")
 		}
 
-		session.registerElicitationHandler(func(req ElicitationRequest, inv ElicitationInvocation) (ElicitationResult, error) {
+		session.registerElicitationHandler(func(ctx ElicitationContext) (ElicitationResult, error) {
 			return ElicitationResult{Action: "accept"}, nil
 		})
 
@@ -483,7 +483,7 @@ func TestSession_ElicitationHandler(t *testing.T) {
 		session, cleanup := newTestSession()
 		defer cleanup()
 
-		session.registerElicitationHandler(func(req ElicitationRequest, inv ElicitationInvocation) (ElicitationResult, error) {
+		session.registerElicitationHandler(func(ctx ElicitationContext) (ElicitationResult, error) {
 			return ElicitationResult{}, fmt.Errorf("handler exploded")
 		})
 
@@ -493,8 +493,7 @@ func TestSession_ElicitationHandler(t *testing.T) {
 		}
 
 		_, err := handler(
-			ElicitationRequest{Message: "Pick a color"},
-			ElicitationInvocation{SessionID: "test-session"},
+			ElicitationContext{SessionID: "test-session", Message: "Pick a color"},
 		)
 		if err == nil {
 			t.Fatal("Expected error from handler")
@@ -508,7 +507,7 @@ func TestSession_ElicitationHandler(t *testing.T) {
 		session, cleanup := newTestSession()
 		defer cleanup()
 
-		session.registerElicitationHandler(func(req ElicitationRequest, inv ElicitationInvocation) (ElicitationResult, error) {
+		session.registerElicitationHandler(func(ctx ElicitationContext) (ElicitationResult, error) {
 			return ElicitationResult{
 				Action:  "accept",
 				Content: map[string]any{"color": "blue"},
@@ -517,8 +516,7 @@ func TestSession_ElicitationHandler(t *testing.T) {
 
 		handler := session.getElicitationHandler()
 		result, err := handler(
-			ElicitationRequest{Message: "Pick a color"},
-			ElicitationInvocation{SessionID: "test-session"},
+			ElicitationContext{SessionID: "test-session", Message: "Pick a color"},
 		)
 		if err != nil {
 			t.Fatalf("Expected no error, got %v", err)
@@ -587,3 +585,4 @@ func TestSession_ElicitationRequestSchema(t *testing.T) {
 		}
 	})
 }
+

go/types.go

@@ -586,8 +586,12 @@ type ElicitationResult struct {
 	Content map[string]any `json:"content,omitempty"`
 }
 
-// ElicitationRequest describes an elicitation request from the server.
-type ElicitationRequest struct {
+// ElicitationContext describes an elicitation request from the server,
+// combining the request data with session context. Mirrors the
+// single-argument pattern of CommandContext.
+type ElicitationContext struct {
+	// SessionID is the identifier of the session that triggered the request.
+	SessionID string
 	// Message describes what information is needed from the user.
 	Message string
 	// RequestedSchema is a JSON Schema describing the form fields (form mode only).
@@ -601,14 +605,9 @@ type ElicitationRequest struct {
 }
 
 // ElicitationHandler handles elicitation requests from the server (e.g. from MCP tools).
-// It receives the request and an ElicitationInvocation for context, and must return
-// an ElicitationResult. If the handler returns an error the SDK auto-cancels the request.
-type ElicitationHandler func(request ElicitationRequest, invocation ElicitationInvocation) (ElicitationResult, error)
-
-// ElicitationInvocation provides context about an elicitation request.
-type ElicitationInvocation struct {
-	SessionID string
-}
+// It receives an ElicitationContext and must return an ElicitationResult.
+// If the handler returns an error the SDK auto-cancels the request.
+type ElicitationHandler func(ctx ElicitationContext) (ElicitationResult, error)
 
 // InputOptions configures a text input field for the Input convenience method.
 type InputOptions struct {