[erichare]

What this PR does:

Closes each MCP command context when a tool call succeeds, fails, or is canceled, including synchronous processor failures. Keyspace tools reuse one request context, and cleanup failures preserve the original result or error.

Which issue(s) this PR fixes:

Part of #2629. The remaining trace-context audit keeps that issue open.

Verification

9 focused tests passed with 0 failures, 0 errors, and 0 skips at ef011130d, this PR's commit in the rebuilt stack. The format check found 0 non-complying files out of 1,202. 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 com.spotify.fmt:fmt-maven-plugin:check test -DskipITs -Dxml-format.skip=true -Dsurefire.failIfNoSpecifiedTests=false -Dquarkus.http.test-port=19089 '-Dtest=McpResourceTest'

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	57.08%
Delta	🟢 +0.34%
✅ Coverage improved!

[github-actions]

Unit Test Coverage Report

Overall Project	57.08%	🍏
Files changed	100%	🍏

File	Coverage
McpResource.java	50.32%	🍏

[github-actions]

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

Metric	Value
Main Branch	72.98%
This PR	72.98%
Delta	🔴 -0.01%
⚠️ Coverage decreased

[github-actions]

Integration Test Coverage Report (dse69-it)

Overall Project	72.98% -0.01%	🍏
Files changed	77.42%	🍏

File	Coverage
McpResource.java	86.17% -2.25%	🍏

[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 decreased

[github-actions]

Integration Test Coverage Report (hcd-it)

Overall Project	74.33% -0.01%	🍏
Files changed	77.42%	🍏

File	Coverage
McpResource.java	86.17% -2.25%	🍏