Fix linked-worktree branch checkout by kranthik10 · Pull Request #9905 · warpdotdev/warp

kranthik10 · 2026-05-02T13:27:42Z

Description

Teach the prompt branch picker to treat Git's + branch marker as a linked-worktree action, not a checkout target. git branch marks the current branch with * and branches checked out in another worktree with +; clicking a + branch should move the user into that worktree instead of running git checkout <branch>, which Git rejects.

The branch list command now also fetches git worktree list --porcelain, and Warp keeps the worktree path as hidden action data for + branches. Normal branches still run git checkout '<branch>', quoted for shell safety. Linked-worktree branches run cd '<worktree-path>'; if the path cannot be resolved, Warp prints a clear message instead of attempting a checkout that is expected to fail.

Linked Issue

Fixes #9170

The linked issue is labeled ready-to-spec or ready-to-implement.
Where appropriate, screenshots or a short video of the implementation are included below (especially for user-visible or UI changes).

Screenshots / Videos

Demo showing the git chip with a linked worktree branch and selecting it to move into that worktree:

Screen.Recording.2026-05-05.at.9.07.02.PM.mov

Testing

cargo fmt -- --check
git diff --check
env TOOLCHAINS=com.apple.dt.toolchain.Metal.32023.864 cargo test -p warp test_format_git_branch_command_checks_out_normal_branch --lib
env TOOLCHAINS=com.apple.dt.toolchain.Metal.32023.864 cargo test -p warp test_git_branch_on_click_value_round_trips_through_encode_decode --lib
Added parser coverage for resolving + branches to worktree paths
Added GitBranchOnClickValue encode/decode round-trip coverage
Added command formatting coverage for normal branch checkout quoting, linked-worktree branch clicks, and the missing-path fallback
GitHub CI is passing

Agent Mode

Warp Agent Mode - This PR was created via Warp's AI Agent Mode

CHANGELOG-BUG-FIX: Fixed prompt branch picker clicks for branches checked out in linked worktrees. Thanks to @JasonLovesDoggo (#9264), @tkshsbcue (#9440), and @lonexreb (#9560) for earlier fixes and investigation.

Co-Authored-By: Warp agent@warp.dev

oz-for-oss · 2026-05-02T13:28:29Z

@kranthik10

I'm starting a first review of this pull request.

You can view the conversation on Warp.

I reviewed this pull request and requested human review from: @warpdotdev/oss-maintainers.

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

oz-for-oss

Overview

This PR moves the ShellGitBranch on-click value normalization into helper functions, keeps the current branch sorted first, and strips Git's * and + branch status markers before building checkout values. The added unit test covers current-branch, linked-worktree, empty, and literal-plus inputs.

Concerns

No blocking correctness or security concerns were found in the annotated diff. The targeted unit test was added, though the PR description notes the local Rust test command was blocked by the missing Apple Metal Toolchain.

Verdict

Found: 0 critical, 0 important, 0 suggestions

Approve

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

unrevised6419 · 2026-05-02T14:05:01Z

Heads up: this PR strips the + marker but the underlying checkout will still fail because the branch is already used by a linked worktree (fatal: '<branch>' is already checked out at ...). See #9170 (comment) for details and suggested fixes.

kranthik10 · 2026-05-03T11:15:31Z

Thanks for calling this out. You were right that just stripping the marker only changes the failure mode: Git will still reject checkout when the branch is already used by another worktree.

I updated this PR so the branch picker also reads git worktree list --porcelain. For + branches, Warp now keeps the linked worktree path as action data and emits cd '<path>' when that item is selected. Normal branches still use git checkout <branch>. If Git marks a branch with + but we can’t resolve the path, Warp now prints a clear message instead of attempting a checkout that should fail.

I added parser coverage for the worktree path mapping and command-formatting coverage for the cd behavior/fallback. Local cargo test is still blocked on my machine by the missing Apple Metal Toolchain, but cargo fmt -- --check and git diff --check pass.

kranthik10 · 2026-05-05T18:39:26Z

Quick update: I pushed a follow-up for the failed unit test.

The test caught that the fallback message was using an extra single-quote escape, which could also make the generated shell command invalid when the message contains words like couldn't. It now uses the normal POSIX escape for single quotes.

Checked locally:

cargo fmt -- --check
git diff --check
a small zsh smoke test for the generated command

The focused Rust test still does not reach the assertion on my machine because this local build is missing protoc and the Xcode Metal Toolchain, so CI is the source of truth for the full test run.

moirahuang

hi @kranthik10, really appreciate you making this PR and making the updated fix so that cd-ing works!

do you mind updating the CHANGELOG to give attribution as well to other people who attempted a fix? The relevant authors and PRs:

in the PR description, in the testing section you say "Not applicable; this is a prompt-chip branch-name parsing fix." however, I think this has visible testing changes. mind recording a video showing the updated git chip with worktreees and switching to a worktree please?

moirahuang · 2026-05-05T18:45:07Z

+                    .map(str::to_string);
+                Self::linked_worktree(branch_name, worktree_path)
+            }
+            _ => Self::new(value.to_string()),


