Remove redundant Form capability check from form mode condition

Copilot · halter73 · Copilot · commit 9a2de43e9c20 · 2026-01-15T22:32:05.000Z
Co-authored-by: halter73 &lt;54385+halter73@users.noreply.github.com&gt;
diff --git a/src/ModelContextProtocol.Core/Server/McpServer.Methods.cs b/src/ModelContextProtocol.Core/Server/McpServer.Methods.cs
@@ -488,7 +488,7 @@ private void ThrowIfElicitationUnsupported(ElicitRequestParams request)
             throw new InvalidOperationException("Client does not support elicitation requests.");
         }
 
-        if (string.Equals(request.Mode, "form", StringComparison.Ordinal) && elicitationCapability.Form is null)
+        if (string.Equals(request.Mode, "form", StringComparison.Ordinal))
         {
             if (request.RequestedSchema is null)
             {
diff --git a/tests/ModelContextProtocol.Tests/Protocol/UrlElicitationTests.cs b/tests/ModelContextProtocol.Tests/Protocol/UrlElicitationTests.cs
@@ -535,10 +535,7 @@ public async Task FormElicitation_Requires_RequestedSchema()
         {
             Capabilities = new ClientCapabilities
             {
-                Elicitation = new ElicitationCapability
-                {
-                    Url = new UrlElicitationCapability(),
-                }
+                Elicitation = new(),
             },
             Handlers = new McpClientHandlers()
             {

Original file line number	Diff line number	Diff line change
`@@ -488,7 +488,7 @@ private void ThrowIfElicitationUnsupported(ElicitRequestParams request)`
`488`	`488`	`throw new InvalidOperationException("Client does not support elicitation requests.");`
`489`	`489`	`}`
`490`	`490`
`491`		`- if (string.Equals(request.Mode, "form", StringComparison.Ordinal) && elicitationCapability.Form is null)`
	`491`	`+ if (string.Equals(request.Mode, "form", StringComparison.Ordinal))`
`492`	`492`	`{`
`493`	`493`	`if (request.RequestedSchema is null)`
`494`	`494`	`{`
Original file line number	Diff line number	Diff line change
`@@ -535,10 +535,7 @@ public async Task FormElicitation_Requires_RequestedSchema()`
`535`	`535`	`{`
`536`	`536`	`Capabilities = new ClientCapabilities`
`537`	`537`	`{`
`538`		`- Elicitation = new ElicitationCapability`
`539`		`- {`
`540`		`- Url = new UrlElicitationCapability(),`
`541`		`- }`
	`538`	`+ Elicitation = new(),`
`542`	`539`	`},`
`543`	`540`	`Handlers = new McpClientHandlers()`
`544`	`541`	`{`