Auto-resume conversation when token/rate limit resets

Resolved 💬 3 comments Opened Mar 24, 2026 by exe-network Closed Mar 28, 2026

Feature Request

When a conversation is interrupted because the token or rate limit is exhausted, Claude Code currently just stops. The user has to manually resume once the limit resets.

Desired behavior: An option (e.g. --auto-resume or a setting in settings.json) that makes Claude Code automatically wait and continue the conversation once the rate limit window resets — especially useful for long-running, multi-step tasks that shouldn't require babysitting.

Use case: Complex autonomous tasks (multi-file refactors, data pipelines, research) that exceed the token budget in a single window. Today the user has to watch for the limit, wait, and manually --continue. This breaks the "set it and forget it" workflow that makes agentic coding powerful.

Possible approach:

  • Detect rate-limit / token-exhaustion exit
  • Wait for the reset window (API headers or a configurable backoff)
  • Automatically invoke --continue to pick up where it left off
  • Optional max-retries / max-wait to avoid infinite loops

🤖 Generated with Claude Code

View original on GitHub ↗

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