feat: Refactor MCPTool
and MCPToolset
to increase code reuse, simplify
#2004
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.
Why:
Consolidates ~280 lines of duplicate code between
MCPTool
andMCPToolset
into ~130 lines of shared utilities, achieving ~150 net lines saved while eliminating DRY violations and improving maintainability with zero breaking changes to public APIs.What:
MCPConnectionManager
class to encapsulate shared connection logic_create_connection_error_message()
utility for unified error handling across server typescreate_tool_invoke_function()
to share tool invocation patternsHow can it be used:
How did you test it:
Notes for the reviewer:
Focus areas: The
MCPConnectionManager
handles all shared lifecycle management while each class maintains its design philosophy -MCPTool
as direct Tool inheritance vsMCPToolset
as tool factory. Git diff shows +244/-170 due to net-per-file counting, but actual duplicate code elimination is ~280 lines replaced with ~130 shared utilities.