Repository navigation
[Bug] /rewind creates in-file branches not visible in resume picker, contrary to documentation #19451
Description
Preflight Checklist
- I have searched existing issues and this hasn't been reported yet
- This is a single bug report (please file separate reports for different bugs)
- I am using the latest version of Claude Code
What's Wrong?
The documentation states that "Forked sessions (created with /rewind or --fork-session) are grouped together under their root session" with →/← keys to expand/collapse. However, /rewind creates in-file branches (via parentUuid relationships within a single session file), NOT separate session files. These in-file branches are not visible in the resume picker, and the documented expand/collapse functionality does not work.
From Common Workflows documentation:
"Forked sessions (created with
/rewindor--fork-session) are grouped together under their root session"
"Use arrow keys (→/←) to expand or collapse grouped sessions"
Actual behavior:
/rewindcreates in-file branches viaparentUuidtree within a SINGLE session file- No separate session files are created for branches
- Resume picker shows flat list - no grouping, no expand/collapse
- Arrow keys (
→/←) have no effect - 483 branch points in my session file are completely invisible in UI
What Should Happen?
Based on documentation:
/rewindshould create forked sessions visible in the resume picker- Forked sessions should be grouped under their root session
- Arrow keys (
→/←) should expand/collapse to show branches - Users should be able to navigate and resume from different branch points
Error Messages/Logs
No error messages - the feature silently doesn't work. The data exists but isn't surfaced:
# Analyzing session file d6ea9071-7c07-4cc9-9938-0b406b452f45.jsonl
file_size = 57.5 MB
total_entries = 29,344
branch_points = 483 (entries with multiple children via parentUuid)
unique_conversation_endpoints = 330 (leafUuid in summaries)
separate_fork_session_files_created = 0
# sessions-index.json for this session
{
"sessionId": "d6ea9071-...",
"isSidechain": false,
"messageCount": 9733
// MISSING: parentSessionId, rootSessionId, forkedFrom, forkDepth
}Steps to Reproduce
- Start a new Claude Code session
- Have a conversation with multiple exchanges
- Use
/rewindorEsc+Escto go back to an earlier point - Continue the conversation (this should create a branch)
- Repeat steps 3-4 multiple times to create multiple branches
- Run
claude --resumeto open the session picker - Observe: Flat list with no grouped/hierarchical view of branches
- Press
→or←: No expand/collapse behavior occurs
My test case:
- Session spanning Dec 8, 2025 - Jan 19, 2026 (42 days)
- 483 branch points created via interruptions/rewind
- 330 unique conversation endpoints (via leafUuid)
- All branches stored in-file via parentUuid, none as separate session files
Claude Model
Opus
Is this a regression?
Yes, this worked in a previous version
Last Working Version
2.1.4
Claude Code Version
2.1.12
Platform
Anthropic API
Operating System
Ubuntu/Debian Linux
Terminal/Shell
VS Code integrated terminal
Additional Information
No response
Activity
github-actions commentedon Jan 20, 2026
Found 3 possible duplicate issues:
claude --resumeonly shows one session despite multiple saved sessions (Windows) #16235This issue will be automatically closed as a duplicate in 3 days.
🤖 Generated with Claude Code
shi-kejian commentedon Jan 20, 2026
The issue #19451 creator is aware of related issues.
This issue is distinct from the flagged potential duplicates:
claude --resumeonly shows one session despite multiple saved sessions (Windows) #16235 is about session files not being discovered (count wrong). This issue is about branches within a session not being visualized as a tree.The core of this issue: The documentation states /rewind creates "forked sessions grouped together under their root session" with →/← to expand/collapse. However, /rewind
creates in-file branches via parentUuid that are never surfaced in the UI. This is either a missing feature or a documentation error.
what-name commentedon Jan 20, 2026
agree, not able to revert to before-rewind in any case. I thought it was weird.
HennadiiM commentedon Feb 5, 2026
Additional bisection data from a separate user:
/compactvisible, expand/collapse works)Environment: macOS 15 (Darwin 25.2.0, arm64), sessions with 7–168 unique
leafUuidvalues.Workaround:
claude install 2.1.29github-actions commentedon Mar 5, 2026
Closing for now — inactive for too long. Please open a new issue if this is still relevant.
github-actions commentedon Mar 13, 2026
This issue has been automatically locked since it was closed and has not had any activity for 7 days. If you're experiencing a similar issue, please file a new issue and reference this one if it's relevant.