[FEATURE] Plan-approval dialog hides auto mode whenever bypass permissions is available

Problem Statement

When a session is started with --allow-dangerously-skip-permissions (so that bypass appears in the shift+tab cycle as an escape hatch), the plan-approval dialog no longer offers auto mode at all. Both "Yes" rows are replaced with bypass:

1. Yes, clear context (5% used) and bypass permissions
2. Yes, and switch to BYPASS PERMISSIONS (no further prompts) for this session
3. Yes, manually approve edits
4. Tell Claude what to change

Without the flag, the same dialog offers "Yes, clear context and use auto mode" and "resume auto mode". The selection appears to be a fixed priority — bypass if available, else auto, else accept edits — for both the clear-context row and the keep-context row (observed in 2.1.296).

This makes "bypass available" and "plan → execute in auto mode" mutually exclusive. My setup:

• defaultMode: "auto" — auto is my everyday mode
• bypass enabled only as a manual escape route for when the auto-mode classifier blocks something I have already reviewed
• showClearContextOnPlanAccept: true — I want to clear context after planning

Having bypass available should not make it the only one-click path out of plan mode. Today the only way to execute a plan in auto mode with bypass available is to pick "manually approve edits" (which keeps context) and then shift+tab to auto — so clear-context-into-auto is impossible.

Proposed Solution

Any of these would solve it:

1. When both auto and bypass are available, show both: "Yes, clear context and use auto mode" alongside the bypass row(s).
2. Prefer the session's defaultMode (here auto) for the plan-exit rows, rather than always preferring bypass.
3. A setting for the plan-exit target mode, e.g. "planExitMode": "auto".

Alternative Solutions

• Launching bypass-capable sessions under a separate command. That works, but bypass has to be chosen at launch rather than kept as an always-available escape route.
• "Yes, manually approve edits" followed by shift+tab to auto, which loses the context clear.

Related

• #18599 (plan exit default option, reopened to track a configurable plan-exit behaviour)
• #25690 (auto-select ExitPlanMode option via settings, closed for inactivity)
• #33109, #37225 (other plan-exit dialog issues involving bypass)

Environment

• Claude Code 2.1.296, CLI, Linux (EndeavourOS)
• Settings: permissions.defaultMode: "auto", showClearContextOnPlanAccept: true, disableBypassPermissionsMode unset
• Launched with --allow-dangerously-skip-permissions