Align git branch status chip styling and behavior with the built-in branch chip by BobbyWang0120 · Pull Request #13349 · warpdotdev/warp

BobbyWang0120 · 2026-07-03T05:31:13Z

Description

Follow-up to #11938. The git branch status chip looked and behaved differently from the built-in git branch chip and the other input-box chips:

It rendered noticeably larger because it hand-rolled its container (own padding constants, hard-coded 14px icon, always the UI font family) instead of reusing the shared UDI chip styling.
Its text used a neutral color instead of the theme's branch color that the built-in git branch chip uses.
It was not clickable, while the built-in git branch chip opens a branch-switcher menu.

This PR makes the chip share the built-in branch chip's styling and behavior instead of approximating them:

Container: built with the shared chip_container() helper so padding, background, border, and corner radius stay consistent with the other chips by construction; icons are sized from the chip font size; the font-family selection matches the sibling diff-stats chip.
Color: same font color as the built-in git branch chip (ansi_fg_green, agent-view aware), so it matches automatically across themes.
Click behavior: clicking the chip now opens the same branch-switcher menu as the built-in git branch chip (search, "create new branch" entry, linked-worktree handling), via a shared git_branch_menu helper used by both chips. The branch list is fetched with the same generator and filtering as the built-in chip and refreshed when the active branch changes (ahead/behind-only updates don't re-run it).

One intentional difference: the tooltip keeps showing the tracking status (upstream name, ahead/behind counts) rather than the built-in chip's "Change git branch", since surfacing that information is the point of this chip; the pointer cursor still signals clickability.

Linked Issue

Fixes #13347

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).

Testing

Manually tested on a local build: the chip matches the height, padding, font, and color of the neighboring chips, and clicking it opens the branch switcher; selecting a branch checks it out and the chip updates (see the demo video in the comments).
context_chips unit tests pass (93 tests).
./script/format --check and cargo clippy -p warp --all-targets --tests -- -D warnings pass.
I have manually tested my changes locally with ./script/run

Screenshots / Videos

Before (current official release — the branch status chip is visibly larger than its neighbors):

After (local build with this fix — the chip matches the other chips):

Update: the chip now also matches the built-in branch chip's color and opens the branch switcher on click — see the demo video in the comments below.

Agent Mode

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

CHANGELOG-BUG-FIX: {{Fixed the git branch status chip rendering larger and in a different color than the other input-box chips, and made it open the branch switcher on click like the built-in branch chip.}}

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

- size branch and status icons from chip font size - use shared chip_container for padding and border - use monospace font in agent view when enabled

oz-for-oss · 2026-07-03T05:31:29Z

@BobbyWang0120

Every PR must be linked to a same-repo issue before Oz can review it.

This PR is linked to #13347, but no linked issue is marked ready-to-implement yet. Only repository maintainers apply that label, so please wait for a maintainer to mark the issue. Once it is marked, push a new commit or comment /oz-review to re-trigger review.

See the contribution guidelines for the full readiness model.

Powered by Oz

oz-for-oss

@BobbyWang0120

Every PR must be linked to a same-repo issue before Oz can review it.

This PR is linked to #13347, but no linked issue is marked ready-to-implement yet. Only repository maintainers apply that label, so please wait for a maintainer to mark the issue. Once it is marked, push a new commit or comment /oz-review to re-trigger review.

See the contribution guidelines for the full readiness model.

Powered by Oz

BobbyWang0120 · 2026-07-03T20:08:06Z

/oz-review

oz-for-oss · 2026-07-03T20:08:25Z

@BobbyWang0120

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: @kevinyang372.

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

Powered by Oz

Oz no longer requests changes for this pull request after the latest automated review.

oz-for-oss

Overview

This PR aligns the git branch status chip with the shared input-box chip styling by reusing the common chip container, sizing the branch/status icons from the UDI font size, and matching the font-family behavior used by the adjacent diff-stats chip.

Concerns

No blocking concerns found. The PR includes before/after visual evidence for the user-facing styling change, and there is no approved spec context to compare against.

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

kevinyang372

The code LGTM -- @BobbyWang0120 Mind sharing some more visual evidence to prove this works in different scenarios? Some examples worth testing imo are:

The branch chip with different ahead / behind stats
The branch chip with different font sizes (larger and smaller than the default)
The branch chip with different color schemas

- extract shared git_branch_menu helper for git branch and git branch status chips - refresh branch dropdown only when the active branch changes - wire git branch status on_click generator to shell branch list

BobbyWang0120 · 2026-07-11T00:04:03Z

The code LGTM -- @BobbyWang0120 Mind sharing some more visual evidence to prove this works in different scenarios? Some examples worth testing imo are:

The branch chip with different ahead / behind stats

