Warp git status and diff tracking fails in Claude Code worktree mode (-w)

[martinmoen0]

Summary

Warp does not surface branch git status or file diffs when working in Claude Code worktree mode (claude code -w), which blocks using that workflow in Warp.

Problem

In Warp, repositories opened through Claude Code worktree mode are not handled correctly for git-aware UI features. The terminal can still run git commands, but Warp is not able to follow the active worktree state for branch status and changed-file diffs.

Expected behavior

When using claude code -w, Warp should detect and track the active git worktree the same way it tracks a standard repository, including current branch status and file diff visibility.

Actual behavior

Warp is not able to handle Claude Code worktree mode for git tracking surfaces. Current branch status and file diff information are not available in Warp for that worktree flow.

Reproduction steps or desired workflow

1. Open a repository in Warp.
2. Start Claude Code in worktree mode using claude code -w.
3. Make or inspect changes in that worktree.
4. Check Warp git-aware surfaces for current branch status and file diffs.
5. Observe that Warp does not provide branch status/diff tracking for this worktree mode.

Artifacts

None attached

Warp version

v0.2026.04.29.08.57.stable_01

Operating system

macOS 26.4.1 (build 25E253)

[oz-for-oss]

@martinmoen0

Here's what I found while triaging this issue:

This closely overlaps with #10031, which reports Claude --worktree metadata such as branch, PR, and changes staying on the original project root. The current report has enough reproduction detail for initial triage.

Maintainer details

I concluded that warp's git-aware UI appears not to rebind branch/diff metadata to the Claude Code worktree entered by -w/--worktree, leaving git status surfaces tied to the original repository context..

Triage summary

This looks like a bug in how Warp chooses the active repository for git-aware UI while Claude Code is running in worktree mode. The reported workflow is clear and closely overlaps with #10031, which reports Claude --worktree metadata such as branch, PR, and changes staying on the original project root.

Reproducibility

High. The steps are deterministic for a git repository using Claude Code -w/--worktree, and the same stable Warp build has a related open report with the same metadata symptoms.

Likely root cause

Current code has linked-worktree support in the repository metadata layer: it can resolve .git files to external gitdirs and watch per-worktree git state. The likely gap is higher up in the active-context handoff: terminal git status and code-review surfaces subscribe based on TerminalView's current_repo_path, which is updated from shell block metadata/navigation. Claude Code plugin events parse and retain a cwd, but I did not find evidence that the agent-reported worktree cwd is used to re-run repository detection or rebind GitStatusUpdateModel/code-review context to the .claude/worktrees/<name> checkout.

Duplicate scan

One strong related open issue was found: #10031. Per the duplicate workflow, this was not marked as a duplicate because fewer than two existing issues met the duplicate threshold.

This is my automated analysis and may be incorrect. A maintainer will verify the details.

Powered by Oz

[thanoskrg]

To add to that it also seems unable to surface node version from worktrees, like it does on the default branch as shown in the screenshot.