Repository navigation
Conversation
# Description Slow MCP discovery can exceed router timeouts and fail agent resumes, holding worker reservations and capacity while startup waits. Separate classification also duplicates MCP connections and paginated listings. This fixes it by: - Deferring HTTP, SSE, and stdio MCP connections until invocation preparation. - Classifying and filtering ADK's own discovery responses before the SDK caches them, preserving server TTLs and catalog notification handling. - Omitting failed toolsets for the execution regardless of prior discovery success, keeping healthy tools available and retrying on later executions without exposing unclassified tools. - Serializing discovery and classification publication per toolset, with cancellation support for queued invocations. - Preserving MCP App result compaction through a single callback, alongside rich stored results, credentials, approvals, and tracing. Tools reclassified as ordinary keep their real output; removed app names remain available for historical compaction. - Documenting discovery, SDK caching, pagination guards, and failure handling in `docs/architecture/mcp.md`. # Change Type ``` /kind fix ``` # Testing - Added unit coverage for zero startup requests, one paginated discovery, filtered SDK cache hits, TTL expiry, catalog notifications, partial failures, execution-scoped retries after initial and later failures, cancellation, concurrent discovery, reclassification, and stdio startup. - Added app-result coverage for cached tools, approvals, and historical results after catalog removal, preserving the original rich payloads. - Added E2E coverage for slow MCP discovery across repeated resumes and initial discovery failure and recovery; extended app-history E2E coverage to verify SDK caching across model steps and rediscovery after restore. # Changelog ```release-note MCP discovery no longer delays startup or resume and caches filtered tools safely. ``` --------- Signed-off-by: Shashank Ram <shashank.ram@solo.io> (cherry picked from commit ccb2dd3) Signed-off-by: Eitan Yarmush <eitan.yarmush@solo.io>
This was referenced Nov 9, 2026
This was referenced Nov 9, 2026
Contributor
Author
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backports #3560 (
ccb2dd350) torelease/v1.0.xwithout modifications.Stacked on
backport/v1.0.x/06-3340. Merge it after the PR below it in the stack.Stack (merge in order, bottom first):
🤖 Generated with Claude Code