[FEATURE] Per-prompt rewind/undo in Desktop App

Status Closed — not planned
Maintainer reply None cached
Activity 7 comments · opened Apr 5, 2026 · closed Jun 16, 2026

Preflight Checklist

  • [x] I have searched existing requests and this feature hasn't been requested yet
  • [x] This is a single feature request (not multiple features)

Problem Statement

When working on multi-step coding tasks, I often need to undo changes from a
specific prompt while keeping changes from other prompts intact. In the Desktop
App, there's no way to do this — /rewind returns "Unknown skill" and
Esc+Esc does nothing.

My typical workflow: I ask Claude to make 5-6 changes across a session.
Change #3 broke something, but changes #4-6 are fine. I need to revert only
#3, but the Desktop App gives me no way to go back to a specific point.
I end up manually reading git diffs and hand-reverting lines, which is slow
and defeats the purpose of using an AI editor.

The CLI version supports /rewind — but I use the Desktop App as my primary
interface, and this core functionality is missing from it.

Proposed Solution

Add a rewind/checkpoint UI to the Desktop App conversation view:

  1. Each user prompt in the conversation acts as a checkpoint
  2. Hovering over a message reveals a "Revert to here" button
  3. Clicking it shows a diff preview of what will be rolled back
  4. User can select/deselect individual files before confirming
  5. After reverting, the conversation history remains visible

(greyed out) so context isn't lost

This matches the behavior already available in the CLI via /rewind,
adapted for a graphical interface.

Alternative Solutions

  • Using git diff and manually reverting specific hunks — works but tedious
  • Asking Claude to "undo your last change" — unreliable, wastes context,

and Claude sometimes makes additional unintended modifications

  • Switching to the CLI version just for /rewind — disrupts workflow
  • Using competing tools (Cursor, Windsurf) that have this built in

Priority

Critical - Blocking my work

Feature Category

File operations

Use Case Example

_No response_

Additional Context

_No response_

View original on GitHub ↗

7 Comments

github-actions[bot] · 6 months ago

Found 3 possible duplicate issues:

  1. https://github.com/anthropics/claude-code/issues/10352
  2. https://github.com/anthropics/claude-code/issues/24419
  3. https://github.com/anthropics/claude-code/issues/27387

This issue will be automatically closed as a duplicate in 3 days.

  • If your issue is a duplicate, please close it and 👍 the existing issue instead
  • To prevent auto-closure, add a comment or 👎 this comment

🤖 Generated with Claude Code

TimotheeWrightFicha · 6 months ago

Needed so badly

TKPhuong · 6 months ago

One of the most important feature that keeps most of the people still using cli instead of desktop app version I think. Rewind is not only to undo but also a way to manage context efficiently along with fork session feature.

Matthieu-Malyga · 5 months ago

In version 1.7196.0 of the desktop app, there is a per-prompt rewind button but it rewinds the discussion only (not the edits). Any one has the same issue?

github-actions[bot] · 4 months ago

Closing for now — inactive for too long. Please open a new issue if this is still relevant.

syeminpark · 3 months ago

make it work

chaoscreater · 1 month ago

I'm on Claude version 2.1.263 and I'm also having this issue in September 2026.

I don't understand why this can't be implemented. The /rewind feature in Claude Code CLI works fine, I can restore the code/file back to a previous state and the directory doesn't need to be git initialized either (since /rewind and git are unrelated to each other).

However, in Claude Code desktop, the /rewind only rewinds the conversation, not the code changes, which is useless.

Also, for some reason I remember seeing this working in Claude before. I recall seeing a prompt (in Claude Code desktop) that asks if I want to rewind to a previous file and there was an option to set that as default and never ask me again. Maybe I've used too many AI tools (like Cursor, Windsurf, etc) and maybe I'm getting the prompts mixed up.

Anyway, various other tools (like Windsurf and Cursor) can restore to a previous checkpoint, so why can't Claude? Especially considering that the CLI works perfectly fine.