fix(mcp): avoid repeated tool schema materialization#1959
Merged
Conversation
🦋 Changeset detectedLatest commit: 116dd0a The changes in this PR will be included in the next version bump. Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
agents
@cloudflare/ai-chat
@cloudflare/codemode
create-think
hono-agents
@cloudflare/shell
@cloudflare/think
@cloudflare/voice
@cloudflare/worker-bundler
commit: |
Contributor
Author
|
@agent-think we will need to document this on cloudflare-docs repo. pls make a pr there for this. |
2 tasks
cjol
approved these changes
Jul 21, 2026
cjol
left a comment
Contributor
There was a problem hiding this comment.
I hesitated over the description of
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.
Summary
Think.includeMcpTools, defaulting totrue, so applications that expose MCP tools through Code Mode or another mechanism outside Think's automatic tool set can skip direct MCP AI-tool materialization without disabling connection restore, discovery, waiting, raw listing, or callsagentsand@cloudflare/thinkWhy
Think currently calls
getAITools()beforebeforeTurn(), so anactiveToolsfilter cannot prevent every MCP input and output schema from being converted to Zod. Large catalogs exposed through Code Mode therefore pay hundreds of conversions on every turn despite exposing no direct MCP tools to the model.This change avoids conversion entirely when Think's automatic MCP exposure is disabled and reuses converted schemas for direct MCP exposure while each live connection retains its current catalog. Replacing the catalog drops the superseded converted schema graph.
Testing
pnpm --filter agents exec vitest --run --project workers src/tests/mcp/client-manager.test.tspnpm --filter @cloudflare/think exec vitest --run -c src/tests/vitest.config.ts src/tests/mcp-tool-materialization.test.tsagentspackage test suite@cloudflare/thinkpackage test suitepnpm exec nx affected -t build test --base=origin/mainpnpm run checkCloses #1938