The branch chip with different font sizes (larger and smaller than the default)

The branch chip with different color schemas

git-branch-status-chip-demo.mp4

BobbyWang0120 · 2026-07-11T00:04:42Z

/oz-review

BobbyWang0120 · 2026-07-11T00:05:20Z

@kevinyang372 demo video was uploaded.

- merge the latest origin/master into the PR branch - preserve branch status menu behavior while accepting telemetry removal

BobbyWang0120 · 2026-07-19T10:24:04Z

@kevinyang372 The demo video is available above, and I have just resolved the conflicts with the latest master. When you have a chance, could you please take another look and let me know if this PR is ready to merge? Thanks!

kevinyang372

@BobbyWang0120 Sorry this didn't make it to my inbox but this LGTM! Could you address the merge conflicts and I could approve CI to run?

- preserve the shared branch-switcher implementation for both branch chips - retain tooltip suppression while the branch menu is open

BobbyWang0120 · 2026-07-20T18:27:53Z

@kevinyang372 I’ve just resolved the latest conflicts with master and pushed the update. Hope you can merge it when ready—thanks!

- collapse nested branch refresh guards with a let chain - unblock platform Clippy checks

BobbyWang0120 · 2026-07-20T19:33:24Z

@kevinyang372 The last CI run failed on Clippy’s collapsible_if lint in app/src/context_chips/current_prompt.rs. I pushed the fix in 46cb89a3f, and the targeted warp library Clippy check now passes locally. Could you please re-trigger or approve the CI pipeline when you have a chance? Thanks!

fix(context-chips): align git branch status chip with udi chips

05c5ef9

- size branch and status icons from chip font size - use shared chip_container for padding and border - use monospace font in agent view when enabled

cla-bot Bot added the cla-signed label Jul 3, 2026

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

oz-for-oss Bot previously requested changes Jul 3, 2026

View reviewed changes

oz-for-oss Bot reviewed Jul 3, 2026

View reviewed changes

oz-for-oss Bot requested a review from kevinyang372 July 3, 2026 20:10

kevinyang372 reviewed Jul 6, 2026

View reviewed changes

feat(context_chips): add branch switcher to git branch status chip

8cec0ca

- extract shared git_branch_menu helper for git branch and git branch status chips - refresh branch dropdown only when the active branch changes - wire git branch status on_click generator to shell branch list

BobbyWang0120 changed the title ~~Align git branch status chip styling with the other input-box chips~~ Align git branch status chip styling and behavior with the built-in branch chip Jul 10, 2026

chore(context-chips): resolve master conflict

122a530

- merge the latest origin/master into the PR branch - preserve branch status menu behavior while accepting telemetry removal

kevinyang372 approved these changes Jul 20, 2026

View reviewed changes

chore(context-chips): resolve master conflicts

44c1de8

- preserve the shared branch-switcher implementation for both branch chips - retain tooltip suppression while the branch menu is open

kevinyang372 enabled auto-merge (squash) July 20, 2026 18:49

fix(context-chips): satisfy collapsible-if lint

46cb89a

- collapse nested branch refresh guards with a let chain - unblock platform Clippy checks

auto-merge was automatically disabled July 20, 2026 19:13
Head branch was pushed to by a user without write access

kevinyang372 enabled auto-merge (squash) July 21, 2026 15:42

kevinyang372 merged commit 8ee4216 into warpdotdev:master Jul 21, 2026
23 checks passed

BobbyWang0120 deleted the bobby/git-branch-status-chip-styling branch July 21, 2026 18:04

Uh oh!

Conversation

BobbyWang0120 commented Jul 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Linked Issue

Testing

Screenshots / Videos

Agent Mode

Uh oh!

oz-for-oss Bot commented Jul 3, 2026

Uh oh!

oz-for-oss Bot left a comment

Choose a reason for hiding this comment

Uh oh!

BobbyWang0120 commented Jul 3, 2026

Uh oh!

oz-for-oss Bot commented Jul 3, 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!

kevinyang372 left a comment

Choose a reason for hiding this comment

Uh oh!

BobbyWang0120 commented Jul 11, 2026

Uh oh!

BobbyWang0120 commented Jul 11, 2026

Uh oh!

BobbyWang0120 commented Jul 11, 2026

Uh oh!

BobbyWang0120 commented Jul 19, 2026

Uh oh!

kevinyang372 left a comment

Choose a reason for hiding this comment

Uh oh!

BobbyWang0120 commented Jul 20, 2026

Uh oh!

BobbyWang0120 commented Jul 20, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

BobbyWang0120 commented Jul 3, 2026 •

edited

Loading

oz-for-oss Bot commented Jul 3, 2026 •

edited

Loading