APP-4263 Fix git ops flicker bug by exzshao · Pull Request #9452 · warpdotdev/warp

exzshao · 2026-04-29T17:33:20Z

Description

Fixes APP-4263: the code review git operations header briefly showed incorrect PR-related actions while PR info for the current branch was still being refreshed.

load_metadata_for_repo returns pr_info: None because PR info is fetched separately via refresh_pr_info (gh pr view). That made the UI treat unknown PR state as "no PR" while the async lookup was in flight, which could briefly show Create PR. With the handle-only version, switching between two branches that both have PRs could also briefly fall back from PR #N to disabled Commit before resolving to PR #M.

Fix

In app/src/code_review/diff_state.rs:

Track an in-flight PR lookup with refreshing_pr_info_handle: Option<SpawnedFutureHandle> instead of storing PR staleness in metadata.
Abort any previous PR lookup before starting a new one.
Carry forward cached pr_info through metadata refreshes so the header does not clear to disabled Commit while the next branch's PR lookup is pending.

In app/src/code_review/code_review_view.rs:

Gate Create PR on !is_pr_info_refreshing() so an unknown/pending PR lookup is not treated as "no PR".
If cached PR info is being carried while a new lookup is pending, keep the previous PR #N label visible but disable the button/menu item with a "Refreshing PR info" tooltip so it cannot open a stale PR.
Once the lookup resolves, update the header to the new branch's PR #M, Create PR, or disabled Commit state as appropriate.

Testing

Not run in this update per request.

Expected/manual behavior:

Main/master → feature branch: no Create PR flicker while gh pr view is pending.
Branch with PR → branch with PR: no disabled Commit interstitial; previous PR label remains disabled until the new PR info resolves.
Branch with PR → branch without PR: previous PR label remains disabled briefly, then transitions to Create PR if the branch is eligible.
Dropdown Create PR and commit-dialog create-PR intent remain unavailable while PR info is refreshing.

Agent Mode

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

UPDATED LOOM: https://www.loom.com/share/4c94527c09914af9b295e49b4719159a

oz-for-oss · 2026-04-29T17:33:30Z

@exzshao

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

I completed the review and posted feedback on this pull request.

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

You can view the conversation on Warp.

I completed the review and posted feedback on this pull request.

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 changes DiffStateModel metadata refresh handling so cached PR information is always preserved after loading fresh metadata.

Concerns

Cached PR information is now preserved even when the current branch changes, which can show or open the previous branch's PR before the asynchronous refresh completes or if it returns no PR.
Security pass: no security-specific issues were found in the provided diff.

Verdict

Found: 0 critical, 1 important, 0 suggestions

Request changes

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

Powered by Oz

MaggieShan

One main comment

oz-for-oss

Overview

This PR tracks PR-info refreshes to avoid git-operations header flicker while gh pr view is pending and disables stale PR actions during refresh.

Concerns

PR lookup completion is not tied to the lookup, branch, or repository that spawned it, so a result that already crossed from the background task before abort() can clear the current refresh handle and apply stale PR info.

Verdict

Found: 0 critical, 1 important, 0 suggestions

Request changes

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 · 2026-05-05T22:36:58Z

@MaggieShan

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

I completed the review and no human review was requested for this pull request.

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

Powered by Oz

MaggieShan · 2026-05-05T22:45:07Z

/oz-review re-review this

oz-for-oss · 2026-05-05T22:45:18Z

@MaggieShan

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

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 adds explicit in-flight PR lookup tracking and gates Create PR / stale PR actions while the lookup is refreshing.

Concerns

PR lookup completions are not tied to the lookup generation or branch that spawned them, so a stale completed lookup can still clear the current refresh state and write old PR info.

Verdict

Found: 0 critical, 1 important, 0 suggestions

