[FEATURE] Change Default Plan Mode Exit Option
Preflight Checklist
- [x] I have searched existing requests and this feature hasn't been requested yet
- [x] This is a single feature request (not multiple features)
Problem Statement
When exiting plan mode via ExitPlanMode, the default option is "Yes, clear context and auto-accept edits." This clears conversation context, losing any instructions, templates, or procedural guidance not captured in the plan file.
This breaks skill-based workflows (.claude/skills/) that use plan mode as part of multi-phase processes. These skills contain agent prompt templates, phase-specific instructions, and codebase investigation context that inform post-plan execution. When context is cleared at plan approval, subsequent phases lose access to this critical information.
The current options presented are:
- Yes, clear context and auto-accept edits (shift+tab) ← DEFAULT
- Yes, auto-accept edits
- Yes, manually approve edits
- Type here to tell Claude what to change
Users must manually select option 2 or 3 each time to preserve context—easy to forget when the default is highlighted and shift+tab provides a convenient shortcut.
Proposed Solution
Change the default to "Yes, auto-accept edits" (option 2), which preserves context while maintaining the streamlined execution flow users expect after plan approval.
The "clear context" option should remain available for users who want a fresh start, but it shouldn't be the default behavior that risks losing workflow state.
Alternative Solutions
- Make the default configurable via
settings.json:
{
"planMode": {
"defaultExitOption": "auto-accept" | "manual-approve" | "clear-context"
}
}
- Per-skill override allowing skill authors to specify exit behavior in skill frontmatter:
---
name: my-skill
plan-mode-exit: preserve-context
---
- Remove "clear context" from the exit dialog entirely and let users who want to clear context use the existing
/compactcommand after plan approval.
Priority
High - Significant impact on productivity
Feature Category
Interactive mode (TUI)
Use Case Example
A feature development skill with the following phases:
- Requirements clarification
- Codebase investigation (launches
code-investigatoragents) - Architecture design (launches
implementation-strategistagents, writes plan) - Plan approval ←
ExitPlanModecalled here - Implementation (uses agent prompt templates from skill, investigation context from phase 2)
- Code review (launches review agents per skill instructions)
- Validation
The skill file contains detailed templates for agent prompts in phases 5-7 and instructions for how to handle review findings. When the user approves the plan with the default "clear context" option, phases 5-7 fail because:
- Agent prompt templates from the skill are no longer in context
- Investigation findings from phase 2 are lost
- Phase-specific instructions for code review and validation are gone
The plan file captures what to build, but not how to execute the remaining phases according to the skill's methodology.
Additional Context
- Claude Code version: 2.1.9
- Related: #2988 (addresses auto-accept behavior, but not context clearing)
- The v2.1.2 changelog notes that Shift+Tab was added as a shortcut for the auto-accept option, which reinforces the default selection and makes accidental context clearing more likely
Showing cached comments. Read the full discussion on GitHub ↗
12 Comments
Found 3 possible duplicate issues:
This issue will be automatically closed as a duplicate in 3 days.
🤖 Generated with Claude Code
I wouldn't call this a duplicate because it provides more context on why the "clear context" setting is problematic and proposes various solutions.
The new "clear context" option can definitely be useful, but I agree it would be nice to make this default configurable. @jasonevines gave a good rundown of reason why clearing context isn't always desired.
I would go further to say that clearing context is almost never desired for tasks involving more than a small amount of intricacy.
Boris Cherny is touting this default context clearing on X, claiming, "We found this helps keep Claude on track longer, and significantly improves plan adherence."
I question how that was determined. It's flatly wrong for anything more than simple work without complex strategy or discovery.
This is true probably for how most people use it, but i don't think it's inherently true. That being said, I don't think it's a good default given to how most people work currently.
But back to that point, when I'm working on a large task I often intentionally start a new conversation when I'm ready to implement, so that the agent has more context space to work with. The key is to make sure your written plan has everything needed to understand and complete the implementation.
I do this by telling Claude something like "I'm going to hand this off to another Claude agent to implement, make sure our plan has all the information the next agent will need to understand and implement this successfully." Then I start a new chat and point it to the plan file we generated in the previous chat.
@timdmackey To address the context issues during complex development, I've built a phased skill workflow (inspired by and extended from
feature-dev) wherein an orchestration agent (the conversation agent) coordinates custom-tailored subagents (sometimes multiple at a time depending on Claude's judgment of task needs) through discovery, planning, implementation, code review, and strategy review. The orchestrator starts plan mode and a to-do list at the very start of the workflow and then exits plan mode before implementation.With a workflow like this, the orchestrator can maintain context on the problem and the strategy through the whole process much of the time. And if I do need to compact, triggering the workflow again is usually enough to get Claude back on track without missing a step.
I almost had a conniption fit running the workflow after the default context clearing mechanic for exiting plan mode dropped, when I didn't realize yet what had happened.
See related issue #18878
This could yield such awesome setups, 10x than ralph-loop.
Alternative Solution
Add a setting (e.g.,
"questionSafetyOption": true) that inserts a neutral, no-op first option at the top of everyAskUserQuestionprompt. This option would do nothing when selected, effectively acting as a guard against accidental Enter presses.For example, the no-op option could be labeled something like:
When selected, Claude would simply re-ask the same question or treat it as if no answer was given.
After living with this feature for the last month, I'd say it's definitely useful but I'd still rather it not be in the default position. I use the "clear context" option 50% of the time but there have been a couple times were I accidentally triggered it and didn't want to.
The context-clearing default hurts because compaction is inherently lossy — no AI summary perfectly preserves the intent and strategy a human put into a plan. Plan documents are the real answer: human-curated artifacts you can re-read verbatim after any reset. But right now plans have no lifecycle — an approved plan gets silently overwritten the next time you enter plan mode, so there's nothing to reload. If plans had identity and status tracking, clearing context would be safe because the approved plan persists and Claude can pick it back up. See #29445 for the broader proposal.
The default "clear context and auto-accept" option on plan mode exit is indeed surprising when you want to keep your planning context.
Workaround 1 — Use Shift+Tab to switch modes instead of ExitPlanMode:
Pressing
Shift+Tabcycles between permission modes (plan → auto-accept → bypass → plan) without clearing context. This avoids the ExitPlanMode prompt entirely.Workaround 2 — Save critical context in CLAUDE.md before exiting:
Before exiting plan mode, tell Claude:
This persists the planning context in a file that survives context clears.
Workaround 3 — Use mission.md or a task file:
This ensures the plan persists regardless of how plan mode is exited.
Workaround 4 — Select "No" and manually switch:
When the ExitPlanMode dialog appears, select the option that doesn't clear context (if available). Then manually adjust your permission mode with Shift+Tab.