Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 4.8k
Split PR review creation, commenting, submission and deletion#410
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
SamMorrowDrums
merged 1 commit into
main
from
343-remove-comments-from-create_pull_request_reviewMay 19, 2025
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -5,8 +5,11 @@ import ( | ||
| "fmt" | ||
| "io" | ||
| "log" | ||
| "net/http" | ||
| "net/url" | ||
| "os" | ||
| "os/signal" | ||
| "strings" | ||
| "syscall" | ||
| "github.com/github/github-mcp-server/pkg/github" | ||
| @@ -15,6 +18,7 @@ import ( | ||
| gogithub "github.com/google/go-github/v69/github" | ||
| "github.com/mark3labs/mcp-go/mcp" | ||
| "github.com/mark3labs/mcp-go/server" | ||
| "github.com/shurcooL/githubv4" | ||
| "github.com/sirupsen/logrus" | ||
| ) | ||
| @@ -44,25 +48,43 @@ type MCPServerConfig struct { | ||
| } | ||
| func NewMCPServer(cfg MCPServerConfig) (*server.MCPServer, error) { | ||
| ghClient := gogithub.NewClient(nil).WithAuthToken(cfg.Token) | ||
| ghClient.UserAgent = fmt.Sprintf("github-mcp-server/%s", cfg.Version) | ||
| if cfg.Host != "" { | ||
| var err error | ||
| ghClient, err = ghClient.WithEnterpriseURLs(cfg.Host, cfg.Host) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to create GitHub client with host: %w", err) | ||
| } | ||
| apiHost, err := parseAPIHost(cfg.Host) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to parse API host: %w", err) | ||
| } | ||
| // Construct our REST client | ||
| restClient := gogithub.NewClient(nil).WithAuthToken(cfg.Token) | ||
| restClient.UserAgent = fmt.Sprintf("github-mcp-server/%s", cfg.Version) | ||
| restClient.BaseURL = apiHost.baseRESTURL | ||
| restClient.UploadURL = apiHost.uploadURL | ||
| // Construct our GraphQL client | ||
| // We're using NewEnterpriseClient here unconditionally as opposed to NewClient because we already | ||
| // did the necessary API host parsing so that github.com will return the correct URL anyway. | ||
| gqlHTTPClient := &http.Client{ | ||
| Transport: &bearerAuthTransport{ | ||
| transport: http.DefaultTransport, | ||
| token: cfg.Token, | ||
| }, | ||
| } // We're going to wrap the Transport later in beforeInit | ||
| gqlClient := githubv4.NewEnterpriseClient(apiHost.graphqlURL.String(), gqlHTTPClient) | ||
| // When a client send an initialize request, update the user agent to include the client info. | ||
| beforeInit := func(_ context.Context, _ any, message *mcp.InitializeRequest) { | ||
| ghClient.UserAgent = fmt.Sprintf( | ||
| userAgent := fmt.Sprintf( | ||
| "github-mcp-server/%s (%s/%s)", | ||
| cfg.Version, | ||
| message.Params.ClientInfo.Name, | ||
| message.Params.ClientInfo.Version, | ||
| ) | ||
| restClient.UserAgent = userAgent | ||
| gqlHTTPClient.Transport = &userAgentTransport{ | ||
| transport: gqlHTTPClient.Transport, | ||
| agent: userAgent, | ||
| } | ||
| } | ||
| hooks := &server.Hooks{ | ||
| @@ -83,14 +105,19 @@ func NewMCPServer(cfg MCPServerConfig) (*server.MCPServer, error) { | ||
| } | ||
| getClient := func(_ context.Context) (*gogithub.Client, error) { | ||
| return ghClient, nil // closing over client | ||
| return restClient, nil // closing over client | ||
| } | ||
| getGQLClient := func(_ context.Context) (*githubv4.Client, error) { | ||
| return gqlClient, nil // closing over client | ||
| } | ||
| // Create default toolsets | ||
| toolsets, err := github.InitToolsets( | ||
| enabledToolsets, | ||
| cfg.ReadOnly, | ||
| getClient, | ||
| getGQLClient, | ||
| cfg.Translator, | ||
| ) | ||
| if err != nil { | ||
| @@ -213,3 +240,141 @@ func RunStdioServer(cfg StdioServerConfig) error { | ||
| return nil | ||
| } | ||
| type apiHost struct { | ||
| baseRESTURL *url.URL | ||
| graphqlURL *url.URL | ||
| uploadURL *url.URL | ||
| } | ||
| func newDotcomHost() (apiHost, error) { | ||
| baseRestURL, err := url.Parse("https://api.github.com/") | ||
| if err != nil { | ||
| return apiHost{}, fmt.Errorf("failed to parse dotcom REST URL: %w", err) | ||
| } | ||
| gqlURL, err := url.Parse("https://api.github.com/graphql") | ||
| if err != nil { | ||
| return apiHost{}, fmt.Errorf("failed to parse dotcom GraphQL URL: %w", err) | ||
| } | ||
| uploadURL, err := url.Parse("https://uploads.github.com") | ||
| if err != nil { | ||
| return apiHost{}, fmt.Errorf("failed to parse dotcom Upload URL: %w", err) | ||
| } | ||
| return apiHost{ | ||
| baseRESTURL: baseRestURL, | ||
| graphqlURL: gqlURL, | ||
| uploadURL: uploadURL, | ||
| }, nil | ||
| } | ||
| func newGHECHost(hostname string) (apiHost, error) { | ||
| u, err := url.Parse(hostname) | ||
| if err != nil { | ||
| return apiHost{}, fmt.Errorf("failed to parse GHEC URL: %w", err) | ||
| } | ||
| // Unsecured GHEC would be an error | ||
| if u.Scheme == "http" { | ||
| return apiHost{}, fmt.Errorf("GHEC URL must be HTTPS") | ||
| } | ||
| restURL, err := url.Parse(fmt.Sprintf("https://api.%s/", u.Hostname())) | ||
| if err != nil { | ||
| return apiHost{}, fmt.Errorf("failed to parse GHEC REST URL: %w", err) | ||
| } | ||
| gqlURL, err := url.Parse(fmt.Sprintf("https://api.%s/graphql", u.Hostname())) | ||
| if err != nil { | ||
| return apiHost{}, fmt.Errorf("failed to parse GHEC GraphQL URL: %w", err) | ||
| } | ||
| uploadURL, err := url.Parse(fmt.Sprintf("https://uploads.%s", u.Hostname())) | ||
| if err != nil { | ||
| return apiHost{}, fmt.Errorf("failed to parse GHEC Upload URL: %w", err) | ||
| } | ||
| return apiHost{ | ||
| baseRESTURL: restURL, | ||
| graphqlURL: gqlURL, | ||
| uploadURL: uploadURL, | ||
| }, nil | ||
| } | ||
| func newGHESHost(hostname string) (apiHost, error) { | ||
| u, err := url.Parse(hostname) | ||
| if err != nil { | ||
| return apiHost{}, fmt.Errorf("failed to parse GHES URL: %w", err) | ||
| } | ||
| restURL, err := url.Parse(fmt.Sprintf("%s://%s/api/v3/", u.Scheme, u.Hostname())) | ||
| if err != nil { | ||
| return apiHost{}, fmt.Errorf("failed to parse GHES REST URL: %w", err) | ||
| } | ||
| gqlURL, err := url.Parse(fmt.Sprintf("%s://%s/api/graphql", u.Scheme, u.Hostname())) | ||
| if err != nil { | ||
| return apiHost{}, fmt.Errorf("failed to parse GHES GraphQL URL: %w", err) | ||
| } | ||
| uploadURL, err := url.Parse(fmt.Sprintf("%s://%s/api/uploads/", u.Scheme, u.Hostname())) | ||
| if err != nil { | ||
| return apiHost{}, fmt.Errorf("failed to parse GHES Upload URL: %w", err) | ||
| } | ||
| return apiHost{ | ||
| baseRESTURL: restURL, | ||
| graphqlURL: gqlURL, | ||
| uploadURL: uploadURL, | ||
| }, nil | ||
| } | ||
| // Note that this does not handle ports yet, so development environments are out. | ||
| func parseAPIHost(s string) (apiHost, error) { | ||
| if s == "" { | ||
| return newDotcomHost() | ||
| } | ||
| u, err := url.Parse(s) | ||
| if err != nil { | ||
| return apiHost{}, fmt.Errorf("could not parse host as URL: %s", s) | ||
| } | ||
| if u.Scheme == "" { | ||
| return apiHost{}, fmt.Errorf("host must have a scheme (http or https): %s", s) | ||
| } | ||
| if strings.HasSuffix(u.Hostname(), "github.com") { | ||
| return newDotcomHost() | ||
| } | ||
| if strings.HasSuffix(u.Hostname(), "ghe.com") { | ||
| return newGHECHost(s) | ||
SamMorrowDrums marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| } | ||
| return newGHESHost(s) | ||
| } | ||
| type userAgentTransport struct { | ||
| transport http.RoundTripper | ||
| agent string | ||
| } | ||
| func (t *userAgentTransport) RoundTrip(req *http.Request) (*http.Response, error) { | ||
| req = req.Clone(req.Context()) | ||
| req.Header.Set("User-Agent", t.agent) | ||
| return t.transport.RoundTrip(req) | ||
| } | ||
| type bearerAuthTransport struct { | ||
| transport http.RoundTripper | ||
| token string | ||
| } | ||
| func (t *bearerAuthTransport) RoundTrip(req *http.Request) (*http.Response, error) { | ||
| req = req.Clone(req.Context()) | ||
| req.Header.Set("Authorization", "Bearer "+t.token) | ||
| return t.transport.RoundTrip(req) | ||
| } | ||
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
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.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I chose to go away from
WithEnterpriseURLSbecause there are hosts that are not enterprise but require different URLs e.g. review labs or development environments.Sadly,
githubv4doesn't offer quite the same options, so I commented below why that is. It also doesn't export the internalgraphql.Clientso we can't just set it.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's a shame! Might need to propose exporting it.