CloudYetiFREE
Claude Code

When Claude goes sideways, the Claude Code team stops and re-plans

When a Claude Code task starts going wrong, switch back to plan mode and fix the plan instead of pushing more prompts. Then have a second Claude review the plan.

Why it matters

Boris Cherny, who created Claude Code, shared this as tip 2 from the Claude Code team.

In plan mode Claude reads files and writes a plan, but it does not edit your source until you approve.

The team pours the effort into the plan so Claude can build it in one go.

Do this

  1. When a task goes sideways, stop pushing. Press Shift+Tab until the status bar shows plan mode, or start your next prompt with /plan.
  2. Ask Claude to re-plan from what it has learned so far.
  3. Open a second Claude session and paste the plan with the prompt below, so it reviews the plan as a staff engineer.
  4. Ask for the verification steps in the plan too, not just the build steps.
  5. Approve the plan only when both reviews agree.

Paste into a second Claude with the plan

Review this plan as a staff engineer. List what could break, what is missing, and which steps need a test before we build.

One thing to keep in mind: At the approval prompt, Shift+Tab approves the plan. Claude Code's docs say to press Esc first if you want to leave plan mode without approving. Approving exits plan mode, and Claude starts editing.

You can also press Ctrl+G at the approval prompt to open the plan in your text editor and change it before Claude proceeds. Source: Boris Cherny (@bcherny) on X, Jan 31 2026, tip 2; Claude Code docs: permission modes, plan mode.

Free live lesson · Nov 24Stop Measuring AI by Tokens. Measure What It EarnsOne hour, live, with Saurav. Bring your own bill. Free.
Save my free seat →
Learn it live, then run it yourselfLoop and harness engineering, AI agents on AWS, AI cost and ROI.See the workshops →

All tips in: Claude Code tips from the team that builds Claude Code

Get new videos and tips by emailOne short email when there is something new. Unsubscribe any time.

More free AI resources

Save my free seat: free live lesson →