Feature request: --wait-on-usage-limit flag for non-interactive / remote-control sessions

Open 💬 9 comments Opened Mar 31, 2026 by LarsThorenWint

Problem

When running Claude Code via /remote-control (e.g. from the mobile app), hitting the usage limit causes an interactive prompt to appear on the local terminal. This prompt blocks the session indefinitely and cannot be dismissed through the remote control channel.

For mobile app users, this means the session is permanently stuck until someone physically accesses the computer — there is no way to recover remotely.

Requested Feature

Add a flag (e.g. --wait-on-usage-limit) that, instead of showing an interactive prompt when the usage limit is reached, silently waits until the quota resets and then automatically continues.

claude --dangerously-skip-permissions --wait-on-usage-limit

Use Case

  • User runs Claude Code on a desktop/server with /remote-control
  • User connects and controls the session from the Claude Code mobile app
  • Usage limit is hit mid-session
  • With the current behavior: session blocks, mobile app is frozen, physical access required to recover
  • With --wait-on-usage-limit: session pauses silently, resumes automatically when quota resets, mobile app stays connected

Why This Matters

Remote control + mobile is a first-class use case. The current behavior makes unattended or long-running remote sessions impractical because a single quota hit requires physical intervention.

Workarounds Attempted

  • Wrapping in a while true restart loop — doesn't help because Claude doesn't exit on usage limit, it blocks
  • timeout wrapper — kills the process, but the mobile app cannot reconnect without re-pairing (physical access needed)
  • Redirecting stdin from /dev/null — may cause exit instead of block, but reconnection still requires physical access

None of these fully solve the problem for the mobile app remote control scenario.

View original on GitHub ↗

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