fix(mcp): allow Claude Code names in tool validation#3135
Merged
amitksingh1490 merged 2 commits intotailcallhq:mainfrom Apr 24, 2026
Merged
fix(mcp): allow Claude Code names in tool validation#3135amitksingh1490 merged 2 commits intotailcallhq:mainfrom
amitksingh1490 merged 2 commits intotailcallhq:mainfrom
Conversation
amitksingh1490
approved these changes
Apr 24, 2026
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
Allow agent tool validation to accept Claude Code formatted MCP tool names when the agent is configured with Forge's legacy MCP tool names or globs.
Problem
Custom agents can be configured with MCP tools using Forge's internal legacy format, for example
mcp_github_tool_create_issueormcp_github_tool_*.After the Claude Code MCP naming compatibility work, incoming tool calls may arrive as
mcp__github__create_issue. MCP execution lookup already accepts both formats, but agent tool validation still checked only the incoming name directly. That caused valid MCP calls to be rejected as not allowed.Fix
When validating a tool call, continue checking the incoming normalized name and also check its legacy MCP form when the incoming name uses the Claude Code
mcp__{server}__{tool}format.Validation
cargo test -p forge_app tool_resolver::tests -- --nocapturecargo clippy -p forge_app --lib --tests -- -D warnings