Claude Code /rewind and Checkpoints: Undo Any AI Mistake (Esc Esc)

When an AI coding step goes wrong, you want one thing: a fast way back. Claude Code gives you exactly that. Press Esc twice (or type /rewind) to roll your code and the conversation back to an earlier checkpoint. Claude Code saves one automatically before each edit. It’s the safety net that makes experimenting fearless. There’s one important limit to understand, and we’ll get to it, but first let’s see how it works.

What a checkpoint is

As you work, Claude Code quietly takes a snapshot, a checkpoint, before each change it makes to your files. You don’t have to set these up; they happen on their own. Each checkpoint is a point you can return to, capturing both the state of your code and where the conversation was. Think of it as an automatic, frequent “save game” for your session.

How to rewind

Two ways to open the rewind menu:

• Press Esc twice in quick succession, or
• Type /rewind.

You’ll see a list of checkpoints to jump back to, and (this is the useful part) a choice of what to restore:

• Code only: revert the files to that point, but keep the conversation. Good when one edit went wrong but the discussion is still on track.
• Conversation only: rewind the chat so Claude forgets the last few steps, while leaving your files as they are.
• Both: reset everything to that checkpoint and take a different path.

That flexibility is what makes rewind feel surgical rather than blunt. You can undo a single bad edit without throwing away the good thinking that came before it.

The one limit that trips people up

Here’s the honest caveat, and it’s the most important sentence in this article: rewind only undoes edits Claude Code made to files itself. It does not undo:

• Changes made by shell commands Claude ran (a script that deleted or moved files, a database migration, an install step).
• Anything changed outside Claude Code: by you, by another tool, by your editor.

So if Claude runs a command that reshapes your project and you rewind, the file edits come back but the command’s effects don’t. This is why checkpoints are best understood as a quick local undo, not a complete time machine.

Use checkpoints and git together

The takeaway isn’t “don’t trust rewind.” It’s “pair it with git.” The two tools cover different ground:

• Checkpoints / /rewind: instant, automatic, session-only undo of Claude’s edits. Perfect for “oops, go back one step” while you work.
• Git commits: permanent, reliable save points that capture everything, including command effects, and survive after the session ends.

The fearless workflow uses both: commit to git before a risky prompt, lean on Esc-Esc for quick undos as you go, and commit again when you’re happy. Checkpoints are the quick-undo button; git is the seatbelt. With both in place, you can let an AI agent take big swings at your code knowing you can always get back.

A calm way to experiment

The real value of rewind is psychological. Once you know any step can be undone in two keystrokes, you stop being precious about each prompt. You try the bolder refactor, the riskier approach, the “just see what happens,” because the cost of a wrong turn is one Esc-Esc away. That’s when AI coding gets genuinely fun, and genuinely productive: you explore freely, review the diff of what changed, and keep only what’s good.

Get your setup right from the start

If you’re still getting Claude Code configured, our free AI for Coders tool gives you the right assistant for your work, the exact install command for your operating system, and a starter rules file so the AI behaves the way you want. Add the rewind reflex and a commit-before-you-prompt habit on top, and you’ll have a setup where mistakes are cheap and easy to undo.

Keep reading

GuidesWhat Is an AI Agent? (Plain English, No Jargon)A chatbot answers your questions; an AI agent goes and does things for you. Here's the difference in plain words, with a real example you've probably heard of.GuidesBest AI Coding Tool 2026: An Honest, No-Hype ComparisonThere's no single winner. Here's a fair look at Claude Code, Cursor, Windsurf, Copilot, Cline and Aider: what each is genuinely best at, and who it's for.GuidesWhat Is Vibe Coding? (And Is It Safe for Beginners)Vibe coding means building software by describing what you want in plain language and letting AI write the code. Here's what it's great at, plus the one honest catch.