[erichare]

What this PR does:

Gives every MCP tool argument a description that says what it is and what JSON it takes, to the standard #2619 set for findAndRerank. Aaron asked for this in review. Filter and sort keep their class descriptions, and arguments whose schema hides the wire shape end with an example. A contract test deserializes each example as its argument type.

Update arguments use the UpdateClause description from #2651 instead of repeating it.

Which issue(s) this PR fixes:

Addresses the MCP argument portion of #2604.

Verification

93 focused tests passed with 0 failures, 0 errors, and 0 skips at 0cc5d9c3f, this PR's commit in the rebuilt stack. The format check found 0 non-complying files out of 1,201. CI runs the unit and DSE/HCD integration suites on this push.

JAVA_HOME=/Library/Java/JavaVirtualMachines/graalvm-21.jdk/Contents/Home ./mvnw -B -ntp clean com.spotify.fmt:fmt-maven-plugin:check test -DskipITs -Dxml-format.skip=true -Dsurefire.failIfNoSpecifiedTests=false -Dquarkus.http.test-port=19089 '-Dtest=McpProtocolTest,McpClauseSchemaContractTest,McpOpenApiSchemaAdapterTest,McpSchemaCustomizerTest'

Manual client checks were not run.

Checklist

• Changes manually tested
• Automated Tests added/updated
• Documentation added/updated
• CLA Signed: DataStax CLA

MCP stack

Merges bottom up; row 1 is the bottom of the stack.

#	PR	Change	Issue
1	#2651	Show accepted update syntax in tool schemas	Fixes #2631
2	#2658	Describe every tool argument	Part of #2604
3	#2645	Close the command context after each call	Part of #2629
4	#2653	Return useful errors when setup fails	Fixes #2628
5	#2648	Keep payloads and credentials out of logs	Fixes #2635
6	#2649	Describe side effects and retry behavior	Fixes #2636
7	#2655	Validate commands like the HTTP API	Fixes #2632
8	#2656	Test request isolation, document tracing	Refs #2629
9	#2657	Reject unapproved browser origins	Part of #2630
10	#2659	Serve only protocol 2026-07-28	Part of #2625, #2626
11	#2669	Add opt-in OAuth authentication	Refs #2642, #2643

[github-actions]

📈 Unit Test Coverage Delta vs Main Branch

Metric	Value
Main Branch	56.74%
This PR	56.86%
Delta	🟢 +0.12%
✅ Coverage improved!

[github-actions]

Unit Test Coverage Report

Overall Project	56.86%	🍏

File	Coverage
KeyspaceCommandTools.java	0%	🍏
CollectionCommandTools.java	0%	🍏
GeneralCommandTools.java	0%	🍏

[github-actions]

➡️ Integration Test Coverage Delta vs Main Branch (dse69-it)

Metric	Value
Main Branch	72.98%
This PR	72.98%
Delta	⚪ 0.00%
ℹ️ Coverage unchanged

[github-actions]

Integration Test Coverage Report (dse69-it)

Overall Project	72.98%	🍏

File	Coverage
KeyspaceCommandTools.java	100%	🍏
CollectionCommandTools.java	100%	🍏
GeneralCommandTools.java	100%	🍏

[github-actions]

➡️ Integration Test Coverage Delta vs Main Branch (hcd-it)

Metric	Value
Main Branch	74.33%
This PR	74.33%
Delta	⚪ 0.00%
ℹ️ Coverage unchanged

[github-actions]

Integration Test Coverage Report (hcd-it)

Overall Project	74.33%	🍏

File	Coverage
KeyspaceCommandTools.java	100%	🍏
CollectionCommandTools.java	100%	🍏
GeneralCommandTools.java	100%	🍏