[FEATURE REQUEST] Prevent Auto-Accept Mode from Automatically Enabling When Exiting Plan Mode
Summary
Add a configuration option to prevent auto-accept mode from automatically turning on when exiting plan mode and selecting "1 to continue and start".
Problem Statement
Currently, when users are in plan mode (activated with Shift+Tab twice) and choose option "1 to continue and start" after reviewing a plan, Claude Code automatically enables auto-accept mode without user consent. This behavior forces users into an autonomous mode they didn't explicitly request, reducing control over the development workflow.
Current Behavior:
- User activates plan mode (
Shift+Tabtwice) - Claude creates a plan without making changes
- User reviews plan and selects "1. Yes" to continue
- Auto-accept mode automatically turns on ⚠️
- Claude proceeds to make changes without further confirmation
Expected Behavior:
- User activates plan mode (
Shift+Tabtwice) - Claude creates a plan without making changes
- User reviews plan and selects "1. Yes" to continue
- Auto-accept mode remains OFF unless explicitly toggled
- Claude asks for confirmation before each significant change
User Impact
- Loss of Control: Users lose the ability to review individual changes after plan approval
- Unexpected Behavior: Auto-accept enabling is surprising and undocumented
- Workflow Disruption: Users must remember to manually disable auto-accept after every plan mode session
- Safety Concerns: Automatic execution without confirmation increases risk of unintended changes
Proposed Solution
Option 1: Configuration Setting (Recommended)
Add a configuration option to control this behavior:
// ~/.claude/settings.json
{
"planMode": {
"autoEnableAcceptOnExit": false // Default: false
}
}
Option 2: Explicit User Choice
When exiting plan mode, present clear options:
Plan completed. How would you like to proceed?
1. Execute plan step-by-step (manual approval for each change)
2. Execute plan with auto-accept mode (no further confirmations)
3. Cancel and stay in plan mode
Option 3: Remember User Preference
Store the user's last choice and apply it consistently:
- If user previously chose manual mode, default to manual
- If user previously chose auto-accept, default to auto-accept
- Allow override with explicit flag:
--auto-acceptor--manual
Environment Information
- Platform: [Multiple - affects all platforms]
- Claude CLI version: [Current versions affected]
- Operating System: [All supported OS]
- Terminal: [All terminals]
Use Cases
- Code Review Workflows: Developers who want to review each change individually
- Learning/Educational: Users learning Claude Code who want to see each step
- High-Stakes Projects: Critical codebases where each change needs approval
- Team Collaboration: Shared sessions where multiple people review changes
Workaround
Currently, users must remember to press Shift+Tab immediately after exiting plan mode to disable auto-accept, which is easy to forget and creates friction.
Related Issues
- This complements existing auto-accept functionality without removing it
- Addresses user experience and control concerns
- Maintains backward compatibility while providing user choice
Labels
enhancementfeature-requestuser-experienceworkflowplan-mode
---
Note: This feature request aims to improve user control and predictability while maintaining all existing functionality. The goal is to make auto-accept an explicit choice rather than an automatic consequence of using plan mode.
10 Comments
+1000. Here is a transcript of my mildy disturbing conversation with Claude on the topic. I do not think the UX with
shift-tabis very clear currently–it seems to be overloaded with multiple toggles.+1. It's insane to me that the default throws it into auto-accept and has caused some serious issues.
Auto-accept should be a deliberate user choice.
When I recently started working with Claude Code, I remember there were 3 options about how it acts when it is ready to make changes and the default always asked me to approve changes, than once I had a few changes in sequence planned and so I agreed to auto-accept thinking I could revert back after. Which now I am in the same situation dealing with what you have described perfectly. Does this sound familiar to anyone? I never saw the 3 choices again, now it is just the 1. Yes
and 2. No, keep planning .
+1
+1 I'm having to manually get out of this each time, I wish that this was a toggle preset. I want to read each file one by one after the plan mode.
In the latest version I'm seeing a new option "2. Yes, and manually approve edits". I think this ticket can be closed?
Never saw this kind of message , when did this update happen?
Ah yes just got this , very nice solution .
Thank you
Would you like to proceed?
❯1. Yes, and auto-accept edits
Every rule I create to block harmful actions, create mandate to seek my approval, even with key phrases, it searches the scripts and analyzes them and auto approves actions exactly with those keyphrases. I have been forced to turn off most of its tools like edit, delete etc. It is more harmful than helpful unless tied down, and put in a jail.
It was mindlessly auto approving and editing code, so I created a script to enforce progressive timestamped backups. It created placeholder backups with names and timestamp, so looking at the codebase you see the backups are proper, but there was nothing inside them. Then I had to add steps to verify integrity of backups before proceeding. But even then it tried to misuse, now I have blocked the edit tool totally. Serious criminal behavior.
This issue has been automatically locked since it was closed and has not had any activity for 7 days. If you're experiencing a similar issue, please file a new issue and reference this one if it's relevant.