Request changes

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 · 2026-05-05T22:47:07Z

                    .unwrap_or(None)
            },
            |me, pr_info, ctx| {
+                me.refreshing_pr_info_handle = None;


⚠️ [IMPORTANT] This completion may belong to an older lookup that finished before abort() took effect; clearing refreshing_pr_info_handle and then writing pr_info can mark a newer lookup as done and publish stale PR info. Track a refresh generation/current branch and ignore completions that are no longer current.

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

oz-for-oss

Overview

This PR preserves and guards PR metadata while asynchronous gh pr view lookups are in flight, preventing the git operations header from briefly exposing stale Create PR or disabled Commit states during branch transitions.

Concerns

The dropdown PR action is disabled while PR info refreshes, but it does not surface the same explanatory tooltip as the primary button.

Found: 0 critical, 0 important, 1 suggestions

Verdict

Approve with nits

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 · 2026-05-05T22:51:07Z

            MenuItemFields::new(format!("PR #{}", pr_info.number))
                .with_icon(Icon::Github)
                .with_on_select_action(CodeReviewAction::ViewPr(pr_info.url))
+                .with_disabled(is_pr_info_refreshing)


💡 [SUGGESTION] Add the same Refreshing PR info tooltip to the disabled dropdown item; the Create PR branch below needs the same explanation when refresh disables it.

No need at the moment

remove flicker

318b86c

cla-bot Bot added the cla-signed label Apr 29, 2026

exzshao changed the title ~~Add FAQ, serde_json, and event sequence to AI conversation~~ APP-4263 Fix git ops flicker bug Apr 29, 2026

oz-for-oss Bot reviewed Apr 29, 2026

View reviewed changes

Comment thread app/src/code_review/diff_state.rs

exzshao added 2 commits April 29, 2026 15:23

Preserve PR info across branch switches and mark stale on change

dd7e3a3

Check PR info staleness before allowing PR creation and actions

aa182b3

exzshao requested a review from MaggieShan April 29, 2026 20:41

MaggieShan reviewed Apr 29, 2026

View reviewed changes

Comment thread app/src/code_review/diff_state.rs Outdated

use Option<SpawnedFutureHandle>

92257e9

exzshao requested a review from MaggieShan April 30, 2026 14:12

MaggieShan reviewed Apr 30, 2026

View reviewed changes

Comment thread app/src/code_review/diff_state.rs

Comment thread app/src/code_review/code_review_view.rs Outdated

Comment thread app/src/code_review/code_review_view.rs Outdated

Refresh PR info when Git operations are enabled and PR info is missing

2765fa7

exzshao requested a review from MaggieShan April 30, 2026 19:48

oz-for-oss Bot previously requested changes Apr 30, 2026

View reviewed changes

Comment thread app/src/code_review/diff_state.rs

address pr nits

628832a

MaggieShan approved these changes May 5, 2026

View reviewed changes

oz-for-oss Bot previously requested changes May 5, 2026

View reviewed changes

oz-for-oss Bot reviewed May 5, 2026

View reviewed changes

oz-for-oss Bot requested a review from kevinchevalier May 5, 2026 22:51

MaggieShan removed the request for review from kevinchevalier May 5, 2026 22:52

MaggieShan merged commit e6df31b into master May 5, 2026
28 checks passed

MaggieShan deleted the edward/app-4263-fix-flicker-tristate branch May 5, 2026 22:53

Conversation

exzshao commented Apr 29, 2026 • edited by MaggieShan Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Fix

Testing

Agent Mode

Uh oh!

oz-for-oss Bot commented Apr 29, 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!

Uh oh!

MaggieShan left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

oz-for-oss Bot left a comment

Choose a reason for hiding this comment

Overview

Concerns

Verdict

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

MaggieShan commented May 5, 2026

Uh oh!

oz-for-oss Bot commented May 5, 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!

oz-for-oss Bot May 5, 2026

Choose a reason for hiding this comment

Uh oh!

oz-for-oss Bot left a comment

Choose a reason for hiding this comment

Overview

Concerns

Verdict

Uh oh!

oz-for-oss Bot May 5, 2026

Choose a reason for hiding this comment

Uh oh!

MaggieShan May 5, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

exzshao commented Apr 29, 2026 •

edited by MaggieShan

Loading

oz-for-oss Bot commented Apr 29, 2026 •

edited

Loading

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

edited

Loading

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

edited

Loading