`entire rewind` to detached head state fails if there are uncommitted changes

[nosman]

What happened?

Before I run the entire rewind <checkpointId> command, I get this warning, as seen in the screenshot:

It says "any uncommitted changes will be lost!". However, when I run the command, I get a git failure:

failed to checkout commit: checkout failed: error: Your local changes to the following files would be overwritten by checkout:
	app/src/renderer/src/screens/SessionDetail.tsx
Please commit your changes or stash them before you switch branches.
Aborting: exit status 1

This makes the warning misleading since I expected it to get rid of uncommitted changes.

Steps to reproduce

No response

Entire CLI version

Entire CLI 0.5.0 (0fa5295)

OS and architecture

macOS 24.5.0 arm64

Agent

Claude Code

Terminal

Terminal.app Version 2.14 (455.1)

Logs / debug output

entire rewind

Selected: 662cd46 Set parent session id on spawned subsessions
Restoring 2 sessions from checkpoint:
  Session 1: Please work on the following open items:
- The `saveGitOi...
    Writing to: /Users/stephanostsoucas/.claude/projects/-Users-stephanostsoucas-gossamer/189ffe14-37bb-42e4-9061-1185568b10bd.jsonl
  Session 2 (latest): Please work on the following open items:
- subSessionId i...
    Writing to: /Users/stephanostsoucas/.claude/projects/-Users-stephanostsoucas-gossamer/2c816fbd-73a0-444b-8b3e-eba2c9bf4a98.jsonl
2026/03/10 01:17:02 ERROR logs-only checkout failed during git checkout component=rewind agent=claude-code checkpoint_id=662cd467cf5a8edabce19e9fb89010e67a34b638 error="checkout failed: error: Your local changes to the following files would be overwritten by checkout:\n\tapp/src/renderer/src/screens/SessionDetail.tsx\nPlease commit your changes or stash them before you switch branches.\nAborting: exit status 1"
failed to checkout commit: checkout failed: error: Your local changes to the following files would be overwritten by checkout:
	app/src/renderer/src/screens/SessionDetail.tsx
Please commit your changes or stash them before you switch branches.
Aborting: exit status 1

Additional context

No response

[ryangchung]

Hey, I'd love to pick this up! I see that the minion issue is up, I'd gravitate towards option b):

use git checkout -f / git reset --hard to force-discard them as the existing warning message implies