[BUG] Plan mode should have a direct way to remain in plan mode until the plan is accepted

Preflight Checklist

• [x] I have searched existing issues and this hasn't been reported yet
• [x] This is a single bug report (please file separate reports for different bugs)
• [x] I am using the latest version of Claude Code

What's Wrong?

Plan mode should have a direct way to remain in plan mode until the plan is accepted, it does not appear to have this. As soon as it forms the plan and presents it, it then prompts us with:

1. Yes, clear context and auto-accept edits (shift+tab)
2. Yes, auto-accept edits
3. Yes, manually approve edits

❯ 4. Type here to tell Claude what to change

At this point there is no way to directly remain in plan mode. If I choose option 4 and type more instructions it looks like claude has left plan mode and begins implementing so I then escape or ctrl-c to stop it. It should allow a direct way to remain in plan mode until it's correct. 1,2,3 are accepting the plan, 4 does not do the opposite as we would hope. 4 only lets you add additional text to the prompt and it begins implementing. Then we have to interrupt it and then re-enter plan mode.

Also, typing shift-tab at that prompt does not work to get back into plan mode.

What Should Happen?

Plan mode should have a direct way to remain in plan mode until the plan is accepted, it does not appear to have this. As soon as it forms the plan and presents it, it then prompts us with:

1. Yes, clear context and auto-accept edits (shift+tab)
2. Yes, auto-accept edits
3. Yes, manually approve edits

❯ 4. Type here to tell Claude what to change

At this point there is no way to directly remain in plan mode. If I choose option 4 and type more instructions it looks like claude has left plan mode and begins implementing so I then escape or ctrl-c to stop it. It should allow a direct way to remain in plan mode until it's correct. 1,2,3 are accepting the plan, 4 does not do the opposite as we would hope. 4 only lets you add additional text to the prompt and it begins implementing. Then we have to interrupt it and then re-enter plan mode.

Also, typing shift-tab at that prompt does not work to get back into plan mode.

Error Messages/Logs

Steps to Reproduce

Plan mode should have a direct way to remain in plan mode until the plan is accepted, it does not appear to have this. As soon as it forms the plan and presents it, it then prompts us with:

1. Yes, clear context and auto-accept edits (shift+tab)
2. Yes, auto-accept edits
3. Yes, manually approve edits

❯ 4. Type here to tell Claude what to change

At this point there is no way to directly remain in plan mode. If I choose option 4 and type more instructions it looks like claude has left plan mode and begins implementing so I then escape or ctrl-c to stop it. It should allow a direct way to remain in plan mode until it's correct. 1,2,3 are accepting the plan, 4 does not do the opposite as we would hope. 4 only lets you add additional text to the prompt and it begins implementing. Then we have to interrupt it and then re-enter plan mode.

Also, typing shift-tab at that prompt does not work to get back into plan mode.

Claude Model

Opus

Is this a regression?

Yes, this worked in a previous version

Last Working Version

_No response_

Claude Code Version

2.1.29 (Claude Code)

Platform

Anthropic API

Operating System

macOS

Terminal/Shell

Terminal.app (macOS)

Additional Information

_No response_