[BUG] Plan mode: exit options not discoverable when ExitPlanMode tool is rejected
Preflight Checklist
- [x] I have searched existing issues and this hasn't been reported yet
- [x] This is a single bug report (not multiple bugs)
Bug Description
Problem
When Claude calls ExitPlanMode and the user rejects it (e.g., because they want to defer the plan rather than approve it), the user gets stuck in a rejection loop with no indication that alternative exit mechanisms exist. The rejection dialog only offers "stay in plan mode" semantics, creating the impression that there is no way out without approving.
What actually exists (but isn't surfaced)
Shift+Tabcycles through permission modes and exits plan mode/plantoggles plan mode on/offAlt+Mas an alternative shortcut
None of these are mentioned in the rejection dialog, in plan mode's header/status area, or in any contextual help during the loop.
Steps to reproduce
- Enter plan mode (via
EnterPlanModetool orShift+Tab) - Claude drafts a plan and calls
ExitPlanMode - User rejects
ExitPlanMode(because they want to defer, not approve) - Claude stays in plan mode and calls
ExitPlanModeagain - Cycle repeats -- user sees no hint about
Shift+Tabor/planas alternatives - User feels trapped, fears losing context if they force an exit
Expected behavior
When ExitPlanMode is rejected, the UI should surface a hint like:
"Tip: Press Shift+Tab or type /plan to exit plan mode without approving."
Or the rejection dialog itself could offer three options:
- Approve plan -- proceed to implement
- Exit plan mode -- leave without approving (equivalent to Shift+Tab)
- Stay in plan mode -- continue planning
Environment
- Claude Code CLI v1.x (TUI, terminal)
- macOS + tmux
- Multi-agent workflow via tmuxinator
Proposed Solution
Surface Shift+Tab / /plan as exit hints in the ExitPlanMode rejection flow. A single line of contextual help would prevent the confusion entirely.
Priority
Low - Minor inconvenience
Feature Category
Interactive mode (TUI)
This issue has 4 comments on GitHub. Read the full discussion on GitHub ↗