Skip to content

feat(errors): improve rate limit error messages for AI agents #2401

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.

Sign up for GitHub

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

Closed
Will-hxw wants to merge 1 commit into from
+23 −0
Closed

feat(errors): improve rate limit error messages for AI agents #2401

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions pkg/errors/error.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ package errors

import (
"context"
"errors"
"fmt"
"net/http"
"time"

"github.com/github/github-mcp-server/pkg/utils"
"github.com/google/go-github/v82/github"
Expand Down Expand Up @@ -159,6 +161,27 @@ func NewGitHubAPIErrorResponse(ctx context.Context, message string, resp *github
if ctx != nil {
_, _ = addGitHubAPIErrorToContext(ctx, apiErr) // Explicitly ignore error for graceful handling
}

var rateLimitErr *github.RateLimitError
if errors.As(err, &rateLimitErr) {
retryIn := time.Until(rateLimitErr.Rate.Reset.Time).Round(time.Second)
return utils.NewToolResultError(fmt.Sprintf(
"%s: GitHub API rate limit exceeded. Retry after %v.",
message, retryIn))
}

var abuseErr *github.AbuseRateLimitError
if errors.As(err, &abuseErr) {
if abuseErr.RetryAfter != nil {
return utils.NewToolResultError(fmt.Sprintf(
"%s: GitHub secondary rate limit exceeded. Retry after %v.",
message, abuseErr.RetryAfter.Round(time.Second)))
}
return utils.NewToolResultError(fmt.Sprintf(
"%s: GitHub secondary rate limit exceeded. Wait before retrying.",
message))
}

return utils.NewToolResultErrorFromErr(message, err)
}

Expand Down