Limit MCP catalog pagination - #36039
Merged
copyberry[bot] merged 1 commit intoJul 29, 2026
Merged
Conversation
copyberry Bot
pushed a commit
that referenced
this pull request
Jul 29, 2026
## Why MCP catalog discovery must not allow a server to keep pagination running or growing without bounds. ## What changed - Apply the shared pagination collector to tool, resource, and resource-template discovery. - Limit each catalog to 100 pages and 1,024 items, and reject pagination cursors larger than 64 KiB or any repeated cursor. - Bound the entire pagination operation by the configured tool timeout, falling back to 30 seconds when no timeout is configured. ## Testing Add unit coverage for every limit and an end-to-end MCP test that preserves valid multi-page tools while excluding a server that returns an oversized cursor. GitOrigin-RevId: 961a1bfa5fe8a265daf56e342a919c980cd720fa
copyberry
Bot
force-pushed
the
copyberry/codex-internal-to-codex-oss/961a1bfa5fe8a265daf56e342a919c980cd720fa
branch
from
July 29, 2026 22:34
6f5870e to
7241ec3
Compare
## Why MCP catalog discovery must not allow a server to keep pagination running or growing without bounds. ## What changed - Apply the shared pagination collector to tool, resource, and resource-template discovery. - Limit each catalog to 100 pages and 1,024 items, and reject pagination cursors larger than 64 KiB or any repeated cursor. - Bound the entire pagination operation by the configured tool timeout, falling back to 30 seconds when no timeout is configured. ## Testing Add unit coverage for every limit and an end-to-end MCP test that preserves valid multi-page tools while excluding a server that returns an oversized cursor. GitOrigin-RevId: 961a1bfa5fe8a265daf56e342a919c980cd720fa
copyberry
Bot
force-pushed
the
copyberry/codex-internal-to-codex-oss/961a1bfa5fe8a265daf56e342a919c980cd720fa
branch
2 times, most recently
from
July 29, 2026 22:37
cc735a7 to
3e3ae08
Compare
copyberry
Bot
deleted the
copyberry/codex-internal-to-codex-oss/961a1bfa5fe8a265daf56e342a919c980cd720fa
branch
July 29, 2026 22:38
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
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.
Limit MCP catalog pagination
Why
MCP catalog discovery must not allow a server to keep pagination running or
growing without bounds.
What changed
discovery.
larger than 64 KiB or any repeated cursor.
back to 30 seconds when no timeout is configured.
Testing
Add unit coverage for every limit and an end-to-end MCP test that preserves
valid multi-page tools while excluding a server that returns an oversized
cursor.