[FEATURE] Improve the UX when hitting rate limits /rate-limit-options

Resolved 💬 3 comments Opened Mar 30, 2026 by dsecareanu Closed May 2, 2026

Preflight Checklist

  • [x] I have searched existing requests and this feature hasn't been requested yet
  • [x] This is a single feature request (not multiple features)

Problem Statement

When running into rate limits in Claude Code, you're faced with the following message that doesn't make much sense because:

The execution already stopped (you've hit the rate limit).

/rate-limit-options

What do you want to do?

❯ 1. Stop and wait for limit to reset

  1. Add funds to continue with extra usage
  2. Upgrade your plan

Enter to confirm · Esc to cancel

Proposed Solution

Replace option 1 with 2, 2 with 3, and add an option 3 to resume once the rate limit has expired (which could be automatically triggered to solve the issue raised by multiple other users).

Alternative Solutions

When the limit resets and you want to resume, you don't have an option except hitting 1 and then asking Claude to resume its task... (which is poor UX)

Priority

Low - Nice to have

Feature Category

Interactive mode (TUI)

Use Case Example

_No response_

Additional Context

_No response_

View original on GitHub ↗

This issue has 3 comments on GitHub. Read the full discussion on GitHub ↗