Migrate context_tools to new ServerTool pattern #1590
+427
−356
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
Migrate search.go tools (SearchRepositories, SearchCode, SearchUsers, SearchOrgs) to use the new NewTool helper and ToolDependencies pattern. - Functions now take only TranslationHelperFunc and return ServerTool - Handler generation uses ToolDependencies for typed access to clients - Update tools.go call sites to remove getClient parameter - Update tests to use new Handler(deps) pattern This demonstrates the migration pattern for additional tool files. Co-authored-by: Adam Holt <oholt@github.com>
Contributor
There was a problem hiding this comment.
Pull request overview
This PR successfully migrates context_tools.go to the new ServerTool pattern with typed dependency injection, building on the infrastructure established in PR #1589. The changes eliminate direct dependency passing through function parameters in favor of lazy dependency resolution through the ToolDependencies struct.
Key Changes:
- Migrated three MCP tools (
GetMe,GetTeams,GetTeamMembers) to use theNewToolhelper with dependency injection - Updated all related tests to use the new
serverTool.Handler(deps)pattern with proper error handling - Fixed error return patterns to consistently return
nilfor Go errors (MCP errors are reported viaresult.IsError)
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| pkg/github/tools.go | Removes NewServerToolLegacy wrappers, now directly calls GetMe, GetTeams, and GetTeamMembers which return ServerTool types |
| pkg/github/context_tools.go | Refactors three tool functions to use NewTool helper with typed dependency injection; handlers now access clients via deps.GetClient(ctx) and deps.GetGQLClient(ctx); error handling updated to return nil for Go errors |
| pkg/github/context_tools_test.go | Updates all tests to use serverTool.Handler(deps) pattern; restructures error handling to use getErrorResult helper consistently; adds explicit require.False(t, result.IsError) checks in success paths |
This was referenced Dec 13, 2025
Convert GetMe, GetTeams, and GetTeamMembers to use the new typed dependency injection pattern: - Functions now take only translations helper, return toolsets.ServerTool - Handler is generated lazily via deps.GetClient/deps.GetGQLClient - Tests updated to use serverTool.Handler(deps) pattern - Fixed error return pattern to return nil for Go error (via result.IsError) Co-authored-by: Adam Holt <omgitsads@users.noreply.github.com>
SamMorrowDrums
force-pushed
the
SamMorrowDrums/server-tool-refactor-context-tools
branch
from
07249a0 to
b863da9
Compare
SamMorrowDrums
force-pushed
the
SamMorrowDrums/server-tool-refactor
branch
from
b29546e to
43acefe
Compare
This was referenced Dec 13, 2025
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
Second PR in the ServerTool refactor stack. Migrates
context_tools.goto the new typed dependency injection pattern.Changes
GetMe,GetTeams, andGetTeamMembersto useNewToolhelpertranslations.TranslationHelperFunc, returningtoolsets.ServerTooldeps.GetClient(ctx)/deps.GetGQLClient(ctx)serverTool.Handler(deps)pattern with proper error handlingnilfor Go error (errors reported viaresult.IsError)Stack
Testing
script/lintpassesscript/testpassesCo-authored-by: Adam Holt oholt@github.com