should we be using branch_name instead of value here?

moirahuang · 2026-05-05T18:46:07Z

+        );
+    }
+
+    format!("git checkout {}", branch.branch_name)


should we use shell_single_quote here as well?

moirahuang · 2026-05-05T18:47:16Z


-pub fn format_git_branch_command(branch_name: &str) -> String {
-    format!("git checkout {branch_name}")
+pub fn format_git_branch_command(value: &str) -> String {


let's use a more descriptive name than value here to make it clear that we're expecting a GitBranchOnClickValue encoded string

moirahuang · 2026-05-05T18:49:33Z

@@ -40,6 +42,36 @@ fn test_github_pr_chip_display_value_falls_back_to_raw_value() {
    );
 }

+#[test]


i know the normal git checkout case wasn't added by you but it'd be great if we can also add some tests here for the normal branch case

and also a test for decode(x.encode()) == x to guard against drift there would be great!

unrevised6419 · 2026-05-05T19:22:08Z

Question: Will we still see the + <branch-name> in the dropdown? I would expect the + to remain, so we know that is a workspace.

moirahuang · 2026-05-05T19:30:37Z

Question: Will we still see the + <branch-name> in the dropdown? I would expect the + to remain, so we know that is a workspace.

My proposed behavior here is that we should strip + from the dropdown (I think that reads better) but swap out the icon for branch (first screenshot) to be the worktree icon (second screenshot) instead. This will have your intended effect of knowing what are worktrees vs. regular git branches, while visually looking better

unrevised6419 · 2026-05-05T19:38:59Z

@moirahuang with icon should be much better! Thanks!

kranthik10 · 2026-05-05T20:16:27Z

Updated the PR description with the demo video and the latest test results. CI is passing now too.

moirahuang · 2026-05-05T20:50:26Z

Updated the PR description with the demo video and the latest test results. CI is passing now too.

I'm seeing no movement in the demo video, only a static view of a Warp window. Also mind handling this comment too please?

unrevised6419 · 2026-05-05T21:14:52Z

I'm seeing no movement in the demo video

@moirahuang for me the video is working fine 🤔

moirahuang · 2026-05-05T21:15:50Z

I'm seeing no movement in the demo video

@moirahuang for me the video is working fine 🤔

for some reason a refresh fixed it for me!

moirahuang · 2026-05-07T18:20:31Z

@kranthik10 I'm going to loop in oz-agent to make the icon change so we can try to land this PR soon!

@oz-agent please update the git branch icon in the git chip to be the worktree icon if the branch is tied to a worktree

oz-for-oss · 2026-05-07T18:20:47Z

@moirahuang

I ran into an unexpected error while working on this.

Powered by Oz

moirahuang · 2026-05-07T18:30:15Z

@oz-agent please update the git branch icon in the git chip to be the worktree icon if the branch is tied to a worktree

oz-for-oss · 2026-05-07T18:30:25Z

@moirahuang

I'm working on changes requested in this PR (responding to a PR conversation comment).

You can view the conversation on Warp.

I pushed changes to this PR based on the comment.

Next steps:

Review the changes pushed to this PR.
Follow up with another comment if further adjustments are needed.

Powered by Oz

moirahuang · 2026-05-08T01:06:50Z

here's with the worktree icons!

i'm going to try to resolve the conflicts and merge this PR

Fixes warpdotdev#9170 Co-Authored-By: Warp <agent@warp.dev>

Use git worktree list --porcelain to resolve branches marked with + by git branch. Selecting one now changes into the linked worktree path instead of running a checkout that Git will reject. Co-Authored-By: Warp <agent@warp.dev>

Use the standard POSIX single-quote escape so the linked-worktree fallback command remains valid when the message contains apostrophes. Co-Authored-By: Warp <agent@warp.dev>

Quote normal branch checkout commands, clarify the encoded branch click parameter, and add tests for normal checkout formatting plus GitBranchOnClickValue encode/decode round trips. Co-Authored-By: Warp <agent@warp.dev>

Co-Authored-By: Moira Huang <moirahuang@users.noreply.github.com>

moirahuang · 2026-05-08T01:10:00Z

/oz-review

oz-for-oss · 2026-05-08T01:10:15Z

@moirahuang

I'm re-reviewing this pull request in response to a review request.

You can view the conversation on Warp.

I reviewed this pull request and requested human review from: @warpdotdev/oss-maintainers.

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

oz-for-oss

Overview

This PR updates the git branch prompt chip to distinguish linked-worktree branches from checkout targets, carries linked worktree paths through hidden menu action data, and formats click commands so normal branches are checked out while linked-worktree branches change directories.

Concerns

No blocking correctness or security concerns found in the annotated diff.

Verdict

Found: 0 critical, 0 important, 0 suggestions

Approve

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

moirahuang

@kranthik10 thanks for your work on this PR!

@JasonLovesDoggo

## Description Teach the prompt branch picker to treat Git's `+` branch marker as a linked-worktree action, not a checkout target. `git branch` marks the current branch with `*` and branches checked out in another worktree with `+`; clicking a `+` branch should move the user into that worktree instead of running `git checkout <branch>`, which Git rejects. The branch list command now also fetches `git worktree list --porcelain`, and Warp keeps the worktree path as hidden action data for `+` branches. Normal branches still run `git checkout '<branch>'`, quoted for shell safety. Linked-worktree branches run `cd '<worktree-path>'`; if the path cannot be resolved, Warp prints a clear message instead of attempting a checkout that is expected to fail. ## Linked Issue Fixes warpdotdev#9170 - [x] The linked issue is labeled `ready-to-spec` or `ready-to-implement`. - [x] Where appropriate, screenshots or a short video of the implementation are included below (especially for user-visible or UI changes). ## Screenshots / Videos Demo showing the git chip with a linked worktree branch and selecting it to move into that worktree: https://github.com/user-attachments/assets/5b31d204-9e13-4855-8977-cbd5bc0ad1bd ## Testing - `cargo fmt -- --check` - `git diff --check` - `env TOOLCHAINS=com.apple.dt.toolchain.Metal.32023.864 cargo test -p warp test_format_git_branch_command_checks_out_normal_branch --lib` - `env TOOLCHAINS=com.apple.dt.toolchain.Metal.32023.864 cargo test -p warp test_git_branch_on_click_value_round_trips_through_encode_decode --lib` - Added parser coverage for resolving `+` branches to worktree paths - Added `GitBranchOnClickValue` encode/decode round-trip coverage - Added command formatting coverage for normal branch checkout quoting, linked-worktree branch clicks, and the missing-path fallback - GitHub CI is passing ## Agent Mode - [x] Warp Agent Mode - This PR was created via Warp's AI Agent Mode CHANGELOG-BUG-FIX: Fixed prompt branch picker clicks for branches checked out in linked worktrees. Thanks to @JasonLovesDoggo (warpdotdev#9264), @tkshsbcue (warpdotdev#9440), and @lonexreb (warpdotdev#9560) for earlier fixes and investigation. Co-Authored-By: Warp <agent@warp.dev> --------- Co-authored-by: Warp <agent@warp.dev> Co-authored-by: Oz <oz-agent@warp.dev> Co-authored-by: Moira Huang <moirahuang@users.noreply.github.com>

@JasonLovesDoggo

## Description Teach the prompt branch picker to treat Git's `+` branch marker as a linked-worktree action, not a checkout target. `git branch` marks the current branch with `*` and branches checked out in another worktree with `+`; clicking a `+` branch should move the user into that worktree instead of running `git checkout <branch>`, which Git rejects. The branch list command now also fetches `git worktree list --porcelain`, and Warp keeps the worktree path as hidden action data for `+` branches. Normal branches still run `git checkout '<branch>'`, quoted for shell safety. Linked-worktree branches run `cd '<worktree-path>'`; if the path cannot be resolved, Warp prints a clear message instead of attempting a checkout that is expected to fail. ## Linked Issue Fixes warpdotdev#9170 - [x] The linked issue is labeled `ready-to-spec` or `ready-to-implement`. - [x] Where appropriate, screenshots or a short video of the implementation are included below (especially for user-visible or UI changes). ## Screenshots / Videos Demo showing the git chip with a linked worktree branch and selecting it to move into that worktree: https://github.com/user-attachments/assets/5b31d204-9e13-4855-8977-cbd5bc0ad1bd ## Testing - `cargo fmt -- --check` - `git diff --check` - `env TOOLCHAINS=com.apple.dt.toolchain.Metal.32023.864 cargo test -p warp test_format_git_branch_command_checks_out_normal_branch --lib` - `env TOOLCHAINS=com.apple.dt.toolchain.Metal.32023.864 cargo test -p warp test_git_branch_on_click_value_round_trips_through_encode_decode --lib` - Added parser coverage for resolving `+` branches to worktree paths - Added `GitBranchOnClickValue` encode/decode round-trip coverage - Added command formatting coverage for normal branch checkout quoting, linked-worktree branch clicks, and the missing-path fallback - GitHub CI is passing ## Agent Mode - [x] Warp Agent Mode - This PR was created via Warp's AI Agent Mode CHANGELOG-BUG-FIX: Fixed prompt branch picker clicks for branches checked out in linked worktrees. Thanks to @JasonLovesDoggo (warpdotdev#9264), @tkshsbcue (warpdotdev#9440), and @lonexreb (warpdotdev#9560) for earlier fixes and investigation. Co-Authored-By: Warp <agent@warp.dev> --------- Co-authored-by: Warp <agent@warp.dev> Co-authored-by: Oz <oz-agent@warp.dev> Co-authored-by: Moira Huang <moirahuang@users.noreply.github.com> (cherry picked from commit 59e802e)

@JasonLovesDoggo

## Description Teach the prompt branch picker to treat Git's `+` branch marker as a linked-worktree action, not a checkout target. `git branch` marks the current branch with `*` and branches checked out in another worktree with `+`; clicking a `+` branch should move the user into that worktree instead of running `git checkout <branch>`, which Git rejects. The branch list command now also fetches `git worktree list --porcelain`, and Warp keeps the worktree path as hidden action data for `+` branches. Normal branches still run `git checkout '<branch>'`, quoted for shell safety. Linked-worktree branches run `cd '<worktree-path>'`; if the path cannot be resolved, Warp prints a clear message instead of attempting a checkout that is expected to fail. ## Linked Issue Fixes warpdotdev#9170 - [x] The linked issue is labeled `ready-to-spec` or `ready-to-implement`. - [x] Where appropriate, screenshots or a short video of the implementation are included below (especially for user-visible or UI changes). ## Screenshots / Videos Demo showing the git chip with a linked worktree branch and selecting it to move into that worktree: https://github.com/user-attachments/assets/5b31d204-9e13-4855-8977-cbd5bc0ad1bd ## Testing - `cargo fmt -- --check` - `git diff --check` - `env TOOLCHAINS=com.apple.dt.toolchain.Metal.32023.864 cargo test -p warp test_format_git_branch_command_checks_out_normal_branch --lib` - `env TOOLCHAINS=com.apple.dt.toolchain.Metal.32023.864 cargo test -p warp test_git_branch_on_click_value_round_trips_through_encode_decode --lib` - Added parser coverage for resolving `+` branches to worktree paths - Added `GitBranchOnClickValue` encode/decode round-trip coverage - Added command formatting coverage for normal branch checkout quoting, linked-worktree branch clicks, and the missing-path fallback - GitHub CI is passing ## Agent Mode - [x] Warp Agent Mode - This PR was created via Warp's AI Agent Mode CHANGELOG-BUG-FIX: Fixed prompt branch picker clicks for branches checked out in linked worktrees. Thanks to @JasonLovesDoggo (warpdotdev#9264), @tkshsbcue (warpdotdev#9440), and @lonexreb (warpdotdev#9560) for earlier fixes and investigation. Co-Authored-By: Warp <agent@warp.dev> --------- Co-authored-by: Warp <agent@warp.dev> Co-authored-by: Oz <oz-agent@warp.dev> Co-authored-by: Moira Huang <moirahuang@users.noreply.github.com>

cla-bot Bot added the cla-signed label May 2, 2026

github-actions Bot added the external-contributor Indicates that a PR has been opened by someone outside the Warp team. label May 2, 2026

kranthik10 marked this pull request as ready for review May 2, 2026 13:28

oz-for-oss Bot reviewed May 2, 2026

View reviewed changes

oz-for-oss Bot requested review from a team and lucieleblanc and removed request for a team May 2, 2026 13:33

unrevised6419 mentioned this pull request May 2, 2026

Branch picker includes linked-worktree '+' marker in git checkout #9170

Closed

moirahuang requested review from moirahuang and removed request for lucieleblanc May 5, 2026 18:10

moirahuang reviewed May 5, 2026

View reviewed changes

This was referenced May 5, 2026

fix: strip linked-worktree '+' marker from branch picker (#9170) #9560

Closed

Strip linked-worktree '+' marker from git branch picker #9440

Closed

fix: strip linked-worktree '+' marker from git branch chip output #9264

Closed

kranthik10 requested a review from moirahuang May 5, 2026 20:23

kranthik10 and others added 5 commits May 7, 2026 18:07

Fix linked-worktree branch checkout

5b16de0

Fixes warpdotdev#9170 Co-Authored-By: Warp <agent@warp.dev>

Handle linked worktree branch clicks

c678d8c

Use git worktree list --porcelain to resolve branches marked with + by git branch. Selecting one now changes into the linked worktree path instead of running a checkout that Git will reject. Co-Authored-By: Warp <agent@warp.dev>

Fix shell quoting for branch fallback

ad7c201

Use the standard POSIX single-quote escape so the linked-worktree fallback command remains valid when the message contains apostrophes. Co-Authored-By: Warp <agent@warp.dev>

Address branch picker review comments

42bd611

Quote normal branch checkout commands, clarify the encoded branch click parameter, and add tests for normal checkout formatting plus GitBranchOnClickValue encode/decode round trips. Co-Authored-By: Warp <agent@warp.dev>

fix: show worktree icon for linked git branches

0899903

Co-Authored-By: Moira Huang <moirahuang@users.noreply.github.com>

moirahuang force-pushed the codex/fix-linked-worktree-branch-picker branch from e4efece to 0899903 Compare May 8, 2026 01:09

oz-for-oss Bot reviewed May 8, 2026

View reviewed changes

oz-for-oss Bot requested review from a team and lucieleblanc and removed request for a team May 8, 2026 01:16

moirahuang enabled auto-merge (squash) May 8, 2026 01:18

moirahuang removed the request for review from lucieleblanc May 8, 2026 01:18

moirahuang approved these changes May 8, 2026

View reviewed changes

moirahuang merged commit 59e802e into warpdotdev:master May 8, 2026
23 checks passed

timomak mentioned this pull request May 10, 2026

[twarp upstream] bootstrap-installers timomak/twarp#29

Merged

1 task

lonexreb mentioned this pull request May 13, 2026

Branch chip emits unquoted branch name to "git checkout", breaking branches with shell metacharacters #10639

Closed

4 tasks

                   );
               }
