refactor: Improve MCP tool name prefix generation with automatic duplicate handling #4369
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
…icate handling - Introduce DefaultMcpToolNamePrefixGenerator to ensure unique tool names across MCP connections - Replace default prefix generation strategy from client/title-based to duplicate detection - Automatically add counter prefixes (dp_1_, dp_2_) when duplicate tool names are detected - Track existing connections and tool names to maintain idempotency - Update tests to reflect new duplicate handling behavior (keep existing tool on duplicate) - Update documentation to describe the new default generator behavior - Change default from McpToolNamePrefixGenerator.defaultGenerator() to new DefaultMcpToolNamePrefixGenerator BREAKING CHANGE: The default tool name generation strategy has changed. Tools now use their original names by default, with automatic prefixing only when duplicates are detected across different connections. Signed-off-by: Christian Tzolov <[email protected]>
| return (mcpConnectionIfo, tool) -> McpToolUtils.prefixedToolName(mcpConnectionIfo.clientInfo().name(), | ||
| mcpConnectionIfo.clientInfo().title(), tool.name()); | ||
| } | ||
| // static McpToolNamePrefixGenerator defaultGenerator() { |
Member
There was a problem hiding this comment.
will remove when merging.
| .add(new ConnectionId(mcpConnectionInfo.clientInfo(), (mcpConnectionInfo.initializeResult() != null) | ||
| ? mcpConnectionInfo.initializeResult().serverInfo() : null, tool))) { | ||
| if (!this.allUsedToolNames.add(uniqueToolName)) { | ||
| uniqueToolName = "dp_" + this.counter.getAndIncrement() + "_" + uniqueToolName; |
Member
There was a problem hiding this comment.
While one can provide a custom prefix generator, It would be good if we can make the prefix "dp_" customisable.
Member
There was a problem hiding this comment.
perhaps "sa" to denote "Spring AI" as a prefix here instead of "dp_"?
Member
There was a problem hiding this comment.
After discussion, changing this to use "alt_" when merging.
Member
|
Rebased, updated the prefix for the duplicate tool name to use "alt_", merged as 31db86d |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
BREAKING CHANGE: The default tool name generation strategy has changed. Tools now use their original names by default, with automatic prefixing only when duplicates are detected across different connections.