Teleport/resume should discover sessions across git worktrees

Resolved 💬 3 comments Opened Feb 24, 2026 by pacaplan Closed Feb 27, 2026

Problem

claude --teleport and claude --resume <id> cannot find sessions running in a different git worktree of the same repository.

Session discovery is scoped by directory path, so worktrees (which share the same git remote) are treated as entirely separate projects. This means you can teleport to a session on a completely different machine via cloud sessions, but you can't discover a session running in ~/repo from ~/repo.worktree on the same machine.

Reproduction

  1. Have a repo at ~/paul/flokay with a worktree at ~/paul/flokay.plan
  2. Start a Claude Code session in ~/paul/flokay
  3. From ~/paul/flokay.plan, run claude --teleport → "No Claude Code sessions found"
  4. From ~/paul/flokay.plan, run claude --resume <session-id> → "No conversation found"

Expected behavior

Teleport and resume should discover sessions from any worktree of the same repository, since they share the same git remote origin. Session discovery should match on git remote (like remote teleport does for cloud sessions) in addition to directory path.

Environment

  • macOS (Darwin 24.6.0)
  • Git worktrees created via git worktree add

View original on GitHub ↗

This issue has 3 comments on GitHub. Read the full discussion on GitHub ↗