fix: forward original tool name to remote MCP servers #278
+3
−3
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.
Problem
When
tool-name-prefixis enabled (or when using explicitprefixin server config), the gateway correctly prefixes tool names for the client (e.g.,new_page→server__new_page).However, when forwarding the
tools/callrequest to the remote MCP server, the prefixed name was being sent instead of the original name. The remote server doesn't know about gateway prefixes and fails with "tool not found".Root Cause
In
handlers.go, themcpServerToolHandlerwas usingreq.Params.Name(the prefixed name from the client request) when callingclient.Session().CallTool():Solution
Pass the original tool name (without prefix) to the handler and use it when forwarding to the remote server:
originalToolNameparameter tomcpServerToolHandlertool.Name(original name) when creating the handler inlistCapabilitiesoriginalToolNameinstead ofreq.Params.Namewhen calling the remote serverTesting
Tested with Chrome DevTools MCP server using custom
prefixconfiguration:chromedev__new_page→ "Tool new_page not found"chromedev__new_page→ works correctlyRelated
This fix is complementary to #263 which changes the prefix separator from
:to__. Without this fix, thetool-name-prefixfeature doesn't work regardless of which separator is used.