[cherry-pick] Update rate limit message#309657
Merged
sbatten merged 1 commit intorelease/1.116from Apr 13, 2026
Merged
Conversation
vs-code-engineering
bot
added
the
cherry-pick-artifact
sbatten
approved these changes
Apr 13, 2026
eli-w-king
pushed a commit
that referenced
this pull request
Apr 14, 2026
Co-authored-by: vs-code-engineering[bot] <vs-code-engineering[bot]@users.noreply.github.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Cherry-pick of #309571 from
main.Error handling improvements:
getRateLimitMessageto accept acopilotPlanparameter and return tailored rate limit messages depending on the user's plan (free, individual, individual_pro) and whether a reset time is available. [1] [2]getErrorDetailsFromChatFetchErrorInnerto pass thecopilotPlanargument togetRateLimitMessage, ensuring the correct message is shown based on the user's plan.