Address review feedback: drop typed InputResponse accessors and resolve input requests with WhenAll+CTS

halter73 · Copilot · halter73 · commit 75fe8ee7ccd5 · 2026-05-27T17:16:24.000-07:00
Co-authored-by: Copilot &lt;223556219+Copilot@users.noreply.github.com&gt;
diff --git a/docs/concepts/elicitation/elicitation.md b/docs/concepts/elicitation/elicitation.md
@@ -188,7 +188,7 @@ public static string ElicitWithMrtr(
     // On retry, process the client's elicitation response
     if (context.Params!.InputResponses?.TryGetValue("user_input", out var response) is true)
     {
-        var elicitResult = response.ElicitationResult;
+        var elicitResult = response.Deserialize(InputResponse.ElicitResultTypeInfo);
         return elicitResult?.Action == "accept"
             ? $"User accepted: {elicitResult.Content?.FirstOrDefault().Value}"
             : "User declined.";
diff --git a/docs/concepts/mrtr/mrtr.md b/docs/concepts/mrtr/mrtr.md
@@ -96,7 +96,7 @@ public static string AnswerTool(
     // On retry, process the client's responses
     if (requestState is not null && inputResponses is not null)
     {
-        var elicitResult = inputResponses["user_answer"].ElicitationResult;
+        var elicitResult = inputResponses["user_answer"].Deserialize(InputResponse.ElicitResultTypeInfo);
         return $"You answered: {elicitResult?.Content?.FirstOrDefault().Value}";
     }
 
@@ -135,11 +135,11 @@ When the client retries a tool call, the retry data is available on the request
 - <xref:ModelContextProtocol.Protocol.RequestParams.InputResponses> — a dictionary of client responses keyed by the same keys used in `inputRequests`.
 - <xref:ModelContextProtocol.Protocol.RequestParams.RequestState> — the opaque state string echoed back by the client.
 
-Each `InputResponse` has typed accessors for the response type:
+Use <xref:ModelContextProtocol.Protocol.InputResponse.Deserialize*> with the `JsonTypeInfo<T>` matching the response type. The expected type follows from the matching <xref:ModelContextProtocol.Protocol.InputRequest.Method> in the original `inputRequests` map — there is no on-the-wire discriminator.
 
-- `ElicitationResult` — the result of an elicitation request.
-- `SamplingResult` — the result of a sampling request.
-- `RootsResult` — the result of a roots list request.
+- Elicitation — `response.Deserialize(InputResponse.ElicitResultTypeInfo)`
+- Sampling — `response.Deserialize(InputResponse.SamplingResultTypeInfo)`
+- Roots list — `response.Deserialize(InputResponse.RootsResultTypeInfo)`
 
 ### Load shedding with requestState-only responses
 
@@ -191,14 +191,14 @@ public static string WizardTool(
 
     if (requestState == "step-2" && inputResponses is not null)
     {
-        var name = inputResponses["name"].ElicitationResult?.Content?.FirstOrDefault().Value;
-        var age = inputResponses["age"].ElicitationResult?.Content?.FirstOrDefault().Value;
+        var name = inputResponses["name"].Deserialize(InputResponse.ElicitResultTypeInfo)?.Content?.FirstOrDefault().Value;
+        var age = inputResponses["age"].Deserialize(InputResponse.ElicitResultTypeInfo)?.Content?.FirstOrDefault().Value;
         return $"Welcome, {name}! You are {age} years old.";
     }
 
     if (requestState == "step-1" && inputResponses is not null)
     {
-        var name = inputResponses["name"].ElicitationResult?.Content?.FirstOrDefault().Value;
+        var name = inputResponses["name"].Deserialize(InputResponse.ElicitResultTypeInfo)?.Content?.FirstOrDefault().Value;
 
         // Second round — ask for age
         throw new InputRequiredException(
diff --git a/docs/concepts/roots/roots.md b/docs/concepts/roots/roots.md
@@ -122,7 +122,7 @@ public static string ListRootsWithMrtr(
     // On retry, process the client's roots response
     if (context.Params!.InputResponses?.TryGetValue("get_roots", out var response) is true)
     {
-        var roots = response.RootsResult?.Roots ?? [];
+        var roots = response.Deserialize(InputResponse.RootsResultTypeInfo)?.Roots ?? [];
         return $"Found {roots.Count} roots: {string.Join(", ", roots.Select(r => r.Uri))}";
     }
 
diff --git a/docs/concepts/sampling/sampling.md b/docs/concepts/sampling/sampling.md
@@ -139,7 +139,7 @@ public static string SampleWithMrtr(
     // On retry, process the client's sampling response
     if (context.Params!.InputResponses?.TryGetValue("llm_call", out var response) is true)
     {
-        var text = response.SamplingResult?.Content
+        var text = response.Deserialize(InputResponse.SamplingResultTypeInfo)?.Content
             .OfType<TextContentBlock>().FirstOrDefault()?.Text;
         return $"LLM said: {text}";
     }
diff --git a/src/ModelContextProtocol.Core/Client/McpClientImpl.cs b/src/ModelContextProtocol.Core/Client/McpClientImpl.cs
@@ -566,20 +566,41 @@ private async ValueTask<IDictionary<string, InputResponse>> ResolveInputRequests
         IDictionary<string, InputRequest> inputRequests,
         CancellationToken cancellationToken)
     {
-        var responses = new Dictionary<string, InputResponse>(inputRequests.Count);
+        // Resolve all input requests concurrently. If any fails, cancel the rest so user-facing
+        // handlers (sampling/elicitation prompts) don't keep running for a request whose caller
+        // has already given up, and ensure exceptions from late-completing tasks are observed.
+        using var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
 
-        // Resolve all input requests concurrently
-        var tasks = new List<(string Key, Task<InputResponse> Task)>(inputRequests.Count);
+        var keyed = new (string Key, Task<InputResponse> Task)[inputRequests.Count];
+        int i = 0;
         foreach (var kvp in inputRequests)
         {
-            tasks.Add((kvp.Key, ResolveInputRequestAsync(kvp.Value, cancellationToken)));
+            keyed[i++] = (kvp.Key, ResolveInputRequestAsync(kvp.Value, linkedCts.Token));
         }
 
-        foreach (var entry in tasks)
+        try
         {
-            responses[entry.Key] = await entry.Task.ConfigureAwait(false);
+            await Task.WhenAll(Array.ConvertAll(keyed, k => k.Task)).ConfigureAwait(false);
+        }
+        catch
+        {
+            linkedCts.Cancel();
+            try
+            {
+                await Task.WhenAll(Array.ConvertAll(keyed, k => k.Task)).ConfigureAwait(false);
+            }
+            catch
+            {
+                // Observed; the original exception is the one we want to surface.
+            }
+            throw;
         }
 
+        var responses = new Dictionary<string, InputResponse>(keyed.Length);
+        foreach (var (key, task) in keyed)
+        {
+            responses[key] = task.Result;
+        }
         return responses;
     }
 
diff --git a/src/ModelContextProtocol.Core/Protocol/InputResponse.cs b/src/ModelContextProtocol.Core/Protocol/InputResponse.cs
@@ -1,6 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
 
 namespace ModelContextProtocol.Protocol;
 
@@ -28,7 +29,10 @@ public sealed class InputResponse
     /// Gets or sets the raw JSON element representing the response.
     /// </summary>
     /// <remarks>
-    /// Use <see cref="Deserialize{T}"/> or the typed factory methods to work with concrete response types.
+    /// Use <see cref="Deserialize{T}"/> with the <c>JsonTypeInfo&lt;T&gt;</c> matching the
+    /// associated <see cref="InputRequest.Method"/> — for elicitation, sampling, or roots see
+    /// <see cref="ElicitResultTypeInfo"/>, <see cref="SamplingResultTypeInfo"/>, and
+    /// <see cref="RootsResultTypeInfo"/>.
     /// </remarks>
     [JsonIgnore]
     public JsonElement RawValue { get; set; }
@@ -43,28 +47,25 @@ public sealed class InputResponse
         JsonSerializer.Deserialize(RawValue, typeInfo);
 
     /// <summary>
-    /// Gets the response as a <see cref="CreateMessageResult"/>.
+    /// Gets the <see cref="JsonTypeInfo{T}"/> for <see cref="ElicitResult"/>, suitable for use with
+    /// <see cref="Deserialize{T}"/> when the corresponding <see cref="InputRequest.Method"/> is
+    /// <see cref="RequestMethods.ElicitationCreate"/>.
     /// </summary>
-    /// <returns>The deserialized sampling result, or <see langword="null"/> if deserialization fails.</returns>
-    [JsonIgnore]
-    public CreateMessageResult? SamplingResult =>
-        JsonSerializer.Deserialize(RawValue, McpJsonUtilities.JsonContext.Default.CreateMessageResult);
+    public static JsonTypeInfo<ElicitResult> ElicitResultTypeInfo => McpJsonUtilities.JsonContext.Default.ElicitResult;
 
     /// <summary>
-    /// Gets the response as an <see cref="ElicitResult"/>.
+    /// Gets the <see cref="JsonTypeInfo{T}"/> for <see cref="CreateMessageResult"/>, suitable for use with
+    /// <see cref="Deserialize{T}"/> when the corresponding <see cref="InputRequest.Method"/> is
+    /// <see cref="RequestMethods.SamplingCreateMessage"/>.
     /// </summary>
-    /// <returns>The deserialized elicitation result, or <see langword="null"/> if deserialization fails.</returns>
-    [JsonIgnore]
-    public ElicitResult? ElicitationResult =>
-        JsonSerializer.Deserialize(RawValue, McpJsonUtilities.JsonContext.Default.ElicitResult);
+    public static JsonTypeInfo<CreateMessageResult> SamplingResultTypeInfo => McpJsonUtilities.JsonContext.Default.CreateMessageResult;
 
     /// <summary>
-    /// Gets the response as a <see cref="ListRootsResult"/>.
+    /// Gets the <see cref="JsonTypeInfo{T}"/> for <see cref="ListRootsResult"/>, suitable for use with
+    /// <see cref="Deserialize{T}"/> when the corresponding <see cref="InputRequest.Method"/> is
+    /// <see cref="RequestMethods.RootsList"/>.
     /// </summary>
-    /// <returns>The deserialized roots list result, or <see langword="null"/> if deserialization fails.</returns>
-    [JsonIgnore]
-    public ListRootsResult? RootsResult =>
-        JsonSerializer.Deserialize(RawValue, McpJsonUtilities.JsonContext.Default.ListRootsResult);
+    public static JsonTypeInfo<ListRootsResult> RootsResultTypeInfo => McpJsonUtilities.JsonContext.Default.ListRootsResult;
 
     /// <summary>
     /// Creates an <see cref="InputResponse"/> from a <see cref="CreateMessageResult"/>.
diff --git a/src/ModelContextProtocol.Core/Server/McpServerImpl.cs b/src/ModelContextProtocol.Core/Server/McpServerImpl.cs
@@ -1217,11 +1217,7 @@ internal bool IsLowLevelMrtrAvailable() =>
                 }
 
                 // Resolve each input request by sending the corresponding JSON-RPC call to the client.
-                var inputResponses = new Dictionary<string, InputResponse>(inputRequests.Count);
-                foreach (var kvp in inputRequests)
-                {
-                    inputResponses[kvp.Key] = await ResolveInputRequestAsync(kvp.Value, cancellationToken).ConfigureAwait(false);
-                }
+                var inputResponses = await ResolveInputRequestsAsync(inputRequests, cancellationToken).ConfigureAwait(false);
 
                 // Reconstruct request params with inputResponses and requestState for the retry.
                 var paramsObj = request.Params?.DeepClone() as JsonObject ?? new JsonObject();
@@ -1244,6 +1240,52 @@ internal bool IsLowLevelMrtrAvailable() =>
         }
     }
 
+    /// <summary>
+    /// Resolves a batch of MRTR input requests concurrently by dispatching each as a standard
+    /// JSON-RPC request to the client. On the first failure all remaining handlers are cancelled
+    /// so user-facing flows (sampling/elicitation prompts) don't keep running once the caller has
+    /// given up, and exceptions from late-completing tasks are observed before the original
+    /// exception is rethrown.
+    /// </summary>
+    private async Task<IDictionary<string, InputResponse>> ResolveInputRequestsAsync(
+        IDictionary<string, InputRequest> inputRequests,
+        CancellationToken cancellationToken)
+    {
+        using var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
+
+        var keyed = new (string Key, Task<InputResponse> Task)[inputRequests.Count];
+        int i = 0;
+        foreach (var kvp in inputRequests)
+        {
+            keyed[i++] = (kvp.Key, ResolveInputRequestAsync(kvp.Value, linkedCts.Token));
+        }
+
+        try
+        {
+            await Task.WhenAll(Array.ConvertAll(keyed, k => k.Task)).ConfigureAwait(false);
+        }
+        catch
+        {
+            linkedCts.Cancel();
+            try
+            {
+                await Task.WhenAll(Array.ConvertAll(keyed, k => k.Task)).ConfigureAwait(false);
+            }
+            catch
+            {
+                // Observed; the original exception is the one we want to surface.
+            }
+            throw;
+        }
+
+        var responses = new Dictionary<string, InputResponse>(keyed.Length);
+        foreach (var (key, task) in keyed)
+        {
+            responses[key] = task.Result;
+        }
+        return responses;
+    }
+
     /// <summary>
     /// Resolves a single MRTR <see cref="InputRequest"/> by dispatching it as a standard JSON-RPC
     /// request to the client. This is the server-side mirror of the client's input resolution logic,
diff --git a/tests/ModelContextProtocol.AspNetCore.Tests/MapMcpTests.Mrtr.cs b/tests/ModelContextProtocol.AspNetCore.Tests/MapMcpTests.Mrtr.cs
@@ -91,7 +91,7 @@ private static async Task<string> MrtrMixed(McpServer server, RequestContext<Cal
         // Round 3 entry: confirmation from round 2 available. Transition to await API.
         if (state == "round-2" && responses?.TryGetValue("confirm", out var confirmResponse) == true)
         {
-            var confirmation = confirmResponse.ElicitationResult?.Action ?? "unknown";
+            var confirmation = confirmResponse.Deserialize(InputResponse.ElicitResultTypeInfo)?.Action ?? "unknown";
 
             // Await API: sequential sampling then elicitation
             var sampleResult = await server.SampleAsync(new CreateMessageRequestParams
@@ -114,10 +114,10 @@ private static async Task<string> MrtrMixed(McpServer server, RequestContext<Cal
         // Round 2 entry: parallel results from round 1 available.
         if (state == "round-1" && responses is not null)
         {
-            var name = responses["name"].ElicitationResult?.Content?.FirstOrDefault().Value;
-            var weather = responses["weather"].SamplingResult?.Content
+            var name = responses["name"].Deserialize(InputResponse.ElicitResultTypeInfo)?.Content?.FirstOrDefault().Value;
+            var weather = responses["weather"].Deserialize(InputResponse.SamplingResultTypeInfo)?.Content
                 .OfType<TextContentBlock>().FirstOrDefault()?.Text ?? "";
-            var root = responses["roots"].RootsResult?.Roots?.FirstOrDefault()?.Name ?? "";
+            var root = responses["roots"].Deserialize(InputResponse.RootsResultTypeInfo)?.Roots?.FirstOrDefault()?.Name ?? "";
 
             // Exception API: single elicitation with requestState
             throw new InputRequiredException(
@@ -305,7 +305,7 @@ private static string MrtrElicit(RequestContext<CallToolRequestParams> context)
         if (context.Params!.InputResponses is { } responses &&
             responses.TryGetValue("user_input", out var response))
         {
-            return $"elicit-ok:{response.ElicitationResult?.Action}";
+            return $"elicit-ok:{response.Deserialize(InputResponse.ElicitResultTypeInfo)?.Action}";
         }
 
         throw new InputRequiredException(
@@ -329,7 +329,7 @@ public async Task Mrtr_LowLevel_Roots_CompletesViaMrtr()
                 if (context.Params!.InputResponses is { } responses &&
                     responses.TryGetValue("roots", out var response))
                 {
-                    var roots = response.RootsResult?.Roots;
+                    var roots = response.Deserialize(InputResponse.RootsResultTypeInfo)?.Roots;
                     return $"roots-ok:{string.Join(",", roots?.Select(r => r.Uri) ?? [])}";
                 }
 
@@ -363,13 +363,13 @@ private static string MrtrMulti(RequestContext<CallToolRequestParams> context)
 
         if (requestState == "round-2" && inputResponses is not null)
         {
-            var greeting = inputResponses["greeting"].ElicitationResult?.Action;
+            var greeting = inputResponses["greeting"].Deserialize(InputResponse.ElicitResultTypeInfo)?.Action;
             return $"multi-done:greeting={greeting}";
         }
 
         if (requestState == "round-1" && inputResponses is not null)
         {
-            var name = inputResponses["name"].ElicitationResult?.Content?.FirstOrDefault().Value;
+            var name = inputResponses["name"].Deserialize(InputResponse.ElicitResultTypeInfo)?.Content?.FirstOrDefault().Value;
             throw new InputRequiredException(
                 inputRequests: new Dictionary<string, InputRequest>
                 {
@@ -475,11 +475,11 @@ private static string MrtrConcurrentThree(RequestContext<CallToolRequestParams>
             responses.ContainsKey("sample") &&
             responses.ContainsKey("roots"))
         {
-            var elicitAction = responses["elicit"].ElicitationResult?.Action;
-            var sampleText = responses["sample"].SamplingResult?
+            var elicitAction = responses["elicit"].Deserialize(InputResponse.ElicitResultTypeInfo)?.Action;
+            var sampleText = responses["sample"].Deserialize(InputResponse.SamplingResultTypeInfo)?
                 .Content.OfType<TextContentBlock>().FirstOrDefault()?.Text;
             var rootUris = string.Join(",",
-                responses["roots"].RootsResult?.Roots.Select(r => r.Uri) ?? []);
+                responses["roots"].Deserialize(InputResponse.RootsResultTypeInfo)?.Roots.Select(r => r.Uri) ?? []);
             return $"all-ok:elicit={elicitAction},sample={sampleText},roots={rootUris}";
         }
 
@@ -596,7 +596,7 @@ public async Task Mrtr_Backcompat_Roots_ResolvedViaLegacyJsonRpc()
                 if (context.Params!.InputResponses is { } responses &&
                     responses.TryGetValue("roots", out var response))
                 {
-                    var roots = response.RootsResult?.Roots;
+                    var roots = response.Deserialize(InputResponse.RootsResultTypeInfo)?.Roots;
                     return $"roots-ok:{roots?.FirstOrDefault()?.Name}";
                 }
 
@@ -633,8 +633,8 @@ public async Task Mrtr_Backcompat_MultipleInputRequests_ResolvedViaLegacyJsonRpc
                     responses.TryGetValue("confirm", out var elicitResponse) &&
                     responses.TryGetValue("summarize", out var sampleResponse))
                 {
-                    var action = elicitResponse.ElicitationResult?.Action;
-                    var text = sampleResponse.SamplingResult?.Content.OfType<TextContentBlock>().FirstOrDefault()?.Text;
+                    var action = elicitResponse.Deserialize(InputResponse.ElicitResultTypeInfo)?.Action;
+                    var text = sampleResponse.Deserialize(InputResponse.SamplingResultTypeInfo)?.Content.OfType<TextContentBlock>().FirstOrDefault()?.Text;
                     return $"both:{action}:{text}";
                 }
 
diff --git a/tests/ModelContextProtocol.ConformanceServer/Prompts/IncompleteResultPrompts.cs b/tests/ModelContextProtocol.ConformanceServer/Prompts/IncompleteResultPrompts.cs
@@ -23,7 +23,7 @@ public static GetPromptResult IncompleteResultPrompt(RequestContext<GetPromptReq
         if (context.Params!.InputResponses is { } responses &&
             responses.TryGetValue("user_context", out var response))
         {
-            var elicit = response.ElicitationResult;
+            var elicit = response.Deserialize(InputResponse.ElicitResultTypeInfo);
             var contextValue = TryReadString(elicit?.Content, "context") ?? "(unknown)";
             return new GetPromptResult
             {
diff --git a/tests/ModelContextProtocol.ConformanceServer/Tools/IncompleteResultTools.cs b/tests/ModelContextProtocol.ConformanceServer/Tools/IncompleteResultTools.cs
diff --git a/tests/ModelContextProtocol.Tests/Protocol/MrtrSerializationTests.cs b/tests/ModelContextProtocol.Tests/Protocol/MrtrSerializationTests.cs

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ public static string ElicitWithMrtr(`
`188`	`188`	`// On retry, process the client's elicitation response`
`189`	`189`	`if (context.Params!.InputResponses?.TryGetValue("user_input", out var response) is true)`
`190`	`190`	`{`
`191`		`- var elicitResult = response.ElicitationResult;`
	`191`	`+ var elicitResult = response.Deserialize(InputResponse.ElicitResultTypeInfo);`
`192`	`192`	`return elicitResult?.Action == "accept"`
`193`	`193`	`? $"User accepted: {elicitResult.Content?.FirstOrDefault().Value}"`
`194`	`194`	`: "User declined.";`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ public static string ListRootsWithMrtr(`
`122`	`122`	`// On retry, process the client's roots response`
`123`	`123`	`if (context.Params!.InputResponses?.TryGetValue("get_roots", out var response) is true)`
`124`	`124`	`{`
`125`		`- var roots = response.RootsResult?.Roots ?? [];`
	`125`	`+ var roots = response.Deserialize(InputResponse.RootsResultTypeInfo)?.Roots ?? [];`
`126`	`126`	`return $"Found {roots.Count} roots: {string.Join(", ", roots.Select(r => r.Uri))}";`
`127`	`127`	`}`
`128`	`128`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ public static string SampleWithMrtr(`
`139`	`139`	`// On retry, process the client's sampling response`
`140`	`140`	`if (context.Params!.InputResponses?.TryGetValue("llm_call", out var response) is true)`
`141`	`141`	`{`
`142`		`- var text = response.SamplingResult?.Content`
	`142`	`+ var text = response.Deserialize(InputResponse.SamplingResultTypeInfo)?.Content`
`143`	`143`	`.OfType<TextContentBlock>().FirstOrDefault()?.Text;`
`144`	`144`	`return $"LLM said: {text}";`
`145`	`145`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ private static async Task<string> MrtrMixed(McpServer server, RequestContext<Cal`
`91`	`91`	`// Round 3 entry: confirmation from round 2 available. Transition to await API.`
`92`	`92`	`if (state == "round-2" && responses?.TryGetValue("confirm", out var confirmResponse) == true)`
`93`	`93`	`{`
`94`		`- var confirmation = confirmResponse.ElicitationResult?.Action ?? "unknown";`
	`94`	`+ var confirmation = confirmResponse.Deserialize(InputResponse.ElicitResultTypeInfo)?.Action ?? "unknown";`
`95`	`95`
`96`	`96`	`// Await API: sequential sampling then elicitation`
`97`	`97`	`var sampleResult = await server.SampleAsync(new CreateMessageRequestParams`
`@@ -114,10 +114,10 @@ private static async Task<string> MrtrMixed(McpServer server, RequestContext<Cal`
`114`	`114`	`// Round 2 entry: parallel results from round 1 available.`
`115`	`115`	`if (state == "round-1" && responses is not null)`
`116`	`116`	`{`
`117`		`- var name = responses["name"].ElicitationResult?.Content?.FirstOrDefault().Value;`
`118`		`- var weather = responses["weather"].SamplingResult?.Content`
	`117`	`+ var name = responses["name"].Deserialize(InputResponse.ElicitResultTypeInfo)?.Content?.FirstOrDefault().Value;`
	`118`	`+ var weather = responses["weather"].Deserialize(InputResponse.SamplingResultTypeInfo)?.Content`
`119`	`119`	`.OfType<TextContentBlock>().FirstOrDefault()?.Text ?? "";`
`120`		`- var root = responses["roots"].RootsResult?.Roots?.FirstOrDefault()?.Name ?? "";`
	`120`	`+ var root = responses["roots"].Deserialize(InputResponse.RootsResultTypeInfo)?.Roots?.FirstOrDefault()?.Name ?? "";`
`121`	`121`
`122`	`122`	`// Exception API: single elicitation with requestState`
`123`	`123`	`throw new InputRequiredException(`
`@@ -305,7 +305,7 @@ private static string MrtrElicit(RequestContext<CallToolRequestParams> context)`
`305`	`305`	`if (context.Params!.InputResponses is { } responses &&`
`306`	`306`	`responses.TryGetValue("user_input", out var response))`
`307`	`307`	`{`
`308`		`- return $"elicit-ok:{response.ElicitationResult?.Action}";`
	`308`	`+ return $"elicit-ok:{response.Deserialize(InputResponse.ElicitResultTypeInfo)?.Action}";`
`309`	`309`	`}`
`310`	`310`
`311`	`311`	`throw new InputRequiredException(`
`@@ -329,7 +329,7 @@ public async Task Mrtr_LowLevel_Roots_CompletesViaMrtr()`
`329`	`329`	`if (context.Params!.InputResponses is { } responses &&`
`330`	`330`	`responses.TryGetValue("roots", out var response))`
`331`	`331`	`{`
`332`		`- var roots = response.RootsResult?.Roots;`
	`332`	`+ var roots = response.Deserialize(InputResponse.RootsResultTypeInfo)?.Roots;`
`333`	`333`	`return $"roots-ok:{string.Join(",", roots?.Select(r => r.Uri) ?? [])}";`
`334`	`334`	`}`
`335`	`335`
`@@ -363,13 +363,13 @@ private static string MrtrMulti(RequestContext<CallToolRequestParams> context)`
`363`	`363`
`364`	`364`	`if (requestState == "round-2" && inputResponses is not null)`
`365`	`365`	`{`
`366`		`- var greeting = inputResponses["greeting"].ElicitationResult?.Action;`
	`366`	`+ var greeting = inputResponses["greeting"].Deserialize(InputResponse.ElicitResultTypeInfo)?.Action;`
`367`	`367`	`return $"multi-done:greeting={greeting}";`
`368`	`368`	`}`
`369`	`369`
`370`	`370`	`if (requestState == "round-1" && inputResponses is not null)`
`371`	`371`	`{`
`372`		`- var name = inputResponses["name"].ElicitationResult?.Content?.FirstOrDefault().Value;`
	`372`	`+ var name = inputResponses["name"].Deserialize(InputResponse.ElicitResultTypeInfo)?.Content?.FirstOrDefault().Value;`
`373`	`373`	`throw new InputRequiredException(`
`374`	`374`	`inputRequests: new Dictionary<string, InputRequest>`
`375`	`375`	`{`
`@@ -475,11 +475,11 @@ private static string MrtrConcurrentThree(RequestContext<CallToolRequestParams>`
`475`	`475`	`responses.ContainsKey("sample") &&`
`476`	`476`	`responses.ContainsKey("roots"))`
`477`	`477`	`{`
`478`		`- var elicitAction = responses["elicit"].ElicitationResult?.Action;`
`479`		`- var sampleText = responses["sample"].SamplingResult?`
	`478`	`+ var elicitAction = responses["elicit"].Deserialize(InputResponse.ElicitResultTypeInfo)?.Action;`
	`479`	`+ var sampleText = responses["sample"].Deserialize(InputResponse.SamplingResultTypeInfo)?`
`480`	`480`	`.Content.OfType<TextContentBlock>().FirstOrDefault()?.Text;`
`481`	`481`	`var rootUris = string.Join(",",`
`482`		`- responses["roots"].RootsResult?.Roots.Select(r => r.Uri) ?? []);`
	`482`	`+ responses["roots"].Deserialize(InputResponse.RootsResultTypeInfo)?.Roots.Select(r => r.Uri) ?? []);`
`483`	`483`	`return $"all-ok:elicit={elicitAction},sample={sampleText},roots={rootUris}";`
`484`	`484`	`}`
`485`	`485`
`@@ -596,7 +596,7 @@ public async Task Mrtr_Backcompat_Roots_ResolvedViaLegacyJsonRpc()`
`596`	`596`	`if (context.Params!.InputResponses is { } responses &&`
`597`	`597`	`responses.TryGetValue("roots", out var response))`
`598`	`598`	`{`
`599`		`- var roots = response.RootsResult?.Roots;`
	`599`	`+ var roots = response.Deserialize(InputResponse.RootsResultTypeInfo)?.Roots;`
`600`	`600`	`return $"roots-ok:{roots?.FirstOrDefault()?.Name}";`
`601`	`601`	`}`
`602`	`602`
`@@ -633,8 +633,8 @@ public async Task Mrtr_Backcompat_MultipleInputRequests_ResolvedViaLegacyJsonRpc`
`633`	`633`	`responses.TryGetValue("confirm", out var elicitResponse) &&`
`634`	`634`	`responses.TryGetValue("summarize", out var sampleResponse))`
`635`	`635`	`{`
`636`		`- var action = elicitResponse.ElicitationResult?.Action;`
`637`		`- var text = sampleResponse.SamplingResult?.Content.OfType<TextContentBlock>().FirstOrDefault()?.Text;`
	`636`	`+ var action = elicitResponse.Deserialize(InputResponse.ElicitResultTypeInfo)?.Action;`
	`637`	`+ var text = sampleResponse.Deserialize(InputResponse.SamplingResultTypeInfo)?.Content.OfType<TextContentBlock>().FirstOrDefault()?.Text;`
`638`	`638`	`return $"both:{action}:{text}";`
`639`	`639`	`}`
`640`	`640`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public static GetPromptResult IncompleteResultPrompt(RequestContext<GetPromptReq`
`23`	`23`	`if (context.Params!.InputResponses is { } responses &&`
`24`	`24`	`responses.TryGetValue("user_context", out var response))`
`25`	`25`	`{`
`26`		`- var elicit = response.ElicitationResult;`
	`26`	`+ var elicit = response.Deserialize(InputResponse.ElicitResultTypeInfo);`
`27`	`27`	`var contextValue = TryReadString(elicit?.Content, "context") ?? "(unknown)";`
`28`	`28`	`return new GetPromptResult`
`29`	`29`	`{`