PR #48151: fix: include cwd project dir in multi-worktree session discovery

• Repository: anthropics/claude-code
• Author: signe
• State: open | merged: False
• Link: https://github.com/anthropics/claude-code/pull/48151

Description (problem / solution / changelog)

Summary

• Fixes --resume showing no sessions when the cwd is a bare repo root with linked worktrees
• Adds the cwd's own project directory to the multi-worktree scan set when it isn't already matched

Fixes #48110

Problem

In a bare-repo + worktree layout (git clone --bare with git worktree add), git worktree list --porcelain does not include the bare root as a worktree entry — only .bare and linked worktrees appear:

worktree /home/user/repo/.bare
bare

worktree /home/user/repo/develop
HEAD abc123
branch refs/heads/develop

Session creation uses getProjectDir(cwd) which hashes the cwd directly, so sessions for /home/user/repo are stored in ~/.claude/projects/-home-user-repo/.

Session listing (getSessionFilesForWorktrees) discovers worktrees via git worktree list, hashes each path, and scans ~/.claude/projects/ for matching directories. Since /home/user/repo is not in the worktree list, its project directory -home-user-repo is never matched — making all its sessions invisible to --resume.

Fix

After the worktree-matching loop in getSessionFilesForWorktrees, always include getProjectDir(getCwd()) in the scan set if it wasn't already matched:

const cwdProjectDir = getProjectDir(cwd);
const cwdDirName = isWindows
  ? basename(cwdProjectDir).toLowerCase()
  : basename(cwdProjectDir);

if (!matched.has(cwdDirName)) {
  matchedDirs.push({ projectDir: cwdProjectDir, wtPath: cwd });
}

This is safe because deduplicateBySessionId() already handles overlapping session IDs, and it's a no-op when the cwd is itself a worktree (already matched by the loop).

Reconstruction note

The attached file is a readable reconstruction of getSessionFilesForWorktrees (minified as HaK in the v2.1.108 bundle) with the fix applied. Since the product source is not in this repo, the file includes placeholder type declarations for the functions it calls. The actual change is the 6-line block marked // FIX.

Test plan

• git clone --bare <url> .bare && echo "gitdir: .bare" > .git && git worktree add develop develop
• Run claude from the bare root, send a message, exit
• Run claude --resume — session should appear in the picker
• Run claude --resume from a linked worktree — sessions from both the worktree and bare root should appear
• Verify no regression for normal (non-bare) repos with and without worktrees

Changed files

• src/services/session/getSessionFilesForWorktrees.ts (added, +146/-0)