[FEATURE REQUEST] Prevent Auto-Accept Mode from Automatically Enabling When Exiting Plan Mode

Resolved 💬 10 comments Opened Jul 4, 2025 by Mohammad-Orabi Closed Jul 16, 2025

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:

  1. User activates plan mode (Shift+Tab twice)
  2. Claude creates a plan without making changes
  3. User reviews plan and selects "1. Yes" to continue
  4. Auto-accept mode automatically turns on ⚠️
  5. Claude proceeds to make changes without further confirmation

Expected Behavior:

  1. User activates plan mode (Shift+Tab twice)
  2. Claude creates a plan without making changes
  3. User reviews plan and selects "1. Yes" to continue
  4. Auto-accept mode remains OFF unless explicitly toggled
  5. 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-accept or --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

  • enhancement
  • feature-request
  • user-experience
  • workflow
  • plan-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.

View original on GitHub ↗

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