Feature request: auto-return to plan mode after an approved plan finishes executing

Open 💬 1 comment Opened Jul 12, 2026 by Asermar

What I'd like

An option so that after a plan is presented and its execution is authorized (including in auto / accept-edits mode), Claude Code automatically returns to plan mode once the work finishes, so the next task starts in plan mode again.

Why

A natural workflow is: plan → approve → execute → plan the next thing. Today, once you ExitPlanMode and run, the session stays in default / acceptEdits for every subsequent turn until you manually Shift+Tab back to plan. For a plan-driven workflow you have to remember to re-arm plan mode after every single task.

Why current options don't cover it

  • permissions.defaultMode: "plan" only applies at session startup / resume, not after each completed task within a running session.
  • Hooks can't fill the gap: Stop and SessionStart hooks don't support updatedPermissions / setMode (only PreToolUse / PermissionRequest do, which fire before a tool runs, not on task completion). Verified on v2.1.207.

Proposed

A setting such as permissions.returnToPlanAfterTask: true (or allowing the Stop hook to emit updatedPermissions with a setMode entry), so that after Claude stops following an approved plan, the permission mode reverts to plan for the next turn.

Environment

Claude Code 2.1.207, Linux.

View original on GitHub ↗

This issue has 1 comment on GitHub. Read the full discussion on GitHub ↗