Separate org and user search#486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Jump to bottom

Open

SamMorrowDrums wants to merge3 commits intomain

base:main

Choose a base branch

fromsearch_orgs

Open

Separate org and user search#486

SamMorrowDrums wants to merge3 commits intomainfromsearch_orgs

+272 −83

Conversation

Copy link

Collaborator

SamMorrowDrums commentedJun 5, 2025

In order to make separation of certain objects more clear we should separate them. This means orgs and users are not the same.

A follow-up will be to separate issue and PR search by also scoping the queries and producing separate functions. It is best for the LLM that it has clear boundaries, and concepts are consistent, rather than accepting the legacy API quirks.

CopilotAI review requested due to automatic review settings

June 5, 2025 22:13

SamMorrowDrums requested a review froma team as acode owner

June 5, 2025 22:13

SamMorrowDrums force-pushed thesearch_orgs branch from4fc70e3 to2583fd0Compare

June 5, 2025 22:15

CopilotAI reviewed

Jun 5, 2025

View reviewed changes

Copy link

Contributor

CopilotAI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Pull Request Overview

This PR separates organization searches from user searches by introducing dedicated tools and refactoring common logic.

Registers a neworgs toolset inInitToolsets.
Refactors search handlers withuserOrOrgHandler and adds a (currently unused)minimalAccountSearchHandler.
ImplementsSearchOrgs function and its tests insearch_test.go.

Reviewed Changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

File	Description
pkg/github/tools.go	Added and registered`"orgs"` toolset alongside existing toolsets
pkg/github/search.go	Refactored search logic, added`userOrOrgHandler`,`SearchOrgs`, and residual`minimalAccountSearchHandler`
pkg/github/search_test.go	Added`Test_SearchOrgs` suite to validate organization search tool

Comments suppressed due to low confidence (3)

pkg/github/search.go:163

TheminimalAccountSearchHandler function is never used. Consider removing it or integrating it into theuserOrOrgHandler to avoid dead code.

func minimalAccountSearchHandler(accountType string, query string, getClient GetClientFn, ctx context.Context, sort, order string, pagination PaginationParams) {

pkg/github/search.go:335

[nitpick] The translation keyTOOL_SEARCH_ORGS_USER_TITLE includesUSER although this is for organizations; consider renaming it toTOOL_SEARCH_ORGS_TITLE for consistency.

mcp.WithToolAnnotation(mcp.ToolAnnotation{ Title: t("TOOL_SEARCH_ORGS_USER_TITLE", "Search organizations"),

pkg/github/search_test.go:521

[nitpick] Tests forSearchOrgs cover the default pagination but don’t verify behavior when non-defaultsort,order, or pagination parameters are provided. Consider adding cases to cover those parameters.