--resume shows same session twice when session spans multiple git branches

Open 💬 0 comments Opened Jul 14, 2026 by oi-boards

Summary

claude --resume shows the same session as two separate entries when that session was active across multiple git branches (e.g. main + a worktree branch). The entries are identical except for the branch label and commit count suffix.

Steps to reproduce

  1. Start a session on main, rename it (e.g. /rename dever2)
  2. Create a git worktree and continue working in the same session (or resume from the WT directory)
  3. Run claude --resume

Actual behavior

dever2
7 minutes ago · BLISS-20323-AQA-ios-3.9.0-content-media-locator-impl · 10.5MB · Boards-com/automation#741

dever2
4 days ago · main · 42.6MB · Boards-com/automation#654

Same session UUID, two entries — one per branch context the session touched.

Expected behavior

One entry per session UUID, showing the most recent branch context.

Environment

  • Claude Code CLI (latest)
  • macOS
  • Git worktree workflow

View original on GitHub ↗