+              #[test]

Conversation

kranthik10 commented May 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Linked Issue

Screenshots / Videos

Testing

Agent Mode

Uh oh!

oz-for-oss Bot commented May 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

oz-for-oss Bot left a comment

Choose a reason for hiding this comment

Overview

Concerns

Verdict

Uh oh!

unrevised6419 commented May 2, 2026

Uh oh!

kranthik10 commented May 3, 2026

Uh oh!

kranthik10 commented May 5, 2026

Uh oh!

moirahuang left a comment

Choose a reason for hiding this comment

Uh oh!

moirahuang May 5, 2026

Choose a reason for hiding this comment

Uh oh!

moirahuang May 5, 2026

Choose a reason for hiding this comment

Uh oh!

moirahuang May 5, 2026

Choose a reason for hiding this comment

Uh oh!

moirahuang May 5, 2026

Choose a reason for hiding this comment

Uh oh!

unrevised6419 commented May 5, 2026

Uh oh!

moirahuang commented May 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

unrevised6419 commented May 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kranthik10 commented May 5, 2026

Uh oh!

moirahuang commented May 5, 2026

Uh oh!

unrevised6419 commented May 5, 2026

Uh oh!

moirahuang commented May 5, 2026

Uh oh!

moirahuang commented May 7, 2026

Uh oh!

oz-for-oss Bot commented May 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

moirahuang commented May 7, 2026

Uh oh!

oz-for-oss Bot commented May 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

moirahuang commented May 8, 2026

Uh oh!

moirahuang commented May 8, 2026

Uh oh!

oz-for-oss Bot commented May 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

oz-for-oss Bot left a comment

Choose a reason for hiding this comment

Overview

Concerns

Verdict

Uh oh!

moirahuang left a comment

Choose a reason for hiding this comment

kranthik10 commented May 2, 2026 •

edited

Loading

oz-for-oss Bot commented May 2, 2026 •

edited

Loading

moirahuang commented May 5, 2026 •

edited

Loading

unrevised6419 commented May 5, 2026 •

edited

Loading

oz-for-oss Bot commented May 7, 2026 •

edited

Loading

oz-for-oss Bot commented May 7, 2026 •

edited

Loading

oz-for-oss Bot commented May 8, 2026 •

edited

Loading