[BUG] /rewind removes stashed messages

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?

I use stashed messages quite often, and like to preserve context using /rewind when possible.
However, when rewinding, my stashed message is destructively removed.

What Should Happen?

Do not remove stashed messages after /rewind - mirrors how e.g. git stash works.

Error Messages/Logs

Steps to Reproduce

1. write a message
2. stage a message
3. rewind to step 1

your staged message is permanently gone

Claude Model

_No response_

Is this a regression?

No, this never worked

Last Working Version

_No response_

Claude Code Version

2.1.220 (Claude Code)

Platform

Other

Operating System

macOS

Terminal/Shell

Other

Additional Information

_No response_