Address missed feedback from #1021

Author: halter73

src/ModelContextProtocol.Core/Client/McpClientImpl.cs

@@ -104,17 +104,11 @@ private void RegisterHandlers(McpClientOptions options, NotificationHandlers not
                 McpJsonUtilities.JsonContext.Default.ElicitResult);
 
             _options.Capabilities ??= new();
-            if (_options.Capabilities.Elicitation is null)
+            _options.Capabilities.Elicitation ??= new();
+            if (_options.Capabilities.Elicitation.Form is null &&
+                _options.Capabilities.Elicitation.Url is null)
             {
-                // Default to supporting only form mode if not explicitly configured
-                _options.Capabilities.Elicitation = new()
-                {
-                    Form = new(),
-                };
-            }
-            else if (_options.Capabilities.Elicitation.Form is null && _options.Capabilities.Elicitation.Url is null)
-            {
-                // If ElicitationCapability is set but both modes are null, default to form mode for backward compatibility
+                // If both modes are null, default to form mode for backward compatibility.
                 _options.Capabilities.Elicitation.Form = new();
             }
         }

src/ModelContextProtocol.Core/Protocol/ElicitationCapability.cs

@@ -70,8 +70,6 @@ public sealed class Converter : JsonConverter<ElicitationCapability>
             }
 
             var capability = new ElicitationCapability();
-            bool hasForm = false;
-            bool hasUrl = false;
 
             foreach (var property in document.RootElement.EnumerateObject())
             {
@@ -80,19 +78,18 @@ public sealed class Converter : JsonConverter<ElicitationCapability>
                     capability.Form = property.Value.ValueKind == JsonValueKind.Null
                         ? null
                         : capability.Form ?? new FormElicitationCapability();
-                    hasForm = true;
                 }
                 else if (property.NameEquals("url"))
                 {
                     capability.Url = property.Value.ValueKind == JsonValueKind.Null
                         ? null
                         : capability.Url ?? new UrlElicitationCapability();
-                    hasUrl = capability.Url is not null;
                 }
             }
 
-            if (!hasForm && !hasUrl)
+            if (capability.Form is null && capability.Url is null)
             {
+                // If both modes are null, default to form mode for backward compatibility.
                 capability.Form = new FormElicitationCapability();
             }