Replace hyphen encoding with fuzzy matching for MCP tool names #10775
+358
−159
Conversation
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
Replace triple-underscore encoding (___) with fuzzy matching that treats hyphens and underscores as equivalent. This keeps MCP tool names short and readable while still handling model mangling of hyphens. - Remove HYPHEN_ENCODING and decodeMcpName() - Add normalizeForComparison() and toolNamesMatch() for fuzzy matching - Update McpHub.findServerNameBySanitizedName() with fuzzy match fallback - Update tests to reflect new behavior Related to: #10766
dosubot
bot
added
size:L
Contributor
Reviewed the new commits that add fuzzy matching for tool names. The previous issue has been addressed.
Mention @roomote in a comment to request specific changes to this pull request or fix all unresolved issues. |
![roomote[bot]](https://avatars.githubusercontent.com/in/1546624?s=60&v=4){kind=small}
When models mangle hyphens to underscores in tool names (e.g., 'get-user-profile' becomes 'get_user_profile'), we now use fuzzy matching to find the correct tool and pass the original hyphenated name to the MCP server. - Use toolNamesMatch() in validateToolExists to find tools with mangled names - Return the resolved (original) tool name for use in MCP calls - Add test for fuzzy matching scenario
dosubot
bot
added
size:XL
daniel-lxs
moved this from PR [Needs Prelim Review]
to PR [Needs Review]
in Roo Code Roadmap
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.
Problem
The current approach to handling MCP tool names with hyphens encodes them as triple underscores (
___), causing tool names to become excessively long. For example,resolve-library-idbecomesresolve___library___id. This bloats tool names and can cause truncation issues with the 64-character limit imposed by some providers.Related to: #10766
Linear: https://linear.app/roocode/issue/COM-501/replace-hyphen-encoding-with-fuzzy-matching-for-mcp-tool-names
Solution
Replace the encoding approach with fuzzy matching that treats hyphens and underscores as equivalent when comparing tool names. This way:
Changes
src/utils/mcp-name.ts: RemovedHYPHEN_ENCODINGanddecodeMcpName(). AddednormalizeForComparison()andtoolNamesMatch()for fuzzy matching.src/services/mcp/McpHub.ts: EnhancedfindServerNameBySanitizedName()with a fuzzy matching fallback.Example
Before (encoding):
resolve-library-id→mcp--context7--resolve___library___idAfter (fuzzy matching):
resolve-library-id→mcp--context7--resolve-library-idmcp__context7__resolve_library_id→ fuzzy match finds itImportant
Replaces hyphen encoding with fuzzy matching for MCP tool names, preserving hyphens and simplifying name handling.
mcp-name.ts, treating hyphens and underscores as equivalent.UseMcpToolTool.tsto usetoolNamesMatch()for tool validation.normalizeForComparison()andtoolNamesMatch()inmcp-name.tsfor fuzzy matching.HYPHEN_ENCODINGanddecodeMcpName()frommcp-name.ts.McpHub.tsto use fuzzy matching infindServerNameBySanitizedName().useMcpToolTool.spec.tsandmcp-name.spec.tsto reflect new behavior.This description was created by
for ce45c97. You can customize this summary. It will automatically update as commits are pushed.